diff -Nru exiv2-0.19/AUTHORS exiv2-0.21/AUTHORS
--- exiv2-0.19/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/AUTHORS	2010-04-24 06:03:24.000000000 +0000
@@ -0,0 +1 @@
+See doc/ChangeLog. Authors and other contributors are mentioned there.
diff -Nru exiv2-0.19/config/config.h.in exiv2-0.21/config/config.h.in
--- exiv2-0.19/config/config.h.in	2009-12-27 09:56:29.000000000 +0000
+++ exiv2-0.21/config/config.h.in	2010-07-25 15:47:35.000000000 +0000
@@ -126,8 +126,8 @@
    slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
 
-/* Define if g++ supports C++ visibility features */
-#undef HAVE_GXXCLASSVISIBILITY
+/* Define if C++ visibility support is enabled */
+#undef WANT_VISIBILITY_SUPPORT
 
 /* Define if we have / are building a shared library (DLL) */
 #undef HAVE_DLL
@@ -204,24 +204,36 @@
 # define EXV_UNICODE_PATH
 #endif
 
-/* Shared library support, see http://gcc.gnu.org/wiki/Visibility */
+/* Symbol visibility support */
 #ifdef WIN32
 # define EXV_IMPORT __declspec(dllimport)
 # define EXV_EXPORT __declspec(dllexport)
 # define EXV_DLLLOCAL
 # define EXV_DLLPUBLIC
 #else
-# ifdef EXV_HAVE_GXXCLASSVISIBILITY
-#  define EXV_IMPORT __attribute__ ((visibility("default")))
-#  define EXV_EXPORT __attribute__ ((visibility("default")))
-#  define EXV_DLLLOCAL __attribute__ ((visibility("hidden")))
-#  define EXV_DLLPUBLIC __attribute__ ((visibility("default")))
-# else
+# ifdef EXV_WANT_VISIBILITY_SUPPORT
+#  if defined(__GNUC__) && (__GNUC__ >= 4)
+#   define EXV_IMPORT __attribute__ ((visibility("default")))
+#   define EXV_EXPORT __attribute__ ((visibility("default")))
+#   define EXV_DLLLOCAL __attribute__ ((visibility("hidden")))
+#   define EXV_DLLPUBLIC __attribute__ ((visibility("default")))
+#  elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#   define EXV_IMPORT __global
+#   define EXV_EXPORT __global
+#   define EXV_DLLLOCAL __hidden
+#   define EXV_DLLPUBLIC __global
+#  else
+#   define EXV_IMPORT
+#   define EXV_EXPORT
+#   define EXV_DLLLOCAL
+#   define EXV_DLLPUBLIC
+#  endif
+# else /* ! EXV_WANT_VISIBILITY_SUPPORT */
 #  define EXV_IMPORT
 #  define EXV_EXPORT
 #  define EXV_DLLLOCAL
 #  define EXV_DLLPUBLIC
-# endif /* ! EXV_HAVE_GXXCLASSVISIBILITY */
+# endif /* ! EXV_WANT_VISIBILITY_SUPPORT */
 #endif /* ! WIN32 */
 
 /* Define EXIV2API for DLL builds */
diff -Nru exiv2-0.19/config/config.make exiv2-0.21/config/config.make
--- exiv2-0.19/config/config.make	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/config/config.make	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ***************************************************** -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      config.make
-# Version:   $Rev: 1750 $
+# Version:   $Rev: 2045 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   26-Feb-05, ahu: created
 #
diff -Nru exiv2-0.19/config/config.mk.in exiv2-0.21/config/config.mk.in
--- exiv2-0.19/config/config.mk.in	2009-11-27 11:39:59.000000000 +0000
+++ exiv2-0.21/config/config.mk.in	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ***************************************************** -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      config.mk.in
-# Version:   $Rev: 1943 $
+# Version:   $Rev: 2045 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   10-Dec-03, ahu: created
 #
diff -Nru exiv2-0.19/config/configure.ac exiv2-0.21/config/configure.ac
--- exiv2-0.19/config/configure.ac	2009-12-29 13:29:21.000000000 +0000
+++ exiv2-0.21/config/configure.ac	2010-11-22 15:44:38.000000000 +0000
@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(exiv2, 0.19, ahuggel@gmx.net)
+AC_INIT(exiv2, 0.21, ahuggel@gmx.net)
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-EXIV2_LTVERSION=6:0:0
+EXIV2_LTVERSION=10:0:0
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
@@ -105,16 +105,25 @@
 fi
 AC_SUBST(DEP_TRACKING,$DEP_TRACKING)
 
-AC_MSG_CHECKING([whether to enable g++ visibility support])
+AC_MSG_CHECKING([whether to enable symbol visibility support])
 AC_ARG_ENABLE(visibility,
-    [  --disable-visibility    do not use g++ visibility support ],
-    GXX_VISIBILITY=$enableval, GXX_VISIBILITY=yes)
-AC_MSG_RESULT($GXX_VISIBILITY)
-if test "$GXX_VISIBILITY" = "yes"; then
-    AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
-    if test "$GXX_VISIBILITY" = "yes"; then
-        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
-        AC_DEFINE(HAVE_GXXCLASSVISIBILITY,1)
+    [  --disable-visibility    do not use symbol visibility support ],
+    VISIBILITY_SUPPORT=$enableval, VISIBILITY_SUPPORT=yes)
+AC_MSG_RESULT($VISIBILITY_SUPPORT)
+if test "$VISIBILITY_SUPPORT" = "yes"; then
+    # Sun Studio C++ compiler (which apparently ignores -fvisibility-inlines-hidden)
+    AX_CXX_CHECK_FLAG(-xldscope=hidden,[],[],[VISIBILITY_SUPPORT=yes],[VISIBILITY_SUPPORT=no])
+    if test "$VISIBILITY_SUPPORT" = "yes"; then
+        CXXFLAGS="${CXXFLAGS} -xldscope=hidden"
+    else
+        # GNU g++
+        AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[VISIBILITY_SUPPORT=yes],[VISIBILITY_SUPPORT=no])
+    	if test "$VISIBILITY_SUPPORT" = "yes"; then
+           CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
+        fi
+    fi
+    if test "$VISIBILITY_SUPPORT" = "yes"; then
+        AC_DEFINE(WANT_VISIBILITY_SUPPORT)
     fi
     if test "$enable_shared" = "yes"; then
         AC_DEFINE(HAVE_DLL)
@@ -219,9 +228,9 @@
 *)   echo "-- Build a shared library......... NO" ;;
 esac
 
-case "$GXX_VISIBILITY" in
-yes) echo "-- Use g++ visibility support..... YES" ;;
-*)   echo "-- Use g++ visibility support..... NO" ;;
+case "$VISIBILITY_SUPPORT" in
+yes) echo "-- Use symbol visibility support.. YES" ;;
+*)   echo "-- Use symbol visibility support.. NO" ;;
 esac
 
 case "x$HAVE_LIBZ" in
diff -Nru exiv2-0.19/config/Makefile.in exiv2-0.21/config/Makefile.in
--- exiv2-0.19/config/Makefile.in	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/config/Makefile.in	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ***************************************************** -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      Makefile.in
-# Version:   $Rev: 1937 $
+# Version:   $Rev: 2045 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   15-Jan-04, ahu: created
 #
diff -Nru exiv2-0.19/configure exiv2-0.21/configure
--- exiv2-0.19/configure	2009-12-30 13:39:52.000000000 +0000
+++ exiv2-0.21/configure	2010-11-30 17:13:00.000000000 +0000
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for exiv2 0.19.
+# Generated by GNU Autoconf 2.67 for exiv2 0.21.
 #
 # Report bugs to <ahuggel@gmx.net>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -359,19 +359,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  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
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -682,7 +682,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='exiv2'
 PACKAGE_TARNAME='exiv2'
-PACKAGE_VERSION='0.19'
-PACKAGE_STRING='exiv2 0.19'
+PACKAGE_VERSION='0.21'
+PACKAGE_STRING='exiv2 0.21'
 PACKAGE_BUGREPORT='ahuggel@gmx.net'
 PACKAGE_URL=''
 
@@ -953,8 +953,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -999,7 +1000,7 @@
     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'`
     case $ac_user_opts in
@@ -1025,7 +1026,7 @@
     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'`
     case $ac_user_opts in
@@ -1229,7 +1230,7 @@
     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'`
     case $ac_user_opts in
@@ -1245,7 +1246,7 @@
     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'`
     case $ac_user_opts in
@@ -1275,8 +1276,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1284,7 +1285,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1302,13 +1303,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1331,7 +1332,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1345,8 +1346,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1361,9 +1362,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1402,11 +1403,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1432,7 +1433,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 exiv2 0.19 to adapt to many kinds of systems.
+\`configure' configures exiv2 0.21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1446,7 +1447,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1497,7 +1498,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of exiv2 0.19:";;
+     short | recursive ) echo "Configuration of exiv2 0.21:";;
    esac
   cat <<\_ACEOF
 
@@ -1513,7 +1514,7 @@
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-dependency-tracking  speeds up one-time build
-  --disable-visibility    do not use g++ visibility support
+  --disable-visibility    do not use symbol visibility support
   --disable-lensdata      do not use the lens database for Nikon lens names
   --enable-commercial     compile with the EXV_COMMERCIAL_VERSION symbol set
   --disable-xmp           do not compile XMP support and the XMP Toolkit
@@ -1613,10 +1614,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-exiv2 configure 0.19
-generated by GNU Autoconf 2.65
+exiv2 configure 0.21
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1686,7 +1687,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1761,7 +1762,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1832,7 +1833,7 @@
   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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1904,7 +1905,7 @@
   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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2017,10 +2018,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2056,7 +2057,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+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; }
 
@@ -2079,17 +2080,15 @@
 $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;}
-( cat <<\_ASBOX
-## ------------------------------ ##
+( $as_echo "## ------------------------------ ##
 ## Report this to ahuggel@gmx.net ##
-## ------------------------------ ##
-_ASBOX
+## ------------------------------ ##"
      ) | 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2111,7 +2110,7 @@
   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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2156,15 +2155,18 @@
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2173,8 +2175,12 @@
 int
 main ()
 {
-#ifndef $2
-  (void) $2;
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
 #endif
 
   ;
@@ -2198,8 +2204,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by exiv2 $as_me 0.19, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by exiv2 $as_me 0.21, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2309,11 +2315,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2347,11 +2351,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2364,11 +2366,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2382,11 +2382,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2441,7 +2439,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # 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
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2456,7 +2459,11 @@
     { $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;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$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
 done
 
@@ -2535,7 +2542,7 @@
 $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
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2549,7 +2556,7 @@
 
 
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-EXIV2_LTVERSION=6:0:0
+EXIV2_LTVERSION=10:0:0
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 cat >>confdefs.h <<_ACEOF
@@ -2568,16 +2575,22 @@
 
 ac_aux_dir=
 for ac_dir in ./config "$srcdir"/./config; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  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 ./config \"$srcdir\"/./config" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ./config \"$srcdir\"/./config" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2818,9 +2831,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C++ compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+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; }
@@ -2862,8 +2874,8 @@
 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 compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+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
@@ -2920,9 +2932,9 @@
     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.
+as_fn_error $? "cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -2973,8 +2985,8 @@
 
 { { $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 compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+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
@@ -3141,7 +3153,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3157,11 +3169,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -3200,7 +3212,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3216,18 +3228,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 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;}
-as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -3538,8 +3550,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$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; }
+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
@@ -3820,7 +3832,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3836,11 +3848,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -3879,7 +3891,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3895,18 +3907,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 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;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -4023,7 +4035,7 @@
 $as_echo_n "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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -4031,7 +4043,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -4052,7 +4064,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_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; }
@@ -4063,16 +4075,16 @@
 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
+  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
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -4097,7 +4109,7 @@
   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
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -4105,7 +4117,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4553,7 +4565,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+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 test "${acl_cv_prog_gnu_ld+set}" = set; then :
@@ -5887,7 +5899,7 @@
   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
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -5963,7 +5975,7 @@
   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
+    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
@@ -6029,7 +6041,7 @@
   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
+    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
@@ -6096,7 +6108,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -6212,7 +6224,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+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 test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -6414,13 +6426,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6417: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6429: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6420: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6432: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6423: output\"" >&5)
+  (eval echo "\"\$as_me:6435: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7614,7 +7626,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7617 "configure"' > conftest.$ac_ext
+  echo '#line 7629 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8481,8 +8493,7 @@
   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
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+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
@@ -8805,7 +8816,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8821,11 +8832,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -8864,7 +8875,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8880,11 +8891,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
@@ -9407,11 +9418,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9410: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9421: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9414: \$? = $ac_status" >&5
+   echo "$as_me:9425: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9746,11 +9757,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9749: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9760: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9753: \$? = $ac_status" >&5
+   echo "$as_me:9764: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9851,11 +9862,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9854: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9858: \$? = $ac_status" >&5
+   echo "$as_me:9869: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9906,11 +9917,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9909: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9920: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9913: \$? = $ac_status" >&5
+   echo "$as_me:9924: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12289,7 +12300,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12292 "configure"
+#line 12303 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12385,7 +12396,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12388 "configure"
+#line 12399 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12800,7 +12811,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+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 test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -14341,11 +14352,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14344: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14348: \$? = $ac_status" >&5
+   echo "$as_me:14359: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14440,11 +14451,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14443: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14447: \$? = $ac_status" >&5
+   echo "$as_me:14458: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14492,11 +14503,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14495: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14506: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14499: \$? = $ac_status" >&5
+   echo "$as_me:14510: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15770,7 +15781,7 @@
 		CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
-		as_fn_error "either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib" "$LINENO" 5
+		as_fn_error $? "either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib" "$LINENO" 5
 	fi
 fi
 
@@ -16052,8 +16063,7 @@
 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"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+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
@@ -16377,8 +16387,7 @@
   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
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+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
@@ -16667,8 +16676,7 @@
 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"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+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
@@ -16711,18 +16719,97 @@
 DEP_TRACKING=$DEP_TRACKING
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable g++ visibility support" >&5
-$as_echo_n "checking whether to enable g++ visibility support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable symbol visibility support" >&5
+$as_echo_n "checking whether to enable symbol visibility support... " >&6; }
 # Check whether --enable-visibility was given.
 if test "${enable_visibility+set}" = set; then :
-  enableval=$enable_visibility; GXX_VISIBILITY=$enableval
+  enableval=$enable_visibility; VISIBILITY_SUPPORT=$enableval
 else
-  GXX_VISIBILITY=yes
+  VISIBILITY_SUPPORT=yes
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GXX_VISIBILITY" >&5
-$as_echo "$GXX_VISIBILITY" >&6; }
-if test "$GXX_VISIBILITY" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VISIBILITY_SUPPORT" >&5
+$as_echo "$VISIBILITY_SUPPORT" >&6; }
+if test "$VISIBILITY_SUPPORT" = "yes"; then
+    # Sun Studio C++ compiler (which apparently ignores -fvisibility-inlines-hidden)
+
+
+
+
+
+  flag=`echo "-xldscope=hidden" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler accepts the -xldscope=hidden flag" >&5
+$as_echo_n "checking whether the C++ compiler accepts the -xldscope=hidden flag... " >&6; }
+if eval "test \"\${ax_cv_cxx_check_flag_$flag+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+    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
+
+
+    save_CXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -xldscope=hidden"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+      eval "ax_cv_cxx_check_flag_$flag=yes"
+
+else
+
+      eval "ax_cv_cxx_check_flag_$flag=no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    CXXFLAGS="$save_CXXFLAGS"
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+fi
+eval ac_res=\$ax_cv_cxx_check_flag_$flag
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+  if eval "test \"`echo '$ax_cv_cxx_check_flag_'$flag`\" = yes"; then :
+
+    :
+    VISIBILITY_SUPPORT=yes
+
+else
+
+    :
+    VISIBILITY_SUPPORT=no
+
+fi
+
+    if test "$VISIBILITY_SUPPORT" = "yes"; then
+        CXXFLAGS="${CXXFLAGS} -xldscope=hidden"
+    else
+        # GNU g++
 
 
 
@@ -16732,7 +16819,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler accepts the -fvisibility-inlines-hidden flag" >&5
 $as_echo_n "checking whether the C++ compiler accepts the -fvisibility-inlines-hidden flag... " >&6; }
-if { as_var=ax_cv_cxx_check_flag_$flag; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ax_cv_cxx_check_flag_$flag+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -16788,18 +16875,21 @@
   if eval "test \"`echo '$ax_cv_cxx_check_flag_'$flag`\" = yes"; then :
 
     :
-    GXX_VISIBILITY=yes
+    VISIBILITY_SUPPORT=yes
 
 else
 
     :
-    GXX_VISIBILITY=no
+    VISIBILITY_SUPPORT=no
 
 fi
 
-    if test "$GXX_VISIBILITY" = "yes"; then
-        CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
-        $as_echo "#define HAVE_GXXCLASSVISIBILITY 1" >>confdefs.h
+    	if test "$VISIBILITY_SUPPORT" = "yes"; then
+           CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
+        fi
+    fi
+    if test "$VISIBILITY_SUPPORT" = "yes"; then
+        $as_echo "#define WANT_VISIBILITY_SUPPORT 1" >>confdefs.h
 
     fi
     if test "$enable_shared" = "yes"; then
@@ -16940,7 +17030,7 @@
 
     fi
     if test "$with_expat" = "no" -o "$found_expat" = "no"; then
-        as_fn_error "either specify a valid expat installation with --with-expat=DIR or disable XMP support with --disable-xmp" "$LINENO" 5
+        as_fn_error $? "either specify a valid expat installation with --with-expat=DIR or disable XMP support with --disable-xmp" "$LINENO" 5
     fi
     $as_echo "#define HAVE_XMP_TOOLKIT 1" >>confdefs.h
 
@@ -17058,6 +17148,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 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$//'
@@ -17219,19 +17310,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  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
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -17427,7 +17518,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -17480,8 +17571,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by exiv2 $as_me 0.19, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by exiv2 $as_me 0.21, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -17546,11 +17637,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-exiv2 config.status 0.19
-configured by $0, generated by GNU Autoconf 2.65,
+exiv2 config.status 0.21
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -17566,11 +17657,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -17592,6 +17688,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -17604,7 +17701,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -17613,7 +17710,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -18033,7 +18130,7 @@
     "./po/Makefile.in") CONFIG_FILES="$CONFIG_FILES ./po/Makefile.in" ;;
     "./src/doxygen.hpp") CONFIG_FILES="$CONFIG_FILES ./src/doxygen.hpp" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -18071,7 +18168,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -18088,7 +18185,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -18102,18 +18199,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -18202,20 +18299,28 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -18243,7 +18348,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -18328,7 +18433,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -18341,7 +18446,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -18369,7 +18474,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   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
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -18396,7 +18501,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -18527,22 +18632,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$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
+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'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -18553,19 +18658,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$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;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -19500,7 +19605,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -19521,7 +19626,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $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
@@ -19543,9 +19648,9 @@
 *)   echo "-- Build a shared library......... NO" ;;
 esac
 
-case "$GXX_VISIBILITY" in
-yes) echo "-- Use g++ visibility support..... YES" ;;
-*)   echo "-- Use g++ visibility support..... NO" ;;
+case "$VISIBILITY_SUPPORT" in
+yes) echo "-- Use symbol visibility support.. YES" ;;
+*)   echo "-- Use symbol visibility support.. NO" ;;
 esac
 
 case "x$HAVE_LIBZ" in
diff -Nru exiv2-0.19/contrib/organize/Makefile exiv2-0.21/contrib/organize/Makefile
--- exiv2-0.19/contrib/organize/Makefile	2009-01-31 09:48:16.000000000 +0000
+++ exiv2-0.21/contrib/organize/Makefile	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ************************************************************* -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      Makefile
-# Version:   $Rev: 1735 $
+# Version:   $Rev: 2045 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   31-Jan-09, ahu: created
 #
diff -Nru exiv2-0.19/debian/changelog exiv2-0.21/debian/changelog
--- exiv2-0.19/debian/changelog	2010-06-14 22:23:17.000000000 +0000
+++ exiv2-0.21/debian/changelog	2011-01-26 19:51:45.000000000 +0000
@@ -1,21 +1,41 @@
-exiv2 (0.19-3) unstable; urgency=low
+exiv2 (0.21-0ppa1) maverick; urgency=low
+  * Backport to Maverick
 
-  * Drop upstream Nikon fixes; partial patch breaks image display
-    - Reopen: #579835 - not fixed
-    - changeset 2017-2020 
+ -- Andrew Coles <andrew.coles@cis.strath.ac.uk>  Wed, 26 Jan 2011  19:49:00 +0000
 
- -- Mark Purcell <msp@debian.org>  Tue, 15 Jun 2010 08:22:09 +1000
+exiv2 (0.21-0ubuntu1) natty; urgency=low
 
-exiv2 (0.19-2) unstable; urgency=low
+  * New upstream release
+  * debian/control:
+    - Add Vcs-Bzr link
+    - Use standards version 3.9.1
+    - Rename libexiv2-9 to libexiv2-10
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Fri, 07 Jan 2011 09:54:22 +1100
+
+exiv2 (0.20-2) unstable; urgency=low
+
+  * Upload to unstable - cleared with debian-release
+
+ -- Mark Purcell <msp@debian.org>  Fri, 09 Jul 2010 19:43:59 +1000
 
-  * Backport upstream Nikon Makernote regression fix (Closes: #579835)
-    - changeset 2017-2020
-  * source/format -> 3.0 (quilt)
-  * Drop inactive Uploaders
-  * Standards-Version: 3.8.3 - no changes
-  * debian/rules Added dh --parallel
+exiv2 (0.20-1) experimental; urgency=low
+
+  * New upstream release
+    - NEW package libexiv2-9 - soname bump
+    - Makernote updates
+    - Nikon performance improvement (Closes: #579835)
+
+  [ Michal Čihař ]
+  * Add -dbg package (Closes: #557088)
+
+  [ Mark Purcell ]
+  * Siwtch to source/format = 3.0 (quilt)
+  * debian/control switch to '-' bullet marker (Closes: #564326) 
+  * Dropped fuji from Maintainers - inactive
+  * Simplify get-orig-source target - uscan
 
- -- Mark Purcell <msp@debian.org>  Mon, 14 Jun 2010 11:46:28 +1000
+ -- Mark Purcell <msp@debian.org>  Sun, 30 May 2010 14:45:46 +1000
 
 exiv2 (0.19-1) unstable; urgency=low
 
diff -Nru exiv2-0.19/debian/control exiv2-0.21/debian/control
--- exiv2-0.19/debian/control	2010-06-14 22:19:23.000000000 +0000
+++ exiv2-0.21/debian/control	2011-01-06 23:20:25.000000000 +0000
@@ -7,10 +7,9 @@
  autotools-dev, libexpat1-dev, zlib1g-dev,
  libexpat1-dev,
  doxygen, graphviz, python, xsltproc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.exiv2.org
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/exiv2/trunk
-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/exiv2/trunk
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/exiv2/ubuntu
 
 Package: exiv2
 Architecture: any
@@ -29,7 +28,7 @@
   * extract, insert and delete the thumbnail image embedded in the Exif metadata
   * fix the Exif ISO setting of picture taken with Nikon cameras
 
-Package: libexiv2-6
+Package: libexiv2-10
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -41,8 +40,8 @@
   * a smart IPTC implementation that does not affect data that programs like
     Photoshop store in the same image segment
   * EXIF MakerNote support:
-    o MakerNote tags can be accessed just like any other EXIF metadata
-    o a sophisticated write algorithm avoids corrupting the MakerNote:
+    - MakerNote tags can be accessed just like any other EXIF metadata
+    - a sophisticated write algorithm avoids corrupting the MakerNote:
   * extract and delete methods for EXIF thumbnails (both, JPEG and TIFF
     thumbnails)
   * set methods for EXIF thumbnails (JPEG only, TIFF thumbnails can be set from
@@ -54,7 +53,7 @@
 Package: libexiv2-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libexiv2-6 (= ${binary:Version}), pkg-config
+Depends: ${misc:Depends}, libexiv2-10 (= ${binary:Version}), pkg-config
 Suggests: libexiv2-doc
 Description: EXIF/IPTC metadata manipulation library - development files
  Exiv2 C++ header files.
@@ -65,3 +64,11 @@
 Architecture: all
 Description: EXIF/IPTC metadata manipulation library - HTML documentation
  Exiv2 HTML documentation.
+
+Package: libexiv2-dbg
+Depends: ${misc:Depends}, libexiv2-10 (= ${binary:Version})
+Section: debug
+Architecture: any
+Priority: extra
+Description: EXIF/IPTC metadata manipulation library - debug
+ Exiv2 debug symbols package
diff -Nru exiv2-0.19/debian/libexiv2-10.install exiv2-0.21/debian/libexiv2-10.install
--- exiv2-0.19/debian/libexiv2-10.install	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/debian/libexiv2-10.install	2011-01-06 23:20:25.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
diff -Nru exiv2-0.19/debian/libexiv2-6.install exiv2-0.21/debian/libexiv2-6.install
--- exiv2-0.19/debian/libexiv2-6.install	2010-06-14 22:19:23.000000000 +0000
+++ exiv2-0.21/debian/libexiv2-6.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff -Nru exiv2-0.19/debian/rules exiv2-0.21/debian/rules
--- exiv2-0.19/debian/rules	2010-06-14 22:19:24.000000000 +0000
+++ exiv2-0.21/debian/rules	2011-01-06 23:20:25.000000000 +0000
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 
-FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
-URL = http://www.exiv2.org/$(UPFILENAME)
-
 %:
-	dh --parallel $@
+	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-rpath
@@ -14,6 +10,9 @@
 	dh_clean
 	rm -rf doc/html
 
+override_dh_strip:
+	dh_strip -a --dbg-package=libexiv2-dbg
+
 override_dh_install:
 	[ ! -f Makefile ] || $(MAKE) doc
 	dh_install --list-missing
@@ -29,15 +28,4 @@
 	dh_compress -X.xls -X.js -X.idx -X.xml -X.php
 
 get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(UPFILENAME) from $(URL) ...
-	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
-print-version:
-	@@echo DEB_SOURCE_PACKAGE: $(DEB_SOURCE_PACKAGE)
-	@@echo DEB_VERSION: $(DEB_VERSION)
-	@@echo DEB_NO_EPOCH_VERSION: $(DEB_NOEPOCH_VERSION)
-	@@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)
-	@@echo FILENAME: $(FILENAME)
-	@@echo URL: $(URL)
+	uscan --force-download
diff -Nru exiv2-0.19/doc/ChangeLog exiv2-0.21/doc/ChangeLog
--- exiv2-0.19/doc/ChangeLog	2009-12-30 13:18:42.000000000 +0000
+++ exiv2-0.21/doc/ChangeLog	2010-11-22 14:50:35.000000000 +0000
@@ -1,3 +1,151 @@
+Changes from version 0.20 to 0.21
+---------------------------------
+
+* Exiv2 utility
+	- 0000727: Exiv2 command line tool: grep should find all occurrences of a
+	           tag, not only one.
+	           (Reported by Steve Wright)
+	         - Added option -q (quiet) to silence warnings and error messages
+	           from the Exiv2 library to the exiv2 command line tool.
+	         - Allow "migration" of XMP namespaces.
+
+* Exiv2 library
+	- 0000476: Error handler: Applications should be able to register an error
+	           handler. (Based on work by Simson Garfinkel)
+	- 0000614: Silence warnings from code.
+	- 0000712: Support of Sigma 17-50 2.8 OS HSM. (Reported by Steffen bla)
+	- 0000713: Tag 0x0203 in Olympus makernotes should be "Lens ID".
+	- 0000719: Remove makernote classes and pretty-print functions from the
+	           published interface.
+	- 0000721: Remove IfdId from the published interface.
+	- 0000726: Add support for Samsung's .SRW raw format.
+	           (Reported by Oleg Yermakov)
+	- 0000564: Need a way to get a list of all supported tags.
+	           (Reported by Jan Kundr)
+	- 0000593: The default type of Array element tags is incorrect.
+	- 0000625: New image formats and improved makernote support should not
+	           break ABI.
+	- 0000678: Lensname missing with EF100mm f/2.8L Macro IS USM.
+	           (Reported by Christoph Spiel)
+	- 0000711: exiv2 0.20 is corrupting ORF files from E-PL1.
+	           (Reported by Mark Haun)
+	- 0000714: Problem compiling with Sun Studio - visibility.
+	           (Reported by Pavel Heimlich)
+	- 0000717: Writing Exif.Image.ImageDescription in ORF file corrupts file.
+	           (Reported by Wouter Portegijs)
+	- 0000734: Support for Tamron 17-50mm f/2.8 SP XR LD II Di VC.
+	           (Reported by Jari-Matti Mäkelä)
+	- 0000735: Support for Sigma AF 50mm f/1.4 EX DG HSM.
+	           (Reported by Jari-Matti Mäkelä)
+	- 0000736: Exiv2 crash on "print".
+	           (Reported by Bastian Holst)
+	- 0000737: Metadata of Canon EF-S 18-55mm are not read correctly.
+	           (Reported by G. Lechner)
+	- 0000739: exiv2 crashes when examining previews.
+	           (Reported by Jim Nelson)
+	- 0000709: Typo in XMPCore_Impl.hpp. (Patch by Dimitri Schoolwerth)
+	- 0000716: Missing header in canonmp.cpp. (Patch by Pavel Heimlich)
+	- 0000723: Fix pkg-config file. (Patch by Johannes Wienke)
+	- 0000738: PSD resource block handling patch.
+	           (Patch by Michael Ulbrich)
+	         - Updated Nikon Lens lookup table to v4.3.410.01 of
+	           Robert Rottmerhusen's fmountlens list.
+	         - Introduced exiv2.hpp as a wrapper to include all Exiv2 objects.
+	         - Added a count field to the Exif tag reference data.
+	           (Patch by Matthias Baas)
+	         - Added ExifKey::defaultCount() to access the new count reference
+	           information.
+	         - Fixed zlib uncompression of large PNG metadata buffers.
+	         - Improved determination of MIME type.
+	         - Updated Canon makernote. (Greg Mansfield, Axel Waggershauser)
+	         - Updated Olympus makernote. (Greg Mansfield)
+	         - Updated Sony and Minolta makernote tags. (Gilles Caulier)
+	         - Fixed writing to pseudo memory mapped areas on Linux.
+	         - Modified test for XMP files to not recognize any XML file with
+	           a regular header as XMP.
+	         - Added afPoint() easy-access function.
+	           (Based on a patch by july)
+	         - Updated Spanish translations. (Pablo Valdés)
+
+* MSVC related
+	         - Updated MSVC project files (and notes) to build with
+	           DevStudio 2010 (and with DevStudio 2003/5/8). (Robin Mills)
+	         - Changes to MSVC build environment: renamed generated libraries.
+	           (Robin Mills, Jon Roch-Berry)
+
+
+Changes from version 0.19 to 0.20
+---------------------------------
+
+* Exiv2 utility
+	- 0000683: %a broken in rename
+	           (Reported by Göran Uddeborg)
+	- 0000572: It should be possible to insert newlines in text strings.
+	           (Implemented using a new function by Leo Sutic)
+	- 0000562: Exif.Photo.UserComment unicode comment doesn't work
+	           (Debian bug 486884)
+	         - Added -g option to 'grep' info for individual tags.
+
+* Exiv2 library
+	- 0000705: Pentax 645D makernote update
+	           (Patch by Michal Čihař)
+	- 0000704: Update of Pentax makernote
+	           (Patch by Michal Čihař)
+	- 0000701: Nikon Capture NX won't save a NEF file manipulated with exiv2
+	           from SVN
+	           (Reported by Frank Hommes)
+	- 0000699: Padding of XMP data results in invalid XMP JPEG segment larger
+	           than 65535 bytes
+	           (Patch by Joachim Gelhaus)
+	- 0000695: Add XMP support for src/metacopy
+	           (Patch by Nikolai Saoukh)
+	- 0000693: src/psdimage.cpp: operands of ? are integers of different
+	           signs: 'unsigned int' and 'long'
+	           (Patch by Nikolai Saoukh)
+	- 0000690: Wrong conversion of IPTC SpecialInstructions in copyIptcToXmp()
+	           (Patch by Volker Grabsch)
+	- 0000686: LLVM clang: error: default initialization of an object of const
+	           type 'class Exiv2::IptcData const' requires a user-provided
+	           default constructor.
+	           (Reported by Nikolai Saoukh)
+	- 0000684: Exif.Image.SubIFDs should support more than 4 sub-IFDs
+	           (Reported by frith [dot] foottit [at] gmail [dot] com in
+	           digiKam bug 210259)
+	- 0000677: Nikon Makernote tags regression in exiv 0.19
+	           (Reported by Mark Purcell. digiKam bug 224094, Debian bug 579835)
+	- 0000674: ShutterSpeedValue should be a signed rational
+	           (Patch by Olivier Tilloy)
+	- 0000673: Allow XMP sidecar files which start with a UTF-8 BOM
+	           (Reported by Michael Friess)
+	- 0000672: Image file gets deleted when writing to it
+	           (Reported with reproducer by Thomas Beutlich)
+	- 0000671: Writing to read-only TIFF-like file fails
+	- 0000668: "TIFF-safe" setExifData variant
+	- 0000666: Optimize binary array elements
+	- 0000665: Write support for Olympus RAW ORF files
+	- 0000662: Incorrect Unicode encoding of Exif UserComment tag
+	           (Leo Sutic)
+	- 0000659: LensType not reported for Pentax K-x
+	           (Reported by Piotr Ryszkiewicz)
+	- 0000611: Add support for makernote of Sony ARW files
+	           (Gilles Caulier)
+	- 0000569: Unable to write GPS data in ORF files with digikam
+	           (Reported by Johannes Wienke. digiKam bug 170693)
+	         - Added Kipi XMP namespace used by digiKam kipi-plugins
+	           (Gilles Caulier)
+	         - Added iView Media Pro and MS Expression Media XMP schemas.
+	           (Silversleeves)
+	         - Generalized class Error, added class WError for use with
+	           Unicode-Paths.
+	         - Updated Nikon Lens lookup table to v4.3.401.01 of
+	           Robert Rottmerhusen's fmountlens list.
+	         - Various fixes and enhancements when building with MSVC.
+	           (Robin Mills, Thomas Beutlich, Jens Mueller)
+	         - Added several missing TIFF tags (from PageMaker 6.0, Adobe
+	           OPI TIFF, Adobe TIFF&PM6 and TIFF/EP specs).
+	         - Completed support for Nikon makernote (Jens Mueller)
+
+
 Changes from version 0.18.2 to 0.19
 -----------------------------------
 
@@ -203,7 +351,7 @@
 	         - [translation] Updated Polish translations.
 	           (Piotr Eljasiak)
 	         - [translation] Updated German translation.
-	           (Oliver Dörr)
+	           (Oliver Dörr)
 	         - [translation] Updated Slovak translations.
 	           (Ivan Masar)
 
@@ -242,7 +390,7 @@
                   (Reported by chrysn)
                 - [exif] Added Olympus2 makernote support. (Vladimir Nadvornik)
                 - [translation] Updated German translation.
-                  (Oliver Dörr)
+                  (Oliver Dörr)
                 - [translation] Updated Polish translation.
                   (Piotr Eljasiak)
                 - [design] Removed inline functions from class hierarchies.
@@ -335,7 +483,7 @@
 	         - [miscellaneous] Define pid_t using a typedef instead of #define in
 	           Windows environments. (Robin Mills)
 	         - [translation] Updated German translation.
-	           (Oliver Dörr)
+	           (Oliver Dörr)
 	         - [translation] Updated French translation.
 	           (Fabien Salvi)
 	         - [translation] Updated Polish translation.
@@ -368,7 +516,7 @@
 	           lens database.
 	         - [doc] Added reference tables for XMP properties to documentation.
 	         - [miscellaneous] Updated German translation.
-	           (Oliver Dörr)
+	           (Oliver Dörr)
 	         - [miscellaneous] Updated Polish translation.
 	           (Piotr Eljasiak)
 
@@ -405,7 +553,7 @@
 	         - [miscellaneous] Updated French translation.
 	           (Olivier Tilloy)
 	         - [miscellaneous] Updated German translation.
-	           (Oliver Dörr)
+	           (Oliver Dörr)
 	         - [miscellaneous] Updated Polish translation.
 	           (Piotr Eljasiak)
 	         - [miscellaneous] Updated Russian translation.
@@ -444,7 +592,7 @@
 	           lookup table. (Patrick Markert)
 	         - [Exif] Canon ModelId patch. (Gerry Patterson)
 	         - [miscellaneous] Updated German translation. 
-	           (Oliver Dörr)
+	           (Oliver Dörr)
 	         - [miscellaneous] Updated Russian translation. 
 	           (Alexandre Prokoudine)
 	         - [miscellaneous] Updated French translation. 
@@ -482,7 +630,7 @@
 	         - [miscellaneous] Fixed version check macro to actually check the 
 	           runtime version and not the compile-time version. Added version() 
 	           and versionNumber() functions.
-	         - [miscellaneous] Updated German translation. (Oliver Dörr)
+	         - [miscellaneous] Updated German translation. (Oliver Dörr)
 	         - [miscellaneous] Changed name of installed translation files to
 	           lower case exiv2.mo. (Highlighted by Angelo Naselli)
 
@@ -510,7 +658,7 @@
 	           The currently available translations are still work in progress:
 	           Finnish by Mikael Lammentausta
 	           French by Gilles Caulier (ported from libexif) and Olivier Tilloy
-	           German by Gilles Caulier (ported from libexif) and Oliver Dörr
+	           German by Gilles Caulier (ported from libexif) and Oliver Dörr
 	           Russian by Alexandre Prokoudine
 	           Polish, Spanish by Gilles Caulier, ported from libexif
 	- 0000460: [exif] Exiv2 should support to decode/encode Windows tags
diff -Nru exiv2-0.19/doc/Makefile exiv2-0.21/doc/Makefile
--- exiv2-0.19/doc/Makefile	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/doc/Makefile	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ***************************************************** -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      Makefile
-# Version:   $Rev: 1750 $
+# Version:   $Rev: 2045 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   10-Dec-03, ahu: created
 #
diff -Nru exiv2-0.19/doc/templates/__index2__ exiv2-0.21/doc/templates/__index2__
--- exiv2-0.19/doc/templates/__index2__	2009-07-05 05:49:08.000000000 +0000
+++ exiv2-0.21/doc/templates/__index2__	2010-11-30 17:00:30.000000000 +0000
@@ -8,6 +8,7 @@
     <li><a href="tags-olympus.html"><span>Olympus</span></a></li> 
     <li><a href="tags-panasonic.html"><span>Panasonic</span></a></li> 
     <li><a href="tags-pentax.html"><span>Pentax</span></a></li> 
+    <li><a href="tags-samsung.html"><span>Samsung</span></a></li> 
     <li><a href="tags-sigma.html"><span>Sigma/Foveon</span></a></li> 
     <li><a href="tags-sony.html"><span>Sony</span></a></li> 
   </ul>
@@ -38,7 +39,10 @@
     <li><a href="tags-xmp-iptcExt.html"><span>Iptc4xmpExt</span></a></li>
     <li><a href="tags-xmp-plus.html"><span>plus</span></a></li>
     <li><a href="tags-xmp-digiKam.html"><span>digiKam</span></a></li>
+    <li><a href="tags-xmp-kipi.html"><span>kipi</span></a></li>
     <li><a href="tags-xmp-MicrosoftPhoto.html"><span>MicrosoftPhoto</span></a></li>
+    <li><a href="tags-xmp-mediapro.html"><span>mediapro</span></a></li>
+    <li><a href="tags-xmp-expressionmedia.html"><span>expressionmedia</span></a></li>
   </ul>
 </div>
 
diff -Nru exiv2-0.19/doc/templates/Makefile exiv2-0.21/doc/templates/Makefile
--- exiv2-0.19/doc/templates/Makefile	2009-12-29 15:24:40.000000000 +0000
+++ exiv2-0.21/doc/templates/Makefile	2010-11-30 17:00:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ************************************************************* -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      Makefile
-# Version:   $Rev: 1983 $
+# Version:   $Rev: 2386 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   28-May-05, ahu: created
 #
@@ -53,6 +53,7 @@
          CanonPi \
          CanonFi \
          CanonPa \
+         CanonPr \
          Fujifilm \
          Minolta \
          MinoltaCsNew \
@@ -66,6 +67,12 @@
          NikonWt \
          NikonIi \
          NikonAf \
+         NikonAf2 \
+         NikonFi \
+         NikonMe \
+         NikonFl1 \
+         NikonFl2 \
+         NikonFl3 \
          NikonSiD80 \
          NikonSiD40 \
          NikonSiD300a \
@@ -92,8 +99,15 @@
 	 Panasonic \
          PanasonicRaw \
          Pentax \
+         Samsung2 \
          Sigma \
-         Sony
+         Sony1 \
+         SonyMinolta \
+         Sony1Cs \
+         Sony1Cs2 \
+         Sony1MltCs7D \
+         Sony1MltCsOld \
+         Sony1MltCsA100
 
 SCHEMA = xmp_dc \
          xmp_xmp \
@@ -111,8 +125,11 @@
          xmp_iptc \
          xmp_MicrosoftPhoto \
          xmp_digiKam \
+         xmp_kipi \
          xmp_iptcExt \
-         xmp_plus
+         xmp_plus \
+         xmp_mediapro \
+         xmp_expressionmedia
 
 TAGLIST = ../../src/taglist
 
diff -Nru exiv2-0.19/doc/templates/__makernotes__ exiv2-0.21/doc/templates/__makernotes__
--- exiv2-0.19/doc/templates/__makernotes__	2008-12-17 18:21:48.000000000 +0000
+++ exiv2-0.21/doc/templates/__makernotes__	2010-11-30 17:00:30.000000000 +0000
@@ -106,25 +106,6 @@
     <td>&nbsp;</td>
    </tr>
    <tr class="EvenRow"> 
-    <td>Sanyo</td>
-    <td>IFD</td>
-    <td>-</td>
-    <td>-</td>
-    <td>-</td>
-    <td><a href="#R6">[6]</a></td>
-    <td>Not supported by Exiv2 yet</td>
-   </tr>
-   <tr class="OddRow"> 
-    <td>SIGMA, FOVEON</td>
-    <td>IFD, at offset 10</td>
-    <td>&quot;SIGMA\0\0\0&quot; or &quot;FOVEON\0\0&quot; followed by two bytes 
-    of unknown meaning</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td><a href="#R7">[7]</a></td>
-    <td>&nbsp;</td>
-   </tr>
-   <tr class="EvenRow"> 
     <td>Panasonic</td>
     <td>IFD without a next-IFD pointer at offset 12</td>
     <td>&quot;Panasonic\0\0\0&quot;</td>
@@ -143,6 +124,34 @@
     <td>&nbsp;</td>
    </tr>
    <tr class="EvenRow"> 
+    <td>SAMSUNG</td>
+    <td>IFD</td>
+    <td>None</td>
+    <td>&nbsp;</td>
+    <td>Relative to the beginning of the makernote</td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+   </tr>
+   <tr class="OddRow"> 
+    <td>Sanyo</td>
+    <td>IFD</td>
+    <td>-</td>
+    <td>-</td>
+    <td>-</td>
+    <td><a href="#R6">[6]</a></td>
+    <td>Not supported by Exiv2 yet</td>
+   </tr>
+   <tr class="EvenRow"> 
+    <td>SIGMA, FOVEON</td>
+    <td>IFD, at offset 10</td>
+    <td>&quot;SIGMA\0\0\0&quot; or &quot;FOVEON\0\0&quot; followed by two bytes 
+    of unknown meaning</td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+    <td><a href="#R7">[7]</a></td>
+    <td>&nbsp;</td>
+   </tr>
+   <tr class="OddRow"> 
     <td>SONY</td>
     <td>IFD without a next-IFD pointer at offset 12</td>
     <td>&quot;SONY DSC \0\0\0&quot;</td>
@@ -151,7 +160,7 @@
     <td>&nbsp;</td>
     <td>Seen in Jpeg images, e.g., from DSC-W7, DSC-R1</td>
    </tr>
-   <tr class="OddRow"> 
+   <tr class="EvenRow"> 
     <td>SONY</td>
     <td>IFD</td>
     <td>None</td>
diff -Nru exiv2-0.19/doc/templates/tags-canon.html.in exiv2-0.21/doc/templates/tags-canon.html.in
--- exiv2-0.19/doc/templates/tags-canon.html.in	2009-12-29 15:24:40.000000000 +0000
+++ exiv2-0.21/doc/templates/tags-canon.html.in	2010-08-16 14:14:42.000000000 +0000
@@ -44,6 +44,11 @@
 __CanonFi__
 <br>
 
+<h3>Canon Processing Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonPr__
+<br>
+
 </div>
 <!-- closes content -->
 
diff -Nru exiv2-0.19/doc/templates/tags-nikon.html.in exiv2-0.21/doc/templates/tags-nikon.html.in
--- exiv2-0.19/doc/templates/tags-nikon.html.in	2009-12-29 15:24:40.000000000 +0000
+++ exiv2-0.21/doc/templates/tags-nikon.html.in	2010-05-29 07:56:31.000000000 +0000
@@ -56,6 +56,36 @@
 __NikonAf__
 <br>
 
+<h3>Nikon Auto Focus 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonAf2__
+<br>
+
+<h3>Nikon File Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFi__
+<br>
+
+<h3>Nikon Multi Exposure Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonMe__
+<br>
+
+<h3>Nikon Flash Info 1 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl1__
+<br>
+
+<h3>Nikon Flash Info 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl2__
+<br>
+
+<h3>Nikon Flash Info 3 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl3__
+<br>
+
 <h3>Nikon Shot Info D80 Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __NikonSiD80__
diff -Nru exiv2-0.19/doc/templates/tags-samsung.html.in exiv2-0.21/doc/templates/tags-samsung.html.in
--- exiv2-0.19/doc/templates/tags-samsung.html.in	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/doc/templates/tags-samsung.html.in	2010-11-30 17:00:30.000000000 +0000
@@ -0,0 +1,19 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+<h2>Samsung MakerNote Tags defined in Exiv2</h2>
+<div>
+<p>Tags found in the MakerNote of images taken with Samsung cameras.</a>.</p> 
+<p>Click on a column header to sort the table.</p>
+</div>
+__Samsung2__
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff -Nru exiv2-0.19/doc/templates/tags-sony.html.in exiv2-0.21/doc/templates/tags-sony.html.in
--- exiv2-0.19/doc/templates/tags-sony.html.in	2005-06-04 07:53:58.000000000 +0000
+++ exiv2-0.21/doc/templates/tags-sony.html.in	2010-05-29 07:56:31.000000000 +0000
@@ -7,10 +7,48 @@
 __index1__
 __index2__
 <h2>Sony MakerNote Tags defined in Exiv2</h2>
-<p>Tags found in the MakerNote of images taken with Sony cameras. Not much is known about the contents of the Sony makernote tags. They appear to be chunks of binary data and I am not aware of any description of this information.</p> 
+<div>
+<p>Tags found in the MakerNote of images taken with Sony cameras.</p> 
 <p>Click on a column header to sort the table.</p>
+</div>
+__Sony1__
+<br>
+
+<h3>Sony Minolta Tags</h3>
+<p>These are the same tags as found in the Minolta MakerNote. 
+In Sony images the group name is <b><code>SonyMinolta</code></b>.</p>
+<p>Click on a column header to sort the table.</p>
+__SonyMinolta__
+<br>
+
+<h3>Sony Camera Settings Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__Sony1Cs__
+<br>
+
+<h3>Sony Camera Settings 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__Sony1Cs2__
+<br>
+
+<h3>Sony Minolta Camera Settings Tags</h3>
+<p>These are the same tags as the Minolta Camera Settings in the Minolta MakerNote. 
+In Sony images the group name is <b><code>Sony1MltCsOld</code></b> or <b><code>Sony1MltCsNew</code></b>.</p>
+<p>Click on a column header to sort the table.</p>
+__Sony1MltCsOld__
+<br>
 
-__Sony__
+<h3>Sony Minolta Camera Settings 7D Tags</h3>
+<p>These are the same tags as the Minolta 7D Camera Settings in the Minolta MakerNote. 
+In Sony images the group name is <b><code>Sony1MltCs7D</code></b>.</p>
+<p>Click on a column header to sort the table.</p>
+__Sony1MltCs7D__
+<br>
+
+<h3>Sony Minolta Camera Settings A100 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__Sony1MltCsA100__
+<br>
 
 </div>
 <!-- closes content -->
diff -Nru exiv2-0.19/doc/templates/tags-xmp-expressionmedia.html.in exiv2-0.21/doc/templates/tags-xmp-expressionmedia.html.in
--- exiv2-0.19/doc/templates/tags-xmp-expressionmedia.html.in	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/doc/templates/tags-xmp-expressionmedia.html.in	2010-05-29 13:43:37.000000000 +0000
@@ -0,0 +1,28 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+
+<h2>Microsoft Expression Media schema</h2>
+<p>This is the Microsoft badged version of the 
+   <a href="tags-xmp-mediapro.html" title="iView Media Pro schema">iView Media Pro schema</a>.
+ <ul>
+  <li>Exiv2 keys are <b><code>Xmp.expressionmedia.&lt;Property&gt;</code></b></li>
+  <li>The schema namespace URI is <b><code>http://ns.microsoft.com/expressionmedia/1.0/</code></b></li>
+  <li>The preferred schema namespace prefix is <b><code>expressionmedia</code></b></li>
+ </ul>
+Reference: ?</p>
+
+<p>Click on a column header to sort the table.</p>
+
+__xmp_expressionmedia__
+
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff -Nru exiv2-0.19/doc/templates/tags-xmp-kipi.html.in exiv2-0.21/doc/templates/tags-xmp-kipi.html.in
--- exiv2-0.19/doc/templates/tags-xmp-kipi.html.in	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/doc/templates/tags-xmp-kipi.html.in	2010-05-29 13:43:37.000000000 +0000
@@ -0,0 +1,27 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+
+<h2>KDE Image Program Interface schema</h2>
+<p>KDE Image Program Interface schema tags, used by digiKam kipi-plugins.
+ <ul>
+  <li>Exiv2 keys are <b><code>Xmp.kipi.&lt;Property&gt;</code></b></li>
+  <li>The schema namespace URI is <b><code>http://www.digikam.org/ns/kipi/1.0/</code></b></li>
+  <li>The preferred schema namespace prefix is <b><code>kipi</code></b></li>
+ </ul>
+Reference: ?</p>
+
+<p>Click on a column header to sort the table.</p>
+
+__xmp_kipi__
+
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff -Nru exiv2-0.19/doc/templates/tags-xmp-mediapro.html.in exiv2-0.21/doc/templates/tags-xmp-mediapro.html.in
--- exiv2-0.19/doc/templates/tags-xmp-mediapro.html.in	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/doc/templates/tags-xmp-mediapro.html.in	2010-05-29 13:43:37.000000000 +0000
@@ -0,0 +1,28 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+
+<h2>iView Media Pro schema</h2>
+<p>iView Media Pro schema tags. See also its successor, the
+   <a href="tags-xmp-expressionmedia.html" title="Microsoft Expression Media schema">Microsoft Expression Media schema</a>.
+ <ul>
+  <li>Exiv2 keys are <b><code>Xmp.mediapro.&lt;Property&gt;</code></b></li>
+  <li>The schema namespace URI is <b><code>http://ns.iview-multimedia.com/mediapro/1.0/</code></b></li>
+  <li>The preferred schema namespace prefix is <b><code>mediapro</code></b></li>
+ </ul>
+Reference: ?</p>
+
+<p>Click on a column header to sort the table.</p>
+
+__xmp_mediapro__
+
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff -Nru exiv2-0.19/msvc/addmoddel/addmoddel.vcproj exiv2-0.21/msvc/addmoddel/addmoddel.vcproj
--- exiv2-0.19/msvc/addmoddel/addmoddel.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/addmoddel/addmoddel.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/addmoddel.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -151,9 +151,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
 				SubSystem="1"
@@ -241,9 +241,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/addmoddel.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -331,9 +331,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/addmoddel.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
diff -Nru exiv2-0.19/msvc/convert-test/convert-test.vcproj exiv2-0.21/msvc/convert-test/convert-test.vcproj
--- exiv2-0.19/msvc/convert-test/convert-test.vcproj	2009-05-31 18:02:43.000000000 +0000
+++ exiv2-0.21/msvc/convert-test/convert-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="convert-test"
-	ProjectGUID="{2F4235D0-B5F5-4C59-981D-BA006734B56E}"
+	ProjectGUID="{610E69BF-9FB7-4A63-AFB5-88C2BA4BE6C1}"
 	RootNamespace="convert-test"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/convert-test.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -151,9 +151,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
 				SubSystem="1"
@@ -241,9 +241,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/convert-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -331,9 +331,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/convert-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
diff -Nru exiv2-0.19/msvc/exifcomment/exifcomment.vcproj exiv2-0.21/msvc/exifcomment/exifcomment.vcproj
--- exiv2-0.19/msvc/exifcomment/exifcomment.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/exifcomment/exifcomment.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/exifcomment.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -150,9 +150,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -239,9 +239,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/exifcomment.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -329,9 +329,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/exifcomment.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
diff -Nru exiv2-0.19/msvc/exifdata-test/exifdata-test.vcproj exiv2-0.21/msvc/exifdata-test/exifdata-test.vcproj
--- exiv2-0.19/msvc/exifdata-test/exifdata-test.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/exifdata-test/exifdata-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -62,9 +62,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/exifdata-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -141,9 +141,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/exifdata-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -227,9 +227,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/exifdata-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -312,7 +312,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/exifdata-test.exe"
diff -Nru exiv2-0.19/msvc/exifprint/exifprint.vcproj exiv2-0.21/msvc/exifprint/exifprint.vcproj
--- exiv2-0.19/msvc/exifprint/exifprint.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/exifprint/exifprint.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/exifprint.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -148,9 +148,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/exifprint.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -238,9 +238,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/exifprint.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/exifprint.exe"
diff -Nru exiv2-0.19/msvc/exiv2/exiv2.vcproj exiv2-0.21/msvc/exiv2/exiv2.vcproj
--- exiv2-0.19/msvc/exiv2/exiv2.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/exiv2/exiv2.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/exiv2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -149,9 +149,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/exiv2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -240,9 +240,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/exiv2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -329,9 +329,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/exiv2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
diff -Nru exiv2-0.19/msvc/exiv2lib/exiv2lib.vcproj exiv2-0.21/msvc/exiv2lib/exiv2lib.vcproj
--- exiv2-0.19/msvc/exiv2lib/exiv2lib.vcproj	2009-12-27 09:56:29.000000000 +0000
+++ exiv2-0.21/msvc/exiv2lib/exiv2lib.vcproj	2010-10-05 01:15:22.000000000 +0000
@@ -5,190 +5,240 @@
 	Name="exiv2lib"
 	ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}"
 	RootNamespace="exiv2lib"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			TargetName="exiv2sd"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
 				PreprocessorDefinitions="WIN32;_DEBUG"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/exiv2.lib"
-				AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32\bin\debug"/>
+				WarnAsError="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..\bin\Debug\
-copy/y &quot;$(TargetPath)&quot; ..\bin\Debug\$(TargetFileName)
-"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/exiv2sd.lib"
+				AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32\bin\debug"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+				Description="create the bin (delivery) directory"
+				CommandLine="mkdir ..\bin\Debug\&#x0D;&#x0A;copy/y &quot;$(TargetPath)&quot; ..\bin\Debug\$(TargetFileName)&#x0D;&#x0A;"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			TargetName="exiv2s"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="copy expat and zlib binaries"
+				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
 				PreprocessorDefinitions="WIN32;_NDEBUG"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="TRUE"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/exiv2.lib"
-				AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32\bin\release"/>
+				WarnAsError="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-				Description="create the bin (delivery) directory"
-				CommandLine="mkdir ..\bin\Release\
-copy/y &quot;$(TargetPath)&quot; ..\bin\$(ConfigurationName)\$(TargetFileName)
-
-"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"
-				Description="copy expat and zlib binaries"
-				CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-
-"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/exiv2s.lib"
+				AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32\bin\release"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+				Description="create the bin (delivery) directory"
+				CommandLine="mkdir ..\bin\Release\&#x0D;&#x0A;copy/y &quot;$(TargetPath)&quot; ..\bin\$(ConfigurationName)\$(TargetFileName)&#x0D;&#x0A;&#x0D;&#x0A;"
+			/>
 		</Configuration>
 		<Configuration
 			Name="DebugDLL|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			TargetName="exiv2d"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="copy expat and zlib dlls"
+				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;copy/y ..\..\..\expat-2.0.1\win32\bin\Debug\libexpat.dll $(OutDir)&#x0D;&#x0A;copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir)&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
 				PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
-				WarnAsError="FALSE"
-				DebugInformationFormat="3"/>
+				WarnAsError="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBMTD"
 				AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
-				OutputFile="$(OutDir)\exiv2.dll"
-				GenerateDebugInformation="TRUE"
-				ImportLibrary="$(TargetDir)\exiv2.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="copy expat and zlib dlls"
-				CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-copy/y ..\..\..\expat-2.0.1\win32\bin\Debug\libexpat.dll $(OutDir)
-copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir)
-"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				OutputFile="$(OutDir)\exiv2d.dll"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)\exiv2d.lib"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="create the bin (delivery) directorie"
@@ -200,63 +250,81 @@
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			TargetName="exiv2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="copy expat and zlib dlls"
+				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;copy/y ..\..\..\expat-2.0.1\win32\bin\Release\*.dll $(OutDir)&#x0D;&#x0A;copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.dll $(OutDir)&#x0D;&#x0A;&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				AdditionalIncludeDirectories="../include;../include/exiv2;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
 				PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
-				WarnAsError="FALSE"
-				DebugInformationFormat="3"/>
+				WarnAsError="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)\exiv2.dll"
-				GenerateDebugInformation="FALSE"
+				GenerateDebugInformation="false"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(TargetDir)\exiv2.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="copy expat and zlib dlls"
-				CommandLine="if exist ..\include\exiv2 goto :jail
-mkdir ..\include\exiv2\
-copy/y ..\..\src\*.h ..\include\exiv2\
-copy/y ..\..\src\*.hpp ..\include\exiv2\
-cd ..\include\exiv2
-del *_int.hpp
-cd ..\..\exiv2lib
-:jail
-copy/y ..\..\..\expat-2.0.1\win32\bin\Release\*.dll $(OutDir)
-copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.dll $(OutDir)
-
-"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="create the bin (delivery) directory"
@@ -270,308 +338,371 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath="..\..\src\basicio.cpp">
+				RelativePath="..\..\src\basicio.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\bmpimage.cpp">
+				RelativePath="..\..\src\bmpimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\canonmn.cpp">
+				RelativePath="..\..\src\canonmn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\convert.cpp">
+				RelativePath="..\..\src\convert.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\cr2image.cpp">
+				RelativePath="..\..\src\cr2image.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\crwimage.cpp">
+				RelativePath="..\..\src\crwimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\datasets.cpp">
+				RelativePath="..\..\src\datasets.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\easyaccess.cpp">
+				RelativePath="..\..\src\easyaccess.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\error.cpp">
+				RelativePath="..\..\src\error.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\exif.cpp">
+				RelativePath="..\..\src\exif.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\fujimn.cpp">
+				RelativePath="..\..\src\fujimn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\futils.cpp">
+				RelativePath="..\..\src\futils.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\gifimage.cpp">
+				RelativePath="..\..\src\gifimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\image.cpp">
+				RelativePath="..\..\src\image.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\iptc.cpp">
+				RelativePath="..\..\src\iptc.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\jp2image.cpp">
+				RelativePath="..\..\src\jp2image.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\jpgimage.cpp">
+				RelativePath="..\..\src\jpgimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\localtime.c">
+				RelativePath="..\..\src\localtime.c"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\makernote.cpp">
+				RelativePath="..\..\src\makernote.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\metadatum.cpp">
+				RelativePath="..\..\src\metadatum.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\minoltamn.cpp">
+				RelativePath="..\..\src\minoltamn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\mrwimage.cpp">
+				RelativePath="..\..\src\mrwimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\nikonmn.cpp">
+				RelativePath="..\..\src\nikonmn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\olympusmn.cpp">
+				RelativePath="..\..\src\olympusmn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\orfimage.cpp">
+				RelativePath="..\..\src\orfimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\panasonicmn.cpp">
+				RelativePath="..\..\src\panasonicmn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\pentaxmn.cpp">
+				RelativePath="..\..\src\pentaxmn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\pgfimage.cpp">
+				RelativePath="..\..\src\pgfimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\pngchunk.cpp">
+				RelativePath="..\..\src\pngchunk.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						GeneratePreprocessedFile="0"/>
+						GeneratePreprocessedFile="0"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\pngimage.cpp">
+				RelativePath="..\..\src\pngimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\preview.cpp">
+				RelativePath="..\..\src\preview.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\properties.cpp">
+				RelativePath="..\..\src\properties.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\psdimage.cpp">
+				RelativePath="..\..\src\psdimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\rafimage.cpp">
+				RelativePath="..\..\src\rafimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\rw2image.cpp">
+				RelativePath="..\..\src\rw2image.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\sigmamn.cpp">
+				RelativePath="..\..\src\samsungmn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\sonymn.cpp">
+				RelativePath="..\..\src\sigmamn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tags.cpp">
+				RelativePath="..\..\src\sonymn.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tgaimage.cpp">
+				RelativePath="..\..\src\tags.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tiffcomposite.cpp">
+				RelativePath="..\..\src\tgaimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tiffimage.cpp">
+				RelativePath="..\..\src\tiffcomposite.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tiffvisitor.cpp">
+				RelativePath="..\..\src\tiffimage.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\types.cpp">
+				RelativePath="..\..\src\tiffvisitor.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\value.cpp">
+				RelativePath="..\..\src\types.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\xmp.cpp">
+				RelativePath="..\..\src\value.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\xmpsidecar.cpp">
+				RelativePath="..\..\src\xmp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xmpsidecar.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\..\src\basicio.hpp">
-			</File>
-			<File
-				RelativePath="..\..\src\bmpimage.hpp">
-			</File>
-			<File
-				RelativePath="..\..\src\canonmn.hpp">
-			</File>
-			<File
-				RelativePath="..\..\config.h">
-			</File>
-			<File
-				RelativePath="..\..\src\convert.hpp">
-			</File>
-			<File
-				RelativePath="..\..\src\cr2image.hpp">
-			</File>
-			<File
-				RelativePath="..\..\src\crwimage.hpp">
-			</File>
-			<File
-				RelativePath="..\..\src\datasets.hpp">
-			</File>
-			<File
-				RelativePath="..\..\src\easyaccess.hpp">
-			</File>
-			<File
-				RelativePath="..\..\src\error.hpp">
-			</File>
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath="..\..\src\exif.hpp">
+				RelativePath="..\..\src\basicio.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\fujimn.hpp">
+				RelativePath="..\..\src\bmpimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\futils.hpp">
+				RelativePath="..\..\config.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\gifimage.hpp">
+				RelativePath="..\..\src\convert.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\image.hpp">
+				RelativePath="..\..\src\cr2image.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\iptc.hpp">
+				RelativePath="..\..\src\crwimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\jp2image.hpp">
+				RelativePath="..\..\src\datasets.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\jpgimage.hpp">
+				RelativePath="..\..\src\easyaccess.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\makernote.hpp">
+				RelativePath="..\..\src\error.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\metadatum.hpp">
+				RelativePath="..\..\src\exif.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\minoltamn.hpp">
+				RelativePath="..\..\src\futils.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\mn.hpp">
+				RelativePath="..\..\src\gifimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\mrwimage.hpp">
+				RelativePath="..\..\src\image.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\nikonmn.hpp">
+				RelativePath="..\..\src\iptc.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\olympusmn.hpp">
+				RelativePath="..\..\src\jp2image.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\orfimage.hpp">
+				RelativePath="..\..\src\jpgimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\panasonicmn.hpp">
+				RelativePath="..\..\src\makernote.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\pentaxmn.hpp">
+				RelativePath="..\..\src\metadatum.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\pgfimage.hpp">
+				RelativePath="..\..\src\mrwimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\pngimage.hpp">
+				RelativePath="..\..\src\orfimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\preview.hpp">
+				RelativePath="..\..\src\pgfimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\properties.hpp">
+				RelativePath="..\..\src\pngimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\psdimage.hpp">
+				RelativePath="..\..\src\preview.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\rafimage.hpp">
+				RelativePath="..\..\src\properties.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\rcsid.hpp">
+				RelativePath="..\..\src\psdimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\rw2image.hpp">
+				RelativePath="..\..\src\rafimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\sigmamn.hpp">
+				RelativePath="..\..\src\rcsid.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\sonymn.hpp">
+				RelativePath="..\..\src\rw2image.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tags.hpp">
+				RelativePath="..\..\src\tags.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tgaimage.hpp">
+				RelativePath="..\..\src\tgaimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tiffcomposite.hpp">
+				RelativePath="..\..\src\tiffcomposite.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tiffimage.hpp">
+				RelativePath="..\..\src\tiffimage.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\tiffvisitor.hpp">
+				RelativePath="..\..\src\tiffvisitor.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\types.hpp">
+				RelativePath="..\..\src\types.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\value.hpp">
+				RelativePath="..\..\src\value.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\xmp.hpp">
+				RelativePath="..\..\src\xmp.hpp"
+				>
 			</File>
 			<File
-				RelativePath="..\..\src\xmpsidecar.hpp">
+				RelativePath="..\..\src\xmpsidecar.hpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 		</Filter>
 		<Filter
 			Name="MSVC-only"
-			Filter="">
+			>
 			<File
-				RelativePath="..\include\exv_msvc.h">
+				RelativePath="..\include\exv_msvc.h"
+				>
 			</File>
 		</Filter>
 	</Files>
diff -Nru exiv2-0.19/msvc/exivsimple/exivsimple.cpp exiv2-0.21/msvc/exivsimple/exivsimple.cpp
--- exiv2-0.19/msvc/exivsimple/exivsimple.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/msvc/exivsimple/exivsimple.cpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  * 
  * This program is part of the Exiv2 distribution.
  *
@@ -20,7 +20,7 @@
  */
 /*
   File:      exivsimple.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2045 $
   Author(s): Brad Schick <brad@robotbattle.com>
              Christian Kuster <christian@kusti.ch>
   History:   12-Nov-04, brad: created
diff -Nru exiv2-0.19/msvc/exivsimple/exivsimple.vcproj exiv2-0.21/msvc/exivsimple/exivsimple.vcproj
--- exiv2-0.19/msvc/exivsimple/exivsimple.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/exivsimple/exivsimple.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/exivsimple.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -151,9 +151,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/exivsimple.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -242,9 +242,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/exivsimple.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -332,9 +332,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/exivsimple.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
diff -Nru exiv2-0.19/msvc/include/exv_msvc.h exiv2-0.21/msvc/include/exv_msvc.h
--- exiv2-0.19/msvc/include/exv_msvc.h	2009-12-29 13:29:21.000000000 +0000
+++ exiv2-0.21/msvc/include/exv_msvc.h	2010-08-15 15:09:00.000000000 +0000
@@ -2,7 +2,7 @@
 /*!
   @file    exv_msvc.h
   @brief   Configuration settings for MSVC
-  @version $Rev: 1981 $
+  @version $Rev: 2320 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    07-Feb-04, ahu: created
@@ -23,13 +23,13 @@
 #define EXV_PACKAGE_NAME "exiv2"
 
 /* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "exiv2 0.19"
+#define EXV_PACKAGE_STRING "exiv2 0.21"
 
 /* Define to the one symbol short name of this package. */
 #define EXV_PACKAGE_TARNAME "exiv2"
 
 /* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.19"
+#define EXV_PACKAGE_VERSION "0.21"
 
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 typedef int pid_t;
diff -Nru exiv2-0.19/msvc/iotest/iotest.vcproj exiv2-0.21/msvc/iotest/iotest.vcproj
--- exiv2-0.19/msvc/iotest/iotest.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/iotest/iotest.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -65,9 +65,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/iotest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -146,9 +146,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/iotest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -235,9 +235,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/iotest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/iotest.exe"
diff -Nru exiv2-0.19/msvc/iptceasy/iptceasy.vcproj exiv2-0.21/msvc/iptceasy/iptceasy.vcproj
--- exiv2-0.19/msvc/iptceasy/iptceasy.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/iptceasy/iptceasy.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -65,9 +65,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/iptceasy.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -146,9 +146,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/iptceasy.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -235,9 +235,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/iptceasy.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/iptceasy.exe"
diff -Nru exiv2-0.19/msvc/iptcprint/iptcprint.vcproj exiv2-0.21/msvc/iptcprint/iptcprint.vcproj
--- exiv2-0.19/msvc/iptcprint/iptcprint.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/iptcprint/iptcprint.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -65,9 +65,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/iptcprint.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -146,9 +146,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/iptcprint.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -235,9 +235,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/iptcprint.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/iptcprint.exe"
diff -Nru exiv2-0.19/msvc/iptctest/iptctest.vcproj exiv2-0.21/msvc/iptctest/iptctest.vcproj
--- exiv2-0.19/msvc/iptctest/iptctest.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/iptctest/iptctest.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -65,9 +65,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/iptctest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -147,9 +147,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/iptctest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -236,9 +236,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/iptctest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -324,7 +324,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/iptctest.exe"
diff -Nru exiv2-0.19/msvc/largeiptc-test/largeiptc-test.vcproj exiv2-0.21/msvc/largeiptc-test/largeiptc-test.vcproj
--- exiv2-0.19/msvc/largeiptc-test/largeiptc-test.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/largeiptc-test/largeiptc-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -65,9 +65,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/largeiptc-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -146,9 +146,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/largeiptc-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -235,9 +235,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/largeiptc-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -323,7 +323,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/largeiptc-test.exe"
diff -Nru exiv2-0.19/msvc/metacopy/metacopy.vcproj exiv2-0.21/msvc/metacopy/metacopy.vcproj
--- exiv2-0.19/msvc/metacopy/metacopy.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/metacopy/metacopy.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/metacopy.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -148,9 +148,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/metacopy.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -238,9 +238,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/metacopy.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/metacopy.exe"
diff -Nru exiv2-0.19/msvc/mmap-test/mmap-test.vcproj exiv2-0.21/msvc/mmap-test/mmap-test.vcproj
--- exiv2-0.19/msvc/mmap-test/mmap-test.vcproj	2009-05-31 04:02:44.000000000 +0000
+++ exiv2-0.21/msvc/mmap-test/mmap-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/mmap-test.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -151,9 +151,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
 				SubSystem="1"
@@ -241,9 +241,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/mmap-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -331,9 +331,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/mmap-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
diff -Nru exiv2-0.19/msvc/organize/organize.vcproj exiv2-0.21/msvc/organize/organize.vcproj
--- exiv2-0.19/msvc/organize/organize.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/organize/organize.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -65,8 +65,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(BOOST_ROOT)\lib "
 				GenerateDebugInformation="true"
@@ -148,8 +149,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(BOOST_ROOT)\lib "
 				GenerateDebugInformation="true"
@@ -235,8 +237,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(BOOST_ROOT)\lib "
 				GenerateDebugInformation="true"
@@ -320,6 +323,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				LinkIncremental="1"
diff -Nru exiv2-0.19/msvc/prevtest/prevtest.vcproj exiv2-0.21/msvc/prevtest/prevtest.vcproj
--- exiv2-0.19/msvc/prevtest/prevtest.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/prevtest/prevtest.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/prevtest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -148,9 +148,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/prevtest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -238,9 +238,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/prevtest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/prevtest.exe"
diff -Nru exiv2-0.19/msvc/README-MSVC.txt exiv2-0.21/msvc/README-MSVC.txt
--- exiv2-0.19/msvc/README-MSVC.txt	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/msvc/README-MSVC.txt	2010-07-20 04:38:47.000000000 +0000
@@ -5,15 +5,20 @@
 -----
 
 Created With:   VC9    (VS/2008 Std)
-Tested  With:   VC7.1, VC8 Pro +SP1, VC9Std and VC9Express
-               (VC7.1 = VS/2003 .Net; VC8 = VS/2005; VC9 = VS/2008)
+Tested  With:   VC7.1, VC8 Pro +SP1, VC9Std running Windows/XP 32bit)
+                VC10 run on Windows/7 64bit, and Windows/XP 32bit
+               (VC7.1 = VS/2003 .Net; VC8 = VS/2005; VC9 = VS/2008; VC10 = VS/2010)
+               
+VC10/VS 2010 requires a project change which the conversion wizard doesn't handle.  See below.
+              
+All builds are 32 bit.  There is no DevStudio support for 64bit builds of Exiv2 and dependancies.
 
 1)  Build environments (solution files)
     exiv2.sln           - this builds the exiv2 libraries   (static and dynamic)
                           and the utility and test programs (exiv2.exe, exifprint.exe)
                           
                           DEPENDS on zlib and expat-2.0.1
-                          Builds with VC9,VC8 and VC7.1
+                          Builds with VC9,VC8 and VC7.1, VC10
             
     exiv2+organize.sln  - builds the same targets as exiv2
                           PLUS the organize.exe command-line program
@@ -24,6 +29,27 @@
                           
                           set Environment string BOOST_ROOT=c:\boost_1_37_0
 
+Notes for DevStudio 2010 Users
+------------------------------
+
+A new setting "TargetName"=$(ProjectName) has been added to DevStudio 2010.  There is only one project impacted by this:
+
+Select Project "exiv2lib" in Project Explorer.  Right-Click/Properties
+
++ Configuration Properties\General
+
+exiv2lib.vcproj
+Target Name | exiv2sd		Debug
+			| exiv2d		DebugDLL
+			| exiv2s		Release
+			| exiv2       	ReleaseDLL
+
+If you don't add these setting, you will get 1,000s of errors.  The damming error concerns:
+"Name of output is not equal to target name"  (or something obscure such as this).
+
+This matter has been reported to Microsoft.
+http://msdn.microsoft.com/EN-US/library/E0846D4D-2CE1-48E3-B219-674FF070BF4E#11
+
 How to build and test exiv2 (with/without organize.exe)
 -------------------------------------------------------
 
@@ -109,7 +135,8 @@
     metacopy.exe: Read and write files must be specified
     bla bla white sheep......
 
-    C:\gnu\exiv2\msvc>diff.exe   runner.txt new.txt
+    C:\gnu\exiv2\msvc>diff.exe   runner.txt  new.txt (Windows/XP)
+    C:\gnu\exiv2\msvc>diff.exe   runner7.txt new.txt (Windows/7)
     --- no differences should be reported --
     
     The test takes less than 1 minute and runs 200+ different test programs.
@@ -264,14 +291,14 @@
 
 a) DLLs + MD build and work
 
-DebugDLL| ReleaseDLL = MD{d}  : link exiv2.lib, xmpsdk.lib, libexpat.lib and zlib1{d}.lib
-          Runtime DLLS        :      exiv2.dll, libexpat.dll, zlib1{d}.dll and MSVC{R|P}{_0D.dll)
+DebugDLL| ReleaseDLL = MD{d}  : link exiv2{d}.lib, xmpsdk.lib, libexpat.lib and zlib1{d}.lib
+          Runtime DLLS        :      exiv2{d}.dll, libexpat.dll, zlib1{d}.dll and MSVC{R|P}{_0D.dll)
           _ = 7 for VS2003, 8 for VS2005 and 9 for VS2008
           The MSVC*.dll's are on most machines and a free download from Microsoft
                         
 b) Static + MT build and work
 
-Debug | Release      = MT{d} :  link exiv2.lib, libexpatMT.lib, zlib{d}.lib xmpsdk.lib 
+Debug | Release      = MT{d} :  link exiv2s{d}.lib, libexpatMT.lib, zlib{d}.lib xmpsdk.lib 
           Runtime DLLs       : none
 
 c) Static + MD will work (but not built)
@@ -287,6 +314,7 @@
 
 This is not a bug.  There is no workaround.
 
+
 Bugs
 ----
 
diff -Nru exiv2-0.19/msvc/runner7.txt exiv2-0.21/msvc/runner7.txt
--- exiv2-0.19/msvc/runner7.txt	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/msvc/runner7.txt	2010-07-20 04:38:47.000000000 +0000
@@ -0,0 +1,7026 @@
+Usage: bin\Debug\addmoddel.exe file
+Usage: bin\Debug\convert-test.exe file
+Usage: bin\Debug\exifcomment.exe file
+Usage: bin\Debug\exifdata-test.exe file
+Usage: bin\Debug\exifprint.exe file
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: bin\Debug\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: bin\Debug\iptceasy.exe file
+Usage: bin\Debug\iptcprint.exe file
+Usage: bin\Debug\iptctest.exe image
+Commands read from stdin.
+Usage: bin\Debug\largeiptc-test.exe image datafile
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+Usage: bin\Debug\mmap-test.exe file
+Usage: bin\Debug\prevtest.exe file
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+Usage: bin\Debug\tiff-test.exe file
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: bin\Debug\write2-test.exe file
+Usage: bin\Debug\xmpparse.exe file
+Usage: bin\Debug\xmpparser-test.exe file
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Usage: bin\DebugDLL\addmoddel.exe file
+Usage: bin\DebugDLL\convert-test.exe file
+Usage: bin\DebugDLL\exifcomment.exe file
+Usage: bin\DebugDLL\exifdata-test.exe file
+Usage: bin\DebugDLL\exifprint.exe file
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: bin\DebugDLL\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: bin\DebugDLL\iptceasy.exe file
+Usage: bin\DebugDLL\iptcprint.exe file
+Usage: bin\DebugDLL\iptctest.exe image
+Commands read from stdin.
+Usage: bin\DebugDLL\largeiptc-test.exe image datafile
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+Usage: bin\DebugDLL\mmap-test.exe file
+Usage: bin\DebugDLL\prevtest.exe file
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+Usage: bin\DebugDLL\tiff-test.exe file
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: bin\DebugDLL\write2-test.exe file
+Usage: bin\DebugDLL\xmpparse.exe file
+Usage: bin\DebugDLL\xmpparser-test.exe file
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Usage: bin\Release\addmoddel.exe file
+Usage: bin\Release\convert-test.exe file
+Usage: bin\Release\exifcomment.exe file
+Usage: bin\Release\exifdata-test.exe file
+Usage: bin\Release\exifprint.exe file
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: bin\Release\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: bin\Release\iptceasy.exe file
+Usage: bin\Release\iptcprint.exe file
+Usage: bin\Release\iptctest.exe image
+Commands read from stdin.
+Usage: bin\Release\largeiptc-test.exe image datafile
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+Usage: bin\Release\mmap-test.exe file
+Usage: bin\Release\prevtest.exe file
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+Usage: bin\Release\tiff-test.exe file
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: bin\Release\write2-test.exe file
+Usage: bin\Release\xmpparse.exe file
+Usage: bin\Release\xmpparser-test.exe file
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Usage: bin\ReleaseDLL\addmoddel.exe file
+Usage: bin\ReleaseDLL\convert-test.exe file
+Usage: bin\ReleaseDLL\exifcomment.exe file
+Usage: bin\ReleaseDLL\exifdata-test.exe file
+Usage: bin\ReleaseDLL\exifprint.exe file
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: bin\ReleaseDLL\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: bin\ReleaseDLL\iptceasy.exe file
+Usage: bin\ReleaseDLL\iptcprint.exe file
+Usage: bin\ReleaseDLL\iptctest.exe image
+Commands read from stdin.
+Usage: bin\ReleaseDLL\largeiptc-test.exe image datafile
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+Usage: bin\ReleaseDLL\mmap-test.exe file
+Usage: bin\ReleaseDLL\prevtest.exe file
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+Usage: bin\ReleaseDLL\tiff-test.exe file
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: bin\ReleaseDLL\write2-test.exe file
+Usage: bin\ReleaseDLL\xmpparse.exe file
+Usage: bin\ReleaseDLL\xmpparser-test.exe file
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Usage: addmoddel\Debug\addmoddel.exe file
+Usage: addmoddel\DebugDLL\addmoddel.exe file
+Usage: addmoddel\Release\addmoddel.exe file
+Usage: addmoddel\ReleaseDLL\addmoddel.exe file
+Usage: convert-test\Debug\convert-test.exe file
+Usage: convert-test\DebugDLL\convert-test.exe file
+Usage: convert-test\Release\convert-test.exe file
+Usage: convert-test\ReleaseDLL\convert-test.exe file
+Usage: exifcomment\Debug\exifcomment.exe file
+Usage: exifcomment\DebugDLL\exifcomment.exe file
+Usage: exifcomment\Release\exifcomment.exe file
+Usage: exifcomment\ReleaseDLL\exifcomment.exe file
+Usage: tiff-test\Debug\tiff-test.exe file
+Usage: tiff-test\DebugDLL\tiff-test.exe file
+Usage: tiff-test\Release\tiff-test.exe file
+Usage: tiff-test\ReleaseDLL\tiff-test.exe file
+Usage: exifdata-test\Debug\exifdata-test.exe file
+Usage: exifdata-test\DebugDLL\exifdata-test.exe file
+Usage: exifdata-test\Release\exifdata-test.exe file
+Usage: exifdata-test\ReleaseDLL\exifdata-test.exe file
+Usage: exifprint\Debug\exifprint.exe file
+Usage: exifprint\DebugDLL\exifprint.exe file
+Usage: exifprint\Release\exifprint.exe file
+Usage: exifprint\ReleaseDLL\exifprint.exe file
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: exiv2.exe [ options ] [ action ] file ...
+
+Manipulate the Exif metadata of images.
+Usage: iotest\Debug\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: iotest\DebugDLL\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: iotest\Release\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: iotest\ReleaseDLL\iotest.exe filein fileout1 fileout2
+fileouts are overwritten and should match filein exactly
+Usage: iptceasy\Debug\iptceasy.exe file
+Usage: iptceasy\DebugDLL\iptceasy.exe file
+Usage: iptceasy\Release\iptceasy.exe file
+Usage: iptceasy\ReleaseDLL\iptceasy.exe file
+Usage: iptcprint\Debug\iptcprint.exe file
+Usage: iptcprint\DebugDLL\iptcprint.exe file
+Usage: iptcprint\Release\iptcprint.exe file
+Usage: iptcprint\ReleaseDLL\iptcprint.exe file
+Usage: iptctest\Debug\iptctest.exe image
+Commands read from stdin.
+Usage: iptctest\DebugDLL\iptctest.exe image
+Commands read from stdin.
+Usage: iptctest\Release\iptctest.exe image
+Commands read from stdin.
+Usage: iptctest\ReleaseDLL\iptctest.exe image
+Commands read from stdin.
+Usage: largeiptc-test\Debug\largeiptc-test.exe image datafile
+Usage: largeiptc-test\DebugDLL\largeiptc-test.exe image datafile
+Usage: largeiptc-test\Release\largeiptc-test.exe image datafile
+Usage: largeiptc-test\ReleaseDLL\largeiptc-test.exe image datafile
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+Usage: mmap-test\ReleaseDLL\mmap-test.exe file
+Usage: mmap-test\Debug\mmap-test.exe file
+Usage: mmap-test\DebugDLL\mmap-test.exe file
+Usage: mmap-test\Release\mmap-test.exe file
+
+Reads and writes raw metadata. Use -h option for help.
+Usage: metacopy.exe [-iecaph] readfile writefile
+Usage: prevtest\Debug\prevtest.exe file
+Usage: prevtest\DebugDLL\prevtest.exe file
+Usage: prevtest\Release\prevtest.exe file
+Usage: prevtest\ReleaseDLL\prevtest.exe file
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+string      long        float       Rational    
+True        1           1           1/1
+False       0           0           0/1
+t           1           1           1/1
+f           0           0           0/1
+-1          -1          -1          -1/1
+0           0           0           0/1
+1           1           1           1/1
+0.0         0           0           0/1
+0.1         0           0.1         1/10
+0.01        0           0.01        1/100
+0.001       0           0.001       1/1000
+-1.49999    -1          -1.49999    -149999/100000
+-1.5        -1          -1.5        -3/2
+1.49999     1           1.49999     149999/100000
+1.5         1           1.5         3/2
+0/1         0           0           0/1
+1/1         1           1           1/1
+1/3         0           0.333333    1/3
+-1/3        0           -0.333333   -1/3
+4/3         1           1.33333     4/3
+-4/3        -1          -1.33333    -4/3
+0/0         nok         nok         0/0
+text        nok         nok         nok
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
+NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
+ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
+ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
+BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
+Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
+PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
+DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
+ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
+Make,	271,	0x010f,	IFD0,	Exif.Image.Make,	Ascii,	The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+Model,	272,	0x0110,	IFD0,	Exif.Image.Model,	Ascii,	The model name or model number of the equipment. This is the model name or number of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown.
+StripOffsets,	273,	0x0111,	IFD0,	Exif.Image.StripOffsets,	Long,	For each strip, the byte offset of that strip. It is recommended that this be selected so the number of strip bytes does not exceed 64 Kbytes. With JPEG compressed data this designation is not needed and is omitted. See also <RowsPerStrip> and <StripByteCounts>.
+Orientation,	274,	0x0112,	IFD0,	Exif.Image.Orientation,	Short,	The image orientation viewed in terms of rows and columns.
+SamplesPerPixel,	277,	0x0115,	IFD0,	Exif.Image.SamplesPerPixel,	Short,	The number of components per pixel. Since this standard applies to RGB and YCbCr images, the value set for this tag is 3. In JPEG compressed data a JPEG marker is used instead of this tag.
+RowsPerStrip,	278,	0x0116,	IFD0,	Exif.Image.RowsPerStrip,	Long,	The number of rows per strip. This is the number of rows in the image of one strip when an image is divided into strips. With JPEG compressed data this designation is not needed and is omitted. See also <StripOffsets> and <StripByteCounts>.
+StripByteCounts,	279,	0x0117,	IFD0,	Exif.Image.StripByteCounts,	Long,	The total number of bytes in each strip. With JPEG compressed data this designation is not needed and is omitted.
+XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
+YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
+PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
+ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
+TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
+Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
+DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
+Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
+WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
+PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
+TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
+TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
+TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
+TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
+SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
+TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
+JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
+JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
+JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
+YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
+YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
+YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
+ReferenceBlackWhite,	532,	0x0214,	IFD0,	Exif.Image.ReferenceBlackWhite,	Rational,	The reference black point value and reference white point value. No defaults are given in TIFF, but the values below are given as defaults here. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability these conditions.
+XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
+Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
+RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
+CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
+CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
+BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
+Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
+ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
+InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
+GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
+TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
+XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
+XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
+XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
+XPKeywords,	40094,	0x9c9e,	IFD0,	Exif.Image.XPKeywords,	Byte,	Keywords tag used by Windows, encoded in UCS2
+XPSubject,	40095,	0x9c9f,	IFD0,	Exif.Image.XPSubject,	Byte,	Subject tag used by Windows, encoded in UCS2
+PrintImageMatching,	50341,	0xc4a5,	IFD0,	Exif.Image.PrintImageMatching,	Undefined,	Print Image Matching, descriptiont needed.
+DNGVersion,	50706,	0xc612,	IFD0,	Exif.Image.DNGVersion,	Byte,	This tag encodes the DNG four-tier version number. For files compliant with version 1.1.0.0 of the DNG specification, this tag should contain the bytes: 1, 1, 0, 0.
+DNGBackwardVersion,	50707,	0xc613,	IFD0,	Exif.Image.DNGBackwardVersion,	Byte,	This tag specifies the oldest version of the Digital Negative specification for which a file is compatible. Readers shouldnot attempt to read a file if this tag specifies a version number that is higher than the version number of the specification the reader was based on.  In addition to checking the version tags, readers should, for all tags, check the types, counts, and values, to verify it is able to correctly read the file.
+UniqueCameraModel,	50708,	0xc614,	IFD0,	Exif.Image.UniqueCameraModel,	Ascii,	Defines a unique, non-localized name for the camera model that created the image in the raw file. This name should include the manufacturer's name to avoid conflicts, and should not be localized, even if the camera name itself is localized for different markets (see LocalizedCameraModel). This string may be used by reader software to index into per-model preferences and replacement profiles.
+LocalizedCameraModel,	50709,	0xc615,	IFD0,	Exif.Image.LocalizedCameraModel,	Byte,	Similar to the UniqueCameraModel field, except the name can be localized for different markets to match the localization of the camera name.
+CFAPlaneColor,	50710,	0xc616,	IFD0,	Exif.Image.CFAPlaneColor,	Byte,	Provides a mapping between the values in the CFAPattern tag and the plane numbers in LinearRaw space. This is a required tag for non-RGB CFA images.
+CFALayout,	50711,	0xc617,	IFD0,	Exif.Image.CFALayout,	Short,	Describes the spatial layout of the CFA.
+LinearizationTable,	50712,	0xc618,	IFD0,	Exif.Image.LinearizationTable,	Short,	Describes a lookup table that maps stored values into linear values. This tag is typically used to increase compression ratios by storing the raw data in a non-linear, more visually uniform space with fewer total encoding levels. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelRepeatDim,	50713,	0xc619,	IFD0,	Exif.Image.BlackLevelRepeatDim,	Short,	Specifies repeat pattern size for the BlackLevel tag.
+BlackLevel,	50714,	0xc61a,	IFD0,	Exif.Image.BlackLevel,	Rational,	Specifies the zero light (a.k.a. thermal black or black current) encoding level, as a repeating pattern. The origin of this pattern is the top-left corner of the ActiveArea rectangle. The values are stored in row-column-sample scan order.
+BlackLevelDeltaH,	50715,	0xc61b,	IFD0,	Exif.Image.BlackLevelDeltaH,	SRational,	If the zero light encoding level is a function of the image column, BlackLevelDeltaH specifies the difference between the zero light encoding level for each column and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+BlackLevelDeltaV,	50716,	0xc61c,	IFD0,	Exif.Image.BlackLevelDeltaV,	SRational,	If the zero light encoding level is a function of the image row, this tag specifies the difference between the zero light encoding level for each row and the baseline zero light encoding level. If SamplesPerPixel is not equal to one, this single table applies to all the samples for each pixel.
+WhiteLevel,	50717,	0xc61d,	IFD0,	Exif.Image.WhiteLevel,	Short,	This tag specifies the fully saturated encoding level for the raw sample values. Saturation is caused either by the sensor itself becoming highly non-linear in response, or by the camera's analog to digital converter clipping.
+DefaultScale,	50718,	0xc61e,	IFD0,	Exif.Image.DefaultScale,	Rational,	DefaultScale is required for cameras with non-square pixels. It specifies the default scale factors for each direction to convert the image to square pixels. Typically these factors are selected to approximately preserve total pixel count. For CFA images that use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, these two values should usually differ by a factor of 2.0.
+DefaultCropOrigin,	50719,	0xc61f,	IFD0,	Exif.Image.DefaultCropOrigin,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropOrigin specifies the origin of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied), relative to the top-left corner of the ActiveArea rectangle.
+DefaultCropSize,	50720,	0xc620,	IFD0,	Exif.Image.DefaultCropSize,	Short,	Raw images often store extra pixels around the edges of the final image. These extra pixels help prevent interpolation artifacts near the edges of the final image. DefaultCropSize specifies the size of the final image area, in raw image coordinates (i.e., before the DefaultScale has been applied).
+ColorMatrix1,	50721,	0xc621,	IFD0,	Exif.Image.ColorMatrix1,	SRational,	ColorMatrix1 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. The matrix values are stored in row scan order. The ColorMatrix1 tag is required for all non-monochrome DNG files.
+ColorMatrix2,	50722,	0xc622,	IFD0,	Exif.Image.ColorMatrix2,	SRational,	ColorMatrix2 defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. The matrix values are stored in row scan order.
+CameraCalibration1,	50723,	0xc623,	IFD0,	Exif.Image.CameraCalibration1,	SRational,	CameraClalibration1 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix1 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+CameraCalibration2,	50724,	0xc624,	IFD0,	Exif.Image.CameraCalibration2,	SRational,	CameraCalibration2 defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant. The matrix is stored in row scan order. This matrix is stored separately from the matrix specified by the ColorMatrix2 tag to allow raw converters to swap in replacement color matrices based on UniqueCameraModel tag, while still taking advantage of any per-individual camera calibration performed by the camera manufacturer.
+ReductionMatrix1,	50725,	0xc625,	IFD0,	Exif.Image.ReductionMatrix1,	SRational,	ReductionMatrix1 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the first calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+ReductionMatrix2,	50726,	0xc626,	IFD0,	Exif.Image.ReductionMatrix2,	SRational,	ReductionMatrix2 defines a dimensionality reduction matrix for use as the first stage in converting color camera native space values to XYZ values, under the second calibration illuminant. This tag may only be used if ColorPlanes is greater than 3. The matrix is stored in row scan order.
+AnalogBalance,	50727,	0xc627,	IFD0,	Exif.Image.AnalogBalance,	Rational,	Normally the stored raw values are not white balanced, since any digital white balancing will reduce the dynamic range of the final image if the user decides to later adjust the white balance; however, if camera hardware is capable of white balancing the color channels before the signal is digitized, it can improve the dynamic range of the final image. AnalogBalance defines the gain, either analog (recommended) or digital (not recommended) that has been applied the stored raw values.
+AsShotNeutral,	50728,	0xc628,	IFD0,	Exif.Image.AsShotNeutral,	Short,	Specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values. The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag.
+AsShotWhiteXY,	50729,	0xc629,	IFD0,	Exif.Image.AsShotWhiteXY,	Rational,	Specifies the selected white balance at time of capture, encoded as x-y chromaticity coordinates. The inclusion of this tag precludes the inclusion of the AsShotNeutral tag.
+BaselineExposure,	50730,	0xc62a,	IFD0,	Exif.Image.BaselineExposure,	SRational,	Camera models vary in the trade-off they make between highlight headroom and shadow noise. Some leave a significant amount of highlight headroom during a normal exposure. This allows significant negative exposure compensation to be applied during raw conversion, but also means normal exposures will contain more shadow noise. Other models leave less headroom during normal exposures. This allows for less negative exposure compensation, but results in lower shadow noise for normal exposures. Because of these differences, a raw converter needs to vary the zero point of its exposure compensation control from model to model. BaselineExposure specifies by how much (in EV units) to move the zero point. Positive values result in brighter default results, while negative values result in darker default results.
+BaselineNoise,	50731,	0xc62b,	IFD0,	Exif.Image.BaselineNoise,	Rational,	Specifies the relative noise level of the camera model at a baseline ISO value of 100, compared to a reference camera model. Since noise levels tend to vary approximately with the square root of the ISO value, a raw converter can use this value, combined with the current ISO, to estimate the relative noise level of the current image.
+BaselineSharpness,	50732,	0xc62c,	IFD0,	Exif.Image.BaselineSharpness,	Rational,	Specifies the relative amount of sharpening required for this camera model, compared to a reference camera model. Camera models vary in the strengths of their anti-aliasing filters. Cameras with weak or no filters require less sharpening than cameras with strong anti-aliasing filters.
+BayerGreenSplit,	50733,	0xc62d,	IFD0,	Exif.Image.BayerGreenSplit,	Long,	Only applies to CFA images using a Bayer pattern filter array. This tag specifies, in arbitrary units, how closely the values of the green pixels in the blue/green rows track the values of the green pixels in the red/green rows. A value of zero means the two kinds of green pixels track closely, while a non-zero value means they sometimes diverge. The useful range for this tag is from 0 (no divergence) to about 5000 (quite large divergence).
+LinearResponseLimit,	50734,	0xc62e,	IFD0,	Exif.Image.LinearResponseLimit,	Rational,	Some sensors have an unpredictable non-linearity in their response as they near the upper limit of their encoding range. This non-linearity results in color shifts in the highlight areas of the resulting image unless the raw converter compensates for this effect. LinearResponseLimit specifies the fraction of the encoding range above which the response may become significantly non-linear.
+CameraSerialNumber,	50735,	0xc62f,	IFD0,	Exif.Image.CameraSerialNumber,	Ascii,	CameraSerialNumber contains the serial number of the camera or camera body that captured the image.
+LensInfo,	50736,	0xc630,	IFD0,	Exif.Image.LensInfo,	Rational,	Contains information about the lens that captured the image. If the minimum f-stops are unknown, they should be encoded as 0/0.
+ChromaBlurRadius,	50737,	0xc631,	IFD0,	Exif.Image.ChromaBlurRadius,	Rational,	ChromaBlurRadius provides a hint to the DNG reader about how much chroma blur should be applied to the image. If this tag is omitted, the reader will use its default amount of chroma blurring. Normally this tag is only included for non-CFA images, since the amount of chroma blur required for mosaic images is highly dependent on the de-mosaic algorithm, in which case the DNG reader's default value is likely optimized for its particular de-mosaic algorithm.
+AntiAliasStrength,	50738,	0xc632,	IFD0,	Exif.Image.AntiAliasStrength,	Rational,	Provides a hint to the DNG reader about how strong the camera's anti-alias filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is prone to aliasing artifacts with some subjects), while a value of 1.0 means a strong anti-alias filter (i.e., the camera almost never has aliasing artifacts).
+ShadowScale,	50739,	0xc633,	IFD0,	Exif.Image.ShadowScale,	SRational,	This tag is used by Adobe Camera Raw to control the sensitivity of its 'Shadows' slider.
+DNGPrivateData,	50740,	0xc634,	IFD0,	Exif.Image.DNGPrivateData,	Byte,	Provides a way for camera manufacturers to store private data in the DNG file for use by their own raw converters, and to have that data preserved by programs that edit DNG files.
+MakerNoteSafety,	50741,	0xc635,	IFD0,	Exif.Image.MakerNoteSafety,	Short,	MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is safe to preserve along with the rest of the EXIF data. File browsers and other image management software processing an image with a preserved MakerNote should be aware that any thumbnail image embedded in the MakerNote may be stale, and may not reflect the current state of the full size image.
+CalibrationIlluminant1,	50778,	0xc65a,	IFD0,	Exif.Image.CalibrationIlluminant1,	Short,	The illuminant used for the first set of color calibration tags (ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for this tag are the same as the legal values for the LightSource EXIF tag.
+CalibrationIlluminant2,	50779,	0xc65b,	IFD0,	Exif.Image.CalibrationIlluminant2,	Short,	The illuminant used for an optional second set of color calibration tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for this tag are the same as the legal values for the CalibrationIlluminant1 tag; however, if both are included, neither is allowed to have a value of 0 (unknown).
+BestQualityScale,	50780,	0xc65c,	IFD0,	Exif.Image.BestQualityScale,	Rational,	For some cameras, the best possible image quality is not achieved by preserving the total pixel count during conversion. For example, Fujifilm SuperCCD images have maximum detail when their total pixel count is doubled. This tag specifies the amount by which the values of the DefaultScale tag need to be multiplied to achieve the best quality image size.
+RawDataUniqueID,	50781,	0xc65d,	IFD0,	Exif.Image.RawDataUniqueID,	Byte,	This tag contains a 16-byte unique identifier for the raw image data in the DNG file. DNG readers can use this tag to recognize a particular raw image, even if the file's name or the metadata contained in the file has been changed. If a DNG writer creates such an identifier, it should do so using an algorithm that will ensure that it is very unlikely two different images will end up having the same identifier.
+OriginalRawFileName,	50827,	0xc68b,	IFD0,	Exif.Image.OriginalRawFileName,	Byte,	If the DNG file was converted from a non-DNG raw file, then this tag contains the file name of that original raw file.
+OriginalRawFileData,	50828,	0xc68c,	IFD0,	Exif.Image.OriginalRawFileData,	Undefined,	If the DNG file was converted from a non-DNG raw file, then this tag contains the compressed contents of that original raw file. The contents of this tag always use the big-endian byte order. The tag contains a sequence of data blocks. Future versions of the DNG specification may define additional data blocks, so DNG readers should ignore extra bytes when parsing this tag. DNG readers should also detect the case where data blocks are missing from the end of the sequence, and should assume a default value for all the missing blocks. There are no padding or alignment bytes between data blocks.
+ActiveArea,	50829,	0xc68d,	IFD0,	Exif.Image.ActiveArea,	Short,	This rectangle defines the active (non-masked) pixels of the sensor. The order of the rectangle coordinates is: top, left, bottom, right.
+MaskedAreas,	50830,	0xc68e,	IFD0,	Exif.Image.MaskedAreas,	Short,	This tag contains a list of non-overlapping rectangle coordinates of fully masked pixels, which can be optionally used by DNG readers to measure the black encoding level. The order of each rectangle's coordinates is: top, left, bottom, right. If the raw image data has already had its black encoding level subtracted, then this tag should not be used, since the masked pixels are no longer useful.
+AsShotICCProfile,	50831,	0xc68f,	IFD0,	Exif.Image.AsShotICCProfile,	Undefined,	This tag contains an ICC profile that, in conjunction with the AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to specify a default color rendering from camera color space coordinates (linear reference values) into the ICC profile connection space. The ICC profile connection space is an output referred colorimetric space, whereas the other color calibration tags in DNG specify a conversion into a scene referred colorimetric space. This means that the rendering in this profile should include any desired tone and gamut mapping needed to convert between scene referred values and output referred values.
+AsShotPreProfileMatrix,	50832,	0xc690,	IFD0,	Exif.Image.AsShotPreProfileMatrix,	SRational,	This tag is used in conjunction with the AsShotICCProfile tag. It specifies a matrix that should be applied to the camera color space coordinates before processing the values through the ICC profile specified in the AsShotICCProfile tag. The matrix is stored in the row scan order. If ColorPlanes is greater than three, then this matrix can (but is not required to) reduce the dimensionality of the color data down to three components, in which case the AsShotICCProfile should have three rather than ColorPlanes input components.
+CurrentICCProfile,	50833,	0xc691,	IFD0,	Exif.Image.CurrentICCProfile,	Undefined,	This tag is used in conjunction with the CurrentPreProfileMatrix tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+CurrentPreProfileMatrix,	50834,	0xc692,	IFD0,	Exif.Image.CurrentPreProfileMatrix,	SRational,	This tag is used in conjunction with the CurrentICCProfile tag. The CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix tag pair, except they are for use by raw file editors rather than camera manufacturers.
+ExposureTime,	33434,	0x829a,	Exif,	Exif.Photo.ExposureTime,	Rational,	Exposure time, given in seconds (sec).
+FNumber,	33437,	0x829d,	Exif,	Exif.Photo.FNumber,	Rational,	The F number.
+ExposureProgram,	34850,	0x8822,	Exif,	Exif.Photo.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	Exif,	Exif.Photo.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used. The tag value is an ASCII string compatible with the standard developed by the ASTM Technical Committee.
+ISOSpeedRatings,	34855,	0x8827,	Exif,	Exif.Photo.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	Exif,	Exif.Photo.OECF,	Undefined,	Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values.
+ExifVersion,	36864,	0x9000,	Exif,	Exif.Photo.ExifVersion,	Undefined,	The version of this standard supported. Nonexistence of this field is taken to mean nonconformance to the standard.
+DateTimeOriginal,	36867,	0x9003,	Exif,	Exif.Photo.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated. For a digital still camera the date and time the picture was taken are recorded.
+DateTimeDigitized,	36868,	0x9004,	Exif,	Exif.Photo.DateTimeDigitized,	Ascii,	The date and time when the image was stored as digital data.
+ComponentsConfiguration,	37121,	0x9101,	Exif,	Exif.Photo.ComponentsConfiguration,	Undefined,	Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences.
+CompressedBitsPerPixel,	37122,	0x9102,	Exif,	Exif.Photo.CompressedBitsPerPixel,	Rational,	Information specific to compressed data. The compression mode used for a compressed image is indicated in unit bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	Exif,	Exif.Photo.ShutterSpeedValue,	SRational,	Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting.
+ApertureValue,	37378,	0x9202,	Exif,	Exif.Photo.ApertureValue,	Rational,	The lens aperture. The unit is the APEX value.
+BrightnessValue,	37379,	0x9203,	Exif,	Exif.Photo.BrightnessValue,	SRational,	The value of brightness. The unit is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+ExposureBiasValue,	37380,	0x9204,	Exif,	Exif.Photo.ExposureBiasValue,	SRational,	The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99.
+MaxApertureValue,	37381,	0x9205,	Exif,	Exif.Photo.MaxApertureValue,	Rational,	The smallest F number of the lens. The unit is the APEX value. Ordinarily it is given in the range of 00.00 to 99.99, but it is not limited to this range.
+SubjectDistance,	37382,	0x9206,	Exif,	Exif.Photo.SubjectDistance,	Rational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	Exif,	Exif.Photo.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	Exif,	Exif.Photo.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	Exif,	Exif.Photo.Flash,	Short,	This tag is recorded when an image is taken using a strobe light (flash).
+FocalLength,	37386,	0x920a,	Exif,	Exif.Photo.FocalLength,	Rational,	The actual focal length of the lens, in mm. Conversion is not made to the focal length of a 35 mm film camera.
+SubjectArea,	37396,	0x9214,	Exif,	Exif.Photo.SubjectArea,	Short,	This tag indicates the location and area of the main subject in the overall scene.
+MakerNote,	37500,	0x927c,	Exif,	Exif.Photo.MakerNote,	Undefined,	A tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer.
+UserComment,	37510,	0x9286,	Exif,	Exif.Photo.UserComment,	Comment,	A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag.
+SubSecTime,	37520,	0x9290,	Exif,	Exif.Photo.SubSecTime,	Ascii,	A tag used to record fractions of seconds for the <DateTime> tag.
+SubSecTimeOriginal,	37521,	0x9291,	Exif,	Exif.Photo.SubSecTimeOriginal,	Ascii,	A tag used to record fractions of seconds for the <DateTimeOriginal> tag.
+SubSecTimeDigitized,	37522,	0x9292,	Exif,	Exif.Photo.SubSecTimeDigitized,	Ascii,	A tag used to record fractions of seconds for the <DateTimeDigitized> tag.
+FlashpixVersion,	40960,	0xa000,	Exif,	Exif.Photo.FlashpixVersion,	Undefined,	The FlashPix format version supported by a FPXR file.
+ColorSpace,	40961,	0xa001,	Exif,	Exif.Photo.ColorSpace,	Short,	The color space information tag is always recorded as the color space specifier. Normally sRGB is used to define the color space based on the PC monitor conditions and environment. If a color space other than sRGB is used, Uncalibrated is set. Image data recorded as Uncalibrated can be treated as sRGB when it is converted to FlashPix.
+PixelXDimension,	40962,	0xa002,	Exif,	Exif.Photo.PixelXDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid width of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file.
+PixelYDimension,	40963,	0xa003,	Exif,	Exif.Photo.PixelYDimension,	Long,	Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF.
+RelatedSoundFile,	40964,	0xa004,	Exif,	Exif.Photo.RelatedSoundFile,	Ascii,	This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded.
+InteroperabilityTag,	40965,	0xa005,	Exif,	Exif.Photo.InteroperabilityTag,	Long,	Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD.
+FlashEnergy,	41483,	0xa20b,	Exif,	Exif.Photo.FlashEnergy,	Rational,	Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds (BCPS).
+SpatialFrequencyResponse,	41484,	0xa20c,	Exif,	Exif.Photo.SpatialFrequencyResponse,	Undefined,	This tag records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+FocalPlaneXResolution,	41486,	0xa20e,	Exif,	Exif.Photo.FocalPlaneXResolution,	Rational,	Indicates the number of pixels in the image width (X) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneYResolution,	41487,	0xa20f,	Exif,	Exif.Photo.FocalPlaneYResolution,	Rational,	Indicates the number of pixels in the image height (V) direction per <FocalPlaneResolutionUnit> on the camera focal plane.
+FocalPlaneResolutionUnit,	41488,	0xa210,	Exif,	Exif.Photo.FocalPlaneResolutionUnit,	Short,	Indicates the unit for measuring <FocalPlaneXResolution> and <FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>.
+SubjectLocation,	41492,	0xa214,	Exif,	Exif.Photo.SubjectLocation,	Short,	Indicates the location of the main subject in the scene. The value of this tag represents the pixel at the center of the main subject relative to the left edge, prior to rotation processing as per the <Rotation> tag. The first value indicates the X column number and second indicates the Y row number.
+ExposureIndex,	41493,	0xa215,	Exif,	Exif.Photo.ExposureIndex,	Rational,	Indicates the exposure index selected on the camera or input device at the time the image is captured.
+SensingMethod,	41495,	0xa217,	Exif,	Exif.Photo.SensingMethod,	Short,	Indicates the image sensor type on the camera or input device.
+FileSource,	41728,	0xa300,	Exif,	Exif.Photo.FileSource,	Undefined,	Indicates the image source. If a DSC recorded the image, this tag value of this tag always be set to 3, indicating that the image was recorded on a DSC.
+SceneType,	41729,	0xa301,	Exif,	Exif.Photo.SceneType,	Undefined,	Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed.
+CFAPattern,	41730,	0xa302,	Exif,	Exif.Photo.CFAPattern,	Undefined,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods.
+CustomRendered,	41985,	0xa401,	Exif,	Exif.Photo.CustomRendered,	Short,	This tag indicates the use of special processing on image data, such as rendering geared to output. When special processing is performed, the reader is expected to disable or minimize any further processing.
+ExposureMode,	41986,	0xa402,	Exif,	Exif.Photo.ExposureMode,	Short,	This tag indicates the exposure mode set when the image was shot. In auto-bracketing mode, the camera shoots a series of frames of the same scene at different exposure settings.
+WhiteBalance,	41987,	0xa403,	Exif,	Exif.Photo.WhiteBalance,	Short,	This tag indicates the white balance mode set when the image was shot.
+DigitalZoomRatio,	41988,	0xa404,	Exif,	Exif.Photo.DigitalZoomRatio,	Rational,	This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used.
+FocalLengthIn35mmFilm,	41989,	0xa405,	Exif,	Exif.Photo.FocalLengthIn35mmFilm,	Short,	This tag indicates the equivalent focal length assuming a 35mm film camera, in mm. A value of 0 means the focal length is unknown. Note that this tag differs from the <FocalLength> tag.
+SceneCaptureType,	41990,	0xa406,	Exif,	Exif.Photo.SceneCaptureType,	Short,	This tag indicates the type of scene that was shot. It can also be used to record the mode in which the image was shot. Note that this differs from the <SceneType> tag.
+GainControl,	41991,	0xa407,	Exif,	Exif.Photo.GainControl,	Short,	This tag indicates the degree of overall image gain adjustment.
+Contrast,	41992,	0xa408,	Exif,	Exif.Photo.Contrast,	Short,	This tag indicates the direction of contrast processing applied by the camera when the image was shot.
+Saturation,	41993,	0xa409,	Exif,	Exif.Photo.Saturation,	Short,	This tag indicates the direction of saturation processing applied by the camera when the image was shot.
+Sharpness,	41994,	0xa40a,	Exif,	Exif.Photo.Sharpness,	Short,	This tag indicates the direction of sharpness processing applied by the camera when the image was shot.
+DeviceSettingDescription,	41995,	0xa40b,	Exif,	Exif.Photo.DeviceSettingDescription,	Undefined,	This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader.
+SubjectDistanceRange,	41996,	0xa40c,	Exif,	Exif.Photo.SubjectDistanceRange,	Short,	This tag indicates the distance to the subject.
+ImageUniqueID,	42016,	0xa420,	Exif,	Exif.Photo.ImageUniqueID,	Ascii,	This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
+InteroperabilityIndex,	1,	0x0001,	Iop,	Exif.Iop.InteroperabilityIndex,	Ascii,	Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
+InteroperabilityVersion,	2,	0x0002,	Iop,	Exif.Iop.InteroperabilityVersion,	Undefined,	Interoperability version
+RelatedImageFileFormat,	4096,	0x1000,	Iop,	Exif.Iop.RelatedImageFileFormat,	Ascii,	File format of image file
+RelatedImageWidth,	4097,	0x1001,	Iop,	Exif.Iop.RelatedImageWidth,	Long,	Image width
+RelatedImageLength,	4098,	0x1002,	Iop,	Exif.Iop.RelatedImageLength,	Long,	Image height
+GPSVersionID,	0,	0x0000,	GPSInfo,	Exif.GPSInfo.GPSVersionID,	Byte,	Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
+GPSLatitudeRef,	1,	0x0001,	GPSInfo,	Exif.GPSInfo.GPSLatitudeRef,	Ascii,	Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
+GPSLatitude,	2,	0x0002,	GPSInfo,	Exif.GPSInfo.GPSLatitude,	Rational,	Indicates the latitude. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is dd/1,mmmm/100,0/1.
+GPSLongitudeRef,	3,	0x0003,	GPSInfo,	Exif.GPSInfo.GPSLongitudeRef,	Ascii,	Indicates whether the longitude is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude.
+GPSLongitude,	4,	0x0004,	GPSInfo,	Exif.GPSInfo.GPSLongitude,	Rational,	Indicates the longitude. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. When degrees, minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format is ddd/1,mmmm/100,0/1.
+GPSAltitudeRef,	5,	0x0005,	GPSInfo,	Exif.GPSInfo.GPSAltitudeRef,	Byte,	Indicates the altitude used as the reference altitude. If the reference is sea level and the altitude is above sea level, 0 is given. If the altitude is below sea level, a value of 1 is given and the altitude is indicated as an absolute value in the GSPAltitude tag. The reference unit is meters. Note that this tag is BYTE type, unlike other reference tags.
+GPSAltitude,	6,	0x0006,	GPSInfo,	Exif.GPSInfo.GPSAltitude,	Rational,	Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is expressed as one RATIONAL value. The reference unit is meters.
+GPSTimeStamp,	7,	0x0007,	GPSInfo,	Exif.GPSInfo.GPSTimeStamp,	Rational,	Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is expressed as three RATIONAL values giving the hour, minute, and second (atomic clock).
+GPSSatellites,	8,	0x0008,	GPSInfo,	Exif.GPSInfo.GPSSatellites,	Ascii,	Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag is set to NULL.
+GPSStatus,	9,	0x0009,	GPSInfo,	Exif.GPSInfo.GPSStatus,	Ascii,	Indicates the status of the GPS receiver when the image is recorded. "A" means measurement is in progress, and "V" means the measurement is Interoperability.
+GPSMeasureMode,	10,	0x000a,	GPSInfo,	Exif.GPSInfo.GPSMeasureMode,	Ascii,	Indicates the GPS measurement mode. "2" means two-dimensional measurement and "3" means three-dimensional measurement is in progress.
+GPSDOP,	11,	0x000b,	GPSInfo,	Exif.GPSInfo.GPSDOP,	Rational,	Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement.
+GPSSpeedRef,	12,	0x000c,	GPSInfo,	Exif.GPSInfo.GPSSpeedRef,	Ascii,	Indicates the unit used to express the GPS receiver speed of movement. "K" "M" and "N" represents kilometers per hour, miles per hour, and knots.
+GPSSpeed,	13,	0x000d,	GPSInfo,	Exif.GPSInfo.GPSSpeed,	Rational,	Indicates the speed of GPS receiver movement.
+GPSTrackRef,	14,	0x000e,	GPSInfo,	Exif.GPSInfo.GPSTrackRef,	Ascii,	Indicates the reference for giving the direction of GPS receiver movement. "T" denotes true direction and "M" is magnetic direction.
+GPSTrack,	15,	0x000f,	GPSInfo,	Exif.GPSInfo.GPSTrack,	Rational,	Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99.
+GPSImgDirectionRef,	16,	0x0010,	GPSInfo,	Exif.GPSInfo.GPSImgDirectionRef,	Ascii,	Indicates the reference for giving the direction of the image when it is captured. "T" denotes true direction and "M" is magnetic direction.
+GPSImgDirection,	17,	0x0011,	GPSInfo,	Exif.GPSInfo.GPSImgDirection,	Rational,	Indicates the direction of the image when it was captured. The range of values is from 0.00 to 359.99.
+GPSMapDatum,	18,	0x0012,	GPSInfo,	Exif.GPSInfo.GPSMapDatum,	Ascii,	Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is "TOKYO" or "WGS-84".
+GPSDestLatitudeRef,	19,	0x0013,	GPSInfo,	Exif.GPSInfo.GPSDestLatitudeRef,	Ascii,	Indicates whether the latitude of the destination point is north or south latitude. The ASCII value "N" indicates north latitude, and "S" is south latitude.
+GPSDestLatitude,	20,	0x0014,	GPSInfo,	Exif.GPSInfo.GPSDestLatitude,	Rational,	Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1.
+GPSDestLongitudeRef,	21,	0x0015,	GPSInfo,	Exif.GPSInfo.GPSDestLongitudeRef,	Ascii,	Indicates whether the longitude of the destination point is east or west longitude. ASCII "E" indicates east longitude, and "W" is west longitude.
+GPSDestLongitude,	22,	0x0016,	GPSInfo,	Exif.GPSInfo.GPSDestLongitude,	Rational,	Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1.
+GPSDestBearingRef,	23,	0x0017,	GPSInfo,	Exif.GPSInfo.GPSDestBearingRef,	Ascii,	Indicates the reference used for giving the bearing to the destination point. "T" denotes true direction and "M" is magnetic direction.
+GPSDestBearing,	24,	0x0018,	GPSInfo,	Exif.GPSInfo.GPSDestBearing,	Rational,	Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99.
+GPSDestDistanceRef,	25,	0x0019,	GPSInfo,	Exif.GPSInfo.GPSDestDistanceRef,	Ascii,	Indicates the unit used to express the distance to the destination point. "K", "M" and "N" represent kilometers, miles and knots.
+GPSDestDistance,	26,	0x001a,	GPSInfo,	Exif.GPSInfo.GPSDestDistance,	Rational,	Indicates the distance to the destination point.
+GPSProcessingMethod,	27,	0x001b,	GPSInfo,	Exif.GPSInfo.GPSProcessingMethod,	Undefined,	A character string recording the name of the method used for location finding. The first byte indicates the character code used, and this is followed by the name of the method.
+GPSAreaInformation,	28,	0x001c,	GPSInfo,	Exif.GPSInfo.GPSAreaInformation,	Undefined,	A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area.
+GPSDateStamp,	29,	0x001d,	GPSInfo,	Exif.GPSInfo.GPSDateStamp,	Ascii,	A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is "YYYY:MM:DD.".
+GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
+Usage: tiff-test\Debug\tiff-test.exe file
+Usage: tiff-test\DebugDLL\tiff-test.exe file
+Usage: tiff-test\Release\tiff-test.exe file
+Usage: tiff-test\ReleaseDLL\tiff-test.exe file
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+       /usr/lib            /usr             lib                
+          /usr/               /             usr                
+            usr               .             usr                
+              /               /                                
+              .               .               .                
+             ..               .              ..                
+            ///               /                                
+    /usr/.emacs            /usr          .emacs                
+   /usr/.emacs/            /usr          .emacs                
+  /usr/.emacs//            /usr          .emacs                
+     usr/.emacs             usr          .emacs                
+         .emacs               .          .emacs                
+      .emacs.gz               .       .emacs.gz             .gz
+ /tmp/image.jpg            /tmp       image.jpg            .jpg
+/tmp/.image.jpg            /tmp      .image.jpg            .jpg
+     /image.jpg               /       image.jpg            .jpg
+      image.jpg               .       image.jpg            .jpg
+    image.jpg//               .       image.jpg            .jpg
+ /////image.jpg               /       image.jpg            .jpg
+ /foo.bar/image        /foo.bar           image                
+/foo.bar/images.tar.gz        /foo.bar   images.tar.gz             .gz
+d:\foo.bar\images.tar.gz      d:\foo.bar   images.tar.gz             .gz
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: write-test file case
+
+where case is an integer between 1 and 11
+Usage: write2-test\Debug\write2-test.exe file
+Usage: write2-test\DebugDLL\write2-test.exe file
+Usage: write2-test\Release\write2-test.exe file
+Usage: write2-test\ReleaseDLL\write2-test.exe file
+Usage: xmpparse\Debug\xmpparse.exe file
+Usage: xmpparse\DebugDLL\xmpparse.exe file
+Usage: xmpparse\Release\xmpparse.exe file
+Usage: xmpparse\ReleaseDLL\xmpparse.exe file
+Usage: xmpparser-test\Debug\xmpparser-test.exe file
+Usage: xmpparser-test\DebugDLL\xmpparser-test.exe file
+Usage: xmpparser-test\Release\xmpparser-test.exe file
+Usage: xmpparser-test\ReleaseDLL\xmpparser-test.exe file
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Xmp.dc.source                                XmpText    13  xmpsample.cpp
+Xmp.dc.subject                               XmpBag      2  Palmtree, Rubbertree
+Xmp.dc.title                                 LangAlt     2  lang="de-DE" Sonnenuntergang am Strand, lang="en-US" Sunset on the beach
+Xmp.dc.one                                   XmpText     2  -1
+Xmp.dc.two                                   XmpText     6  3.1415
+Xmp.dc.three                                 XmpText     3  5/7
+Xmp.dc.four                                  XmpText     3  255
+Xmp.dc.five                                  XmpText     3  256
+Xmp.dc.six                                   XmpText     5  False
+Xmp.dc.seven                                 XmpText     5  Seven
+Xmp.dc.format                                XmpText    10  image/jpeg
+Xmp.dc.creator                               XmpSeq      3  1) The first creator, 2) The second creator, 3) And another one
+Xmp.dc.description                           LangAlt     2  lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
+Xmp.tiff.ImageDescription                    LangAlt     2  lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
+Xmp.ns.myProperty                            XmpText     7  myValue
+Xmp.xmpDM.videoFrameSize/stDim:w             XmpText     2  16
+Xmp.xmpDM.videoFrameSize/stDim:h             XmpText     1  9
+Xmp.xmpDM.videoFrameSize/stDim:unit          XmpText     4  inch
+Xmp.dc.publisher                             XmpBag      1  James Bond
+Xmp.dc.publisher[1]/?ns:role                 XmpText    12  secret agent
+Xmp.dc.creator[2]/?ns:role                   XmpText    10  programmer
+Xmp.xmpBJ.JobRef                             XmpText     0  type="Bag"
+Xmp.xmpBJ.JobRef[1]/stJob:name               XmpText    14  Birthday party
+Xmp.xmpBJ.JobRef[1]/stJob:role               XmpText    12  Photographer
+Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
+Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:ns="myNamespace/"
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
+    xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
+   dc:source="xmpsample.cpp"
+   dc:one="-1"
+   dc:two="3.1415"
+   dc:three="5/7"
+   dc:four="255"
+   dc:five="256"
+   dc:six="False"
+   dc:seven="Seven"
+   dc:format="image/jpeg"
+   ns:myProperty="myValue">
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Palmtree</rdf:li>
+     <rdf:li>Rubbertree</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="de-DE">Sonnenuntergang am Strand</rdf:li>
+     <rdf:li xml:lang="en-US">Sunset on the beach</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>1) The first creator</rdf:li>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>2) The second creator</rdf:value>
+      <ns:role>programmer</ns:role>
+     </rdf:li>
+     <rdf:li>3) And another one</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Hello, World</rdf:li>
+     <rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <dc:publisher>
+    <rdf:Bag>
+     <rdf:li rdf:parseType="Resource">
+      <rdf:value>James Bond</rdf:value>
+      <ns:role>secret agent</ns:role>
+     </rdf:li>
+    </rdf:Bag>
+   </dc:publisher>
+   <tiff:ImageDescription>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">TIFF image description</rdf:li>
+     <rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
+    </rdf:Alt>
+   </tiff:ImageDescription>
+   <xmpDM:videoFrameSize
+    stDim:w="16"
+    stDim:h="9"
+    stDim:unit="inch"/>
+   <xmpBJ:JobRef>
+    <rdf:Bag>
+     <rdf:li
+      stJob:name="Birthday party"
+      stJob:role="Photographer"/>
+     <rdf:li
+      stJob:name="Wedding ceremony"
+      stJob:role="Best man"/>
+    </rdf:Bag>
+   </xmpBJ:JobRef>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+Exif.Image.Make                              Ascii       6  Canon
+Exif.Image.Model                             Ascii      22  Canon PowerShot S5 IS
+Exif.Image.Orientation                       Short       1  top, left
+Exif.Image.XResolution                       Rational    1  180
+Exif.Image.YResolution                       Rational    1  180
+Exif.Image.ResolutionUnit                    Short       1  inch
+Exif.Image.DateTime                          Ascii      20  2008:09:06 14:34:23
+Exif.Image.YCbCrPositioning                  Short       1  Centered
+Exif.Image.ExifTag                           Long        1  186
+Exif.Photo.ExposureTime                      Rational    1  1/500 s
+Exif.Photo.FNumber                           Rational    1  F4
+Exif.Photo.ISOSpeedRatings                   Short       1  80
+Exif.Photo.ExifVersion                       Undefined   4  2.20
+Exif.Photo.DateTimeOriginal                  Ascii      20  2008:09:06 14:34:23
+Exif.Photo.DateTimeDigitized                 Ascii      20  2008:09:06 14:34:23
+Exif.Photo.ComponentsConfiguration           Undefined   4  YCbCr
+Exif.Photo.CompressedBitsPerPixel            Rational    1  3
+Exif.Photo.ShutterSpeedValue                 SRational   1  1/501 s
+Exif.Photo.ApertureValue                     Rational    1  F4
+Exif.Photo.ExposureBiasValue                 SRational   1  0 EV
+Exif.Photo.MaxApertureValue                  Rational    1  F3.5
+Exif.Photo.MeteringMode                      Short       1  Multi-segment
+Exif.Photo.Flash                             Short       1  No, compulsory
+Exif.Photo.FocalLength                       Rational    1  21.3 mm
+Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
+Exif.MakerNote.Offset                        Long        1  680
+Exif.MakerNote.ByteOrder                     Ascii       3  MM
+Exif.CanonCs.Macro                           Short       1  Off
+Exif.CanonCs.Selftimer                       Short       1  Off
+Exif.CanonCs.Quality                         Short       1  Fine
+Exif.CanonCs.FlashMode                       Short       1  Off
+Exif.CanonCs.DriveMode                       Short       1  Single / timer
+Exif.CanonCs.FocusMode                       Short       1  Single
+Exif.CanonCs.ImageSize                       Short       1  Medium 1
+Exif.CanonCs.EasyMode                        Short       1  Manual
+Exif.CanonCs.DigitalZoom                     Short       1  None
+Exif.CanonCs.Contrast                        Short       1  Normal
+Exif.CanonCs.Saturation                      Short       1  Normal
+Exif.CanonCs.Sharpness                       Short       1  Normal
+Exif.CanonCs.ISOSpeed                        Short       1  Auto
+Exif.CanonCs.MeteringMode                    Short       1  Evaluative
+Exif.CanonCs.FocusType                       Short       1  Auto
+Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
+Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
+Exif.CanonCs.LensType                        Short       1  (65535)
+Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
+Exif.CanonCs.MaxAperture                     Short       1  F3.6
+Exif.CanonCs.MinAperture                     Short       1  F8
+Exif.CanonCs.FlashActivity                   Short       1  Did not fire
+Exif.CanonCs.FlashDetails                    Short       1  
+Exif.CanonCs.FocusContinuous                 Short       1  Continuous
+Exif.CanonCs.AESetting                       Short       1  Normal AE
+Exif.CanonCs.ImageStabilization              Short       1  On
+Exif.CanonCs.DisplayAperture                 Short       1  0
+Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
+Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
+Exif.CanonCs.PhotoEffect                     Short       1  (65535)
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
+Exif.CanonCs.ColorTone                       Short       1  32767
+Exif.Canon.FocalLength                       Short       4  21.3 mm
+Exif.CanonSi.ISOSpeed                        Short       1  100
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
+Exif.CanonSi.TargetAperture                  Short       1  F4
+Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
+Exif.CanonSi.WhiteBalance                    Short       1  Sunny
+Exif.CanonSi.Sequence                        Short       1  0
+Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
+Exif.CanonSi.FlashBias                       Short       1  0 EV
+Exif.CanonSi.SubjectDistance                 Short       1  503
+Exif.CanonSi.ApertureValue                   Short       1  F4
+Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
+Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
+Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
+Exif.Canon.FileNumber                        Long        1  100-1904
+Exif.Canon.OwnerName                         Ascii      32  Robin Mills
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
+Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
+Exif.Photo.FlashpixVersion                   Undefined   4  1.00
+Exif.Photo.ColorSpace                        Short       1  sRGB
+Exif.Photo.PixelXDimension                   Short       1  2592
+Exif.Photo.PixelYDimension                   Short       1  1944
+Exif.Photo.InteroperabilityTag               Long        1  3350
+Exif.Iop.InteroperabilityIndex               Ascii       4  R98
+Exif.Iop.InteroperabilityVersion             Undefined   4  1.00
+Exif.Iop.RelatedImageWidth                   Short       1  2592
+Exif.Iop.RelatedImageLength                  Short       1  1944
+Exif.Photo.FocalPlaneXResolution             Rational    1  11520
+Exif.Photo.FocalPlaneYResolution             Rational    1  11503
+Exif.Photo.FocalPlaneResolutionUnit          Short       1  inch
+Exif.Photo.SensingMethod                     Short       1  One-chip color area
+Exif.Photo.FileSource                        Undefined   1  Digital still camera
+Exif.Photo.CustomRendered                    Short       1  Normal process
+Exif.Photo.ExposureMode                      Short       1  Auto
+Exif.Photo.WhiteBalance                      Short       1  Manual
+Exif.Photo.DigitalZoomRatio                  Rational    1  1.0
+Exif.Photo.SceneCaptureType                  Short       1  Standard
+Exif.Thumbnail.Compression                   Short       1  JPEG (old-style)
+Exif.Thumbnail.XResolution                   Rational    1  180
+Exif.Thumbnail.YResolution                   Rational    1  180
+Exif.Thumbnail.ResolutionUnit                Short       1  inch
+Exif.Thumbnail.JPEGInterchangeFormat         Long        1  3498
+Exif.Thumbnail.JPEGInterchangeFormatLength   Long        1  6714
+File name       : test.png
+File size       : 135047 Bytes
+MIME type       : image/png
+Image size      : 200 x 150
+Camera make     : Canon
+Camera model    : Canon PowerShot S5 IS
+Image timestamp : 2008:09:06 14:34:23
+Image number    : 100-1904
+Exposure time   : 1/500 s
+Aperture        : F4
+Exposure bias   : 0 EV
+Flash           : No, compulsory
+Flash bias      : 0 EV
+Focal length    : 21.3 mm
+Subject distance: 503
+ISO speed       : 80
+Exposure mode   : Program (P)
+Metering mode   : Multi-segment
+Macro mode      : Off
+Image quality   : Fine
+Exif Resolution : 2592 x 1944
+White balance   : Sunny
+Thumbnail       : image/jpeg, 6714 Bytes
+Copyright       : 
+Exif comment    : 
+
+File name       : test.tiff
+File size       : 194752 Bytes
+MIME type       : image/tiff
+Image size      : 282 x 212
+Camera make     : SONY
+Camera model    : DSC-S600
+Image timestamp : 
+Image number    : 
+Exposure time   : 
+Aperture        : 
+Exposure bias   : 
+Flash           : 
+Flash bias      : 
+Focal length    : 
+Subject distance: 
+ISO speed       : 
+Exposure mode   : 
+Metering mode   : 
+Macro mode      : 
+Image quality   : 
+Exif Resolution : 282 x 212
+White balance   : 
+Thumbnail       : None
+Copyright       : 
+Exif comment    : 
+
+Exif.Image.Make                              Ascii       6  Canon
+Exif.Image.Model                             Ascii      22  Canon PowerShot S5 IS
+Exif.Image.Orientation                       Short       1  top, left
+Exif.Image.XResolution                       Rational    1  180
+Exif.Image.YResolution                       Rational    1  180
+Exif.Image.ResolutionUnit                    Short       1  inch
+Exif.Image.DateTime                          Ascii      20  2008:09:06 14:34:23
+Exif.Image.YCbCrPositioning                  Short       1  Centered
+Exif.Image.ExifTag                           Long        1  186
+Exif.Photo.ExposureTime                      Rational    1  1/500 s
+Exif.Photo.FNumber                           Rational    1  F4
+Exif.Photo.ISOSpeedRatings                   Short       1  80
+Exif.Photo.ExifVersion                       Undefined   4  2.20
+Exif.Photo.DateTimeOriginal                  Ascii      20  2008:09:06 14:34:23
+Exif.Photo.DateTimeDigitized                 Ascii      20  2008:09:06 14:34:23
+Exif.Photo.ComponentsConfiguration           Undefined   4  YCbCr
+Exif.Photo.CompressedBitsPerPixel            Rational    1  3
+Exif.Photo.ShutterSpeedValue                 SRational   1  1/501 s
+Exif.Photo.ApertureValue                     Rational    1  F4
+Exif.Photo.ExposureBiasValue                 SRational   1  0 EV
+Exif.Photo.MaxApertureValue                  Rational    1  F3.5
+Exif.Photo.MeteringMode                      Short       1  Multi-segment
+Exif.Photo.Flash                             Short       1  No, compulsory
+Exif.Photo.FocalLength                       Rational    1  21.3 mm
+Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
+Exif.MakerNote.Offset                        Long        1  680
+Exif.MakerNote.ByteOrder                     Ascii       3  MM
+Exif.CanonCs.Macro                           Short       1  Off
+Exif.CanonCs.Selftimer                       Short       1  Off
+Exif.CanonCs.Quality                         Short       1  Fine
+Exif.CanonCs.FlashMode                       Short       1  Off
+Exif.CanonCs.DriveMode                       Short       1  Single / timer
+Exif.CanonCs.FocusMode                       Short       1  Single
+Exif.CanonCs.ImageSize                       Short       1  Medium 1
+Exif.CanonCs.EasyMode                        Short       1  Manual
+Exif.CanonCs.DigitalZoom                     Short       1  None
+Exif.CanonCs.Contrast                        Short       1  Normal
+Exif.CanonCs.Saturation                      Short       1  Normal
+Exif.CanonCs.Sharpness                       Short       1  Normal
+Exif.CanonCs.ISOSpeed                        Short       1  Auto
+Exif.CanonCs.MeteringMode                    Short       1  Evaluative
+Exif.CanonCs.FocusType                       Short       1  Auto
+Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
+Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
+Exif.CanonCs.LensType                        Short       1  (65535)
+Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
+Exif.CanonCs.MaxAperture                     Short       1  F3.6
+Exif.CanonCs.MinAperture                     Short       1  F8
+Exif.CanonCs.FlashActivity                   Short       1  Did not fire
+Exif.CanonCs.FlashDetails                    Short       1  
+Exif.CanonCs.FocusContinuous                 Short       1  Continuous
+Exif.CanonCs.AESetting                       Short       1  Normal AE
+Exif.CanonCs.ImageStabilization              Short       1  On
+Exif.CanonCs.DisplayAperture                 Short       1  0
+Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
+Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
+Exif.CanonCs.PhotoEffect                     Short       1  (65535)
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
+Exif.CanonCs.ColorTone                       Short       1  32767
+Exif.Canon.FocalLength                       Short       4  21.3 mm
+Exif.CanonSi.ISOSpeed                        Short       1  100
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
+Exif.CanonSi.TargetAperture                  Short       1  F4
+Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
+Exif.CanonSi.WhiteBalance                    Short       1  Sunny
+Exif.CanonSi.Sequence                        Short       1  0
+Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
+Exif.CanonSi.FlashBias                       Short       1  0 EV
+Exif.CanonSi.SubjectDistance                 Short       1  503
+Exif.CanonSi.ApertureValue                   Short       1  F4
+Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
+Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
+Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
+Exif.Canon.FileNumber                        Long        1  100-1904
+Exif.Canon.OwnerName                         Ascii      32  Robin Mills
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
+Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
+Exif.Photo.FlashpixVersion                   Undefined   4  1.00
+Exif.Photo.ColorSpace                        Short       1  sRGB
+Exif.Photo.PixelXDimension                   Short       1  2592
+Exif.Photo.PixelYDimension                   Short       1  1944
+Exif.Photo.InteroperabilityTag               Long        1  3350
+Exif.Iop.InteroperabilityIndex               Ascii       4  R98
+Exif.Iop.InteroperabilityVersion             Undefined   4  1.00
+Exif.Iop.RelatedImageWidth                   Short       1  2592
+Exif.Iop.RelatedImageLength                  Short       1  1944
+Exif.Photo.FocalPlaneXResolution             Rational    1  11520
+Exif.Photo.FocalPlaneYResolution             Rational    1  11503
+Exif.Photo.FocalPlaneResolutionUnit          Short       1  inch
+Exif.Photo.SensingMethod                     Short       1  One-chip color area
+Exif.Photo.FileSource                        Undefined   1  Digital still camera
+Exif.Photo.CustomRendered                    Short       1  Normal process
+Exif.Photo.ExposureMode                      Short       1  Auto
+Exif.Photo.WhiteBalance                      Short       1  Manual
+Exif.Photo.DigitalZoomRatio                  Rational    1  1.0
+Exif.Photo.SceneCaptureType                  Short       1  Standard
+Exif.Thumbnail.Compression                   Short       1  JPEG (old-style)
+Exif.Thumbnail.XResolution                   Rational    1  180
+Exif.Thumbnail.YResolution                   Rational    1  180
+Exif.Thumbnail.ResolutionUnit                Short       1  inch
+Exif.Thumbnail.JPEGInterchangeFormat         Long        1  3498
+Exif.Thumbnail.JPEGInterchangeFormatLength   Long        1  6714
+File name       : test.png
+File size       : 135047 Bytes
+MIME type       : image/png
+Image size      : 200 x 150
+Camera make     : Canon
+Camera model    : Canon PowerShot S5 IS
+Image timestamp : 2008:09:06 14:34:23
+Image number    : 100-1904
+Exposure time   : 1/500 s
+Aperture        : F4
+Exposure bias   : 0 EV
+Flash           : No, compulsory
+Flash bias      : 0 EV
+Focal length    : 21.3 mm
+Subject distance: 503
+ISO speed       : 80
+Exposure mode   : Program (P)
+Metering mode   : Multi-segment
+Macro mode      : Off
+Image quality   : Fine
+Exif Resolution : 2592 x 1944
+White balance   : Sunny
+Thumbnail       : image/jpeg, 6714 Bytes
+Copyright       : 
+Exif comment    : 
+
+File name       : test.tiff
+File size       : 194752 Bytes
+MIME type       : image/tiff
+Image size      : 282 x 212
+Camera make     : SONY
+Camera model    : DSC-S600
+Image timestamp : 
+Image number    : 
+Exposure time   : 
+Aperture        : 
+Exposure bias   : 
+Flash           : 
+Flash bias      : 
+Focal length    : 
+Subject distance: 
+ISO speed       : 
+Exposure mode   : 
+Metering mode   : 
+Macro mode      : 
+Image quality   : 
+Exif Resolution : 282 x 212
+White balance   : 
+Thumbnail       : None
+Copyright       : 
+Exif comment    : 
+
+Exif.Image.Make                              Ascii       6  Canon
+Exif.Image.Model                             Ascii      22  Canon PowerShot S5 IS
+Exif.Image.Orientation                       Short       1  top, left
+Exif.Image.XResolution                       Rational    1  180
+Exif.Image.YResolution                       Rational    1  180
+Exif.Image.ResolutionUnit                    Short       1  inch
+Exif.Image.DateTime                          Ascii      20  2008:09:06 14:34:23
+Exif.Image.YCbCrPositioning                  Short       1  Centered
+Exif.Image.ExifTag                           Long        1  186
+Exif.Photo.ExposureTime                      Rational    1  1/500 s
+Exif.Photo.FNumber                           Rational    1  F4
+Exif.Photo.ISOSpeedRatings                   Short       1  80
+Exif.Photo.ExifVersion                       Undefined   4  2.20
+Exif.Photo.DateTimeOriginal                  Ascii      20  2008:09:06 14:34:23
+Exif.Photo.DateTimeDigitized                 Ascii      20  2008:09:06 14:34:23
+Exif.Photo.ComponentsConfiguration           Undefined   4  YCbCr
+Exif.Photo.CompressedBitsPerPixel            Rational    1  3
+Exif.Photo.ShutterSpeedValue                 SRational   1  1/501 s
+Exif.Photo.ApertureValue                     Rational    1  F4
+Exif.Photo.ExposureBiasValue                 SRational   1  0 EV
+Exif.Photo.MaxApertureValue                  Rational    1  F3.5
+Exif.Photo.MeteringMode                      Short       1  Multi-segment
+Exif.Photo.Flash                             Short       1  No, compulsory
+Exif.Photo.FocalLength                       Rational    1  21.3 mm
+Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
+Exif.MakerNote.Offset                        Long        1  680
+Exif.MakerNote.ByteOrder                     Ascii       3  MM
+Exif.CanonCs.Macro                           Short       1  Off
+Exif.CanonCs.Selftimer                       Short       1  Off
+Exif.CanonCs.Quality                         Short       1  Fine
+Exif.CanonCs.FlashMode                       Short       1  Off
+Exif.CanonCs.DriveMode                       Short       1  Single / timer
+Exif.CanonCs.FocusMode                       Short       1  Single
+Exif.CanonCs.ImageSize                       Short       1  Medium 1
+Exif.CanonCs.EasyMode                        Short       1  Manual
+Exif.CanonCs.DigitalZoom                     Short       1  None
+Exif.CanonCs.Contrast                        Short       1  Normal
+Exif.CanonCs.Saturation                      Short       1  Normal
+Exif.CanonCs.Sharpness                       Short       1  Normal
+Exif.CanonCs.ISOSpeed                        Short       1  Auto
+Exif.CanonCs.MeteringMode                    Short       1  Evaluative
+Exif.CanonCs.FocusType                       Short       1  Auto
+Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
+Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
+Exif.CanonCs.LensType                        Short       1  (65535)
+Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
+Exif.CanonCs.MaxAperture                     Short       1  F3.6
+Exif.CanonCs.MinAperture                     Short       1  F8
+Exif.CanonCs.FlashActivity                   Short       1  Did not fire
+Exif.CanonCs.FlashDetails                    Short       1  
+Exif.CanonCs.FocusContinuous                 Short       1  Continuous
+Exif.CanonCs.AESetting                       Short       1  Normal AE
+Exif.CanonCs.ImageStabilization              Short       1  On
+Exif.CanonCs.DisplayAperture                 Short       1  0
+Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
+Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
+Exif.CanonCs.PhotoEffect                     Short       1  (65535)
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
+Exif.CanonCs.ColorTone                       Short       1  32767
+Exif.Canon.FocalLength                       Short       4  21.3 mm
+Exif.CanonSi.ISOSpeed                        Short       1  100
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
+Exif.CanonSi.TargetAperture                  Short       1  F4
+Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
+Exif.CanonSi.WhiteBalance                    Short       1  Sunny
+Exif.CanonSi.Sequence                        Short       1  0
+Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
+Exif.CanonSi.FlashBias                       Short       1  0 EV
+Exif.CanonSi.SubjectDistance                 Short       1  503
+Exif.CanonSi.ApertureValue                   Short       1  F4
+Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
+Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
+Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
+Exif.Canon.FileNumber                        Long        1  100-1904
+Exif.Canon.OwnerName                         Ascii      32  Robin Mills
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
+Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
+Exif.Photo.FlashpixVersion                   Undefined   4  1.00
+Exif.Photo.ColorSpace                        Short       1  sRGB
+Exif.Photo.PixelXDimension                   Short       1  2592
+Exif.Photo.PixelYDimension                   Short       1  1944
+Exif.Photo.InteroperabilityTag               Long        1  3350
+Exif.Iop.InteroperabilityIndex               Ascii       4  R98
+Exif.Iop.InteroperabilityVersion             Undefined   4  1.00
+Exif.Iop.RelatedImageWidth                   Short       1  2592
+Exif.Iop.RelatedImageLength                  Short       1  1944
+Exif.Photo.FocalPlaneXResolution             Rational    1  11520
+Exif.Photo.FocalPlaneYResolution             Rational    1  11503
+Exif.Photo.FocalPlaneResolutionUnit          Short       1  inch
+Exif.Photo.SensingMethod                     Short       1  One-chip color area
+Exif.Photo.FileSource                        Undefined   1  Digital still camera
+Exif.Photo.CustomRendered                    Short       1  Normal process
+Exif.Photo.ExposureMode                      Short       1  Auto
+Exif.Photo.WhiteBalance                      Short       1  Manual
+Exif.Photo.DigitalZoomRatio                  Rational    1  1.0
+Exif.Photo.SceneCaptureType                  Short       1  Standard
+Exif.Thumbnail.Compression                   Short       1  JPEG (old-style)
+Exif.Thumbnail.XResolution                   Rational    1  180
+Exif.Thumbnail.YResolution                   Rational    1  180
+Exif.Thumbnail.ResolutionUnit                Short       1  inch
+Exif.Thumbnail.JPEGInterchangeFormat         Long        1  3498
+Exif.Thumbnail.JPEGInterchangeFormatLength   Long        1  6714
+File name       : test.png
+File size       : 135047 Bytes
+MIME type       : image/png
+Image size      : 200 x 150
+Camera make     : Canon
+Camera model    : Canon PowerShot S5 IS
+Image timestamp : 2008:09:06 14:34:23
+Image number    : 100-1904
+Exposure time   : 1/500 s
+Aperture        : F4
+Exposure bias   : 0 EV
+Flash           : No, compulsory
+Flash bias      : 0 EV
+Focal length    : 21.3 mm
+Subject distance: 503
+ISO speed       : 80
+Exposure mode   : Program (P)
+Metering mode   : Multi-segment
+Macro mode      : Off
+Image quality   : Fine
+Exif Resolution : 2592 x 1944
+White balance   : Sunny
+Thumbnail       : image/jpeg, 6714 Bytes
+Copyright       : 
+Exif comment    : 
+
+File name       : test.tiff
+File size       : 194752 Bytes
+MIME type       : image/tiff
+Image size      : 282 x 212
+Camera make     : SONY
+Camera model    : DSC-S600
+Image timestamp : 
+Image number    : 
+Exposure time   : 
+Aperture        : 
+Exposure bias   : 
+Flash           : 
+Flash bias      : 
+Focal length    : 
+Subject distance: 
+ISO speed       : 
+Exposure mode   : 
+Metering mode   : 
+Macro mode      : 
+Image quality   : 
+Exif Resolution : 282 x 212
+White balance   : 
+Thumbnail       : None
+Copyright       : 
+Exif comment    : 
+
+Exif.Image.Make                              Ascii       6  Canon
+Exif.Image.Model                             Ascii      22  Canon PowerShot S5 IS
+Exif.Image.Orientation                       Short       1  top, left
+Exif.Image.XResolution                       Rational    1  180
+Exif.Image.YResolution                       Rational    1  180
+Exif.Image.ResolutionUnit                    Short       1  inch
+Exif.Image.DateTime                          Ascii      20  2008:09:06 14:34:23
+Exif.Image.YCbCrPositioning                  Short       1  Centered
+Exif.Image.ExifTag                           Long        1  186
+Exif.Photo.ExposureTime                      Rational    1  1/500 s
+Exif.Photo.FNumber                           Rational    1  F4
+Exif.Photo.ISOSpeedRatings                   Short       1  80
+Exif.Photo.ExifVersion                       Undefined   4  2.20
+Exif.Photo.DateTimeOriginal                  Ascii      20  2008:09:06 14:34:23
+Exif.Photo.DateTimeDigitized                 Ascii      20  2008:09:06 14:34:23
+Exif.Photo.ComponentsConfiguration           Undefined   4  YCbCr
+Exif.Photo.CompressedBitsPerPixel            Rational    1  3
+Exif.Photo.ShutterSpeedValue                 SRational   1  1/501 s
+Exif.Photo.ApertureValue                     Rational    1  F4
+Exif.Photo.ExposureBiasValue                 SRational   1  0 EV
+Exif.Photo.MaxApertureValue                  Rational    1  F3.5
+Exif.Photo.MeteringMode                      Short       1  Multi-segment
+Exif.Photo.Flash                             Short       1  No, compulsory
+Exif.Photo.FocalLength                       Rational    1  21.3 mm
+Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
+Exif.MakerNote.Offset                        Long        1  680
+Exif.MakerNote.ByteOrder                     Ascii       3  MM
+Exif.CanonCs.Macro                           Short       1  Off
+Exif.CanonCs.Selftimer                       Short       1  Off
+Exif.CanonCs.Quality                         Short       1  Fine
+Exif.CanonCs.FlashMode                       Short       1  Off
+Exif.CanonCs.DriveMode                       Short       1  Single / timer
+Exif.CanonCs.FocusMode                       Short       1  Single
+Exif.CanonCs.ImageSize                       Short       1  Medium 1
+Exif.CanonCs.EasyMode                        Short       1  Manual
+Exif.CanonCs.DigitalZoom                     Short       1  None
+Exif.CanonCs.Contrast                        Short       1  Normal
+Exif.CanonCs.Saturation                      Short       1  Normal
+Exif.CanonCs.Sharpness                       Short       1  Normal
+Exif.CanonCs.ISOSpeed                        Short       1  Auto
+Exif.CanonCs.MeteringMode                    Short       1  Evaluative
+Exif.CanonCs.FocusType                       Short       1  Auto
+Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
+Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
+Exif.CanonCs.LensType                        Short       1  (65535)
+Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
+Exif.CanonCs.MaxAperture                     Short       1  F3.6
+Exif.CanonCs.MinAperture                     Short       1  F8
+Exif.CanonCs.FlashActivity                   Short       1  Did not fire
+Exif.CanonCs.FlashDetails                    Short       1  
+Exif.CanonCs.FocusContinuous                 Short       1  Continuous
+Exif.CanonCs.AESetting                       Short       1  Normal AE
+Exif.CanonCs.ImageStabilization              Short       1  On
+Exif.CanonCs.DisplayAperture                 Short       1  0
+Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
+Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
+Exif.CanonCs.PhotoEffect                     Short       1  (65535)
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
+Exif.CanonCs.ColorTone                       Short       1  32767
+Exif.Canon.FocalLength                       Short       4  21.3 mm
+Exif.CanonSi.ISOSpeed                        Short       1  100
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
+Exif.CanonSi.TargetAperture                  Short       1  F4
+Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
+Exif.CanonSi.WhiteBalance                    Short       1  Sunny
+Exif.CanonSi.Sequence                        Short       1  0
+Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
+Exif.CanonSi.FlashBias                       Short       1  0 EV
+Exif.CanonSi.SubjectDistance                 Short       1  503
+Exif.CanonSi.ApertureValue                   Short       1  F4
+Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
+Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
+Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
+Exif.Canon.FileNumber                        Long        1  100-1904
+Exif.Canon.OwnerName                         Ascii      32  Robin Mills
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
+Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
+Exif.Photo.FlashpixVersion                   Undefined   4  1.00
+Exif.Photo.ColorSpace                        Short       1  sRGB
+Exif.Photo.PixelXDimension                   Short       1  2592
+Exif.Photo.PixelYDimension                   Short       1  1944
+Exif.Photo.InteroperabilityTag               Long        1  3350
+Exif.Iop.InteroperabilityIndex               Ascii       4  R98
+Exif.Iop.InteroperabilityVersion             Undefined   4  1.00
+Exif.Iop.RelatedImageWidth                   Short       1  2592
+Exif.Iop.RelatedImageLength                  Short       1  1944
+Exif.Photo.FocalPlaneXResolution             Rational    1  11520
+Exif.Photo.FocalPlaneYResolution             Rational    1  11503
+Exif.Photo.FocalPlaneResolutionUnit          Short       1  inch
+Exif.Photo.SensingMethod                     Short       1  One-chip color area
+Exif.Photo.FileSource                        Undefined   1  Digital still camera
+Exif.Photo.CustomRendered                    Short       1  Normal process
+Exif.Photo.ExposureMode                      Short       1  Auto
+Exif.Photo.WhiteBalance                      Short       1  Manual
+Exif.Photo.DigitalZoomRatio                  Rational    1  1.0
+Exif.Photo.SceneCaptureType                  Short       1  Standard
+Exif.Thumbnail.Compression                   Short       1  JPEG (old-style)
+Exif.Thumbnail.XResolution                   Rational    1  180
+Exif.Thumbnail.YResolution                   Rational    1  180
+Exif.Thumbnail.ResolutionUnit                Short       1  inch
+Exif.Thumbnail.JPEGInterchangeFormat         Long        1  3498
+Exif.Thumbnail.JPEGInterchangeFormatLength   Long        1  6714
+File name       : test.png
+File size       : 135047 Bytes
+MIME type       : image/png
+Image size      : 200 x 150
+Camera make     : Canon
+Camera model    : Canon PowerShot S5 IS
+Image timestamp : 2008:09:06 14:34:23
+Image number    : 100-1904
+Exposure time   : 1/500 s
+Aperture        : F4
+Exposure bias   : 0 EV
+Flash           : No, compulsory
+Flash bias      : 0 EV
+Focal length    : 21.3 mm
+Subject distance: 503
+ISO speed       : 80
+Exposure mode   : Program (P)
+Metering mode   : Multi-segment
+Macro mode      : Off
+Image quality   : Fine
+Exif Resolution : 2592 x 1944
+White balance   : Sunny
+Thumbnail       : image/jpeg, 6714 Bytes
+Copyright       : 
+Exif comment    : 
+
+File name       : test.tiff
+File size       : 194752 Bytes
+MIME type       : image/tiff
+Image size      : 282 x 212
+Camera make     : SONY
+Camera model    : DSC-S600
+Image timestamp : 
+Image number    : 
+Exposure time   : 
+Aperture        : 
+Exposure bias   : 
+Flash           : 
+Flash bias      : 
+Focal length    : 
+Subject distance: 
+ISO speed       : 
+Exposure mode   : 
+Metering mode   : 
+Macro mode      : 
+Image quality   : 
+Exif Resolution : 282 x 212
+White balance   : 
+Thumbnail       : None
+Copyright       : 
+Exif comment    : 
+
+-------Debug---------------
+addmoddel.exe 
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+convert-test.exe
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifcomment.exe
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifdata-test.exe
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifprint.exe 
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.exe     
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exivsimple.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iotest.exe    
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iptceasy.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iptcprint.exe 
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iptctest.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+largeiptc-test.exe
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+metacopy.exe  
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+mmap-test.exe 
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+prevtest.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+stringto-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+taglist.exe   
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+tiff-test.exe 
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+utiltest.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+write-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+write2-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+xmpparse.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+xmpparser-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+xmpsample.exe 
+-------DebugDLL---------------
+addmoddel.exe 
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+convert-test.exe
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifcomment.exe
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifdata-test.exe
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifprint.exe 
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.exe     
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+exivsimple.dll
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+iotest.exe    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+iptceasy.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+iptcprint.exe 
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+iptctest.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+largeiptc-test.exe
+libexpat.dll  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+metacopy.exe  
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+mmap-test.exe 
+ntdll.dll     
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+prevtest.exe  
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+stringto-test.exe
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+taglist.exe   
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+tiff-test.exe 
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+utiltest.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+write-test.exe
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+write2-test.exe
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+xmpparse.exe  
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+xmpparser-test.exe
+zlib1d.dll    
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2d.dll    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+xmpsample.exe 
+zlib1d.dll    
+-------Release---------------
+addmoddel.exe 
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+convert-test.exe
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifcomment.exe
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifdata-test.exe
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifprint.exe 
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.exe     
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exivsimple.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iotest.exe    
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iptceasy.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iptcprint.exe 
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+iptctest.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+largeiptc-test.exe
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+metacopy.exe  
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+mmap-test.exe 
+ntdll.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+prevtest.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+stringto-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+taglist.exe   
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+tiff-test.exe 
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+utiltest.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+write-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+write2-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+xmpparse.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+xmpparser-test.exe
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+xmpsample.exe 
+-------ReleaseDLL---------------
+addmoddel.exe 
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+convert-test.exe
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifcomment.exe
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifdata-test.exe
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exifprint.exe 
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+exiv2.exe     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+exivsimple.dll
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+iotest.exe    
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+iptceasy.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+iptcprint.exe 
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+iptctest.exe  
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+largeiptc-test.exe
+libexpat.dll  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+metacopy.exe  
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+mmap-test.exe 
+ntdll.dll     
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+prevtest.exe  
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+stringto-test.exe
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+taglist.exe   
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+tiff-test.exe 
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+KERNEL32.dll  
+KERNELBASE.dll
+ntdll.dll     
+utiltest.exe  
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+write-test.exe
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+write2-test.exe
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+xmpparse.exe  
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+xmpparser-test.exe
+zlib1.dll     
+API-MS-Win-Core-Debug-L1-1-0.dll
+API-MS-Win-Core-ErrorHandling-L1-1-0.dll
+API-MS-Win-Core-Fibers-L1-1-0.dll
+API-MS-Win-Core-File-L1-1-0.dll
+API-MS-Win-Core-Handle-L1-1-0.dll
+API-MS-Win-Core-Heap-L1-1-0.dll
+API-MS-Win-Core-IO-L1-1-0.dll
+API-MS-Win-Core-LibraryLoader-L1-1-0.dll
+API-MS-Win-Core-Localization-L1-1-0.dll
+API-MS-Win-Core-Memory-L1-1-0.dll
+API-MS-Win-Core-Misc-L1-1-0.dll
+API-MS-Win-Core-NamedPipe-L1-1-0.dll
+API-MS-Win-Core-ProcessEnvironment-L1-1-0.dll
+API-MS-Win-Core-ProcessThreads-L1-1-0.dll
+API-MS-Win-Core-Profile-L1-1-0.dll
+API-MS-Win-Core-RtlSupport-L1-1-0.dll
+API-MS-Win-Core-String-L1-1-0.dll
+API-MS-Win-Core-Synch-L1-1-0.dll
+API-MS-Win-Core-SysInfo-L1-1-0.dll
+API-MS-Win-Core-ThreadPool-L1-1-0.dll
+API-MS-Win-Core-Util-L1-1-0.dll
+API-MS-Win-Security-Base-L1-1-0.dll
+exiv2.dll     
+KERNEL32.dll  
+KERNELBASE.dll
+libexpat.dll  
+ntdll.dll     
+xmpsample.exe 
+zlib1.dll     
diff -Nru exiv2-0.19/msvc/runner.txt exiv2-0.21/msvc/runner.txt
--- exiv2-0.19/msvc/runner.txt	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/msvc/runner.txt	2010-07-18 21:03:36.000000000 +0000
@@ -44,11 +44,15 @@
 text        nok         nok         nok
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -62,23 +66,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -86,16 +118,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -299,7 +365,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -307,7 +373,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -365,7 +431,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -374,7 +440,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -446,11 +512,15 @@
 text        nok         nok         nok
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -464,23 +534,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -488,16 +586,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -701,7 +833,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -709,7 +841,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -767,7 +899,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -776,7 +908,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -848,11 +980,15 @@
 text        nok         nok         nok
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -866,23 +1002,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -890,16 +1054,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -1103,7 +1301,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -1111,7 +1309,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -1169,7 +1367,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -1178,7 +1376,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -1250,11 +1448,15 @@
 text        nok         nok         nok
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -1268,23 +1470,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -1292,16 +1522,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -1505,7 +1769,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -1513,7 +1777,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -1571,7 +1835,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -1580,7 +1844,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -1788,11 +2052,15 @@
 text        nok         nok         nok
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -1806,23 +2074,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -1830,16 +2126,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -1989,11 +2319,15 @@
 GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -2007,23 +2341,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -2031,16 +2393,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -2190,11 +2586,15 @@
 GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -2208,23 +2608,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -2232,16 +2660,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -2391,11 +2853,15 @@
 GPSDifferential,	30,	0x001e,	GPSInfo,	Exif.GPSInfo.GPSDifferential,	Short,	Indicates whether differential correction is applied to the GPS receiver.
 ProcessingSoftware,	11,	0x000b,	IFD0,	Exif.Image.ProcessingSoftware,	Ascii,	The name and version of the software used to post-process the picture.
 NewSubfileType,	254,	0x00fe,	IFD0,	Exif.Image.NewSubfileType,	Long,	A general indication of the kind of data contained in this subfile.
+SubfileType,	255,	0x00ff,	IFD0,	Exif.Image.SubfileType,	Short,	A general indication of the kind of data contained in this subfile. This field is deprecated. The NewSubfileType field should be used instead.
 ImageWidth,	256,	0x0100,	IFD0,	Exif.Image.ImageWidth,	Long,	The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 ImageLength,	257,	0x0101,	IFD0,	Exif.Image.ImageLength,	Long,	The number of rows of image data. In JPEG compressed data a JPEG marker is used instead of this tag.
 BitsPerSample,	258,	0x0102,	IFD0,	Exif.Image.BitsPerSample,	Short,	The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag.
 Compression,	259,	0x0103,	IFD0,	Exif.Image.Compression,	Short,	The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6.
 PhotometricInterpretation,	262,	0x0106,	IFD0,	Exif.Image.PhotometricInterpretation,	Short,	The pixel composition. In JPEG compressed data a JPEG marker is used instead of this tag.
+Threshholding,	263,	0x0107,	IFD0,	Exif.Image.Threshholding,	Short,	For black and white TIFF files that represent shades of gray, the technique used to convert from gray to black and white pixels.
+CellWidth,	264,	0x0108,	IFD0,	Exif.Image.CellWidth,	Short,	The width of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
+CellLength,	265,	0x0109,	IFD0,	Exif.Image.CellLength,	Short,	The length of the dithering or halftoning matrix used to create a dithered or halftoned bilevel file.
 FillOrder,	266,	0x010a,	IFD0,	Exif.Image.FillOrder,	Short,	The logical order of bits within a byte
 DocumentName,	269,	0x010d,	IFD0,	Exif.Image.DocumentName,	Ascii,	The name of the document from which this image was scanned
 ImageDescription,	270,	0x010e,	IFD0,	Exif.Image.ImageDescription,	Ascii,	A character string giving the title of the image. It may be a comment such as "1988 company picnic" or the like. Two-bytes character codes cannot be used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> is to be used.
@@ -2409,23 +2875,51 @@
 XResolution,	282,	0x011a,	IFD0,	Exif.Image.XResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 YResolution,	283,	0x011b,	IFD0,	Exif.Image.YResolution,	Rational,	The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated.
 PlanarConfiguration,	284,	0x011c,	IFD0,	Exif.Image.PlanarConfiguration,	Short,	Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed.
+GrayResponseUnit,	290,	0x0122,	IFD0,	Exif.Image.GrayResponseUnit,	Short,	The precision of the information contained in the GrayResponseCurve.
+GrayResponseCurve,	291,	0x0123,	IFD0,	Exif.Image.GrayResponseCurve,	Short,	For grayscale data, the optical density of each possible pixel value.
+T4Options,	292,	0x0124,	IFD0,	Exif.Image.T4Options,	Long,	T.4-encoding options.
+T6Options,	293,	0x0125,	IFD0,	Exif.Image.T6Options,	Long,	T.6-encoding options.
 ResolutionUnit,	296,	0x0128,	IFD0,	Exif.Image.ResolutionUnit,	Short,	The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated.
 TransferFunction,	301,	0x012d,	IFD0,	Exif.Image.TransferFunction,	Short,	A transfer function for the image, described in tabular style. Normally this tag is not necessary, since color space is specified in the color space information tag (<ColorSpace>).
 Software,	305,	0x0131,	IFD0,	Exif.Image.Software,	Ascii,	This tag records the name and version of the software or firmware of the camera or image input device used to generate the image. The detailed format is not specified, but it is recommended that the example shown below be followed. When the field is left blank, it is treated as unknown.
 DateTime,	306,	0x0132,	IFD0,	Exif.Image.DateTime,	Ascii,	The date and time of image creation. In Exif standard, it is the date and time the file was changed.
-HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
 Artist,	315,	0x013b,	IFD0,	Exif.Image.Artist,	Ascii,	This tag records the name of the camera owner, photographer or image creator. The detailed format is not specified, but it is recommended that the information be written as in the example below for ease of Interoperability. When the field is left blank, it is treated as unknown. Ex.) "Camera owner, John Smith; Photographer, Michael Brown; Image creator, Ken James"
+HostComputer,	316,	0x013c,	IFD0,	Exif.Image.HostComputer,	Ascii,	This tag records information about the host computer used to generate the image.
+Predictor,	317,	0x013d,	IFD0,	Exif.Image.Predictor,	Short,	A predictor is a mathematical operator that is applied to the image data before an encoding scheme is applied.
 WhitePoint,	318,	0x013e,	IFD0,	Exif.Image.WhitePoint,	Rational,	The chromaticity of the white point of the image. Normally this tag is not necessary, since color space is specified in the colorspace information tag (<ColorSpace>).
 PrimaryChromaticities,	319,	0x013f,	IFD0,	Exif.Image.PrimaryChromaticities,	Rational,	The chromaticity of the three primary colors of the image. Normally this tag is not necessary, since colorspace is specified in the colorspace information tag (<ColorSpace>).
+ColorMap,	320,	0x0140,	IFD0,	Exif.Image.ColorMap,	Short,	A color map for palette color images. This field defines a Red-Green-Blue color map (often called a lookup table) for palette-color images. In a palette-color image, a pixel value is used to index into an RGB lookup table.
+HalftoneHints,	321,	0x0141,	IFD0,	Exif.Image.HalftoneHints,	Short,	The purpose of the HalftoneHints field is to convey to the halftone function the range of gray levels within a colorimetrically-specified image that should retain tonal detail.
 TileWidth,	322,	0x0142,	IFD0,	Exif.Image.TileWidth,	Short,	The tile width in pixels. This is the number of columns in each tile.
 TileLength,	323,	0x0143,	IFD0,	Exif.Image.TileLength,	Short,	The tile length (height) in pixels. This is the number of rows in each tile.
 TileOffsets,	324,	0x0144,	IFD0,	Exif.Image.TileOffsets,	Short,	For each tile, the byte offset of that tile, as compressed and stored on disk. The offset is specified with respect to the beginning of the TIFF file. Note that this implies that each tile has a location independent of the locations of other tiles.
 TileByteCounts,	325,	0x0145,	IFD0,	Exif.Image.TileByteCounts,	Short,	For each tile, the number of (compressed) bytes in that tile. See TileOffsets for a description of how the byte counts are ordered.
 SubIFDs,	330,	0x014a,	IFD0,	Exif.Image.SubIFDs,	Long,	Defined by Adobe Corporation to enable TIFF Trees within a TIFF file.
+InkSet,	332,	0x014c,	IFD0,	Exif.Image.InkSet,	Short,	The set of inks used in a separated (PhotometricInterpretation=5) image.
+InkNames,	333,	0x014d,	IFD0,	Exif.Image.InkNames,	Ascii,	The name of each ink used in a separated (PhotometricInterpretation=5) image.
+NumberOfInks,	334,	0x014e,	IFD0,	Exif.Image.NumberOfInks,	Short,	The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples.
+DotRange,	336,	0x0150,	IFD0,	Exif.Image.DotRange,	Byte,	The component values that correspond to a 0% dot and 100% dot.
+TargetPrinter,	337,	0x0151,	IFD0,	Exif.Image.TargetPrinter,	Ascii,	A description of the printing environment for which this separation is intended.
+ExtraSamples,	338,	0x0152,	IFD0,	Exif.Image.ExtraSamples,	Short,	Specifies that each pixel has m extra components whose interpretation is defined by one of the values listed below.
+SampleFormat,	339,	0x0153,	IFD0,	Exif.Image.SampleFormat,	Short,	This field specifies how to interpret each data sample in a pixel.
+SMinSampleValue,	340,	0x0154,	IFD0,	Exif.Image.SMinSampleValue,	Short,	This field specifies the minimum sample value.
+SMaxSampleValue,	341,	0x0155,	IFD0,	Exif.Image.SMaxSampleValue,	Short,	This field specifies the maximum sample value.
 TransferRange,	342,	0x0156,	IFD0,	Exif.Image.TransferRange,	Short,	Expands the range of the TransferFunction
+ClipPath,	343,	0x0157,	IFD0,	Exif.Image.ClipPath,	Byte,	A TIFF ClipPath is intended to mirror the essentials of PostScript's path creation functionality.
+XClipPathUnits,	344,	0x0158,	IFD0,	Exif.Image.XClipPathUnits,	SShort,	The number of units that span the width of the image, in terms of integer ClipPath coordinates.
+YClipPathUnits,	345,	0x0159,	IFD0,	Exif.Image.YClipPathUnits,	SShort,	The number of units that span the height of the image, in terms of integer ClipPath coordinates.
+Indexed,	346,	0x015a,	IFD0,	Exif.Image.Indexed,	Short,	Indexed images are images where the 'pixels' do not represent color values, but rather an index (usually 8-bit) into a separate color table, the ColorMap.
+JPEGTables,	347,	0x015b,	IFD0,	Exif.Image.JPEGTables,	Undefined,	This optional tag may be used to encode the JPEG quantization andHuffman tables for subsequent use by the JPEG decompression process.
+OPIProxy,	351,	0x015f,	IFD0,	Exif.Image.OPIProxy,	Short,	OPIProxy gives information concerning whether this image is a low-resolution proxy of a high-resolution image (Adobe OPI).
 JPEGProc,	512,	0x0200,	IFD0,	Exif.Image.JPEGProc,	Long,	This field indicates the process used to produce the compressed data
 JPEGInterchangeFormat,	513,	0x0201,	IFD0,	Exif.Image.JPEGInterchangeFormat,	Long,	The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 JPEGInterchangeFormatLength,	514,	0x0202,	IFD0,	Exif.Image.JPEGInterchangeFormatLength,	Long,	The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1.
+JPEGRestartInterval,	515,	0x0203,	IFD0,	Exif.Image.JPEGRestartInterval,	Short,	This Field indicates the length of the restart interval used in the compressed image data.
+JPEGLosslessPredictors,	517,	0x0205,	IFD0,	Exif.Image.JPEGLosslessPredictors,	Short,	This Field points to a list of lossless predictor-selection values, one per component.
+JPEGPointTransforms,	518,	0x0206,	IFD0,	Exif.Image.JPEGPointTransforms,	Short,	This Field points to a list of point transform values, one per component.
+JPEGQTables,	519,	0x0207,	IFD0,	Exif.Image.JPEGQTables,	Long,	This Field points to a list of offsets to the quantization tables, one per component.
+JPEGDCTables,	520,	0x0208,	IFD0,	Exif.Image.JPEGDCTables,	Long,	This Field points to a list of offsets to the DC Huffman tables or the lossless Huffman tables, one per component.
+JPEGACTables,	521,	0x0209,	IFD0,	Exif.Image.JPEGACTables,	Long,	This Field points to a list of offsets to the Huffman AC tables, one per component.
 YCbCrCoefficients,	529,	0x0211,	IFD0,	Exif.Image.YCbCrCoefficients,	Rational,	The matrix coefficients for transformation from RGB to YCbCr image data. No default is given in TIFF; but here the value given in Appendix E, "Color Space Guidelines", is used as the default. The color space is declared in a color space information tag, with the default being the value that gives the optimal image characteristics Interoperability this condition.
 YCbCrSubSampling,	530,	0x0212,	IFD0,	Exif.Image.YCbCrSubSampling,	Short,	The sampling ratio of chrominance components in relation to the luminance component. In JPEG compressed data a JPEG marker is used instead of this tag.
 YCbCrPositioning,	531,	0x0213,	IFD0,	Exif.Image.YCbCrPositioning,	Short,	The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning.
@@ -2433,16 +2927,50 @@
 XMLPacket,	700,	0x02bc,	IFD0,	Exif.Image.XMLPacket,	Byte,	XMP Metadata (Adobe technote 9-14-02)
 Rating,	18246,	0x4746,	IFD0,	Exif.Image.Rating,	Short,	Rating tag used by Windows
 RatingPercent,	18249,	0x4749,	IFD0,	Exif.Image.RatingPercent,	Short,	Rating tag used by Windows, value in percent
+ImageID,	32781,	0x800d,	IFD0,	Exif.Image.ImageID,	Ascii,	ImageID is the full pathname of the original, high-resolution image, or any other identifying string that uniquely identifies the original image (Adobe OPI).
 CFARepeatPatternDim,	33421,	0x828d,	IFD0,	Exif.Image.CFARepeatPatternDim,	Short,	Contains two values representing the minimum rows and columns to define the repeating patterns of the color filter array
 CFAPattern,	33422,	0x828e,	IFD0,	Exif.Image.CFAPattern,	Byte,	Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used. It does not apply to all sensing methods
 BatteryLevel,	33423,	0x828f,	IFD0,	Exif.Image.BatteryLevel,	Rational,	Contains a value of the battery level as a fraction or string
-IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
 Copyright,	33432,	0x8298,	IFD0,	Exif.Image.Copyright,	Ascii,	Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., "Copyright, John Smith, 19xx. All rights reserved.". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case since the statement also ends with a NULL, there are two NULL codes). When only the photographer copyright is given, it is terminated by one NULL code . When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given. When the field is left blank, it is treated as unknown.
-ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Undefined,	Contains information embedded by the Adobe Photoshop application
+ExposureTime,	33434,	0x829a,	IFD0,	Exif.Image.ExposureTime,	Rational,	Exposure time, given in seconds.
+FNumber,	33437,	0x829d,	IFD0,	Exif.Image.FNumber,	Rational,	The F number.
+IPTCNAA,	33723,	0x83bb,	IFD0,	Exif.Image.IPTCNAA,	Long,	Contains an IPTC/NAA record
+ImageResources,	34377,	0x8649,	IFD0,	Exif.Image.ImageResources,	Byte,	Contains information embedded by the Adobe Photoshop application
 ExifTag,	34665,	0x8769,	IFD0,	Exif.Image.ExifTag,	Long,	A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF.
 InterColorProfile,	34675,	0x8773,	IFD0,	Exif.Image.InterColorProfile,	Undefined,	Contains an InterColor Consortium (ICC) format color space characterization/profile
+ExposureProgram,	34850,	0x8822,	IFD0,	Exif.Image.ExposureProgram,	Short,	The class of the program used by the camera to set exposure when the picture is taken.
+SpectralSensitivity,	34852,	0x8824,	IFD0,	Exif.Image.SpectralSensitivity,	Ascii,	Indicates the spectral sensitivity of each channel of the camera used.
 GPSTag,	34853,	0x8825,	IFD0,	Exif.Image.GPSTag,	Long,	A pointer to the GPS Info IFD. The Interoperability structure of the GPS Info IFD, like that of Exif IFD, has no image data.
+ISOSpeedRatings,	34855,	0x8827,	IFD0,	Exif.Image.ISOSpeedRatings,	Short,	Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+OECF,	34856,	0x8828,	IFD0,	Exif.Image.OECF,	Undefined,	Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+Interlace,	34857,	0x8829,	IFD0,	Exif.Image.Interlace,	Short,	Indicates the field number of multifield images.
+TimeZoneOffset,	34858,	0x882a,	IFD0,	Exif.Image.TimeZoneOffset,	SShort,	This optional tag encodes the time zone of the camera clock (relativeto Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the picture was taken. It may also contain the time zone offsetof the clock used to create the DateTime tag-value when the image wasmodified.
+SelfTimerMode,	34859,	0x882b,	IFD0,	Exif.Image.SelfTimerMode,	Short,	Number of seconds image capture was delayed from button press.
+DateTimeOriginal,	36867,	0x9003,	IFD0,	Exif.Image.DateTimeOriginal,	Ascii,	The date and time when the original image data was generated.
+CompressedBitsPerPixel,	37122,	0x9102,	IFD0,	Exif.Image.CompressedBitsPerPixel,	Rational,	Specific to compressed data; states the compressed bits per pixel.
+ShutterSpeedValue,	37377,	0x9201,	IFD0,	Exif.Image.ShutterSpeedValue,	SRational,	Shutter speed.
+ApertureValue,	37378,	0x9202,	IFD0,	Exif.Image.ApertureValue,	Rational,	The lens aperture.
+BrightnessValue,	37379,	0x9203,	IFD0,	Exif.Image.BrightnessValue,	SRational,	The value of brightness.
+ExposureBiasValue,	37380,	0x9204,	IFD0,	Exif.Image.ExposureBiasValue,	SRational,	The exposure bias.
+MaxApertureValue,	37381,	0x9205,	IFD0,	Exif.Image.MaxApertureValue,	Rational,	The smallest F number of the lens.
+SubjectDistance,	37382,	0x9206,	IFD0,	Exif.Image.SubjectDistance,	SRational,	The distance to the subject, given in meters.
+MeteringMode,	37383,	0x9207,	IFD0,	Exif.Image.MeteringMode,	Short,	The metering mode.
+LightSource,	37384,	0x9208,	IFD0,	Exif.Image.LightSource,	Short,	The kind of light source.
+Flash,	37385,	0x9209,	IFD0,	Exif.Image.Flash,	Short,	Indicates the status of flash when the image was shot.
+FocalLength,	37386,	0x920a,	IFD0,	Exif.Image.FocalLength,	Rational,	The actual focal length of the lens, in mm.
+FlashEnergy,	37387,	0x920b,	IFD0,	Exif.Image.FlashEnergy,	Rational,	Amount of flash energy (BCPS).
+SpatialFrequencyResponse,	37388,	0x920c,	IFD0,	Exif.Image.SpatialFrequencyResponse,	Undefined,	SFR of the camera.
+Noise,	37389,	0x920d,	IFD0,	Exif.Image.Noise,	Undefined,	Noise measurement values.
+FocalPlaneXResolution,	37390,	0x920e,	IFD0,	Exif.Image.FocalPlaneXResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image.
+FocalPlaneYResolution,	37391,	0x920f,	IFD0,	Exif.Image.FocalPlaneYResolution,	Rational,	Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image.
+FocalPlaneResolutionUnit,	37392,	0x9210,	IFD0,	Exif.Image.FocalPlaneResolutionUnit,	Short,	Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391).
+ImageNumber,	37393,	0x9211,	IFD0,	Exif.Image.ImageNumber,	Long,	Number assigned to an image, e.g., in a chained image burst.
+SecurityClassification,	37394,	0x9212,	IFD0,	Exif.Image.SecurityClassification,	Ascii,	Security classification assigned to the image.
+ImageHistory,	37395,	0x9213,	IFD0,	Exif.Image.ImageHistory,	Ascii,	Record of what has been done to the image.
+SubjectLocation,	37396,	0x9214,	IFD0,	Exif.Image.SubjectLocation,	Short,	Indicates the location and area of the main subject in the overall scene.
+ExposureIndex,	37397,	0x9215,	IFD0,	Exif.Image.ExposureIndex,	Rational,	Encodes the camera exposure index setting when image was captured.
 TIFFEPStandardID,	37398,	0x9216,	IFD0,	Exif.Image.TIFFEPStandardID,	Byte,	Contains four ASCII characters representing the TIFF/EP standard version of a TIFF/EP file, eg '1', '0', '0', '0'
+SensingMethod,	37399,	0x9217,	IFD0,	Exif.Image.SensingMethod,	Short,	Type of image sensor.
 XPTitle,	40091,	0x9c9b,	IFD0,	Exif.Image.XPTitle,	Byte,	Title tag used by Windows, encoded in UCS2
 XPComment,	40092,	0x9c9c,	IFD0,	Exif.Image.XPComment,	Byte,	Comment tag used by Windows, encoded in UCS2
 XPAuthor,	40093,	0x9c9d,	IFD0,	Exif.Image.XPAuthor,	Byte,	Author tag used by Windows, encoded in UCS2
@@ -2733,7 +3261,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -2741,7 +3269,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -2799,7 +3327,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -2808,7 +3336,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -2861,7 +3389,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -2869,7 +3397,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -2927,7 +3455,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -2936,7 +3464,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -2989,7 +3517,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -2997,7 +3525,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -3055,7 +3583,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -3064,7 +3592,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -3117,7 +3645,7 @@
 Xmp.xmpBJ.JobRef[2]/stJob:name               XmpText    16  Wedding ceremony
 Xmp.xmpBJ.JobRef[2]/stJob:role               XmpText     8  Best man
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.1.1-Exiv2">
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -3125,7 +3653,7 @@
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
-    xmlns:xapBJ="http://ns.adobe.com/xap/1.0/bj/"
+    xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
     xmlns:stJob="http://ns.adobe.com/xap/1.0/sType/Job#"
    dc:source="xmpsample.cpp"
    dc:one="-1"
@@ -3183,7 +3711,7 @@
     stDim:w="16"
     stDim:h="9"
     stDim:unit="inch"/>
-   <xapBJ:JobRef>
+   <xmpBJ:JobRef>
     <rdf:Bag>
      <rdf:li
       stJob:name="Birthday party"
@@ -3192,7 +3720,7 @@
       stJob:name="Wedding ceremony"
       stJob:role="Best man"/>
     </rdf:Bag>
-   </xapBJ:JobRef>
+   </xmpBJ:JobRef>
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
@@ -3245,18 +3773,12 @@
 Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
 Exif.MakerNote.Offset                        Long        1  680
 Exif.MakerNote.ByteOrder                     Ascii       3  MM
-Exif.Canon.0x0000                            Short       6  0 0 0 0 0 1
-Exif.Canon.0x0000                            Short      20  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.CanonCs.0x0000                          Short       1  92
 Exif.CanonCs.Macro                           Short       1  Off
 Exif.CanonCs.Selftimer                       Short       1  Off
 Exif.CanonCs.Quality                         Short       1  Fine
 Exif.CanonCs.FlashMode                       Short       1  Off
 Exif.CanonCs.DriveMode                       Short       1  Single / timer
-Exif.CanonCs.0x0006                          Short       1  0
 Exif.CanonCs.FocusMode                       Short       1  Single
-Exif.CanonCs.0x0008                          Short       1  65535
-Exif.CanonCs.0x0009                          Short       1  1
 Exif.CanonCs.ImageSize                       Short       1  Medium 1
 Exif.CanonCs.EasyMode                        Short       1  Manual
 Exif.CanonCs.DigitalZoom                     Short       1  None
@@ -3268,86 +3790,44 @@
 Exif.CanonCs.FocusType                       Short       1  Auto
 Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
 Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
-Exif.CanonCs.0x0015                          Short       1  32767
 Exif.CanonCs.LensType                        Short       1  (65535)
 Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
 Exif.CanonCs.MaxAperture                     Short       1  F3.6
 Exif.CanonCs.MinAperture                     Short       1  F8
 Exif.CanonCs.FlashActivity                   Short       1  Did not fire
 Exif.CanonCs.FlashDetails                    Short       1  
-Exif.CanonCs.0x001e                          Short       1  0
-Exif.CanonCs.0x001f                          Short       1  0
 Exif.CanonCs.FocusContinuous                 Short       1  Continuous
 Exif.CanonCs.AESetting                       Short       1  Normal AE
 Exif.CanonCs.ImageStabilization              Short       1  On
 Exif.CanonCs.DisplayAperture                 Short       1  0
 Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
 Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
-Exif.CanonCs.0x0026                          Short       1  0
-Exif.CanonCs.0x0027                          Short       1  0
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
 Exif.CanonCs.PhotoEffect                     Short       1  (65535)
-Exif.CanonCs.0x0029                          Short       1  0
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
 Exif.CanonCs.ColorTone                       Short       1  32767
-Exif.CanonCs.0x002b                          Short       1  32767
-Exif.CanonCs.0x002c                          Short       1  0
-Exif.CanonCs.0x002d                          Short       1  0
 Exif.Canon.FocalLength                       Short       4  21.3 mm
-Exif.Canon.0x0003                            Short       4  0 0 0 0
-Exif.CanonSi.0x0000                          Short       1  68
-Exif.CanonSi.0x0001                          Short       1  65523
 Exif.CanonSi.ISOSpeed                        Short       1  100
-Exif.CanonSi.0x0003                          Short       1  296
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
 Exif.CanonSi.TargetAperture                  Short       1  F4
 Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
-Exif.CanonSi.0x0006                          Short       1  0
 Exif.CanonSi.WhiteBalance                    Short       1  Sunny
-Exif.CanonSi.0x0008                          Short       1  0
 Exif.CanonSi.Sequence                        Short       1  0
-Exif.CanonSi.0x000a                          Short       1  64
-Exif.CanonSi.0x000b                          Short       1  0
-Exif.CanonSi.0x000c                          Short       1  0
-Exif.CanonSi.0x000d                          Short       1  0
 Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
 Exif.CanonSi.FlashBias                       Short       1  0 EV
-Exif.CanonSi.0x0010                          Short       1  0
-Exif.CanonSi.0x0011                          Short       1  0
-Exif.CanonSi.0x0012                          Short       1  1
 Exif.CanonSi.SubjectDistance                 Short       1  503
-Exif.CanonSi.0x0014                          Short       1  0
 Exif.CanonSi.ApertureValue                   Short       1  F4
 Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
-Exif.CanonSi.0x0017                          Short       1  0
-Exif.CanonSi.0x0018                          Short       1  0
-Exif.CanonSi.0x0019                          Short       1  0
-Exif.CanonSi.0x001a                          Short       1  250
-Exif.CanonSi.0x001b                          Short       1  0
-Exif.CanonSi.0x001c                          Short       1  0
-Exif.CanonSi.0x001d                          Short       1  0
-Exif.CanonSi.0x001e                          Short       1  0
-Exif.CanonSi.0x001f                          Short       1  0
-Exif.CanonSi.0x0020                          Short       1  0
-Exif.CanonSi.0x0021                          Short       1  0
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
 Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
-Exif.Canon.ImageNumber                       Long        1  100-1904
+Exif.Canon.FileNumber                        Long        1  100-1904
 Exif.Canon.OwnerName                         Ascii      32  Robin Mills
-Exif.Canon.0x000d                            Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
 Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
-Exif.Canon.0x0013                            Short       4  0 0 0 0
-Exif.Canon.0x0018                            Byte      256  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 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 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0019                            Short       1  1
-Exif.Canon.0x001a                            Short       1  0
-Exif.Canon.0x001c                            Short       1  0
-Exif.Canon.0x001d                            Short      16  32 1 12 2 2 2 2 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x001e                            Long        1  16843264
-Exif.Canon.0x001f                            Short      69  138 1 0 4 8 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 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 0 0 0 0 0 0
-Exif.Canon.0x0022                            Short     208  416 0 0 16 8 1 1 640 480 0 0 0 0 0 8 384 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0023                            Long        2  8 0
-Exif.Canon.0x0024                            Short      78  156 35 0 0 0 1 1 16 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 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 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0025                            Byte       14  14 35 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0026                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
-Exif.Canon.0x0027                            Short       6  6 0 0 5676 4752 56834
-Exif.Canon.0x0028                            Byte       16  44 22 144 18 2 222 51 19 3 97 148 189 85 40 198 44 
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
 Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
 Exif.Photo.FlashpixVersion                   Undefined   4  1.00
 Exif.Photo.ColorSpace                        Short       1  sRGB
@@ -3398,7 +3878,7 @@
 White balance   : Sunny
 Thumbnail       : image/jpeg, 6714 Bytes
 Copyright       : 
-Exif comment    : 
+Exif comment    : 
 
 File name       : test.tiff
 File size       : 194752 Bytes
@@ -3453,18 +3933,12 @@
 Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
 Exif.MakerNote.Offset                        Long        1  680
 Exif.MakerNote.ByteOrder                     Ascii       3  MM
-Exif.Canon.0x0000                            Short       6  0 0 0 0 0 1
-Exif.Canon.0x0000                            Short      20  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.CanonCs.0x0000                          Short       1  92
 Exif.CanonCs.Macro                           Short       1  Off
 Exif.CanonCs.Selftimer                       Short       1  Off
 Exif.CanonCs.Quality                         Short       1  Fine
 Exif.CanonCs.FlashMode                       Short       1  Off
 Exif.CanonCs.DriveMode                       Short       1  Single / timer
-Exif.CanonCs.0x0006                          Short       1  0
 Exif.CanonCs.FocusMode                       Short       1  Single
-Exif.CanonCs.0x0008                          Short       1  65535
-Exif.CanonCs.0x0009                          Short       1  1
 Exif.CanonCs.ImageSize                       Short       1  Medium 1
 Exif.CanonCs.EasyMode                        Short       1  Manual
 Exif.CanonCs.DigitalZoom                     Short       1  None
@@ -3476,86 +3950,44 @@
 Exif.CanonCs.FocusType                       Short       1  Auto
 Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
 Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
-Exif.CanonCs.0x0015                          Short       1  32767
 Exif.CanonCs.LensType                        Short       1  (65535)
 Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
 Exif.CanonCs.MaxAperture                     Short       1  F3.6
 Exif.CanonCs.MinAperture                     Short       1  F8
 Exif.CanonCs.FlashActivity                   Short       1  Did not fire
 Exif.CanonCs.FlashDetails                    Short       1  
-Exif.CanonCs.0x001e                          Short       1  0
-Exif.CanonCs.0x001f                          Short       1  0
 Exif.CanonCs.FocusContinuous                 Short       1  Continuous
 Exif.CanonCs.AESetting                       Short       1  Normal AE
 Exif.CanonCs.ImageStabilization              Short       1  On
 Exif.CanonCs.DisplayAperture                 Short       1  0
 Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
 Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
-Exif.CanonCs.0x0026                          Short       1  0
-Exif.CanonCs.0x0027                          Short       1  0
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
 Exif.CanonCs.PhotoEffect                     Short       1  (65535)
-Exif.CanonCs.0x0029                          Short       1  0
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
 Exif.CanonCs.ColorTone                       Short       1  32767
-Exif.CanonCs.0x002b                          Short       1  32767
-Exif.CanonCs.0x002c                          Short       1  0
-Exif.CanonCs.0x002d                          Short       1  0
 Exif.Canon.FocalLength                       Short       4  21.3 mm
-Exif.Canon.0x0003                            Short       4  0 0 0 0
-Exif.CanonSi.0x0000                          Short       1  68
-Exif.CanonSi.0x0001                          Short       1  65523
 Exif.CanonSi.ISOSpeed                        Short       1  100
-Exif.CanonSi.0x0003                          Short       1  296
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
 Exif.CanonSi.TargetAperture                  Short       1  F4
 Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
-Exif.CanonSi.0x0006                          Short       1  0
 Exif.CanonSi.WhiteBalance                    Short       1  Sunny
-Exif.CanonSi.0x0008                          Short       1  0
 Exif.CanonSi.Sequence                        Short       1  0
-Exif.CanonSi.0x000a                          Short       1  64
-Exif.CanonSi.0x000b                          Short       1  0
-Exif.CanonSi.0x000c                          Short       1  0
-Exif.CanonSi.0x000d                          Short       1  0
 Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
 Exif.CanonSi.FlashBias                       Short       1  0 EV
-Exif.CanonSi.0x0010                          Short       1  0
-Exif.CanonSi.0x0011                          Short       1  0
-Exif.CanonSi.0x0012                          Short       1  1
 Exif.CanonSi.SubjectDistance                 Short       1  503
-Exif.CanonSi.0x0014                          Short       1  0
 Exif.CanonSi.ApertureValue                   Short       1  F4
 Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
-Exif.CanonSi.0x0017                          Short       1  0
-Exif.CanonSi.0x0018                          Short       1  0
-Exif.CanonSi.0x0019                          Short       1  0
-Exif.CanonSi.0x001a                          Short       1  250
-Exif.CanonSi.0x001b                          Short       1  0
-Exif.CanonSi.0x001c                          Short       1  0
-Exif.CanonSi.0x001d                          Short       1  0
-Exif.CanonSi.0x001e                          Short       1  0
-Exif.CanonSi.0x001f                          Short       1  0
-Exif.CanonSi.0x0020                          Short       1  0
-Exif.CanonSi.0x0021                          Short       1  0
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
 Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
-Exif.Canon.ImageNumber                       Long        1  100-1904
+Exif.Canon.FileNumber                        Long        1  100-1904
 Exif.Canon.OwnerName                         Ascii      32  Robin Mills
-Exif.Canon.0x000d                            Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
 Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
-Exif.Canon.0x0013                            Short       4  0 0 0 0
-Exif.Canon.0x0018                            Byte      256  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 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 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0019                            Short       1  1
-Exif.Canon.0x001a                            Short       1  0
-Exif.Canon.0x001c                            Short       1  0
-Exif.Canon.0x001d                            Short      16  32 1 12 2 2 2 2 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x001e                            Long        1  16843264
-Exif.Canon.0x001f                            Short      69  138 1 0 4 8 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 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 0 0 0 0 0 0
-Exif.Canon.0x0022                            Short     208  416 0 0 16 8 1 1 640 480 0 0 0 0 0 8 384 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0023                            Long        2  8 0
-Exif.Canon.0x0024                            Short      78  156 35 0 0 0 1 1 16 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 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 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0025                            Byte       14  14 35 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0026                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
-Exif.Canon.0x0027                            Short       6  6 0 0 5676 4752 56834
-Exif.Canon.0x0028                            Byte       16  44 22 144 18 2 222 51 19 3 97 148 189 85 40 198 44 
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
 Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
 Exif.Photo.FlashpixVersion                   Undefined   4  1.00
 Exif.Photo.ColorSpace                        Short       1  sRGB
@@ -3606,7 +4038,7 @@
 White balance   : Sunny
 Thumbnail       : image/jpeg, 6714 Bytes
 Copyright       : 
-Exif comment    : 
+Exif comment    : 
 
 File name       : test.tiff
 File size       : 194752 Bytes
@@ -3661,18 +4093,12 @@
 Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
 Exif.MakerNote.Offset                        Long        1  680
 Exif.MakerNote.ByteOrder                     Ascii       3  MM
-Exif.Canon.0x0000                            Short       6  0 0 0 0 0 1
-Exif.Canon.0x0000                            Short      20  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.CanonCs.0x0000                          Short       1  92
 Exif.CanonCs.Macro                           Short       1  Off
 Exif.CanonCs.Selftimer                       Short       1  Off
 Exif.CanonCs.Quality                         Short       1  Fine
 Exif.CanonCs.FlashMode                       Short       1  Off
 Exif.CanonCs.DriveMode                       Short       1  Single / timer
-Exif.CanonCs.0x0006                          Short       1  0
 Exif.CanonCs.FocusMode                       Short       1  Single
-Exif.CanonCs.0x0008                          Short       1  65535
-Exif.CanonCs.0x0009                          Short       1  1
 Exif.CanonCs.ImageSize                       Short       1  Medium 1
 Exif.CanonCs.EasyMode                        Short       1  Manual
 Exif.CanonCs.DigitalZoom                     Short       1  None
@@ -3684,86 +4110,44 @@
 Exif.CanonCs.FocusType                       Short       1  Auto
 Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
 Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
-Exif.CanonCs.0x0015                          Short       1  32767
 Exif.CanonCs.LensType                        Short       1  (65535)
 Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
 Exif.CanonCs.MaxAperture                     Short       1  F3.6
 Exif.CanonCs.MinAperture                     Short       1  F8
 Exif.CanonCs.FlashActivity                   Short       1  Did not fire
 Exif.CanonCs.FlashDetails                    Short       1  
-Exif.CanonCs.0x001e                          Short       1  0
-Exif.CanonCs.0x001f                          Short       1  0
 Exif.CanonCs.FocusContinuous                 Short       1  Continuous
 Exif.CanonCs.AESetting                       Short       1  Normal AE
 Exif.CanonCs.ImageStabilization              Short       1  On
 Exif.CanonCs.DisplayAperture                 Short       1  0
 Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
 Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
-Exif.CanonCs.0x0026                          Short       1  0
-Exif.CanonCs.0x0027                          Short       1  0
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
 Exif.CanonCs.PhotoEffect                     Short       1  (65535)
-Exif.CanonCs.0x0029                          Short       1  0
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
 Exif.CanonCs.ColorTone                       Short       1  32767
-Exif.CanonCs.0x002b                          Short       1  32767
-Exif.CanonCs.0x002c                          Short       1  0
-Exif.CanonCs.0x002d                          Short       1  0
 Exif.Canon.FocalLength                       Short       4  21.3 mm
-Exif.Canon.0x0003                            Short       4  0 0 0 0
-Exif.CanonSi.0x0000                          Short       1  68
-Exif.CanonSi.0x0001                          Short       1  65523
 Exif.CanonSi.ISOSpeed                        Short       1  100
-Exif.CanonSi.0x0003                          Short       1  296
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
 Exif.CanonSi.TargetAperture                  Short       1  F4
 Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
-Exif.CanonSi.0x0006                          Short       1  0
 Exif.CanonSi.WhiteBalance                    Short       1  Sunny
-Exif.CanonSi.0x0008                          Short       1  0
 Exif.CanonSi.Sequence                        Short       1  0
-Exif.CanonSi.0x000a                          Short       1  64
-Exif.CanonSi.0x000b                          Short       1  0
-Exif.CanonSi.0x000c                          Short       1  0
-Exif.CanonSi.0x000d                          Short       1  0
 Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
 Exif.CanonSi.FlashBias                       Short       1  0 EV
-Exif.CanonSi.0x0010                          Short       1  0
-Exif.CanonSi.0x0011                          Short       1  0
-Exif.CanonSi.0x0012                          Short       1  1
 Exif.CanonSi.SubjectDistance                 Short       1  503
-Exif.CanonSi.0x0014                          Short       1  0
 Exif.CanonSi.ApertureValue                   Short       1  F4
 Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
-Exif.CanonSi.0x0017                          Short       1  0
-Exif.CanonSi.0x0018                          Short       1  0
-Exif.CanonSi.0x0019                          Short       1  0
-Exif.CanonSi.0x001a                          Short       1  250
-Exif.CanonSi.0x001b                          Short       1  0
-Exif.CanonSi.0x001c                          Short       1  0
-Exif.CanonSi.0x001d                          Short       1  0
-Exif.CanonSi.0x001e                          Short       1  0
-Exif.CanonSi.0x001f                          Short       1  0
-Exif.CanonSi.0x0020                          Short       1  0
-Exif.CanonSi.0x0021                          Short       1  0
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
 Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
-Exif.Canon.ImageNumber                       Long        1  100-1904
+Exif.Canon.FileNumber                        Long        1  100-1904
 Exif.Canon.OwnerName                         Ascii      32  Robin Mills
-Exif.Canon.0x000d                            Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
 Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
-Exif.Canon.0x0013                            Short       4  0 0 0 0
-Exif.Canon.0x0018                            Byte      256  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 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 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0019                            Short       1  1
-Exif.Canon.0x001a                            Short       1  0
-Exif.Canon.0x001c                            Short       1  0
-Exif.Canon.0x001d                            Short      16  32 1 12 2 2 2 2 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x001e                            Long        1  16843264
-Exif.Canon.0x001f                            Short      69  138 1 0 4 8 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 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 0 0 0 0 0 0
-Exif.Canon.0x0022                            Short     208  416 0 0 16 8 1 1 640 480 0 0 0 0 0 8 384 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0023                            Long        2  8 0
-Exif.Canon.0x0024                            Short      78  156 35 0 0 0 1 1 16 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 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 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0025                            Byte       14  14 35 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0026                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
-Exif.Canon.0x0027                            Short       6  6 0 0 5676 4752 56834
-Exif.Canon.0x0028                            Byte       16  44 22 144 18 2 222 51 19 3 97 148 189 85 40 198 44 
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
 Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
 Exif.Photo.FlashpixVersion                   Undefined   4  1.00
 Exif.Photo.ColorSpace                        Short       1  sRGB
@@ -3814,7 +4198,7 @@
 White balance   : Sunny
 Thumbnail       : image/jpeg, 6714 Bytes
 Copyright       : 
-Exif comment    : 
+Exif comment    : 
 
 File name       : test.tiff
 File size       : 194752 Bytes
@@ -3869,18 +4253,12 @@
 Exif.Photo.MakerNote                         Undefined 2382  (Binary value suppressed)
 Exif.MakerNote.Offset                        Long        1  680
 Exif.MakerNote.ByteOrder                     Ascii       3  MM
-Exif.Canon.0x0000                            Short       6  0 0 0 0 0 1
-Exif.Canon.0x0000                            Short      20  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.CanonCs.0x0000                          Short       1  92
 Exif.CanonCs.Macro                           Short       1  Off
 Exif.CanonCs.Selftimer                       Short       1  Off
 Exif.CanonCs.Quality                         Short       1  Fine
 Exif.CanonCs.FlashMode                       Short       1  Off
 Exif.CanonCs.DriveMode                       Short       1  Single / timer
-Exif.CanonCs.0x0006                          Short       1  0
 Exif.CanonCs.FocusMode                       Short       1  Single
-Exif.CanonCs.0x0008                          Short       1  65535
-Exif.CanonCs.0x0009                          Short       1  1
 Exif.CanonCs.ImageSize                       Short       1  Medium 1
 Exif.CanonCs.EasyMode                        Short       1  Manual
 Exif.CanonCs.DigitalZoom                     Short       1  None
@@ -3892,86 +4270,44 @@
 Exif.CanonCs.FocusType                       Short       1  Auto
 Exif.CanonCs.AFPoint                         Short       1  Manual AF point selection
 Exif.CanonCs.ExposureProgram                 Short       1  Program (P)
-Exif.CanonCs.0x0015                          Short       1  32767
 Exif.CanonCs.LensType                        Short       1  (65535)
 Exif.CanonCs.Lens                            Short       3  6.0 - 72.0 mm
 Exif.CanonCs.MaxAperture                     Short       1  F3.6
 Exif.CanonCs.MinAperture                     Short       1  F8
 Exif.CanonCs.FlashActivity                   Short       1  Did not fire
 Exif.CanonCs.FlashDetails                    Short       1  
-Exif.CanonCs.0x001e                          Short       1  0
-Exif.CanonCs.0x001f                          Short       1  0
 Exif.CanonCs.FocusContinuous                 Short       1  Continuous
 Exif.CanonCs.AESetting                       Short       1  Normal AE
 Exif.CanonCs.ImageStabilization              Short       1  On
 Exif.CanonCs.DisplayAperture                 Short       1  0
 Exif.CanonCs.ZoomSourceWidth                 Short       1  3264
 Exif.CanonCs.ZoomTargetWidth                 Short       1  3264
-Exif.CanonCs.0x0026                          Short       1  0
-Exif.CanonCs.0x0027                          Short       1  0
+Exif.CanonCs.SpotMeteringMode                Short       1  Center
 Exif.CanonCs.PhotoEffect                     Short       1  (65535)
-Exif.CanonCs.0x0029                          Short       1  0
+Exif.CanonCs.ManualFlashOutput               Short       1  n/a
 Exif.CanonCs.ColorTone                       Short       1  32767
-Exif.CanonCs.0x002b                          Short       1  32767
-Exif.CanonCs.0x002c                          Short       1  0
-Exif.CanonCs.0x002d                          Short       1  0
 Exif.Canon.FocalLength                       Short       4  21.3 mm
-Exif.Canon.0x0003                            Short       4  0 0 0 0
-Exif.CanonSi.0x0000                          Short       1  68
-Exif.CanonSi.0x0001                          Short       1  65523
 Exif.CanonSi.ISOSpeed                        Short       1  100
-Exif.CanonSi.0x0003                          Short       1  296
+Exif.CanonSi.MeasuredEV                      Short       1  14.25
 Exif.CanonSi.TargetAperture                  Short       1  F4
 Exif.CanonSi.TargetShutterSpeed              Short       1  1/501 s
-Exif.CanonSi.0x0006                          Short       1  0
 Exif.CanonSi.WhiteBalance                    Short       1  Sunny
-Exif.CanonSi.0x0008                          Short       1  0
 Exif.CanonSi.Sequence                        Short       1  0
-Exif.CanonSi.0x000a                          Short       1  64
-Exif.CanonSi.0x000b                          Short       1  0
-Exif.CanonSi.0x000c                          Short       1  0
-Exif.CanonSi.0x000d                          Short       1  0
 Exif.CanonSi.AFPointUsed                     Short       1  0 focus points; none used
 Exif.CanonSi.FlashBias                       Short       1  0 EV
-Exif.CanonSi.0x0010                          Short       1  0
-Exif.CanonSi.0x0011                          Short       1  0
-Exif.CanonSi.0x0012                          Short       1  1
 Exif.CanonSi.SubjectDistance                 Short       1  503
-Exif.CanonSi.0x0014                          Short       1  0
 Exif.CanonSi.ApertureValue                   Short       1  F4
 Exif.CanonSi.ShutterSpeedValue               Short       1  1/546 s
-Exif.CanonSi.0x0017                          Short       1  0
-Exif.CanonSi.0x0018                          Short       1  0
-Exif.CanonSi.0x0019                          Short       1  0
-Exif.CanonSi.0x001a                          Short       1  250
-Exif.CanonSi.0x001b                          Short       1  0
-Exif.CanonSi.0x001c                          Short       1  0
-Exif.CanonSi.0x001d                          Short       1  0
-Exif.CanonSi.0x001e                          Short       1  0
-Exif.CanonSi.0x001f                          Short       1  0
-Exif.CanonSi.0x0020                          Short       1  0
-Exif.CanonSi.0x0021                          Short       1  0
+Exif.CanonSi.MeasuredEV2                     Short       1  -6.00
 Exif.Canon.ImageType                         Ascii      25  IMG:PowerShot S5 IS JPEG
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.01
-Exif.Canon.ImageNumber                       Long        1  100-1904
+Exif.Canon.FileNumber                        Long        1  100-1904
 Exif.Canon.OwnerName                         Ascii      32  Robin Mills
-Exif.Canon.0x000d                            Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
+Exif.Canon.CameraInfo                        Long      148  370 411 0 0 0 384 874 4294967255 0 0 0 0 577 889 4294967150 0 0 4294967287 0 0 1 0 0 0 9 10 888 888 888 384 1015 4294967148 0 0 888 888 0 0 1 3072 3072 3072 3072 3072 4294964224 4294964224 4294964224 4294964224 4294964224 0 4294964224 4294967287 0 0 0 0 0 0 0 0 0 0 164 1024 1024 40 94 0 0 0 0 0 0 525 0 40 94 0 0 3 1 0 0 921 1027 1024 1280 0 40 97 10 881 1646 1711 881 1 1014 384 888 659 4294967148 2 128 1 0 0 0 0 7532 5 0 0 0 0 0 0 7819 8252 8279 128 1 0 4294961112 3 1 7471 0 0 0 0 0 0 0 0 5345 1088 245 446 100 196 44 4091 4091 1 1 25 8 2400605383
 Exif.Canon.ModelID                           Long        1  PowerShot S5 IS
-Exif.Canon.0x0013                            Short       4  0 0 0 0
-Exif.Canon.0x0018                            Byte      256  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 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 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0019                            Short       1  1
-Exif.Canon.0x001a                            Short       1  0
-Exif.Canon.0x001c                            Short       1  0
-Exif.Canon.0x001d                            Short      16  32 1 12 2 2 2 2 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x001e                            Long        1  16843264
-Exif.Canon.0x001f                            Short      69  138 1 0 4 8 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 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 0 0 0 0 0 0
-Exif.Canon.0x0022                            Short     208  416 0 0 16 8 1 1 640 480 0 0 0 0 0 8 384 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 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 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 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 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0023                            Long        2  8 0
-Exif.Canon.0x0024                            Short      78  156 35 0 0 0 1 1 16 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 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 0 0 0 0 0 0 0 0 0 0 0 0
-Exif.Canon.0x0025                            Byte       14  14 35 0 0 0 0 0 0 0 0 0 0 0 0 
-Exif.Canon.0x0026                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
-Exif.Canon.0x0027                            Short       6  6 0 0 5676 4752 56834
-Exif.Canon.0x0028                            Byte       16  44 22 144 18 2 222 51 19 3 97 148 189 85 40 198 44 
+Exif.Canon.ThumbnailImageValidArea           Short       4  0 0 0 0
+Exif.Canon.SuperMacro                        Short       1  Off
+Exif.Canon.AFInfo                            Short      48  96 2 9 1 2592 1944 1088 245 196 0 0 0 0 0 0 0 0 44 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
 Exif.Photo.UserComment                       Undefined 264  (Binary value suppressed)
 Exif.Photo.FlashpixVersion                   Undefined   4  1.00
 Exif.Photo.ColorSpace                        Short       1  sRGB
@@ -4022,7 +4358,7 @@
 White balance   : Sunny
 Thumbnail       : image/jpeg, 6714 Bytes
 Copyright       : 
-Exif comment    : 
+Exif comment    : 
 
 File name       : test.tiff
 File size       : 194752 Bytes
@@ -4126,108 +4462,108 @@
 -------DebugDLL---------------
 KERNEL32.dll  
 addmoddel.exe 
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
 convert-test.exe
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
 exifcomment.exe
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
 exifdata-test.exe
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
 exifprint.exe 
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
 exiv2.exe     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 exivsimple.dll
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 iotest.exe    
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 iptceasy.exe  
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 iptcprint.exe 
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 iptctest.exe  
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 largeiptc-test.exe
 libexpat.dll  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 metacopy.exe  
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 mmap-test.exe 
 ntdll.dll     
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 prevtest.exe  
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 stringto-test.exe
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 taglist.exe   
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 tiff-test.exe 
@@ -4236,31 +4572,31 @@
 ntdll.dll     
 utiltest.exe  
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 write-test.exe
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 write2-test.exe
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 xmpparse.exe  
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 xmpparser-test.exe
 zlib1d.dll    
 KERNEL32.dll  
-exiv2.dll     
+exiv2d.dll    
 libexpat.dll  
 ntdll.dll     
 xmpsample.exe 
diff -Nru exiv2-0.19/msvc/stringto-test/stringto-test.vcproj exiv2-0.21/msvc/stringto-test/stringto-test.vcproj
--- exiv2-0.19/msvc/stringto-test/stringto-test.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/stringto-test/stringto-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/stringto-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -145,9 +145,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/stringto-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -235,9 +235,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/stringto-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -324,7 +324,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/stringto-test.exe"
diff -Nru exiv2-0.19/msvc/taglist/taglist.vcproj exiv2-0.21/msvc/taglist/taglist.vcproj
--- exiv2-0.19/msvc/taglist/taglist.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/taglist/taglist.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/taglist.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -148,9 +148,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/taglist.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -238,9 +238,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/taglist.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/taglist.exe"
diff -Nru exiv2-0.19/msvc/tiff-test/tiff-test.vcproj exiv2-0.21/msvc/tiff-test/tiff-test.vcproj
--- exiv2-0.19/msvc/tiff-test/tiff-test.vcproj	2009-05-31 18:02:43.000000000 +0000
+++ exiv2-0.21/msvc/tiff-test/tiff-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="tiff-test"
-	ProjectGUID="{2F4235D0-B5F5-4C59-981D-BA006734B56E}"
+	ProjectGUID="{042FB218-CA7F-4EE2-ADA9-D3249318B2EF}"
 	RootNamespace="tiff-test"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/tiff-test.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -151,9 +151,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
 				SubSystem="1"
@@ -241,9 +241,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/tiff-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -331,9 +331,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/tiff-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
diff -Nru exiv2-0.19/msvc/utiltest/utiltest.vcproj exiv2-0.21/msvc/utiltest/utiltest.vcproj
--- exiv2-0.19/msvc/utiltest/utiltest.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/utiltest/utiltest.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/utiltest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -148,9 +148,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/utiltest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -238,9 +238,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/utiltest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/utiltest.exe"
diff -Nru exiv2-0.19/msvc/write2-test/write2-test.vcproj exiv2-0.21/msvc/write2-test/write2-test.vcproj
--- exiv2-0.19/msvc/write2-test/write2-test.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/write2-test/write2-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/write2-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -148,9 +148,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/write2-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -238,9 +238,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/write2-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/write2-test.exe"
diff -Nru exiv2-0.19/msvc/write-test/write-test.vcproj exiv2-0.21/msvc/write-test/write-test.vcproj
--- exiv2-0.19/msvc/write-test/write-test.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/write-test/write-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/write-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -148,9 +148,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/write-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -238,9 +238,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/write-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/write-test.exe"
diff -Nru exiv2-0.19/msvc/xmpparse/xmpparse.vcproj exiv2-0.21/msvc/xmpparse/xmpparse.vcproj
--- exiv2-0.19/msvc/xmpparse/xmpparse.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/xmpparse/xmpparse.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/xmpparse.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -146,9 +146,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/xmpparse.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -237,9 +237,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/xmpparse.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/xmpparse.exe"
diff -Nru exiv2-0.19/msvc/xmpparser-test/xmpparser-test.vcproj exiv2-0.21/msvc/xmpparser-test/xmpparser-test.vcproj
--- exiv2-0.19/msvc/xmpparser-test/xmpparser-test.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/xmpparser-test/xmpparser-test.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/xmpparser-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -146,9 +146,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/xmpparser-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -237,9 +237,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/xmpparser-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/xmpparser-test.exe"
diff -Nru exiv2-0.19/msvc/xmpsample/xmpsample.vcproj exiv2-0.21/msvc/xmpsample/xmpsample.vcproj
--- exiv2-0.19/msvc/xmpsample/xmpsample.vcproj	2009-03-17 06:47:43.000000000 +0000
+++ exiv2-0.21/msvc/xmpsample/xmpsample.vcproj	2010-07-20 04:38:47.000000000 +0000
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Debug\zlibd.lib"
 				OutputFile="$(OutDir)/xmpsample.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -146,9 +146,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:MSVCRT"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_LIB_Release\zlib.lib"
 				OutputFile="$(OutDir)/xmpsample.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
@@ -237,9 +237,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32\bin\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Debug\zlib1d.lib"
 				OutputFile="$(OutDir)/xmpsample.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -327,7 +327,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkLibraryDependencies="true"
+				LinkLibraryDependencies="false"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
 				AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32\bin\release\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.lib"
 				OutputFile="$(OutDir)/xmpsample.exe"
diff -Nru exiv2-0.19/msvc/xmpsdk/xmpsdk.vcproj exiv2-0.21/msvc/xmpsdk/xmpsdk.vcproj
--- exiv2-0.19/msvc/xmpsdk/xmpsdk.vcproj	2009-07-12 18:17:25.000000000 +0000
+++ exiv2-0.21/msvc/xmpsdk/xmpsdk.vcproj	2010-07-18 21:03:36.000000000 +0000
@@ -295,10 +295,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\xmpsdk\src\XML_Node.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\xmpsdk\src\MD5.cpp"
 				>
 			</File>
@@ -323,6 +319,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\xmpsdk\src\XML_Node.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\xmpsdk\src\XMPCore_Impl.cpp"
 				>
 			</File>
Binary files /tmp/TId3M1M1Ks/exiv2-0.19/po/de.gmo and /tmp/B4Gg93MYI9/exiv2-0.21/po/de.gmo differ
diff -Nru exiv2-0.19/po/de.po exiv2-0.21/po/de.po
--- exiv2-0.19/po/de.po	2009-12-29 10:51:25.000000000 +0000
+++ exiv2-0.21/po/de.po	2010-11-22 15:13:38.000000000 +0000
@@ -8,1659 +8,1963 @@
 #   Lutz Mueller <lutz@users.sourceforge.net>, 2002.
 #   Marcus Meissner <marcus@jet.franken.de>, 2004, 2005.
 # Oliver Dörr <kde@doerr-privat.de>, 2007, 2008.
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\n"
 "PO-Revision-Date: 2008-11-16 21:57+0100\n"
 "Last-Translator: Oliver Dörr <kde@doerr-privat.de>\n"
 "Language-Team: german <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
 msgstr "Die Datei konnte nicht geöffnet werden\n"
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 msgid "File size"
 msgstr "Dateigröße"
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 msgid "Image size"
 msgstr "Bildgrõße"
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
 msgstr "Es wurden keine Exif-Daten in der Datei gefunden\n"
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 msgid "Camera make"
 msgstr "Kamerahersteller"
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 msgid "Camera model"
 msgstr "Kameramodell"
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 msgid "Image timestamp"
 msgstr "Zeitstempel des Bildes"
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 msgid "Image number"
 msgstr "Bildnummer"
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 msgid "Exposure time"
 msgstr "Belichtungszeit"
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr "Blende"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 msgid "Exposure bias"
 msgstr "Belichtungskontrolle"
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr "Blitz"
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 msgid "Flash bias"
 msgstr "Blitzkontrolle"
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 msgid "Focal length"
 msgstr "Brennweite"
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 msgid "35 mm equivalent"
 msgstr "35 mm äquivalent"
 
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 msgid "Subject distance"
 msgstr "Entfernung des Motivs"
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 msgid "ISO speed"
 msgstr "ISO Geschwindigkeit"
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 msgid "Exposure mode"
 msgstr "Belichtungsmodus"
 
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 msgid "Metering mode"
 msgstr "Messmodus"
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 msgid "Macro mode"
 msgstr "Makromodus"
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 msgid "Image quality"
 msgstr "Bildqualität"
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 msgid "Exif Resolution"
 msgstr "Exif-Auflösung"
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 msgid "White balance"
 msgstr "Weißabgleich"
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
 msgstr "Vorschau"
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr "Keine"
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
 msgstr "Exif-Kommentar"
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 msgid "No IPTC data found in the file\n"
 msgstr "Es wurden keine IPTC-Daten in der Datei gefunden.\n"
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 msgid "No XMP data found in the file\n"
 msgstr "Es wurden keine XMP-Daten in der Datei gefunden.\n"
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
 msgstr "(Binäre Werte sind unterdrückt)"
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 msgid "JPEG comment"
 msgstr "JPEG-Kommentar"
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 #, fuzzy
 msgid "Preview"
 msgstr "Vorschaudaten"
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
 msgstr "Pixel"
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 msgid "bytes"
 msgstr "Bytes"
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 msgid "Neither tag"
 msgstr "Keins der Stichwörter"
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 msgid "nor"
 msgstr "noch"
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 msgid "found in the file"
 msgstr "wurde in der Datei gefunden"
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
 msgstr ""
 "Der Erstellungszeitstempel der Bilddatei ist nicht in der Datei gesetzt."
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
 msgstr "Der Zeitstempel konnte nicht verarbeitet werden."
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 msgid "in the file"
 msgstr "in der Datei"
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
 msgstr "Aktualisiere den Zeitstempel auf"
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 msgid "Erasing thumbnail data"
 msgstr "Die Vorschaudaten werden gelöscht."
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
 msgstr "Die Exif-Daten der Datei werden gelöscht."
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
 msgstr "Die IPTC-Daten der Datei werden gelöscht."
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
 msgstr "Der JPEG-Kommentar der Datei wird gelöscht."
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
 msgstr "Die XMP-Daten der Datei werden gelöscht."
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
 msgstr "Das Bild enthält keine Exif-Bildvorschau.\n"
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 msgid "Writing thumbnail"
 msgstr "Die Vorschau wird geschrieben."
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 msgid "to file"
 msgstr "in die Datei"
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
 msgstr "Die Exif-Daten enthalten keine Vorschau.\n"
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
 msgstr ""
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 msgid "Writing preview"
 msgstr ""
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 msgid "Setting JPEG comment"
 msgstr "Der JPEG-Kommentar wird gesetzt."
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 msgid "Failed to read"
 msgstr "Fehler beim lesen"
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 msgid "value"
 msgstr "Wert"
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 msgid "Set"
 msgstr "Setzen"
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr "Löschen"
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr "Reg "
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
 msgstr "Zeitstempel des Metadatums mit Schlüssel"
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
 msgstr "nicht gesetzt\n"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
 msgstr "Justiere"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
 msgstr "durch"
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 msgid "years"
 msgstr "Jahre"
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
 msgstr "Jahr"
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 msgid "months"
 msgstr "Monate"
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 msgid "month"
 msgstr "Monat"
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
 msgstr "Tage"
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
 msgstr "Tag"
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
 msgstr "s"
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 msgid "Can't adjust timestamp by"
 msgstr "Der Zeitstempel konnte nicht verändert werden von"
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 msgid "to"
 msgstr "nach"
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr ""
 "Es existiert ein Standard-Exif-ISO-Stichwort; dies wird nicht geändert\n"
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
 msgstr "Setze den Exif-ISO Wert auf"
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1671
+#, fuzzy
+msgid "No Exif user comment found"
+msgstr "Exif-Kommentar"
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:1692
+#, fuzzy
+msgid "Setting Exif UNICODE user comment to"
+msgstr "Setze den Exif-ISO Wert auf"
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
 msgstr "Schreibe die Exif-Daten von"
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
 msgstr "Schreibe die IPTC-Daten von"
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
 msgstr "Schreibe die XMP-Daten von"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
 msgstr "Schreibe den JPEG-Kommentar von"
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
 msgstr "Die Metadaten konnten nicht in die Datei geschrieben werden"
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr "Das Format des Dateinamens führt zu keinem Dateinamen für die Datei"
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
 msgstr "Diese Datei hat schon den richtigen Namen"
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 msgid "File"
 msgstr "Datei"
 
-#: src/actions.cpp:1909
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
 msgstr "existiert [O]überschreiben, [r]umbennenen oder [s]überspringen?"
 
-#: src/actions.cpp:1937
+#: src/actions.cpp:1970
 msgid "Renaming file to"
 msgstr "Die Datei wird umbenannt nach"
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
 msgstr "aktualisiere Zeitstempel"
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
 msgstr "Fehler beim umbenennen"
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr "Aus"
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr "An"
+
+#: src/canonmn.cpp:69
 msgid "PowerShot A30"
 msgstr "PowerShot A30"
 
-#: src/canonmn.cpp:61
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
 msgid "PowerShot A20"
 msgstr "PowerShot A20"
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
 msgid "PowerShot A10"
 msgstr "PowerShot A10"
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 msgid "PowerShot G2"
 msgstr "PowerShot G2"
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
 msgid "PowerShot S40"
 msgstr "PowerShot S40"
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
 msgid "PowerShot S30"
 msgstr "PowerShot S30"
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
 msgid "PowerShot A40"
 msgstr "PowerShot A40"
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr "EOS D30"
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
 msgid "PowerShot A100"
 msgstr "PowerShot A100"
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
 msgid "PowerShot A200"
 msgstr "PowerShot A200"
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 msgid "PowerShot G3"
 msgstr "PowerShot G3"
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
 msgid "PowerShot S45"
 msgstr "PowerShot S45"
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
 msgid "PowerShot A70"
 msgstr "PowerShot A70"
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
 msgid "PowerShot A60"
 msgstr "PowerShot A60"
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 msgid "PowerShot G5"
 msgstr "PowerShot G5"
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
 msgid "PowerShot A300"
 msgstr "PowerShot A300"
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
 msgid "PowerShot S50"
 msgstr "PowerShot S50"
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
 msgid "PowerShot A80"
 msgstr "PowerShot A80"
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
 msgid "PowerShot S1 IS"
 msgstr "PowerShot S1 IS"
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
 msgid "PowerShot Pro1"
 msgstr "PowerShot Pro1"
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
 msgid "PowerShot S70"
 msgstr "PowerShot S70"
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
 msgid "PowerShot S60"
 msgstr "PowerShot S60"
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 msgid "PowerShot G6"
 msgstr "PowerShot G6"
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
 msgid "PowerShot A75"
 msgstr "PowerShot A75"
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
 msgid "PowerShot A400"
 msgstr "PowerShot A400"
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
 msgid "PowerShot A310"
 msgstr "PowerShot A310"
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
 msgid "PowerShot A85"
 msgstr "PowerShot A85"
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
 msgid "PowerShot A95"
 msgstr "PowerShot A95"
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
 msgid "PowerShot A520"
 msgstr "PowerShot A520"
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
 msgid "PowerShot A510"
 msgstr "PowerShot A510"
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
 msgid "PowerShot S2 IS"
 msgstr "PowerShot S2 IS"
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr "EOS D60"
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
 msgid "PowerShot A430"
 msgstr "PowerShot A430"
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
 msgid "PowerShot A410"
 msgstr "PowerShot A410"
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
 msgid "PowerShot S80"
 msgstr "PowerShot S80"
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
 msgid "PowerShot A620"
 msgstr "PowerShot A620"
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
 msgid "PowerShot A610"
 msgstr "PowerShot A610"
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
 msgid "PowerShot TX1"
 msgstr "PowerShot TX1"
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
 msgid "PowerShot A420"
 msgstr "PowerShot A420"
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
 msgid "PowerShot A700"
 msgstr "PowerShot A700"
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
 msgid "PowerShot S3 IS"
 msgstr "PowerShot S3 IS"
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
 msgid "PowerShot A540"
 msgstr "PowerShot A540"
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 msgid "PowerShot G7"
 msgstr "PowerShot G7"
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
 msgid "PowerShot A530"
 msgstr "PowerShot A530"
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
 msgid "PowerShot A710 IS"
 msgstr "PowerShot A710 IS"
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
 msgid "PowerShot A640"
 msgstr "PowerShot A640"
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
 msgid "PowerShot A630"
 msgstr "PowerShot A630"
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
 msgid "PowerShot S5 IS"
 msgstr "PowerShot S5 IS"
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
 msgid "PowerShot A460"
 msgstr "PowerShot A460"
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr "PowerShot SD850 IS / Digital IXUS 950 IS"
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
 msgid "PowerShot A570 IS"
 msgstr "PowerShot A570 IS"
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
 msgid "PowerShot A560"
 msgstr "PowerShot A560"
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
 msgid "PowerShot A550"
 msgstr "PowerShot A550"
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
 msgid "PowerShot A450"
 msgstr "PowerShot A450"
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
 msgid "PowerShot Pro90 IS"
 msgstr "PowerShot Pro90 IS"
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 msgid "PowerShot G1"
 msgstr "PowerShot G1"
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr "PowerShot S100 / Digital IXUS / IXY Digital"
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr "HV10"
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr "iVIS DC50"
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr "iVIS HV20"
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr "EOS-1D"
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr "EOS-1DS"
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr "EOS 10D"
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr "EOS-1D Mark III"
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr "EOS Digital Rebel / 300D / Kiss Digital"
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr "EOS-1D Mark II"
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr "EOS 20D"
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr "EOS-1Ds Mark II"
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr "EOS Digital Rebel XT / 350D / Kiss Digital N"
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr "EOS 5D"
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr "EOS-1D Mark II N"
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr "EOS 30D"
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
+#: src/canonmn.cpp:170
+#, fuzzy
+msgid "EOS 7D"
+msgstr "EOS 5D"
+
+#: src/canonmn.cpp:171
+#, fuzzy
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
+
+#: src/canonmn.cpp:172
+#, fuzzy
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr "EOS Digital Rebel / 300D / Kiss Digital"
+
+#: src/canonmn.cpp:173
+#, fuzzy
+msgid "EOS 50D"
+msgstr "EOS 5D"
+
+#: src/canonmn.cpp:174
+#, fuzzy
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
+
+#: src/canonmn.cpp:175
+#, fuzzy
+msgid "EOS-1D Mark IV"
+msgstr "EOS-1D Mark II"
+
+#: src/canonmn.cpp:180
+#, fuzzy
+msgid "Format 1"
+msgstr "Format"
+
+#: src/canonmn.cpp:181
+#, fuzzy
+msgid "Format 2"
+msgstr "Format"
+
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+#, fuzzy
+msgid "On (1)"
+msgstr "An"
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+#, fuzzy
+msgid "On (2)"
+msgstr "An"
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr "Adobe RGB"
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
 msgid "Camera Settings"
 msgstr "Kameraeinstellungen"
 
-#: src/canonmn.cpp:166
+#: src/canonmn.cpp:200
 msgid "Various camera settings"
 msgstr "Verschiedene Kameraeinstellungen"
 
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
 msgid "Focal Length"
 msgstr "Brennweite"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
 msgid "Shot Info"
 msgstr "Aufnahmeinfo"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203
 msgid "Shot information"
 msgstr "Aufnahmeinformation"
 
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
 msgid "Panorama"
 msgstr "Panorama"
 
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
 msgid "Image Type"
 msgstr "Bildtyp"
 
-#: src/canonmn.cpp:171
+#: src/canonmn.cpp:205
 msgid "Image type"
 msgstr "Bildtyp"
 
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware Version"
 msgstr "Firmware Version"
 
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware version"
 msgstr "Firmware Version"
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File Number"
 msgstr "Blende"
 
-#: src/canonmn.cpp:173
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File number"
 msgstr "Dateiname"
 
-#: src/canonmn.cpp:174
+#: src/canonmn.cpp:208
 msgid "Owner Name"
 msgstr "Besitzername"
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 msgid "Camera serial number"
 msgstr "Kamera-Seriennummer"
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera Info"
+msgstr "Kamerainformation"
+
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera info"
+msgstr "Kamerainformation"
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 msgid "Custom Functions"
 msgstr "Angepasste Funktionen"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "ModelID"
 msgstr "Modell-ID"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "Model ID"
 msgstr "Modell-ID"
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
 msgid "Picture Info"
 msgstr "Bild-Info"
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 msgid "Picture info"
 msgstr "Bild-Info"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail Image Valid Area"
+msgstr "Vorschaubild"
+
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail image valid area"
+msgstr "Vorschaubild"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial Number Format"
+msgstr "Seriennummer 2"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial number format"
+msgstr "Seriennummer 2"
+
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+msgid "Super Macro"
+msgstr "Supermakro"
+
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+msgid "Super macro"
+msgstr "Supermakro"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF Info"
+msgstr "Autofokus-Information"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF info"
+msgstr "Autofokus-Information"
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
 msgid "White Balance Table"
 msgstr "Weißabgleichstabelle"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:219
 msgid "White balance table"
 msgstr "Weißabgleichstabelle"
 
-#: src/canonmn.cpp:185
-msgid "Unknown CanonMakerNote tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Canon"
+#: src/canonmn.cpp:220
+#, fuzzy
+msgid "LensModel"
+msgstr "Linsenmodell"
 
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
-msgstr "An"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+msgid "Internal Serial Number"
+msgstr "Interne Seriennummer"
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
-msgstr "Aus"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+msgid "Internal serial number"
+msgstr "Interne Seriennummer"
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
+msgstr ""
+
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
+
+#: src/canonmn.cpp:223
+#, fuzzy
+msgid "Custom functions"
+msgstr "Angepasste Funktionen"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing Info"
+msgstr "Verarbeitungssoftware"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing info"
+msgstr "Verarbeitungssoftware"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured Color"
+msgstr "Natürliche Farbe"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured color"
+msgstr "Natürliche Farben"
+
+#: src/canonmn.cpp:226
+#, fuzzy
+msgid "ColorSpace"
+msgstr "Farbraum"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD Offset"
+msgstr "Offset"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD offset"
+msgstr "Offset"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor Info"
+msgstr "Linseninformation"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor info"
+msgstr "Aufnahmeinfo"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color Data"
+msgstr "Farbmatrix"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color data"
+msgstr "Meine Farbdaten"
+
+#: src/canonmn.cpp:234
+msgid "Unknown CanonMakerNote tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Canon"
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
 msgid "Economy"
 msgstr "Economy"
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
 msgid "Normal"
 msgstr "Normal"
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
 msgid "Fine"
 msgstr "Fein"
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
 msgid "RAW"
 msgstr "Roh"
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:254
 msgid "Superfine"
 msgstr "Superfein"
 
-#: src/canonmn.cpp:206
+#: src/canonmn.cpp:255
 #, fuzzy
 msgid "Normal Movie"
 msgstr "Normale Verarbeitung"
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
 msgid "Red-eye"
 msgstr "Rote-Augen"
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 msgid "Slow sync"
 msgstr "Langsame Synchronisation"
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
 msgid "Auto + red-eye"
 msgstr "Auto + Rote-Augen"
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
 msgid "On + red-eye"
 msgstr "An + Rote-Augen"
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
 msgid "External"
 msgstr "Extern"
 
-#: src/canonmn.cpp:223
+#: src/canonmn.cpp:273
 msgid "Single / timer"
 msgstr "Einzel / Timer"
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
 msgid "Continuous"
 msgstr "Kontinuierlich"
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
 msgid "Movie"
 msgstr "Film"
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 msgid "Continuous, speed priority"
 msgstr "Kontinuierlich, Gerschwindigkeit prioritisiert"
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
 msgid "Continuous, low"
 msgstr "Kontinuierlich, niedrig"
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
 msgid "Continuous, high"
 msgstr "Kontinuierlich, hoch"
 
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 msgid "One shot AF"
 msgstr "Eine Aufnahme mit Autofokus"
 
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
 msgid "AI servo AF"
 msgstr ""
 
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
+#, fuzzy
 msgid "AI focus AF"
-msgstr ""
+msgstr "Automatischer Fokus"
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 msgid "Manual focus"
 msgstr "Manueller Fokus"
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
 msgid "Single"
 msgstr "Einzel"
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
 msgid "Pan focus"
 msgstr "Schwenk-Fokus"
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
 msgid "Large"
 msgstr "Groß"
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
 msgid "Small"
 msgstr "Klein"
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
 msgid "Medium 1"
 msgstr "Mittel 1"
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
 msgid "Medium 2"
 msgstr "Mittel 2"
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
 msgid "Medium 3"
 msgstr "Mittel 3"
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
 msgid "Full auto"
 msgstr "Vollautomatisch"
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr "Landschaft"
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
 msgid "Fast shutter"
 msgstr "Schneller Verschluß"
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 msgid "Slow shutter"
 msgstr "Langsamer Verschluß"
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 msgid "Night Scene"
 msgstr "Nachtszene"
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
 msgid "Gray scale"
 msgstr "Grauskalierung"
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
 msgstr "Sepia"
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 msgid "Sports"
 msgstr "Sport"
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 msgid "Macro / close-up"
 msgstr "Makro/Großaufnahme"
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 msgid "Black & white"
 msgstr "Schwarz/Weiß"
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 msgid "Vivid"
 msgstr "Vivid"
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
 msgid "Flash off"
 msgstr "Blitz aus"
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 msgid "Long shutter"
 msgstr "Langsamer Verschluß"
 
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr "Supermakro"
-
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
 msgid "Foliage"
 msgstr "Blätter"
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
 msgid "Indoor"
 msgstr "Innen"
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
 msgstr "Feuerwerk"
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
 msgstr "Strand"
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 msgid "Underwater"
 msgstr "Unterwasser"
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
 msgid "Snow"
 msgstr "Schnee"
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
 msgstr "Kinder & Tiere"
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 msgid "Night SnapShot"
 msgstr "Nachtaufnahme"
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 msgid "Digital macro"
 msgstr "Digitales Makro"
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
 msgid "My Colors"
 msgstr "Meine Farben"
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
 msgid "Still image"
 msgstr "Standbild"
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
 msgid "Other"
 msgstr "Andere"
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
 msgstr "Niedrig"
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 msgid "High"
 msgstr "Hoch"
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr "n/v"
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
 msgid "Auto High"
 msgstr "Automatisch Hoch"
 
-#: src/canonmn.cpp:322
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
 msgid "Default"
 msgstr "Standard"
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
 msgid "Spot"
 msgstr "Punkt"
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr "Durchschnitt"
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
 msgid "Evaluative"
 msgstr "Bewertend"
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
 msgid "Partial"
 msgstr "Partiell"
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 msgid "Center weighted"
 msgstr "Zentriert gewichtet"
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 msgid "Not known"
 msgstr "Unbekannt"
 
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr "Macro"
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 msgid "Very close"
 msgstr "Sehr nahe Aufnahme"
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
 msgid "Close"
 msgstr "Nahaufnahme"
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
 msgid "Middle range"
 msgstr "Mittlere Entfernung"
 
-#: src/canonmn.cpp:339
+#: src/canonmn.cpp:391
 msgid "Far range"
 msgstr "Weite Entfernung"
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 msgid "Infinity"
 msgstr "Unendlich"
 
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
 msgid "Manual AF point selection"
 msgstr "Manuelle Auswahl des Autofokus-Punktes"
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 msgid "None (MF)"
 msgstr "Keine (Manueller Fokus)"
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 msgid "Auto-selected"
 msgstr "Automatische Erfassung"
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 msgid "Right"
 msgstr "Rechts"
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 msgid "Center"
 msgstr "Zentriert"
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
 msgid "Left"
 msgstr "Links"
 
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
 msgid "Auto AF point selection"
 msgstr "Autofokus-Punktauswahl"
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
 msgid "Easy shooting (Auto)"
 msgstr "Einfach Aufnahme (Auto)"
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 msgid "Program (P)"
 msgstr "Programm (P)"
 
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 msgid "Shutter priority (Tv)"
 msgstr "Verschlußpriorität (Tv)"
 
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 msgid "Aperture priority (Av)"
 msgstr "Blendenpriorität (Av)"
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 msgid "Manual (M)"
 msgstr "Manuell (M)"
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 msgid "Did not fire"
 msgstr "Blitz löste nicht aus"
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
 msgid "Fired"
 msgstr "Blitz ausgelöst"
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 msgid "External flash"
 msgstr "Externer Blitz"
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
 msgid "Internal flash"
 msgstr "Eingebauter Blitz"
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
 msgstr "TTL"
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr ""
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr ""
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
+#, fuzzy
 msgid "FP sync used"
-msgstr ""
+msgstr "Benutzter Autofokus-Punkt"
 
-#: src/canonmn.cpp:625
+#: src/canonmn.cpp:707
 msgid "Normal AE"
 msgstr "Normale automatische Belichtung"
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
 msgid "Exposure compensation"
 msgstr "Belichtungskompensation"
 
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
 msgstr "Automatische Belichtungssperre"
 
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 msgid "AE lock + exposure compensation"
 msgstr "Automatische Belichtungssperre + Belichtungskompensation"
 
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
 msgid "No AE"
 msgstr "Keine automatische Belichtung"
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
 msgid "On, shot only"
 msgstr "An, nur Aufnahme"
 
-#: src/canonmn.cpp:644
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+msgid "AF Point"
+msgstr "Autofokus-Punkt"
+
+#: src/canonmn.cpp:732
 msgid "Smooth"
 msgstr "Glatt"
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
 msgstr "S&W"
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
 msgid "My color data"
 msgstr "Meine Farbdaten"
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+msgid "Full"
+msgstr "Vollbild"
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:759
 msgid "Selftimer"
 msgstr "Selbstauslöser"
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
 msgid "Self timer"
 msgstr "Selbstauslöser"
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 msgid "Quality"
 msgstr "Qualität"
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 msgid "Flash Mode"
 msgstr "Blitzmodus"
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
 msgid "Flash mode setting"
 msgstr "Blitzmodus-Einstellungen"
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
 msgid "Drive Mode"
 msgstr "Antriebsmodus"
 
-#: src/canonmn.cpp:657
+#: src/canonmn.cpp:762
 msgid "Drive mode setting"
 msgstr "Antriebsmodus-Einstellungen"
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 msgid "Focus Mode"
 msgstr "Fokusmodus"
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
 msgid "Focus mode setting"
 msgstr "Fokusmodus-Einstellung"
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 msgid "Image Size"
 msgstr "Bildgrõße"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy Mode"
 msgstr "Einfacher Modus"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy shooting mode"
 msgstr "Einfacher Aufnahmemodus"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 msgid "Digital Zoom"
 msgstr "Digitaler Zoom"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 msgid "Digital zoom"
 msgstr "Digitaler Zoom"
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
 msgid "Contrast setting"
 msgstr "Kontrasteinstellungen"
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
 msgid "Saturation setting"
 msgstr "Sättigungseinstellung"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr "Schärfe"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
 msgid "Sharpness setting"
 msgstr "Schärfeneinstellung"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 msgid "ISO Speed Mode"
 msgstr "ISO Geschwindigkeitsangabe"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
 msgid "ISO speed setting"
 msgstr "ISO Geschwindigkeitseinstellung"
 
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
 msgstr "Belichtungsmessungsmodus"
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
 msgid "Metering mode setting"
 msgstr "Belichtungsmessungsmodus-Einstellungen"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus Type"
 msgstr "Fokustyp"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus type setting"
 msgstr "Fokustypeinstellung"
 
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-msgid "AF Point"
-msgstr "Autofokus-Punkt"
-
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 msgid "AF point selected"
 msgstr "Ausgewählter Autofokus-Punkt"
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 msgid "Exposure Program"
 msgstr "Belichtungsprogramm"
 
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
 msgid "Exposure mode setting"
 msgstr "Belichtungseinstellung"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 msgid "Lens Type"
 msgstr "Linsentyp"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 msgid "Lens type"
 msgstr "Linsentyp"
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 msgid "Lens"
 msgstr "Linse"
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
@@ -1668,672 +1972,985 @@
 "Brennweite der Linse, 'lang' und 'kurz', in Brennweiteneinheiten und "
 "Brennweiteeinheit in mm"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
+#: src/canonmn.cpp:781
+msgid "Short Focal"
+msgstr ""
+
+#: src/canonmn.cpp:781
+#, fuzzy
+msgid "Short focal"
+msgstr "Punktfokus"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal Units"
+msgstr "Brennweite"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal units"
+msgstr "Brennweite"
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
 msgid "Max Aperture"
 msgstr "Maximale Blende"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
 msgid "Max aperture"
 msgstr "Maximale Blende"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 msgid "Min Aperture"
 msgstr "Minimale Blende"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 msgid "Min aperture"
 msgstr "Minimale Blende"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash Activity"
 msgstr "Blitzaktivität"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash activity"
 msgstr "Blitzaktivität"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash Details"
 msgstr "Blitzdetails"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash details"
 msgstr "Blitzdetails"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus Continuous"
 msgstr "Kontinuierlicher Fokus"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus continuous setting"
 msgstr "Einstellung des kontinuierlichen Fokus"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AESetting"
 msgstr "Automatische Belichtung-Einstellungen"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AE setting"
 msgstr "Automatische Belichtung-Einstellungen"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 msgid "Image Stabilization"
 msgstr "Bildstabilisierung"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 msgid "Image stabilization"
 msgstr "Bildstabilisierung"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display Aperture"
 msgstr "Blende anzeigen"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display aperture"
 msgstr "Blende anzeigen"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom Source Width"
 msgstr "Quellweite zoomen"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom source width"
 msgstr "Quellweite zoomen"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom Target Width"
 msgstr "Zielweite zoomen"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom target width"
 msgstr "Zielweite zoomen"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot Metering Mode"
+msgstr "Belichtungsmessungsmodus"
+
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot metering mode"
+msgstr "Der Messmodus."
+
+#: src/canonmn.cpp:797
 msgid "Photo Effect"
 msgstr "Fotoeffekt"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 msgid "Photo effect"
 msgstr "Fotoeffekt"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual Flash Output"
+msgstr "Manuell ausgelöst"
+
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual flash output"
+msgstr "Manuell ausgelöst"
+
+#: src/canonmn.cpp:799
 msgid "Color Tone"
 msgstr "Farbton"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
 msgid "Color tone"
 msgstr "Farbton"
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
+msgstr ""
+
+#: src/canonmn.cpp:800
+#, fuzzy
+msgid "SRAW quality"
+msgstr "Bildqualität"
+
+#: src/canonmn.cpp:802
 msgid "Unknown Canon Camera Settings 1 tag"
 msgstr "Unbekanntes Feld in den Canon-Kameraeinstellungen 1"
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 msgid "Sunny"
 msgstr "Sonnig"
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 msgid "Cloudy"
 msgstr "Wolkiges Wetter"
 
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 msgid "Tungsten"
 msgstr "Wolframlicht"
 
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
 msgstr "Leuchtstoffröhre"
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
 msgid "Black & White"
 msgstr "Schwarz/Weiß"
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr "Schatten"
 
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 msgid "Manual Temperature (Kelvin)"
 msgstr "Manuelle Temperatur (Kelvin)"
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
 msgstr "PC Satz 1"
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
 msgstr "PC Satz 2"
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
 msgstr "PC Satz 3"
 
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
 msgid "Daylight Fluorescent"
 msgstr "Flursozierendes Tageslicht"
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 msgid "Custom 1"
 msgstr "Benutzerdefiniert 1"
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 msgid "Custom 2"
 msgstr "Benutzerdefiniert 2"
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+msgid "Custom 3"
+msgstr "Benutzerdefiniert 3"
+
+#: src/canonmn.cpp:831
+#, fuzzy
+msgid "PC Set 4"
+msgstr "PC Satz 1"
+
+#: src/canonmn.cpp:832
+#, fuzzy
+msgid "PC Set 5"
+msgstr "PC Satz 1"
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 msgid "left"
 msgstr "Links"
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 msgid "center"
 msgstr "Zentriert"
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
 msgid "right"
 msgstr "Rechts"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO Speed Used"
 msgstr "ISO Geschwindigkeitsangabe"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO speed used"
 msgstr "ISO Geschwindigkeitsangabe"
 
-#: src/canonmn.cpp:758
+#: src/canonmn.cpp:867
+msgid "Measured EV"
+msgstr ""
+
+#: src/canonmn.cpp:868
 msgid "Target Aperture"
 msgstr "Zielblende"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target Shutter Speed"
 msgstr "Zielverschlussgeschwindigkeit"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target shutter speed"
 msgstr "Zielverschlussgeschwindigkeit"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr "Weißabgleich"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
 msgid "White balance setting"
 msgstr "Weißabgleichseinstellung"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence"
 msgstr "Reihenfolge"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
 msgstr "Fortlaufende Nummer (wenn Sie im Burst-Modus fotografieren)"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF Point Used"
 msgstr "Benutzter Autofokus-Punkt"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF point used"
 msgstr "Benutzter Autofokus-Punkt"
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 msgid "Flash Bias"
 msgstr "Blitzkontrolle"
 
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
 msgstr "Entfernung des Motivs"
 
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 msgid "Subject distance (units are not clear)"
 msgstr "Motivabstand (Einheiten nicht klar definiert)"
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 msgid "Aperture Value"
 msgstr "Blendenwert"
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 msgid "Shutter Speed Value"
 msgstr "Verschlussgeschwindigkeitswert"
 
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr "Verschlussgeschwindigkeit"
 
-#: src/canonmn.cpp:782
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
+msgstr ""
+
+#: src/canonmn.cpp:892
 msgid "Unknown Canon Camera Settings 2 tag"
 msgstr "Unbekanntes Feld in den Canon-Kameraeinstellungen 2"
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 msgid "Left to right"
 msgstr "links nach rechts"
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 msgid "Right to left"
 msgstr "rechts nach links"
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 msgid "Bottom to top"
 msgstr "unten nach oben"
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 msgid "Top to bottom"
 msgstr "oben nach unten"
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
 msgstr "2x2 Matrix (Im Uhrzeigersinn)"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama Frame"
 msgstr "Panoramaeinzelbild"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama frame number"
 msgstr "Nummer des Panoramaeinzelbildes"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama Direction"
 msgstr "Pamoramarichtung"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama direction"
 msgstr "Pamoramarichtung"
 
-#: src/canonmn.cpp:804
+#: src/canonmn.cpp:914
 msgid "Unknown Canon Panorama tag"
 msgstr "Unbekanntes Canon-Panoramafeld"
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 msgid "Noise Reduction"
 msgstr "Rauschunterdrückung"
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
 msgid "Long exposure noise reduction"
 msgstr "Rauschreduktion einer langen Belichtung"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
+#, fuzzy
 msgid "Shutter Ae Lock"
-msgstr ""
+msgstr "Verschlussgeschwindigkeit"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
+#, fuzzy
 msgid "Shutter/AE lock buttons"
-msgstr ""
+msgstr "Verschlusszähler"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr "Spiegelvorauslösung"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr "Spiegelvorauslösung"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
+#, fuzzy
 msgid "Exposure Level Increments"
-msgstr ""
+msgstr "Belichtungsabstand"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
 msgid "AF Assist"
 msgstr "Autofokus-Unterstützung"
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
 msgstr "Autofokus-Lichtunterstützung"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
+#, fuzzy
 msgid "Flash Sync Speed Av"
-msgstr ""
+msgstr "Blitztyp"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
+#, fuzzy
 msgid "Shutter speed in Av mode"
-msgstr ""
+msgstr "Verschlusswert"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB Sequence"
 msgstr "AEB Sequenz"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB sequence/auto cancellation"
 msgstr "AEB Sequenz/Automatischer Abbruch"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
+#, fuzzy
 msgid "Shutter Curtain Sync"
-msgstr ""
+msgstr "Verschlusszähler"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
+#, fuzzy
 msgid "Shutter curtain sync"
-msgstr ""
+msgstr "Verschlusszähler"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF Stop Button"
 msgstr "Stoppknopf der Autofokus-Linse"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF stop button Fn. Switch"
 msgstr "Stoppknopf der Autofokus-Linse Funktionswechsel"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Fill Flash Auto Reduction"
 msgstr "Automatische Verringerung des Aufhellblitzes"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
 msgstr "Automatische Verringerung des Aufhellblitzes"
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
 msgstr "Menüknopf \"Eingabe\""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
+#, fuzzy
 msgid "Menu button return position"
-msgstr ""
+msgstr "Menüknopf \"Eingabe\""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "Set Button Function"
 msgstr "Knopffunktion setzen"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor Cleaning"
 msgstr "Sensorenreinigung"
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor cleaning"
 msgstr "Sensorenreinigung"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
 msgstr "Eingeblendetes Display"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
 msgstr "Eingeblendetes Display"
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
 msgid "Unknown Canon Custom Function tag"
 msgstr "Unbekanntes Feld in den benutzerdefinierten Funktionen von Canon"
 
-#: src/canonmn.cpp:841
+#: src/canonmn.cpp:951
 msgid "mid-right"
 msgstr "Mitte - rechts"
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 msgid "bottom"
 msgstr "Unten"
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 msgid "top"
 msgstr "Oben"
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
 msgid "mid-left"
 msgstr "Mitte - links"
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
 msgid "upper-left"
 msgstr "Oben - links"
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
 msgid "upper-right"
 msgstr "Oben - rechts"
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
 msgid "lower-left"
 msgstr "Unten - links"
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
 msgid "lower-right"
 msgstr "Unten - rechts"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
 msgid "Image Width"
 msgstr "Bildbreite"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
 msgid "Image width"
 msgstr "Bildbreite"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
 msgid "Image Height"
 msgstr "Bildhöhe"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
 msgid "Image height"
 msgstr "Bildhöhe"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image Width As Shot"
 msgstr "Bildbreite während der Aufnahme"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image width (as shot)"
 msgstr "Bildbreite bei der Aufnahme"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image Height As Shot"
 msgstr "Bildhöhe bei der Aufnahme"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image height (as shot)"
 msgstr "Bildhöhe (bei der Aufnahme)"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF Points Used"
 msgstr "Benutzte Autofokus-Punkte"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF points used"
 msgstr "Benutzte Autofokus-Punkte"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF Points Used 20D"
 msgstr "Benutzte Autofokus-Punkte 20D"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF points used (20D)"
 msgstr "Benutzte Autofokus-Punkte (20D)"
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 msgid "Unknown Canon Picture Info tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
+#, fuzzy
 msgid "ISO"
-msgstr ""
+msgstr "Aufnahmeinfo"
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 msgid "WB"
 msgstr ""
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
 msgstr ""
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
 msgstr ""
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 #, fuzzy
 msgid "Medium Movie"
 msgstr "Mittel 1"
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 #, fuzzy
 msgid "Small Movie"
 msgstr "Film"
 
-#: src/canonmn.cpp:905
+#: src/canonmn.cpp:1015
 #, fuzzy
 msgid "On 1"
 msgstr "An"
 
-#: src/canonmn.cpp:906
+#: src/canonmn.cpp:1016
 #, fuzzy
 msgid "On 2"
 msgstr "An"
 
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 #, fuzzy
 msgid "On (shift AB)"
 msgstr "Eine Aufnahme mit Autofokus"
 
-#: src/canonmn.cpp:915
+#: src/canonmn.cpp:1025
+#, fuzzy
 msgid "On (shift GM)"
-msgstr ""
+msgstr "Eine Aufnahme mit Autofokus"
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
 msgstr "Gelb"
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 msgid "Orange"
 msgstr "Orange"
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 msgid "Red"
 msgstr "Rot"
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 msgid "Green"
 msgstr "Grün"
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
 msgid "Blue"
 msgstr "Blau"
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
 msgstr "Lila"
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Automatischer Erfassungsschritt"
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
 #, fuzzy
 msgid "Bracket Value"
 msgstr "Automatischer Erfassungsschritt"
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
 #, fuzzy
 msgid "Bracket Shot Number"
 msgstr "Automatischer Erfassungsschritt"
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 #, fuzzy
 msgid "Raw Jpg Quality"
 msgstr "Bildqualität"
 
-#: src/canonmn.cpp:943
+#: src/canonmn.cpp:1053
 #, fuzzy
 msgid "Raw Jpg Size"
 msgstr "Bildgrõße"
 
-#: src/canonmn.cpp:945
+#: src/canonmn.cpp:1055
 #, fuzzy
 msgid "WB Bracket Mode"
 msgstr "Automatischer Erfassungsschritt"
 
-#: src/canonmn.cpp:946
+#: src/canonmn.cpp:1056
 #, fuzzy
 msgid "WB Bracket Value AB"
 msgstr "Weißabgleichswert"
 
-#: src/canonmn.cpp:947
+#: src/canonmn.cpp:1057
 #, fuzzy
 msgid "WB Bracket Value GM"
 msgstr "Weißabgleichswert"
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 #, fuzzy
 msgid "Filter Effect"
 msgstr "Farbeffekt"
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 #, fuzzy
 msgid "Toning Effect"
 msgstr "Fotoeffekt"
 
-#: src/canonmn.cpp:951
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro Magnification"
+msgstr "Elektronische Vergrößerung"
+
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro magnification"
+msgstr "Elektronische Vergrößerung"
+
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
+msgstr ""
+
+#: src/canonmn.cpp:1061
+#, fuzzy
+msgid "Live view shooting"
+msgstr "Antriebsmodus-Einstellungen"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash Exposure Lock"
+msgstr "Blitzbelichtungskompensation"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash exposure lock"
+msgstr "Blitzbelichtungskompensation"
+
+#: src/canonmn.cpp:1064
 #, fuzzy
 msgid "Unknown Canon File Info tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/crwimage.cpp:663
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
+msgstr "Standard"
+
+#: src/canonmn.cpp:1082
+#, fuzzy
+msgid "Lowest"
+msgstr "Abwärts-Links"
+
+#: src/canonmn.cpp:1086
+#, fuzzy
+msgid "Highest"
+msgstr "Hoch"
+
+#: src/canonmn.cpp:1094
+#, fuzzy
+msgid "High Saturation"
+msgstr "Sättigung"
+
+#: src/canonmn.cpp:1096
+#, fuzzy
+msgid "Low Saturation"
+msgstr "Sättigung"
+
+#: src/canonmn.cpp:1097
+#, fuzzy
+msgid "CM Set 1"
+msgstr "PC Satz 1"
+
+#: src/canonmn.cpp:1098
+#, fuzzy
+msgid "CM Set 2"
+msgstr "PC Satz 2"
+
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
+msgstr ""
+
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
+msgstr ""
+
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
+msgstr ""
+
+#: src/canonmn.cpp:1102
+msgid "PC 1"
+msgstr ""
+
+#: src/canonmn.cpp:1103
+msgid "PC 2"
+msgstr ""
+
+#: src/canonmn.cpp:1104
+msgid "PC 3"
+msgstr ""
+
+#: src/canonmn.cpp:1109
+msgid "Faithful"
+msgstr ""
+
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+msgid "Monochrome"
+msgstr "Monochrom"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "ToneCurve"
+msgstr "Farbtonkurve"
+
+#: src/canonmn.cpp:1115
+msgid "Tone curve"
+msgstr "Farbtonkurve"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "SharpnessFrequency"
+msgstr "Schärfe"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "Sharpness frequency"
+msgstr "Schärfe-Wert"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "SensorRedLevel"
+msgstr "WB_RGGBLevelsShade"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "Sensor red level"
+msgstr "Schwarzlevel"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "SensorBlueLevel"
+msgstr "WB_RGGBLevelsShade"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "Sensor blue level"
+msgstr "Schwarzlevel"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "WhiteBalanceRed"
+msgstr "Weißabgleich"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "White balance red"
+msgstr "Weißabgleich 2"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "WhiteBalanceBlue"
+msgstr "Weißabgleichswert"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "White balance blue"
+msgstr "Weißabgleichstabelle"
+
+#: src/canonmn.cpp:1122
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Weißabgleich"
+
+#: src/canonmn.cpp:1123
+#, fuzzy
+msgid "ColorTemperature"
+msgstr "Farbtemperatur"
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+msgid "Color Temperature"
+msgstr "Farbtemperatur"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "PictureStyle"
+msgstr "Bildmodus"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "Picture style"
+msgstr "Bildmodus"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "DigitalGain"
+msgstr "Digitales Makro"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "Digital gain"
+msgstr "Digitales Makro"
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+#, fuzzy
+msgid "WBShift AB"
+msgstr "Eine Aufnahme mit Autofokus"
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+#, fuzzy
+msgid "WB Shift GM"
+msgstr "Eine Aufnahme mit Autofokus"
+
+#: src/canonmn.cpp:1128
+#, fuzzy
+msgid "Unknown Canon Processing Info tag"
+msgstr "Unbekanntes Feld in der Canon-Bildinfo"
+
+#: src/crwimage.cpp:664
 msgid "Header, offset"
 msgstr "Header, offset"
 
-#: src/crwimage.cpp:680
+#: src/crwimage.cpp:681
 msgid "tag"
 msgstr "Feld"
 
-#: src/crwimage.cpp:682
+#: src/crwimage.cpp:683
 msgid "dir"
 msgstr "Ordner"
 
-#: src/crwimage.cpp:684
+#: src/crwimage.cpp:685
 msgid "type"
 msgstr "Typ"
 
-#: src/crwimage.cpp:685
+#: src/crwimage.cpp:686
 msgid "size"
 msgstr "GrößeVoll"
 
-#: src/crwimage.cpp:686
+#: src/crwimage.cpp:687
 msgid "offset"
 msgstr "Offset"
 
@@ -2363,8 +2980,8 @@
 "vom Anbieter, Teil 1identifiziert. Die Versionsnummern werden von der IPTC "
 "und NAA Organisationen zugewiesen."
 
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
 msgid "Destination"
 msgstr "Ziel"
 
@@ -2376,7 +2993,7 @@
 "Dieser Datensatz ist für die Anbieter die Weiterleitungsinformationen "
 "oberhalb der entsprechenden OSI-Layer benötigen."
 
-#: src/datasets.cpp:94
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
 msgid "File Format"
 msgstr "Dateiformat"
 
@@ -2626,7 +3243,7 @@
 msgid "Document Title"
 msgstr "Dokumententitel"
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
 msgid "Edit Status"
 msgstr "Bearbeitungsstatus"
 
@@ -2649,22 +3266,22 @@
 "Felder <ARMIdentifier> und <ARMVersion> hergestellt. Dies geschieht durch "
 "die Standards des Anbieters."
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
 msgstr "Dringlichkeit"
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
 "Gibt die redaktionelle Wichtigkeit des Inhalts und nicht notwendigerweise "
 "Die Wichtigkeit mit der der Umschlag behandelt werden muß. Siehe dazu daß "
 "Sichwort <EnvelopePriority>. \"1\" ist die höchste, \"5\" normal und \"8\" "
 "die niedrigste Wichtigkeit."
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
 msgid "Subject"
 msgstr "Motiv"
 
@@ -2674,7 +3291,7 @@
 "Die Referenz des Motivs ist eine strukturierte Definition des Motivs, um das "
 "es sich dreht."
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
 msgid "Category"
 msgstr "Kategorie"
 
@@ -2704,7 +3321,7 @@
 "enthalten ist. Falls nicht, so bleibt die Auswahl der zusätzlichen Kategorie "
 "beim Anbieter."
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
 msgstr "Zusätzliche Kategorien"
 
@@ -2721,7 +3338,7 @@
 "Dadurch wird es dem Benutzer möglich ein solches Objekt schnell zu finden "
 "oder wieder aufzurufen."
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
 msgstr "Schlüsselbegriffe"
 
@@ -2772,7 +3389,7 @@
 "geographischen Ortes zur Verfügung der dem Inhalt des Motivs entspricht. "
 "Dies geschieht nach den Richtlinien des Anbieters."
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
 msgid "Release Date"
 msgstr "Freigabedatum"
 
@@ -2832,7 +3449,7 @@
 "Andere redaktionelle Anweisungen, wie z.B. Embargos und Warnungen, bezüglich "
 "der Benutzung der Objektdaten."
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 msgid "Instructions"
 msgstr "Anweisungen"
 
@@ -2886,7 +3503,7 @@
 "Gibt die Umschlagsnummer eines vorangegangenen Umschlags an, auf den das "
 "aktuelle Objekt verweist."
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
 msgid "Date Created"
 msgstr "Erstellungsdatum"
 
@@ -2938,9 +3555,10 @@
 "Gibt in der Form SSMMSS:HHMM die Uhrzeit an, an dem die digitale Version der "
 "Objektdaten erstellt wurde. Es wird der ISO 8601 Standard benutzt."
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 msgid "Program"
 msgstr "Programm"
 
@@ -2994,7 +3612,7 @@
 "Der Titel der Verfasserzeile ist der Titel des oder der Ersteller der "
 "Objektdaten."
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr "Stadt"
 
@@ -3034,7 +3652,7 @@
 msgid "State/Province"
 msgstr "Staat/Provinz"
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
 msgid "Country Code"
 msgstr "Länderkode"
 
@@ -3071,11 +3689,11 @@
 "Lokation zur Verfügung, wo das intellektuelle Eigentum der Objektdaten "
 "erstellt wurde. Hierbei werden die Richtlinien des Anbieters beachtet."
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
 msgid "Country"
 msgstr "Land"
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
 msgid "Transmission Reference"
 msgstr "Übertragungsreferenz"
 
@@ -3087,7 +3705,7 @@
 "Ein Code nach den Standards des  Anbieters, der den Ursprung der "
 "Originalübertragung angibt."
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
 msgid "Headline"
 msgstr "Schlagzeile"
 
@@ -3098,7 +3716,7 @@
 "Ein veröffentlichbarer Eintrag, der eine Zusammenfassung des Inhalts der "
 "Objektdaten zur Verfügung stellt."
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
 msgid "Credit"
 msgstr "Anbieter"
 
@@ -3110,8 +3728,8 @@
 "Identifiziert den Anbieter der Objektdaten. Dies ist nicht unbedingt der "
 "Besitzer oder der Ersteller."
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
 msgid "Source"
 msgstr "Quelle"
 
@@ -3132,7 +3750,7 @@
 msgid "Copyright Notice"
 msgstr "Copyright-Notiz"
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -3152,7 +3770,7 @@
 msgid "A textual description of the object data."
 msgstr "Eine textuelle Beschreibung der Objektdaten."
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -3193,7 +3811,7 @@
 msgid "Indicates the layout of an image."
 msgstr "Gibt das Layout eines Bildes an."
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
 msgid "Language"
 msgstr "Sprache"
 
@@ -3294,225 +3912,227 @@
 msgid "Unknown dataset"
 msgstr "Unbekannter Datensatz"
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+#, fuzzy
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr "Fahler %0: arg1=%1, arg2=%2, arg3=%3."
 
-#: src/error.cpp:50
+#: src/error.cpp:56
 msgid "Success"
 msgstr "Erfolgreich"
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr "Dies scheint kein %1 Bild zu sein."
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr "Ungültiger Datensatzname \"%1\""
 
-#: src/error.cpp:55
+#: src/error.cpp:61
 msgid "Invalid record name `%1'"
 msgstr "Ungültiger Datensatzname \"%1\""
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr "Ungültiger Schlüssel \"%1\""
 
-#: src/error.cpp:57
+#: src/error.cpp:63
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
 msgstr "Ungültiger Feldname oder IFD-ID `%1', IFD-ID %2"
 
-#: src/error.cpp:58
+#: src/error.cpp:64
 msgid "Value not set"
 msgstr "Wert nicht gesetzt"
 
-#: src/error.cpp:59
+#: src/error.cpp:65
 msgid "%1: Failed to open the data source: %2"
 msgstr "%1: Die Datenquelle konnte nicht geöffnet werden: %2"
 
-#: src/error.cpp:60
+#: src/error.cpp:66
 msgid "%1: Failed to open file (%2): %3"
 msgstr "%1: Die Datei konnte nicht geöffnet werden (%2): %3"
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr "%1: Die Datei enthält Daten eines unbekannten Bildtyps."
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr "Der Speicher enthält Daten eines unbekannten Bildtypes."
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr "Der Bildtyp %1 ist nicht unterstützt."
 
-#: src/error.cpp:64
+#: src/error.cpp:70
 msgid "Failed to read image data"
 msgstr "Die Bilddaten konnten nicht gelesen werden."
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr "Dies scheint kein JPEG-Bild zu sein."
 
-#: src/error.cpp:67
+#: src/error.cpp:72
+#, fuzzy
+msgid "%1: Failed to map file for reading and writing: %2"
+msgstr "Die Kommandozeile konnte nicht gelesen werden\n"
+
+#: src/error.cpp:73
 msgid "%1: Failed to rename file to %2: %3"
 msgstr "%1: Datei konnte nicht umbenannt werden nach %2: %3"
 
-#: src/error.cpp:68
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr "%1: Transfer fehlgeschlagen: %2"
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr "Speichertransfer fehlgeschlagen: %1"
 
-#: src/error.cpp:70
+#: src/error.cpp:76
 msgid "Failed to read input data"
 msgstr "Die Eingabedaten konnten nicht gelesen werden."
 
-#: src/error.cpp:71
+#: src/error.cpp:77
 msgid "Failed to write image"
 msgstr "Das Bild konnte nicht geschrieben werden."
 
-#: src/error.cpp:72
+#: src/error.cpp:78
 msgid "Input data does not contain a valid image"
 msgstr "Die Eingabedaten enthalten kein gültiges Bild."
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 msgid "Invalid ifdId %1"
 msgstr "Ungültige IFD-ID %1"
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr "Entry::setValue: Wert zu groß (Feld=%1, Größe=%2, Angefragt=%3)"
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr "Entry::setDataArea: Wert zu groß (Feld=%1, Größe=%2, Angefragt=%3)"
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr "Offset ausserhalb des zulässigen Bereiches"
 
-#: src/error.cpp:77
+#: src/error.cpp:83
 msgid "Unsupported data area offset type"
 msgstr "Nicht unterstützter Datenbereich für den Offsettyp"
 
-#: src/error.cpp:78
+#: src/error.cpp:84
 msgid "Invalid charset: `%1'"
 msgstr "Ungültiger Zeichensatz: \"%1\""
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr "Nicht unterstütztes Datumsformat"
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr "Nicht unterstütztes Zeitformat"
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 #, fuzzy
 msgid "Writing to %1 images is not supported"
 msgstr "Das Schreiben von %2 Bildern wird nicht unterstützt."
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr "Das Setzen von %1 in %2 Bildern ist nicht unterstützt."
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr "Dies scheint kein CRW Bild zu sein."
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr "%1: Nicht unterstützt"
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr "Keine Namensrauminformation für den XMP-Präfix `%1' verfügbar"
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr ""
 "Es ist kein Präfix registriert für den Namensraum `%2', dieser wird benötigt "
 "für den Eigenschaftspfad `%1'"
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr "Die Größe des %1 JPEG-Segments ist größer als 5535 Bytes."
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr "Nicht verwaltbares XMP-Datum %1 vom Typ %2"
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr "Nicht verwaltbarer XMP-Knoten %1 mit opt=%2"
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr "Fehler des XMP-Werkzeugsatzes %1: %2"
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr ""
 "Fehler beim Dekodieren der alternativen Spracheigenschaft %1 mit opt=%2"
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr "Fehler beim Dekodieren der alternativen Sprachvermerks %1 mit opt=%2"
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr "Fehler beim Enkodieren der alternativen Spracheigenschaft %1"
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
-"Fehler bei der Bestimmung des Eigenschaftsnamen aus dem Pfad %1, Namensraum %"
-"2"
+"Fehler bei der Bestimmung des Eigenschaftsnamen aus dem Pfad %1, Namensraum "
+"%2"
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr "Namensraum des Schemas %1 ist nicht im XMP Werkzeugsatz registriert"
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr "Es ist kein Namensraum für den Präfix `%1' registriert"
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 "Aliase werden nicht unterstützt. Bitte senden Sie dieses XMP-Packet an "
 "ahuggel@gmx.net `%1', `%2', `%3'"
 
-#: src/error.cpp:98
+#: src/error.cpp:104
 msgid "Invalid XmpText type `%1'"
 msgstr "Ungültiger Xmp-Texttyp `%1'"
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr "Der TIFF Ordner %1 hat zu viele Einträge"
 
-#: src/error.cpp:100
+#: src/error.cpp:106
 msgid "Multiple TIFF array element tags %1 in one directory"
 msgstr "Mehrfache TIFF-Feldelemente %1 in einem Ordner"
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr "Das TIFF-Feldelement %1 hat den falschen Typ"
 
-#: src/error.cpp:103
-msgid "(Unknown Error)"
-msgstr "(Unbekannter Fehler)"
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
-msgstr "Copyright (C) 2004-2009 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
+msgstr "Copyright (C) 2004-2010 Andreas Huggel.\n"
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3524,7 +4144,7 @@
 "der Free Software Foundation veröffentlicht wurde. Gültig ist die Version 2\n"
 "der Lizenz oder, wenn Sie es wünschen, spätere Versionen.\n"
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3537,7 +4157,7 @@
 "Zusicherung der erforderlichen Gebrauchstauglichkeit. Weitere Details\n"
 "finden Sie in der GNU General Public Lizenz.\n"
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3549,11 +4169,11 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
 "Boston, MA 02110-1301 USA\n"
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr "Benutzung:"
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
@@ -3561,11 +4181,11 @@
 "[ Optionen ] [ Aktionen ] Datei ...\n"
 "\n"
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr "Ändert die Exif-Metadaten von Bildern.\n"
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
@@ -3573,7 +4193,7 @@
 "\n"
 "Aktionen:\n"
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
@@ -3582,15 +4202,15 @@
 "                Aktion benötigt mindestens eine der Optionen -a, -Y, -O oder "
 "-D.\n"
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr "  pr | print    Druckt die Metadaten des Bildes.\n"
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr "  rm | delete   Löscht die Bildmetadaten aus den Dateien.\n"
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
@@ -3599,14 +4219,14 @@
 "                Benutzen Sie die Option -S um die Erweiterung der "
 "Eingabedateien zu ändern.\n"
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 "  ex | extract  Extrahiert die Metadaten in *.exv, *.xmp und "
 "Bildvorschaudateien.\n"
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
@@ -3619,7 +4239,7 @@
 "                -r format gesetzt werden. Die Optionen der Zeitstempel "
 "werden mit -t und -T kontrolliert.\n"
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
@@ -3631,7 +4251,7 @@
 "Kommentar.\n"
 "                Benötigt zusätzlich eine Option von-c, -m oder -M.\n"
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
@@ -3640,7 +4260,13 @@
 "Herstellerbemerkung in das reguläre\n"
 "                Exif-Feld.\n"
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
@@ -3648,58 +4274,73 @@
 "\n"
 "Optionen:\n"
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr "   -h      Gibt diese Hilfe aus und beendet sich.\n"
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr "   -V      Zeigt die Programmversion an und beendet sich.\n"
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr "   -v      Ausführliche Meldungen während des Programmlaufs.\n"
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+#, fuzzy
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr "   -v      Ausführliche Meldungen während des Programmlaufs.\n"
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr "   -b      zeigt große binäre Werte an.\n"
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 #, fuzzy
 msgid "   -u      Show unknown tags.\n"
 msgstr "   -u      Zeigt keine unbekannten Felder an.\n"
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr "   -k      Bewahrt die Dateizeitstempel (keep).\n"
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 "   -t      Setzt beim \"Umbennenen\" auch die Zeitstempel der Datei "
 "(überschreibt -k).\n"
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
 msgstr ""
-"   -T      Setzt nur die Dateizeitsempel in der Aktion \"umbenennen\" und "
+"   -T      Setzt nur die Dateizeitstempel in der Aktion \"umbenennen\" und "
 "benennt nicht die \n"
 "           Datei um (überschreibt -k).\n"
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr ""
 "   -f      Vor dem überschreiben von existierenden Dateien nicht nachfragen "
 "(force).\n"
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr "   -F      Vor dem umbenennen nicht nachfragen (Force).\n"
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
@@ -3707,72 +4348,72 @@
 "   -a time Zeitjustierung im Format [-]HH[:MM[:SS]]. Diese Option wird\n"
 "           nur in Zusammenhang mit der Aktion 'Justieren' benutzt.\n"
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr "   -Y yrs  Justierung von Jahren in der Aktion \"justieren\".\n"
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr "   -O mon  Justierung der Monate in der Aktion 'justieren'.\n"
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr "   -D day  Jusitierung von tagen in der Aktion \"Justierung\".\n"
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr "   -p mode Druckmodus für die Aktion 'Drucken'. Mögliche Modi sind:\n"
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr ""
 "             s : druckt eine Zusammenfassung der Exif-Metadaten (Standard)\n"
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 #, fuzzy
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
 msgstr ""
 "             v : Vollständige Exif-Datenwerte (Kurzform für -Pxgnycv)\n"
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 #, fuzzy
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 "             t : interpretiert (übersetzt) die Exif-Daten (Kurzform für -"
 "Pkyct)\n"
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 #, fuzzy
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr ""
 "             v : Vollständige Exif-Datenwerte (Kurzform für -Pxgnycv)\n"
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 #, fuzzy
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr "             h : Hexdump der Exif-Daten (Kurzform für -Pxgnycsh)\n"
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 #, fuzzy
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr "             i : IPTC-Datenwerte\n"
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 #, fuzzy
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr "             x : XMP-Eigenschaften\n"
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr "             c : JPEG-Kommentar\n"
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 #, fuzzy
 msgid "             p : list available previews\n"
 msgstr "             l : Feldlabel\n"
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 #, fuzzy
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
@@ -3780,92 +4421,92 @@
 "   -P cols Druckt Spalten für die Exif-Feldliste (Aktion 'Drucken' action). "
 "Gültig sind:\n"
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 #, fuzzy
 msgid "             E : include Exif tags in the list\n"
 msgstr "             s : Größe in Bytes\n"
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 #, fuzzy
 msgid "             I : IPTC datasets\n"
 msgstr "             i : IPTC-Daten\n"
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 #, fuzzy
 msgid "             X : XMP properties\n"
 msgstr "             x : XMP-Eigenschaften\n"
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 #, fuzzy
 msgid "             x : print a column with the tag number\n"
 msgstr "             x : Druckt eine Spalte mit dem Feldwert\n"
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr "             g : Gruppenname\n"
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr "             k : Schlüssel\n"
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr "             l : Feldlabel\n"
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr "             n : Feldname\n"
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr "             y : Typ\n"
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr "             c : Anzahl der Komponenten (Zähler)\n"
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr "             s : Größe in Bytes\n"
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr "             v : Vollständiger Datenwert\n"
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr "             t : interpretierte, übersetzte Daten\n"
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr "             h : Hexdump der Daten\n"
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr "   -d ziel  Ziele für die Aktion \"Löschen\". Mögliche Ziele sind:\n"
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr "             a : Alle unterstützten Metadaten (Standard)\n"
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr "             e : Exif-Abschnitt\n"
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr "             t : Nur die Exif-Vorschau\n"
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr "             i : IPTC-Daten\n"
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr "             x : XMP-Paket\n"
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
 "           the same as those for the -d option, plus a modifier:\n"
@@ -3880,7 +4521,7 @@
 "Namen\n"
 "           <file>-thumb.jpg haben.\n"
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 #, fuzzy
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
@@ -3895,7 +4536,7 @@
 "           die gleichen wie bei der Option -d, und:\n"
 "             X : Extrahiert die Metadaten in die XMP-Zusatzdatei <file>.xmp\n"
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
@@ -3905,29 +4546,29 @@
 "           entspricht strftime(3). Die folgenden Schlüsselwörter werden "
 "unterstützt:\n"
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr "             :basename:   - Originaldateiname ohne Erweiterung\n"
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 "             :dirname:    - Name des Ordners in dem die Originaldatei liegt\n"
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr "             :parentname: - Name des Elternordners\n"
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr "           Das Standardformat des Dateinamens ist "
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr "   -c txt  JPEG-Kommentar der im Bild gesetzt wird.\n"
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
@@ -3936,7 +4577,7 @@
 "Befehle ist\n"
 "           set|add|del <schlüssel> [[<typ>] <wert>].\n"
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
@@ -3944,7 +4585,7 @@
 "   -M bef  Befehlszeile für die Aktion \"Modifizieren\". Das Format für die\n"
 "           Befehle ist das gleiche wie der Befehlsdatei.\n"
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
@@ -3952,7 +4593,7 @@
 "   -l ord  Lokation (Ordner) für die Dateien aus den eingefügt bzw. "
 "extrahiert wird.\n"
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
@@ -3961,407 +4602,414 @@
 "Einfügen.\n"
 "\n"
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 msgid "Option"
 msgstr "Option"
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr "benötigt ein Argument\n"
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr "Unbekannte Option"
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr "\"getopt\" gab einen unerwarteten Zeichencode zurück"
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr "Die überzählige Option wird ignoriert"
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr "kann nicht mit der vorangegangene Option zusammen benutzt werden\n"
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr "Die überflüssige Option \"-a\" wird ignoriert"
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr "Fehler beim Verarbeiten des Arguments \"-a\""
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr ""
 "Die Option \"-a\" kann nicht mit der vorangegangene Option zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 msgid "Error parsing"
 msgstr "Fehler bei der Verarbeitung"
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 msgid "option argument"
 msgstr "Optionsargument"
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr "Unbekannter Druckmodus"
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr "Die überflüssige Option \"-p\" wird ignoriert"
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr ""
 "Die Option \"-p\" kann nicht mit der vorangegangene Option zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr "Unbekannter Druckeintrag"
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr "Die überflüssige Option \"-P\" wird ignoriert"
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr ""
 "Die Option \"-P\" kann nicht mit der vorangegangene Option zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr ""
 "Die Option \"-d\" kann nicht mit der vorangegangene Option zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr ""
 "Die Option \"-e\" kann nicht mit der vorangegangene Option zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr ""
 "Die Option \"-i\" kann nicht mit der vorangegangene Option zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"adjust\" kann nicht mit den anderen Optionen zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"print\" kann nicht mit den anderen Optionen zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"delete\" kann nicht mit den anderen Option zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"extract\" kann nicht mit den anderen Optionen zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"insert\" kann nicht mit den anderen Optionen zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"rename\" kann nicht mit den anderen Optionen zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"modify\" kann nicht mit den anderen Optionen zusammen benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr ""
 "Die Aktion \"fixiso\" kann nicht mit den anderen Optionen zusammen benutzt "
 "werden \n"
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+#, fuzzy
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr ""
+"Die Aktion \"fixiso\" kann nicht mit den anderen Optionen zusammen benutzt "
+"werden \n"
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr "Eine Aktion muss angegeben werden\n"
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr ""
 "Die Aktion \"justieren\" benötigt mindestens eine der Optionen \"-a\", \"-Y"
 "\", \"-O\" oder \"-D\"\n"
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr ""
 "Die Aktion \"modify\" benötigt mindestens eine der Optionen \"-c\", \"-m\" "
 "oder \"-M\"\n"
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr "Es muss mindestens eine Datei angegeben werden\n"
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr "Fehler beim verarbeiten der Argumente der Option \"-m\"\n"
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr "Fehler beim verarbeiten der Argumente der Option \"-M\"\n"
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr ""
 "-l Option kann nur bei den Aktionen \"extract\" und \"insert\" benutzt "
 "werden\n"
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr "-S Option kann nur bei der Aktion \"insert\" benutzt werden\n"
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr "-t Option kann nur bei der Aktion \"rename\" benutzt werden.\n"
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr "-T Option kann nur bei der Aktion \"rename\" benutzt werden.\n"
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr "Unbekannt"
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 msgid "target"
 msgstr "Ziel"
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 #, fuzzy
 msgid "Invalid preview number"
 msgstr "Intervallnummer"
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr "Die Kommandozeile konnte nicht gelesen werden\n"
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 msgid "line"
 msgstr "Zeile"
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 msgid "-M option"
 msgstr "Option \"-M\""
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr "Ungültige Kommandozeile"
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr "Ungültiges Kommando"
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
 msgstr "Ungültiger Schlüssel"
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
 msgid "Soft mode 1"
 msgstr "Softmodus 1"
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
 msgid "Soft mode 2"
 msgstr "Softmodus 2"
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
 msgid "Hard mode 1"
 msgstr "Hartmodus 1"
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
 msgid "Hard mode 2"
 msgstr "Hartmodus 2"
 
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr "Tageslicht"
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
 msgid "Fluorescent (daylight)"
 msgstr "Fluoreszenz (Tageslicht)"
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
 msgid "Fluorescent (warm white)"
 msgstr "Fluoreszenz (warmes Weiß)"
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
 msgid "Fluorescent (cool white)"
 msgstr "Fluoreszenz (kaltes Weiß)"
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
 msgid "Incandescent"
 msgstr "Glühend"
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
 msgid "None (black & white)"
 msgstr "Nichts (Schwarz/Weiß)"
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
 msgid "Red-eye reduction"
 msgstr "Rote Augen reduzieren"
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr "Nachtszene"
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
 msgid "Program AE"
 msgstr "Program \"automatische Belichtung\""
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 msgid "Natural light"
 msgstr "Natürliches Licht"
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
 msgid "Anti-blur"
 msgstr "Anti-Unschärfe"
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
 msgid "Sunset"
 msgstr "Sonnenuntergang"
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
 msgid "Museum"
 msgstr "Museum"
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
 msgid "Party"
 msgstr "Feier"
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 msgid "Flower"
 msgstr "Blume"
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
 msgstr "Text"
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
 msgid "Natural light & flash"
 msgstr "Natürliches Licht & Blitz"
 
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
 msgid "Aperture-priority AE"
 msgstr "Blendenpriorität AE"
 
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
+#, fuzzy
 msgid "Shutter speed priority AE"
-msgstr ""
+msgstr "Verschlussgeschwindigkeit-Priorität"
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
 msgid "No flash & flash"
 msgstr "Kein Blitz & Blitz"
 
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr "Standard"
-
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
 msgid "Chrome"
 msgstr "Chrom"
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
 msgid "Wide"
 msgstr "Weit"
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
 msgid "F0/Standard"
 msgstr "F0/Standard"
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 msgid "F1/Studio portrait"
 msgstr "F1/Studioportrait"
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
 msgstr "F2/Fujichrome"
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
 msgid "F3/Studio portrait Ex"
 msgstr "F3/Studioportrait Ex"
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr "F4/Velvia"
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr "Auto (100-400%)"
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr "Roh"
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
 msgid "Standard (100%)"
 msgstr "Standard (100%)"
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
 msgstr "Weitenmodus 1 (230%)"
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
 msgstr "Weitenmodus 2 (400%)"
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
 msgid "Film simulation mode"
 msgstr "Film-Simulationsmodus"
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
 msgid "Version"
 msgstr "Version"
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
 msgid "Fujifilm Makernote version"
 msgstr "Version der Fujifilm Herstellerbemerkung"
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
@@ -4369,192 +5017,193 @@
 "Die Nummer ist eindeutig und enthält das Datum der Herstellung. Es handelt "
 "sich nicht, um die gleiche Nummer wie die auf dem Kameragehäuse."
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
 msgid "Image quality setting"
 msgstr "Bildqualitätseinstellung"
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
 msgid "Color"
 msgstr "Farbe"
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 msgid "Chroma saturation setting"
 msgstr "Chroma-Sättigungseinstellungen"
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
 msgid "Tone"
 msgstr "Ton"
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
 msgid "Flash firing mode setting"
 msgstr "Blitzeinstellung"
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
 msgid "Flash Strength"
 msgstr "Blitzstärke"
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
+#, fuzzy
 msgid "Flash firing strength compensation setting"
-msgstr ""
+msgstr "Blitzkompensationseinstellung"
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
 msgid "Macro mode setting"
 msgstr "Makromoduseinstellung"
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 msgid "Focusing mode setting"
 msgstr "Fokusmoduseinstellung"
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
 msgstr "Langsame Synchronisation"
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
 msgid "Slow synchro mode setting"
 msgstr "Einstellungen des langsamen Synchronisationsmodus"
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
 msgid "Picture Mode"
 msgstr "Bildmodus"
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
 msgid "Picture mode setting"
 msgstr "Bildmoduseinstellung"
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr "Einstellungen für kontinuierliche Aufnahmen oder Belichtungsreihen"
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
 msgid "Sequence Number"
 msgstr "Sequenznummer"
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 msgid "Sequence number"
 msgstr "Sequenznummer"
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
 msgid "FinePix Color"
 msgstr "FinePix Farbe"
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
 msgstr "Fuji FinePix Farbeinstellung"
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
 msgid "Blur Warning"
 msgstr "Unschärfewarnung"
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
 msgid "Blur warning status"
 msgstr "Unschärfewarnung-Status"
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
 msgid "Focus Warning"
 msgstr "Fokuswarnung"
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
 msgid "Auto Focus warning status"
 msgstr "Status der Auto-Fokuswarnung"
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
 msgid "Exposure Warning"
 msgstr "Belichtungswarnung"
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
 msgid "Auto exposure warning status"
 msgstr "Status der Auto-Belichtungswarnung"
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
 msgid "Dynamic Range"
 msgstr "Dynamischer Bereich"
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
 msgid "Dynamic range"
 msgstr "Dynamischer Bereich"
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
 msgid "Film Mode"
 msgstr "Filmmodus"
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
 msgid "Film mode"
 msgstr "Filmmodus"
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
 msgid "Dynamic Range Setting"
 msgstr "Dynamische Bereichseinstellung"
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
 msgid "Dynamic range settings"
 msgstr "Dynamische Bereichseinstellung"
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
 msgid "Development Dynamic Range"
 msgstr "Entwicklungsdynamischer Bereich"
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
 msgid "Development dynamic range"
 msgstr "Entwicklungsdynamischer Bereich"
 
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
 msgid "Minimum Focal Length"
 msgstr "Minimale Fokuslänge"
 
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
 msgid "Minimum focal length"
 msgstr "Minimale Fokuslänge"
 
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
 msgid "Maximum Focal Length"
 msgstr "Maximale Fokuslänge"
 
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
 msgid "Maximum focal length"
 msgstr "Maximale Fokuslänge"
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
 msgid "Maximum Aperture at Mininimum Focal"
 msgstr "Maximale Blende bei minimalem Fokus"
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
 msgid "Maximum aperture at mininimum focal"
 msgstr "Maximale Blende bei minimalem Fokus"
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
 msgid "Maximum Aperture at Maxinimum Focal"
 msgstr "Maximale Blende bei maximalem Fokus"
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
 msgid "Maximum aperture at maxinimum focal"
 msgstr "Maximale Blende bei maximalem Fokus"
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr "Dateiquelle"
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 msgid "File source"
 msgstr "Dateiquelle"
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
 msgid "Order Number"
 msgstr "Ablaufsnummer"
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
 msgid "Order number"
 msgstr "Ablaufsnummer"
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
 msgid "Frame Number"
 msgstr "Einzelbildnummer"
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
 msgid "Frame number"
 msgstr "Einzelbildnummer"
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
 msgid "Unknown FujiMakerNote tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Fujii"
 
@@ -4562,20 +5211,20 @@
 msgid "Natural Color"
 msgstr "Natürliche Farbe"
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
 msgid "Vivid Color"
 msgstr "Vivid Farbe"
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
 msgid "Solarization"
 msgstr "Solarisation"
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
 msgid "Natural"
 msgstr "Natürlich"
 
@@ -4591,6524 +5240,9029 @@
 msgid "Evening"
 msgstr "Abend"
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
 msgid "Night Portrait"
 msgstr "Nachtportrait"
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
 msgid "Super Fine"
 msgstr "Superfein"
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
 msgid "Extra Fine"
 msgstr "Extrafein"
 
-#: src/minoltamn.cpp:84
-msgid "ISO Setting Used"
-msgstr "Benutzte ISO-Einstellungen"
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr "Hoher Schlüssel"
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr "Niedriger Schlüssel"
-
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
 msgid "Makernote Version"
 msgstr "Version der Herstellerbemerkung"
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr ""
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
 msgid "Camera Settings (Std Old)"
 msgstr "Kameraeinstellungen(Alter Standard)"
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 "Standard-Kameraeinstellungen (für alte Kameras wie z.B. D5, D7, S304 und "
 "S404)"
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
 msgid "Camera Settings (Std New)"
 msgstr "Kameraeinstellungen(Neuer Standard)"
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 "Standard-Kameraeinstellungen (für neue Kameras wie z.B. D7u, D7i und D7hi)"
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
 msgid "Camera Settings (7D)"
 msgstr "Kameraeinstellungen (7D)"
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
 msgid "Camera Settings (for Dynax 7D model)"
 msgstr "Kameraeinstellungen (für das Modell Dynax 7D)"
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
 msgid "Image Stabilization Data"
 msgstr "Bildstabilisierungsdaten"
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
 msgid "Image stabilization data"
 msgstr "Bildstabilisierungsdaten"
 
-#: src/minoltamn.cpp:247
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
+msgstr ""
+
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:111
 msgid "Compressed Image Size"
 msgstr "Komprimierte Bildgröße"
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:112
 msgid "Compressed image size"
 msgstr "Komprimierte Bildgröße"
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
 msgstr "Jpeg-Vorschau 640x480 Pixel"
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
 msgid "Thumbnail Offset"
 msgstr "Bildvorschauoffset"
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr "Offset der Bildvorschau"
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
 msgid "Thumbnail Length"
 msgstr "Bildvorschaulänge"
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
 msgid "Size of the thumbnail"
 msgstr "Größe der Bildvorschau"
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+msgid "Scene Mode"
+msgstr "Szenenmodus"
+
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
 msgid "Color Mode"
 msgstr "Farbmodus"
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
 msgid "Color mode"
 msgstr "Farbmodus"
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
 msgid "Image Quality"
 msgstr "Bildqualität"
 
-#: src/minoltamn.cpp:271
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
+msgstr ""
+
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+msgid "Flash Exposure Compensation"
+msgstr "Blitzkompensation"
+
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+msgid "Flash exposure compensation in EV"
+msgstr "Blitzkompensation in EV"
+
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+#, fuzzy
+msgid "Teleconverter Model"
+msgstr "Modell der Erweiterung"
+
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
+msgstr ""
+
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
+msgstr ""
+
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
 msgid "Zone Matching"
 msgstr "Zonenabgleich"
 
-#: src/minoltamn.cpp:272
+#: src/minoltamn.cpp:154
 msgid "Zone matching"
 msgstr "Zonenabgleich"
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
-msgid "Color Temperature"
-msgstr "Farbtemperatur"
-
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
 msgid "Color temperature"
 msgstr "Farbtemperatur"
 
-#: src/minoltamn.cpp:277
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
 msgid "Lens ID"
 msgstr "Linsen-ID"
 
-#: src/minoltamn.cpp:278
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
 msgid "Lens identifier"
 msgstr "Linsen-Identifizierung"
 
-#: src/minoltamn.cpp:280
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+#, fuzzy
+msgid "Color Compensation Filter"
+msgstr "Tonkompensation"
+
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
+msgstr ""
+
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+#, fuzzy
+msgid "White Balance Fine Tune"
+msgstr "Weißabgleichstabelle"
+
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+#, fuzzy
+msgid "White Balance Fine Tune Value"
+msgstr "Weißabgleichswert"
+
+#: src/minoltamn.cpp:168
+#, fuzzy
+msgid "Image Stabilization A100"
+msgstr "Bildstabilisierung"
+
+#: src/minoltamn.cpp:169
+#, fuzzy
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr "Bildstabilisierungsdaten"
+
+#: src/minoltamn.cpp:173
 msgid "Camera Settings (5D)"
 msgstr "Kameraeinstellungen (5D)"
 
-#: src/minoltamn.cpp:281
+#: src/minoltamn.cpp:174
 msgid "Camera Settings (for Dynax 5D model)"
 msgstr "Kameraeinstellungen (für Dynax 5D Modell)"
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
 msgid "Print IM"
 msgstr ""
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
+#, fuzzy
 msgid "PrintIM information"
-msgstr ""
+msgstr "GPS-Informationen"
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:183
 msgid "Camera Settings (Z1)"
 msgstr "Kameraeinstellungen (Z1)"
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr "Kameraeinstellungen (für Z1, DImage X und F100 Modelle)"
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
 msgid "Unknown Minolta MakerNote tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Minolta"
 
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr "Blendenpriorität"
 
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr "Verschlußpriorität"
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
 msgid "Fill flash"
 msgstr "Aufhellblitz"
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
 msgid "Rear flash sync"
 msgstr "Rear-Flash-Sync"
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
 msgid "Wireless"
 msgstr "Drahtlos"
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
 msgid "Fluorescent 2"
 msgstr "Fluroszierend 2"
 
-#: src/minoltamn.cpp:329 src/properties.cpp:763
-msgid "Custom 3"
-msgstr "Benutzerdefiniert 3"
-
-#: src/minoltamn.cpp:334
+#: src/minoltamn.cpp:231
 msgid "Full size"
 msgstr "Volle Größe"
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
 msgid "Super fine"
 msgstr "Superfein"
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr "Extrafein"
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+#, fuzzy
+msgid "Single Frame"
+msgstr "Einzelbild"
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
 msgid "Self-timer"
 msgstr "Selbstauslöser"
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
 msgid "Bracketing"
 msgstr "Automatische Erfassung"
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
 msgid "Interval"
 msgstr "Intervall"
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
 msgid "UHS continuous"
 msgstr "UHS fortlaufend"
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
 msgid "HS continuous"
 msgstr "HS fortlaufend"
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
 msgid "Multi-segment"
 msgstr "Mehr-Segment"
 
-#: src/minoltamn.cpp:380
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+msgid "Center weighted average"
+msgstr "Mittelpunkt gewichteter Durchschnitt"
+
+#: src/minoltamn.cpp:271
 msgid "Electronic magnification"
 msgstr "Elektronische Vergrößerung"
 
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
 msgid "Top"
 msgstr "Oben"
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
 msgid "Top-right"
 msgstr "Oben - rechts"
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 msgid "Bottom-right"
 msgstr "Unten - rechts"
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
 msgid "Bottom"
 msgstr "Unten"
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
 msgid "Bottom-left"
 msgstr "Unten - links"
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
 msgid "Top-left"
 msgstr "Oben - links"
 
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
 msgid "Hard"
 msgstr "Hart"
 
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
 msgid "Soft"
 msgstr "Weich"
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
 msgid "Night portrait"
 msgstr "Nachtportrait"
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
 msgid "Sports action"
 msgstr "Sportaktion"
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr "Zeitrafferfilm"
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 msgid "Standard form"
 msgstr "Standardformat"
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
 msgid "Data form"
 msgstr "Datenformat"
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
 msgid "Natural color"
 msgstr "Natürliche Farben"
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
 msgid "Black and white"
 msgstr "Schwarz/weiß"
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
 msgid "Vivid color"
 msgstr "Vivid Farbe"
 
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr "Adobe RGB"
-
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
 msgid "No zone"
 msgstr "Keine Zone"
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr "Mittelzone (Horizontale Orientierung)"
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr "Mittelzone (Vertikale Orientierung)"
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
 msgid "Left zone"
 msgstr "Linke Zone"
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 msgid "Right zone"
 msgstr "Rechte Zone"
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
 msgid "Auto focus"
 msgstr "Automatischer Fokus"
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
 msgid "Wide focus (normal)"
 msgstr "Weiter Fokus (Normal)"
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
 msgid "Spot focus"
 msgstr "Punktfokus"
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
 msgid "Exposure"
 msgstr "Belichtung"
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 msgid "Filter"
 msgstr "Filter"
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 msgid "Not embedded"
 msgstr "Nicht eingebettet"
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
 msgid "Embedded"
 msgstr "Eingebettet"
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr "Text + ID#"
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr "ADI (Advanced Distance Integration)"
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr "Pre-flash TTl"
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
 msgid "Manual flash control"
 msgstr "Manuelle Blitzkontrolle"
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr "Belichtungsmodus"
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
 msgid "Flash mode"
 msgstr "Blitzmodus"
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
 msgid "Drive mode"
 msgstr "Antriebsmodus"
 
-#: src/minoltamn.cpp:631
-msgid "Exposure Speed"
-msgstr "Belichtungsgeschwindigkeit"
-
-#: src/minoltamn.cpp:632
-msgid "Exposure speed"
-msgstr "Belichtungsgeschwindigkeit"
+#: src/minoltamn.cpp:512
+#, fuzzy
+msgid "ISO Value"
+msgstr "ISO-Geschwindigkeitswert"
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr "Belichtungszeit"
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 msgid "FNumber"
 msgstr "F Nummer."
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 msgid "The F-Number"
 msgstr "Die F Nummer"
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 msgid "Macro Mode"
 msgstr "Makromodus"
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
 msgid "Exposure Compensation"
 msgstr "Belichtungskompensierung"
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
 msgid "Bracket Step"
 msgstr "Automatischer Erfassungsschritt"
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
 msgid "Bracket step"
 msgstr "Automatischer Erfassungsschritt"
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
 msgid "Interval Length"
 msgstr "Intervalllänge"
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
 msgid "Interval length"
 msgstr "Intervalllänge"
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
 msgid "Interval Number"
 msgstr "Intervallnummer"
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
 msgid "Interval number"
 msgstr "Intervallnummer"
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
 msgid "Focus Distance"
 msgstr "Fokusabstand"
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
 msgid "Focus distance"
 msgstr "Fokusabstand"
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+#, fuzzy
+msgid "Flash Fired"
+msgstr "Blitzgerät"
+
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+#, fuzzy
+msgid "Flash fired"
+msgstr "Blitz aus"
+
+#: src/minoltamn.cpp:547
 msgid "Minolta Date"
 msgstr "Minolta Datum"
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
 msgid "Minolta date"
 msgstr "Minolta Datum"
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
 msgid "Minolta Time"
 msgstr "Minolta Zeit"
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
 msgid "Minolta time"
 msgstr "Minolta Zeit"
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
 msgid "File Number Memory"
 msgstr "Dateinummerspeicher"
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
 msgid "File number memory"
 msgstr "Dateinummerspeicher"
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
-msgid "Image Number"
+#: src/minoltamn.cpp:559
+#, fuzzy
+msgid "Last Image Number"
+msgstr "Bildnummer"
+
+#: src/minoltamn.cpp:560
+#, fuzzy
+msgid "Last image number"
 msgstr "Bildnummer"
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:562
 msgid "Color Balance Red"
 msgstr "Roter Farbabgleich"
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
 msgid "Color balance red"
 msgstr "Roter Farbabgleich"
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
 msgid "Color Balance Green"
 msgstr "Grüner Farbabgleich"
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
 msgid "Color balance green"
 msgstr "Grüner Farbabgleich"
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
 msgid "Color Balance Blue"
 msgstr "Blauer Farbabgleich"
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
 msgid "Color balance blue"
 msgstr "Blauer Farbabgleich"
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
 msgid "Subject Program"
 msgstr "Motiv-Programm"
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
 msgid "Subject program"
 msgstr "Motiv-Programm"
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
-msgid "Flash Exposure Compensation"
-msgstr "Blitzkompensation"
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
+msgid "ISO Settings"
+msgstr "ISO-Einstellungen"
 
-#: src/minoltamn.cpp:704
-msgid "Flash exposure compensation in EV"
-msgstr "Blitzkompensation in EV"
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
+msgid "ISO setting"
+msgstr "ISO-Einstellung"
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
 msgid "Minolta Model"
 msgstr "Minolta Modell"
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
 msgid "Minolta model"
 msgstr "Minolta Modell"
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
 msgid "Interval Mode"
 msgstr "Intervallmodus"
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
 msgid "Interval mode"
 msgstr "Intervallmodus"
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
 msgid "Folder Name"
 msgstr "Ordnername"
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
 msgid "Folder name"
 msgstr "Ordnername"
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
 msgid "ColorMode"
 msgstr "Farbmodus"
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
 msgid "Color Filter"
 msgstr "Farbfilter"
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
 msgid "Color filter"
 msgstr "Farbfilter"
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
 msgid "Black and White Filter"
 msgstr "Schwarz/Weiß-Filter"
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
 msgid "Black and white filter"
 msgstr "Schwarz/Weiß-Filter"
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
 msgid "Internal Flash"
 msgstr "Eingebauter Blitz"
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
 msgid "Spot Focus Point X"
 msgstr "Punktschärfe X-Wert"
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
 msgid "Spot focus point X"
 msgstr "Punktschärfe X-Wert"
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
 msgid "Spot Focus Point Y"
 msgstr "Punktschärfe Y-Wert"
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
 msgid "Spot focus point Y"
 msgstr "Punktschärfe Y-Wert"
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
 msgid "Wide Focus Zone"
 msgstr "Weite Fokuszone"
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
 msgid "Wide focus zone"
 msgstr "Weite Fokuszone"
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
 msgid "Focus mode"
 msgstr "Fokusmodus"
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
 msgid "Focus area"
 msgstr "Fokusbereich"
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
+#, fuzzy
 msgid "DEC Switch Position"
-msgstr ""
+msgstr "Autofokus-Position"
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
+#, fuzzy
 msgid "DEC switch position"
-msgstr ""
+msgstr "Autofokus-Position"
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
 msgid "Color Profile"
 msgstr "Farbprofil"
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
 msgid "Color profile"
 msgstr "Farbprofil"
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
+#, fuzzy
 msgid "Data Imprint"
-msgstr ""
+msgstr "Datendump"
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
 msgid "Flash Metering"
 msgstr "Blitzdosierung"
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
 msgid "Flash metering"
 msgstr "Blitzdosierung"
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
 msgid "Unknown Minolta Camera Settings tag"
 msgstr "Unbekanntes Feld in den Minolta-Kameraeinstellungen"
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
+#, fuzzy
 msgid "Program-shift A"
-msgstr ""
+msgstr "Programmwechsel"
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
+#, fuzzy
 msgid "Program-shift S"
-msgstr ""
+msgstr "Programmwechsel"
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
 msgid "Raw+Jpeg"
 msgstr "Roh+Jpeg"
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
 msgid "Kelvin"
 msgstr "Kelvin"
 
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
 msgid "Single-shot AF"
 msgstr "Einzelaufnahme-Autofokus"
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
 msgid "Continuous AF"
 msgstr "Kontinuierlicher Autofokus"
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
 msgid "Automatic AF"
 msgstr "Automatischer Autofokus"
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
 msgid "sRGB (Natural)"
 msgstr "sRGB (Natürlich)"
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
 msgid "sRGB (Natural+)"
 msgstr "sRGB (Natürlich+)"
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr "Horizontal (Normal)"
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr "90 Grad drehen (Im Uhrzeigersinn)"
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr "270 Grad drehen (Im Uhrzeigersinn)"
 
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
 msgid "AF Points"
 msgstr "Autofokus-Punkte"
 
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
 msgid "AF points"
 msgstr "Autofokus-Punkte"
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr "Farbraum"
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 msgid "Color space"
 msgstr "Farbraum"
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 msgid "Free Memory Card Images"
 msgstr "Freie Bilder auf der Speicherkarte"
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 msgid "Free memory card images"
 msgstr "Freie Bilder auf der Speicherkarte"
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
 msgid "Hue"
 msgstr "Sättigung"
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
 msgid "Rotation"
 msgstr "Drehung"
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+msgid "Image Number"
+msgstr "Bildnummer"
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
 msgid "Noise reduction"
 msgstr "Rauschreduktion"
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
 msgid "Zone Matching On"
 msgstr "Zonenabgleich eingeschaltet"
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
 msgid "Zone matching on"
 msgstr "Zonenabgleich eingeschaltet"
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
 msgid "Unknown Minolta Camera Settings 7D tag"
 msgstr "Unbekanntes Feld in den Minolta-Kameraeinstellungen für 7D"
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
-msgstr ""
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+#, fuzzy
+msgid "Program Shift A"
+msgstr "Programmwechsel"
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+#, fuzzy
+msgid "Program Shift S"
+msgstr "Programmwechsel"
+
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+#, fuzzy
+msgid "Night View/Portrait"
+msgstr "Nachtportrait"
+
+#: src/minoltamn.cpp:895
 msgid "200 (Zone Matching High)"
 msgstr "200 (Zonenabgleich Hoch)"
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
 msgid "80 (Zone Matching Low)"
 msgstr "80 (Zonenabgleich Niedrig)"
 
-#: src/minoltamn.cpp:1065
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+#, fuzzy
+msgid "Adobe RGB (ICC)"
+msgstr "Adobe RGB"
+
+#: src/minoltamn.cpp:918
 msgid "Central"
 msgstr "Zentriert"
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:919
 msgid "Up"
 msgstr "Aufwärts"
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
 msgid "Up right"
 msgstr "Aufwärts - Rechts"
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
 msgid "Down right"
 msgstr "Abwärts - Rechts"
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
 msgid "Down"
 msgstr "Abwärts"
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
 msgid "Down left"
 msgstr "Abwärts - Links"
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
 msgid "Up left"
 msgstr "Aufwärts -. Links"
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 msgid "Selection"
 msgstr "Auswahl"
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+#, fuzzy
+msgid "Natural+"
+msgstr "Natürlich"
+
+#: src/minoltamn.cpp:949
+#, fuzzy
+msgid "Wind Scene"
+msgstr "Nachtszene"
+
+#: src/minoltamn.cpp:950
+#, fuzzy
+msgid "Evening Scene"
+msgstr "Abend"
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus Position"
 msgstr "Fokusposition"
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus position"
 msgstr "Fokusposition"
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
 msgid "Focus Area"
 msgstr "Fokusbereich"
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
 msgid "Exposure Revision"
 msgstr "Belichtungs-Revision"
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
 msgid "Exposure revision"
 msgstr "Belichtungs-Revision"
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+#, fuzzy
+msgid "Rotation2"
+msgstr "Drehung"
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+#, fuzzy
+msgid "Picture Finish"
+msgstr "Bild-Info"
+
+#: src/minoltamn.cpp:1059
 msgid "Exposure Manual Bias"
 msgstr "Manuelle Belichtungskontrolle"
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
 msgid "Exposure manual bias"
 msgstr "Manuelle Belichtungskontrolle"
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
 msgid "AF Mode"
 msgstr "Autofokus-Modus"
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
 msgid "AF mode"
 msgstr "Autofokus-Modus"
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
 msgid "Unknown Minolta Camera Settings 5D tag"
 msgstr "Unbekanntes Feld in den Minolta-Kameraeinstellungen für 5D"
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
-msgid "Single area"
-msgstr "Einzelbereich"
-
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
-msgid "Dynamic area"
-msgstr "Dynamischer Bereich"
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
+#, fuzzy
+msgid "Self-timer 10 sec"
+msgstr "Selbstauslöser (12 Sek.)"
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
-msgstr "Dynamischer Bereich, nächstes Motiv"
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
+#, fuzzy
+msgid "Self-timer 2 sec"
+msgstr "Selbstauslöser (2 Sek.)"
 
-#: src/nikonmn.cpp:77
-msgid "Group dynamic"
-msgstr "Gruppendynamisch"
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+#, fuzzy
+msgid "White Balance Bracketing Low"
+msgstr "Weißabgleichsreihe"
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr "Einzelbereich (Weit)"
+#: src/minoltamn.cpp:1101
+#, fuzzy
+msgid "White Balance Bracketing High"
+msgstr "Weißabgleichsreihe"
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
-msgstr "Dynamischer Bereich (Weit)"
+#: src/minoltamn.cpp:1102
+#, fuzzy
+msgid "Single-frame Bracketing Low"
+msgstr "Einzelbild"
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
-msgid "Upper-left"
-msgstr "Aufwärts-Links"
+#: src/minoltamn.cpp:1103
+#, fuzzy
+msgid "Continous Bracketing Low"
+msgstr "Automatischer Erfassung"
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
-msgid "Upper-right"
-msgstr "Aufwärts-Rechts"
+#: src/minoltamn.cpp:1104
+#, fuzzy
+msgid "Single-frame Bracketing High"
+msgstr "Einzelbild"
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
-msgid "Lower-left"
-msgstr "Abwärts-Links"
+#: src/minoltamn.cpp:1105
+#, fuzzy
+msgid "Continous Bracketing High"
+msgstr "Kontinuierlich, hoch"
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
-msgid "Lower-right"
-msgstr "Abwärts-Rechts"
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
+msgstr ""
 
-#: src/nikonmn.cpp:96
-msgid "Left-most"
-msgstr "Ganz Links"
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
+#, fuzzy
+msgid "Continuous Bracketing"
+msgstr "Kontinuierlich, hoch"
 
-#: src/nikonmn.cpp:97
-msgid "Right-most"
-msgstr "Ganz Rechts"
+#: src/minoltamn.cpp:1152
+#, fuzzy
+msgid "Single-Frame Bracketing"
+msgstr "Einzelbild"
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
-msgstr "sRGB"
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
+#, fuzzy
+msgid "White Balance Bracketing"
+msgstr "Weißabgleichsreihe"
 
-#: src/nikonmn.cpp:131
-msgid "Fire, manual"
-msgstr "Ausgelöst, manuell"
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
+msgid "Preset"
+msgstr "Voreinstellung"
 
-#: src/nikonmn.cpp:132
-msgid "Fire, external"
-msgstr "Ausgelöst, extern"
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
+#, fuzzy
+msgid "Color Temperature/Color Filter"
+msgstr "Farbtemperatur"
 
-#: src/nikonmn.cpp:133
-msgid "Fire, commander mode"
-msgstr "Ausgelöst, Kommandomodus"
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
+msgid "Temperature"
+msgstr "Temperatur"
 
-#: src/nikonmn.cpp:134
-msgid "Fire, TTL mode"
-msgstr "Ausgelöst, TTL-Modus"
+#: src/minoltamn.cpp:1209
+#, fuzzy
+msgid "Setup"
+msgstr "Setzen"
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
-msgstr "Verzögerung"
+#: src/minoltamn.cpp:1210
+#, fuzzy
+msgid "Recall"
+msgstr "Gelb"
 
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
-msgid "PC control"
-msgstr "PC Kontrolle"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
+msgstr ""
 
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
-msgid "Exposure bracketing"
-msgstr "Belichtungserfassung"
+#: src/minoltamn.cpp:1216
+msgid "Error"
+msgstr ""
 
-#: src/nikonmn.cpp:143
+#: src/minoltamn.cpp:1228
 #, fuzzy
-msgid "Auto ISO"
-msgstr "Automatisch"
-
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
-msgid "White balance bracketing"
-msgstr "Weißabgleichsauslöser"
+msgid "Image and Information"
+msgstr "Bildkonfiguration"
 
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
-msgid "IR control"
-msgstr "IR Kontrolle"
+#: src/minoltamn.cpp:1229
+#, fuzzy
+msgid "Image Only"
+msgstr "Bildtyp"
 
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
-msgstr ""
+#: src/minoltamn.cpp:1230
+#, fuzzy
+msgid "Image and Histogram"
+msgstr "Bildhöhe"
 
-#: src/nikonmn.cpp:162
-msgid "Auto release"
-msgstr "Automatisch ausgelöst"
+#: src/minoltamn.cpp:1236
+#, fuzzy
+msgid "Fill Flash"
+msgstr "Aufhellblitz"
 
-#: src/nikonmn.cpp:163
-msgid "Manual release"
-msgstr "Manuell ausgelöst"
+#: src/minoltamn.cpp:1247
+#, fuzzy
+msgid "Focus Hold"
+msgstr "Fokusmodus"
 
-#: src/nikonmn.cpp:168
+#: src/minoltamn.cpp:1248
 #, fuzzy
-msgid "Lossy (type 1)"
-msgstr "Linsentyp"
+msgid "DOF Preview"
+msgstr "Vorschaudaten"
 
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
-msgstr "Unkomprimiert"
+#: src/minoltamn.cpp:1253
+msgid "Hold"
+msgstr ""
 
-#: src/nikonmn.cpp:170
+#: src/minoltamn.cpp:1254
 #, fuzzy
-msgid "Lossless"
-msgstr "Los Angeles"
+msgid "Toggle"
+msgstr "Ton"
 
-#: src/nikonmn.cpp:171
+#: src/minoltamn.cpp:1255
 #, fuzzy
-msgid "Lossy (type 2)"
-msgstr "Linsentyp"
+msgid "Spot Hold"
+msgstr "Punktmodus"
 
-#: src/nikonmn.cpp:177
+#: src/minoltamn.cpp:1256
 #, fuzzy
-msgid "B & W"
-msgstr "S&W"
+msgid "Spot Toggle"
+msgstr "Punktmodus"
 
-#: src/nikonmn.cpp:179
-#, fuzzy
-msgid "Trim"
-msgstr "Zeit"
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+msgid "Shutter Speed"
+msgstr "Verschlusszeit"
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:181
-msgid "D-Lighting"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
 msgstr ""
 
-#: src/nikonmn.cpp:182
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
+msgstr ""
+
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
+msgstr ""
+
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
 #, fuzzy
-msgid "Red eye"
-msgstr "Rote-Augen"
+msgid "Automatic"
+msgstr "Automatischer Autofokus"
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
 #, fuzzy
-msgid "Cyanotype"
-msgstr "Typ"
+msgid "Auto-rotate"
+msgstr "Autokontrast"
 
-#: src/nikonmn.cpp:184
+#: src/minoltamn.cpp:1287
 #, fuzzy
-msgid "Sky light"
-msgstr "Tageslicht"
+msgid "Horizontal"
+msgstr "Horizontal (Normal)"
 
-#: src/nikonmn.cpp:185
+#: src/minoltamn.cpp:1293
 #, fuzzy
-msgid "Warm tone"
-msgstr "Farbton"
+msgid "Manual Rotate"
+msgstr "Manuell ausgelöst"
 
-#: src/nikonmn.cpp:186
+#: src/minoltamn.cpp:1298
 #, fuzzy
-msgid "Color custom"
-msgstr "Farbton"
+msgid "Within Range"
+msgstr "Linsenweite"
 
-#: src/nikonmn.cpp:187
+#: src/minoltamn.cpp:1299
 #, fuzzy
-msgid "Image overlay"
-msgstr "Bildton"
+msgid "Under/Over Range"
+msgstr "Transferbereich"
 
-#: src/nikonmn.cpp:193
+#: src/minoltamn.cpp:1300
 #, fuzzy
-msgid "Minimal"
-msgstr "Manuell"
+msgid "Out of Range"
+msgstr "Offset ausserhalb des zulässigen Bereiches"
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
-msgid "Nikon Makernote version"
-msgstr "Version der Herstellerbemerkung von Nikon"
+#: src/minoltamn.cpp:1305
+#, fuzzy
+msgid "Not Indicated"
+msgstr "Undefiniert"
 
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
-msgid "ISO Speed"
-msgstr "ISO-Geschwindigkeit"
+#: src/minoltamn.cpp:1306
+#, fuzzy
+msgid "Under Scale"
+msgstr "Unterwasser"
 
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
-msgid "Sharpening"
-msgstr "Schärfung"
+#: src/minoltamn.cpp:1307
+#, fuzzy
+msgid "Bottom of Scale"
+msgstr "unten nach oben"
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
-msgid "Image sharpening setting"
-msgstr "Bildschärfungseinstellung"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
+msgstr ""
 
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
-msgid "Focus"
-msgstr "Fokus"
+#: src/minoltamn.cpp:1326
+#, fuzzy
+msgid "Over Scale"
+msgstr "Standard-Skalierung"
 
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
-msgid "Flash Setting"
-msgstr "Blitzeinstellung"
+#: src/minoltamn.cpp:1331
+msgid "AM"
+msgstr ""
 
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
-msgid "Flash setting"
-msgstr "Blitzeinstellung"
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
+msgstr ""
 
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
-msgid "ISO Selection"
-msgstr "ISO-Auswahl"
+#: src/minoltamn.cpp:1338
+#, fuzzy
+msgid "Built-in"
+msgstr "Ausfüllen"
 
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
-msgid "ISO selection"
-msgstr "ISO-Auswahl"
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
+msgid "Very Low"
+msgstr "Sehr niedrig"
 
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data Dump"
-msgstr "Datendump"
+#: src/minoltamn.cpp:1346
+#, fuzzy
+msgid "Half Full"
+msgstr "Vollbild"
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data dump"
-msgstr "Datendump"
-
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
-msgid "Image Adjustment"
-msgstr "Bildanpassung"
-
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
-msgid "Image adjustment setting"
-msgstr "Bildanpassung-Einstellung"
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
+msgstr ""
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
-msgid "Auxiliary Lens"
-msgstr "Zusatzlinse"
+#: src/minoltamn.cpp:1355
+#, fuzzy
+msgid "Exposure Compensation Setting"
+msgstr "Belichtungskompensierung"
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
-msgstr "Zusatzlinse (Adapter)"
+#: src/minoltamn.cpp:1356
+#, fuzzy
+msgid "Exposure compensation setting"
+msgstr "Belichtungskompensation"
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
-msgid "Manual focus distance"
-msgstr "Manueller Fokusabstand"
+#: src/minoltamn.cpp:1358
+#, fuzzy
+msgid "High Speed Sync"
+msgstr "Hohe Empfindlichkeit"
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
-msgid "Digital zoom setting"
-msgstr "Digitale Zoomeinstellung"
+#: src/minoltamn.cpp:1359
+#, fuzzy
+msgid "High speed sync"
+msgstr "Hohe Empfindlichkeit"
 
-#: src/nikonmn.cpp:246
-msgid "AF Focus Position"
-msgstr "Autofokus-Position"
+#: src/minoltamn.cpp:1361
+#, fuzzy
+msgid "Manual Exposure Time"
+msgstr "Belichtungszeit"
 
-#: src/nikonmn.cpp:247
-msgid "AF focus position information"
-msgstr "Autofokus-Positioninformation"
+#: src/minoltamn.cpp:1362
+#, fuzzy
+msgid "Manual exposure time"
+msgstr "Belichtungszeit"
 
-#: src/nikonmn.cpp:252
-msgid "Unknown Nikon1MakerNote tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon1"
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
+#, fuzzy
+msgid "Manual FNumber"
+msgstr "Intervallnummer"
 
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
-msgstr "Kontinuierlicher Autofokus"
+#: src/minoltamn.cpp:1373
+#, fuzzy
+msgid "Drive Mode 2"
+msgstr "Antriebsmodus"
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
-msgstr "Einzel Autofokus"
+#: src/minoltamn.cpp:1374
+#, fuzzy
+msgid "Drive mode 2"
+msgstr "Antriebsmodus"
 
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
-msgid "Not used"
-msgstr "Nicht benutzt"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
+msgstr ""
 
-#: src/nikonmn.cpp:353
-msgid "guess"
-msgstr "Raten"
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
+#, fuzzy
+msgid "AF Area Mode"
+msgstr "Autofokus-Modus"
 
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
-msgstr "VGA Basis"
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
+#, fuzzy
+msgid "FlashMode"
+msgstr "Blitzmodus"
 
-#: src/nikonmn.cpp:401
-msgid "VGA Normal"
-msgstr "VGA Normal"
+#: src/minoltamn.cpp:1391
+#, fuzzy
+msgid "Flash Exposure Comp Setting"
+msgstr "Blitzkompensation"
 
-#: src/nikonmn.cpp:402
-msgid "VGA Fine"
-msgstr "VGA Fein"
+#: src/minoltamn.cpp:1392
+#, fuzzy
+msgid "Flash exposure compensation setting"
+msgstr "Blitzkompensation in EV"
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
-msgstr "SXGA Basis"
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
+#, fuzzy
+msgid "ISO Setting"
+msgstr "ISO-Einstellungen"
 
-#: src/nikonmn.cpp:404
-msgid "SXGA Normal"
-msgstr "SXGA Normal"
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
+#, fuzzy
+msgid "Zone Matching Mode"
+msgstr "Zonenabgleich"
 
-#: src/nikonmn.cpp:405
-msgid "SXGA Fine"
-msgstr "SXGA Fein"
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
+#, fuzzy
+msgid "Dynamic Range Optimizer Mode"
+msgstr "Dynamische Bereichseinstellung"
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
-msgid "Monochrome"
-msgstr "Monochrom"
+#: src/minoltamn.cpp:1404
+#, fuzzy
+msgid "Dynamic range optimizer mode"
+msgstr "Dynamische Bereichserweiterung"
 
-#: src/nikonmn.cpp:417
-msgid "Bright+"
-msgstr "Helligkeit+"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
+msgstr ""
 
-#: src/nikonmn.cpp:418
-msgid "Bright-"
-msgstr "Helligkeit-"
+#: src/minoltamn.cpp:1430
+#, fuzzy
+msgid "Self Timer Time"
+msgstr "Selbstauslöser"
 
-#: src/nikonmn.cpp:419
-msgid "Contrast+"
-msgstr "Kontrast+"
+#: src/minoltamn.cpp:1431
+#, fuzzy
+msgid "Self timer time"
+msgstr "Selbstauslöser"
 
-#: src/nikonmn.cpp:420
-msgid "Contrast-"
-msgstr "Kontrast-"
+#: src/minoltamn.cpp:1434
+#, fuzzy
+msgid "Continuous bracketing"
+msgstr "Kontinuierlich, hoch"
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
-msgstr "Voreinstellung"
+#: src/minoltamn.cpp:1436
+#, fuzzy
+msgid "Single Frame Bracketing"
+msgstr "Weißabgleichsauslöser"
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
-msgstr "Speedlight"
+#: src/minoltamn.cpp:1437
+#, fuzzy
+msgid "Single frame bracketing"
+msgstr "Weißabgleichsauslöser"
 
-#: src/nikonmn.cpp:479
-msgid "Unknown Nikon2MakerNote tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon2"
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
+msgid "White balance bracketing"
+msgstr "Weißabgleichsauslöser"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
-msgid "Flash Device"
-msgstr "Blitzgerät"
+#: src/minoltamn.cpp:1442
+#, fuzzy
+msgid "White Balance Setting"
+msgstr "Weißabgleichseinstellung"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
-msgid "Flash device"
-msgstr "Blitzgerät"
+#: src/minoltamn.cpp:1445
+#, fuzzy
+msgid "Preset White Balance"
+msgstr "Weißabgleich"
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
-msgid "White Balance Bias"
-msgstr "Weißabgleichskontrolle"
+#: src/minoltamn.cpp:1446
+#, fuzzy
+msgid "Preset white balance"
+msgstr "Weißabgleich"
 
-#: src/nikonmn.cpp:522
-msgid "White balance bias"
-msgstr "Weißabgleichskontrolle"
+#: src/minoltamn.cpp:1448
+#, fuzzy
+msgid "Color Temperature Setting"
+msgstr "Farbtemperatur"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1449
 #, fuzzy
-msgid "WB RB Levels"
-msgstr "WB_RGGBLevelsShade"
+msgid "Color temperature setting"
+msgstr "Farbtemperatur"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1451
 #, fuzzy
-msgid "WB RB levels"
-msgstr "Schwarzlevel"
+msgid "Custom WB Setting"
+msgstr "Benutzerdefiniert WB 1"
 
-#: src/nikonmn.cpp:524
-msgid "Program Shift"
-msgstr "Programmwechsel"
+#: src/minoltamn.cpp:1452
+#, fuzzy
+msgid "Custom WB setting"
+msgstr "Benutzerdefiniert WB 1"
 
-#: src/nikonmn.cpp:524
-msgid "Program shift"
-msgstr "Programmwechsel"
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
+#, fuzzy
+msgid "Dynamic Range Optimizer Settings"
+msgstr "Dynamische Bereichseinstellung"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure Difference"
-msgstr "Belichtungsabstand"
+#: src/minoltamn.cpp:1460
+#, fuzzy
+msgid "Custom WB Red Level"
+msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure difference"
-msgstr "Belichtungsabstand"
+#: src/minoltamn.cpp:1461
+#, fuzzy
+msgid "Custom WB red level"
+msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
-msgstr "Zeiger auf ein Vorschaubild"
+#: src/minoltamn.cpp:1463
+#, fuzzy
+msgid "Custom WB Green Level"
+msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
-msgstr ""
+#: src/minoltamn.cpp:1464
+#, fuzzy
+msgid "Custom WB green level"
+msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:529
-msgid "Flash Comp"
-msgstr "Blitzkompensation"
+#: src/minoltamn.cpp:1466
+#, fuzzy
+msgid "Custom WB Blue Level"
+msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:529
-msgid "Flash compensation setting"
-msgstr "Blitzkompensationseinstellung"
+#: src/minoltamn.cpp:1467
+#, fuzzy
+msgid "CustomWB blue level"
+msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:530
-msgid "ISO Settings"
-msgstr "ISO-Einstellungen"
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
+#, fuzzy
+msgid "Custom WB Error"
+msgstr "Benutzerdefiniert WB 1"
 
-#: src/nikonmn.cpp:530
-msgid "ISO setting"
-msgstr "ISO-Einstellung"
+#: src/minoltamn.cpp:1473
+#, fuzzy
+msgid "White balance fine tune"
+msgstr "Weißabgleich-Anpassung"
 
-#: src/nikonmn.cpp:531
-msgid "Image Boundary"
-msgstr "Bildgrenzen"
+#: src/minoltamn.cpp:1479
+#, fuzzy
+msgid "Color compensation filter"
+msgstr "Blitzkompensationswert"
 
-#: src/nikonmn.cpp:531
-msgid "Image boundary"
-msgstr "Bildgrenzen"
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
+#, fuzzy
+msgid "Sony Image Size"
+msgstr "Bildgrõße"
 
-#: src/nikonmn.cpp:533
-msgid "Flash Bracket Comp"
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
 msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash bracket compensation applied"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "Exposure Bracket Comp"
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "AE bracket compensation applied"
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
 msgstr ""
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
-msgid "Image Processing"
-msgstr "Bildverarbeitung"
-
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
-msgid "Image processing"
-msgstr "Bildverarbeitung"
-
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
 msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
-msgstr ""
+#: src/minoltamn.cpp:1497
+#, fuzzy
+msgid "Eye start AF"
+msgstr "Eine Aufnahme mit Autofokus"
 
-#: src/nikonmn.cpp:539
+#: src/minoltamn.cpp:1499
 #, fuzzy
-msgid "VR Info"
-msgstr "Rohinfo"
+msgid "Red Eye Reduction"
+msgstr "Rote Augen reduzieren"
 
-#: src/nikonmn.cpp:539
+#: src/minoltamn.cpp:1500
 #, fuzzy
-msgid "VR info"
-msgstr "Rohinfo"
+msgid "Red eye reduction"
+msgstr "Rote Augen reduzieren"
 
-#: src/nikonmn.cpp:540
+#: src/minoltamn.cpp:1502
 #, fuzzy
-msgid "Image Authentication"
-msgstr "Bild-Orientierung"
+msgid "Flash Default"
+msgstr "Blitzdetails"
 
-#: src/nikonmn.cpp:540
+#: src/minoltamn.cpp:1503
 #, fuzzy
-msgid "Image authentication"
-msgstr "Bild-Orientierung"
+msgid "Flash default"
+msgstr "Blitzdetails"
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
-msgstr ""
+#: src/minoltamn.cpp:1505
+#, fuzzy
+msgid "Auto Bracket Order"
+msgstr "Automatische Erfassung"
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
-msgstr ""
+#: src/minoltamn.cpp:1506
+#, fuzzy
+msgid "Auto bracket order"
+msgstr "Automatischer Erfassung"
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1508
 #, fuzzy
-msgid "Picture Control"
-msgstr "Bild-Info"
+msgid "Focus Hold Button"
+msgstr "Fokusmodus-Einstellung"
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1509
 #, fuzzy
-msgid " Picture control"
-msgstr "Bild-Info"
+msgid "Focus hold button"
+msgstr "Fokusmodus-Einstellung"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1511
 #, fuzzy
-msgid "World Time"
-msgstr "Minolta Zeit"
+msgid "AEL Button"
+msgstr "Automatische Belichtung-Einstellungen"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1512
 #, fuzzy
-msgid "World time"
-msgstr "Minolta Zeit"
+msgid "AEL button"
+msgstr "Automatische Belichtung-Einstellungen"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1514
 #, fuzzy
-msgid "ISO Info"
-msgstr "Aufnahmeinfo"
+msgid "Control Dial Set"
+msgstr "Kontrasteinstellung"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1515
 #, fuzzy
-msgid "ISO info"
-msgstr "ISO-Einstellung"
+msgid "Control dial set"
+msgstr "Kontrast"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1517
 #, fuzzy
-msgid "Vignette Control"
-msgstr "Vignettierungsmenge"
+msgid "Exposure Compensation Mode"
+msgstr "Belichtungskompensierung"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1518
 #, fuzzy
-msgid "Vignette control"
-msgstr "Vignettierungsmenge"
+msgid "Exposure compensation mode"
+msgstr "Belichtungskompensation"
 
-#: src/nikonmn.cpp:547
-msgid "Tone Compensation"
-msgstr "Tonkompensation"
+#: src/minoltamn.cpp:1521
+#, fuzzy
+msgid "AF assist"
+msgstr "Autofokus-Unterstützung"
 
-#: src/nikonmn.cpp:547
-msgid "Tone compensation"
-msgstr "Tonkompensation"
+#: src/minoltamn.cpp:1523
+#, fuzzy
+msgid "Card Shutter Lock"
+msgstr "Verschlusszähler"
 
-#: src/nikonmn.cpp:553
-msgid "Mode of flash used"
-msgstr "Modus des benutzten Blitzes"
-
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1524
 #, fuzzy
-msgid "AF Info"
-msgstr "Autofokus-Information"
+msgid "Card shutter lock"
+msgstr "Schneller Verschluß"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1526
 #, fuzzy
-msgid "AF info"
-msgstr "Autofokus-Information"
+msgid "Lens Shutter Lock"
+msgstr "Langsamer Verschluß"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
-msgid "Shooting Mode"
-msgstr "Aufnahmemodus"
+#: src/minoltamn.cpp:1527
+#, fuzzy
+msgid "Lens shutter lock"
+msgstr "Langsamer Verschluß"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
-msgid "Shooting mode"
-msgstr "Aufnahmemodus"
+#: src/minoltamn.cpp:1529
+#, fuzzy
+msgid "AF Area Illumination"
+msgstr "GPS Bereichsinformation"
 
-#: src/nikonmn.cpp:556
-msgid "Auto Bracket Release"
-msgstr "Auslöser der Automatische Erfassung"
+#: src/minoltamn.cpp:1530
+#, fuzzy
+msgid "AF area illumination"
+msgstr "Autofokus-Modus"
 
-#: src/nikonmn.cpp:556
-msgid "Auto bracket release"
-msgstr "Auslöser der Automatische Erfassung"
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
+msgstr ""
 
-#: src/nikonmn.cpp:557
-msgid "Lens FStops"
-msgstr "Blendeneinstellung der Linse"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
+msgstr ""
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1535
 #, fuzzy
-msgid "Contrast Curve"
-msgstr "Kontrast-Wert"
+msgid "Record Display"
+msgstr "Eingeblendetes Display"
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1536
 #, fuzzy
-msgid "Contrast curve"
-msgstr "Kontrast-Wert"
+msgid "Record display"
+msgstr "Eingeblendetes Display"
+
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
+msgstr ""
+
+#: src/minoltamn.cpp:1539
+msgid "Play display"
+msgstr ""
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1541
 #, fuzzy
-msgid "Color Hue"
-msgstr "Farbton"
+msgid "Exposure Indicator"
+msgstr "Belichtungsindex"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1542
 #, fuzzy
-msgid "Color hue"
-msgstr "Farbton"
+msgid "Exposure indicator"
+msgstr "Belichtungsindex"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene Mode"
-msgstr "Szenenmodus"
+#: src/minoltamn.cpp:1544
+#, fuzzy
+msgid "AEL Exposure Indicator"
+msgstr "Belichtungsindex"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene mode"
-msgstr "Szenenmodus"
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
-msgstr "Lichtquelle"
+#: src/minoltamn.cpp:1547
+#, fuzzy
+msgid "Exposure Bracketing Indicator Last"
+msgstr "Belichtungserfassung"
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
-msgid "Light source"
-msgstr "Lichtquelle"
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:562
-#, fuzzy
-msgid "Shot info"
-msgstr "Aufnahmeinfo"
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
+msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue Adjustment"
-msgstr "Sättigungsanpassung"
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
+msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue adjustment"
-msgstr "Sättigungsanpassung"
+#: src/minoltamn.cpp:1553
+#, fuzzy
+msgid "Flash Exposure Indicator"
+msgstr "Blitzkompensation"
 
-#: src/nikonmn.cpp:564
+#: src/minoltamn.cpp:1554
 #, fuzzy
-msgid "NEF Compression"
-msgstr "Kompression"
+msgid "Flash exposure indicator"
+msgstr "Blitzbelichtungskompensation"
 
-#: src/nikonmn.cpp:564
+#: src/minoltamn.cpp:1556
 #, fuzzy
-msgid "NEF compression"
-msgstr "Kompression"
+msgid "Flash Exposure Indicator Next"
+msgstr "Blitzkompensation"
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
-msgid "Linearization Table"
-msgstr "Linearisierungstabelle"
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:567
+#: src/minoltamn.cpp:1559
 #, fuzzy
-msgid "Linearization table"
-msgstr "Linearisierungstabelle"
+msgid "Flash Exposure Indicator Last"
+msgstr "Blitzkompensation"
+
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1565
 #, fuzzy
-msgid "Color Balance"
-msgstr "Farbabgleich 1"
+msgid "Focus Mode Switch"
+msgstr "Fokusmodus"
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1566
 #, fuzzy
-msgid "Color balance"
-msgstr "Roter Farbabgleich"
+msgid "Focus mode switch"
+msgstr "Fokusmodus-Einstellung"
 
-#: src/nikonmn.cpp:569
-msgid "Lens Data"
-msgstr "Linsendaten"
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
+msgid "Flash Type"
+msgstr "Blitztyp"
 
-#: src/nikonmn.cpp:569
-msgid "Lens data settings"
-msgstr "Linsendaten-Einstellungen"
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
+msgid "Flash type"
+msgstr "Blitztyp"
 
-#: src/nikonmn.cpp:570
-msgid "Raw Image Center"
-msgstr "Rohbild-Center"
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
+msgid "AE Lock"
+msgstr "Automatische Belichtungssperre"
 
-#: src/nikonmn.cpp:570
-msgid "Raw image center"
-msgstr "Rohbild-Center"
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
+msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
-msgstr "Sensor-Pixelgröße"
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
+msgstr "Batteriestatus"
 
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
-msgstr "Sensor-Pixelgröße"
+#: src/minoltamn.cpp:1584
+#, fuzzy
+msgid "Battery level"
+msgstr "Batteriestatus"
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:1588
 #, fuzzy
-msgid "Scene Assist"
-msgstr "Autofokus-Unterstützung"
+msgid "Unknown Sony Camera Settings A100 tag"
+msgstr "Unbekanntes Feld in den Canon-Kameraeinstellungen 1"
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
 #, fuzzy
-msgid "Scene assist"
-msgstr "Szenenbereich"
+msgid "Clear"
+msgstr "Jahr"
 
-#: src/nikonmn.cpp:574
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
 #, fuzzy
-msgid "Retouch History"
-msgstr "Historie"
+msgid "Deep"
+msgstr "Denver"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
-msgstr ""
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
+#, fuzzy
+msgid "Light"
+msgstr "Rechts"
 
-#: src/nikonmn.cpp:576
-msgid "Serial NO"
-msgstr "Seriennummer"
+#: src/minoltamn.cpp:1897
+#, fuzzy
+msgid "Night View"
+msgstr "Nachtszene"
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
 msgstr ""
 
-#: src/nikonmn.cpp:577
-msgid "Image Data Size"
-msgstr "Bilddatengröße"
-
-#: src/nikonmn.cpp:577
-msgid "Image data size"
-msgstr "Bilddatengröße"
+#: src/minoltamn.cpp:1937
+#, fuzzy
+msgid "Local"
+msgstr "Ort"
 
-#: src/nikonmn.cpp:579
-msgid "Image Count"
-msgstr "Bildanzahl"
+#: src/minoltamn.cpp:1952
+#, fuzzy
+msgid "Top-Right"
+msgstr "Oben - rechts"
 
-#: src/nikonmn.cpp:579
-msgid "Image count"
-msgstr "Bildanzahl"
+#: src/minoltamn.cpp:1954
+#, fuzzy
+msgid "Bottom-Right"
+msgstr "Unten - rechts"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/minoltamn.cpp:1956
 #, fuzzy
-msgid "Deleted Image Count"
-msgstr "Bildanzahl löschen"
+msgid "Bottom-Left"
+msgstr "Unten - links"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/minoltamn.cpp:1958
 #, fuzzy
-msgid "Deleted image count"
-msgstr "Bildanzahl löschen"
+msgid "Top-Left"
+msgstr "Oben - links"
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
-msgid "Shutter Count"
-msgstr "Verschlusszähler"
+#: src/minoltamn.cpp:1959
+#, fuzzy
+msgid "Far-Right"
+msgstr "Rechts zuschneiden"
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
-msgstr "Anzahl der Fotos dieser Kamera"
+#: src/minoltamn.cpp:1960
+#, fuzzy
+msgid "Far-Left"
+msgstr "Links zuschneiden"
 
-#: src/nikonmn.cpp:582
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
 #, fuzzy
-msgid "Flash info"
-msgstr "Blitzinformation"
+msgid "Advanced Auto"
+msgstr "Fortgeschrittene hohe Funktion"
 
-#: src/nikonmn.cpp:583
-msgid "Image Optimization"
-msgstr "Bildoptimierung"
+#: src/minoltamn.cpp:1975
+#, fuzzy
+msgid "Advanced Level"
+msgstr "Fortgeschrittene hohe Empfindlichkeit"
 
-#: src/nikonmn.cpp:583
-msgid "Image optimization"
-msgstr "Bildoptimierung"
+#: src/minoltamn.cpp:1988
+#, fuzzy
+msgid "AF"
+msgstr "Autofokus-S"
 
-#: src/nikonmn.cpp:585
-msgid "Program Variation"
-msgstr "Programmvariation"
+#: src/minoltamn.cpp:1989
+#, fuzzy
+msgid "Release"
+msgstr "Freigabedatum"
 
-#: src/nikonmn.cpp:585
-msgid "Program variation"
-msgstr "Programmvariation"
+#: src/minoltamn.cpp:2001
+#, fuzzy
+msgid "RAW "
+msgstr "Roh"
 
-#: src/nikonmn.cpp:587
-msgid "AF Response"
-msgstr "Autofokus-Antwort"
+#: src/minoltamn.cpp:2002
+#, fuzzy
+msgid "CRAW "
+msgstr "Roh"
 
-#: src/nikonmn.cpp:587
-msgid "AF response"
-msgstr "Autofokus-Antwort"
+#: src/minoltamn.cpp:2005
+#, fuzzy
+msgid "RAW+JPEG"
+msgstr "JPEG"
 
-#: src/nikonmn.cpp:588
+#: src/minoltamn.cpp:2006
 #, fuzzy
-msgid "Multi exposure"
-msgstr "Mehrfache Belichtung"
+msgid "CRAW+JPEG"
+msgstr "JPEG"
 
-#: src/nikonmn.cpp:589
-msgid "High ISO Noise Reduction"
-msgstr "Hohe ISO-Rauschreduktion"
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
+msgstr ""
 
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
+#: src/minoltamn.cpp:2063
 #, fuzzy
-msgid "Toning effect"
-msgstr "Fotoeffekt"
+msgid "Compressed Raw"
+msgstr "Kompressionsrate"
 
-#: src/nikonmn.cpp:591
+#: src/minoltamn.cpp:2064
 #, fuzzy
-msgid "AF info 2"
-msgstr "Autofokus-Information"
+msgid "Compressed Raw + JPEG"
+msgstr "Komprimierte Bildgröße"
 
-#: src/nikonmn.cpp:592
-#, fuzzy
-msgid "File info"
-msgstr "Dateiname"
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
+msgstr ""
 
-#: src/nikonmn.cpp:595
-msgid "Capture Data"
-msgstr "Eingelesene Daten"
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
+msgstr ""
 
-#: src/nikonmn.cpp:595
-msgid "Capture data"
-msgstr "Eingelesene Daten"
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
+msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture Version"
-msgstr "Version der gelesenen Daten"
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
+msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture version"
-msgstr "Version der gelesenen Daten"
+#: src/minoltamn.cpp:2110
+msgid "ISO Setting Used"
+msgstr "Benutzte ISO-Einstellungen"
 
-#: src/nikonmn.cpp:598
-msgid "Capture Offsets"
-msgstr "Erfassungsoffsets"
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
+msgid "High Key"
+msgstr "Hoher Schlüssel"
 
-#: src/nikonmn.cpp:598
-msgid "Capture offsets"
-msgstr "Erfassungsoffsets"
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
+msgstr "Niedriger Schlüssel"
 
-#: src/nikonmn.cpp:599
+#: src/nikonmn.cpp:80
 #, fuzzy
-msgid "Scan IFD"
+msgid "Extra High"
+msgstr "Extrafein"
+
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
+msgid "Single area"
+msgstr "Einzelbereich"
+
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
+msgid "Dynamic area"
+msgstr "Dynamischer Bereich"
+
+#: src/nikonmn.cpp:88
+msgid "Dynamic area, closest subject"
+msgstr "Dynamischer Bereich, nächstes Motiv"
+
+#: src/nikonmn.cpp:89
+msgid "Group dynamic"
+msgstr "Gruppendynamisch"
+
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
+msgstr "Einzelbereich (Weit)"
+
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
+msgid "Dynamic area (wide)"
+msgstr "Dynamischer Bereich (Weit)"
+
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
+msgid "Upper-left"
+msgstr "Aufwärts-Links"
+
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
+msgid "Upper-right"
+msgstr "Aufwärts-Rechts"
+
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
+msgid "Lower-left"
+msgstr "Abwärts-Links"
+
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
+msgid "Lower-right"
+msgstr "Abwärts-Rechts"
+
+#: src/nikonmn.cpp:108
+msgid "Left-most"
+msgstr "Ganz Links"
+
+#: src/nikonmn.cpp:109
+msgid "Right-most"
+msgstr "Ganz Rechts"
+
+#: src/nikonmn.cpp:143
+msgid "Fire, manual"
+msgstr "Ausgelöst, manuell"
+
+#: src/nikonmn.cpp:144
+msgid "Fire, external"
+msgstr "Ausgelöst, extern"
+
+#: src/nikonmn.cpp:145
+msgid "Fire, commander mode"
+msgstr "Ausgelöst, Kommandomodus"
+
+#: src/nikonmn.cpp:146
+msgid "Fire, TTL mode"
+msgstr "Ausgelöst, TTL-Modus"
+
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
+msgid "Delay"
+msgstr "Verzögerung"
+
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
+msgid "PC control"
+msgstr "PC Kontrolle"
+
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
+msgid "Exposure bracketing"
+msgstr "Belichtungserfassung"
+
+#: src/nikonmn.cpp:155
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Automatisch"
+
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
+msgid "IR control"
+msgstr "IR Kontrolle"
+
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
+msgstr ""
+
+#: src/nikonmn.cpp:174
+msgid "Auto release"
+msgstr "Automatisch ausgelöst"
+
+#: src/nikonmn.cpp:175
+msgid "Manual release"
+msgstr "Manuell ausgelöst"
+
+#: src/nikonmn.cpp:180
+#, fuzzy
+msgid "Lossy (type 1)"
+msgstr "Linsentyp"
+
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+msgid "Uncompressed"
+msgstr "Unkomprimiert"
+
+#: src/nikonmn.cpp:182
+#, fuzzy
+msgid "Lossless"
+msgstr "Los Angeles"
+
+#: src/nikonmn.cpp:183
+#, fuzzy
+msgid "Lossy (type 2)"
+msgstr "Linsentyp"
+
+#: src/nikonmn.cpp:189
+#, fuzzy
+msgid "B & W"
+msgstr "S&W"
+
+#: src/nikonmn.cpp:191
+#, fuzzy
+msgid "Trim"
+msgstr "Zeit"
+
+#: src/nikonmn.cpp:192
+#, fuzzy
+msgid "Small picture"
+msgstr "Film"
+
+#: src/nikonmn.cpp:193
+#, fuzzy
+msgid "D-Lighting"
+msgstr "Tageslicht"
+
+#: src/nikonmn.cpp:194
+#, fuzzy
+msgid "Red eye"
+msgstr "Rote-Augen"
+
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
+#, fuzzy
+msgid "Cyanotype"
+msgstr "Typ"
+
+#: src/nikonmn.cpp:196
+#, fuzzy
+msgid "Sky light"
+msgstr "Tageslicht"
+
+#: src/nikonmn.cpp:197
+#, fuzzy
+msgid "Warm tone"
+msgstr "Farbton"
+
+#: src/nikonmn.cpp:198
+#, fuzzy
+msgid "Color custom"
+msgstr "Farbton"
+
+#: src/nikonmn.cpp:199
+#, fuzzy
+msgid "Image overlay"
+msgstr "Bildton"
+
+#: src/nikonmn.cpp:205
+#, fuzzy
+msgid "Minimal"
+msgstr "Manuell"
+
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
+msgid "Nikon Makernote version"
+msgstr "Version der Herstellerbemerkung von Nikon"
+
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
+msgid "ISO Speed"
+msgstr "ISO-Geschwindigkeit"
+
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
+msgid "Sharpening"
+msgstr "Schärfung"
+
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
+msgid "Image sharpening setting"
+msgstr "Bildschärfungseinstellung"
+
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
+msgid "Flash Setting"
+msgstr "Blitzeinstellung"
+
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
+msgid "Flash setting"
+msgstr "Blitzeinstellung"
+
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
+msgid "ISO Selection"
+msgstr "ISO-Auswahl"
+
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
+msgid "ISO selection"
+msgstr "ISO-Auswahl"
+
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data Dump"
+msgstr "Datendump"
+
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data dump"
+msgstr "Datendump"
+
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+msgid "Image Adjustment"
+msgstr "Bildanpassung"
+
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+msgid "Image adjustment setting"
+msgstr "Bildanpassung-Einstellung"
+
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+msgid "Auxiliary Lens"
+msgstr "Zusatzlinse"
+
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+msgid "Auxiliary lens (adapter)"
+msgstr "Zusatzlinse (Adapter)"
+
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
+msgid "Manual focus distance"
+msgstr "Manueller Fokusabstand"
+
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
+msgid "Digital zoom setting"
+msgstr "Digitale Zoomeinstellung"
+
+#: src/nikonmn.cpp:258
+msgid "AF Focus Position"
+msgstr "Autofokus-Position"
+
+#: src/nikonmn.cpp:259
+msgid "AF focus position information"
+msgstr "Autofokus-Positioninformation"
+
+#: src/nikonmn.cpp:263
+msgid "Unknown Nikon1MakerNote tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon1"
+
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+msgid "Continuous autofocus"
+msgstr "Kontinuierlicher Autofokus"
+
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
+msgid "Single autofocus"
+msgstr "Einzel Autofokus"
+
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
+msgid "Not used"
+msgstr "Nicht benutzt"
+
+#: src/nikonmn.cpp:365
+msgid "guess"
+msgstr "Raten"
+
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
+msgstr "VGA Basis"
+
+#: src/nikonmn.cpp:413
+msgid "VGA Normal"
+msgstr "VGA Normal"
+
+#: src/nikonmn.cpp:414
+msgid "VGA Fine"
+msgstr "VGA Fein"
+
+#: src/nikonmn.cpp:415
+msgid "SXGA Basic"
+msgstr "SXGA Basis"
+
+#: src/nikonmn.cpp:416
+msgid "SXGA Normal"
+msgstr "SXGA Normal"
+
+#: src/nikonmn.cpp:417
+msgid "SXGA Fine"
+msgstr "SXGA Fein"
+
+#: src/nikonmn.cpp:429
+msgid "Bright+"
+msgstr "Helligkeit+"
+
+#: src/nikonmn.cpp:430
+msgid "Bright-"
+msgstr "Helligkeit-"
+
+#: src/nikonmn.cpp:431
+msgid "Contrast+"
+msgstr "Kontrast+"
+
+#: src/nikonmn.cpp:432
+msgid "Contrast-"
+msgstr "Kontrast-"
+
+#: src/nikonmn.cpp:451
+msgid "Speedlight"
+msgstr "Speedlight"
+
+#: src/nikonmn.cpp:491
+msgid "Unknown Nikon2MakerNote tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon2"
+
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
+msgid "Flash Device"
+msgstr "Blitzgerät"
+
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
+msgid "Flash device"
+msgstr "Blitzgerät"
+
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
+msgid "White Balance Bias"
+msgstr "Weißabgleichskontrolle"
+
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
+msgid "White balance bias"
+msgstr "Weißabgleichskontrolle"
+
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB Levels"
+msgstr "WB_RGGBLevelsShade"
+
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB levels"
+msgstr "Schwarzlevel"
+
+#: src/nikonmn.cpp:536
+msgid "Program Shift"
+msgstr "Programmwechsel"
+
+#: src/nikonmn.cpp:536
+msgid "Program shift"
+msgstr "Programmwechsel"
+
+#: src/nikonmn.cpp:537
+msgid "Exposure Difference"
+msgstr "Belichtungsabstand"
+
+#: src/nikonmn.cpp:537
+msgid "Exposure difference"
+msgstr "Belichtungsabstand"
+
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+msgid "Pointer to a preview image"
+msgstr "Zeiger auf ein Vorschaubild"
+
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+#, fuzzy
+msgid "Offset to an IFD containing a preview image"
+msgstr "Offset des Vorschaubildes"
+
+#: src/nikonmn.cpp:541
+msgid "Flash Comp"
+msgstr "Blitzkompensation"
+
+#: src/nikonmn.cpp:541
+msgid "Flash compensation setting"
+msgstr "Blitzkompensationseinstellung"
+
+#: src/nikonmn.cpp:543
+msgid "Image Boundary"
+msgstr "Bildgrenzen"
+
+#: src/nikonmn.cpp:543
+msgid "Image boundary"
+msgstr "Bildgrenzen"
+
+#: src/nikonmn.cpp:544
+#, fuzzy
+msgid "Flash exposure comp"
+msgstr "Blitzbelichtungskompensation"
+
+#: src/nikonmn.cpp:545
+#, fuzzy
+msgid "Flash Bracket Comp"
+msgstr "Blitzkompensation"
+
+#: src/nikonmn.cpp:545
+#, fuzzy
+msgid "Flash bracket compensation applied"
+msgstr "Blitzbelichtungskompensation"
+
+#: src/nikonmn.cpp:546
+#, fuzzy
+msgid "Exposure Bracket Comp"
+msgstr "Belichtungserfassung"
+
+#: src/nikonmn.cpp:546
+#, fuzzy
+msgid "AE bracket compensation applied"
+msgstr "Blitzkompensationswert"
+
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
+msgid "Image Processing"
+msgstr "Bildverarbeitung"
+
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+msgid "Image processing"
+msgstr "Bildverarbeitung"
+
+#: src/nikonmn.cpp:548
+#, fuzzy
+msgid "Crop High Speed"
+msgstr "Hohe Empfindlichkeit"
+
+#: src/nikonmn.cpp:548
+#, fuzzy
+msgid "Crop high speed"
+msgstr "Höhe des Zuschnitts"
+
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure Tuning"
+msgstr "Belichtungswarnung"
+
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure tuning"
+msgstr "Belichtungswarnung"
+
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR Info"
+msgstr "Rohinfo"
+
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR info"
+msgstr "Rohinfo"
+
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image Authentication"
+msgstr "Bild-Orientierung"
+
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image authentication"
+msgstr "Bild-Orientierung"
+
+#: src/nikonmn.cpp:554
+msgid "ActiveD-Lighting"
+msgstr ""
+
+#: src/nikonmn.cpp:554
+msgid "ActiveD-lighting"
+msgstr ""
+
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid "Picture Control"
+msgstr "Bild-Info"
+
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid " Picture control"
+msgstr "Bild-Info"
+
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World Time"
+msgstr "Minolta Zeit"
+
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World time"
+msgstr "Minolta Zeit"
+
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO Info"
+msgstr "Aufnahmeinfo"
+
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO info"
+msgstr "ISO-Einstellung"
+
+#: src/nikonmn.cpp:558
+#, fuzzy
+msgid "Vignette Control"
+msgstr "Vignettierungsmenge"
+
+#: src/nikonmn.cpp:558
+#, fuzzy
+msgid "Vignette control"
+msgstr "Vignettierungsmenge"
+
+#: src/nikonmn.cpp:560
+msgid "Tone Compensation"
+msgstr "Tonkompensation"
+
+#: src/nikonmn.cpp:560
+msgid "Tone compensation"
+msgstr "Tonkompensation"
+
+#: src/nikonmn.cpp:566
+msgid "Mode of flash used"
+msgstr "Modus des benutzten Blitzes"
+
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
+msgid "Shooting Mode"
+msgstr "Aufnahmemodus"
+
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
+msgid "Shooting mode"
+msgstr "Aufnahmemodus"
+
+#: src/nikonmn.cpp:569
+msgid "Auto Bracket Release"
+msgstr "Auslöser der Automatische Erfassung"
+
+#: src/nikonmn.cpp:569
+msgid "Auto bracket release"
+msgstr "Auslöser der Automatische Erfassung"
+
+#: src/nikonmn.cpp:570
+msgid "Lens FStops"
+msgstr "Blendeneinstellung der Linse"
+
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast Curve"
+msgstr "Kontrast-Wert"
+
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast curve"
+msgstr "Kontrast-Wert"
+
+#: src/nikonmn.cpp:572
+#, fuzzy
+msgid "Color Hue"
+msgstr "Farbton"
+
+#: src/nikonmn.cpp:572
+#, fuzzy
+msgid "Color hue"
+msgstr "Farbton"
+
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
+msgid "Scene mode"
+msgstr "Szenenmodus"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
+msgid "Light Source"
+msgstr "Lichtquelle"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
+msgid "Light source"
+msgstr "Lichtquelle"
+
+#: src/nikonmn.cpp:575
+#, fuzzy
+msgid "Shot info"
+msgstr "Aufnahmeinfo"
+
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue Adjustment"
+msgstr "Sättigungsanpassung"
+
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue adjustment"
+msgstr "Sättigungsanpassung"
+
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF Compression"
+msgstr "Kompression"
+
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF compression"
+msgstr "Kompression"
+
+#: src/nikonmn.cpp:580 src/tags.cpp:903
+msgid "Linearization Table"
+msgstr "Linearisierungstabelle"
+
+#: src/nikonmn.cpp:580
+#, fuzzy
+msgid "Linearization table"
+msgstr "Linearisierungstabelle"
+
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color Balance"
+msgstr "Farbabgleich 1"
+
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color balance"
+msgstr "Roter Farbabgleich"
+
+#: src/nikonmn.cpp:582
+msgid "Lens Data"
+msgstr "Linsendaten"
+
+#: src/nikonmn.cpp:582
+msgid "Lens data settings"
+msgstr "Linsendaten-Einstellungen"
+
+#: src/nikonmn.cpp:583
+msgid "Raw Image Center"
+msgstr "Rohbild-Center"
+
+#: src/nikonmn.cpp:583
+msgid "Raw image center"
+msgstr "Rohbild-Center"
+
+#: src/nikonmn.cpp:584
+msgid "Sensor Pixel Size"
+msgstr "Sensor-Pixelgröße"
+
+#: src/nikonmn.cpp:584
+msgid "Sensor pixel size"
+msgstr "Sensor-Pixelgröße"
+
+#: src/nikonmn.cpp:586
+#, fuzzy
+msgid "Scene Assist"
+msgstr "Autofokus-Unterstützung"
+
+#: src/nikonmn.cpp:586
+#, fuzzy
+msgid "Scene assist"
+msgstr "Szenenbereich"
+
+#: src/nikonmn.cpp:587
+#, fuzzy
+msgid "Retouch History"
+msgstr "Historie"
+
+#: src/nikonmn.cpp:587
+#, fuzzy
+msgid "Retouch history"
+msgstr "Historie"
+
+#: src/nikonmn.cpp:589
+msgid "Serial NO"
+msgstr "Seriennummer"
+
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
+msgstr ""
+
+#: src/nikonmn.cpp:590
+msgid "Image Data Size"
+msgstr "Bilddatengröße"
+
+#: src/nikonmn.cpp:590
+msgid "Image data size"
+msgstr "Bilddatengröße"
+
+#: src/nikonmn.cpp:592
+msgid "Image Count"
+msgstr "Bildanzahl"
+
+#: src/nikonmn.cpp:592
+msgid "Image count"
+msgstr "Bildanzahl"
+
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted Image Count"
+msgstr "Bildanzahl löschen"
+
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted image count"
+msgstr "Bildanzahl löschen"
+
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
+msgid "Shutter Count"
+msgstr "Verschlusszähler"
+
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
+msgstr "Anzahl der Fotos dieser Kamera"
+
+#: src/nikonmn.cpp:595
+#, fuzzy
+msgid "Flash info"
+msgstr "Blitzinformation"
+
+#: src/nikonmn.cpp:596
+msgid "Image Optimization"
+msgstr "Bildoptimierung"
+
+#: src/nikonmn.cpp:596
+msgid "Image optimization"
+msgstr "Bildoptimierung"
+
+#: src/nikonmn.cpp:598
+msgid "Program Variation"
+msgstr "Programmvariation"
+
+#: src/nikonmn.cpp:598
+msgid "Program variation"
+msgstr "Programmvariation"
+
+#: src/nikonmn.cpp:600
+msgid "AF Response"
+msgstr "Autofokus-Antwort"
+
+#: src/nikonmn.cpp:600
+msgid "AF response"
+msgstr "Autofokus-Antwort"
+
+#: src/nikonmn.cpp:601
+#, fuzzy
+msgid "Multi exposure"
+msgstr "Mehrfache Belichtung"
+
+#: src/nikonmn.cpp:602
+msgid "High ISO Noise Reduction"
+msgstr "Hohe ISO-Rauschreduktion"
+
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
+#, fuzzy
+msgid "Toning effect"
+msgstr "Fotoeffekt"
+
+#: src/nikonmn.cpp:604
+#, fuzzy
+msgid "AF info 2"
+msgstr "Autofokus-Information"
+
+#: src/nikonmn.cpp:605
+#, fuzzy
+msgid "File info"
+msgstr "Dateiname"
+
+#: src/nikonmn.cpp:608
+msgid "Capture Data"
+msgstr "Eingelesene Daten"
+
+#: src/nikonmn.cpp:608
+msgid "Capture data"
+msgstr "Eingelesene Daten"
+
+#: src/nikonmn.cpp:609
+msgid "Capture Version"
+msgstr "Version der gelesenen Daten"
+
+#: src/nikonmn.cpp:609
+msgid "Capture version"
+msgstr "Version der gelesenen Daten"
+
+#: src/nikonmn.cpp:611
+msgid "Capture Offsets"
+msgstr "Erfassungsoffsets"
+
+#: src/nikonmn.cpp:611
+msgid "Capture offsets"
+msgstr "Erfassungsoffsets"
+
+#: src/nikonmn.cpp:612
+#, fuzzy
+msgid "Scan IFD"
 msgstr "Speicherungs-ID"
 
-#: src/nikonmn.cpp:600
+#: src/nikonmn.cpp:613
+#, fuzzy
+msgid "ICC profile"
+msgstr "Farbprofil"
+
+#: src/nikonmn.cpp:614
+#, fuzzy
+msgid "Capture output"
+msgstr "Eingelesene Daten"
+
+#: src/nikonmn.cpp:616
+msgid "Unknown Nikon3MakerNote tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon3"
+
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+msgid "No"
+msgstr "Nein"
+
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
+msgid "Yes"
+msgstr "Ja"
+
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
+msgstr ""
+
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
+msgstr ""
+
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
+msgstr ""
+
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+#, fuzzy
+msgid "Vibration Reduction"
+msgstr "Verzerrungskorrektur"
+
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+#, fuzzy
+msgid "Vibration reduction"
+msgstr "Verzerrungskorrektur"
+
+#: src/nikonmn.cpp:648
+#, fuzzy
+msgid "Unknown Nikon Vibration Reduction Tag"
+msgstr "Unbekanntes Feld in den benutzerdefinierten Funktionen von Canon"
+
+#: src/nikonmn.cpp:658
+#, fuzzy
+msgid "Default Settings"
+msgstr "Besitzt Einstellungen"
+
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
+#, fuzzy
+msgid "Quick Adjust"
+msgstr "Sättigungsanpassung"
+
+#: src/nikonmn.cpp:660
+#, fuzzy
+msgid "Full Control"
+msgstr "Farbkontrolle"
+
+#: src/nikonmn.cpp:681
+msgid "Blue-green"
+msgstr ""
+
+#: src/nikonmn.cpp:683
+#, fuzzy
+msgid "Purple-blue"
+msgstr "Lila"
+
+#: src/nikonmn.cpp:684
+#, fuzzy
+msgid "Red-purple"
+msgstr "Lila"
+
+#: src/nikonmn.cpp:691
+#, fuzzy
+msgid "Name"
+msgstr "Spitzname"
+
+#: src/nikonmn.cpp:692
+#, fuzzy
+msgid "Base"
+msgstr "Basis-Adresse"
+
+#: src/nikonmn.cpp:693
+#, fuzzy
+msgid "Adjust"
+msgstr "Justiere"
+
+#: src/nikonmn.cpp:694
+#, fuzzy
+msgid "Quick adjust"
+msgstr "Sättigungsanpassung"
+
+#: src/nikonmn.cpp:700
+#, fuzzy
+msgid "Filter effect"
+msgstr "Farbeffekt"
+
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning Saturation"
+msgstr "Sättigung"
+
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning saturation"
+msgstr "Sättigung"
+
+#: src/nikonmn.cpp:704
+#, fuzzy
+msgid "Unknown Nikon Picture Control Tag"
+msgstr "Unbekanntes Feld in der Canon-Bildinfo"
+
+#: src/nikonmn.cpp:714
+#, fuzzy
+msgid "Timezone"
+msgstr "Ton"
+
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight Savings"
+msgstr "Tageslicht"
+
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight savings"
+msgstr "Tageslicht"
+
+#: src/nikonmn.cpp:716
+#, fuzzy
+msgid "Date Display Format"
+msgstr "Dateiformat"
+
+#: src/nikonmn.cpp:716
+#, fuzzy
+msgid "Date display format"
+msgstr "Datenformat"
+
+#: src/nikonmn.cpp:718
+#, fuzzy
+msgid "Unknown Nikon World Time Tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon1"
+
+#: src/nikonmn.cpp:729
+#, fuzzy
+msgid "Hi 0.3"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:730
+#, fuzzy
+msgid "Hi 0.5"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:731
+#, fuzzy
+msgid "Hi 0.7"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:732
+#, fuzzy
+msgid "Hi 1.0"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:733
+#, fuzzy
+msgid "Hi 1.3"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:734
+#, fuzzy
+msgid "Hi 1.5"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:735
+#, fuzzy
+msgid "Hi 1.7"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:736
+#, fuzzy
+msgid "Hi 2.0"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
+msgstr ""
+
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
+msgstr ""
+
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
+msgstr ""
+
+#: src/nikonmn.cpp:740
+#, fuzzy
+msgid "Lo 1.0"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:746
+#, fuzzy
+msgid "ISO Expansion"
+msgstr "ISO-Auswahl"
+
+#: src/nikonmn.cpp:746
+#, fuzzy
+msgid "ISO expansion"
+msgstr "ISO-Auswahl"
+
+#: src/nikonmn.cpp:747
+#, fuzzy
+msgid "ISO 2"
+msgstr "Aufnahmeinfo"
+
+#: src/nikonmn.cpp:748
+#, fuzzy
+msgid "ISO Expansion 2"
+msgstr "ISO-Auswahl"
+
+#: src/nikonmn.cpp:748
+#, fuzzy
+msgid "ISO expansion 2"
+msgstr "ISO-Auswahl"
+
+#: src/nikonmn.cpp:750
+#, fuzzy
+msgid "Unknown Nikon Iso Info Tag"
+msgstr "Unbekanntes Feld in der Canon-Bildinfo"
+
+#: src/nikonmn.cpp:760
+#, fuzzy
+msgid "Single Area"
+msgstr "Einzelbereich"
+
+#: src/nikonmn.cpp:761
+#, fuzzy
+msgid "Dynamic Area"
+msgstr "Dynamischer Bereich"
+
+#: src/nikonmn.cpp:762
+#, fuzzy
+msgid "Dynamic Area, Closest Subject"
+msgstr "Dynamischer Bereich, nächstes Motiv"
+
+#: src/nikonmn.cpp:763
+#, fuzzy
+msgid "Group Dynamic"
+msgstr "Gruppendynamisch"
+
+#: src/nikonmn.cpp:764
+#, fuzzy
+msgid "Single Area (wide)"
+msgstr "Einzelbereich (Weit)"
+
+#: src/nikonmn.cpp:765
+#, fuzzy
+msgid "Dynamic Area (wide)"
+msgstr "Dynamischer Bereich (Weit)"
+
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
+msgid "Mid-left"
+msgstr "Mitte - links"
+
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
+msgid "Mid-right"
+msgstr "Mitte - rechts"
+
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
 #, fuzzy
-msgid "ICC profile"
-msgstr "Farbprofil"
+msgid "Far Left"
+msgstr "Links zuschneiden"
 
-#: src/nikonmn.cpp:601
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
 #, fuzzy
-msgid "Capture output"
-msgstr "Eingelesene Daten"
+msgid "Far Right"
+msgstr "Rechts zuschneiden"
 
-#: src/nikonmn.cpp:603
-msgid "Unknown Nikon3MakerNote tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon3"
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
+#, fuzzy
+msgid "AF area mode"
+msgstr "Autofokus-Modus"
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
-msgstr "Nein"
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
+msgid "AF point"
+msgstr "Autofokus-Punkt"
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
-msgid "Yes"
-msgstr "Ja"
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF Points In Focus"
+msgstr "Benutzte Autofokus-Punkte"
 
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
-msgstr ""
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF points in focus"
+msgstr "Benutzte Autofokus-Punkte"
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
+#: src/nikonmn.cpp:804
+#, fuzzy
+msgid "Unknown Nikon Auto Focus Tag"
+msgstr "Unbekanntes Feld in den benutzerdefinierten Funktionen von Canon"
+
+#: src/nikonmn.cpp:815
+msgid "On (51-point)"
 msgstr ""
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
+#: src/nikonmn.cpp:816
+msgid "On (11-point)"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
+#: src/nikonmn.cpp:822
 #, fuzzy
-msgid "Vibration Reduction"
-msgstr "Verzerrungskorrektur"
+msgid "Contrast Detect AF"
+msgstr "Kontrasteinstellungen"
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
+#: src/nikonmn.cpp:822
 #, fuzzy
-msgid "Vibration reduction"
-msgstr "Verzerrungskorrektur"
+msgid "Contrast detect AF"
+msgstr "Kontrasteinstellungen"
 
-#: src/nikonmn.cpp:635
+#: src/nikonmn.cpp:824
 #, fuzzy
-msgid "Unknown Nikon Vibration Reduction Tag"
-msgstr "Unbekanntes Feld in den benutzerdefinierten Funktionen von Canon"
+msgid "Phase Detect AF"
+msgstr "Fehler beim lesen"
 
-#: src/nikonmn.cpp:645
+#: src/nikonmn.cpp:824
 #, fuzzy
-msgid "Default Settings"
-msgstr "Besitzt Einstellungen"
+msgid "Phase detect AF"
+msgstr "Fehler beim lesen"
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
+#: src/nikonmn.cpp:825
 #, fuzzy
-msgid "Quick Adjust"
-msgstr "Sättigungsanpassung"
+msgid "Primary AF Point"
+msgstr "Graupunkt"
 
-#: src/nikonmn.cpp:647
+#: src/nikonmn.cpp:825
 #, fuzzy
-msgid "Full Control"
-msgstr "Farbkontrolle"
+msgid "Primary AF point"
+msgstr "Graupunkt"
 
-#: src/nikonmn.cpp:668
-msgid "Blue-green"
-msgstr ""
+#: src/nikonmn.cpp:827
+#, fuzzy
+msgid "AF Image Width"
+msgstr "Bildbreite"
 
-#: src/nikonmn.cpp:670
+#: src/nikonmn.cpp:827
 #, fuzzy
-msgid "Purple-blue"
-msgstr "Lila"
+msgid "AF image width"
+msgstr "Bildbreite"
 
-#: src/nikonmn.cpp:671
+#: src/nikonmn.cpp:828
 #, fuzzy
-msgid "Red-purple"
-msgstr "Lila"
+msgid "AF Image Height"
+msgstr "Bildhöhe"
 
-#: src/nikonmn.cpp:678
+#: src/nikonmn.cpp:828
 #, fuzzy
-msgid "Name"
-msgstr "Spitzname"
+msgid "AF image height"
+msgstr "Bildhöhe"
 
-#: src/nikonmn.cpp:679
+#: src/nikonmn.cpp:829
 #, fuzzy
-msgid "Base"
-msgstr "Basis-Adresse"
+msgid "AF Area X Position"
+msgstr "Autofokus-Position"
 
-#: src/nikonmn.cpp:680
+#: src/nikonmn.cpp:829
 #, fuzzy
-msgid "Adjust"
-msgstr "Justiere"
+msgid "AF area x position"
+msgstr "Autofokus-Position"
 
-#: src/nikonmn.cpp:681
+#: src/nikonmn.cpp:830
 #, fuzzy
-msgid "Quick adjust"
-msgstr "Sättigungsanpassung"
+msgid "AF Area Y Position"
+msgstr "Autofokus-Position"
 
-#: src/nikonmn.cpp:687
+#: src/nikonmn.cpp:830
 #, fuzzy
-msgid "Filter effect"
-msgstr "Farbeffekt"
+msgid "AF area y position"
+msgstr "Autofokus-Position"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:831
 #, fuzzy
-msgid "Toning Saturation"
-msgstr "Sättigung"
+msgid "AF Area Width"
+msgstr "Autofokus-Modus"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:831
 #, fuzzy
-msgid "Toning saturation"
-msgstr "Sättigung"
+msgid "AF area width"
+msgstr "Autofokus-Modus"
 
-#: src/nikonmn.cpp:691
+#: src/nikonmn.cpp:832
 #, fuzzy
-msgid "Unknown Nikon Picture Control Tag"
+msgid "AF Area Height"
+msgstr "Autofokus-Modus"
+
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF area height"
+msgstr "Rechts zuschneiden"
+
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast Detect AF In Focus"
+msgstr "Kontrasteinstellungen"
+
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast detect AF in focus"
+msgstr "Kontrasteinstellungen"
+
+#: src/nikonmn.cpp:835
+#, fuzzy
+msgid "Unknown Nikon Auto Focus 2 Tag"
+msgstr "Unbekanntes Feld in den benutzerdefinierten Funktionen von Canon"
+
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory Number"
+msgstr "Ablaufsnummer"
+
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory number"
+msgstr "Ablaufsnummer"
+
+#: src/nikonmn.cpp:849
+#, fuzzy
+msgid "Unknown Nikon File Info Tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/nikonmn.cpp:701
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
+msgid "Multiple Exposure"
+msgstr "Mehrfache Belichtung"
+
+#: src/nikonmn.cpp:861
 #, fuzzy
-msgid "Timezone"
-msgstr "Ton"
+msgid "Image Overlay"
+msgstr "Bildton"
 
-#: src/nikonmn.cpp:702
+#: src/nikonmn.cpp:867
 #, fuzzy
-msgid "Daylight Savings"
-msgstr "Tageslicht"
+msgid "Multi Exposure Mode"
+msgstr "Belichtungsmodus"
 
-#: src/nikonmn.cpp:702
+#: src/nikonmn.cpp:867
 #, fuzzy
-msgid "Daylight savings"
-msgstr "Tageslicht"
+msgid "Multi exposure mode"
+msgstr "Mehrfache Belichtung"
 
-#: src/nikonmn.cpp:703
+#: src/nikonmn.cpp:868
 #, fuzzy
-msgid "Date Display Format"
-msgstr "Dateiformat"
+msgid "Multi Exposure Shots"
+msgstr "Mehrfache Belichtung"
 
-#: src/nikonmn.cpp:703
+#: src/nikonmn.cpp:868
 #, fuzzy
-msgid "Date display format"
-msgstr "Datenformat"
+msgid "Multi exposure shots"
+msgstr "Mehrfache Belichtung"
 
-#: src/nikonmn.cpp:705
+#: src/nikonmn.cpp:869
 #, fuzzy
-msgid "Unknown Nikon World Time Tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon1"
+msgid "Multi Exposure Auto Gain"
+msgstr "Mehrfache Belichtung"
 
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
+#: src/nikonmn.cpp:869
+#, fuzzy
+msgid "Multi exposure auto gain"
+msgstr "Mehrfache Belichtung"
+
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
+#, fuzzy
+msgid "Unknown Nikon Multi Exposure Tag"
+msgstr "Unbekanntes Feld in den benutzerdefinierten Funktionen von Canon"
+
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
+msgid "Internal"
+msgstr "Intern"
+
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
 msgstr ""
 
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
 msgstr ""
 
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
+msgstr ""
+
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
+msgstr ""
+
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
+msgstr ""
+
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
+msgstr ""
+
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
+msgstr ""
+
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
+msgstr ""
+
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
+msgstr ""
+
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
+msgstr ""
+
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
+msgstr ""
+
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
+msgstr ""
+
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
+msgstr ""
+
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
+msgstr ""
+
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
+msgstr ""
+
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
+msgstr ""
+
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
+msgstr ""
+
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
+msgstr ""
+
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
+msgstr ""
+
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
+msgstr ""
+
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
 msgstr ""
 
-#: src/nikonmn.cpp:719
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
+msgstr ""
+
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
+msgstr ""
+
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
+msgstr ""
+
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
+msgstr ""
+
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
+msgstr ""
+
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
+msgstr ""
+
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
+msgstr ""
+
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
+msgstr ""
+
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
+msgstr ""
+
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
+msgstr ""
+
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
+msgstr ""
+
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
+msgstr ""
+
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
+msgstr ""
+
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:934
 #, fuzzy
-msgid "Hi 1.0"
-msgstr "HV10"
+msgid "10.0 m"
+msgstr "100"
 
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:938
+#, fuzzy
+msgid "16.0 m"
+msgstr "160"
+
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
+msgstr ""
+
+#: src/nikonmn.cpp:940
+#, fuzzy
+msgid "20.0 m"
+msgstr "200"
+
+#: src/nikonmn.cpp:947
+#, fuzzy
+msgid "iTTL-BL"
+msgstr "TTL"
+
+#: src/nikonmn.cpp:948
+#, fuzzy
+msgid "iTTL"
+msgstr "TTL"
+
+#: src/nikonmn.cpp:949
+#, fuzzy
+msgid "Auto Aperture"
+msgstr "Blende"
+
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
 msgstr ""
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
+#, fuzzy
+msgid "Repeating Flash"
+msgstr "Wiedergabeklasse"
+
+#: src/nikonmn.cpp:960
+#, fuzzy
+msgid "Bounce Flash"
+msgstr "Kein Blitz"
+
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
 msgstr ""
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
 msgstr ""
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
 msgstr ""
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
 msgstr ""
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
 msgstr ""
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:974
 #, fuzzy
-msgid "ISO Expansion"
-msgstr "ISO-Auswahl"
+msgid "Amber"
+msgstr "F Nummer."
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "ISO expansion"
-msgstr "ISO-Auswahl"
+msgid "Flash Source"
+msgstr "Dateiquelle"
 
-#: src/nikonmn.cpp:734
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "ISO 2"
-msgstr "Aufnahmeinfo"
-
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
-msgstr ""
-
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
-msgstr ""
+msgid "Flash source"
+msgstr "Dateiquelle"
 
-#: src/nikonmn.cpp:737
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
 #, fuzzy
-msgid "Unknown Nikon Iso Info Tag"
-msgstr "Unbekanntes Feld in der Canon-Bildinfo"
+msgid "0x0005"
+msgstr "1000"
 
-#: src/nikonmn.cpp:747
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Single Area"
-msgstr "Einzelbereich"
+msgid "External Flash Firmware"
+msgstr "Externer Blitzzoom"
 
-#: src/nikonmn.cpp:748
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Dynamic Area"
-msgstr "Dynamischer Bereich"
+msgid "External flash firmware"
+msgstr "Externer Blitzmodus"
 
-#: src/nikonmn.cpp:749
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
 #, fuzzy
-msgid "Dynamic Area, Closest Subject"
-msgstr "Dynamischer Bereich, nächstes Motiv"
+msgid "External Flash Flags"
+msgstr "Externer Blitz"
 
-#: src/nikonmn.cpp:750
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
 #, fuzzy
-msgid "Group Dynamic"
-msgstr "Gruppendynamisch"
+msgid "External flash flags"
+msgstr "Externer Blitz"
 
-#: src/nikonmn.cpp:751
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Single Area (wide)"
-msgstr "Einzelbereich (Weit)"
+msgid "Flash Focal Length"
+msgstr "Maximale Fokuslänge"
 
-#: src/nikonmn.cpp:752
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Dynamic Area (wide)"
-msgstr "Dynamischer Bereich (Weit)"
-
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
-msgid "Mid-left"
-msgstr "Mitte - links"
+msgid "Flash focal length"
+msgstr "Maximale Fokuslänge"
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
-msgid "Mid-right"
-msgstr "Mitte - rechts"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
+msgstr ""
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
 #, fuzzy
-msgid "Far Left"
-msgstr "Links zuschneiden"
+msgid "Repeating flash rate"
+msgstr "Die Datei wird umbenannt nach"
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
+msgstr ""
+
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
 #, fuzzy
-msgid "Far Right"
-msgstr "Rechts zuschneiden"
+msgid "Repeating flash count"
+msgstr "Manuelle Blitzkontrolle"
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF Area Mode"
-msgstr "Autofokus-Modus"
+msgid "Flash GN Distance"
+msgstr "Fokusabstand"
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF area mode"
-msgstr "Autofokus-Modus"
+msgid "Flash GN distance"
+msgstr "Fokusabstand"
 
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
-msgid "AF point"
-msgstr "Autofokus-Punkt"
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
+msgstr ""
 
-#: src/nikonmn.cpp:789
-#, fuzzy
-msgid "AF Points In Focus"
-msgstr "Benutzte Autofokus-Punkte"
+#: src/nikonmn.cpp:988
+msgid "Flash group a control mode"
+msgstr ""
+
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
+msgstr ""
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:989
+msgid "Flash group b control mode"
+msgstr ""
+
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "AF points in focus"
-msgstr "Benutzte Autofokus-Punkte"
+msgid "Flash Color Filter"
+msgstr "Farbfilter"
 
-#: src/nikonmn.cpp:791
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "Unknown Nikon Auto Focus Tag"
-msgstr "Unbekanntes Feld in den benutzerdefinierten Funktionen von Canon"
+msgid "Flash color filter"
+msgstr "Farbfilter"
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
 msgid "Shutter count"
 msgstr "Verschlusszähler"
 
-#: src/nikonmn.cpp:804
+#: src/nikonmn.cpp:1044
 #, fuzzy
 msgid "Unknown Nikon Shot Info D80 Tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
 #, fuzzy
 msgid "Flash Level"
 msgstr "Blitzgerät"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:1056
 #, fuzzy
 msgid "Flash level"
 msgstr "Blitzgerät"
 
-#: src/nikonmn.cpp:818
+#: src/nikonmn.cpp:1058
 #, fuzzy
 msgid "Unknown Nikon Shot Info D40 Tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
 #, fuzzy
 msgid "0"
 msgstr "50"
 
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
+#, fuzzy
 msgid "+1"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
+#, fuzzy
 msgid "+2"
-msgstr ""
+msgstr "200"
 
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
 msgid "+4"
 msgstr ""
 
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
 msgid "+8"
 msgstr ""
 
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
 #, fuzzy
 msgid "+16"
 msgstr "160"
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
 #, fuzzy
 msgid "-16"
 msgstr "160"
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
 msgid "-8"
 msgstr ""
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
 msgid "-4"
 msgstr ""
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
+#, fuzzy
 msgid "-2"
-msgstr ""
+msgstr "200"
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
+#, fuzzy
 msgid "-1"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
+#, fuzzy
 msgid "+17"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
+#, fuzzy
 msgid "-17"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
 msgid "+9"
 msgstr ""
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
+#, fuzzy
 msgid "+18"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
+#, fuzzy
 msgid "-18"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
 msgid "-9"
 msgstr ""
 
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
+#, fuzzy
 msgid "+19"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
+#, fuzzy
 msgid "-19"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
+#, fuzzy
 msgid "+5"
-msgstr ""
+msgstr "125"
 
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
 #, fuzzy
 msgid "+10"
 msgstr "10s"
 
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
 #, fuzzy
 msgid "+20"
 msgstr "200"
 
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
 #, fuzzy
 msgid "-20"
 msgstr "200"
 
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
 #, fuzzy
 msgid "-10"
 msgstr "10s"
 
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
+#, fuzzy
 msgid "-5"
-msgstr ""
+msgstr "125"
 
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
+#, fuzzy
 msgid "+11"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
+#, fuzzy
 msgid "-11"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
 msgid "+3"
 msgstr ""
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
+#, fuzzy
 msgid "+6"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
 #, fuzzy
 msgid "+12"
 msgstr "125"
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
 #, fuzzy
 msgid "-12"
 msgstr "125"
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
+#, fuzzy
 msgid "-6"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
 msgid "-3"
 msgstr ""
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
+#, fuzzy
 msgid "+13"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
+#, fuzzy
 msgid "-13"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
 msgid "+7"
 msgstr ""
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
+#, fuzzy
 msgid "+14"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
+#, fuzzy
 msgid "-14"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
 msgid "-7"
 msgstr ""
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
 #, fuzzy
 msgid "+15"
 msgstr "125"
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
 #, fuzzy
 msgid "-15"
 msgstr "125"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
 msgid "AF Fine Tune Adj"
 msgstr "Benutzter Autofokus-Punkt"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
 msgid "AF fine tune adj"
 msgstr "Benutzter Autofokus-Punkt"
 
-#: src/nikonmn.cpp:878
+#: src/nikonmn.cpp:1118
 #, fuzzy
 msgid "Unknown Nikon Shot Info D300 (a) Tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/nikonmn.cpp:938
+#: src/nikonmn.cpp:1178
 #, fuzzy
 msgid "Unknown Nikon Shot Info D300 (b) Tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
-msgstr ""
-
-#: src/nikonmn.cpp:950
-msgid "On (2)"
-msgstr ""
-
-#: src/nikonmn.cpp:951
+#: src/nikonmn.cpp:1191
+#, fuzzy
 msgid "On (3)"
-msgstr ""
+msgstr "An"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:1204
 #, fuzzy
 msgid "Shutter Count 1"
 msgstr "Verschlusszähler"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:1204
 #, fuzzy
 msgid "Shutter count 1"
 msgstr "Verschlusszähler"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:1208
 #, fuzzy
 msgid "Shutter Count 2"
 msgstr "Verschlusszähler"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:1208
 #, fuzzy
 msgid "Shutter count 2"
 msgstr "Verschlusszähler"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:1209
 #, fuzzy
 msgid "Vibration Reduction 2"
 msgstr "Verzerrungskorrektur"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:1209
 #, fuzzy
 msgid "Vibration reduction 2"
 msgstr "Verzerrungskorrektur"
 
-#: src/nikonmn.cpp:973
+#: src/nikonmn.cpp:1213
 #, fuzzy
 msgid "Unknown Nikon Shot Info Tag"
 msgstr "Unbekanntes Feld in der Canon-Bildinfo"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:1224
 #, fuzzy
 msgid "WB RBGG Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:1224
 #, fuzzy
 msgid "WB RBGG levels"
 msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:986
+#: src/nikonmn.cpp:1226
 #, fuzzy
 msgid "Unknown Nikon Color Balance 1 Tag"
 msgstr "Farbabgleich 1"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
 msgid "WB RGGB Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
 msgid "WB RGGB levels"
 msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:999
+#: src/nikonmn.cpp:1239
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2 Tag"
 msgstr "Farbabgleich 2"
 
-#: src/nikonmn.cpp:1012
+#: src/nikonmn.cpp:1252
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2a Tag"
 msgstr "Farbabgleich 2"
 
-#: src/nikonmn.cpp:1025
+#: src/nikonmn.cpp:1265
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2b Tag"
 msgstr "Farbabgleich 2"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:1276
 #, fuzzy
 msgid "WB RGBG Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:1276
 #, fuzzy
 msgid "WB RGBG levels"
 msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:1038
+#: src/nikonmn.cpp:1278
 #, fuzzy
 msgid "Unknown Nikon Color Balance 3 Tag"
 msgstr "Unbekanntes Canon-Panoramafeld"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:1289
 #, fuzzy
 msgid "WB GRBG Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:1289
 #, fuzzy
 msgid "WB GRBG levels"
 msgstr "Schwarzlevel"
 
-#: src/nikonmn.cpp:1051
+#: src/nikonmn.cpp:1291
 #, fuzzy
 msgid "Unknown Nikon Color Balance 4 Tag"
 msgstr "Unbekanntes Canon-Panoramafeld"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
 msgid "Lens ID Number"
 msgstr "Linsen-Seriennummer"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
 msgid "Lens ID number"
 msgstr "Linsen-Seriennummer"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
 msgid "Lens F-Stops"
 msgstr "Blendeneinstellung der Linse"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
 msgid "Lens F-stops"
 msgstr "Blendeneinstellung der Linse"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 msgid "Min Focal Length"
 msgstr "Minimale Fokuslänge"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 msgid "Min focal length"
 msgstr "Minimale Fokuslänge"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 msgid "Max Focal Length"
 msgstr "Maximale Fokuslänge"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 msgid "Max focal length"
 msgstr "Maximale Fokuslänge"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
 msgid "Max Aperture At Min Focal"
 msgstr "Maximale Blende bei minimalem Fokus"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
 msgid "Max aperture at min focal"
 msgstr "Maximale Blende bei minimalem Fokus"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
 msgid "Max Aperture At Max Focal"
 msgstr "Maximale Blende bei maximalem Fokus"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
 msgid "Max aperture at max focal"
 msgstr "Maximale Blende bei maximalem Fokus"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
 msgid "MCU Version"
 msgstr "ARM-Version"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
 msgid "MCU version"
 msgstr "ARM-Version"
 
-#: src/nikonmn.cpp:1070
+#: src/nikonmn.cpp:1310
 #, fuzzy
 msgid "Unknown Nikon Lens Data 1 Tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon1"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
 msgid "Exit Pupil Position"
 msgstr "Autofokus-Position"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
 msgid "Exit pupil position"
 msgstr "Fokusposition"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
 msgid "AF Aperture"
 msgstr "Blende"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
 msgid "AF aperture"
 msgstr "Blende"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
 msgid "Effective Max Aperture"
 msgstr "Maximale Blende"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
 msgid "Effective max aperture"
 msgstr "Maximale Blende"
 
-#: src/nikonmn.cpp:1095
+#: src/nikonmn.cpp:1335
 #, fuzzy
 msgid "Unknown Nikon Lens Data 2 Tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon1"
 
-#: src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1355
 #, fuzzy
 msgid "Max aperture at min focal length"
 msgstr "Maximale Blende bei minimalem Fokus"
 
-#: src/nikonmn.cpp:1116
+#: src/nikonmn.cpp:1356
 #, fuzzy
 msgid "Max aperture at max focal length"
 msgstr "Maximale Blende bei maximalem Fokus"
 
-#: src/nikonmn.cpp:1120
+#: src/nikonmn.cpp:1360
 #, fuzzy
 msgid "Unknown Nikon Lens Data 3 Tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon1"
 
-#: src/nikonmn.cpp:1299
+#: src/nikonmn.cpp:1540
 msgid "Closest subject"
 msgstr "Nächstes Motiv"
 
-#: src/nikonmn.cpp:1300
+#: src/nikonmn.cpp:1541
 msgid "Group dynamic-AF"
 msgstr "Gruppen dynamischer Autofokus"
 
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
 msgid "none"
 msgstr "Keine"
 
-#: src/nikonmn.cpp:1333
+#: src/nikonmn.cpp:1574
 msgid "used"
 msgstr "benutzt"
 
-#: src/nikonmn.cpp:1359
+#: src/nikonmn.cpp:1600
 #, fuzzy
 msgid "All 11 Points"
 msgstr "Autofokus-Punkte"
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
 msgid "Single-frame"
 msgstr "Einzelbild"
 
-#: src/olympusmn.cpp:68
+#: src/olympusmn.cpp:71
 msgid "Standard Quality (SQ)"
 msgstr "Standard Qualität (SQ)"
 
-#: src/olympusmn.cpp:69
+#: src/olympusmn.cpp:72
 msgid "High Quality (HQ)"
 msgstr "Hohe Qualität (HQ)"
 
-#: src/olympusmn.cpp:70
-msgid "Super High Quality (SHQ)"
-msgstr "Super Hohe Qualität (SHQ)"
+#: src/olympusmn.cpp:73
+msgid "Super High Quality (SHQ)"
+msgstr "Super Hohe Qualität (SHQ)"
+
+#: src/olympusmn.cpp:88
+msgid "On (preset)"
+msgstr "Ein (Standard)"
+
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
+msgid "Sport"
+msgstr "Sport"
+
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
+msgid "Landscape+Portrait"
+msgstr "Landschaft und Portrait"
+
+#: src/olympusmn.cpp:100
+msgid "Self Portrait"
+msgstr "Selbstportrait"
+
+#: src/olympusmn.cpp:102
+msgid "2 in 1"
+msgstr "2 in 1"
+
+#: src/olympusmn.cpp:105
+msgid "Night+Portrait"
+msgstr "Nacht und Portrait"
+
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
+msgstr "Essen"
+
+#: src/olympusmn.cpp:112
+msgid "Documents"
+msgstr "Dokumente"
+
+#: src/olympusmn.cpp:114
+msgid "Shoot & Select"
+msgstr "Aufnehmen & Auswählen"
+
+#: src/olympusmn.cpp:115
+msgid "Beach & Snow"
+msgstr "Strand & Schnee"
+
+#: src/olympusmn.cpp:116
+msgid "Self Portrait+Timer"
+msgstr "Selbstportrait und -Auslöser"
+
+#: src/olympusmn.cpp:117
+msgid "Candle"
+msgstr "Kerze"
+
+#: src/olympusmn.cpp:118
+msgid "Available Light"
+msgstr "Verfügbares Licht"
+
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
+msgstr "Hinter Glas"
+
+#: src/olympusmn.cpp:120
+msgid "My Mode"
+msgstr "Eigener Modus"
+
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
+msgid "Pet"
+msgstr "Haustier"
+
+#: src/olympusmn.cpp:122
+msgid "Underwater Wide1"
+msgstr "Unterwasser-Weite1"
+
+#: src/olympusmn.cpp:123
+msgid "Underwater Macro"
+msgstr "Unterwasser-Makro"
+
+#: src/olympusmn.cpp:124
+msgid "Shoot & Select1"
+msgstr "Aufnehmen & Auswählen1"
+
+#: src/olympusmn.cpp:125
+msgid "Shoot & Select2"
+msgstr "Aufnehmen & Auswählen2"
+
+#: src/olympusmn.cpp:127
+msgid "Digital Image Stabilization"
+msgstr "Digitale Bildstabilisierung"
+
+#: src/olympusmn.cpp:128
+msgid "Auction"
+msgstr "Auktion"
+
+#: src/olympusmn.cpp:131
+msgid "Underwater Wide2"
+msgstr "Unterwasser Weite2"
+
+#: src/olympusmn.cpp:133
+msgid "Children"
+msgstr "Kinder"
 
-#: src/olympusmn.cpp:85
-msgid "On (preset)"
-msgstr "Ein (Standard)"
+#: src/olympusmn.cpp:135
+msgid "Nature Macro"
+msgstr "Natur-Makro"
 
-#: src/olympusmn.cpp:91
-msgid "Internal"
-msgstr "Intern"
+#: src/olympusmn.cpp:136
+msgid "Underwater Snapshot"
+msgstr "Unterwasser-Aufnahme"
 
-#: src/olympusmn.cpp:93
+#: src/olympusmn.cpp:137
+msgid "Shooting Guide"
+msgstr "Aufnahmehilfe"
+
+#: src/olympusmn.cpp:145
 msgid "Internal + External"
 msgstr "Intern + Extern"
 
-#: src/olympusmn.cpp:118
+#: src/olympusmn.cpp:176
 msgid "Interlaced"
 msgstr "Interlaced"
 
-#: src/olympusmn.cpp:119
+#: src/olympusmn.cpp:177
 msgid "Progressive"
 msgstr "Progressiv"
 
-#: src/olympusmn.cpp:127
+#: src/olympusmn.cpp:188
 msgid "Thumbnail Image"
 msgstr "Vorschaubild"
 
-#: src/olympusmn.cpp:128
+#: src/olympusmn.cpp:189
 msgid "Thumbnail image"
 msgstr "Vorschaubild"
 
-#: src/olympusmn.cpp:131
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body Firmware Version"
+msgstr "Firmware Version"
+
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body firmware version"
+msgstr "Firmware Version"
+
+#: src/olympusmn.cpp:195
 msgid "Special Mode"
 msgstr "Spezialmodus"
 
-#: src/olympusmn.cpp:132
+#: src/olympusmn.cpp:196
 msgid "Picture taking mode"
 msgstr "Bildaufnahmemodus"
 
-#: src/olympusmn.cpp:140
+#: src/olympusmn.cpp:204
 msgid "Black & White Mode"
 msgstr "Schwarz/Weiß-Modus"
 
-#: src/olympusmn.cpp:141
+#: src/olympusmn.cpp:205
 msgid "Black and white mode"
 msgstr "Schwarz/Weiß-Modus"
 
-#: src/olympusmn.cpp:144
+#: src/olympusmn.cpp:208
 msgid "Digital zoom ratio"
 msgstr "Digitale Zoomrate"
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
 msgid "Focal Plane Diagonal"
 msgstr "Brennebene"
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
 msgid "Focal plane diagonal"
 msgstr "Brennebene"
 
-#: src/olympusmn.cpp:149
+#: src/olympusmn.cpp:213
 msgid "Lens Distortion Parameters"
 msgstr "Linsenverzerrungsparameter"
 
-#: src/olympusmn.cpp:150
+#: src/olympusmn.cpp:214
 msgid "Lens distortion parameters"
 msgstr "Linsenverzerrungsparameter"
 
-#: src/olympusmn.cpp:153
-msgid "Software firmware version"
-msgstr "Firmware-Version der Software"
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
+msgid "Camera Type"
+msgstr "Kameratyp"
+
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
+msgid "Camera type"
+msgstr "Kameratyp"
 
-#: src/olympusmn.cpp:156
+#: src/olympusmn.cpp:220
 msgid "ASCII format data such as [PictureInfo]"
 msgstr "ASCII-Formatdaten wie z.B. bei [BildInfo]"
 
-#: src/olympusmn.cpp:158
+#: src/olympusmn.cpp:222
 msgid "Camera ID"
 msgstr "Kamera ID"
 
-#: src/olympusmn.cpp:159
+#: src/olympusmn.cpp:223
 msgid "Camera ID data"
 msgstr "Kamera ID-Daten"
 
-#: src/olympusmn.cpp:178
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
+msgstr "Software"
+
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
+#, fuzzy
+msgid "Preview Image"
+msgstr "Bildvorschau gültig"
+
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
+#, fuzzy
+msgid "Preview image"
+msgstr "Bildvorschau gültig"
+
+#: src/olympusmn.cpp:237
 msgid "Pre Capture Frames"
 msgstr "Vorerfassungsbilder"
 
-#: src/olympusmn.cpp:179
+#: src/olympusmn.cpp:238
 msgid "Pre-capture frames"
 msgstr "Vorerfassungsbilder"
 
-#: src/olympusmn.cpp:184
+#: src/olympusmn.cpp:240
+#, fuzzy
+msgid "White Board"
+msgstr "Weißabgleich"
+
+#: src/olympusmn.cpp:241
+#, fuzzy
+msgid "White board"
+msgstr "Weißabgleich"
+
+#: src/olympusmn.cpp:243
 msgid "One Touch WB"
 msgstr "Ein-Tasten-Weißabgleich"
 
-#: src/olympusmn.cpp:185
+#: src/olympusmn.cpp:244
 msgid "One touch white balance"
 msgstr "Ein-Tasten-Weißabgleich"
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
-msgid "Serial number"
-msgstr "Seriennummer"
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
+msgid "White Balance Bracket"
+msgstr "Weißabgleichsreihe"
+
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
+msgid "White balance bracket"
+msgstr "Weißabgleichsreihe"
+
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+msgid "Firmware"
+msgstr "Firmware"
+
+#: src/olympusmn.cpp:256
+#, fuzzy
+msgid "Firmwarer"
+msgstr "Firmware"
 
-#: src/olympusmn.cpp:199
+#: src/olympusmn.cpp:261
 msgid "Data Dump 1"
 msgstr "Datendump 1"
 
-#: src/olympusmn.cpp:200
+#: src/olympusmn.cpp:262
 msgid "Various camera settings 1"
 msgstr "Verschiedene Kameraeinstellungen 1"
 
-#: src/olympusmn.cpp:202
+#: src/olympusmn.cpp:264
 msgid "Data Dump 2"
 msgstr "Datendump 2"
 
-#: src/olympusmn.cpp:203
+#: src/olympusmn.cpp:265
 msgid "Various camera settings 2"
 msgstr "Verschiedene Kameraeinstellungen 2"
 
-#: src/olympusmn.cpp:205
-msgid "Shutter Speed"
-msgstr "Verschlusszeit"
-
-#: src/olympusmn.cpp:206
+#: src/olympusmn.cpp:268
 msgid "Shutter speed value"
 msgstr "Verschlusswert"
 
-#: src/olympusmn.cpp:209
+#: src/olympusmn.cpp:271
 msgid "ISO speed value"
 msgstr "ISO-Geschwindigkeitswert"
 
-#: src/olympusmn.cpp:212
+#: src/olympusmn.cpp:274
 msgid "Aperture value"
 msgstr "Blendenwert"
 
-#: src/olympusmn.cpp:215
+#: src/olympusmn.cpp:277
 msgid "Brightness value"
 msgstr "Helligkeitswert"
 
-#: src/olympusmn.cpp:223
+#: src/olympusmn.cpp:285
 msgid "Bracket"
 msgstr "Erfassung"
 
-#: src/olympusmn.cpp:224
+#: src/olympusmn.cpp:286
 msgid "Exposure compensation value"
 msgstr "Blitzkompensationswert"
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
 msgid "Sensor Temperature"
 msgstr "Sensortemperatur"
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
 msgid "Sensor temperature"
 msgstr "Sensortemperatur"
 
-#: src/olympusmn.cpp:229
+#: src/olympusmn.cpp:291
 msgid "Lens Temperature"
 msgstr "Linsentemperatur"
 
-#: src/olympusmn.cpp:230
+#: src/olympusmn.cpp:292
 msgid "Lens temperature"
 msgstr "Linsentemperatur"
 
-#: src/olympusmn.cpp:244
+#: src/olympusmn.cpp:294
+#, fuzzy
+msgid "Light Condition"
+msgstr "Hohe Funktionen"
+
+#: src/olympusmn.cpp:295
+#, fuzzy
+msgid "Light condition"
+msgstr "Hohe Funktionen"
+
+#: src/olympusmn.cpp:297
+#, fuzzy
+msgid "Focus Range"
+msgstr "Fokusbereich"
+
+#: src/olympusmn.cpp:298
+#, fuzzy
+msgid "Focus range"
+msgstr "Fokusbereich"
+
+#: src/olympusmn.cpp:306
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
 msgid "Zoom step count"
 msgstr "Zoom-Schrittweite"
 
-#: src/olympusmn.cpp:247
+#: src/olympusmn.cpp:309
 msgid "Macro Focus"
 msgstr "Makro-Fokus"
 
-#: src/olympusmn.cpp:248
+#: src/olympusmn.cpp:310
 msgid "Macro focus step count"
 msgstr "Makro-Fokus-Schrittweite"
 
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
 msgid "Sharpness Factor"
 msgstr "Schärfefaktor"
 
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
 msgid "Sharpness factor"
 msgstr "Schärfefaktor"
 
-#: src/olympusmn.cpp:253
+#: src/olympusmn.cpp:315
 msgid "Flash Charge Level"
 msgstr "Batteriestatus des Blitzes"
 
-#: src/olympusmn.cpp:254
+#: src/olympusmn.cpp:316
 msgid "Flash charge level"
 msgstr "Batteriestatus des Blitzes"
 
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
 msgid "Color Matrix"
 msgstr "Farbmatrix"
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
 msgid "Color matrix"
 msgstr "Farbmatrix"
 
-#: src/olympusmn.cpp:259
+#: src/olympusmn.cpp:321
 msgid "BlackLevel"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
 msgid "Black level"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:269
+#: src/olympusmn.cpp:331
 msgid "White balance mode"
 msgstr "Weißabgleichsmodus"
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
 msgid "Red Balance"
 msgstr "Rotabgleich"
 
-#: src/olympusmn.cpp:275
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
 msgid "Red balance"
 msgstr "Rotabgleich"
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
 msgid "Blue Balance"
 msgstr "Blauabgleich"
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
 msgid "Blue balance"
 msgstr "Blauabgleich"
 
-#: src/olympusmn.cpp:283
+#: src/olympusmn.cpp:342
+#, fuzzy
+msgid "Color Matrix Number"
+msgstr "Farbmatrix 1"
+
+#: src/olympusmn.cpp:343
+#, fuzzy
+msgid "Color matrix mumber"
+msgstr "Farbmatrix 2"
+
+#: src/olympusmn.cpp:345
 msgid "Serial Number 2"
 msgstr "Seriennummer 2"
 
-#: src/olympusmn.cpp:284
+#: src/olympusmn.cpp:346
 msgid "Serial number 2"
 msgstr "Seriennummer 2"
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
 msgid "Flash exposure compensation"
 msgstr "Blitzbelichtungskompensation"
 
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
+#, fuzzy
 msgid "External Flash Bounce"
-msgstr ""
+msgstr "Externer Blitzmodus"
 
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
+#, fuzzy
 msgid "External flash bounce"
-msgstr ""
+msgstr "Externer Blitzmodus"
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
 msgid "External Flash Zoom"
 msgstr "Externer Blitzzoom"
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
 msgid "External flash zoom"
 msgstr "Externer Blitzzoom"
 
-#: src/olympusmn.cpp:325
+#: src/olympusmn.cpp:387
 msgid "External Flash Mode"
 msgstr "Externer Blitzmodus"
 
-#: src/olympusmn.cpp:326
+#: src/olympusmn.cpp:388
 msgid "External flash mode"
 msgstr "Externer Blitzmodus"
 
-#: src/olympusmn.cpp:334
+#: src/olympusmn.cpp:396
 msgid "Color Control"
 msgstr "Farbkontrolle"
 
-#: src/olympusmn.cpp:335
+#: src/olympusmn.cpp:397
 msgid "Color control"
 msgstr "Farbkontrolle"
 
-#: src/olympusmn.cpp:337
+#: src/olympusmn.cpp:399
 msgid "ValidBits"
 msgstr "Gültige Bits"
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
 msgid "Valid bits"
 msgstr "Gültige Bits"
 
-#: src/olympusmn.cpp:340
+#: src/olympusmn.cpp:402
 msgid "CoringFilter"
 msgstr "Kernfiilter"
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
 msgid "Coring filter"
 msgstr "Kernfilter"
 
-#: src/olympusmn.cpp:361
+#: src/olympusmn.cpp:423
 msgid "Compression Ratio"
 msgstr "Kompressionsrate"
 
-#: src/olympusmn.cpp:362
+#: src/olympusmn.cpp:424
 msgid "Compression ratio"
 msgstr "Kompressionsrate"
 
-#: src/olympusmn.cpp:365
+#: src/olympusmn.cpp:427
 msgid "Preview image embedded"
 msgstr "Eingebettetes Vorschaubild"
 
-#: src/olympusmn.cpp:368
+#: src/olympusmn.cpp:430
 msgid "Offset of the preview image"
 msgstr "Offset des Vorschaubildes"
 
-#: src/olympusmn.cpp:371
+#: src/olympusmn.cpp:433
 msgid "Size of the preview image"
 msgstr "Größe des Vorschaubildes"
 
-#: src/olympusmn.cpp:373
+#: src/olympusmn.cpp:435
 msgid "CCD Scan Mode"
 msgstr "CCD-Scanmodus"
 
-#: src/olympusmn.cpp:374
+#: src/olympusmn.cpp:436
 msgid "CCD scan mode"
 msgstr "CCD-Scanmodus"
 
-#: src/olympusmn.cpp:379
+#: src/olympusmn.cpp:441
 msgid "Infinity Lens Step"
 msgstr "Unendlicher Linsenschritt"
 
-#: src/olympusmn.cpp:380
+#: src/olympusmn.cpp:442
 msgid "Infinity lens step"
 msgstr "Unendlicher Linsenschritt"
 
-#: src/olympusmn.cpp:382
+#: src/olympusmn.cpp:444
 msgid "Near Lens Step"
 msgstr "Naher Linsenschritt"
 
-#: src/olympusmn.cpp:383
+#: src/olympusmn.cpp:445
 msgid "Near lens step"
 msgstr "Naher Linsenschritt"
 
-#: src/olympusmn.cpp:385
+#: src/olympusmn.cpp:447
 msgid "Equipment Info"
 msgstr "Ausrüstungsinfo"
 
-#: src/olympusmn.cpp:386
+#: src/olympusmn.cpp:448
 msgid "Camera equipment sub-IFD"
 msgstr "Kamerasausrüstung Unter-IFD"
 
-#: src/olympusmn.cpp:389
+#: src/olympusmn.cpp:451
 msgid "Camera Settings sub-IFD"
 msgstr "Kameraeinstellungen (Unter-IFD)"
 
-#: src/olympusmn.cpp:391
+#: src/olympusmn.cpp:453
 msgid "Raw Development"
 msgstr "Rohentwicklung"
 
-#: src/olympusmn.cpp:392
+#: src/olympusmn.cpp:454
 msgid "Raw development sub-IFD"
 msgstr "Rohentwicklung Unter-IFD"
 
-#: src/olympusmn.cpp:394
+#: src/olympusmn.cpp:456
 msgid "Raw Development 2"
 msgstr "Rohentwicklung 2"
 
-#: src/olympusmn.cpp:395
+#: src/olympusmn.cpp:457
 msgid "Raw development 2 sub-IFD"
 msgstr "Rohentwicklung 2 Unter-IFD"
 
-#: src/olympusmn.cpp:398
+#: src/olympusmn.cpp:460
 msgid "Image processing sub-IFD"
 msgstr "Bildverarbeitung Unter-IFD"
 
-#: src/olympusmn.cpp:400
+#: src/olympusmn.cpp:462
 msgid "Focus Info"
 msgstr "Fokus-Info"
 
-#: src/olympusmn.cpp:401
+#: src/olympusmn.cpp:463
 msgid "Focus sub-IFD"
 msgstr "Fokus Unter-IFD"
 
-#: src/olympusmn.cpp:403
+#: src/olympusmn.cpp:465
 msgid "Raw Info"
 msgstr "Rohinfo"
 
-#: src/olympusmn.cpp:404
+#: src/olympusmn.cpp:466
+#, fuzzy
 msgid "Raw sub-IFD"
-msgstr ""
+msgstr "Fokus Unter-IFD"
 
-#: src/olympusmn.cpp:409
+#: src/olympusmn.cpp:470
 msgid "Unknown OlympusMakerNote tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
 
-#: src/olympusmn.cpp:424
+#: src/olympusmn.cpp:486
 msgid "Program-shift"
 msgstr "Programmwechsel"
 
-#: src/olympusmn.cpp:429
+#: src/olympusmn.cpp:491
 msgid "Center-weighted average"
 msgstr "Mittelpunkt gewichteter Durchschnitt"
 
-#: src/olympusmn.cpp:431
+#: src/olympusmn.cpp:493
 msgid "ESP"
 msgstr ""
 
-#: src/olympusmn.cpp:432
+#: src/olympusmn.cpp:494
 msgid "Pattern+AF"
 msgstr "Muster und Autofokus"
 
-#: src/olympusmn.cpp:433
+#: src/olympusmn.cpp:495
 msgid "Spot+Highlight control"
 msgstr ""
 
-#: src/olympusmn.cpp:434
+#: src/olympusmn.cpp:496
+#, fuzzy
 msgid "Spot+Shadow control"
-msgstr ""
-
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
-msgid "Super Macro"
-msgstr "Supermakro"
+msgstr "Farbkontrolle"
 
-#: src/olympusmn.cpp:446
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
 msgid "Single AF"
 msgstr "Einzel-Autofokus"
 
-#: src/olympusmn.cpp:447
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
 msgid "Sequential shooting AF"
 msgstr "Serienaufnahmen-Autofokus"
 
-#: src/olympusmn.cpp:449
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
 msgid "Multi AF"
 msgstr "Mehrfacher Autofokus"
 
-#: src/olympusmn.cpp:450
-msgid "MF"
-msgstr ""
-
-#: src/olympusmn.cpp:455
+#: src/olympusmn.cpp:517
 msgid "AF Not Used"
 msgstr "Autofokus wurde nicht benutzt"
 
-#: src/olympusmn.cpp:456
+#: src/olympusmn.cpp:518
 msgid "AF Used"
 msgstr "Autofokus wurde benutzt"
 
-#: src/olympusmn.cpp:461
+#: src/olympusmn.cpp:523
 msgid "Not Ready"
 msgstr "Nicht bereit"
 
-#: src/olympusmn.cpp:462
+#: src/olympusmn.cpp:524
 msgid "Ready"
 msgstr "Fertig"
 
-#: src/olympusmn.cpp:469
+#: src/olympusmn.cpp:531
 msgid "Fill-in"
 msgstr "Ausfüllen"
 
-#: src/olympusmn.cpp:471
+#: src/olympusmn.cpp:533
 msgid "Slow-sync"
 msgstr "Langsame Synchronisation"
 
-#: src/olympusmn.cpp:472
+#: src/olympusmn.cpp:534
 #, fuzzy
 msgid "Forced On"
 msgstr "Leuchtstoffröhre"
 
-#: src/olympusmn.cpp:473
+#: src/olympusmn.cpp:535
 msgid "2nd Curtain"
 msgstr ""
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
+msgstr ""
+
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
+msgstr ""
+
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
+msgstr ""
+
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
 msgstr ""
 
-#: src/olympusmn.cpp:480
+#: src/olympusmn.cpp:566
+#, fuzzy
+msgid "7500K (Fine Weather with Shade)"
+msgstr "5300K (Gutes Wetter)"
+
+#: src/olympusmn.cpp:567
 msgid "6000K (Cloudy)"
 msgstr "6000K (Wolkig)"
 
-#: src/olympusmn.cpp:481
+#: src/olympusmn.cpp:568
 msgid "5300K (Fine Weather)"
 msgstr "5300K (Gutes Wetter)"
 
-#: src/olympusmn.cpp:482
+#: src/olympusmn.cpp:569
 msgid "3000K (Tungsten light)"
 msgstr "3000K (Wolframlicht)"
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
 msgid "3600K (Tungsten light-like)"
 msgstr "3600K (Ähnlich Wolframlicht)"
 
-#: src/olympusmn.cpp:484
+#: src/olympusmn.cpp:571
 msgid "6600K (Daylight fluorescent)"
 msgstr "6600K (Tageslicht-Fluroszierend)"
 
-#: src/olympusmn.cpp:485
+#: src/olympusmn.cpp:572
 msgid "4500K (Neutral white fluorescent)"
 msgstr "4500K (Neutral-Weiß-Fluroszierend)"
 
-#: src/olympusmn.cpp:486
+#: src/olympusmn.cpp:573
 msgid "4000K (Cool white fluorescent)"
 msgstr "4000K (Kühl-Weiß-Fluroszierend)"
 
-#: src/olympusmn.cpp:488
+#: src/olympusmn.cpp:575
 msgid "Custom WB 1"
 msgstr "Benutzerdefiniert WB 1"
 
-#: src/olympusmn.cpp:489
+#: src/olympusmn.cpp:576
 msgid "Custom WB 2"
 msgstr "Benutzerdefiniert WB 2"
 
-#: src/olympusmn.cpp:490
+#: src/olympusmn.cpp:577
 msgid "Custom WB 3"
 msgstr "Benutzerdefiniert WB 3"
 
-#: src/olympusmn.cpp:491
+#: src/olympusmn.cpp:578
 msgid "Custom WB 4"
 msgstr "Benutzerdefiniert WB 4"
 
-#: src/olympusmn.cpp:492
+#: src/olympusmn.cpp:579
 msgid "Custom WB 5400K"
 msgstr "Benutzerdefiniert WB 5400K"
 
-#: src/olympusmn.cpp:493
+#: src/olympusmn.cpp:580
 msgid "Custom WB 2900K"
-msgstr "Benutzerdefiniert WB 2900K"
-
-#: src/olympusmn.cpp:494
-msgid "Custom WB 8000K"
-msgstr "Benutzerdefiniert WB 8000K"
-
-#: src/olympusmn.cpp:500
-msgid "CM1 (Red Enhance)"
-msgstr "CM1 (Rotverbesserung)"
-
-#: src/olympusmn.cpp:501
-msgid "CM2 (Green Enhance)"
-msgstr "CM2 (Grünverbesserung)"
-
-#: src/olympusmn.cpp:502
-msgid "CM3 (Blue Enhance)"
-msgstr "CM3 (Blauverbesserung)"
-
-#: src/olympusmn.cpp:503
-msgid "CM4 (Skin Tones)"
-msgstr "CM4 (Hauttöne)"
-
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
-msgid "Pro Photo RGB"
-msgstr ""
-
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
-msgid "Sport"
-msgstr "Sport"
-
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
-msgid "Landscape+Portrait"
-msgstr "Landschaft und Portrait"
-
-#: src/olympusmn.cpp:522
-msgid "Self Portrait"
-msgstr "Selbstportrait"
-
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
-msgstr "2 in 1"
-
-#: src/olympusmn.cpp:527
-msgid "Night+Portrait"
-msgstr "Nacht und Portrait"
-
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
-msgstr "Essen"
-
-#: src/olympusmn.cpp:534
-msgid "Documents"
-msgstr "Dokumente"
-
-#: src/olympusmn.cpp:536
-msgid "Shoot & Select"
-msgstr "Aufnehmen & Auswählen"
-
-#: src/olympusmn.cpp:537
-msgid "Beach & Snow"
-msgstr "Strand & Schnee"
-
-#: src/olympusmn.cpp:538
-msgid "Self Portrait+Timer"
-msgstr "Selbstportrait und -Auslöser"
-
-#: src/olympusmn.cpp:539
-msgid "Candle"
-msgstr "Kerze"
-
-#: src/olympusmn.cpp:540
-msgid "Available Light"
-msgstr "Verfügbares Licht"
-
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
-msgstr "Hinter Glas"
-
-#: src/olympusmn.cpp:542
-msgid "My Mode"
-msgstr "Eigener Modus"
-
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-msgid "Pet"
-msgstr "Haustier"
-
-#: src/olympusmn.cpp:544
-msgid "Underwater Wide1"
-msgstr "Unterwasser-Weite1"
-
-#: src/olympusmn.cpp:545
-msgid "Underwater Macro"
-msgstr "Unterwasser-Makro"
-
-#: src/olympusmn.cpp:546
-msgid "Shoot & Select1"
-msgstr "Aufnehmen & Auswählen1"
-
-#: src/olympusmn.cpp:547
-msgid "Shoot & Select2"
-msgstr "Aufnehmen & Auswählen2"
-
-#: src/olympusmn.cpp:549
-msgid "Digital Image Stabilization"
-msgstr "Digitale Bildstabilisierung"
-
-#: src/olympusmn.cpp:550
-msgid "Auction"
-msgstr "Auktion"
+msgstr "Benutzerdefiniert WB 2900K"
 
-#: src/olympusmn.cpp:553
-msgid "Underwater Wide2"
-msgstr "Unterwasser Weite2"
+#: src/olympusmn.cpp:581
+msgid "Custom WB 8000K"
+msgstr "Benutzerdefiniert WB 8000K"
 
-#: src/olympusmn.cpp:555
-msgid "Children"
-msgstr "Kinder"
+#: src/olympusmn.cpp:587
+msgid "CM1 (Red Enhance)"
+msgstr "CM1 (Rotverbesserung)"
 
-#: src/olympusmn.cpp:557
-msgid "Nature Macro"
-msgstr "Natur-Makro"
+#: src/olympusmn.cpp:588
+msgid "CM2 (Green Enhance)"
+msgstr "CM2 (Grünverbesserung)"
 
-#: src/olympusmn.cpp:558
-msgid "Underwater Snapshot"
-msgstr "Unterwasser-Aufnahme"
+#: src/olympusmn.cpp:589
+msgid "CM3 (Blue Enhance)"
+msgstr "CM3 (Blauverbesserung)"
 
-#: src/olympusmn.cpp:559
-msgid "Shooting Guide"
-msgstr "Aufnahmehilfe"
+#: src/olympusmn.cpp:590
+msgid "CM4 (Skin Tones)"
+msgstr "CM4 (Hauttöne)"
+
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
+msgid "Pro Photo RGB"
+msgstr ""
 
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
 msgid "Noise Filter"
 msgstr "Rauschfilter"
 
-#: src/olympusmn.cpp:566
+#: src/olympusmn.cpp:604
 msgid "Noise Filter (ISO Boost)"
 msgstr "Rauschfilter (ISO-Boost)"
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
 msgid "Muted"
 msgstr "Stumm"
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
 msgid "Monotone"
 msgstr "Monoton"
 
-#: src/olympusmn.cpp:601
+#: src/olympusmn.cpp:640
 msgid "SQ"
 msgstr ""
 
-#: src/olympusmn.cpp:602
+#: src/olympusmn.cpp:641
 msgid "HQ"
 msgstr ""
 
-#: src/olympusmn.cpp:603
+#: src/olympusmn.cpp:642
 msgid "SHQ"
 msgstr ""
 
-#: src/olympusmn.cpp:608
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
+msgid "On, Mode 1"
+msgstr "An, Modus 1"
+
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
+msgid "On, Mode 2"
+msgstr "An, Modus 2"
+
+#: src/olympusmn.cpp:651
+#, fuzzy
+msgid "On, Mode 3"
+msgstr "An, Modus 1"
+
+#: src/olympusmn.cpp:655
 msgid "Camera Settings Version"
 msgstr "Kameraeinstellungen-Version"
 
-#: src/olympusmn.cpp:608
+#: src/olympusmn.cpp:655
 msgid "Camera settings version"
 msgstr "Kameraeinstellungen-Version"
 
-#: src/olympusmn.cpp:609
+#: src/olympusmn.cpp:656
 msgid "PreviewImage Valid"
 msgstr "Bildvorschau gültig"
 
-#: src/olympusmn.cpp:609
+#: src/olympusmn.cpp:656
 msgid "Preview image valid"
 msgstr "Bildvorschau gültig"
 
-#: src/olympusmn.cpp:610
+#: src/olympusmn.cpp:657
 msgid "PreviewImage Start"
 msgstr "Start der Bildvorschau"
 
-#: src/olympusmn.cpp:610
+#: src/olympusmn.cpp:657
 msgid "Preview image start"
 msgstr "Start der Bildvorschau"
 
-#: src/olympusmn.cpp:611
+#: src/olympusmn.cpp:658
 msgid "PreviewImage Length"
 msgstr "Länge der Bildvorschau"
 
-#: src/olympusmn.cpp:611
+#: src/olympusmn.cpp:658
 msgid "Preview image length"
 msgstr "Länge der Bildvorschau"
 
-#: src/olympusmn.cpp:613
-msgid "AE Lock"
-msgstr "Automatische Belichtungssperre"
-
-#: src/olympusmn.cpp:613
+#: src/olympusmn.cpp:660
 msgid "Auto exposure lock"
 msgstr "Automatische Belichtungssperre"
 
-#: src/olympusmn.cpp:617
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure Shift"
+msgstr "Belichtungszeit"
+
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure shift"
+msgstr "Belichtungszeit"
+
+#: src/olympusmn.cpp:665
 msgid "Focus Process"
 msgstr "Fokusverarbeitung"
 
-#: src/olympusmn.cpp:617
+#: src/olympusmn.cpp:665
 msgid "Focus process"
 msgstr "Fokusverarbeitung"
 
-#: src/olympusmn.cpp:618
+#: src/olympusmn.cpp:666
 msgid "AF Search"
 msgstr "Autofokus-Suche"
 
-#: src/olympusmn.cpp:618
+#: src/olympusmn.cpp:666
 msgid "AF search"
 msgstr "Autofokus-Suche"
 
-#: src/olympusmn.cpp:619
+#: src/olympusmn.cpp:667
 msgid "AF Areas"
 msgstr "Autofokus-Bereiche"
 
-#: src/olympusmn.cpp:619
+#: src/olympusmn.cpp:667
 msgid "AF areas"
 msgstr "Autofokus-Bereiche"
 
-#: src/olympusmn.cpp:622
+#: src/olympusmn.cpp:668
+#, fuzzy
+msgid "AFPointSelected"
+msgstr "Ausgewählter Autofokus-Punkt"
+
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF Fine Tune Adjust"
+msgstr "Benutzter Autofokus-Punkt"
+
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF fine tune adjust"
+msgstr "Benutzter Autofokus-Punkt"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash Remote Control"
+msgstr "Fernbedienung"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash remote control"
+msgstr "Fernbedienung"
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash Control Mode"
+msgstr "Blitzmodus"
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash control mode"
+msgstr "Blitzmodus"
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash Intensity"
+msgstr "Blitzaktivität"
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash intensity"
+msgstr "Blitzaktivität"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual Flash Strength"
+msgstr "Blitzstärke"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual flash strength"
+msgstr "Manuelle Blitzkontrolle"
+
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
 msgid "White Balance 2"
 msgstr "Weißabgleich 2"
 
-#: src/olympusmn.cpp:622
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
 msgid "White balance 2"
 msgstr "Weißabgleich 2"
 
-#: src/olympusmn.cpp:623
+#: src/olympusmn.cpp:677
 msgid "White Balance Temperature"
 msgstr "Weißabgleichstemperatur"
 
-#: src/olympusmn.cpp:623
+#: src/olympusmn.cpp:677
 msgid "White balance temperature"
 msgstr "Weißabgleichstemperatur"
 
-#: src/olympusmn.cpp:624
-msgid "White Balance Bracket"
-msgstr "Weißabgleichsreihe"
-
-#: src/olympusmn.cpp:624
-msgid "White balance bracket"
-msgstr "Weißabgleichsreihe"
-
-#: src/olympusmn.cpp:625
+#: src/olympusmn.cpp:679
 msgid "Custom Saturation"
 msgstr "Benutzerdefinierte Sättigung"
 
-#: src/olympusmn.cpp:625
+#: src/olympusmn.cpp:679
 msgid "Custom saturation"
 msgstr "Benutzerdefinierte Sättigung"
 
-#: src/olympusmn.cpp:626
+#: src/olympusmn.cpp:680
 msgid "Modified Saturation"
 msgstr "Geänderte Sättigung"
 
-#: src/olympusmn.cpp:626
+#: src/olympusmn.cpp:680
 msgid "Modified saturation"
 msgstr "Geänderte Sättigung"
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
 msgid "Contrast Setting"
 msgstr "Kontrasteinstellung"
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
 msgid "Sharpness Setting"
 msgstr "Schärfeneinstellung"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
 msgid "Distortion Correction"
 msgstr "Verzerrungskorrektur"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
 msgid "Distortion correction"
 msgstr "Verzerrungskorrektur"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
 msgid "Shading Compensation"
 msgstr "Abschattungskompensation"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
 msgid "Shading compensation"
 msgstr "Abschattungskompensation"
 
-#: src/olympusmn.cpp:634
+#: src/olympusmn.cpp:688
 msgid "Compression Factor"
 msgstr "Kompressionsrate"
 
-#: src/olympusmn.cpp:634
+#: src/olympusmn.cpp:688
 msgid "Compression factor"
 msgstr "Kompressionsrate"
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
 msgid "Gradation"
 msgstr "Gradation"
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
 msgid "Picture mode"
 msgstr "Bildmodus"
 
-#: src/olympusmn.cpp:637
+#: src/olympusmn.cpp:691
 msgid "Picture Mode Saturation"
 msgstr "Bildmodus-Sättigung"
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
 msgid "Picture mode saturation"
 msgstr "Bildmodus-Sättigung"
 
-#: src/olympusmn.cpp:638
+#: src/olympusmn.cpp:692
 msgid "Picture Mode Hue"
 msgstr "Bildmodus-Farbton"
 
-#: src/olympusmn.cpp:638
+#: src/olympusmn.cpp:692
 msgid "Picture mode hue"
 msgstr "Bildmodus-Farbton"
 
-#: src/olympusmn.cpp:639
+#: src/olympusmn.cpp:693
 msgid "Picture Mode Contrast"
 msgstr "Bildmodus-Kontrast"
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
 msgid "Picture mode contrast"
 msgstr "Bildmodus-Kontrast"
 
-#: src/olympusmn.cpp:640
+#: src/olympusmn.cpp:694
 msgid "Picture Mode Sharpness"
 msgstr "Bildmodus-Schärfe"
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
 msgid "Picture mode sharpness"
 msgstr "Bildmodus-Schärfe"
 
-#: src/olympusmn.cpp:641
+#: src/olympusmn.cpp:695
 msgid "Picture Mode BW Filter"
 msgstr "Bildmodus-Monochromfilter"
 
-#: src/olympusmn.cpp:641
+#: src/olympusmn.cpp:695
 msgid "Picture mode BW filter"
 msgstr "Bildmodus-Monochromfilter"
 
-#: src/olympusmn.cpp:642
+#: src/olympusmn.cpp:696
 msgid "Picture Mode Tone"
 msgstr "Bildmodus-Ton"
 
-#: src/olympusmn.cpp:642
+#: src/olympusmn.cpp:696
 msgid "Picture mode tone"
 msgstr "Bildmodus-Ton"
 
-#: src/olympusmn.cpp:643
+#: src/olympusmn.cpp:697
 msgid "Noise filter"
 msgstr "Rauschfilter"
 
-#: src/olympusmn.cpp:645
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art Filter"
+msgstr "Filter"
+
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art filter"
+msgstr "Farbfilter"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic Filter"
+msgstr "Digitaler Filter"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic filter"
+msgstr "Digitaler Filter"
+
+#: src/olympusmn.cpp:701
 msgid "Panorama Mode"
 msgstr "Panorama-Modus"
 
-#: src/olympusmn.cpp:645
+#: src/olympusmn.cpp:701
 msgid "Panorama mode"
 msgstr "Panorama-Modus"
 
-#: src/olympusmn.cpp:646
+#: src/olympusmn.cpp:702
 msgid "Image Quality 2"
 msgstr "Bildqualität 2"
 
-#: src/olympusmn.cpp:646
+#: src/olympusmn.cpp:702
 msgid "Image quality 2"
 msgstr "Bildqualität 2"
 
-#: src/olympusmn.cpp:647
+#: src/olympusmn.cpp:704
+#, fuzzy
 msgid "Manometer Pressure"
-msgstr ""
+msgstr "Druckmesser-Druck"
 
-#: src/olympusmn.cpp:647
+#: src/olympusmn.cpp:704
 msgid "Manometer pressure"
 msgstr "Druckmesser-Druck"
 
-#: src/olympusmn.cpp:648
+#: src/olympusmn.cpp:705
 msgid "Manometer Reading"
 msgstr "Druckmesser-Lesen"
 
-#: src/olympusmn.cpp:648
+#: src/olympusmn.cpp:705
 msgid "Manometer reading"
 msgstr "Druckmesser-Lesen"
 
-#: src/olympusmn.cpp:649
+#: src/olympusmn.cpp:706
+#, fuzzy
 msgid "Extended WB Detect"
-msgstr ""
+msgstr "Szenenerkennung"
 
-#: src/olympusmn.cpp:649
+#: src/olympusmn.cpp:706
+#, fuzzy
 msgid "Extended WB detect"
+msgstr "Szenenerkennung"
+
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
 msgstr ""
 
-#: src/olympusmn.cpp:651
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:710
 #, fuzzy
 msgid "Unknown OlympusCs tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
 
-#: src/olympusmn.cpp:662
+#: src/olympusmn.cpp:721
 msgid "Simple E-System"
 msgstr ""
 
-#: src/olympusmn.cpp:663
+#: src/olympusmn.cpp:722
 msgid "E-System"
 msgstr ""
 
-#: src/olympusmn.cpp:679
+#: src/olympusmn.cpp:739
 msgid "Equipment Version"
 msgstr "Ausrüstungsversion"
 
-#: src/olympusmn.cpp:679
+#: src/olympusmn.cpp:739
 msgid "Equipment version"
 msgstr "Ausrüstungsversion"
 
-#: src/olympusmn.cpp:680
-msgid "Camera Type"
-msgstr "Kameratyp"
-
-#: src/olympusmn.cpp:680
-msgid "Camera type"
-msgstr "Kameratyp"
-
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
-msgid "Internal Serial Number"
-msgstr "Interne Seriennummer"
-
-#: src/olympusmn.cpp:682
-msgid "Internal serial number"
-msgstr "Interne Seriennummer"
-
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-#, fuzzy
-msgid "Body Firmware Version"
-msgstr "Firmware Version"
-
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-#, fuzzy
-msgid "Body firmware version"
-msgstr "Firmware Version"
+#: src/olympusmn.cpp:741
+msgid "Serial number"
+msgstr "Seriennummer"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
 msgid "Lens Serial Number"
 msgstr "Linsen-Seriennummer"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
 msgid "Lens serial number"
 msgstr "Linsen-Seriennummer"
 
-#: src/olympusmn.cpp:687
+#: src/olympusmn.cpp:747 src/properties.cpp:374
+msgid "Lens Model"
+msgstr "Linsenmodell"
+
+#: src/olympusmn.cpp:747
+#, fuzzy
+msgid "Lens model"
+msgstr "Linsenmodell"
+
+#: src/olympusmn.cpp:748
 msgid "Lens Firmware Version"
 msgstr "Linsen-Firmware Version"
 
-#: src/olympusmn.cpp:687
+#: src/olympusmn.cpp:748
 msgid "Lens firmware version"
 msgstr "Linsen-Firmware Version"
 
-#: src/olympusmn.cpp:692
+#: src/olympusmn.cpp:753
 msgid "Max Aperture At Current Focal"
 msgstr "Maximale Blende bei aktuellem Fokus"
 
-#: src/olympusmn.cpp:692
+#: src/olympusmn.cpp:753
 msgid "Max aperture at current focal"
 msgstr "Maximale Blende bei aktuellem Fokus"
 
-#: src/olympusmn.cpp:693
+#: src/olympusmn.cpp:754
 msgid "Lens Properties"
 msgstr "Linseneigenschaften"
 
-#: src/olympusmn.cpp:693
+#: src/olympusmn.cpp:754
 msgid "Lens properties"
 msgstr "Linseneigenschaften"
 
-#: src/olympusmn.cpp:694
+#: src/olympusmn.cpp:755
 msgid "Extender"
 msgstr "Erweiterung"
 
-#: src/olympusmn.cpp:695
+#: src/olympusmn.cpp:756
 msgid "Extender Serial Number"
 msgstr "Seriennummer der Erweiterung"
 
-#: src/olympusmn.cpp:695
+#: src/olympusmn.cpp:756
 msgid "Extender serial number"
 msgstr "Seriennummer der Erweiterung"
 
-#: src/olympusmn.cpp:696
+#: src/olympusmn.cpp:757
 msgid "Extender Model"
 msgstr "Modell der Erweiterung"
 
-#: src/olympusmn.cpp:696
+#: src/olympusmn.cpp:757
 msgid "Extender model"
 msgstr "Modell der Erweiterung"
 
-#: src/olympusmn.cpp:697
+#: src/olympusmn.cpp:758
 msgid "Extender Firmware Version"
 msgstr "Firmware Version der Erweiterung"
 
-#: src/olympusmn.cpp:697
+#: src/olympusmn.cpp:758
 msgid "Extender firmwareversion"
 msgstr "Firmware Version der Erweiterung"
 
-#: src/olympusmn.cpp:698
-msgid "Flash Type"
-msgstr "Blitztyp"
-
-#: src/olympusmn.cpp:698
-msgid "Flash type"
-msgstr "Blitztyp"
-
-#: src/olympusmn.cpp:699 src/properties.cpp:354
+#: src/olympusmn.cpp:760 src/properties.cpp:370
 msgid "Flash Model"
 msgstr "Blitzmodell"
 
-#: src/olympusmn.cpp:699
+#: src/olympusmn.cpp:760
 msgid "Flash model"
 msgstr "Blitzmodell"
 
-#: src/olympusmn.cpp:700
+#: src/olympusmn.cpp:761
 msgid "Flash Firmware Version"
 msgstr "Firmware Version des Blitzes"
 
-#: src/olympusmn.cpp:700
+#: src/olympusmn.cpp:761
 msgid "Flash firmware version"
 msgstr "Firmware Version des Blitzes"
 
-#: src/olympusmn.cpp:701
+#: src/olympusmn.cpp:762
 msgid "FlashSerialNumber"
 msgstr "Seriennummer des Blitzes"
 
-#: src/olympusmn.cpp:703
+#: src/olympusmn.cpp:764
 #, fuzzy
 msgid "Unknown OlympusEq tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
 msgid "High Speed"
 msgstr "Hohe Empfindlichkeit"
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
 msgid "High Function"
 msgstr "Hohe Funktionen"
 
-#: src/olympusmn.cpp:722
+#: src/olympusmn.cpp:783
 msgid "Advanced High Speed"
 msgstr "Fortgeschrittene hohe Empfindlichkeit"
 
-#: src/olympusmn.cpp:723
+#: src/olympusmn.cpp:784
 msgid "Advanced High Function"
 msgstr "Fortgeschrittene hohe Funktion"
 
-#: src/olympusmn.cpp:728
+#: src/olympusmn.cpp:789
 msgid "Original"
 msgstr "Original"
 
-#: src/olympusmn.cpp:729
+#: src/olympusmn.cpp:790
 msgid "Edited (Landscape)"
 msgstr "Bearbeitet (Landschaft)"
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
 msgid "Edited (Portrait)"
 msgstr "Bearbeitet (Portrait)"
 
-#: src/olympusmn.cpp:736
+#: src/olympusmn.cpp:797
 msgid "WB Color Temp"
 msgstr "Weißabgleich-Farbtemperatur"
 
-#: src/olympusmn.cpp:737
+#: src/olympusmn.cpp:798
 msgid "WB Gray Point"
 msgstr "Weißabgleich-Graupunkt"
 
-#: src/olympusmn.cpp:747
+#: src/olympusmn.cpp:808
 msgid "Raw Development Version"
 msgstr "Version der Rohentwicklung"
 
-#: src/olympusmn.cpp:747
+#: src/olympusmn.cpp:808
 msgid "Raw development version"
 msgstr "Version der Rohentwicklung"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
 msgid "Exposure Bias Value"
 msgstr "Belichtungsfehler"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
 #, fuzzy
 msgid "Exposure bias value"
 msgstr "Belichtungsfehler"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
 msgid "White Balance Value"
 msgstr "Weißabgleichswert"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
 msgid "White balance value"
 msgstr "Weißabgleichswert"
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
 #, fuzzy
 msgid "WB Fine Adjustment"
 msgstr "Sättigungsanpassung"
 
-#: src/olympusmn.cpp:750
+#: src/olympusmn.cpp:811
 #, fuzzy
 msgid "WB fine adjustment"
 msgstr "Sättigungsanpassung"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
 msgid "Gray Point"
 msgstr "Graupunkt"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
 msgid "Gray point"
 msgstr "Graupunkt"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
 #, fuzzy
 msgid "Saturation Emphasis"
 msgstr "Sättigungseinstellung"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
 #, fuzzy
 msgid "Saturation emphasis"
 msgstr "Sättigungseinstellung"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
 #, fuzzy
 msgid "Memory Color Emphasis"
 msgstr "Meine Farben"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
 msgid "Memory color emphasis"
-msgstr ""
+msgstr "Meine Farben"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
 msgid "Contrast Value"
 msgstr "Kontrast-Wert"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
 msgid "Contrast value"
 msgstr "Kontrast-Wert"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
 msgid "Sharpness Value"
 msgstr "Schärfe-Wert"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
 msgid "Sharpness value"
 msgstr "Schärfe-Wert"
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
 #, fuzzy
 msgid "Engine"
 msgstr "Techniker"
 
-#: src/olympusmn.cpp:759
+#: src/olympusmn.cpp:820
 msgid "Edit status"
 msgstr "Bearbeitungsstatus"
 
-#: src/olympusmn.cpp:760
+#: src/olympusmn.cpp:821
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/olympusmn.cpp:762
+#: src/olympusmn.cpp:823
 #, fuzzy
 msgid "Unknown OlympusRd tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:878
 #, fuzzy
 msgid "Raw Development 2 Version"
 msgstr "Rohentwicklung"
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:878
 #, fuzzy
 msgid "Raw development 2 version"
 msgstr "Roh-Entwicklungsinformation"
 
-#: src/olympusmn.cpp:821
+#: src/olympusmn.cpp:882
 #, fuzzy
 msgid "White balance fine adjustment"
 msgstr "Weißabgleich-Anpassung"
 
-#: src/olympusmn.cpp:831
+#: src/olympusmn.cpp:892
 #, fuzzy
 msgid "PM Saturation"
 msgstr "Sättigung"
 
-#: src/olympusmn.cpp:832
+#: src/olympusmn.cpp:893
 #, fuzzy
 msgid "PM Contrast"
 msgstr "Kontrast"
 
-#: src/olympusmn.cpp:833
+#: src/olympusmn.cpp:894
 #, fuzzy
 msgid "PM Sharpness"
 msgstr "Schärfe"
 
-#: src/olympusmn.cpp:834
+#: src/olympusmn.cpp:895
 #, fuzzy
 msgid "PM BW Filter"
 msgstr "Filter"
 
-#: src/olympusmn.cpp:834
+#: src/olympusmn.cpp:895
+#, fuzzy
 msgid "PM BW filter"
-msgstr ""
+msgstr "Filter"
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:896
 #, fuzzy
 msgid "PM Picture Tone"
 msgstr "Bildmodus"
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:896
 #, fuzzy
 msgid "PM picture tone"
 msgstr "Bildmodus"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:899
 #, fuzzy
 msgid "Auto Gradation"
 msgstr "Audiodauer"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:899
 #, fuzzy
 msgid "Auto gradation"
 msgstr "Audiodauer"
 
-#: src/olympusmn.cpp:839
+#: src/olympusmn.cpp:900
+#, fuzzy
 msgid "PM Noise Filter"
+msgstr "Rauschfilter"
+
+#: src/olympusmn.cpp:900
+#, fuzzy
+msgid "Picture mode noise filter"
+msgstr "Bildmoduseinstellung"
+
+#: src/olympusmn.cpp:902
+#, fuzzy
+msgid "Unknown OlympusRd2 tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
+
+#: src/olympusmn.cpp:913
+#, fuzzy
+msgid "On (2 frames)"
+msgstr "Ein (Standard)"
+
+#: src/olympusmn.cpp:914
+#, fuzzy
+msgid "On (3 frames)"
+msgstr "Ein (Standard)"
+
+#: src/olympusmn.cpp:919
+msgid "4:3"
+msgstr ""
+
+#: src/olympusmn.cpp:920
+#, fuzzy
+msgid "3:2"
+msgstr "320"
+
+#: src/olympusmn.cpp:921
+msgid "16:9"
+msgstr ""
+
+#: src/olympusmn.cpp:922
+msgid "6:6"
+msgstr ""
+
+#: src/olympusmn.cpp:923
+msgid "5:4"
+msgstr ""
+
+#: src/olympusmn.cpp:924
+msgid "7:6"
 msgstr ""
 
-#: src/olympusmn.cpp:839
+#: src/olympusmn.cpp:925
 #, fuzzy
-msgid "Picture mode noise filter"
-msgstr "Bildmoduseinstellung"
+msgid "6:5"
+msgstr "D65"
 
-#: src/olympusmn.cpp:841
+#: src/olympusmn.cpp:926
 #, fuzzy
-msgid "Unknown OlympusRd2 tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
+msgid "7:5"
+msgstr "D75"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:927
+msgid "3:4"
+msgstr ""
+
+#: src/olympusmn.cpp:931
 #, fuzzy
 msgid "Image Processing Version"
 msgstr "Bildverarbeitung"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:931
 #, fuzzy
 msgid "Image processing version"
 msgstr "Informationen zur Bildverarbeitung"
 
-#: src/olympusmn.cpp:852
+#: src/olympusmn.cpp:933
+#, fuzzy
 msgid "WB RB Levels 3000K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:852
+#: src/olympusmn.cpp:933
+#, fuzzy
 msgid "WB RB levels 3000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:853
+#: src/olympusmn.cpp:934
+#, fuzzy
 msgid "WB RB Levels 3300K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:853
+#: src/olympusmn.cpp:934
+#, fuzzy
 msgid "WB RB levels 3300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:854
+#: src/olympusmn.cpp:935
+#, fuzzy
 msgid "WB RB Levels 3600K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:854
+#: src/olympusmn.cpp:935
+#, fuzzy
 msgid "WB RB levels 3600K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:855
+#: src/olympusmn.cpp:936
+#, fuzzy
 msgid "WB RB Levels 3900K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:855
+#: src/olympusmn.cpp:936
+#, fuzzy
 msgid "WB RB levels 3900K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:856
+#: src/olympusmn.cpp:937
+#, fuzzy
 msgid "WB RB Levels 4000K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:856
+#: src/olympusmn.cpp:937
+#, fuzzy
 msgid "WB RB levels 4000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:857
+#: src/olympusmn.cpp:938
+#, fuzzy
 msgid "WB RB Levels 4300K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:857
+#: src/olympusmn.cpp:938
+#, fuzzy
 msgid "WB RB levels 4300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:858
+#: src/olympusmn.cpp:939
+#, fuzzy
 msgid "WB RB Levels 4500K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:858
+#: src/olympusmn.cpp:939
+#, fuzzy
 msgid "WB RB levels 4500K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:859
+#: src/olympusmn.cpp:940
+#, fuzzy
 msgid "WB RB Levels 4800K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:859
+#: src/olympusmn.cpp:940
+#, fuzzy
 msgid "WB RB levels 4800K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:860
+#: src/olympusmn.cpp:941
+#, fuzzy
 msgid "WB RB Levels 5300K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:860
+#: src/olympusmn.cpp:941
+#, fuzzy
 msgid "WB RB levels 5300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:861
+#: src/olympusmn.cpp:942
+#, fuzzy
 msgid "WB RB Levels 6000K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:861
+#: src/olympusmn.cpp:942
+#, fuzzy
 msgid "WB RB levels 6000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:862
+#: src/olympusmn.cpp:943
+#, fuzzy
 msgid "WB RB Levels 6600K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:862
+#: src/olympusmn.cpp:943
+#, fuzzy
 msgid "WB RB levels 6600K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:863
+#: src/olympusmn.cpp:944
+#, fuzzy
 msgid "WB RB Levels 7500K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:863
+#: src/olympusmn.cpp:944
+#, fuzzy
 msgid "WB RB levels 7500K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:864
+#: src/olympusmn.cpp:945
 #, fuzzy
 msgid "WB RB Levels CWB1"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:864
+#: src/olympusmn.cpp:945
+#, fuzzy
 msgid "WB RB levels CWB1"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:865
+#: src/olympusmn.cpp:946
 #, fuzzy
 msgid "WB RB Levels CWB2"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:865
+#: src/olympusmn.cpp:946
+#, fuzzy
 msgid "WB RB levels CWB2"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:866
+#: src/olympusmn.cpp:947
 #, fuzzy
 msgid "WB RB Levels CWB3"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:866
+#: src/olympusmn.cpp:947
+#, fuzzy
 msgid "WB RB levels CWB3"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:867
+#: src/olympusmn.cpp:948
 #, fuzzy
 msgid "WB RB Levels CWB4"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:867
+#: src/olympusmn.cpp:948
+#, fuzzy
 msgid "WB RB levels CWB4"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:868
+#: src/olympusmn.cpp:949
+#, fuzzy
 msgid "WB G Level 3000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:868
+#: src/olympusmn.cpp:949
+#, fuzzy
 msgid "WB G level 3000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:869
+#: src/olympusmn.cpp:950
+#, fuzzy
 msgid "WB G Level 3300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:869
+#: src/olympusmn.cpp:950
+#, fuzzy
 msgid "WB G level 3300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:870
+#: src/olympusmn.cpp:951
+#, fuzzy
 msgid "WB G Level 3600K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:870
+#: src/olympusmn.cpp:951
+#, fuzzy
 msgid "WB G level 3600K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:871
+#: src/olympusmn.cpp:952
+#, fuzzy
 msgid "WB G Level 3900K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:871
+#: src/olympusmn.cpp:952
+#, fuzzy
 msgid "WB G level 3900K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:872
+#: src/olympusmn.cpp:953
+#, fuzzy
 msgid "WB G Level 4000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:872
+#: src/olympusmn.cpp:953
+#, fuzzy
 msgid "WB G level 4000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:873
+#: src/olympusmn.cpp:954
+#, fuzzy
 msgid "WB G Level 4300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:873
+#: src/olympusmn.cpp:954
+#, fuzzy
 msgid "WB G level 4300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:874
+#: src/olympusmn.cpp:955
+#, fuzzy
 msgid "WB G Level 4500K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:874
+#: src/olympusmn.cpp:955
+#, fuzzy
 msgid "WB G level 4500K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:875
+#: src/olympusmn.cpp:956
+#, fuzzy
 msgid "WB G Level 4800K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:875
+#: src/olympusmn.cpp:956
+#, fuzzy
 msgid "WB G level 4800K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:876
+#: src/olympusmn.cpp:957
+#, fuzzy
 msgid "WB G Level 5300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:876
+#: src/olympusmn.cpp:957
+#, fuzzy
 msgid "WB G level 5300K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:877
+#: src/olympusmn.cpp:958
+#, fuzzy
 msgid "WB G Level 6000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:877
+#: src/olympusmn.cpp:958
+#, fuzzy
 msgid "WB G level 6000K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:878
+#: src/olympusmn.cpp:959
+#, fuzzy
 msgid "WB G Level 6600K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:878
+#: src/olympusmn.cpp:959
+#, fuzzy
 msgid "WB G level 6600K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:879
+#: src/olympusmn.cpp:960
+#, fuzzy
 msgid "WB G Level 7500K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:879
+#: src/olympusmn.cpp:960
+#, fuzzy
 msgid "WB G level 7500K"
-msgstr ""
+msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:961
 #, fuzzy
 msgid "WB G Level"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:961
 #, fuzzy
 msgid "WB G level"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:882
+#: src/olympusmn.cpp:963
 msgid "Enhancer"
 msgstr "Verbesserer"
 
-#: src/olympusmn.cpp:883
+#: src/olympusmn.cpp:964
 msgid "Enhancer Values"
 msgstr "Verbesserer-Werte"
 
-#: src/olympusmn.cpp:883
+#: src/olympusmn.cpp:964
+#, fuzzy
 msgid "Enhancer values"
-msgstr ""
+msgstr "Verbesserer-Werte"
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
 #, fuzzy
 msgid "Coring Filter"
 msgstr "Kernfiilter"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
 #, fuzzy
 msgid "Coring Values"
 msgstr "Kernfilter"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
 #, fuzzy
 msgid "Coring values"
 msgstr "Kernfilter"
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
+#: src/olympusmn.cpp:967 src/tags.cpp:913
 msgid "Black Level"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:887
+#: src/olympusmn.cpp:968
+#, fuzzy
 msgid "Gain Base"
-msgstr ""
+msgstr "Basis-Adresse"
 
-#: src/olympusmn.cpp:887
+#: src/olympusmn.cpp:968
 msgid "Gain base"
 msgstr ""
 
-#: src/olympusmn.cpp:888
+#: src/olympusmn.cpp:969
 msgid "Valid Bits"
 msgstr "Gültige Bits"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
 msgid "Crop Left"
 msgstr "Links zuschneiden"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
 msgid "Crop left"
 msgstr "Links zuschneiden"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
 msgid "Crop Top"
 msgstr "Oben zuschneiden"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
 msgid "Crop top"
 msgstr "Oben zuschneiden"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
 msgid "Crop Width"
 msgstr "Breite des Zuschnitts"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
 msgid "Crop width"
 msgstr "Breite des Zuschnitts"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
 msgid "Crop Height"
 msgstr "Höhe des Zuschnitts"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
 msgid "Crop height"
 msgstr "Höhe des Zuschnitts"
 
-#: src/olympusmn.cpp:896
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple Exposure Mode"
+msgstr "Belichtungsmodus"
+
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple exposure mode"
+msgstr "Mehrfache Belichtung"
+
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+#, fuzzy
+msgid "Aspect Ratio"
+msgstr "Video-Pixelverhältnis"
+
+#: src/olympusmn.cpp:978
+#, fuzzy
+msgid "Aspect ratio"
+msgstr "Video-Pixelverhältnis"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect Frame"
+msgstr "Video-Pixelverhältnis"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect frame"
+msgstr "Video-Pixelverhältnis"
+
+#: src/olympusmn.cpp:980
+#, fuzzy
 msgid "Face Detect"
-msgstr ""
+msgstr "Fehler beim lesen"
 
-#: src/olympusmn.cpp:896
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+#, fuzzy
 msgid "Face detect"
-msgstr ""
+msgstr "Fehler beim lesen"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:981
 #, fuzzy
 msgid "Face Detect Area"
 msgstr "Fehler beim lesen"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:981
 #, fuzzy
 msgid "Face detect area"
 msgstr "Fehler beim lesen"
 
-#: src/olympusmn.cpp:899
+#: src/olympusmn.cpp:983
 #, fuzzy
 msgid "Unknown OlympusIp tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
 
-#: src/olympusmn.cpp:909
+#: src/olympusmn.cpp:993
 msgid "Bounce or Off"
 msgstr ""
 
-#: src/olympusmn.cpp:910
+#: src/olympusmn.cpp:994
 msgid "Direct"
 msgstr "Direkt"
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:998
 msgid "Focus Info Version"
 msgstr "Version der Fokus-Information"
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:998
 msgid "Focus info version"
 msgstr "Version der Fokus-Information"
 
-#: src/olympusmn.cpp:915
+#: src/olympusmn.cpp:999
 msgid "Auto Focus"
 msgstr "Automatischer Fokus"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:1000
 msgid "Scene Detect"
 msgstr "Szenenerkennung"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:1000
 msgid "Scene detect"
 msgstr "Szenenerkennung"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:1001
 msgid "Scene Area"
 msgstr "Szenenbereich"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:1001
 msgid "Scene area"
 msgstr "Szenenbereich"
 
-#: src/olympusmn.cpp:918
+#: src/olympusmn.cpp:1002
 msgid "Scene Detect Data"
 msgstr "Szenenerkennungsdaten"
 
-#: src/olympusmn.cpp:918
+#: src/olympusmn.cpp:1002
 msgid "Scene detect data"
 msgstr "Szenenerkennungsdaten"
 
-#: src/olympusmn.cpp:919
+#: src/olympusmn.cpp:1003
 msgid "Zoom Step Count"
 msgstr "Zoom-Schrittweite"
 
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:1004
 msgid "Focus Step Count"
 msgstr "Fokus-Schrittweite"
 
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:1004
 msgid "Focus step count"
 msgstr "Fokus-Schrittweite"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:1005
 #, fuzzy
 msgid "Focus Step Infinity"
 msgstr "Fokuseinstellung"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:1005
 #, fuzzy
 msgid "Focus step infinity"
 msgstr "Fokuseinstellung"
 
-#: src/olympusmn.cpp:922
+#: src/olympusmn.cpp:1006
 #, fuzzy
 msgid "Focus Step Near"
 msgstr "Fokustyp"
 
-#: src/olympusmn.cpp:922
+#: src/olympusmn.cpp:1006
 #, fuzzy
 msgid "Focus step near"
 msgstr "Fokusabstand"
 
-#: src/olympusmn.cpp:925
+#: src/olympusmn.cpp:1009
 msgid "External Flash"
 msgstr "Externer Blitz"
 
-#: src/olympusmn.cpp:926
+#: src/olympusmn.cpp:1010
 #, fuzzy
 msgid "External Flash Guide Number"
 msgstr "Externer Blitzmodus"
 
-#: src/olympusmn.cpp:926
+#: src/olympusmn.cpp:1010
 #, fuzzy
 msgid "External flash guide number"
 msgstr "Externer Blitzmodus"
 
-#: src/olympusmn.cpp:930
+#: src/olympusmn.cpp:1014
 msgid "Manual Flash"
 msgstr "Manuell ausgelöst"
 
-#: src/olympusmn.cpp:930
+#: src/olympusmn.cpp:1014
 msgid "Manual flash"
 msgstr "Manuell ausgelöst"
 
-#: src/olympusmn.cpp:934
+#: src/olympusmn.cpp:1018
 #, fuzzy
 msgid "Unknown OlympusFi tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
 
-#: src/olympusmn.cpp:945
+#: src/olympusmn.cpp:1029
 #, fuzzy
 msgid "Unknown OlympusFe tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
 
-#: src/olympusmn.cpp:958
+#: src/olympusmn.cpp:1042
 #, fuzzy
 msgid "Fine Weather"
 msgstr "Gutes Wetter"
 
-#: src/olympusmn.cpp:959
+#: src/olympusmn.cpp:1043
 #, fuzzy
 msgid "Tungsten (incandescent)"
 msgstr "weißglühendes Wolfram Licht"
 
-#: src/olympusmn.cpp:960
+#: src/olympusmn.cpp:1044
 #, fuzzy
 msgid "Evening Sunlight"
 msgstr "Abend"
 
-#: src/olympusmn.cpp:961
+#: src/olympusmn.cpp:1045
 #, fuzzy
 msgid "Daylight Fluorescent (D 5700 - 7100K)"
 msgstr "Tageslicht Leuchtstoff (D 5700 - 7100K)"
 
-#: src/olympusmn.cpp:962
+#: src/olympusmn.cpp:1046
 #, fuzzy
 msgid "Day White Fluorescent (N 4600 - 5400K)"
 msgstr "Tageslichtweiß Leuchtstoff (N 4600 - 5400K)"
 
-#: src/olympusmn.cpp:963
+#: src/olympusmn.cpp:1047
 #, fuzzy
 msgid "Cool White Fluorescent (W 3900 - 4500K)"
 msgstr "Kühles weißes Leuchtstoff (W 3900 - 4500K)"
 
-#: src/olympusmn.cpp:964
+#: src/olympusmn.cpp:1048
 #, fuzzy
 msgid "White Fluorescent (WW 3200 - 3700K)"
 msgstr "Weißes Leuchtstofflicht (WW 3200 - 3700K)"
 
-#: src/olympusmn.cpp:965
+#: src/olympusmn.cpp:1049
 #, fuzzy
 msgid "One Touch White Balance"
 msgstr "Ein-Tasten-Weißabgleich"
 
-#: src/olympusmn.cpp:966
+#: src/olympusmn.cpp:1050
 #, fuzzy
 msgid "Custom 1-4"
 msgstr "Benutzerdefiniert 1"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:1054
 #, fuzzy
 msgid "Raw Info Version"
 msgstr "Version der Fokus-Information"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:1054
 #, fuzzy
 msgid "Raw info version"
 msgstr "Version der Fokus-Information"
 
-#: src/olympusmn.cpp:971
+#: src/olympusmn.cpp:1055
 #, fuzzy
 msgid "WB_RB Levels Used"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:971
+#: src/olympusmn.cpp:1055
 #, fuzzy
 msgid "WB_RB levels used"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:1056
 #, fuzzy
 msgid "WB_RB Levels Auto"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:1056
 #, fuzzy
 msgid "WB_RB levels auto"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:1057
 #, fuzzy
 msgid "WB_RB Levels Shade"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:1057
 #, fuzzy
 msgid "WB_RB levels shade"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:1058
 #, fuzzy
 msgid "WB_RB Levels Cloudy"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:1058
 #, fuzzy
 msgid "WB_RB levels cloudy"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:975
+#: src/olympusmn.cpp:1059
 #, fuzzy
 msgid "WB_RB Levels Fine Weather"
 msgstr "WB_RGGBLevelsFlash"
 
-#: src/olympusmn.cpp:975
+#: src/olympusmn.cpp:1059
+#, fuzzy
 msgid "WB_RB levels fine weather"
-msgstr ""
+msgstr "WB_RGGBLevelsFlash"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:1060
 #, fuzzy
 msgid "WB_RB Levels Tungsten"
 msgstr "WB_RGGBLevelsTungsten"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:1060
 #, fuzzy
 msgid "WB_RB levels tungsten"
 msgstr "WB_RGGBLevelsTungsten"
 
-#: src/olympusmn.cpp:977
+#: src/olympusmn.cpp:1061
 #, fuzzy
 msgid "WB_RB Levels Evening Sunlight"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:977
+#: src/olympusmn.cpp:1061
 #, fuzzy
 msgid "WB_RB levels evening sunlight"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:978
+#: src/olympusmn.cpp:1062
 #, fuzzy
 msgid "WB_RB Levels Daylight Fluor"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:978
+#: src/olympusmn.cpp:1062
 #, fuzzy
 msgid "WB_RB levels daylight fluor"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:979
+#: src/olympusmn.cpp:1063
 #, fuzzy
 msgid "WB_RB Levels Day White Fluor"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:979
+#: src/olympusmn.cpp:1063
+#, fuzzy
 msgid "WB_RB levels day white fluor"
-msgstr ""
+msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:980
+#: src/olympusmn.cpp:1064
 #, fuzzy
 msgid "WB_RB Levels Cool White Fluor"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:980
+#: src/olympusmn.cpp:1064
+#, fuzzy
 msgid "WB_RB levels cool white fluor"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:1065
 #, fuzzy
 msgid "WB_RB Levels White Fluorescent"
 msgstr "WB_RGGBLevelsFluorescentD"
 
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:1065
 #, fuzzy
 msgid "WB_RB levels white fluorescent"
 msgstr "WB_RGGBLevelsFluorescentD"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:1066
 #, fuzzy
 msgid "Color Matrix2"
 msgstr "Farbmatrix 2"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:1066
 #, fuzzy
 msgid "Color matrix 2"
 msgstr "Farbmatrix 2"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1069
 #, fuzzy
 msgid "Black Level 2"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1069
 #, fuzzy
 msgid "Black level 2"
 msgstr "Schwarzlevel"
 
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
 msgid "YCbCr Coefficients"
 msgstr "YCbCr Koeffizienten"
 
-#: src/olympusmn.cpp:986
+#: src/olympusmn.cpp:1070
 #, fuzzy
 msgid "YCbCr coefficients"
 msgstr "YCbCr Koeffizienten"
 
-#: src/olympusmn.cpp:987
+#: src/olympusmn.cpp:1071
 #, fuzzy
 msgid "Valid Pixel Depth"
 msgstr "Video-Pixeltiefe"
 
-#: src/olympusmn.cpp:987
+#: src/olympusmn.cpp:1071
 #, fuzzy
 msgid "Valid pixel depth"
 msgstr "Video-Pixeltiefe"
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:1077
 #, fuzzy
 msgid "White Balance Comp"
 msgstr "Weißabgleich 2"
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:1077
 #, fuzzy
 msgid "White balance comp"
 msgstr "Weißabgleich 2"
 
-#: src/olympusmn.cpp:994
+#: src/olympusmn.cpp:1078
 #, fuzzy
 msgid "Saturation Setting"
 msgstr "Sättigungseinstellung"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:1079
+#, fuzzy
+msgid "Hue Setting"
+msgstr "Besitzt Einstellungen"
+
+#: src/olympusmn.cpp:1079
+#, fuzzy
+msgid "Hue setting"
+msgstr "Automatische Belichtung-Einstellungen"
+
+#: src/olympusmn.cpp:1082
+#, fuzzy
+msgid "CM Exposure Compensation"
+msgstr "Belichtungskompensierung"
+
+#: src/olympusmn.cpp:1082
+#, fuzzy
+msgid "CM exposure compensation"
+msgstr "Belichtungskompensation"
+
+#: src/olympusmn.cpp:1083
+#, fuzzy
+msgid "CM White Balance"
+msgstr "Weißabgleich"
+
+#: src/olympusmn.cpp:1083
+#, fuzzy
+msgid "CM white balance"
+msgstr "Weißabgleich"
+
+#: src/olympusmn.cpp:1084
+#, fuzzy
+msgid "CM White Balance Comp"
+msgstr "Weißabgleich 2"
+
+#: src/olympusmn.cpp:1084
+#, fuzzy
+msgid "CM white balance comp"
+msgstr "Weißabgleich 2"
+
+#: src/olympusmn.cpp:1085
+#, fuzzy
+msgid "CM White Balance Gray Point"
+msgstr "Weißabgleichsreihe"
+
+#: src/olympusmn.cpp:1085
+#, fuzzy
+msgid "CM white balance gray point"
+msgstr "Weißabgleichsauslöser"
+
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM Saturation"
+msgstr "Sättigung"
+
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM saturation"
+msgstr "Sättigung"
+
+#: src/olympusmn.cpp:1087
+#, fuzzy
+msgid "CM Hue"
+msgstr "Sättigung"
+
+#: src/olympusmn.cpp:1087
+#, fuzzy
+msgid "CM hue"
+msgstr "Sättigung"
+
+#: src/olympusmn.cpp:1088
+#, fuzzy
+msgid "CM Contrast"
+msgstr "Kontrast"
+
+#: src/olympusmn.cpp:1088
+#, fuzzy
+msgid "CM contrast"
+msgstr "Kontrast"
+
+#: src/olympusmn.cpp:1089
+#, fuzzy
+msgid "CM Sharpness"
+msgstr "Schärfe"
+
+#: src/olympusmn.cpp:1089
+#, fuzzy
+msgid "CM sharpness"
+msgstr "Schärfe"
+
+#: src/olympusmn.cpp:1091
+#, fuzzy
+msgid "Unknown OlympusRi tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
+
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
+msgid "User-Selected"
+msgstr "Vom Benutzer ausgewählt"
+
+#: src/olympusmn.cpp:1115
+#, fuzzy
+msgid "Auto-Override"
+msgstr "Überschreiben"
+
+#: src/olympusmn.cpp:1151
+msgid "Fast"
+msgstr "Schnell"
+
+#: src/olympusmn.cpp:1208
+msgid "3000 Kelvin"
+msgstr "3000 Kelvin"
+
+#: src/olympusmn.cpp:1209
+msgid "3700 Kelvin"
+msgstr "3700 Kelvin"
+
+#: src/olympusmn.cpp:1210
+msgid "4000 Kelvin"
+msgstr "4000 Kelvin"
+
+#: src/olympusmn.cpp:1211
+msgid "4500 Kelvin"
+msgstr "4500 Kelvin"
+
+#: src/olympusmn.cpp:1212
+msgid "5500 Kelvin"
+msgstr "5500 Kelvin"
+
+#: src/olympusmn.cpp:1213
+msgid "6500 Kelvin"
+msgstr "6500 Kelvin"
+
+#: src/olympusmn.cpp:1214
+msgid "7500 Kelvin"
+msgstr "7500 Kelvin"
+
+#: src/olympusmn.cpp:1220
+msgid "One-touch"
+msgstr "Eine Berührung"
+
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
+msgstr ""
+
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
+msgstr ""
+
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
+msgstr ""
+
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
+msgstr ""
+
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
+msgstr ""
+
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
+msgstr ""
+
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
+msgstr ""
+
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
+msgstr ""
+
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1386
+#, fuzzy
+msgid "Imager AF"
+msgstr "Eindeutige Bildnummer"
+
+#: src/olympusmn.cpp:1387
+#, fuzzy
+msgid "AF sensor"
+msgstr "Autofokus-Suche"
+
+#: src/olympusmn.cpp:1433
+#, fuzzy
+msgid "Soft Focus"
+msgstr "Punktfokus"
+
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
+msgstr ""
+
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
+msgstr ""
+
+#: src/olympusmn.cpp:1436
 #, fuzzy
-msgid "Hue Setting"
-msgstr "Besitzt Einstellungen"
+msgid "Light Tone"
+msgstr "Rechte Zone"
 
-#: src/olympusmn.cpp:995
-#, fuzzy
-msgid "Hue setting"
-msgstr "Automatische Belichtung-Einstellungen"
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
+msgstr ""
 
-#: src/olympusmn.cpp:998
-#, fuzzy
-msgid "CM Exposure Compensation"
-msgstr "Belichtungskompensierung"
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
+msgstr ""
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:1439
 #, fuzzy
-msgid "CM exposure compensation"
-msgstr "Belichtungskompensation"
+msgid "Diorama"
+msgstr "Panorama"
 
-#: src/olympusmn.cpp:999
+#: src/olympusmn.cpp:1440
 #, fuzzy
-msgid "CM White Balance"
-msgstr "Weißabgleich"
+msgid "Cross Process"
+msgstr "Fokusverarbeitung"
 
-#: src/olympusmn.cpp:999
+#: src/olympusmn.cpp:1441
 #, fuzzy
-msgid "CM white balance"
-msgstr "Weißabgleich"
+msgid "Fish Eye"
+msgstr "Energie des Blitzes"
 
-#: src/olympusmn.cpp:1000
-#, fuzzy
-msgid "CM White Balance Comp"
-msgstr "Weißabgleich 2"
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
+msgstr ""
 
-#: src/olympusmn.cpp:1000
+#: src/olympusmn.cpp:1489
 #, fuzzy
-msgid "CM white balance comp"
-msgstr "Weißabgleich 2"
+msgid "Left (or n/a)"
+msgstr "Linke Zone"
 
-#: src/olympusmn.cpp:1001
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
 #, fuzzy
-msgid "CM White Balance Gray Point"
-msgstr "Weißabgleichsreihe"
+msgid "Center (horizontal)"
+msgstr "Mittelzone (Horizontale Orientierung)"
 
-#: src/olympusmn.cpp:1001
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
 #, fuzzy
-msgid "CM white balance gray point"
-msgstr "Weißabgleichsauslöser"
+msgid "Center (vertical)"
+msgstr "Mittelzone (Vertikale Orientierung)"
 
-#: src/olympusmn.cpp:1002
-#, fuzzy
-msgid "CM Saturation"
-msgstr "Sättigung"
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:1504
 #, fuzzy
-msgid "CM saturation"
-msgstr "Sättigung"
+msgid "Top-center (horizontal)"
+msgstr "Mittelzone (Horizontale Orientierung)"
 
-#: src/olympusmn.cpp:1003
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1506
 #, fuzzy
-msgid "CM Hue"
-msgstr "Sättigung"
+msgid "Left (horizontal)"
+msgstr "Horizontal (Normal)"
 
-#: src/olympusmn.cpp:1003
-msgid "CM hue"
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
 msgstr ""
 
-#: src/olympusmn.cpp:1004
-#, fuzzy
-msgid "CM Contrast"
-msgstr "Kontrast"
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:1510
 #, fuzzy
-msgid "CM contrast"
-msgstr "Kontrast"
+msgid "Right (horizontal)"
+msgstr "Horizontal (Normal)"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:1511
 #, fuzzy
-msgid "CM Sharpness"
-msgstr "Schärfe"
+msgid "Bottom-left (horizontal)"
+msgstr "Unten - links"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:1512
 #, fuzzy
-msgid "CM sharpness"
-msgstr "Schärfe"
+msgid "Bottom-center (horizontal)"
+msgstr "Unten - links"
 
-#: src/olympusmn.cpp:1007
+#: src/olympusmn.cpp:1513
 #, fuzzy
-msgid "Unknown OlympusRi tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Olympus"
+msgid "Bottom-right (horizontal)"
+msgstr "Unten - rechts"
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
-msgid "User-Selected"
-msgstr "Vom Benutzer ausgewählt"
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1031
+#: src/olympusmn.cpp:1515
 #, fuzzy
-msgid "Auto-Override"
-msgstr "Überschreiben"
+msgid "Top-center (vertical)"
+msgstr "Zentriert"
 
-#: src/olympusmn.cpp:1067
-msgid "Fast"
-msgstr "Schnell"
+#: src/olympusmn.cpp:1516
+#, fuzzy
+msgid "Top-right (vertical)"
+msgstr "Oben - rechts"
 
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
-msgstr "3000 Kelvin"
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
-msgstr "3700 Kelvin"
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
-msgstr "4000 Kelvin"
+#: src/olympusmn.cpp:1520
+#, fuzzy
+msgid "Mid-right (vertical)"
+msgstr "Mitte - rechts"
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
-msgstr "4500 Kelvin"
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
-msgstr "5500 Kelvin"
+#: src/olympusmn.cpp:1522
+#, fuzzy
+msgid "Bottom-left (vertical)"
+msgstr "Unten - links"
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
-msgstr "6500 Kelvin"
+#: src/olympusmn.cpp:1523
+#, fuzzy
+msgid "Bottom-center (vertical)"
+msgstr "Unten - links"
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
-msgstr "7500 Kelvin"
+#: src/olympusmn.cpp:1524
+#, fuzzy
+msgid "Bottom-right (vertical)"
+msgstr "Unten - rechts"
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
-msgstr "Eine Berührung"
+#: src/olympusmn.cpp:1561
+#, fuzzy
+msgid "Single Target"
+msgstr "Einzelbereich"
+
+#: src/olympusmn.cpp:1562
+#, fuzzy
+msgid "All Target"
+msgstr "Ziel"
+
+#: src/olympusmn.cpp:1563
+#, fuzzy
+msgid "Dynamic Single Target"
+msgstr "Dynamische Bereichseinstellung"
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
 msgid "Very High"
 msgstr "Sehr hoch"
 
-#: src/panasonicmn.cpp:57
+#: src/panasonicmn.cpp:59
 #, fuzzy
 msgid "Motion Picture"
 msgstr "Bildmodus"
 
-#: src/panasonicmn.cpp:65
+#: src/panasonicmn.cpp:67
 msgid "Halogen"
 msgstr "Halogen"
 
-#: src/panasonicmn.cpp:76
+#: src/panasonicmn.cpp:79
 msgid "Auto, focus button"
 msgstr "Automatisch, Fokusknopf"
 
-#: src/panasonicmn.cpp:77
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
 msgid "Auto, continuous"
 msgstr "Automatisch, dauerhaft"
 
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
-msgstr "An, Modus 1"
-
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
-msgstr "An, Modus 2"
-
-#: src/panasonicmn.cpp:91
+#: src/panasonicmn.cpp:95
 msgid "Tele-macro"
 msgstr "Telemakro"
 
-#: src/panasonicmn.cpp:99
+#: src/panasonicmn.cpp:103
 msgid "Scenery"
 msgstr "Szene"
 
-#: src/panasonicmn.cpp:104
+#: src/panasonicmn.cpp:108
 msgid "Shutter-speed priority"
 msgstr "Verschlussgeschwindigkeit-Priorität"
 
-#: src/panasonicmn.cpp:108
+#: src/panasonicmn.cpp:112
 #, fuzzy
 msgid "Movie preview"
 msgstr "Nahaufnahme"
 
-#: src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:113
 msgid "Panning"
 msgstr "Verschieben"
 
-#: src/panasonicmn.cpp:110
+#: src/panasonicmn.cpp:114
 #, fuzzy
 msgid "Simple"
 msgstr "Einzel"
 
-#: src/panasonicmn.cpp:111
+#: src/panasonicmn.cpp:115
 #, fuzzy
 msgid "Color effects"
 msgstr "Farbeffekt"
 
-#: src/panasonicmn.cpp:115
+#: src/panasonicmn.cpp:119
 msgid "Night scenery"
 msgstr "Nachtszene"
 
-#: src/panasonicmn.cpp:117
+#: src/panasonicmn.cpp:121
 #, fuzzy
 msgid "Baby"
 msgstr "durch"
 
-#: src/panasonicmn.cpp:118
+#: src/panasonicmn.cpp:122
 #, fuzzy
 msgid "Soft skin"
 msgstr "Weich"
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
 msgid "Candlelight"
 msgstr "Kerzenlicht"
 
-#: src/panasonicmn.cpp:120
+#: src/panasonicmn.cpp:124
 #, fuzzy
 msgid "Starry night"
 msgstr "Standard Licht A"
 
-#: src/panasonicmn.cpp:121
+#: src/panasonicmn.cpp:125
 #, fuzzy
 msgid "High sensitivity"
 msgstr "ISO-Empfindlichkeit"
 
-#: src/panasonicmn.cpp:122
+#: src/panasonicmn.cpp:126
 #, fuzzy
 msgid "Panorama assist"
 msgstr "Panorama"
 
-#: src/panasonicmn.cpp:125
+#: src/panasonicmn.cpp:129
 msgid "Aerial photo"
 msgstr ""
 
-#: src/panasonicmn.cpp:128
+#: src/panasonicmn.cpp:132
 #, fuzzy
 msgid "Intelligent ISO"
 msgstr "Intervalllänge"
 
-#: src/panasonicmn.cpp:129
+#: src/panasonicmn.cpp:133
 #, fuzzy
 msgid "High speed continuous shooting"
 msgstr "Einstellung des kontinuierlichen Fokus"
 
-#: src/panasonicmn.cpp:130
+#: src/panasonicmn.cpp:134
+#, fuzzy
 msgid "Intelligent auto"
-msgstr ""
+msgstr "Intervalllänge"
 
-#: src/panasonicmn.cpp:142
+#: src/panasonicmn.cpp:146
 msgid "Warm"
 msgstr "Warm"
 
-#: src/panasonicmn.cpp:143
+#: src/panasonicmn.cpp:147
 msgid "Cool"
 msgstr "Kalt"
 
-#: src/panasonicmn.cpp:151
+#: src/panasonicmn.cpp:155
 msgid "Low/High quality"
 msgstr "Niedrige/Hohe Qualität"
 
-#: src/panasonicmn.cpp:152
+#: src/panasonicmn.cpp:156
 msgid "Infinite"
 msgstr "Unendlich"
 
-#: src/panasonicmn.cpp:160
+#: src/panasonicmn.cpp:164
 #, fuzzy
 msgid "Medium low"
 msgstr "Mittel 1"
 
-#: src/panasonicmn.cpp:161
+#: src/panasonicmn.cpp:165
 #, fuzzy
 msgid "Medium high"
 msgstr "Mittel 1"
 
-#: src/panasonicmn.cpp:170
+#: src/panasonicmn.cpp:175
 msgid "Low (-1)"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
+#: src/panasonicmn.cpp:176
 #, fuzzy
 msgid "High (+1)"
 msgstr "Hoch"
 
-#: src/panasonicmn.cpp:172
+#: src/panasonicmn.cpp:177
 msgid "Lowest (-2)"
 msgstr ""
 
-#: src/panasonicmn.cpp:173
+#: src/panasonicmn.cpp:178
+#, fuzzy
 msgid "Highest (+2)"
-msgstr ""
+msgstr "Hoch"
 
-#: src/panasonicmn.cpp:179
+#: src/panasonicmn.cpp:184
 msgid "10s"
 msgstr "10s"
 
-#: src/panasonicmn.cpp:180
+#: src/panasonicmn.cpp:185
 msgid "2s"
 msgstr "2s"
 
-#: src/panasonicmn.cpp:200
+#: src/panasonicmn.cpp:205
 msgid "EX optics"
 msgstr ""
 
-#: src/panasonicmn.cpp:207
+#: src/panasonicmn.cpp:212
 msgid "Telephoto"
 msgstr ""
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
 #, fuzzy
 msgid "Home"
 msgstr "Rom"
 
-#: src/panasonicmn.cpp:219
+#: src/panasonicmn.cpp:225
 #, fuzzy
 msgid "Standard (color)"
 msgstr "Standardformat"
 
-#: src/panasonicmn.cpp:220
+#: src/panasonicmn.cpp:226
 #, fuzzy
 msgid "Dynamic (color)"
 msgstr "Dynamischer Bereich"
 
-#: src/panasonicmn.cpp:221
+#: src/panasonicmn.cpp:227
 #, fuzzy
 msgid "Nature (color)"
 msgstr "Natürliche Farben"
 
-#: src/panasonicmn.cpp:222
+#: src/panasonicmn.cpp:228
 #, fuzzy
 msgid "Smooth (color)"
 msgstr "Glatt"
 
-#: src/panasonicmn.cpp:223
+#: src/panasonicmn.cpp:229
 #, fuzzy
 msgid "Standard (B&W)"
 msgstr "Standard (100%)"
 
-#: src/panasonicmn.cpp:224
+#: src/panasonicmn.cpp:230
 #, fuzzy
 msgid "Dynamic (B&W)"
 msgstr "Dynamischer Bereich"
 
-#: src/panasonicmn.cpp:225
+#: src/panasonicmn.cpp:231
 #, fuzzy
 msgid "Smooth (B&W)"
 msgstr "Glatt"
 
-#: src/panasonicmn.cpp:239
+#: src/panasonicmn.cpp:245
 msgid "Audio"
 msgstr "Audio"
 
-#: src/panasonicmn.cpp:242
+#: src/panasonicmn.cpp:248
 msgid "White balance adjustment"
 msgstr "Weißabgleich-Anpassung"
 
-#: src/panasonicmn.cpp:243
+#: src/panasonicmn.cpp:249
 msgid "FlashBias"
 msgstr "Blitzkontrolle"
 
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
 msgid "Exif version"
 msgstr "Exif-Version"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color Effect"
 msgstr "Farbeffekt"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color effect"
 msgstr "Farbeffekt"
 
-#: src/panasonicmn.cpp:248
+#: src/panasonicmn.cpp:254
 msgid ""
 "Time in 1/100 s from when the camera was powered on to when the image is "
 "written to memory card"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst Mode"
 msgstr "Burst Mode"
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst mode"
 msgstr "Burst Mode"
 
-#: src/panasonicmn.cpp:252
+#: src/panasonicmn.cpp:258
 msgid "NoiseReduction"
 msgstr "Rauschreduktion"
 
-#: src/panasonicmn.cpp:253
+#: src/panasonicmn.cpp:259
 msgid "Self Timer"
 msgstr "Selbstauslöser"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+#, fuzzy
 msgid "Baby Age"
-msgstr ""
+msgstr "durch"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
 msgid "Baby (or pet) age"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical Zoom Mode"
 msgstr "Spezialmodus"
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical zoom mode"
 msgstr "Filmmodus"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion Lens"
 msgstr "Versionen"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion lens"
 msgstr "Kernfilter"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel Day"
 msgstr "Reisetag"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel day"
 msgstr "Reisetag"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World Time Location"
 msgstr "Aufnahmeort"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World time location"
 msgstr "Aufnahmeort"
 
-#: src/panasonicmn.cpp:264
+#: src/panasonicmn.cpp:270
 #, fuzzy
 msgid "Program ISO"
 msgstr "Programm"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 #, fuzzy
 msgid "WB Adjust AB"
 msgstr "Sättigungsanpassung"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 msgid "WB adjust AB. Positive is a shift toward blue."
 msgstr ""
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 #, fuzzy
 msgid "WB Adjust GM"
 msgstr "Sättigungsanpassung"
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 msgid "WBAdjustGM. Positive is a shift toward green."
 msgstr ""
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory Type"
 msgstr "Linsentyp"
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory type"
 msgstr "Linsentyp"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote Version"
 msgstr "Version der Herstellerbemerkung"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote version"
 msgstr "Version der Herstellerbemerkung"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB Red Level"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB red level"
 msgstr "Schwarzlevel"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB Green Level"
 msgstr "Schwarzlevel"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB green level"
 msgstr "Schwarzlevel"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB Blue Level"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB blue level"
 msgstr "Schwarzlevel"
 
-#: src/panasonicmn.cpp:282
+#: src/panasonicmn.cpp:288
 msgid "Unknown PanasonicMakerNote tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Panasonic"
 
-#: src/panasonicmn.cpp:299
+#: src/panasonicmn.cpp:305
 #, fuzzy
 msgid "Spot mode on"
 msgstr "Punktmodus"
 
-#: src/panasonicmn.cpp:300
+#: src/panasonicmn.cpp:306
 msgid "Spot mode off or 3-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:301
+#: src/panasonicmn.cpp:307
 #, fuzzy
 msgid "Spot focussing"
 msgstr "Punktfokus"
 
-#: src/panasonicmn.cpp:302
+#: src/panasonicmn.cpp:308
 msgid "5-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:303
+#: src/panasonicmn.cpp:309
 msgid "1-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:304
+#: src/panasonicmn.cpp:310
 msgid "1-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:305
+#: src/panasonicmn.cpp:311
 msgid "3-area (auto)"
 msgstr ""
 
-#: src/panasonicmn.cpp:306
+#: src/panasonicmn.cpp:312
 msgid "3-area (left)"
 msgstr ""
 
-#: src/panasonicmn.cpp:307
+#: src/panasonicmn.cpp:313
 msgid "3-area (center)"
 msgstr ""
 
-#: src/panasonicmn.cpp:308
+#: src/panasonicmn.cpp:314
 msgid "3-area (right)"
 msgstr ""
 
-#: src/panasonicmn.cpp:320
+#: src/panasonicmn.cpp:326
 msgid " EV"
 msgstr " EV"
 
-#: src/panasonicmn.cpp:329
+#: src/panasonicmn.cpp:335
 #, fuzzy
 msgid "Panasonic raw version"
 msgstr "Linsen-Firmware Version"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor Width"
 msgstr "Breite des Zuschnitts"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor width"
 msgstr "Breite des Zuschnitts"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor Height"
 msgstr "Sensorenreinigung"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor height"
 msgstr "Sensorenreinigung"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor Top Border"
 msgstr "Sensortemperatur"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor top border"
 msgstr "Sensortemperatur"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor Left Border"
 msgstr "Sensortemperatur"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor left border"
 msgstr "Sensortemperatur"
 
-#: src/panasonicmn.cpp:336
+#: src/panasonicmn.cpp:342
 msgid "Red balance (found in Digilux 2 RAW images)"
 msgstr ""
 
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview Image"
-msgstr "Bildvorschau gültig"
-
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview image"
-msgstr "Bildvorschau gültig"
-
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
 msgid "Manufacturer"
 msgstr "Hersteller"
 
-#: src/panasonicmn.cpp:343
+#: src/panasonicmn.cpp:349
 #, fuzzy
 msgid "The manufacturer of the recording equipment"
 msgstr "TIFF-Feld 271, 0x10F. Hersteller der Aufnahmeausrüstung."
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
 msgid "Model"
 msgstr "Modell"
 
-#: src/panasonicmn.cpp:344
+#: src/panasonicmn.cpp:350
 #, fuzzy
 msgid "The model name or model number of the equipment"
 msgstr "TIFF-Feld 272, 0x110. Modellname oder -nummer der Ausrüstung."
 
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
 msgid "Strip Offsets"
 msgstr "Strip Offsets"
 
-#: src/panasonicmn.cpp:345
+#: src/panasonicmn.cpp:351
 #, fuzzy
 msgid "Strip offsets"
 msgstr "Strip Offsets"
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
 msgid "Orientation"
 msgstr "Orientierung"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 #, fuzzy
 msgid "Rows Per Strip"
 msgstr "Zeilen pro Strip"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 #, fuzzy
 msgid "The number of rows per strip"
 msgstr "Die Anzahl der Takte."
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip Byte Counts"
 msgstr "Strip Byte Anzahl"
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip byte counts"
 msgstr "Strip Byte Anzahl"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw Data Offset"
 msgstr "Eindeutige ID der Rohdaten"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw data offset"
 msgstr "Header, offset"
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
 msgid "Exif IFD Pointer"
 msgstr "Exif IFD Zeiger"
 
-#: src/panasonicmn.cpp:350
+#: src/panasonicmn.cpp:356
 msgid "A pointer to the Exif IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
 msgid "GPS Info IFD Pointer"
 msgstr "GPS Info IFD Zeiger"
 
-#: src/panasonicmn.cpp:351
+#: src/panasonicmn.cpp:357
 msgid "A pointer to the GPS Info IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:353
+#: src/panasonicmn.cpp:359
 #, fuzzy
 msgid "Unknown PanasonicRaw tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Panasonic"
 
-#: src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:57
 msgid "Night-Scene"
 msgstr "Nachtszene"
 
-#: src/pentaxmn.cpp:62
+#: src/pentaxmn.cpp:63
 msgid "Optio 330/430"
 msgstr "Optio 330/430"
 
-#: src/pentaxmn.cpp:63
+#: src/pentaxmn.cpp:64
 msgid "Optio 230"
 msgstr "Optio 230"
 
-#: src/pentaxmn.cpp:64
+#: src/pentaxmn.cpp:65
 msgid "Optio 330GS"
 msgstr "Optio 330GS"
 
-#: src/pentaxmn.cpp:65
+#: src/pentaxmn.cpp:66
 msgid "Optio 450/550"
 msgstr "Optio 450/550"
 
-#: src/pentaxmn.cpp:66
+#: src/pentaxmn.cpp:67
 msgid "Optio S"
 msgstr "Optio S"
 
-#: src/pentaxmn.cpp:67
+#: src/pentaxmn.cpp:68
 msgid "*ist D"
 msgstr "*ist D"
 
-#: src/pentaxmn.cpp:68
+#: src/pentaxmn.cpp:69
 msgid "Optio 33L"
 msgstr "Optio 33L"
 
-#: src/pentaxmn.cpp:69
+#: src/pentaxmn.cpp:70
 msgid "Optio 33LF"
 msgstr "Optio 33LF"
 
-#: src/pentaxmn.cpp:70
+#: src/pentaxmn.cpp:71
 msgid "Optio 33WR/43WR/555"
 msgstr "Optio 33WR/43WR/555"
 
-#: src/pentaxmn.cpp:71
+#: src/pentaxmn.cpp:72
 msgid "Optio S4"
 msgstr "Optio S4"
 
-#: src/pentaxmn.cpp:72
+#: src/pentaxmn.cpp:73
 msgid "Optio MX"
 msgstr "Optio MX"
 
-#: src/pentaxmn.cpp:73
+#: src/pentaxmn.cpp:74
 msgid "Optio S40"
 msgstr "Optio S40"
 
-#: src/pentaxmn.cpp:74
+#: src/pentaxmn.cpp:75
 msgid "Optio S4i"
 msgstr "Optio S4i"
 
-#: src/pentaxmn.cpp:75
+#: src/pentaxmn.cpp:76
 msgid "Optio 30"
 msgstr "Optio 30"
 
-#: src/pentaxmn.cpp:76
+#: src/pentaxmn.cpp:77
 msgid "Optio S30"
 msgstr "Optio S30"
 
-#: src/pentaxmn.cpp:77
+#: src/pentaxmn.cpp:78
 msgid "Optio 750Z"
 msgstr "Optio 750Z"
 
-#: src/pentaxmn.cpp:78
+#: src/pentaxmn.cpp:79
 msgid "Optio SV"
 msgstr "Optio SV"
 
-#: src/pentaxmn.cpp:79
+#: src/pentaxmn.cpp:80
 msgid "Optio SVi"
 msgstr "Optio SVi"
 
-#: src/pentaxmn.cpp:80
+#: src/pentaxmn.cpp:81
 msgid "Optio X"
 msgstr "Optio X"
 
-#: src/pentaxmn.cpp:81
+#: src/pentaxmn.cpp:82
 msgid "Optio S5i"
 msgstr "Optio S5i"
 
-#: src/pentaxmn.cpp:82
+#: src/pentaxmn.cpp:83
 msgid "Optio S50"
 msgstr "Optio S50"
 
-#: src/pentaxmn.cpp:83
+#: src/pentaxmn.cpp:84
 msgid "*ist DS"
 msgstr "*ist DS"
 
-#: src/pentaxmn.cpp:84
+#: src/pentaxmn.cpp:85
 msgid "Optio MX4"
 msgstr "Optio MX4"
 
-#: src/pentaxmn.cpp:85
+#: src/pentaxmn.cpp:86
 msgid "Optio S5n"
 msgstr "Optio S5n"
 
-#: src/pentaxmn.cpp:86
+#: src/pentaxmn.cpp:87
 msgid "Optio WP"
 msgstr "Optio WP"
 
-#: src/pentaxmn.cpp:87
+#: src/pentaxmn.cpp:88
 msgid "Optio S55"
 msgstr "Optio S55"
 
-#: src/pentaxmn.cpp:88
+#: src/pentaxmn.cpp:89
 msgid "Optio S5z"
 msgstr "Optio S5z"
 
-#: src/pentaxmn.cpp:89
+#: src/pentaxmn.cpp:90
 msgid "*ist DL"
 msgstr "*ist DL"
 
-#: src/pentaxmn.cpp:90
+#: src/pentaxmn.cpp:91
 msgid "Optio S60"
 msgstr "Optio S60"
 
-#: src/pentaxmn.cpp:91
+#: src/pentaxmn.cpp:92
 msgid "Optio S45"
 msgstr "Optio S45"
 
-#: src/pentaxmn.cpp:92
+#: src/pentaxmn.cpp:93
 msgid "Optio S6"
 msgstr "Optio S6"
 
-#: src/pentaxmn.cpp:93
+#: src/pentaxmn.cpp:94
 msgid "Optio WPi"
 msgstr "Optio WPi"
 
-#: src/pentaxmn.cpp:94
+#: src/pentaxmn.cpp:95
 msgid "BenQ DC X600"
 msgstr "BenQ DC X600"
 
-#: src/pentaxmn.cpp:95
+#: src/pentaxmn.cpp:96
 msgid "*ist DS2"
 msgstr "*ist DS2"
 
-#: src/pentaxmn.cpp:96
+#: src/pentaxmn.cpp:97
 msgid "Samsung GX-1S"
 msgstr "Samsung GX-1S"
 
-#: src/pentaxmn.cpp:97
+#: src/pentaxmn.cpp:98
 msgid "Optio A10"
 msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:98
+#: src/pentaxmn.cpp:99
 msgid "*ist DL2"
 msgstr "*ist DL2"
 
-#: src/pentaxmn.cpp:99
+#: src/pentaxmn.cpp:100
 msgid "Samsung GX-1L"
 msgstr "Samsung GX-1L"
 
-#: src/pentaxmn.cpp:100
+#: src/pentaxmn.cpp:101
 msgid "K100D"
 msgstr "K100D"
 
-#: src/pentaxmn.cpp:101
+#: src/pentaxmn.cpp:102
 msgid "K110D"
 msgstr "K110D"
 
-#: src/pentaxmn.cpp:102
+#: src/pentaxmn.cpp:103
 msgid "K100D Super"
 msgstr "K100D Super"
 
-#: src/pentaxmn.cpp:103
-msgid "Optio T10"
+#: src/pentaxmn.cpp:104
+#, fuzzy
+msgid "Optio T10/T20"
 msgstr "Optio T10"
 
-#: src/pentaxmn.cpp:104
+#: src/pentaxmn.cpp:105
 msgid "Optio W10"
 msgstr "Optio W10"
 
-#: src/pentaxmn.cpp:105
+#: src/pentaxmn.cpp:106
 msgid "Optio M10"
 msgstr "Optio M10"
 
-#: src/pentaxmn.cpp:106
+#: src/pentaxmn.cpp:107
 msgid "K10D"
 msgstr "K10D"
 
-#: src/pentaxmn.cpp:107
+#: src/pentaxmn.cpp:108
 msgid "Samsung GX10"
 msgstr "Samsung GX10"
 
-#: src/pentaxmn.cpp:108
+#: src/pentaxmn.cpp:109
 msgid "Optio S7"
 msgstr "Optio S7"
 
-#: src/pentaxmn.cpp:109
+#: src/pentaxmn.cpp:110
+#, fuzzy
+msgid "Optio L20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:111
 msgid "Optio M20"
 msgstr "Optio M20"
 
-#: src/pentaxmn.cpp:110
+#: src/pentaxmn.cpp:112
 msgid "Optio W20"
 msgstr "Optio W20"
 
-#: src/pentaxmn.cpp:111
+#: src/pentaxmn.cpp:113
 msgid "Optio A20"
 msgstr "Optio A20"
 
-#: src/pentaxmn.cpp:112
+#: src/pentaxmn.cpp:114
 msgid "Optio M30"
 msgstr "Optio M30"
 
-#: src/pentaxmn.cpp:113
+#: src/pentaxmn.cpp:115
 msgid "Optio E30"
 msgstr "Optio E30"
 
-#: src/pentaxmn.cpp:114
+#: src/pentaxmn.cpp:116
+#, fuzzy
+msgid "Optio E35"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:117
 msgid "Optio T30"
 msgstr "Optio T30"
 
-#: src/pentaxmn.cpp:115
+#: src/pentaxmn.cpp:118
 msgid "Optio W30"
 msgstr "Optio W30"
 
-#: src/pentaxmn.cpp:116
+#: src/pentaxmn.cpp:119
 msgid "Optio A30"
 msgstr "Optio A30"
 
-#: src/pentaxmn.cpp:117
+#: src/pentaxmn.cpp:120
 msgid "Optio E40"
 msgstr "Optio E40"
 
-#: src/pentaxmn.cpp:118
+#: src/pentaxmn.cpp:121
 msgid "Optio M40"
 msgstr "Optio M40"
 
-#: src/pentaxmn.cpp:119
+#: src/pentaxmn.cpp:122
 msgid "Optio Z10"
 msgstr "Optio Z10"
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
+#: src/pentaxmn.cpp:123
+msgid "K20D"
+msgstr "K20D"
+
+#: src/pentaxmn.cpp:124
+#, fuzzy
+msgid "Samsung GX20"
+msgstr "Samsung GX10"
+
+#: src/pentaxmn.cpp:125
 msgid "Optio S10"
 msgstr "Optio S10"
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
+#: src/pentaxmn.cpp:126
 msgid "Optio A40"
 msgstr "Optio A40"
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
+#: src/pentaxmn.cpp:127
 msgid "Optio V10"
 msgstr "Optio V10"
 
-#: src/pentaxmn.cpp:123
-msgid "K20D"
-msgstr "K20D"
-
-#: src/pentaxmn.cpp:127
+#: src/pentaxmn.cpp:128
 msgid "K200D"
 msgstr "K200D"
 
-#: src/pentaxmn.cpp:128
+#: src/pentaxmn.cpp:129
+#, fuzzy
+msgid "Optio S12"
+msgstr "Optio S10"
+
+#: src/pentaxmn.cpp:130
 msgid "Optio E50"
 msgstr "Optio E50"
 
-#: src/pentaxmn.cpp:129
+#: src/pentaxmn.cpp:131
 msgid "Optio M50"
 msgstr "Optio M50"
 
+#: src/pentaxmn.cpp:132
+#, fuzzy
+msgid "Optio V20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:133
+#, fuzzy
+msgid "Optio W60"
+msgstr "Optio S60"
+
 #: src/pentaxmn.cpp:134
+#, fuzzy
+msgid "Optio M60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:135
+#, fuzzy
+msgid "Optio E60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:136
+#, fuzzy
+msgid "K2000"
+msgstr "K200D"
+
+#: src/pentaxmn.cpp:137
+msgid "K-m"
+msgstr ""
+
+#: src/pentaxmn.cpp:138
+#, fuzzy
+msgid "Optio P70"
+msgstr "Optio 750Z"
+
+#: src/pentaxmn.cpp:139
+#, fuzzy
+msgid "Optio E70"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:140
+msgid "X70"
+msgstr ""
+
+#: src/pentaxmn.cpp:141
+msgid "K-7"
+msgstr ""
+
+#: src/pentaxmn.cpp:142
+#, fuzzy
+msgid "Optio W80"
+msgstr "Optio W10"
+
+#: src/pentaxmn.cpp:143
+#, fuzzy
+msgid "Optio P80"
+msgstr "Optio 30"
+
+#: src/pentaxmn.cpp:144
+#, fuzzy
+msgid "Optio WS80"
+msgstr "Optio S40"
+
+#: src/pentaxmn.cpp:145
+msgid "K-x"
+msgstr ""
+
+#: src/pentaxmn.cpp:146
+#, fuzzy
+msgid "645D"
+msgstr "64"
+
+#: src/pentaxmn.cpp:147
+#, fuzzy
+msgid "Optio I-10"
+msgstr "Optio A10"
+
+#: src/pentaxmn.cpp:152
 msgid "Good"
 msgstr "Gut"
 
-#: src/pentaxmn.cpp:135
+#: src/pentaxmn.cpp:153
 msgid "Better"
 msgstr "Besser"
 
-#: src/pentaxmn.cpp:136
+#: src/pentaxmn.cpp:154
 msgid "Best"
 msgstr "Am Besten"
 
-#: src/pentaxmn.cpp:137
+#: src/pentaxmn.cpp:155
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/pentaxmn.cpp:139
+#: src/pentaxmn.cpp:157
 msgid "Premium"
 msgstr "Premium"
 
-#: src/pentaxmn.cpp:144
+#: src/pentaxmn.cpp:162
 msgid "640x480"
 msgstr "640x480"
 
-#: src/pentaxmn.cpp:145
-msgid "Full"
-msgstr "Vollbild"
-
-#: src/pentaxmn.cpp:146
+#: src/pentaxmn.cpp:164
 msgid "1024x768"
 msgstr "1024x768"
 
-#: src/pentaxmn.cpp:147
+#: src/pentaxmn.cpp:165
 msgid "1280x960"
 msgstr "1280x960"
 
-#: src/pentaxmn.cpp:148
+#: src/pentaxmn.cpp:166
 msgid "1600x1200"
 msgstr "1600x1200"
 
-#: src/pentaxmn.cpp:149
+#: src/pentaxmn.cpp:167
 msgid "2048x1536"
 msgstr "2048x1536"
 
-#: src/pentaxmn.cpp:150
+#: src/pentaxmn.cpp:168
 msgid "2560x1920 or 2304x1728"
 msgstr "2560x1920 oder 2304x1728"
 
-#: src/pentaxmn.cpp:151
+#: src/pentaxmn.cpp:169
 msgid "3072x2304"
 msgstr "3072x2304"
 
-#: src/pentaxmn.cpp:152
+#: src/pentaxmn.cpp:170
 msgid "3264x2448"
 msgstr "3264x2448"
 
-#: src/pentaxmn.cpp:153
+#: src/pentaxmn.cpp:171
 msgid "320x240"
 msgstr "320x240"
 
-#: src/pentaxmn.cpp:154
+#: src/pentaxmn.cpp:172
 msgid "2288x1712"
 msgstr "2288x1712"
 
-#: src/pentaxmn.cpp:155
+#: src/pentaxmn.cpp:173
 msgid "2592x1944"
 msgstr "2592x1944"
 
-#: src/pentaxmn.cpp:156
+#: src/pentaxmn.cpp:174
 msgid "2304x1728 or 2592x1944"
 msgstr "2304x1728 oder 2592x1944"
 
-#: src/pentaxmn.cpp:157
+#: src/pentaxmn.cpp:175
 msgid "3056x2296"
 msgstr "3056x2296"
 
-#: src/pentaxmn.cpp:158
+#: src/pentaxmn.cpp:176
 msgid "2816x2212 or 2816x2112"
 msgstr "2816x2212 oder 2816x2112"
 
-#: src/pentaxmn.cpp:159
+#: src/pentaxmn.cpp:177
 msgid "3648x2736"
 msgstr "3648x2736"
 
-#: src/pentaxmn.cpp:164
+#: src/pentaxmn.cpp:182
 msgid "Auto, Did not fire"
 msgstr "Blitz nicht ausgelöst, automatisch"
 
-#: src/pentaxmn.cpp:166
+#: src/pentaxmn.cpp:184
 msgid "Auto, Did not fire, Red-eye reduction"
 msgstr "Blitz nicht ausgelöst, automatisch, Rote-Augen-Reduktion"
 
-#: src/pentaxmn.cpp:167
+#: src/pentaxmn.cpp:185
 msgid "Auto, Fired"
 msgstr "Blitz ausgelöst, automatisch"
 
-#: src/pentaxmn.cpp:169
+#: src/pentaxmn.cpp:187
 msgid "Auto, Fired, Red-eye reduction"
 msgstr "Blitz ausgelöst, automatisch, Rote-Augen-Reduktion"
 
-#: src/pentaxmn.cpp:170
+#: src/pentaxmn.cpp:188
 msgid "On, Red-eye reduction"
 msgstr "Ein, Rote Augen reduzieren"
 
-#: src/pentaxmn.cpp:171
+#: src/pentaxmn.cpp:189
 msgid "On, Wireless"
 msgstr "Ein, Drahtlos"
 
-#: src/pentaxmn.cpp:172
+#: src/pentaxmn.cpp:190
 msgid "On, Soft"
 msgstr "Ein, weich"
 
-#: src/pentaxmn.cpp:173
+#: src/pentaxmn.cpp:191
 msgid "On, Slow-sync"
 msgstr "Ein, langsame Synchronisation"
 
-#: src/pentaxmn.cpp:174
+#: src/pentaxmn.cpp:192
 msgid "On, Slow-sync, Red-eye reduction"
 msgstr "Ein, langsame Synchronisation, Rote-Augen-Reduktion"
 
-#: src/pentaxmn.cpp:175
+#: src/pentaxmn.cpp:193
 msgid "On, Trailing-curtain Sync"
 msgstr ""
 
-#: src/pentaxmn.cpp:184
+#: src/pentaxmn.cpp:203
 msgid "Pan Focus"
 msgstr "Schwenk-Fokus"
 
-#: src/pentaxmn.cpp:185
+#: src/pentaxmn.cpp:204
 msgid "AF-S"
 msgstr "Autofokus-S"
 
-#: src/pentaxmn.cpp:186
+#: src/pentaxmn.cpp:205
 msgid "AF-C"
 msgstr "Autofokus-C"
 
-#: src/pentaxmn.cpp:192
+#: src/pentaxmn.cpp:206
+#, fuzzy
+msgid "AF-A"
+msgstr "Autofokus-S"
+
+#: src/pentaxmn.cpp:212
 msgid "Fixed Center"
 msgstr "Fixierte Mitte"
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
+#: src/pentaxmn.cpp:213
+#, fuzzy
+msgid "Automatic Tracking AF"
+msgstr "Automatischer Autofokus"
+
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
+msgstr ""
+
+#: src/pentaxmn.cpp:231
+#, fuzzy
+msgid "Fixed Center or multiple"
+msgstr "Fixierte Mitte"
+
+#: src/pentaxmn.cpp:233
+#, fuzzy
+msgid "Top-center"
+msgstr "Zentriert"
+
+#: src/pentaxmn.cpp:239
+#, fuzzy
+msgid "Bottom-center"
+msgstr "Unten - links"
+
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
 msgid "50"
 msgstr "50"
 
-#: src/pentaxmn.cpp:209
+#: src/pentaxmn.cpp:246
 msgid "64"
 msgstr "64"
 
-#: src/pentaxmn.cpp:210
+#: src/pentaxmn.cpp:247
 msgid "80"
 msgstr "80"
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
 msgid "100"
 msgstr "100"
 
-#: src/pentaxmn.cpp:212
+#: src/pentaxmn.cpp:249
 msgid "125"
 msgstr "125"
 
-#: src/pentaxmn.cpp:213
+#: src/pentaxmn.cpp:250
 msgid "160"
 msgstr "160"
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
 msgid "200"
 msgstr "200"
 
-#: src/pentaxmn.cpp:215
+#: src/pentaxmn.cpp:252
 msgid "250"
 msgstr "250"
 
-#: src/pentaxmn.cpp:216
+#: src/pentaxmn.cpp:253
 msgid "320"
 msgstr "320"
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
 msgid "400"
 msgstr "400"
 
-#: src/pentaxmn.cpp:218
+#: src/pentaxmn.cpp:255
 msgid "500"
 msgstr "500"
 
-#: src/pentaxmn.cpp:219
+#: src/pentaxmn.cpp:256
 msgid "640"
 msgstr "640"
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
 msgid "800"
 msgstr "800"
 
-#: src/pentaxmn.cpp:221
+#: src/pentaxmn.cpp:258
 msgid "1000"
 msgstr "1000"
 
-#: src/pentaxmn.cpp:222
+#: src/pentaxmn.cpp:259
 msgid "1250"
 msgstr "1250"
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
 msgid "1600"
 msgstr "1600"
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
+#: src/pentaxmn.cpp:261
+#, fuzzy
+msgid "2000"
+msgstr "200"
+
+#: src/pentaxmn.cpp:262
+#, fuzzy
+msgid "2500"
+msgstr "200"
+
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
 msgid "3200"
 msgstr "3200"
 
-#: src/pentaxmn.cpp:249
+#: src/pentaxmn.cpp:264
+#, fuzzy
+msgid "4000"
+msgstr "400"
+
+#: src/pentaxmn.cpp:265
+#, fuzzy
+msgid "5000"
+msgstr "500"
+
+#: src/pentaxmn.cpp:266
+#, fuzzy
+msgid "6400"
+msgstr "400"
+
+#: src/pentaxmn.cpp:276
+#, fuzzy
+msgid "70"
+msgstr "50"
+
+#: src/pentaxmn.cpp:278
+#, fuzzy
+msgid "140"
+msgstr "10s"
+
+#: src/pentaxmn.cpp:280
+#, fuzzy
+msgid "280"
+msgstr "80"
+
+#: src/pentaxmn.cpp:282
+#, fuzzy
+msgid "560"
+msgstr "50"
+
+#: src/pentaxmn.cpp:284
+#, fuzzy
+msgid "1100"
+msgstr "100"
+
+#: src/pentaxmn.cpp:286
+#, fuzzy
+msgid "2200"
+msgstr "200"
+
+#: src/pentaxmn.cpp:304
 msgid "Multi Segment"
 msgstr "Mehr-Segment"
 
-#: src/pentaxmn.cpp:250
+#: src/pentaxmn.cpp:305
 msgid "Center Weighted"
 msgstr "Zentriert gewichtet"
 
-#: src/pentaxmn.cpp:262
+#: src/pentaxmn.cpp:317
 msgid "DaylightFluorescent"
 msgstr "Tageslicht fluoreszent"
 
-#: src/pentaxmn.cpp:263
+#: src/pentaxmn.cpp:318
 msgid "DaywhiteFluorescent"
 msgstr "Tagesweiß fluoreszent"
 
-#: src/pentaxmn.cpp:264
+#: src/pentaxmn.cpp:319
 msgid "WhiteFluorescent"
 msgstr "Weiß fluoreszent"
 
-#: src/pentaxmn.cpp:268
+#: src/pentaxmn.cpp:324
 msgid "User Selected"
 msgstr "Vom Benutzer ausgewählt"
 
-#: src/pentaxmn.cpp:273
+#: src/pentaxmn.cpp:329
 msgid "Auto (Daylight)"
 msgstr "Automatisch (Tageslicht)"
 
-#: src/pentaxmn.cpp:274
+#: src/pentaxmn.cpp:330
 msgid "Auto (Shade)"
 msgstr "Automatisch (Schatten)"
 
-#: src/pentaxmn.cpp:275
+#: src/pentaxmn.cpp:331
 msgid "Auto (Flash)"
 msgstr "Automatisch (Blitz)"
 
-#: src/pentaxmn.cpp:276
+#: src/pentaxmn.cpp:332
 msgid "Auto (Tungsten)"
 msgstr "Automatisch (Wolframlicht)"
 
-#: src/pentaxmn.cpp:277
+#: src/pentaxmn.cpp:333
 msgid "Auto (DaywhiteFluorescent)"
 msgstr "Automatisch (Tageslicht fluoreszent)"
 
-#: src/pentaxmn.cpp:278
+#: src/pentaxmn.cpp:334
 msgid "Auto (WhiteFluorescent)"
 msgstr "Automatisch (Leuchstoffröhre)"
 
-#: src/pentaxmn.cpp:279
+#: src/pentaxmn.cpp:335
 msgid "Auto (Cloudy)"
 msgstr "Automatisch (Wolkiges Wetter)"
 
-#: src/pentaxmn.cpp:281
+#: src/pentaxmn.cpp:337
 msgid "Preset (Fireworks?)"
 msgstr "Voreingestellt (Feuerwerk?)"
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
 msgid "Med Low"
 msgstr "Mitte bis niedrig"
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
 msgid "Med High"
 msgstr "Mitte bis hoch"
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-msgid "Very Low"
-msgstr "Sehr niedrig"
-
-#: src/pentaxmn.cpp:311
+#: src/pentaxmn.cpp:369
 msgid "Med Soft"
 msgstr "Mitte bis weich"
 
-#: src/pentaxmn.cpp:312
+#: src/pentaxmn.cpp:370
 msgid "Med Hard"
 msgstr "Mitte bis hart"
 
-#: src/pentaxmn.cpp:313
+#: src/pentaxmn.cpp:371
 msgid "Very Soft"
 msgstr "Sehr weich"
 
-#: src/pentaxmn.cpp:314
+#: src/pentaxmn.cpp:372
 msgid "Very Hard"
 msgstr "Sehr hart"
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
 msgid "Home town"
 msgstr "Heimatstadt"
 
-#: src/pentaxmn.cpp:325
+#: src/pentaxmn.cpp:383
 msgid "Pago Pago"
 msgstr "Pago Pago"
 
-#: src/pentaxmn.cpp:326
+#: src/pentaxmn.cpp:384
 msgid "Honolulu"
 msgstr "Honolulu"
 
-#: src/pentaxmn.cpp:327
+#: src/pentaxmn.cpp:385
 msgid "Anchorage"
 msgstr "Anchorage"
 
-#: src/pentaxmn.cpp:328
+#: src/pentaxmn.cpp:386
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: src/pentaxmn.cpp:329
+#: src/pentaxmn.cpp:387
 msgid "San Fransisco"
 msgstr "San Fransisco"
 
-#: src/pentaxmn.cpp:330
+#: src/pentaxmn.cpp:388
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: src/pentaxmn.cpp:331
+#: src/pentaxmn.cpp:389
 msgid "Calgary"
 msgstr "Calgary"
 
-#: src/pentaxmn.cpp:332
+#: src/pentaxmn.cpp:390
 msgid "Denver"
 msgstr "Denver"
 
-#: src/pentaxmn.cpp:333
+#: src/pentaxmn.cpp:391
 msgid "Mexico City"
 msgstr "Mexico Stadt"
 
-#: src/pentaxmn.cpp:334
+#: src/pentaxmn.cpp:392
 msgid "Chicago"
 msgstr "Chicago"
 
-#: src/pentaxmn.cpp:335
+#: src/pentaxmn.cpp:393
 msgid "Miami"
 msgstr "Miami"
 
-#: src/pentaxmn.cpp:336
+#: src/pentaxmn.cpp:394
 msgid "Toronto"
 msgstr "Toronto"
 
-#: src/pentaxmn.cpp:337
+#: src/pentaxmn.cpp:395
 msgid "New York"
 msgstr "New York"
 
-#: src/pentaxmn.cpp:338
+#: src/pentaxmn.cpp:396
 msgid "Santiago"
 msgstr "Santiago"
 
-#: src/pentaxmn.cpp:339
+#: src/pentaxmn.cpp:397
 msgid "Caracus"
 msgstr "Caracas"
 
-#: src/pentaxmn.cpp:340
+#: src/pentaxmn.cpp:398
 msgid "Halifax"
 msgstr "Halifax"
 
-#: src/pentaxmn.cpp:341
+#: src/pentaxmn.cpp:399
 msgid "Buenos Aires"
 msgstr "Buenos Aires"
 
-#: src/pentaxmn.cpp:342
+#: src/pentaxmn.cpp:400
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: src/pentaxmn.cpp:343
+#: src/pentaxmn.cpp:401
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
-#: src/pentaxmn.cpp:344
+#: src/pentaxmn.cpp:402
 msgid "Madrid"
 msgstr "Madrid"
 
-#: src/pentaxmn.cpp:345
+#: src/pentaxmn.cpp:403
 msgid "London"
 msgstr "London"
 
-#: src/pentaxmn.cpp:346
+#: src/pentaxmn.cpp:404
 msgid "Paris"
 msgstr "Paris"
 
-#: src/pentaxmn.cpp:347
+#: src/pentaxmn.cpp:405
 msgid "Milan"
 msgstr "Mailand"
 
-#: src/pentaxmn.cpp:348
+#: src/pentaxmn.cpp:406
 msgid "Rome"
 msgstr "Rom"
 
-#: src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:407
 msgid "Berlin"
 msgstr "Berlin"
 
-#: src/pentaxmn.cpp:350
+#: src/pentaxmn.cpp:408
 msgid "Johannesburg"
 msgstr "Johannesburg"
 
-#: src/pentaxmn.cpp:351
+#: src/pentaxmn.cpp:409
 msgid "Istanbul"
 msgstr "Istanbul"
 
-#: src/pentaxmn.cpp:352
+#: src/pentaxmn.cpp:410
 msgid "Cairo"
 msgstr "Kairo"
 
-#: src/pentaxmn.cpp:353
+#: src/pentaxmn.cpp:411
 msgid "Jerusalem"
 msgstr "Jerusalem"
 
-#: src/pentaxmn.cpp:354
+#: src/pentaxmn.cpp:412
 msgid "Moscow"
 msgstr "Moskau"
 
-#: src/pentaxmn.cpp:355
+#: src/pentaxmn.cpp:413
 msgid "Jeddah"
 msgstr "Dschidda"
 
-#: src/pentaxmn.cpp:356
+#: src/pentaxmn.cpp:414
 msgid "Tehran"
 msgstr "Tehran"
 
-#: src/pentaxmn.cpp:357
+#: src/pentaxmn.cpp:415
 msgid "Dubai"
 msgstr "Dubai"
 
-#: src/pentaxmn.cpp:358
+#: src/pentaxmn.cpp:416
 msgid "Karachi"
 msgstr "Karatschi"
 
-#: src/pentaxmn.cpp:359
+#: src/pentaxmn.cpp:417
 msgid "Kabul"
 msgstr "Kabul"
 
-#: src/pentaxmn.cpp:360
+#: src/pentaxmn.cpp:418
 msgid "Male"
 msgstr "Male"
 
-#: src/pentaxmn.cpp:361
+#: src/pentaxmn.cpp:419
 msgid "Delhi"
 msgstr "Delhi"
 
-#: src/pentaxmn.cpp:362
+#: src/pentaxmn.cpp:420
 msgid "Colombo"
 msgstr "Colombo"
 
-#: src/pentaxmn.cpp:363
+#: src/pentaxmn.cpp:421
 msgid "Kathmandu"
 msgstr "Kathmandu"
 
-#: src/pentaxmn.cpp:364
+#: src/pentaxmn.cpp:422
 msgid "Dacca"
 msgstr "Dacca"
 
-#: src/pentaxmn.cpp:365
+#: src/pentaxmn.cpp:423
 msgid "Yangon"
 msgstr "Yangon"
 
-#: src/pentaxmn.cpp:366
+#: src/pentaxmn.cpp:424
 msgid "Bangkok"
 msgstr "Bangkok"
 
-#: src/pentaxmn.cpp:367
+#: src/pentaxmn.cpp:425
 msgid "Kuala Lumpur"
 msgstr "Kuala Lumpur"
 
-#: src/pentaxmn.cpp:368
+#: src/pentaxmn.cpp:426
 msgid "Vientiane"
 msgstr "Vientiane"
 
-#: src/pentaxmn.cpp:369
+#: src/pentaxmn.cpp:427
 msgid "Singapore"
 msgstr "Singapur"
 
-#: src/pentaxmn.cpp:370
+#: src/pentaxmn.cpp:428
 msgid "Phnom Penh"
 msgstr "Phnom Penh"
 
-#: src/pentaxmn.cpp:371
+#: src/pentaxmn.cpp:429
 msgid "Ho Chi Minh"
 msgstr "Ho Chi Minh"
 
-#: src/pentaxmn.cpp:372
+#: src/pentaxmn.cpp:430
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: src/pentaxmn.cpp:373
+#: src/pentaxmn.cpp:431
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: src/pentaxmn.cpp:374
+#: src/pentaxmn.cpp:432
 msgid "Perth"
 msgstr "Perth"
 
-#: src/pentaxmn.cpp:375
+#: src/pentaxmn.cpp:433
 msgid "Beijing"
 msgstr "Peking"
 
-#: src/pentaxmn.cpp:376
+#: src/pentaxmn.cpp:434
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: src/pentaxmn.cpp:377
+#: src/pentaxmn.cpp:435
 msgid "Manila"
 msgstr "Manila"
 
-#: src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:436
 msgid "Taipei"
 msgstr "Taipei"
 
-#: src/pentaxmn.cpp:379
+#: src/pentaxmn.cpp:437
 msgid "Seoul"
 msgstr "Seoul"
 
-#: src/pentaxmn.cpp:380
+#: src/pentaxmn.cpp:438
 msgid "Adelaide"
 msgstr "Adelaide"
 
-#: src/pentaxmn.cpp:381
+#: src/pentaxmn.cpp:439
 msgid "Tokyo"
 msgstr "Tokio"
 
-#: src/pentaxmn.cpp:382
+#: src/pentaxmn.cpp:440
 msgid "Guam"
 msgstr "Guam"
 
-#: src/pentaxmn.cpp:383
+#: src/pentaxmn.cpp:441
 msgid "Sydney"
 msgstr "Sydney"
 
-#: src/pentaxmn.cpp:384
+#: src/pentaxmn.cpp:442
 msgid "Noumea"
 msgstr "Numea"
 
-#: src/pentaxmn.cpp:385
+#: src/pentaxmn.cpp:443
 msgid "Wellington"
 msgstr "Wellington"
 
-#: src/pentaxmn.cpp:386
+#: src/pentaxmn.cpp:444
 msgid "Auckland"
 msgstr "Auckland"
 
-#: src/pentaxmn.cpp:387
+#: src/pentaxmn.cpp:445
 msgid "Lima"
 msgstr "Lima"
 
-#: src/pentaxmn.cpp:388
+#: src/pentaxmn.cpp:446
 msgid "Dakar"
 msgstr "Dakar"
 
-#: src/pentaxmn.cpp:389
+#: src/pentaxmn.cpp:447
 msgid "Algiers"
 msgstr "Algier"
 
-#: src/pentaxmn.cpp:390
+#: src/pentaxmn.cpp:448
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: src/pentaxmn.cpp:391
+#: src/pentaxmn.cpp:449
 msgid "Athens"
 msgstr "Athen"
 
-#: src/pentaxmn.cpp:392
+#: src/pentaxmn.cpp:450
 msgid "Nairobi"
 msgstr "Nairobi"
 
-#: src/pentaxmn.cpp:393
+#: src/pentaxmn.cpp:451
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
-#: src/pentaxmn.cpp:394
+#: src/pentaxmn.cpp:452
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: src/pentaxmn.cpp:395
+#: src/pentaxmn.cpp:453
 msgid "Lisbon"
 msgstr "Lisabon"
 
-#: src/pentaxmn.cpp:400
+#: src/pentaxmn.cpp:454
+#, fuzzy
+msgid "Copenhagen"
+msgstr "Abdeckung"
+
+#: src/pentaxmn.cpp:459
 msgid "Unprocessed"
 msgstr "Unverarbeitet"
 
-#: src/pentaxmn.cpp:401
+#: src/pentaxmn.cpp:460
 msgid "Digital Filter"
 msgstr "Digitaler Filter"
 
-#: src/pentaxmn.cpp:402
+#: src/pentaxmn.cpp:461
 msgid "Cropped"
 msgstr "Zugeschnitten"
 
-#: src/pentaxmn.cpp:404
+#: src/pentaxmn.cpp:463
 msgid "Frame Synthesis?"
 msgstr ""
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
 msgid "MTF Program"
 msgstr "MTF Programm"
 
-#: src/pentaxmn.cpp:416
+#: src/pentaxmn.cpp:475
 msgid "Night Scene Portrait"
 msgstr "Nachtportrait"
 
-#: src/pentaxmn.cpp:417
+#: src/pentaxmn.cpp:476
 msgid "No Flash"
 msgstr "Kein Blitz"
 
-#: src/pentaxmn.cpp:420
+#: src/pentaxmn.cpp:479
 msgid "Surf & Snow"
 msgstr "Surfen & Schnee"
 
-#: src/pentaxmn.cpp:423
+#: src/pentaxmn.cpp:482
 msgid "Kids"
 msgstr "Kinder"
 
-#: src/pentaxmn.cpp:428
+#: src/pentaxmn.cpp:487
+#, fuzzy
+msgid "Stage Lighting"
+msgstr "Bildhöhe"
+
+#: src/pentaxmn.cpp:488
+#, fuzzy
+msgid "Night Snap"
+msgstr "Nachtaufnahme"
+
+#: src/pentaxmn.cpp:490
 msgid "Auto PICT (Standard)"
 msgstr "Auto PICT (Standard)"
 
-#: src/pentaxmn.cpp:429
+#: src/pentaxmn.cpp:491
 msgid "Auto PICT (Portrait)"
 msgstr "Auto PICT (Portrait)"
 
-#: src/pentaxmn.cpp:430
+#: src/pentaxmn.cpp:492
 msgid "Auto PICT (Landscape)"
 msgstr "Auto PICT (Landschaft)"
 
-#: src/pentaxmn.cpp:431
+#: src/pentaxmn.cpp:493
 msgid "Auto PICT (Macro)"
 msgstr "Auto PICT (Makro)"
 
-#: src/pentaxmn.cpp:432
+#: src/pentaxmn.cpp:494
 msgid "Auto PICT (Sport)"
 msgstr "Auto PICT (Sport)"
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
 msgid "Green Mode"
 msgstr "Grüner Modus"
 
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
 msgid "Shutter Speed Priority"
 msgstr "Verschlussgeschwindigkeit-Priorität"
 
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
 msgid "Aperture Priority"
 msgstr "Blendenpriorität"
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
 msgid "Bulb"
 msgstr "Glühbirne"
 
-#: src/pentaxmn.cpp:442
+#: src/pentaxmn.cpp:504
 msgid "Hi-speed Program"
 msgstr "Hi-Speed Programm"
 
-#: src/pentaxmn.cpp:443
+#: src/pentaxmn.cpp:505
 msgid "DOF Program"
 msgstr "DOF Programm"
 
-#: src/pentaxmn.cpp:448
+#: src/pentaxmn.cpp:510
+#, fuzzy
 msgid "Program Tv Shift"
-msgstr ""
+msgstr "Programmwechsel"
 
-#: src/pentaxmn.cpp:449
+#: src/pentaxmn.cpp:511
+#, fuzzy
 msgid "Program Av Shift"
-msgstr ""
+msgstr "Programmwechsel"
 
-#: src/pentaxmn.cpp:452
+#: src/pentaxmn.cpp:514
+#, fuzzy
 msgid "Aperture Priority (Off-Auto-Aperture)"
-msgstr ""
+msgstr "Blendenpriorität (Av)"
 
-#: src/pentaxmn.cpp:453
+#: src/pentaxmn.cpp:515
 msgid "Manual (Off-Auto-Aperture)"
 msgstr ""
 
-#: src/pentaxmn.cpp:454
+#: src/pentaxmn.cpp:516
 msgid "Bulb (Off-Auto-Aperture)"
 msgstr ""
 
-#: src/pentaxmn.cpp:456
+#: src/pentaxmn.cpp:518
 msgid "Shutter Priority"
 msgstr "Verschlußpriorität"
 
-#: src/pentaxmn.cpp:457
+#: src/pentaxmn.cpp:519
+#, fuzzy
 msgid "Shutter & Aperture Priority AE"
-msgstr ""
+msgstr "Verschlussgeschwindigkeit-Priorität"
 
-#: src/pentaxmn.cpp:458
+#: src/pentaxmn.cpp:520
+#, fuzzy
 msgid "Shutter & Aperture Priority AE (1)"
-msgstr ""
+msgstr "Verschlussgeschwindigkeit-Priorität"
 
-#: src/pentaxmn.cpp:459
+#: src/pentaxmn.cpp:521
+#, fuzzy
 msgid "Sensitivity Priority AE"
-msgstr ""
+msgstr "Empfindlichkeit justieren"
 
-#: src/pentaxmn.cpp:460
+#: src/pentaxmn.cpp:522
 msgid "Sensitivity Priority AE (1)"
 msgstr ""
 
-#: src/pentaxmn.cpp:461
+#: src/pentaxmn.cpp:523
 msgid "Flash X-Sync Speed AE"
 msgstr ""
 
-#: src/pentaxmn.cpp:462
+#: src/pentaxmn.cpp:524
 msgid "Flash X-Sync Speed AE (1)"
 msgstr ""
 
-#: src/pentaxmn.cpp:471
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:535
 msgid "Continuous (Hi)"
 msgstr "Kontinuierlich (Hi)"
 
-#: src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
 msgid "Burst"
 msgstr "Bersten"
 
-#: src/pentaxmn.cpp:473
+#: src/pentaxmn.cpp:538
 msgid "Self-timer (12 sec)"
 msgstr "Selbstauslöser (12 Sek.)"
 
-#: src/pentaxmn.cpp:474
+#: src/pentaxmn.cpp:539
 msgid "Self-timer (2 sec)"
 msgstr "Selbstauslöser (2 Sek.)"
 
-#: src/pentaxmn.cpp:475
+#: src/pentaxmn.cpp:540
 msgid "Remote Control (3 sec)"
 msgstr "Fernbedienung (3 Sec)"
 
-#: src/pentaxmn.cpp:476
+#: src/pentaxmn.cpp:541
 msgid "Remote Control"
 msgstr "Fernbedienung"
 
-#: src/pentaxmn.cpp:477
-msgid "Multiple Exposure"
-msgstr "Mehrfache Belichtung"
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
+#, fuzzy
+msgid "Video"
+msgstr "Weit"
 
-#: src/pentaxmn.cpp:488
+#: src/pentaxmn.cpp:554
 msgid "M-42 or No Lens"
 msgstr "M-42 oder keine Linsen"
 
-#: src/pentaxmn.cpp:489
+#: src/pentaxmn.cpp:555
 msgid "K,M Lens"
 msgstr "K,M Linsen"
 
-#: src/pentaxmn.cpp:490
+#: src/pentaxmn.cpp:556
 msgid "A Series Lens"
 msgstr "A-Serien Linsen"
 
-#: src/pentaxmn.cpp:625
+#: src/pentaxmn.cpp:703
 msgid "Bright"
 msgstr "Helligkeit"
 
-#: src/pentaxmn.cpp:628
+#: src/pentaxmn.cpp:706
 msgid "Vibrant"
 msgstr "Dynamisch"
 
-#: src/pentaxmn.cpp:641
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
+msgstr ""
+
+#: src/pentaxmn.cpp:720
 msgid "Weakest"
 msgstr "Schwächste"
 
-#: src/pentaxmn.cpp:642
+#: src/pentaxmn.cpp:721
 msgid "Weak"
 msgstr "Schwach"
 
-#: src/pentaxmn.cpp:643
+#: src/pentaxmn.cpp:722
 msgid "Strong"
 msgstr "Stark"
 
-#: src/pentaxmn.cpp:752
+#: src/pentaxmn.cpp:832
 msgid "No extended bracketing"
 msgstr "Keine erweiterte Erfassung"
 
-#: src/pentaxmn.cpp:758
+#: src/pentaxmn.cpp:838
 msgid "WB-BA"
 msgstr "WB-BA"
 
-#: src/pentaxmn.cpp:761
+#: src/pentaxmn.cpp:841
 msgid "WB-GM"
 msgstr "WB-GM"
 
-#: src/pentaxmn.cpp:773
+#: src/pentaxmn.cpp:853
 msgid "Unknown "
 msgstr "Unbekannt"
 
-#: src/pentaxmn.cpp:786
+#: src/pentaxmn.cpp:866
 msgid "Pentax Makernote version"
 msgstr "Version der Pentax-Herstellerbemerkung"
 
-#: src/pentaxmn.cpp:789
+#: src/pentaxmn.cpp:869
 msgid "Camera shooting mode"
 msgstr "Kamera-Aufnahmemodus"
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
 msgid "Resolution of a preview image"
 msgstr "Auflösung des Vorschaubildes"
 
-#: src/pentaxmn.cpp:794
+#: src/pentaxmn.cpp:874
 msgid "Length of a preview image"
 msgstr "Länge des Vorschaubildes"
 
-#: src/pentaxmn.cpp:795
+#: src/pentaxmn.cpp:875
+#, fuzzy
 msgid "Size of an IFD containing a preview image"
-msgstr ""
+msgstr "Größe des Vorschaubildes"
 
-#: src/pentaxmn.cpp:800
+#: src/pentaxmn.cpp:880
 msgid "Model identification"
 msgstr "Modellidentifikation"
 
-#: src/pentaxmn.cpp:801
+#: src/pentaxmn.cpp:881
 msgid "Pentax model idenfication"
 msgstr "Pentax-Modellidentifikation"
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
 msgid "Date"
 msgstr "Datum"
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
 msgid "Time"
 msgstr "Zeit"
 
-#: src/pentaxmn.cpp:810
+#: src/pentaxmn.cpp:890
 msgid "Image quality settings"
 msgstr "Bildqualitätseinstellungen"
 
-#: src/pentaxmn.cpp:813
+#: src/pentaxmn.cpp:893
 msgid "Image size settings"
 msgstr "Bildgröße-Einstellungen"
 
-#: src/pentaxmn.cpp:817
+#: src/pentaxmn.cpp:897
 msgid "Flash mode settings"
 msgstr "Blitzmodus-Einstellungen"
 
-#: src/pentaxmn.cpp:820
+#: src/pentaxmn.cpp:900
 msgid "Focus mode settings"
 msgstr "Fokusmodus-Einstellungen"
 
-#: src/pentaxmn.cpp:823
+#: src/pentaxmn.cpp:903
 msgid "Selected AF point"
 msgstr "Ausgewählter Autofokus-Punkt"
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+#, fuzzy
+msgid "AF point in focus"
+msgstr "Benutzte Autofokus-Punkte"
+
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
 msgid "F-Number"
 msgstr "F-Nummer"
 
-#: src/pentaxmn.cpp:832
+#: src/pentaxmn.cpp:915
 msgid "ISO sensitivity"
 msgstr "ISO-Empfindlichkeit"
 
-#: src/pentaxmn.cpp:833
+#: src/pentaxmn.cpp:916
 msgid "ISO sensitivity settings"
 msgstr "ISO-Empfindlichkeitseinstellungen"
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
 msgid "MeteringMode"
 msgstr "Messmodus"
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
 msgid "AutoBracketing"
 msgstr "Automatischer Erfassung"
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
 msgid "White ballance"
 msgstr "Weißabgleich"
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
 msgid "White ballance mode"
 msgstr "Weißabgleichsmodus"
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
+#: src/pentaxmn.cpp:936
+#, fuzzy
+msgid "Blue color balance"
+msgstr "Blauabgleich"
+
+#: src/pentaxmn.cpp:939
+#, fuzzy
+msgid "Red color balance"
+msgstr "Roter Farbabgleich"
+
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
 msgid "FocalLength"
 msgstr "Brennweite"
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
 msgid "Location"
 msgstr "Ort"
 
-#: src/pentaxmn.cpp:869
+#: src/pentaxmn.cpp:959
 msgid "Hometown"
 msgstr "Heimatstadt"
 
-#: src/pentaxmn.cpp:875
+#: src/pentaxmn.cpp:965
 msgid "Hometown DST"
 msgstr "Heimatstadt (Sommerzeit)"
 
-#: src/pentaxmn.cpp:876
+#: src/pentaxmn.cpp:966
 msgid "Whether day saving time is active in home town"
 msgstr "Sommerzeit aktiv in der Heimatstadt"
 
-#: src/pentaxmn.cpp:878
+#: src/pentaxmn.cpp:968
 msgid "Destination DST"
 msgstr "Zielort (Sommerzeit)"
 
-#: src/pentaxmn.cpp:879
+#: src/pentaxmn.cpp:969
 msgid "Whether day saving time is active in destination"
 msgstr "Ist die Sommerzeit aktiv im Zielort"
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
 msgid "DSPFirmwareVersion"
 msgstr "DSP-Firmware Version"
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
 msgid "CPUFirmwareVersion"
 msgstr "CPU-Firmware Version"
 
-#: src/pentaxmn.cpp:891
+#: src/pentaxmn.cpp:981
 msgid "Light value"
 msgstr "Helligkeitswert"
 
-#: src/pentaxmn.cpp:892
+#: src/pentaxmn.cpp:982
 msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 "Der von der Kamera berechnete Helligkeitswert inklusive "
 "Belichtungskompensation"
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+#, fuzzy
+msgid "Image area offset"
+msgstr "Bilddatengröße"
+
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+#, fuzzy
+msgid "Raw image size"
+msgstr "Bildgrõße"
+
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
 msgid "Preview image borders"
 msgstr "Vorschau der Bildränder"
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
 msgid "Sensitivity adjust"
 msgstr "Empfindlichkeit justieren"
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
 msgid "Digital filter"
 msgstr "Digitaler Filter"
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-msgid "Temperature"
-msgstr "Temperatur"
-
-#: src/pentaxmn.cpp:923
+#: src/pentaxmn.cpp:1019
 msgid "Camera temperature"
 msgstr "Kameratemperatur"
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
 msgid "Image tone"
 msgstr "Bildton"
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
 msgid "Colort temperature"
 msgstr "Farbtemperatur"
 
-#: src/pentaxmn.cpp:943
+#: src/pentaxmn.cpp:1039
 msgid "Shake reduction"
 msgstr "Schüttelreduktion"
 
-#: src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:1040
 msgid "Shake reduction information"
 msgstr "Information zu der Schüttelreduktion"
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
 msgid "Dynamic range expansion"
 msgstr "Dynamische Bereichserweiterung"
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
 msgid "High ISO noise reduction"
 msgstr "Hohe ISO-Rauschreduktion"
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+#, fuzzy
+msgid "AF Adjustment"
+msgstr "Sättigungsanpassung"
+
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
 msgid "Black point"
 msgstr "Schwarzpunkt"
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
 msgid "White point"
 msgstr "Weißpunkt"
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
 msgid "ShotInfo"
 msgstr "Aufnahmeinfo"
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
+#, fuzzy
 msgid "AEInfo"
-msgstr ""
+msgstr "Autofokus-Information"
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
 msgid "LensInfo"
 msgstr "Linseninformation"
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
 msgid "FlashInfo"
 msgstr "Blitzinformation"
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
 msgid "AEMeteringSegments"
 msgstr "AEMeteringSegments"
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
 msgid "FlashADump"
 msgstr "FlashADump"
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
 msgid "FlashBDump"
 msgstr "FlashBDump"
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
 msgid "WB_RGGBLevelsDaylight"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
 msgid "WB_RGGBLevelsShade"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
 msgid "WB_RGGBLevelsCloudy"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
 msgid "WB_RGGBLevelsTungsten"
 msgstr "WB_RGGBLevelsTungsten"
 
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
 msgid "WB_RGGBLevelsFluorescentD"
 msgstr "WB_RGGBLevelsFluorescentD"
 
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
 msgid "WB_RGGBLevelsFluorescentN"
 msgstr "WB_RGGBLevelsFluorescentN"
 
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
 msgid "WB_RGGBLevelsFluorescentW"
 msgstr "WB_RGGBLevelsFluorescentW"
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
 msgid "WB_RGGBLevelsFlash"
 msgstr "WB_RGGBLevelsFlash"
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
 msgid "CameraInfo"
 msgstr "Kamerainformation"
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
 msgid "BatteryInfo"
 msgstr "Batterieinformation"
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
 msgid "AFInfo"
 msgstr "Autofokus-Information"
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
 msgid "ColorInfo"
 msgstr "Farbinfo"
 
-#: src/pentaxmn.cpp:1023
+#: src/pentaxmn.cpp:1125
 msgid "Unknown PentaxMakerNote tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Pentax"
 
-#: src/properties.cpp:92
+#: src/properties.cpp:97
 msgid "Dublin Core schema"
 msgstr "Dublin-Hauptschema"
 
-#: src/properties.cpp:93
+#: src/properties.cpp:98
 msgid "digiKam Photo Management schema"
 msgstr "digiKam-Fotoverwaltungsschema"
 
-#: src/properties.cpp:94
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
+msgstr ""
+
+#: src/properties.cpp:100
 msgid "XMP Basic schema"
 msgstr "XMP-Basisschema"
 
-#: src/properties.cpp:95
+#: src/properties.cpp:101
 msgid "XMP Rights Management schema"
 msgstr "XMP-Rechteverwaltungsschema"
 
-#: src/properties.cpp:96
+#: src/properties.cpp:102
 msgid "XMP Media Management schema"
 msgstr "XMP-Mediverwaltungsschema"
 
-#: src/properties.cpp:97
+#: src/properties.cpp:103
 msgid "XMP Basic Job Ticket schema"
 msgstr "XMP-Basis-Job-Ticket-Schema"
 
-#: src/properties.cpp:98
+#: src/properties.cpp:104
 msgid "XMP Paged-Text schema"
 msgstr "XMP eingelagertes Textschema"
 
-#: src/properties.cpp:99
+#: src/properties.cpp:105
 msgid "XMP Dynamic Media schema"
 msgstr "XMP-Dynamisches Medienschema"
 
-#: src/properties.cpp:100
+#: src/properties.cpp:106
 msgid "Microsoft Photo schema"
 msgstr "Microsoft-Fotoschema"
 
-#: src/properties.cpp:101
+#: src/properties.cpp:107
 msgid "Adobe PDF schema"
 msgstr "Adobe PDF-Schema"
 
-#: src/properties.cpp:102
+#: src/properties.cpp:108
 msgid "Adobe photoshop schema"
 msgstr "Adobe Photoshop-Schema"
 
-#: src/properties.cpp:103
+#: src/properties.cpp:109
 msgid "Camera Raw schema"
 msgstr "Kamera-Rohschema"
 
-#: src/properties.cpp:104
+#: src/properties.cpp:110
 msgid "Exif Schema for TIFF Properties"
 msgstr "Exif-Schema für TIFF-Eigenschaften"
 
-#: src/properties.cpp:105
+#: src/properties.cpp:111
 msgid "Exif schema for Exif-specific Properties"
 msgstr "Exif-Schema für Exif-spezifische Eigenschaften"
 
-#: src/properties.cpp:106
+#: src/properties.cpp:112
 msgid "Exif schema for Additional Exif Properties"
 msgstr "Exif-Schema für zusätzliche Exif-Eigenschaften"
 
-#: src/properties.cpp:107
+#: src/properties.cpp:113
 msgid "IPTC Core schema"
 msgstr "IPTC-Hauptschema"
 
-#: src/properties.cpp:109
+#: src/properties.cpp:115
 #, fuzzy
 msgid "IPTC Extension schema"
 msgstr "IPTC-Hauptschema"
 
-#: src/properties.cpp:111
+#: src/properties.cpp:117
 msgid "PLUS License Data Format schema"
 msgstr ""
 
-#: src/properties.cpp:114
+#: src/properties.cpp:118
+#, fuzzy
+msgid "iView Media Pro schema"
+msgstr "XMP-Dynamisches Medienschema"
+
+#: src/properties.cpp:119
+#, fuzzy
+msgid "Expression Media schema"
+msgstr "IPTC-Hauptschema"
+
+#: src/properties.cpp:122
 msgid "Colorant structure"
 msgstr "Farbmittelstruktur"
 
-#: src/properties.cpp:115
+#: src/properties.cpp:123
 msgid "Dimensions structure"
 msgstr "Dimensionsstruktur"
 
-#: src/properties.cpp:116
+#: src/properties.cpp:124
 msgid "Font structure"
 msgstr "Schriftartstruktur"
 
-#: src/properties.cpp:117
+#: src/properties.cpp:125
 msgid "Thumbnail structure"
 msgstr "Vorschaustruktur"
 
-#: src/properties.cpp:118
+#: src/properties.cpp:126
 msgid "Resource Event structure"
 msgstr "Eventstruktur der Ressource"
 
-#: src/properties.cpp:119
+#: src/properties.cpp:127
 msgid "ResourceRef structure"
 msgstr "RessourceRef-Struktur"
 
-#: src/properties.cpp:120
+#: src/properties.cpp:128
 msgid "Version structure"
 msgstr "Versionsstruktur"
 
-#: src/properties.cpp:121
+#: src/properties.cpp:129
 msgid "Basic Job/Workflow structure"
 msgstr "Basisaufgabe/Arbeitsablaufstruktur"
 
-#: src/properties.cpp:124
+#: src/properties.cpp:132
 msgid "Qualifier for xmp:Identifier"
 msgstr "Kennzeichnung für XMP:Identifikator"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributor"
 msgstr "Mitwirkende"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributors to the resource (other than the authors)."
 msgstr "Andere Mitwirkende als die Autoren bei den Ressourcen."
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid "Coverage"
 msgstr "Abdeckung"
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid ""
 "The spatial or temporal topic of the resource, the spatial applicability of "
 "the resource, or the jurisdiction under which the resource is relevant."
 msgstr ""
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid "Creator"
 msgstr "Ersteller"
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid ""
 "The authors of the resource (listed in order of precedence, if significant)."
 msgstr "Die Autoren der Ressource in der Ordnung Ihres Beitrags."
 
-#: src/properties.cpp:132
+#: src/properties.cpp:140
 msgid "Date(s) that something interesting happened to the resource."
 msgstr "Daten an denen etwas Interessantes an der Ressource geschah."
 
-#: src/properties.cpp:133
+#: src/properties.cpp:141
 msgid ""
 "A textual description of the content of the resource. Multiple values may be "
 "present for different languages."
@@ -11116,11 +14270,11 @@
 "Eine textliche Beschreibung des Inhalts der Ressource. Mehrere Werte können "
 "für unterschiedliche Sprachen vorhanden sein."
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid "Format"
 msgstr "Format"
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid ""
 "The file format used when saving the resource. Tools and applications should "
 "set this property to the save format of the data. It may include appropriate "
@@ -11130,11 +14284,11 @@
 "Programme sollten diese Eignschaft setzen, um das Format der Daten zu "
 "speichern. Es kann auch It zugehörige Kennzeichnungen enthalten."
 
-#: src/properties.cpp:137 src/properties.cpp:180
+#: src/properties.cpp:145 src/properties.cpp:196
 msgid "Identifier"
 msgstr "Identifizierer"
 
-#: src/properties.cpp:137
+#: src/properties.cpp:145
 msgid ""
 "Unique identifier of the resource. Recommended best practice is to identify "
 "the resource by means of a string conforming to a formal identification "
@@ -11144,16 +14298,16 @@
 "die Ressource über eine Zeichnkette zu identifizieren, die einem formellen "
 "Identifikationssystem entspricht."
 
-#: src/properties.cpp:139
+#: src/properties.cpp:147
 msgid "An unordered array specifying the languages used in the resource."
 msgstr ""
 "Eine unsortierte Liste die die in der Ressource benutzten Sprachen aufzählt."
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid ""
 "An entity responsible for making the resource available. Examples of a "
 "Publisher include a person, an organization, or a service. Typically, the "
@@ -11164,11 +14318,11 @@
 "ein Dienst sein. Typischerweise sollte der Name eines Herausgebers benutzt "
 "werden, um die Entität zu kennzeichen"
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid "Relation"
 msgstr "Beziehung"
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid ""
 "Relationships to other documents. Recommended best practice is to identify "
 "the related resource by means of a string conforming to a formal "
@@ -11178,11 +14332,11 @@
 "betreffende Ressource durch eine Zeichenkette zu identifizieren, die einem "
 "formellen Identifizierungssystem entspricht."
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid "Rights"
 msgstr "Rechte"
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid ""
 "Informal rights statement, selected by language. Typically, rights "
 "information includes a statement about various property rights associated "
@@ -11193,13 +14347,13 @@
 "Eigenschaftsrechte, inklusive geistige Eigentumsrechte, die mit der "
 "Ressource assoziert sind."
 
-#: src/properties.cpp:148
+#: src/properties.cpp:156
 msgid "Unique identifier of the work from which this resource was derived."
 msgstr ""
 "Eindeutige Identifikation der Arbeit von der diese Ressource abgeleitet "
 "wurde."
 
-#: src/properties.cpp:149
+#: src/properties.cpp:157
 msgid ""
 "An unordered array of descriptive phrases or keywords that specify the topic "
 "of the content of the resource."
@@ -11207,11 +14361,11 @@
 "Eine ungeordnete Liste von beschreibenden Begriffen oder Sitchwörtern, die "
 "das Thema des Inhalts der Ressource angeben."
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid "Title"
 msgstr "Titel"
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid ""
 "The title of the document, or the name given to the resource. Typically, it "
 "will be a name by which the resource is formally known."
@@ -11219,19 +14373,19 @@
 "Der Titel des Dokuments oder der Name den die Ressource hat. Normalerweise "
 "ist dies der Name unter dem die Ressource allgemein bekannt ist."
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "Type"
 msgstr "Typ"
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "A document type; for example, novel, poem, or working paper."
 msgstr "En Dokumenttyp wie z.B. Roman, Gedicht oder Arbeitspapier."
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid "Tags List"
 msgstr "Felderliste"
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid ""
 "The list of complete tags path as string. The path hierarchy is separated by "
 "'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
@@ -11240,33 +14394,74 @@
 "Zeichenkette werden durch das Zeichen \"/\" getrennt, wie z.B. in \"Stadt/"
 "Paris/Monument/Eiffelturm\"."
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 #, fuzzy
 msgid "Captions Author Names"
 msgstr "Ländername"
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 msgid ""
 "The list of all captions author names for each language alternative captions "
 "set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 #, fuzzy
 msgid "Captions Date Time Stamps"
 msgstr "aktualisiere Zeitstempel"
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 msgid ""
 "The list of all captions date time stamps for each language alternative "
 "captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:168
+#: src/properties.cpp:170 src/tags.cpp:842
+#, fuzzy
+msgid "Image History"
+msgstr "Bildhöhe"
+
+#: src/properties.cpp:170
+msgid ""
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
+msgstr ""
+
+#: src/properties.cpp:171
+#, fuzzy
+msgid "Lens Correction Settings"
+msgstr "Linsendaten-Einstellungen"
+
+#: src/properties.cpp:171
+msgid ""
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
+msgstr ""
+
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
+msgstr ""
+
+#: src/properties.cpp:177
+msgid ""
+"The list of files processed with Enfuse program through ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:178
+#, fuzzy
+msgid "Enfuse Settings"
+msgstr "Besitzt Einstellungen"
+
+#: src/properties.cpp:178
+msgid ""
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:184
 msgid "Advisory"
 msgstr "Hinweise"
 
-#: src/properties.cpp:168
+#: src/properties.cpp:184
 msgid ""
 "An unordered array specifying properties that were edited outside the "
 "authoring application. Each item should contain a single namespace and XPath "
@@ -11277,11 +14472,11 @@
 "Namensraum und XPath enthalten, die über ein ASCII-Leerzeichen (U+0020). "
 "getrennt sind."
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid "Base URL"
 msgstr "Basis-Adresse"
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid ""
 "The base URL for relative URLs in the document content. If this document "
 "contains Internet links, and those links are relative, they are relative to "
@@ -11296,20 +14491,20 @@
 "werden können. Web-Autorenwerkzeuge sollten diesen Wert, basierend auf Ihrer "
 "Absicht wie URL's interpretiert werden, setzen."
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 msgid "Create Date"
 msgstr "Erstellungsdatum"
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 msgid "The date and time the resource was originally created."
 msgstr ""
 "Das Datum und die Uhrzeit an dem die Ressource im Original erstellt wurde."
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid "Creator Tool"
 msgstr "Erstellungswerkzeug"
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid ""
 "The name of the first known tool used to create the resource. If history is "
 "present in the metadata, this value should be equivalent to that of xmpMM:"
@@ -11319,7 +14514,7 @@
 "wurde. Wenn in den Metadaten eine Historie geführt wird, dann sollte dieser "
 "Wert gleich dem in der Eigenschaft xmpMM:History's softwareAgent sein."
 
-#: src/properties.cpp:180
+#: src/properties.cpp:196
 msgid ""
 "An unordered array of text strings that unambiguously identify the resource "
 "within a given context. An array item may be qualified with xmpidq:Scheme to "
@@ -11336,11 +14531,11 @@
 "und sie in der XMP-Spezifikation als als einfache, einwertige Eigenschaft "
 "definiert wurde."
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid "Label"
 msgstr "Name"
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid ""
 "A word or short phrase that identifies a document as a member of a user-"
 "defined collection. Used to organize documents in a file browser."
@@ -11349,11 +14544,11 @@
 "benutzerdefinierten SDammlung identifiziert. Es wird benutzt, um die "
 "Dokumente in einem Dateimanager zu organisieren."
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid "Metadata Date"
 msgstr "Metadaten-Datum"
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid ""
 "The date and time that any metadata for this resource was last changed. It "
 "should be the same as or more recent than xmp:ModifyDate."
@@ -11362,11 +14557,11 @@
 "geändert wurden. Es sollte das gleiche oder ein aktuelleres Datum als xmp:"
 "ModifyDate sein."
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid "Modify Date"
 msgstr "Änderungsdatum"
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid ""
 "The date and time the resource was last modified. Note: The value of this "
 "property is not necessarily the same as the file's system modification date "
@@ -11377,19 +14572,19 @@
 "Änderungsdatum des Dateisystems, da es gesetzt wird bevor die Datei "
 "gespeichert wird."
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "A short informal name for the resource."
 msgstr "Ein kurzer informeller Name für die Ressource."
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid "Rating"
 msgstr "Bewertung"
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid ""
 "A number that indicates a document's status relative to other documents, "
 "used to organize documents in a file browser. Values are user-defined within "
@@ -11400,11 +14595,11 @@
 "Werte werden vom Benutzer innerhalb eines von der Anwendung vorgegebenen "
 "Bereichs gesetzt."
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid "Thumbnails"
 msgstr "Vorschaubilder"
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid ""
 "An alternative array of thumbnail images for a file, which can differ in "
 "characteristics such as size or image encoding."
@@ -11412,45 +14607,45 @@
 "Eine alternative Liste von Vorschaubildern für eine Datei. Diese können sich "
 "in Eigenschaften wie z.B. Größe oder Bildkodierung unterscheiden."
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Online rights management certificate."
 msgstr "Online-Rechteverwaltungszertifikat"
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 msgid "Marked"
 msgstr "Markiert"
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 msgid "Indicates that this is a rights-managed resource."
 msgstr "Zeigt an, dass dies eine Ressource ist deren Rechet verwaltet sind."
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "Owner"
 msgstr "Besitzer"
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "An unordered array specifying the legal owner(s) of a resource."
 msgstr ""
 "Eine ungeordnete Liste von einem oder mehreren rechtlichen Besitzer einer "
 "Ressource."
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Usage Terms"
 msgstr "Benutzungsbedingungen"
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Text instructions on how a resource can be legally used."
 msgstr "Textbeschreibung wie die Ressource legal benutzt werden kann."
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid "Web Statement"
 msgstr "Web-Angaben"
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid ""
 "The location of a web page describing the owner and/or rights statement for "
 "this resource."
@@ -11458,11 +14653,11 @@
 "Die Adresse einer-Web-Seite die den Besitzer und/oder die Rechteangaben für "
 "die Ressource beschreibt."
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid "Derived From"
 msgstr "Abgeleitet von"
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid ""
 "A reference to the original document from which this one is derived. It is a "
 "minimal reference; missing components can be assumed to be unchanged. For "
@@ -11477,11 +14672,11 @@
 "vorangegangenen Version angeben. Eine Wiedergabe braucht also nur die "
 "Instanz-ID un die Wiedergabeklasse des Originals angeben."
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid "Document ID"
 msgstr "Dokumenten-ID"
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid ""
 "The common identifier for all versions and renditions of a document. It "
 "should be based on a UUID; see Document and Instance IDs below."
@@ -11490,11 +14685,11 @@
 "Dokuments. Er sollte daher auf der UUID basieren. Sehen Sie dazu die "
 "Dokumenten und Instanz-ID's unten."
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid "History"
 msgstr "Historie"
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid ""
 "An ordered array of high-level user actions that resulted in this resource. "
 "It is intended to give human readers a general indication of the steps taken "
@@ -11509,11 +14704,11 @@
 "gedacht als vollständige Zusammenstellung aller Tastenanschläge oder als "
 "detailierte Anleitung."
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid "Instance ID"
 msgstr "Instanz-ID"
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid ""
 "An identifier for a specific incarnation of a document, updated each time a "
 "file is saved. It should be based on a UUID; see Document and Instance IDs "
@@ -11523,11 +14718,11 @@
 "aktualisiert wird, wenn die Datei gespeichert wird. Er sollte auf einer UUID "
 "basieren. Sehen Sie dazu unten die Dokumenten und Instanz-ID."
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid "Managed From"
 msgstr "Verwaltet von"
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid ""
 "A reference to the document as it was prior to becoming managed. It is set "
 "when a managed document is introduced to an asset management system that "
@@ -11539,11 +14734,11 @@
 "aufgenommen wird, die es nicht besitzt. Es kann oder auch nicht Referenzen "
 "auf verschiedene Verwaltungssysteme enthalten."
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid "Manager"
 msgstr "Verwalter"
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid ""
 "The name of the asset management system that manages this resource. Along "
 "with xmpMM: ManagerVariant, it tells applications which asset management "
@@ -11553,11 +14748,11 @@
 "xmpMM: ManagerVariant, teilt es der Anwendung mit welches "
 "Bestandsverwaltungssystem zu diesem Dokument kontaktiert werden muss."
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 msgid "Manage To"
 msgstr "Verwaltet für"
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 msgid ""
 "A URI identifying the managed resource to the asset management system; the "
 "presence of this property is the formal indication that this resource is "
@@ -11569,11 +14764,11 @@
 "Indikator das diese Ressource verwaltet ist. Form und Inhalt dieser URI ist "
 "nur für das Bestandsverwaltungssystem."
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 msgid "Manage UI"
 msgstr "Verwaltungs-UI"
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 msgid ""
 "A URI that can be used to access information about the managed resource "
 "through a web browser. It might require a custom browser plug-in."
@@ -11582,11 +14777,11 @@
 "Ressource mittels eines Web-Browsers zu bekommen. Sie setzt unter Umständen "
 "ein Browsermodul voraus."
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 msgid "Manager Variant"
 msgstr "Verwaltungsvariante"
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 msgid ""
 "Specifies a particular variant of the asset management system. The format of "
 "this property is private to the specific asset management system."
@@ -11594,11 +14789,11 @@
 "Gibt eine bestimmte Variante des Bestandsverwaltungssystems an. Das Format "
 "dieser Eigenschaft ist nur für die angegebene Bestandsverwaltungssystem."
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid "Rendition Class"
 msgstr "Wiedergabeklasse"
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid ""
 "The rendition class name for this resource. This property should be absent "
 "or set to default for a document version that is not a derived rendition."
@@ -11607,11 +14802,11 @@
 "oder auf den Standard gesetzt sein für alle Dokumentenversionen die keine "
 "abgeleitete Umsetzungen sind."
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid "Rendition Params"
 msgstr "Wiedergabeparameter"
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid ""
 "Can be used to provide additional rendition parameters that are too complex "
 "or verbose to encode in xmpMM: RenditionClass."
@@ -11620,11 +14815,11 @@
 "stellen, die zu komplex oder zu umfangreich sind, um in der Wiedergabeklasse "
 "xmpMM: gespeichert zu werden."
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid "Version ID"
 msgstr "Version-ID"
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid ""
 "The document version identifier for this resource. Each version of a "
 "document gets a new identifier, usually simply by incrementing integers 1, "
@@ -11637,11 +14832,11 @@
 "gebildet. Medienverwaltungssystemw haben unter Umständen andere Konventionen "
 "oder unterstützen Abzweigungen die ein komplexeres Schema benötigen."
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid "Versions"
 msgstr "Versionen"
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid ""
 "The version history associated with this resource. Entry [1] is the oldest "
 "known version for this document, entry [last()] is the most recent version. "
@@ -11660,19 +14855,19 @@
 "vorhanden ist. Interne Versionsinformationen können komprimiert oder "
 "gelöscht und die Versionshistorie kann an einem Punkt abgeschnitten werden."
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Last URL"
 msgstr "Letzte Adresse"
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Deprecated for privacy protection."
 msgstr "Veraltet wegen dem Schutz der Privatsphäre."
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid "Rendition Of"
 msgstr "Wiedergabe von"
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid ""
 "Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
 "which this is a rendition."
@@ -11680,21 +14875,21 @@
 "Veraltet und durch xmpMM:DerivedFrom ersetzt. Eine Referenz auf das Dokument "
 "von dem dieses eine Ableitung ist."
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Save ID"
 msgstr "Speicherungs-ID"
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
 msgstr ""
 "Veraltet. Wurde vorher benutzt, um die Eigenschaft xmpMM:LastURL zu "
 "unterstützen"
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 msgid "Job Reference"
 msgstr "Jobreferenz"
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 msgid ""
 "References an external job management file for a job process in which the "
 "document is being used. Use of job names is under user control. Typical use "
@@ -11712,32 +14907,32 @@
 "Informationen zu speichern, in welchem Jobs das Dokument früher benutzt "
 "wurde."
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid "Maximum Page Size"
 msgstr "Maximale Seitengröße"
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid ""
 "The size of the largest page in the document (including any in contained "
 "documents)."
 msgstr ""
 "Die Größe der größten Seite, inklusive aller eingebetten Seiten, im Dokument."
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid "Number of Pages"
 msgstr "Anzahl der Seiten"
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid ""
 "The number of pages in the document (including any in contained documents)."
 msgstr ""
 "Die Anzahl der Seiten, inklusive aller eingebetten Seiten, des Dokuments."
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid ""
 "An unordered array of fonts that are used in the document (including any in "
 "contained documents)."
@@ -11745,11 +14940,11 @@
 "Eine ungeordnete Liste von Zeichensätzen die in diesem Dokument benutzt "
 "werden. Diese enthält auch die Zeichensätze von eingebetteten Dokumenten."
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid "Colorants"
 msgstr "Farbmittel"
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid ""
 "An ordered array of colorants (swatches) that are used in the document "
 "(including any in contained documents)."
@@ -11757,11 +14952,11 @@
 "Eine ungeordnete Liste von Farbmitteln die in diesem Dokument benutzt "
 "werden. Diese enthält auch alle Farbmittel in eingebetteten Dokumenten."
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid "Plate Names"
 msgstr "Druckstocknamen"
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid ""
 "An ordered array of plate names that are needed to print the document "
 "(including any in contained documents)."
@@ -11770,46 +14965,46 @@
 "Dokument zu drucken. Diese enthält auch die Druckstöcke aus allen "
 "eingebetteten Druckstöcken."
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "Project Reference"
 msgstr "Projektreferenz"
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "A reference to the project that created this file."
 msgstr "Eine Referenz zu dem Projekt das diese Datei erstellt hat."
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "Video Frame Rate"
 msgstr "Video-Bildrate"
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "The video frame rate. One of: 24, NTSC, PAL."
 msgstr "Für die Video-Bildrate mögliche Werte sind: 24, NTSC, PAL."
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "Video Frame Size"
 msgstr "Video-Bildgröße"
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "The frame size. For example: w:720, h: 480, unit:pixels"
 msgstr ""
 "Die Größe des Video Bildes, z.B. Breite: 720, Höhe: 480, Einheit: Pixel"
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "Video Pixel Aspect Ratio"
 msgstr "Video-Pixelverhältnis"
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
 msgstr ""
 "Das Verhältnis der Videopixel augedrückt als Höhe/Breite, z.B.: \"648/720\" "
 "= 0.9."
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid "Video Pixel Depth"
 msgstr "Video-Pixeltiefe"
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid ""
 "The size in bits of each color component of a pixel. Standard Windows 32-bit "
 "pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
@@ -11817,11 +15012,11 @@
 "Die Größe in BNits für jede Farbkomponente eines Pixels. Standard Windows 32-"
 "Bit Pixel haben 8 Bit pro Farbe. Erlaubt sind : 8Int, 16Int, 32Int, 32Float."
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid "Video Color Space"
 msgstr "Video-Farbraum"
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid ""
 "The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
 "CCIR-709 (used for HD)."
@@ -11829,141 +15024,144 @@
 "Der benutzte Farbraum. Erlaubt sind: sRGB (von Photoshop), CCIR-601 (von "
 "NTSC), CCIR-709 (von HD)."
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 msgid "Video Alpha Mode"
 msgstr "Video-Alphamodus"
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 msgid "The alpha mode. One of: straight, pre-multiplied."
 msgstr "Der benutzte Alphamodus. Erlaubt sind: straight, pre-multiplied."
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid "Video Alpha Premultiple Color"
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid ""
 "A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
 "is pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "Video Alpha Unity Is Transparent"
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "When true, unity is clear, when false, it is opaque."
 msgstr ""
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video Compressor"
 msgstr "Videokompression"
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video compression used. For example, jpeg."
 msgstr "Benutzte Videokompression, z.B. jpeg."
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "Video Field Order"
 msgstr "Video-Feldreihenfolge"
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "The field order for video. One of: Upper, Lower, Progressive."
 msgstr ""
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid "Pull Down"
 msgstr "Nach unten ziehen"
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid ""
 "The sampling phase of film to be converted to video (pull-down). One of: "
 "WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
 "WWWSS_24p, WWSSW_24p."
 msgstr ""
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid "Audio Sample Rate"
 msgstr "Audio-Abtastrate"
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid ""
 "The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
 msgstr ""
 "Die Audio-Abtastrate kann ein beliebiger Wert sein. Empfohlen sind die Werte "
 "32000, 41100, oder 48000."
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "Audio Sample Type"
 msgstr "Audio-Abtasttyp"
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr "Der Audio-Abtasttyp, ein Wert aus: 8Int, 16Int, 32Int, 32Float."
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "Audio Channel Type"
 msgstr "Audio-Kanaltyp"
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
 msgstr "Der Audio-Kanaltyp, ein Wert aus: Mono, Stereo, 5.1, 7.1."
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "Audio Compressor"
 msgstr "Audio-Kompression"
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "The audio compression used. For example, MP3."
 msgstr "Die benutzte Audio-Kompression, z.B. MP3."
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid "Speaker Placement"
 msgstr "Lautsprecheraufstellung"
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid ""
 "A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
 msgstr ""
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 msgid "File Data Rate"
 msgstr "Dateidatenrate"
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
+#, fuzzy
 msgid ""
 "The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
 "sec"
 msgstr ""
+"Das Verhältnis der Videopixel augedrückt als Höhe/Breite, z.B.: \"648/720\" "
+"= 0.9."
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid "Tape Name"
 msgstr "Bandname"
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid ""
 "The name of the tape from which the clip was captured, as set during the "
 "capture process."
 msgstr ""
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid "Alternative Tape Name"
 msgstr "Alternativer Bandname"
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid ""
 "An alternative tape name, set via the project window or timecode dialog in "
 "Premiere. If an alternative name has been set and has not been reverted, "
 "that name is displayed."
 msgstr ""
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid "Start Time Code"
 msgstr "Startzeitstempel"
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid ""
 "The timecode of the first frame of video in the file, as obtained from the "
 "device control."
@@ -11971,11 +15169,11 @@
 "Der Zeitstempel des ersten Bildes des Videos in der Datei. Er stammt von der "
 "Gerätekontrolle."
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid "Alternative Time code"
 msgstr "Alternativer Zeitstempel"
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid ""
 "A timecode set by the user. When specified, it is used instead of the "
 "startTimecode."
@@ -11983,43 +15181,43 @@
 "Ein Zeitstempel der vom Benutzer. Wenn er gesetzt ist, dann wird er anstatt "
 "des Startzeitstempels benutzt."
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 msgid "Duration"
 msgstr "Dauer"
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 msgid "The duration of the media file."
 msgstr "Die Abspieldauer der Mediendatei."
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 msgid "Scene"
 msgstr "Szene"
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 msgid "The name of the scene."
 msgstr "Der Name der Szene."
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 msgid "Shot Name"
 msgstr "Aufnahmename"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 msgid "The name of the shot or take."
 msgstr "Der Name der Aufnahme."
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 msgid "Shot Date"
 msgstr "Aufnahmedatum"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 msgid "The date and time when the video was shot."
 msgstr "Das Datum und die Uhrzeit an dem das Video aufgenommen wurde."
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid "Shot Location"
 msgstr "Aufnahmeort"
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid ""
 "The name of the location where the video was shot. For example: "
 "\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
@@ -12029,97 +15227,97 @@
 "Video aufgenommen wurde. Für eine genauere Positionsbestimmung sollten Sie "
 "die  Exif-GPS-Werte benutzen."
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 msgid "Log Comment"
 msgstr "Protokollkommentar"
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 msgid "User's log comments."
 msgstr "Protokollkommentar des Benutzers."
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "Markers"
 msgstr "Markierungen"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "An ordered list of markers"
 msgstr "Eine geordnete Liste von Markierungen"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 msgid "Contributed Media"
 msgstr "Mitwirkende Medien"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 msgid "An unordered list of all media used to create this media."
 msgstr ""
 "Ein ungeordnete Liste aller Medien die benutzt wurdenum dieses Medium zu "
 "erstellen."
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid "Absolute Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid ""
 "The absolute path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid "Relative Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid ""
 "The relative path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 msgid "Video Modified Date"
 msgstr "Änderungsdatum des Videos"
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 msgid "The date and time when the video was last modified."
 msgstr "Das Datum und die Uhrzeit der letzten Änderung des Videos."
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 msgid "Audio Modified Date"
 msgstr "Änderungsdatum der Audiodaten"
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 msgid "The date and time when the audio was last modified."
 msgstr "Das Datum und die Uhrzeit der letzten Änderung der Audiodaten."
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 msgid "Metadata Modified Date"
 msgstr "Änderungsdatum der Metadaten"
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 msgid "The date and time when the metadata was last modified."
 msgstr "Das Datum und die Uhrzeit der letzten Änderung der Metadaten."
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/properties.cpp:323
+#: src/properties.cpp:339
 msgid "The name of the artist or artists."
 msgstr "Der Name des Künstlers bzw. der Künstler."
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 msgid "Album"
 msgstr "Album"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 msgid "The name of the album."
 msgstr "Der Name des Albums."
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid "Track Number"
 msgstr "Stücknummer"
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid ""
 "A numeric value indicating the order of the audio file within its original "
 "recording."
@@ -12127,111 +15325,111 @@
 "Ein numerischer Wert, der die Reihenfolge der Audiodatei in der "
 "Originalaufnahme anzeigt."
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 msgid "Genre"
 msgstr "Genre"
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 msgid "The name of the genre."
 msgstr "Der Name des Genres."
 
-#: src/properties.cpp:327
+#: src/properties.cpp:343
 msgid "The copyright information."
 msgstr "Die urheberrechtliche Information."
 
-#: src/properties.cpp:328
+#: src/properties.cpp:344
 msgid "The date the title was released."
 msgstr "Das Datum andem der Titel veröffentlicht wurde."
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "Composer"
 msgstr "Verfasser"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "The composer's name."
 msgstr "Der Name des Verfassers."
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "Engineer"
 msgstr "Techniker"
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "The engineer's name."
 msgstr "Der Name des Technikers."
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "Tempo"
 msgstr "Geschwindigkeit"
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "The audio's tempo."
 msgstr "Die Geschwindigkeit des Audio."
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "Instrument"
 msgstr "Instrument"
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "The musical instrument."
 msgstr "Das musikalische Instrument."
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 msgid "Intro Time"
 msgstr "Introzeit"
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 msgid "The duration of lead time for queuing music."
 msgstr "Die Dauer der Einführungszeit für Wartemusik."
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "Out Cue"
 msgstr "Out Cue"
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "The time at which to fade out."
 msgstr "Die Zeit zu der ausgeblendet werden sollte."
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "Relative Timestamp"
 msgstr "Relativer Zeitstempel"
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "The start time of the media inside the audio project."
 msgstr "Die Startzeit des Mediums innerhalb des Audioprojektes."
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "Loop"
 msgstr "Schleife"
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "When true, the clip can be looped seemlessly."
 msgstr ""
 "Wenn dieser gesetzt ist, dann kann der Clip nahtlos in einer Schleife laufen."
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 msgid "Number Of Beats"
 msgstr "Taktanzahl"
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 msgid "The number of beats."
 msgstr "Die Anzahl der Takte."
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid "Key"
 msgstr "Schlüssel"
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid ""
 "The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
 msgstr ""
 "Der musikalische Schlüssel des Audios. Dies ist einer aus : C, C#, D, D#, E, "
 "F, F#, G, G#, A, A#, B."
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid "Stretch Mode"
 msgstr "Stretchmodus"
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid ""
 "The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
 "Splice, Hybrid."
@@ -12239,35 +15437,35 @@
 "Der Audio-Stretchmodus ist einer aus: Feste Länge, Zeitskalieren, Resample, "
 "Taktverbund und Hybrid."
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Time Scale Parameters"
 msgstr "Zeitskalierungsparameter"
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Additional parameters for Time-Scale stretch mode."
 msgstr "Zusätzliche Parameter für den Zeitskalierungs-Stretchmodus."
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Resample Parameters"
 msgstr "Paramter des Resamples"
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Additional parameters for Resample stretch mode."
 msgstr "Zusätzliche Parameter für den Stretchmodus des Resamples"
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Beat Splice Parameters"
 msgstr "Parameter des Taktverbundes"
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Additional parameters for Beat Splice stretch mode."
 msgstr "Zusätzliche Parameter für den Stretchmodus des Taktverbundes."
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid "Time Signature"
 msgstr "Takt-Signatur"
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid ""
 "The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
 "12/8, other."
@@ -12275,138 +15473,134 @@
 "Die Takt-Signatur der Musik ist eine von: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
 "12/8 oder andere."
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid "Scale Type"
 msgstr "Skalierungstyp"
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid ""
 "The musical scale used in the music. One of: Major, Minor, Both, Neither. "
 "Neither is most often used for instruments with no associated scale, such as "
 "drums."
 msgstr ""
 
-#: src/properties.cpp:351 src/tags.cpp:889
+#: src/properties.cpp:367 src/tags.cpp:1076
 msgid "Camera Serial Number"
 msgstr "Kamera-Seriennummer"
 
-#: src/properties.cpp:351
+#: src/properties.cpp:367
 msgid "Camera Serial Number."
 msgstr "Kamera-Seriennummer."
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 msgid "Date Acquired"
 msgstr "Erwerbungsdatum"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 msgid "Date Acquired."
 msgstr "Erwerbungsdatum."
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 msgid "Flash Manufacturer"
 msgstr "Hersteller des Blitzes."
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 msgid "Flash Manufacturer."
 msgstr "Hersteller des Blitzes."
 
-#: src/properties.cpp:354
+#: src/properties.cpp:370
 msgid "Flash Model."
 msgstr "Blitzmodell."
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
 msgid "Last Keyword IPTC"
 msgstr "Letzter IPTC-Schlüsselbegriff"
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
 msgid "Last Keyword IPTC."
 msgstr "Letzter IPTC-Schlüsselbegriff."
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 msgid "Last Keyword XMP"
 msgstr "Letzter XMP-Schlüsselbegriff"
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 msgid "Last Keyword XMP."
 msgstr "Letzter XMP-Schlüsselbegriff."
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 msgid "Lens Manufacturer"
 msgstr "Linsen-Hersteller"
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 msgid "Lens Manufacturer."
 msgstr "Linsen-Hersteller."
 
-#: src/properties.cpp:358
-msgid "Lens Model"
-msgstr "Linsenmodell"
-
-#: src/properties.cpp:358
+#: src/properties.cpp:374
 msgid "Lens Model."
 msgstr "Linsenmodell."
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 msgid "Rating Percent"
 msgstr "Bewertung in Prozent"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 msgid "Rating Percent."
 msgstr "Bewertung in Prozent."
 
-#: src/properties.cpp:365
+#: src/properties.cpp:381
 msgid "Keywords."
 msgstr "Schlüsselbegriffe."
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "PDF Version"
 msgstr "PDF-Version"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
 msgstr "Die Version der PDF-Datei, z.B. 1.0, 1.3 usw."
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "Producer"
 msgstr "Hersteller"
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "The name of the tool that created the PDF document."
 msgstr "Der Name des Werkzeugs, dass das PDF-Dokument erstellt hat."
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 msgid "Authors Position"
 msgstr "Position des Autors."
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 msgid "By-line title."
 msgstr "Titel der Verfasserzeile."
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 msgid "Caption Writer"
 msgstr "Abschnittsautor"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 msgid "Writer/editor."
 msgstr "Autor/Verfasser"
 
-#: src/properties.cpp:375
+#: src/properties.cpp:391
 msgid "Category. Limited to 3 7-bit ASCII characters."
 msgstr "Diese Kategorie ist auf drei 7-Bit ASCII-Zeichen beschränkt."
 
-#: src/properties.cpp:376
+#: src/properties.cpp:392
 msgid "City."
 msgstr "Stadt."
 
-#: src/properties.cpp:377
+#: src/properties.cpp:393
 msgid "Country/primary location."
 msgstr "Land/Primäre Lokation."
 
-#: src/properties.cpp:378
+#: src/properties.cpp:394
 msgid "Credit."
 msgstr "Danksagungen."
 
-#: src/properties.cpp:379
+#: src/properties.cpp:395
 msgid ""
 "The date the intellectual content of the document was created (rather than "
 "the creation date of the physical representation), following IIM "
@@ -12415,327 +15609,328 @@
 "photo was digitized for archiving."
 msgstr ""
 
-#: src/properties.cpp:383
+#: src/properties.cpp:399
 msgid "Headline."
 msgstr "Schlagzeile."
 
-#: src/properties.cpp:384
+#: src/properties.cpp:400
 msgid "Special instructions."
 msgstr "Besondere Anweisungen."
 
-#: src/properties.cpp:385
+#: src/properties.cpp:401
 msgid "Source."
 msgstr "Quelle."
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "State"
 msgstr "Staat"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "Province/state."
 msgstr "Provinz/Staat."
 
-#: src/properties.cpp:387
+#: src/properties.cpp:403
 msgid "Supplemental category."
 msgstr "Zusätzliche Kategorie."
 
-#: src/properties.cpp:388
+#: src/properties.cpp:404
 msgid "Original transmission reference."
 msgstr "Original-Übertragungsreferenz."
 
-#: src/properties.cpp:389
+#: src/properties.cpp:405
 msgid "Urgency. Valid range is 1-8."
 msgstr "Dringlichkeit. Der gültige Bereich ist 1-8."
 
-#: src/properties.cpp:397
+#: src/properties.cpp:413
 msgid "inches"
 msgstr "Zoll"
 
-#: src/properties.cpp:398 src/tags.cpp:227
+#: src/properties.cpp:414 src/tags.cpp:247
 msgid "cm"
 msgstr "cm"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "Auto Brightness"
 msgstr "Automatische Helligkeit"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "When true, \"Brightness\" is automatically adjusted."
 msgstr ""
 "Wenn diese Option gesetzt ist, dann wird die Helligkeit automatisch justiert."
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "Auto Contrast"
 msgstr "Autokontrast"
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "When true, \"Contrast\" is automatically adjusted."
 msgstr ""
 "Wenn diese Option gesetzt ist, dann wird der kontrast automatisch justiert."
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "Auto Exposure"
 msgstr "Automatische Belichtung"
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "When true, \"Exposure\" is automatically adjusted."
 msgstr ""
 "Wenn diese Option gesetzt ist, dann wird die Belichtung automatisch justiert."
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "Auto Shadows"
 msgstr "Automatisch (Schatten)"
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "When true,\"Shadows\" is automatically adjusted."
 msgstr ""
 "Wenn diese Option gesetzt ist, dann werden die Schatten automatisch justiert."
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 msgid "Blue Hue"
 msgstr "Blauabgleich"
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 msgid "\"Blue Hue\" setting. Range -100 to 100."
 msgstr "Einstellungen des Blauabgleichs. Der Bereich geht von -100 bis 100."
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 msgid "Blue Saturation"
 msgstr "Blau-Sättigung"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 msgid "\"Blue Saturation\" setting. Range -100 to +100."
 msgstr "Einstellungen der Blausättigung. Der Bereich geht von -100 bis +100."
 
-#: src/properties.cpp:408
+#: src/properties.cpp:424
 msgid "\"Brightness\" setting. Range 0 to +150."
 msgstr "Die Einstellung der Helligkeit. Der Bereich geht von 0 bis + 150."
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 msgid "Camera Profile"
 msgstr "Kameraprofil"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 msgid "\"Camera Profile\" setting."
 msgstr "Einstellungen des Kameraprofils."
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 msgid "Chromatic Aberration Blue"
 msgstr "Chromatische Aberration Blau"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 msgid ""
 "\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
 msgstr ""
 "Einstellung \"Chromatische Aberration, Blau/Gelb-Ränder korrigieren\". "
 "Bereich von -100 bis +100."
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 msgid "Chromatic Aberration Red"
 msgstr "Chromatische Aberration Rot"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 msgid ""
 "\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
 msgstr ""
 "Einstellung \"Chromatische Aberration, Rot/Cyan-Ränder korrigieren\". "
 "Bereich von -100 bis +100."
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 msgid "Color Noise Reduction"
 msgstr "Farbrauschunterdrückung"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
 msgstr ""
 "Einstellung der \"Farbrauschunterdrückung\". Im Bereich von 0 bis +100."
 
-#: src/properties.cpp:413
+#: src/properties.cpp:429
 msgid "\"Contrast\" setting. Range -50 to +100."
 msgstr "Einstellung des \"Kontrastes\". Im Bereich von -50 bis +100."
 
-#: src/properties.cpp:414
+#: src/properties.cpp:430
 msgid "When \"Has Crop\" is true, top of crop rectangle"
 msgstr ""
 "Wenn die Option \"Zuschneiden\" gesetzt ist, dann wird das Rechteck oben "
 "zugeschnitten"
 
-#: src/properties.cpp:415
+#: src/properties.cpp:431
 msgid "When \"Has Crop\" is true, left of crop rectangle."
 msgstr ""
 "Wenn die Option \"Zuschneiden\" gesetzt ist, dann wird das Rechteck links "
 "zugeschnitten"
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "Crop Bottom"
 msgstr "Unten zuschneiden"
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "When \"Has Crop\" is true, bottom of crop rectangle."
 msgstr ""
 "Wenn die Option \"Zuschneiden\" gesetzt ist, dann wird das Rechteck unten "
 "zugeschnitten"
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "Crop Right"
 msgstr "Rechts zuschneiden"
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "When \"Has Crop\" is true, right of crop rectangle."
 msgstr ""
 "Wenn die Option \"Zuschneiden\" gesetzt ist, dann wird das Rechteck rechts "
 "zugeschnitten"
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "Crop Angle"
 msgstr "Winkel zuschneiden"
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "When \"Has Crop\" is true, angle of crop rectangle."
 msgstr ""
 "Wenn die Option \"Zuschneiden\" gesetzt ist, dann werden die Winkel des "
 "Rechtecks zugeschnitten"
 
-#: src/properties.cpp:419
+#: src/properties.cpp:435
 msgid "Width of resulting cropped image in CropUnits units."
 msgstr "Breite des zugeschnittenen Bildes in zugeschnittenen Einheiten."
 
-#: src/properties.cpp:420
+#: src/properties.cpp:436
 msgid "Height of resulting cropped image in CropUnits units."
 msgstr "Höhe des zugeschnittenen Bildes in zugeschnittenen Einheiten."
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Crop Units"
 msgstr "Zuschnittene Einheiten"
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
 msgstr ""
 "Einheit für \"Breite des Zuschnitts\" und \"Höhe des Zuschnitts\": 0=Pixel, "
 "1=Zoll, 2=Zentimeter"
 
-#: src/properties.cpp:422
+#: src/properties.cpp:438
 msgid "\"Exposure\" setting. Range -4.0 to +4.0."
 msgstr "Einstellung der \"Belichtung\". Im Bereich von -4.0 bis +4.0."
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 msgid "GreenHue"
 msgstr "Grünabgleich"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 msgid "\"Green Hue\" setting. Range -100 to +100."
 msgstr "Einstellung des \"Grünabgleichs\". Im Bereich von -100 bis +100."
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 msgid "Green Saturation"
 msgstr "Grünsättigung"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 msgid "\"Green Saturation\" setting. Range -100 to +100."
 msgstr "Einstellung der \"Grünsättigung\". Im Bereich von -100 bis +100."
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "Has Crop"
 msgstr "Wurde zugeschnitten"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "When true, image has a cropping rectangle."
 msgstr ""
 "Wenn die Option gesetzt ist, dann hat das Bild ein zuschneidendes Rechteck."
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "Has Settings"
 msgstr "Besitzt Einstellungen"
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "When true, non-default camera raw settings."
 msgstr ""
 "Wenn diese Option gesetzt ist, dann wurden nicht die Standardeinstellungen "
 "der Kamera genutzt."
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 msgid "Luminance Smoothing"
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
+#, fuzzy
 msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Einstellungen der Blausättigung. Der Bereich geht von -100 bis +100."
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "Raw File Name"
 msgstr "Rohdateiname"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "File name of raw file (not a complete path)."
 msgstr "Dateiname der Rohdatei (nicht der komplette Pfad)."
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 msgid "Red Hue"
 msgstr "Rotabgleich"
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 msgid "\"Red Hue\" setting. Range -100 to +100."
 msgstr "Einstellung des \"Rotabgleichs\". Im Bereich von -100 bis +100."
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 msgid "Red Saturation"
 msgstr "Rotsättigung"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 msgid "\"Red Saturation\" setting. Range -100 to +100."
 msgstr "Einstellungen der \"Rotsättigung\". Im Bereich von -100 bis +100."
 
-#: src/properties.cpp:431
+#: src/properties.cpp:447
 msgid "\"Saturation\" setting. Range -100 to +100."
 msgstr "Einstellungen der\"Sättigung\". Im Bereich von -100 bis +100."
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 msgid "Shadows"
 msgstr "Schatten"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 msgid "\"Shadows\" setting. Range 0 to +100."
 msgstr "Einstellungen der\"Schatten\". Im Bereich von 0 bis +100."
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 msgid "Shadow Tint"
 msgstr "Dunkle Tinte"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 msgid "\"Shadow Tint\" setting. Range -100 to +100."
 msgstr "Einstellungen der\"dunklen Tinte\". Im Bereich von -100 bis +100."
 
-#: src/properties.cpp:434
+#: src/properties.cpp:450
 msgid "\"Sharpness\" setting. Range 0 to +100."
 msgstr "Einstellungen der\"Schärfe\". Im Bereich von 0 bis +100."
 
-#: src/properties.cpp:435
+#: src/properties.cpp:451
 msgid "\"Temperature\" setting. Range 2000 to 50000."
 msgstr "Einstellungen der\"Temperatur\". Im Bereich von 2000 bis 50000."
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 msgid "Tint"
 msgstr "Tinte"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 msgid "\"Tint\" setting. Range -150 to +150."
 msgstr "Einstellungen der \"Tinte\". Im Bereich von -150 bis +150."
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Tone Curve"
 msgstr "Farbtonkurve"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
 msgstr ""
 "Vektor von Punkten (Ganzzahlig, Ganzzahlig) der eine \"Farbtonkurve\" "
 "beschreibt."
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid "Tone Curve Name"
 msgstr "Name der Farbtonkurve"
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid ""
 "The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
 "Contrast, Strong Contrast, Custom or a user-defined preset name."
@@ -12744,72 +15939,72 @@
 "Starker Kontrast, Anwendungsspezifisch oder ein benutzerdefinierter "
 "voreingestellter Name."
 
-#: src/properties.cpp:440
+#: src/properties.cpp:456
 msgid "Version of Camera Raw plugin."
 msgstr "Version des Kamerarohmoduls."
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 msgid "Vignette Amount"
 msgstr "Vignettierungsmenge"
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 msgid "\"Vignetting Amount\" setting. Range -100 to +100."
 msgstr ""
 "Einstellungen der \"Vignettierungsmenge\". Im Bereich von -100 bis +100."
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 msgid "Vignette Midpoint"
 msgstr "Vignettierungsmittelpunkt"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
 msgstr ""
 "Einstellung des \"Vignettierungsmittelpunkt\". Im Bereich von -150 bis +150."
 
-#: src/properties.cpp:443
+#: src/properties.cpp:459
 msgid ""
 "\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
 "Tungsten, Fluorescent, Flash, Custom"
 msgstr ""
 
-#: src/properties.cpp:450
+#: src/properties.cpp:466
 msgid "TIFF tag 256, 0x100. Image width in pixels."
 msgstr "TIFF-Feld 256, 0x100: Bildbreite in Pixeln."
 
-#: src/properties.cpp:451 src/tags.cpp:354
+#: src/properties.cpp:467 src/tags.cpp:425
 msgid "Image Length"
 msgstr "Bildlänge"
 
-#: src/properties.cpp:451
+#: src/properties.cpp:467
 msgid "TIFF tag 257, 0x101. Image height in pixels."
 msgstr "TIFF-Feld 257, 0x101: Bildbreite in Pixeln."
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "Bits Per Sample"
 msgstr "Bits pro Abtastung"
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
 msgstr "TIFF-Feld 258, 0x102: Anzahl der Bits pro Komponente in jedem Kanal."
 
-#: src/properties.cpp:453 src/tags.cpp:364
+#: src/properties.cpp:469 src/tags.cpp:435
 msgid "Compression"
 msgstr "Kompression"
 
-#: src/properties.cpp:453
+#: src/properties.cpp:469
 msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
 msgstr ""
 "TIFF-Feld 259, 0x103: Kompressionsschema: 1 = keine Kompression; 6 = JPEG."
 
-#: src/properties.cpp:454 src/tags.cpp:370
+#: src/properties.cpp:470 src/tags.cpp:441
 msgid "Photometric Interpretation"
 msgstr "Fotometrische Interpretation"
 
-#: src/properties.cpp:454
+#: src/properties.cpp:470
 msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
 msgstr "TIFF-Feld 262, 0x106, Pixelzusammensetzung: 2 = RGB; 6 = YCbCr."
 
-#: src/properties.cpp:455
+#: src/properties.cpp:471
 msgid ""
 "TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
 "0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
@@ -12818,63 +16013,63 @@
 "0th column at bottom 8 = 0th row at left, 0th column at bottom"
 msgstr ""
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 msgid "Samples Per Pixel"
 msgstr "Abtastung pro Pixel"
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 msgid "TIFF tag 277, 0x115. Number of components per pixel."
 msgstr "TIFF-Feld 277, 0x115: Anzahl der Komponenten pro Pixel."
 
-#: src/properties.cpp:465 src/tags.cpp:432
+#: src/properties.cpp:481 src/tags.cpp:515
 msgid "Planar Configuration"
 msgstr "Planar Konfiguration"
 
-#: src/properties.cpp:465
+#: src/properties.cpp:481
 msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
 msgstr "TIFF-Feld 284, 0x11C. Datenlayout:1 = kompakt; 2 = flach."
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid "YCbCr Sub Sampling"
 msgstr "YCbCr Sub Sampling"
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid ""
 "TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
 "YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
+#: src/properties.cpp:484 src/tags.cpp:718
 msgid "YCbCr Positioning"
 msgstr "YCbCr Positionierung"
 
-#: src/properties.cpp:468
+#: src/properties.cpp:484
 msgid ""
 "TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
 "centered; 2 = co-sited."
 msgstr ""
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "X Resolution"
 msgstr "x-Auflösung"
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
 msgstr "TIFF-Feld 282, 0x11A. Horizontale Auflösung in Pixeln pro Einheit."
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "Y Resolution"
 msgstr "y-Auflösung"
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
 msgstr "TIFF-Feld 283, 0x11B. Vertikale Auflösung in Pixeln pro Einheit."
 
-#: src/properties.cpp:472 src/tags.cpp:438
+#: src/properties.cpp:488 src/tags.cpp:533
 msgid "Resolution Unit"
 msgstr "Maßeinheit der Auflösung"
 
-#: src/properties.cpp:472
+#: src/properties.cpp:488
 msgid ""
 "TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
 "of: 2 = inches; 3 = centimeters."
@@ -12882,50 +16077,51 @@
 "TIFF-Feld 296, 0x128. Die für die x- und y-Auflösung benutzten Einheiten. "
 "Der Wert ist: 2 = Zoll; 3 = Zentimeter."
 
-#: src/properties.cpp:474 src/tags.cpp:443
+#: src/properties.cpp:490 src/tags.cpp:538
 msgid "Transfer Function"
 msgstr "(Farb)transfer Funktion"
 
-#: src/properties.cpp:474
+#: src/properties.cpp:490
 msgid ""
 "TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
 "with 3 * 256 entries."
 msgstr ""
 
-#: src/properties.cpp:476 src/tags.cpp:471
+#: src/properties.cpp:492 src/tags.cpp:570
 msgid "White Point"
 msgstr "Weißpunkt"
 
-#: src/properties.cpp:476
+#: src/properties.cpp:492
 msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
 msgstr "TIFF-Feld 318, 0x13E. Chromatizität des Weißpunktes."
 
-#: src/properties.cpp:477 src/tags.cpp:476
+#: src/properties.cpp:493 src/tags.cpp:575
 msgid "Primary Chromaticities"
 msgstr "Primäre Chromazität"
 
-#: src/properties.cpp:477
+#: src/properties.cpp:493
 msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
 msgstr "TIFF-Feld 319, 0x13F. Chromatizität der drei Primärfarben."
 
-#: src/properties.cpp:478
+#: src/properties.cpp:494
 msgid ""
 "TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
 msgstr ""
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "Reference Black White"
 msgstr "Schwarz/Weiß-Referenz"
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
+#, fuzzy
 msgid "TIFF tag 532, 0x214. Reference black and white point values."
-msgstr ""
+msgstr "TIFF-Feld 318, 0x13E. Chromatizität des Weißpunktes."
 
-#: src/properties.cpp:480 src/tags.cpp:455
+#: src/properties.cpp:496 src/tags.cpp:550
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: src/properties.cpp:480
+#: src/properties.cpp:496
 msgid ""
 "TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
 "and time of image creation (no time zone in EXIF), stored in ISO 8601 "
@@ -12934,11 +16130,11 @@
 "ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
+#: src/properties.cpp:502 src/tags.cpp:463
 msgid "Image Description"
 msgstr "Bildbeschreibung"
 
-#: src/properties.cpp:486
+#: src/properties.cpp:502
 msgid ""
 "TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
 "in XMP as dc:description."
@@ -12946,24 +16142,19 @@
 "TIFF-Feld 270, 0x10E. Beschreibung des Bildes. Achtung: Diese Eigenschaft "
 "wird in XMP unter dc:description gespeichert."
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "Make"
 msgstr "Hersteller"
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
 msgstr "TIFF-Feld 271, 0x10F. Hersteller der Aufnahmeausrüstung."
 
-#: src/properties.cpp:488
+#: src/properties.cpp:504
 msgid "TIFF tag 272, 0x110. Model name or number of equipment."
 msgstr "TIFF-Feld 272, 0x110. Modellname oder -nummer der Ausrüstung."
 
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
-msgstr "Software"
-
-#: src/properties.cpp:489
+#: src/properties.cpp:505
 msgid ""
 "TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
 "property is stored in XMP as xmp:CreatorTool. "
@@ -12972,7 +16163,7 @@
 "Bilder zu erstellen. Achtung: Diese Eigenschaft wird in XMP unter xmp:"
 "CreatorTool gespeichert."
 
-#: src/properties.cpp:491
+#: src/properties.cpp:507
 msgid ""
 "TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
 "property is stored in XMP as the first item in the dc:creator array."
@@ -12981,47 +16172,50 @@
 "Diese Eigenschaft wird in XMP als erster Eintrag im Feld dc:creator "
 "gespeichert."
 
-#: src/properties.cpp:493
+#: src/properties.cpp:509
+#, fuzzy
 msgid ""
 "TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
 "in XMP as dc:rights."
 msgstr ""
+"TIFF-Feld 270, 0x10E. Beschreibung des Bildes. Achtung: Diese Eigenschaft "
+"wird in XMP unter dc:description gespeichert."
 
-#: src/properties.cpp:500 src/tags.cpp:1198
+#: src/properties.cpp:516 src/tags.cpp:1388
 msgid "Exif Version"
 msgstr "Exif-Version"
 
-#: src/properties.cpp:500
+#: src/properties.cpp:516
 msgid "EXIF tag 36864, 0x9000. EXIF version number."
 msgstr "Exif-Feld 36864, 0x9000. Exif-Versionsnummer."
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "Flashpix Version"
 msgstr "FlashPix Version"
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
 msgstr "Exif-Feld 40960, 0xA000. Version des FlashPix."
 
-#: src/properties.cpp:502
+#: src/properties.cpp:518
 msgid "EXIF tag 40961, 0xA001. Color space information"
 msgstr "Exif-Feld 40961, 0xA001. Informationen über den Farbraum."
 
-#: src/properties.cpp:503 src/tags.cpp:1209
+#: src/properties.cpp:519 src/tags.cpp:1399
 msgid "Components Configuration"
 msgstr "Komponentenkonfiguration"
 
-#: src/properties.cpp:503
+#: src/properties.cpp:519
 msgid ""
 "EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
 "compressed data), 1 2 3 0 (other cases)."
 msgstr ""
 
-#: src/properties.cpp:505 src/tags.cpp:636
+#: src/properties.cpp:521 src/tags.cpp:823
 msgid "Compressed Bits Per Pixel"
 msgstr "Komprimierte Bits pro Pixel"
 
-#: src/properties.cpp:505
+#: src/properties.cpp:521
 msgid ""
 "EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
 "indicated in unit bits per pixel."
@@ -13029,45 +16223,45 @@
 "Exif-Feld 37122, 0x9102. Kompressionsmodus der benutzt wurde, um das Bild zu "
 "komprimieren in der Einheit Bits pro Pixel."
 
-#: src/properties.cpp:507 src/tags.cpp:1293
+#: src/properties.cpp:523 src/tags.cpp:1483
 msgid "Pixel X Dimension"
 msgstr "Pixel X-Dimension"
 
-#: src/properties.cpp:507
+#: src/properties.cpp:523
 msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
 msgstr "Exif-Feld 40962, 0xA002. Gültige Bildbreite in Pixeln."
 
-#: src/properties.cpp:508 src/tags.cpp:1300
+#: src/properties.cpp:524 src/tags.cpp:1490
 msgid "Pixel Y Dimension"
 msgstr "Pixel Y-Dimension"
 
-#: src/properties.cpp:508
+#: src/properties.cpp:524
 msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
 msgstr "Exif-Feld 40963, 0xA003. Gültige Bildhöhe in Pixeln."
 
-#: src/properties.cpp:509 src/tags.cpp:1267
+#: src/properties.cpp:525 src/tags.cpp:1457
 msgid "User Comment"
 msgstr "Anmerkung des Nutzers"
 
-#: src/properties.cpp:509
+#: src/properties.cpp:525
 msgid "EXIF tag 37510, 0x9286. Comments from user."
 msgstr "Exif-Feld 37510, 0x9286. Kommentar des Benutzers."
 
-#: src/properties.cpp:510 src/tags.cpp:1309
+#: src/properties.cpp:526 src/tags.cpp:1499
 msgid "Related Sound File"
 msgstr "Zugehörige Audiodatei"
 
-#: src/properties.cpp:510
+#: src/properties.cpp:526
 msgid ""
 "EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
 msgstr ""
 "Exif-Feld 40964, 0xA004. Ein \"8.3\" Dateiname für die zugehörige Sounddatei."
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid "Date and Time Original"
 msgstr "Datum und Uhrzeit (Original)"
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid ""
 "EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
 "time when original image was generated, in ISO 8601 format. Includes the "
@@ -13077,11 +16271,11 @@
 "Datum und Zeit, im ISO 8601-Format, an dem das Originalbild erstellt wurde. "
 "Enthält die Exif-SubSecTimeOriginal Daten."
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid "Date and Time Digitized"
 msgstr "Datum und Uhrzeit (Digitalisiert)"
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid ""
 "EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
 "time when image was stored as digital data, can be the same as "
@@ -13094,37 +16288,37 @@
 "gespeichert wurde. Gespeichert wird im ISO 8601-Format und enthält die Exif-"
 "SubSecTimeDigitized-Daten."
 
-#: src/properties.cpp:518
+#: src/properties.cpp:534
 msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
 msgstr "Exif-Feld 33434, 0x829A. Belichtungszeit in Sekunden."
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "F Number"
 msgstr "Blende"
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "EXIF tag 33437, 0x829D. F number."
 msgstr "Exif-Feld 33437, 0x829D. Blende."
 
-#: src/properties.cpp:520
+#: src/properties.cpp:536
 msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
 msgstr ""
 "Exif-Feld 34850, 0x8822. Klasse des Programmes das für die Belichtung "
 "benutzt wurde."
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
 msgid "Spectral Sensitivity"
 msgstr "Spektrale Empfindlichkeit"
 
-#: src/properties.cpp:521
+#: src/properties.cpp:537
 msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
 msgstr "Exif-Feld 34852, 0x8824. Spektrale Empfindlichkeit jedes Kanals."
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 msgid "ISOSpeedRatings"
 msgstr "ISO Geschwindigkeitsangabe"
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 msgid ""
 "EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
 "specified in ISO 12232."
@@ -13132,11 +16326,11 @@
 "Exif-Feld 34855, 0x8827. Gibt die ISO Geschwindigkeit und -breite der Kamera "
 "bzw. des Eingabegeräts an, wie in ISO 12232 spezifiziert."
 
-#: src/properties.cpp:524 src/tags.cpp:625
+#: src/properties.cpp:540 src/tags.cpp:812
 msgid "OECF"
 msgstr "OECF"
 
-#: src/properties.cpp:524
+#: src/properties.cpp:540
 msgid ""
 "EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
 "ISO 14524."
@@ -13144,7 +16338,7 @@
 "Exif-Feld 34856, 0x8828. Verfahren zur Messung optoelektronischer Kennlinien "
 "wie in ISO 14524 spezifiziert."
 
-#: src/properties.cpp:525
+#: src/properties.cpp:541
 msgid ""
 "EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
 "specification."
@@ -13152,55 +16346,58 @@
 "Exif-Feld 37377, 0x9201. Verschlussgeschwindigkeit. Die Einheit ist APEX. "
 "Siehe auch Anhang C der Exif-Spezifikation."
 
-#: src/properties.cpp:526
+#: src/properties.cpp:542
 msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
 msgstr "Exif-Feld 37378, 0x9202. Linsenblende, Einheit ist APEX."
 
-#: src/properties.cpp:527 src/tags.cpp:639
+#: src/properties.cpp:543 src/tags.cpp:826
 msgid "Brightness Value"
 msgstr "Helligkeitswert"
 
-#: src/properties.cpp:527
+#: src/properties.cpp:543
 msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
 msgstr "Exif-Feld 37379, 0x9203. Helligkeit, Einheit ist APEX."
 
-#: src/properties.cpp:528
+#: src/properties.cpp:544
 msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
 msgstr "Exif-Feld 37380, 0x9204. Belichtungsfehler, Einheit ist APEX."
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 msgid "Maximum Aperture Value"
 msgstr "Maximale Blende"
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
 msgstr "Exif-Feld 37381, 0x9205. Die kleineste Blende der Linse, in APEX."
 
-#: src/properties.cpp:530
+#: src/properties.cpp:546
 msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
 msgstr "Exif-Feld 37382, 0x9206. Die Entfernung zum Motiv (in Metern)."
 
-#: src/properties.cpp:531
+#: src/properties.cpp:547
+#, fuzzy
 msgid "EXIF tag 37383, 0x9207. Metering mode."
-msgstr ""
+msgstr "Exif-Feld 37382, 0x9206. Die Entfernung zum Motiv (in Metern)."
 
-#: src/properties.cpp:532
+#: src/properties.cpp:548
+#, fuzzy
 msgid "EXIF tag 37384, 0x9208. Light source."
-msgstr ""
+msgstr "Exif-Feld 33437, 0x829D. Blende."
 
-#: src/properties.cpp:533
+#: src/properties.cpp:549
 msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
 msgstr ""
 
-#: src/properties.cpp:534
+#: src/properties.cpp:550
+#, fuzzy
 msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
-msgstr ""
+msgstr "Exif-Feld 37382, 0x9206. Die Entfernung zum Motiv (in Metern)."
 
-#: src/properties.cpp:535 src/tags.cpp:1259
+#: src/properties.cpp:551 src/tags.cpp:1449
 msgid "Subject Area"
 msgstr "Motivbereich"
 
-#: src/properties.cpp:535
+#: src/properties.cpp:551
 msgid ""
 "EXIF tag 37396, 0x9214. The location and area of the main subject in the "
 "overall scene."
@@ -13208,116 +16405,129 @@
 "Exif-Feld 37396, 0x9214. Dieses Feld gibt die Position und Größe des "
 "Hauptmotivs in der Szene an."
 
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
 msgid "Flash Energy"
 msgstr "Energie des Blitzes"
 
-#: src/properties.cpp:536
+#: src/properties.cpp:552
 msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
 msgstr ""
 
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: src/properties.cpp:537
+#: src/properties.cpp:553
+#, fuzzy
 msgid ""
 "EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
 "as specified in ISO 12233."
 msgstr ""
+"Exif-Feld 34855, 0x8827. Gibt die ISO Geschwindigkeit und -breite der Kamera "
+"bzw. des Eingabegeräts an, wie in ISO 12232 spezifiziert."
 
-#: src/properties.cpp:539 src/tags.cpp:650
+#: src/properties.cpp:555 src/tags.cpp:837
 msgid "Focal Plane X Resolution"
 msgstr "Fokusebene x-Auflösung"
 
-#: src/properties.cpp:539
+#: src/properties.cpp:555
+#, fuzzy
 msgid ""
 "EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
 "unit."
-msgstr ""
+msgstr "TIFF-Feld 282, 0x11A. Horizontale Auflösung in Pixeln pro Einheit."
 
-#: src/properties.cpp:540 src/tags.cpp:651
+#: src/properties.cpp:556 src/tags.cpp:838
 msgid "Focal Plane Y Resolution"
 msgstr "Fokusebene y-Auflösung"
 
-#: src/properties.cpp:540
+#: src/properties.cpp:556
+#, fuzzy
 msgid ""
 "EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
 "unit."
-msgstr ""
+msgstr "TIFF-Feld 283, 0x11B. Vertikale Auflösung in Pixeln pro Einheit."
 
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
 msgid "Focal Plane Resolution Unit"
 msgstr "Einheit der Angaben der Fokusebene"
 
-#: src/properties.cpp:541
+#: src/properties.cpp:557
 msgid ""
 "EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
 "FocalPlaneYResolution."
 msgstr ""
 
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
 msgid "Subject Location"
 msgstr "Ort des Motivs"
 
-#: src/properties.cpp:542
+#: src/properties.cpp:558
 msgid ""
 "EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
 "value is the horizontal pixel and the second value is the vertical pixel at "
 "which the main subject appears."
 msgstr ""
 
-#: src/properties.cpp:545 src/tags.cpp:657
+#: src/properties.cpp:561 src/tags.cpp:844
 msgid "Exposure Index"
 msgstr "Belichtungsindex"
 
-#: src/properties.cpp:545
+#: src/properties.cpp:561
+#, fuzzy
 msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
 msgstr ""
+"Exif-Feld 41495, 0xA217. Gibt den Sensortyp in der Kamera bzw. Eingabegerät "
+"an."
 
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
 msgid "Sensing Method"
 msgstr "Bildsensor"
 
-#: src/properties.cpp:546
+#: src/properties.cpp:562
 msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
 msgstr ""
 "Exif-Feld 41495, 0xA217. Gibt den Sensortyp in der Kamera bzw. Eingabegerät "
 "an."
 
-#: src/properties.cpp:547
+#: src/properties.cpp:563
+#, fuzzy
 msgid "EXIF tag 41728, 0xA300. Indicates image source."
-msgstr ""
+msgstr "Exif-Feld 41996, 0xA40C gibt den Abstand zum Motiv an."
 
-#: src/properties.cpp:548 src/tags.cpp:1364
+#: src/properties.cpp:564 src/tags.cpp:1554
 msgid "Scene Type"
 msgstr "Szenentyp"
 
-#: src/properties.cpp:548
+#: src/properties.cpp:564
+#, fuzzy
 msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
-msgstr ""
+msgstr "Exif-Feld 41996, 0xA40C gibt den Abstand zum Motiv an."
 
-#: src/properties.cpp:549 src/tags.cpp:572
+#: src/properties.cpp:565 src/tags.cpp:759
 msgid "CFA Pattern"
 msgstr "CFA Pattern"
 
-#: src/properties.cpp:549
+#: src/properties.cpp:565
 msgid ""
 "EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
 "sense."
 msgstr ""
 
-#: src/properties.cpp:550 src/tags.cpp:1374
+#: src/properties.cpp:566 src/tags.cpp:1564
 msgid "Custom Rendered"
 msgstr "Besondere Verarbeitung"
 
-#: src/properties.cpp:550
+#: src/properties.cpp:566
+#, fuzzy
 msgid ""
 "EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
 "data."
 msgstr ""
+"Exif-Feld 41986, 0xA402. Dieses Feld enthält den Belichtungsmodus, der zur "
+"Aufnahme eingestellt war."
 
-#: src/properties.cpp:551
+#: src/properties.cpp:567
 msgid ""
 "EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
 "shot."
@@ -13325,7 +16535,7 @@
 "Exif-Feld 41986, 0xA402. Dieses Feld enthält den Belichtungsmodus, der zur "
 "Aufnahme eingestellt war."
 
-#: src/properties.cpp:552
+#: src/properties.cpp:568
 msgid ""
 "EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
 "was shot."
@@ -13333,11 +16543,11 @@
 "Exif-Feld 41987, 0xA403 enthält den Weißabgleichsmodus, der zur Aufnahme "
 "eingestellt war."
 
-#: src/properties.cpp:553 src/tags.cpp:1388
+#: src/properties.cpp:569 src/tags.cpp:1578
 msgid "Digital Zoom Ratio"
 msgstr "Digitale Zoomrate"
 
-#: src/properties.cpp:553
+#: src/properties.cpp:569
 msgid ""
 "EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
 "shot."
@@ -13345,11 +16555,11 @@
 "EXIF-Feld 41988, 0xA404 gibt den Grad des digitalen Zooms an mit dem das "
 "Bild aufgenommen wurde."
 
-#: src/properties.cpp:554 src/tags.cpp:1393
+#: src/properties.cpp:570 src/tags.cpp:1583
 msgid "Focal Length In 35mm Film"
 msgstr "Brennweite in 35mm Film"
 
-#: src/properties.cpp:554
+#: src/properties.cpp:570
 msgid ""
 "EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
 "35mm film camera, in mm. A value of 0 means the focal length is unknown. "
@@ -13359,25 +16569,31 @@
 "an. Der Wert 0 bedeutet das die Brennweite unbekannt ist. Es unterscheidet "
 "sich vom <FocalLength>Feld."
 
-#: src/properties.cpp:557 src/tags.cpp:1399
+#: src/properties.cpp:573 src/tags.cpp:1589
 msgid "Scene Capture Type"
 msgstr "Szenenmodus"
 
-#: src/properties.cpp:557
+#: src/properties.cpp:573
+#, fuzzy
 msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
 msgstr ""
+"Exif-Feld 41986, 0xA402. Dieses Feld enthält den Belichtungsmodus, der zur "
+"Aufnahme eingestellt war."
 
-#: src/properties.cpp:558 src/tags.cpp:1404
+#: src/properties.cpp:574 src/tags.cpp:1594
 msgid "Gain Control"
 msgstr "Körnungskontrolle"
 
-#: src/properties.cpp:558
+#: src/properties.cpp:574
+#, fuzzy
 msgid ""
 "EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
 "adjustment."
 msgstr ""
+"Exif-Feld 41986, 0xA402. Dieses Feld enthält den Belichtungsmodus, der zur "
+"Aufnahme eingestellt war."
 
-#: src/properties.cpp:559
+#: src/properties.cpp:575
 msgid ""
 "EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
 "applied by the camera."
@@ -13385,7 +16601,7 @@
 "Exif-Feld 41992, 0xA408 gibt die Richtung der Kontrastbearbeitung an, die "
 "bei der Aufnahme des Bildes angewandt wurde."
 
-#: src/properties.cpp:560
+#: src/properties.cpp:576
 msgid ""
 "EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
 "applied by the camera."
@@ -13393,7 +16609,7 @@
 "Exif-Feld 41993, 0xA409 gibt die Richtung der Sättigungsbearbeitung an, die "
 "bei der Aufnahme des Bildes angewandt wurde."
 
-#: src/properties.cpp:561
+#: src/properties.cpp:577
 msgid ""
 "EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
 "applied by the camera."
@@ -13401,29 +16617,33 @@
 "Exif-Feld 41994, 0xA40A gibt die Richtung der Schärfebearbeitung bei der "
 "Aufnahme des Bildes an."
 
-#: src/properties.cpp:562 src/tags.cpp:1419
+#: src/properties.cpp:578 src/tags.cpp:1609
 msgid "Device Setting Description"
 msgstr "Beschreibung der Geräteeinstellungen"
 
-#: src/properties.cpp:562
+#: src/properties.cpp:578
+#, fuzzy
 msgid ""
 "EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
 "conditions of a particular camera model."
 msgstr ""
+"Dieses Feld enthält Informationen über die Bildaufnahmebedingungen eines "
+"bestimmten Kameramodells. Es wird nur zur Angabe der Bedingungen im Leser "
+"benutzt."
 
-#: src/properties.cpp:563 src/tags.cpp:1424
+#: src/properties.cpp:579 src/tags.cpp:1614
 msgid "Subject Distance Range"
 msgstr "Motivabstand"
 
-#: src/properties.cpp:563
+#: src/properties.cpp:579
 msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
 msgstr "Exif-Feld 41996, 0xA40C gibt den Abstand zum Motiv an."
 
-#: src/properties.cpp:564 src/tags.cpp:1427
+#: src/properties.cpp:580 src/tags.cpp:1617
 msgid "Image Unique ID"
 msgstr "Eindeutige Bildnummer"
 
-#: src/properties.cpp:564
+#: src/properties.cpp:580
 msgid ""
 "EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
 "recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
@@ -13434,57 +16654,57 @@
 "Zeichen aufgezeichnet und hat damit in hexadezimaler Notation eine 128 Bit "
 "Länge ."
 
-#: src/properties.cpp:566 src/tags.cpp:1501
+#: src/properties.cpp:582 src/tags.cpp:1691
 msgid "GPS Version ID"
 msgstr "GPS Version ID"
 
-#: src/properties.cpp:566
+#: src/properties.cpp:582
 msgid ""
 "GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
 "period separators. The current value is \"2.0.0.0\"."
 msgstr ""
 
-#: src/properties.cpp:568 src/tags.cpp:1512
+#: src/properties.cpp:584 src/tags.cpp:1702
 msgid "GPS Latitude"
 msgstr "GPS-Breitengrad"
 
-#: src/properties.cpp:568
+#: src/properties.cpp:584
 msgid ""
 "GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
 msgstr ""
 
-#: src/properties.cpp:569 src/tags.cpp:1524
+#: src/properties.cpp:585 src/tags.cpp:1714
 msgid "GPS Longitude"
 msgstr "GPS-Längengrad"
 
-#: src/properties.cpp:569
+#: src/properties.cpp:585
 msgid ""
 "GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
 msgstr ""
 
-#: src/properties.cpp:570 src/tags.cpp:1532
+#: src/properties.cpp:586 src/tags.cpp:1722
 msgid "GPS Altitude Reference"
 msgstr "GPS-Höhenreferenz"
 
-#: src/properties.cpp:570
+#: src/properties.cpp:586
 #, fuzzy
 msgid ""
 "GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
 msgstr "GPS-Feld 6, 0x06 gibt die Höhe in Metern an."
 
-#: src/properties.cpp:571 src/tags.cpp:1540
+#: src/properties.cpp:587 src/tags.cpp:1730
 msgid "GPS Altitude"
 msgstr "GPS-Höhe"
 
-#: src/properties.cpp:571
+#: src/properties.cpp:587
 msgid "GPS tag 6, 0x06. Indicates altitude in meters."
 msgstr "GPS-Feld 6, 0x06 gibt die Höhe in Metern an."
 
-#: src/properties.cpp:572 src/tags.cpp:1544
+#: src/properties.cpp:588 src/tags.cpp:1734
 msgid "GPS Time Stamp"
 msgstr "GPS-Zeitstempel"
 
-#: src/properties.cpp:572
+#: src/properties.cpp:588
 msgid ""
 "GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
 "data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
@@ -13494,85 +16714,93 @@
 "no date is available, do not write exif:GPSTimeStamp to XMP."
 msgstr ""
 
-#: src/properties.cpp:578 src/tags.cpp:1549
+#: src/properties.cpp:594 src/tags.cpp:1739
 msgid "GPS Satellites"
 msgstr "GPS-Satelliten"
 
-#: src/properties.cpp:578
+#: src/properties.cpp:594
 msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
 msgstr ""
 
-#: src/properties.cpp:579 src/tags.cpp:1556
+#: src/properties.cpp:595 src/tags.cpp:1746
 msgid "GPS Status"
 msgstr "GPS-Status"
 
-#: src/properties.cpp:579
+#: src/properties.cpp:595
+#, fuzzy
 msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
-msgstr ""
+msgstr "GPS-Feld 26, 0x1A. Die Entfernung zum Objekt (in Metern)."
 
-#: src/properties.cpp:580 src/tags.cpp:1561
+#: src/properties.cpp:596 src/tags.cpp:1751
 msgid "GPS Measure Mode"
 msgstr "GPS-Messungsmodus"
 
-#: src/properties.cpp:580
+#: src/properties.cpp:596
 msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 msgid "GPS DOP"
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
 msgstr "GPS-Feld 11, 0x0B. Grad der Präzision der GPS-Daten"
 
-#: src/properties.cpp:582 src/tags.cpp:1569
+#: src/properties.cpp:598 src/tags.cpp:1759
 msgid "GPS Speed Reference"
 msgstr "GPS-Geschwindigkeitsreferenz"
 
-#: src/properties.cpp:582
+#: src/properties.cpp:598
+#, fuzzy
 msgid "GPS tag 12, 0x0C. Units used to speed measurement."
-msgstr ""
+msgstr "GPS-Feld 26, 0x1A. Die Entfernung zum Objekt (in Metern)."
 
-#: src/properties.cpp:583 src/tags.cpp:1573
+#: src/properties.cpp:599 src/tags.cpp:1763
 msgid "GPS Speed"
 msgstr "GPS-Geschwindigkeit"
 
-#: src/properties.cpp:583
+#: src/properties.cpp:599
+#, fuzzy
 msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
-msgstr ""
+msgstr "GPS-Feld 11, 0x0B. Grad der Präzision der GPS-Daten"
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
 msgid "GPS Track Reference"
 msgstr "GPS-Spurreferenz"
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
+#, fuzzy
 msgid "GPS tag 14, 0x0E. Reference for movement direction."
-msgstr ""
+msgstr "GPS-Feld 26, 0x1A. Die Entfernung zum Objekt (in Metern)."
 
-#: src/properties.cpp:585 src/tags.cpp:1580
+#: src/properties.cpp:601 src/tags.cpp:1770
 msgid "GPS Track"
 msgstr "GPS-Spur"
 
-#: src/properties.cpp:585
+#: src/properties.cpp:601
+#, fuzzy
 msgid ""
 "GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
 msgstr ""
+"GPS-Feld 17, 0x11. Gibt die Richtung an in der das Bild gemacht wurde. Der "
+"Wertebereich geht von 0,00 bis 359,99."
 
-#: src/properties.cpp:586 src/tags.cpp:1584
+#: src/properties.cpp:602 src/tags.cpp:1774
+#, fuzzy
 msgid "GPS Image Direction Reference"
-msgstr ""
+msgstr "GPS-Bildrichtung"
 
-#: src/properties.cpp:586
+#: src/properties.cpp:602
 #, fuzzy
 msgid "GPS tag 16, 0x10. Reference for image direction."
 msgstr "GPS-Feld 26, 0x1A. Die Entfernung zum Objekt (in Metern)."
 
-#: src/properties.cpp:587 src/tags.cpp:1588
+#: src/properties.cpp:603 src/tags.cpp:1778
 msgid "GPS Image Direction"
 msgstr "GPS-Bildrichtung"
 
-#: src/properties.cpp:587
+#: src/properties.cpp:603
 msgid ""
 "GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
 "359.99."
@@ -13580,133 +16808,141 @@
 "GPS-Feld 17, 0x11. Gibt die Richtung an in der das Bild gemacht wurde. Der "
 "Wertebereich geht von 0,00 bis 359,99."
 
-#: src/properties.cpp:588 src/tags.cpp:1592
+#: src/properties.cpp:604 src/tags.cpp:1782
+#, fuzzy
 msgid "GPS Map Datum"
-msgstr ""
+msgstr "GPS-Status"
 
-#: src/properties.cpp:588
+#: src/properties.cpp:604
+#, fuzzy
 msgid "GPS tag 18, 0x12. Geodetic survey data."
-msgstr ""
+msgstr "GPS-Feld 11, 0x0B. Grad der Präzision der GPS-Daten"
 
-#: src/properties.cpp:589 src/tags.cpp:1600
+#: src/properties.cpp:605 src/tags.cpp:1790
 msgid "GPS Destination Latitude"
 msgstr "GPS Breitengrad des Ziels"
 
-#: src/properties.cpp:589
+#: src/properties.cpp:605
 msgid ""
 "GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
 "destination latitude."
 msgstr ""
 
-#: src/properties.cpp:590 src/tags.cpp:1612
+#: src/properties.cpp:606 src/tags.cpp:1802
 msgid "GPS Destination Longitude"
 msgstr "GPS Längengrad des Ziels"
 
-#: src/properties.cpp:590
+#: src/properties.cpp:606
 msgid ""
 "GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
 "longitude."
 msgstr ""
 
-#: src/properties.cpp:591 src/tags.cpp:1619
+#: src/properties.cpp:607 src/tags.cpp:1809
 msgid "GPS Destination Bearing Reference"
 msgstr "GPS Referenz zur Richtung zum Ziel"
 
-#: src/properties.cpp:591
+#: src/properties.cpp:607
+#, fuzzy
 msgid "GPS tag 23, 0x17. Reference for movement direction."
-msgstr ""
+msgstr "GPS-Feld 26, 0x1A. Die Entfernung zum Objekt (in Metern)."
 
-#: src/properties.cpp:592 src/tags.cpp:1623
+#: src/properties.cpp:608 src/tags.cpp:1813
 msgid "GPS Destination Bearing"
 msgstr "GPS Richtung zum Ziel"
 
-#: src/properties.cpp:592
+#: src/properties.cpp:608
+#, fuzzy
 msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
 msgstr ""
+"GPS-Feld 17, 0x11. Gibt die Richtung an in der das Bild gemacht wurde. Der "
+"Wertebereich geht von 0,00 bis 359,99."
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
 msgid "GPS Destination Distance Refefrence"
 msgstr "GPS Referenz zur Entfernung des Objektes"
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
+#, fuzzy
 msgid "GPS tag 25, 0x19. Units used for speed measurement."
-msgstr ""
+msgstr "GPS-Feld 26, 0x1A. Die Entfernung zum Objekt (in Metern)."
 
-#: src/properties.cpp:594 src/tags.cpp:1631
+#: src/properties.cpp:610 src/tags.cpp:1821
 msgid "GPS Destination Distance"
 msgstr "GPS Entfernung des Objekts"
 
-#: src/properties.cpp:594
+#: src/properties.cpp:610
 msgid "GPS tag 26, 0x1A. Distance to destination."
 msgstr "GPS-Feld 26, 0x1A. Die Entfernung zum Objekt (in Metern)."
 
-#: src/properties.cpp:595 src/tags.cpp:1634
+#: src/properties.cpp:611 src/tags.cpp:1824
 msgid "GPS Processing Method"
 msgstr "GPS Verarbeitungsmethode"
 
-#: src/properties.cpp:595
+#: src/properties.cpp:611
 msgid ""
 "GPS tag 27, 0x1B. A character string recording the name of the method used "
 "for location finding."
 msgstr ""
 
-#: src/properties.cpp:596 src/tags.cpp:1639
+#: src/properties.cpp:612 src/tags.cpp:1829
 msgid "GPS Area Information"
 msgstr "GPS Bereichsinformation"
 
-#: src/properties.cpp:596
+#: src/properties.cpp:612
 msgid ""
 "GPS tag 28, 0x1C. A character string recording the name of the GPS area."
 msgstr ""
 
-#: src/properties.cpp:597 src/tags.cpp:1647
+#: src/properties.cpp:613 src/tags.cpp:1837
 msgid "GPS Differential"
 msgstr ""
 
-#: src/properties.cpp:597
+#: src/properties.cpp:613
+#, fuzzy
 msgid ""
 "GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
 "the GPS receiver."
-msgstr ""
+msgstr "GPS-Feld 6, 0x06 gibt die Höhe in Metern an."
 
-#: src/properties.cpp:603
+#: src/properties.cpp:619
 msgid ""
 "A description of the lens used to take the photograph. For example, \"70-200 "
 "mm f/2.8-4.0\"."
 msgstr ""
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid "SerialNumber"
 msgstr "Seriennummer"
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid ""
 "The serial number of the camera or camera body used to take the photograph."
 msgstr ""
 "Die Seriennummer der Kamera oder des Kamerakörpers mit dem das Foto gemacht "
 "wurde."
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
 msgid "Contact Info-City"
 msgstr "Kontaktinfo-Stadt"
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
 msgid "The contact information city part."
 msgstr "Der Teil der Kontaktinformation für die Stadt."
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 msgid "Contact Info-Country"
 msgstr "Kontaktinfo-Land"
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 msgid "The contact information country part."
 msgstr "Der Teil der Kontaktinformation für das Land."
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid "Contact Info-Address"
 msgstr "Kontaktinfo-Adresse"
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid ""
 "The contact information address part. Comprises an optional company name and "
 "all required information to locate the building or postbox to which mail "
@@ -13716,19 +16952,19 @@
 "optionalen Firmennamen und alle benötigten Informationen um das Gebäude oder "
 "das Postfach zu finden, um Briefe dort hin zusenden."
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
 msgid "Contact Info-Postal Code"
 msgstr "Kontaktinfo-Postleitzahl"
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
 msgid "The contact information part denoting the local postal code."
 msgstr "Der Teil der Kontaktinformation der die Postleitzahl enthält."
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid "Contact Info-State/Province"
 msgstr "Kontaktinfo-Staat/Provinz"
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid ""
 "The contact information part denoting regional information like state or "
 "province."
@@ -13736,31 +16972,31 @@
 "Der Teil der Kontaktinformation der die reginalen Informationen wie Staat "
 "oder Provinz enthält."
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
 msgid "Contact Info-Email"
 msgstr "Kontaktinfo-E-Mail"
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
 msgid "The contact information email address part."
 msgstr "Der Teil der Kontaktinformation der die E-Mail Adresse enthält."
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
 msgid "Contact Info-Phone"
 msgstr "Kontaktinfo-Telefon"
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
 msgid "The contact information phone number part."
 msgstr "Der Teil der Kontaktinformation der die Telefonnumer enthält."
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
 msgid "Contact Info-Web URL"
 msgstr "Kontaktinfo-Web URL"
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
 msgid "The contact information web address part."
 msgstr "Der Teil der Kontaktinformation der die Web-Adresse enthält."
 
-#: src/properties.cpp:619
+#: src/properties.cpp:635
 msgid ""
 "Code of the country the content is focussing on -- either the country shown "
 "in visual media or referenced in text or audio media. This element is at the "
@@ -13769,28 +17005,28 @@
 "should go to the \"Country\" element."
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid "Creator's Contact Info"
 msgstr "Kontaktinfo des Erstellers"
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid ""
 "The creator's contact information provides all necessary information to get "
 "in contact with the creator of this news object and comprises a set of sub-"
 "properties for proper addressing."
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid "Intellectual Genre"
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid ""
 "Describes the nature, intellectual or journalistic characteristic of a news "
 "object, not specifically its content."
 msgstr ""
 
-#: src/properties.cpp:627
+#: src/properties.cpp:643
 msgid ""
 "Name of a location the content is focussing on -- either the location shown "
 "in visual media or referenced by text or audio media. This location name "
@@ -13800,274 +17036,282 @@
 "geographical hierarchy."
 msgstr ""
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid "IPTC Scene"
 msgstr "IPTC-Szene"
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid ""
 "Describes the scene of a photo content. Specifies one or more terms from the "
 "IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
 "in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid "IPTC Subject Code"
 msgstr "IPTC-Motivkode"
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid ""
 "Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
 "to categorize the content. Each Subject is represented as a string of 8 "
 "digits in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
+#, fuzzy
 msgid "Additional model info"
-msgstr ""
+msgstr "Autofokus-Positioninformation"
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
 msgid ""
 "Information about the ethnicity and other facts of the model(s) in a model-"
 "released image."
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid "Code of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid ""
 "Code from controlled vocabulary for identyfing the organisation or company "
 "which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid "Controlled Vocabulary Term"
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid ""
 "A term to describe the content of the image by a value from a Controlled "
 "Vocabulary."
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 #, fuzzy
 msgid "Model age"
 msgstr "Modell"
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 msgid ""
 "Age of the human model(s) at the time this image was taken in a model "
 "released image."
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of the organisation or company which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 #, fuzzy
 msgid "Person shown"
 msgstr "Versionen"
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 msgid "Name of a person shown in the image."
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 #, fuzzy
 msgid "Digital Image Identifier"
 msgstr "Digitale Bildstabilisierung"
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 msgid ""
 "Globally unique identifier for this digital image. It is created and applied "
 "by the creator of the digital image at the time of its creation. this value "
 "shall not be changed after that time."
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 msgid "Physical type of original photo"
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 #, fuzzy
 msgid "The type of the source digital file."
 msgstr "Die Abspieldauer der Mediendatei."
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
 #, fuzzy
 msgid "Event"
 msgstr "Abend"
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665
 msgid "Names or describes the specific event at which the photo was taken."
 msgstr ""
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 #, fuzzy
 msgid "Maximum available height"
 msgstr "Verfügbares Licht"
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 msgid ""
 "The maximum available height in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 #, fuzzy
 msgid "Maximum available width"
 msgstr "Maximale Fokuslänge"
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 msgid ""
 "The maximum available width in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 #, fuzzy
 msgid "Registry Entry"
 msgstr "Feldeintrag"
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid ""
 "Both a Registry Item Id and a Registry Organisation Id to record any "
 "registration of this digital image with a registry."
 msgstr ""
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
+#, fuzzy
 msgid "Registry Entry-Item Identifier"
-msgstr ""
+msgstr "Feldeintrag"
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
 msgid ""
 "A unique identifier created by a registry and applied by the creator of the "
 "digital image. This value shall not be changed after being applied. This "
 "identifier is linked to a corresponding Registry Organisation Identifier."
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid "Registry Entry-Organisation Identifier"
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid ""
 "An identifier for the registry which issued the corresponding Registry Image "
 "Id."
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 msgid "IPTC Fields Last Edited"
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 #, fuzzy
 msgid ""
 "The date and optionally time when any of the IPTC photo metadata fields has "
 "been last edited."
 msgstr "Das Datum und die Uhrzeit der letzten Änderung der Metadaten."
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
 #, fuzzy
 msgid "Location shown"
 msgstr "Ortscode"
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
+#, fuzzy
 msgid "A location shown in the image."
-msgstr ""
+msgstr "Offset des Vorschaubildes"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "Location Created"
 msgstr "Ortscode"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "The location the photo was taken."
 msgstr "Der Name der Aufnahme."
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Location-City"
 msgstr "Ort"
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Name of the city of a location."
 msgstr "Der Name des Künstlers bzw. der Künstler."
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
 #, fuzzy
 msgid "Location-Country ISO-Code"
 msgstr "Ortscode"
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
+#, fuzzy
 msgid "The ISO code of a country of a location."
-msgstr ""
+msgstr "Der Name der Aufnahme."
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "Location-Country Name"
 msgstr "Ortsname"
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "The name of a country of a location."
 msgstr "Der Name der Aufnahme."
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
 #, fuzzy
 msgid "Location-Province/State"
 msgstr "Provinz/Staat"
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
+#, fuzzy
 msgid ""
 "The name of a subregion of a country - a province or state - of a location."
-msgstr ""
+msgstr "Der Name der Aufnahme."
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 #, fuzzy
 msgid "Location-Sublocation"
 msgstr "Genauer Ort"
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 msgid ""
 "Name of a sublocation. This sublocation name could either be the name of a "
 "sublocation to a city or the name of a well known location or (natural) "
 "monument outside a city."
 msgstr ""
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
 #, fuzzy
 msgid "Location-World Region"
 msgstr "Ortscode"
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
+#, fuzzy
 msgid "The name of a world region of a location."
-msgstr ""
+msgstr "Der Name der Aufnahme."
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
+#, fuzzy
 msgid "Artwork or object in the image"
-msgstr ""
+msgstr "Eine Referenz zu dem Projekt das diese Datei erstellt hat."
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
+#, fuzzy
 msgid "A set of metadata about artwork or an object in the image."
-msgstr ""
+msgstr "Eine Referenz zu dem Projekt das diese Datei erstellt hat."
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 #, fuzzy
 msgid "Artwork or object-Copyright notice"
 msgstr "Copyright-Notiz"
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 msgid ""
 "Contains any necessary copyright notice for claiming the intellectual "
 "property for artwork or an object in the image and should identify the "
@@ -14075,1642 +17319,2180 @@
 "property rights."
 msgstr ""
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
+#, fuzzy
 msgid "Artwork or object-Creator"
-msgstr ""
+msgstr "Copyright-Notiz"
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
 msgid ""
 "Contains the name of the artist who has created artwork or an object in the "
 "image. In cases where the artist could or should not be identified the name "
 "of a company or organisation may be appropriate."
 msgstr ""
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
+#, fuzzy
 msgid "Artwork or object-Date Created"
-msgstr ""
+msgstr "Copyright-Notiz"
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
 msgid ""
 "Designates the date and optionally the time the artwork or object in the "
 "image was created. This relates to artwork or objects with associated "
 "intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
+#, fuzzy
 msgid "Artwork or object-Source"
-msgstr ""
+msgstr "Copyright-Notiz"
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
 msgid ""
 "The organisation or body holding and registering the artwork or object in "
 "the image for inventory purposes."
 msgstr ""
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
+#, fuzzy
 msgid "Artwork or object-Source inventory number"
-msgstr ""
+msgstr "Copyright-Notiz"
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
 msgid ""
 "The inventory number issued by the organisation or body holding and "
 "registering the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
+#, fuzzy
 msgid "Artwork or object-Title"
-msgstr ""
+msgstr "Copyright-Notiz"
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
 #, fuzzy
 msgid "A reference for the artwork or object in the image."
 msgstr "Eine Referenz zu dem Projekt das diese Datei erstellt hat."
 
-#: src/properties.cpp:677
+#: src/properties.cpp:693
 msgid "Scan from film"
 msgstr ""
 
-#: src/properties.cpp:678
+#: src/properties.cpp:694
 msgid "Scan from transparency (including slide)"
 msgstr ""
 
-#: src/properties.cpp:679
+#: src/properties.cpp:695
 msgid "Scan from print"
 msgstr ""
 
-#: src/properties.cpp:680
+#: src/properties.cpp:696
 #, fuzzy
 msgid "Camera RAW"
 msgstr "Kamera ID"
 
-#: src/properties.cpp:681
+#: src/properties.cpp:697
 #, fuzzy
 msgid "Camera TIFF"
 msgstr "Kamera ID"
 
-#: src/properties.cpp:682
+#: src/properties.cpp:698
 #, fuzzy
 msgid "Camera JPEG"
 msgstr "Kamera ID"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 #, fuzzy
 msgid "PLUS Version"
 msgstr "PDF-Version"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 msgid ""
 "The version number of the PLUS standards in place at the time of the "
 "transaction."
 msgstr ""
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 #, fuzzy
 msgid "Licensee"
 msgstr "Linse"
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 msgid ""
 "Party or parties to whom the license is granted by the Licensor/s under the "
 "license transaction."
 msgstr ""
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 #, fuzzy
 msgid "Licensee ID"
 msgstr "Linsen-ID"
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 msgid "Optional PLUS-ID identifying each Licensee."
 msgstr ""
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Licensee Name"
 msgstr "Ortsname"
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Name of each Licensee."
 msgstr "Der Name der Szene."
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 #, fuzzy
 msgid "End User"
 msgstr "Erweiterung"
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 msgid "Party or parties ultimately making use of the image under the license."
 msgstr ""
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
+#, fuzzy
 msgid "End User ID"
-msgstr ""
+msgstr "Erweiterung"
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
 msgid "Optional PLUS-ID identifying each End User."
 msgstr ""
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
 #, fuzzy
 msgid "End User Name"
 msgstr "Besitzername"
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
+#, fuzzy
 msgid "Name of each End User."
-msgstr ""
+msgstr "Der Name der Szene."
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 #, fuzzy
 msgid "Licensor"
 msgstr "Linse"
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 msgid "Party or parties granting the license to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 #, fuzzy
 msgid "Licensor ID"
 msgstr "Linsen-ID"
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 msgid "Optional PLUS-ID identifying each Licensor."
 msgstr ""
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
 #, fuzzy
 msgid "Licensor Name"
 msgstr "Ortsname"
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
+#, fuzzy
 msgid "Name of each Licensor."
-msgstr ""
+msgstr "Der Name der Szene."
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor Address"
-msgstr ""
+msgstr "Linseneigenschaften"
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor street address."
-msgstr ""
+msgstr "Ländername"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
+#, fuzzy
 msgid "Licensor Address Detail"
-msgstr ""
+msgstr "Kontaktinfo-Postleitzahl"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
+#, fuzzy
 msgid "Additional Licensor mailing address details."
-msgstr ""
+msgstr "Autofokus-Positioninformation"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
 #, fuzzy
 msgid "Licensor City"
 msgstr "Mexico Stadt"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
+#, fuzzy
 msgid "Licensor City name."
-msgstr ""
+msgstr "Ländername"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
 #, fuzzy
 msgid "Licensor State or Province"
 msgstr "Staat/Provinz"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
+#, fuzzy
 msgid "Licensor State or Province name."
-msgstr ""
+msgstr "Staat/Provinz"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
 #, fuzzy
 msgid "Licensor Postal Code"
 msgstr "Kontaktinfo-Postleitzahl"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
+#, fuzzy
 msgid "Licensor Postal Code or Zip Code."
-msgstr ""
+msgstr "Kontaktinfo-Postleitzahl"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country"
 msgstr "Land"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country name."
 msgstr "Ländername"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1"
-msgstr ""
+msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1."
-msgstr ""
+msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
+#, fuzzy
 msgid "Licensor Telephone 1"
-msgstr ""
+msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
 #, fuzzy
 msgid "Licensor Telephone number 1."
 msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2"
-msgstr ""
+msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2."
-msgstr ""
+msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
+#, fuzzy
 msgid "Licensor Telephone 2"
-msgstr ""
+msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
 #, fuzzy
 msgid "Licensor Telephone number 2."
 msgstr "Linsen-Seriennummer"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email"
-msgstr ""
+msgstr "Ortsname"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email address."
-msgstr ""
+msgstr "Kontaktinfo-Postleitzahl"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 #, fuzzy
 msgid "Licensor URL"
 msgstr "Letzte Adresse"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 msgid "Licensor world wide web address."
 msgstr ""
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 #, fuzzy
 msgid "Licensor Notes"
 msgstr "Linseneigenschaften"
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 msgid ""
 "Supplemental information for use in identifying and contacting the Licensor/"
 "s."
 msgstr ""
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 #, fuzzy
 msgid "PLUS Media Summary Code"
 msgstr "GPS-Messungsmodus"
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 msgid ""
 "A PLUS-standardized alphanumeric code string summarizing the media usages "
 "included in the license."
 msgstr ""
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "License Start Date"
 msgstr "Szenenerkennungsdaten"
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "The date on which the license takes effect."
 msgstr "Das Datum und die Uhrzeit an dem das Video aufgenommen wurde."
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "License End Date"
 msgstr "Linsendaten"
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "The date on which the license expires."
 msgstr "Der Name der Szene."
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 #, fuzzy
 msgid "Media Constraints"
 msgstr "Kontrast"
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 msgid ""
 "Constraints limiting the scope of PLUS Media Usage/s included in the license "
 "to particular named media or to media not yet specifically defined in the "
 "PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
+#, fuzzy
 msgid "Region Constraints"
-msgstr ""
+msgstr "Kontrast"
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
 msgid ""
 "Constraints limiting the scope of geographic distribution to specific "
 "cities, states, provinces or other areas to be included in or excluded from "
 "the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
+#, fuzzy
 msgid "Product or Service Constraints"
-msgstr ""
+msgstr "Autokontrast"
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
 msgid ""
 "Constraints limiting usage of the image to promotion of/association with a "
 "named product or service."
 msgstr ""
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 #, fuzzy
 msgid "Image File Constraints"
 msgstr "Bildgröße-Einstellungen"
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 msgid ""
 "Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
+#, fuzzy
 msgid "Image Alteration Constraints"
-msgstr ""
+msgstr "Bildqualitätseinstellungen"
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
 msgid ""
 "Constraints on alteration of the image by cropping, flipping, retouching, "
 "colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 #, fuzzy
 msgid "Image Duplication Constraints"
 msgstr "Bildqualitätseinstellungen"
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 #, fuzzy
 msgid "Model Release Status"
 msgstr "Freigabedatum"
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 msgid ""
 "Summarizes the availability and scope of model releases authorizing usage of "
 "the likenesses of persons appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 #, fuzzy
 msgid "Model Release ID"
 msgstr "Modell-ID"
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid ""
 "Age of the youngest model pictured in the image, at the time that the image "
 "was made."
 msgstr ""
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
+#, fuzzy
 msgid "Property Release Status"
-msgstr ""
+msgstr "Freigabedatum"
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
 msgid ""
 "Summarizes the availability and scope of property releases authorizing usage "
 "of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
+#, fuzzy
 msgid "Property Release ID"
-msgstr ""
+msgstr "Modell-ID"
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
 msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
 #, fuzzy
 msgid "Other Constraints"
 msgstr "Autokontrast"
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
 #, fuzzy
 msgid "Additional constraints on the license."
 msgstr "Zusätzliche Parameter für den Stretchmodus des Taktverbundes."
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
+#, fuzzy
 msgid "Credit Line Required"
-msgstr ""
+msgstr "Nicht benutzt"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
 msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Other License Requirements"
-msgstr ""
+msgstr "Linseninformation"
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Additional license requirements."
-msgstr ""
+msgstr "Autofokus-Positioninformation"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
+#, fuzzy
 msgid "Terms and Conditions Text"
-msgstr ""
+msgstr "Aufnahmebedingungen"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
+#, fuzzy
 msgid "Terms and Conditions applying to the license."
-msgstr ""
+msgstr "Zusätzliche Parameter für den Stretchmodus des Taktverbundes."
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
+#, fuzzy
 msgid "Terms and Conditions URL"
-msgstr ""
+msgstr "Aufnahmebedingungen"
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
 msgid "URL for Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
 #, fuzzy
 msgid "Other License Conditions"
 msgstr "Aufnahmebedingungen"
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
+#, fuzzy
 msgid "Additional license conditions."
-msgstr ""
+msgstr "Autofokus-Positioninformation"
 
-#: src/properties.cpp:731
+#: src/properties.cpp:747
 #, fuzzy
 msgid "Identifies the type of image delivered."
 msgstr "Identifiziert den Anbieter und das Produkt"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
+#, fuzzy
 msgid "Licensor Image ID"
-msgstr ""
+msgstr "Linsen-ID"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
 msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
+#, fuzzy
 msgid "Image File Name As Delivered"
-msgstr ""
+msgstr "Zugehöriges Bilddateiformat"
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
 msgid ""
 "Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 #, fuzzy
 msgid "Image File Format As Delivered"
 msgstr "Zugehöriges Bilddateiformat"
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 msgid ""
 "File format of the image file delivered to the Licensee for use under the "
 "license."
 msgstr ""
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
+#, fuzzy
 msgid "Image File Size As Delivered"
-msgstr ""
+msgstr "Zugehöriges Bilddateiformat"
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
 msgid "Size of the image file delivered to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright Status"
 msgstr "Copyright"
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright status of the image."
 msgstr "Copyright-Notiz"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
+#, fuzzy
 msgid "Copyright Registration Number"
-msgstr ""
+msgstr "Besitzername"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
 msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "First Publication Date"
 msgstr "Digitalisierungsdatum"
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "The date on which the image was first published."
 msgstr "Das Datum andem der Titel veröffentlicht wurde."
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 #, fuzzy
 msgid "Copyright Owner"
 msgstr "Copyright"
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 #, fuzzy
 msgid "Copyright Owner ID"
 msgstr "Copyright"
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
 #, fuzzy
 msgid "Copyright Owner Name"
 msgstr "Besitzername"
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
+#, fuzzy
 msgid "Name of Copyright Owner."
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
+#, fuzzy
 msgid "Copyright Owner Image ID"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
 msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Image Creator"
 msgstr "Bild-Orientierung"
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Creator/s of the image."
 msgstr "Offset des Vorschaubildes"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 #, fuzzy
 msgid "Image Creator ID"
 msgstr "Bild-Orientierung"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 msgid "Optional PLUS-ID identifying each Image Creator."
 msgstr ""
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Image Creator Name"
 msgstr "Bildton"
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Name of Image Creator."
 msgstr "Rohbild-Center"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
+#, fuzzy
 msgid "Image Creator Image ID"
-msgstr ""
+msgstr "Bild-Orientierung"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
 msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 #, fuzzy
 msgid "Image Supplier ID"
 msgstr "Eindeutige Bildnummer"
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
 #, fuzzy
 msgid "Image Supplier Name"
 msgstr "Bildgrõße"
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
+#, fuzzy
 msgid "Name of Image Supplier."
-msgstr ""
+msgstr "Rohbild-Center"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
+#, fuzzy
 msgid "Image Supplier Image ID"
-msgstr ""
+msgstr "Eindeutige Bildnummer"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
 msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
+#, fuzzy
 msgid "Licensee Image ID"
-msgstr ""
+msgstr "Bildanzahl löschen"
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
 msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
 #, fuzzy
 msgid "Licensee Image Notes"
 msgstr "Bildanzahl löschen"
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
+#, fuzzy
 msgid "Notes added by Licensee."
-msgstr ""
+msgstr "Der Name der Szene."
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
+#, fuzzy
 msgid "Other Image Info"
-msgstr ""
+msgstr "Linseninformation"
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
 #, fuzzy
 msgid "Additional image information."
 msgstr "Autofokus-Positioninformation"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 #, fuzzy
 msgid "License ID"
 msgstr "Linsen-ID"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
+#, fuzzy
 msgid "Licensor Transaction ID"
-msgstr ""
+msgstr "Verfalldatum"
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
 msgid ""
 "Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
+#, fuzzy
 msgid "Licensee Transaction ID"
-msgstr ""
+msgstr "Verfalldatum"
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
 msgid ""
 "Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 #, fuzzy
 msgid "Licensee Project Reference"
 msgstr "Projektreferenz"
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "License Transaction Date"
 msgstr "Verfalldatum"
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "The date of the License Transaction."
 msgstr "Der Name der Szene."
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 #, fuzzy
 msgid "Reuse"
 msgstr "benutzt"
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 msgid ""
 "Indicates whether a license is a repeat or an initial license.  Reuse may "
 "require that licenses stored in files previously delivered to the customer "
 "be updated."
 msgstr ""
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
+#, fuzzy
 msgid "Other License Documents"
-msgstr ""
+msgstr "Aufnahmebedingungen"
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
 msgid ""
 "Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Other License Info"
 msgstr "Linseninformation"
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Additional license information."
 msgstr "Autofokus-Positioninformation"
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
 msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:764
+#: src/properties.cpp:780
 #, fuzzy
 msgid "Custom 4"
 msgstr "Benutzerdefiniert 1"
 
-#: src/properties.cpp:765
+#: src/properties.cpp:781
 #, fuzzy
 msgid "Custom 5"
 msgstr "Benutzerdefiniert 1"
 
-#: src/properties.cpp:766
+#: src/properties.cpp:782
 #, fuzzy
 msgid "Custom 6"
 msgstr "Benutzerdefiniert 1"
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
 msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:767
+#: src/properties.cpp:783
 #, fuzzy
 msgid "Custom 7"
 msgstr "Benutzerdefiniert 1"
 
-#: src/properties.cpp:768
+#: src/properties.cpp:784
 #, fuzzy
 msgid "Custom 8"
 msgstr "Benutzerdefiniert 1"
 
-#: src/properties.cpp:769
+#: src/properties.cpp:785
 #, fuzzy
 msgid "Custom 9"
 msgstr "Benutzerdefiniert 1"
 
-#: src/properties.cpp:770
+#: src/properties.cpp:786
 #, fuzzy
 msgid "Custom 10"
 msgstr "Benutzerdefiniert 1"
 
-#: src/properties.cpp:777
+#: src/properties.cpp:793
 msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:778
+#: src/properties.cpp:794
 #, fuzzy
 msgid "Not Required"
 msgstr "Nicht benutzt"
 
-#: src/properties.cpp:784
+#: src/properties.cpp:800
 #, fuzzy
 msgid "Protected"
 msgstr "Produkt-ID"
 
-#: src/properties.cpp:785
+#: src/properties.cpp:801
 #, fuzzy
 msgid "Public Domain"
 msgstr "Nach unten ziehen"
 
-#: src/properties.cpp:791
+#: src/properties.cpp:807
+#, fuzzy
 msgid "Credit Adjacent To Image"
-msgstr ""
+msgstr "Bildvorschau gültig"
 
-#: src/properties.cpp:792
+#: src/properties.cpp:808
 msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:793
+#: src/properties.cpp:809
 #, fuzzy
 msgid "Credit on Image"
 msgstr "Bildvorschau gültig"
 
-#: src/properties.cpp:794
+#: src/properties.cpp:810
 #, fuzzy
 msgid "Not Require"
 msgstr "Undefiniert"
 
-#: src/properties.cpp:799
+#: src/properties.cpp:815
 #, fuzzy
 msgid "No Colorization"
 msgstr "Solarisation"
 
-#: src/properties.cpp:800
+#: src/properties.cpp:816
 msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:801
+#: src/properties.cpp:817
 #, fuzzy
 msgid "No De-Colorization"
 msgstr "Solarisation"
 
-#: src/properties.cpp:802
+#: src/properties.cpp:818
 msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:803
+#: src/properties.cpp:819
+#, fuzzy
 msgid "No Merging"
-msgstr ""
+msgstr "Rauschunterdrückung"
 
-#: src/properties.cpp:804
+#: src/properties.cpp:820
 #, fuzzy
 msgid "No Retouching"
 msgstr "Rauschunterdrückung"
 
-#: src/properties.cpp:809
+#: src/properties.cpp:825
 msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:810
+#: src/properties.cpp:826
+#, fuzzy
 msgid "No Duplication Constraints"
-msgstr ""
+msgstr "Bildqualitätseinstellungen"
 
-#: src/properties.cpp:811
+#: src/properties.cpp:827
 #, fuzzy
 msgid "No Duplication"
 msgstr "Audiodauer"
 
-#: src/properties.cpp:816
+#: src/properties.cpp:832
 #, fuzzy
 msgid "Maintain File Name"
 msgstr "Rohdateiname"
 
-#: src/properties.cpp:817
+#: src/properties.cpp:833
+#, fuzzy
 msgid "Maintain File Type"
-msgstr ""
+msgstr "Rohdateiname"
 
-#: src/properties.cpp:818
+#: src/properties.cpp:834
 #, fuzzy
 msgid "Maintain ID in File Name"
 msgstr "Originaler Rohdateiname"
 
-#: src/properties.cpp:819
+#: src/properties.cpp:835
 #, fuzzy
 msgid "Maintain Metadata"
 msgstr "Minolta Datum"
 
-#: src/properties.cpp:824
+#: src/properties.cpp:840
 #, fuzzy
 msgid "Windows Bitmap (BMP)"
 msgstr "Windows-Titel"
 
-#: src/properties.cpp:825
+#: src/properties.cpp:841
 msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:826
+#: src/properties.cpp:842
 msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
-#: src/properties.cpp:827
+#: src/properties.cpp:843
 #, fuzzy
 msgid "Graphics Interchange Format (GIF)"
 msgstr "JPEG Interchange Format"
 
-#: src/properties.cpp:828
+#: src/properties.cpp:844
 #, fuzzy
 msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
 msgstr "JPEG Interchange Format"
 
-#: src/properties.cpp:830
+#: src/properties.cpp:846
 msgid "Macintosh Picture (PICT)"
 msgstr ""
 
-#: src/properties.cpp:831
+#: src/properties.cpp:847
 msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:832
+#: src/properties.cpp:848
 msgid "Photoshop Document (PSD)"
 msgstr ""
 
-#: src/properties.cpp:833
+#: src/properties.cpp:849
 msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:834
+#: src/properties.cpp:850
 #, fuzzy
 msgid "Tagged Image File Format (TIFF)"
 msgstr "Zugehöriges Bilddateiformat"
 
-#: src/properties.cpp:835
+#: src/properties.cpp:851
 msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:840
+#: src/properties.cpp:856
 msgid "Greater than 50 MB"
 msgstr ""
 
-#: src/properties.cpp:841
+#: src/properties.cpp:857
+#, fuzzy
 msgid "Up to 1 MB"
-msgstr ""
+msgstr "Optio A10"
 
-#: src/properties.cpp:842
+#: src/properties.cpp:858
 #, fuzzy
 msgid "Up to 10 MB"
 msgstr "Optio A10"
 
-#: src/properties.cpp:843
+#: src/properties.cpp:859
 #, fuzzy
 msgid "Up to 30 MB"
 msgstr "Optio 30"
 
-#: src/properties.cpp:844
+#: src/properties.cpp:860
 #, fuzzy
 msgid "Up to 50 MB"
 msgstr "Optio S50"
 
-#: src/properties.cpp:849
+#: src/properties.cpp:865
 #, fuzzy
 msgid "Illustrated Image"
 msgstr "Zugehörige Bildbreite"
 
-#: src/properties.cpp:850
+#: src/properties.cpp:866
 msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:852
+#: src/properties.cpp:868
 msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:853
-#, fuzzy
-msgid "Video"
-msgstr "Weit"
-
-#: src/properties.cpp:858
+#: src/properties.cpp:874
 #, fuzzy
 msgid "Cell"
 msgstr "Gelb"
 
-#: src/properties.cpp:859
+#: src/properties.cpp:875
 msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:861
+#: src/properties.cpp:877
 #, fuzzy
 msgid "Pager"
 msgstr "Verwalter"
 
-#: src/properties.cpp:862
+#: src/properties.cpp:878
 msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:867
+#: src/properties.cpp:883
 #, fuzzy
 msgid "Age Unknown"
 msgstr "Unbekannt"
 
-#: src/properties.cpp:868
+#: src/properties.cpp:884
 msgid "Age 25 or Over"
 msgstr ""
 
-#: src/properties.cpp:869
+#: src/properties.cpp:885
 msgid "Age 24"
 msgstr ""
 
-#: src/properties.cpp:870
+#: src/properties.cpp:886
 msgid "Age 23"
 msgstr ""
 
-#: src/properties.cpp:871
+#: src/properties.cpp:887
 msgid "Age 22"
 msgstr ""
 
-#: src/properties.cpp:872
+#: src/properties.cpp:888
 msgid "Age 21"
 msgstr ""
 
-#: src/properties.cpp:873
+#: src/properties.cpp:889
 msgid "Age 20"
 msgstr ""
 
-#: src/properties.cpp:874
+#: src/properties.cpp:890
 msgid "Age 19"
 msgstr ""
 
-#: src/properties.cpp:875
+#: src/properties.cpp:891
 msgid "Age 18"
 msgstr ""
 
-#: src/properties.cpp:876
+#: src/properties.cpp:892
 msgid "Age 17"
 msgstr ""
 
-#: src/properties.cpp:877
+#: src/properties.cpp:893
 msgid "Age 16"
 msgstr ""
 
-#: src/properties.cpp:878
+#: src/properties.cpp:894
 msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:879
+#: src/properties.cpp:895
 msgid "Age 14 or Under"
 msgstr ""
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
 msgid "Not Applicable"
 msgstr ""
 
-#: src/properties.cpp:886
+#: src/properties.cpp:902
+#, fuzzy
 msgid "Unlimited Model Releases"
-msgstr ""
+msgstr "Modell-ID"
 
-#: src/properties.cpp:887
+#: src/properties.cpp:903
 msgid "Limited or Incomplete Model Releases"
 msgstr ""
 
-#: src/properties.cpp:894
+#: src/properties.cpp:910
 msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:895
+#: src/properties.cpp:911
 msgid "Limited or Incomplete Property Releases"
 msgstr ""
 
-#: src/properties.cpp:901
+#: src/properties.cpp:917
 msgid "Repeat Use"
 msgstr ""
 
-#: src/sigmamn.cpp:60
+#: src/properties.cpp:921 src/properties.cpp:930
+#, fuzzy
+msgid "Fixture Identification"
+msgstr "Modellidentifikation"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+#, fuzzy
+msgid "Status"
+msgstr "GPS-Status"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
+msgstr ""
+
+#: src/properties.cpp:923 src/properties.cpp:932
+#, fuzzy
+msgid "People"
+msgstr "Lila"
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
+msgstr ""
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
+msgstr ""
+
+#: src/sigmamn.cpp:62
 msgid "Resolution Mode"
 msgstr "Auflösungsmodus"
 
-#: src/sigmamn.cpp:61
+#: src/sigmamn.cpp:63
 msgid "Resolution mode"
 msgstr "Auflösungsmodus"
 
-#: src/sigmamn.cpp:62
+#: src/sigmamn.cpp:65
 msgid "Autofocus Mode"
 msgstr "Autofokusmodus"
 
-#: src/sigmamn.cpp:63
+#: src/sigmamn.cpp:66
 msgid "Autofocus mode"
 msgstr "Autofokusmodus"
 
-#: src/sigmamn.cpp:65
+#: src/sigmamn.cpp:68
 msgid "Focus Setting"
 msgstr "Fokuseinstellung"
 
-#: src/sigmamn.cpp:66
+#: src/sigmamn.cpp:69
 msgid "Focus setting"
 msgstr "Fokuseinstellung"
 
-#: src/sigmamn.cpp:77
+#: src/sigmamn.cpp:80
 msgid "Lens Range"
 msgstr "Linsenweite"
 
-#: src/sigmamn.cpp:78
+#: src/sigmamn.cpp:81
 msgid "Lens focal length range"
 msgstr "Linsenbrennweitenbereich"
 
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
 msgid "Shadow"
 msgstr "Schatten"
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
 msgid "Highlight"
 msgstr "Spitzlichter"
 
-#: src/sigmamn.cpp:101
+#: src/sigmamn.cpp:104
 msgid "Fill Light"
 msgstr "Fülllicht"
 
-#: src/sigmamn.cpp:102
+#: src/sigmamn.cpp:105
 msgid "X3 Fill light"
 msgstr "X3 Fülllicht"
 
-#: src/sigmamn.cpp:104
+#: src/sigmamn.cpp:107
 msgid "Color Adjustment"
 msgstr "Farbanpassung"
 
-#: src/sigmamn.cpp:105
-msgid "Color adjustment"
-msgstr "Farbanpassung"
+#: src/sigmamn.cpp:108
+msgid "Color adjustment"
+msgstr "Farbanpassung"
+
+#: src/sigmamn.cpp:110
+msgid "Adjustment Mode"
+msgstr "Anpassungsmodus"
+
+#: src/sigmamn.cpp:111
+msgid "Adjustment mode"
+msgstr "Anpassungsmodus"
+
+#: src/sigmamn.cpp:122
+msgid "Auto Bracket"
+msgstr "Automatische Erfassung"
+
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
+msgid "Auto bracket"
+msgstr "Automatischer Erfassung"
+
+#: src/sigmamn.cpp:127
+msgid "Unknown SigmaMakerNote tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Sigma"
+
+#: src/sigmamn.cpp:170
+msgid "8-Segment"
+msgstr "8-Segment"
+
+#: src/sonymn.cpp:88
+#, fuzzy
+msgid "Standard "
+msgstr "Standard"
+
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
+msgstr ""
+
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
+msgstr ""
+
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
+msgstr ""
+
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
+msgstr ""
+
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
+msgstr ""
+
+#: src/sonymn.cpp:109
+#, fuzzy
+msgid "Landscape "
+msgstr "Landschaft"
+
+#: src/sonymn.cpp:113
+#, fuzzy
+msgid "Night Scene / Twilight"
+msgstr "Nachtszene"
+
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
+msgstr ""
+
+#: src/sonymn.cpp:115
+#, fuzzy
+msgid "Twilight Portrait"
+msgstr "Nachtportrait"
+
+#: src/sonymn.cpp:116
+#, fuzzy
+msgid "Soft Snap"
+msgstr "Weich"
+
+#: src/sonymn.cpp:118
+#, fuzzy
+msgid "Smile Shutter"
+msgstr "Langsamer Verschluß"
+
+#: src/sonymn.cpp:120
+#, fuzzy
+msgid "High Sensitivity"
+msgstr "ISO-Empfindlichkeit"
+
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
+msgstr ""
+
+#: src/sonymn.cpp:123
+#, fuzzy
+msgid "Gourmet"
+msgstr "Dokumente"
+
+#: src/sonymn.cpp:125
+#, fuzzy
+msgid "Handheld Twilight"
+msgstr "Kerzenlicht"
+
+#: src/sonymn.cpp:126
+#, fuzzy
+msgid "Anti Motion Blur"
+msgstr "Bildmodus"
+
+#: src/sonymn.cpp:128
+#, fuzzy
+msgid "Backlight Correction HDR"
+msgstr "Ohne Korrektur"
+
+#: src/sonymn.cpp:142
+#, fuzzy
+msgid "On (Continuous)"
+msgstr "Kontinuierlich"
+
+#: src/sonymn.cpp:143
+#, fuzzy
+msgid "On (Shooting)"
+msgstr "Aufnahmemodus"
+
+#: src/sonymn.cpp:151
+msgid "Plus"
+msgstr ""
+
+#: src/sonymn.cpp:167
+#, fuzzy
+msgid "White Flourescent"
+msgstr "Weiß fluoreszent"
+
+#: src/sonymn.cpp:168
+#, fuzzy
+msgid "Cool White Flourescent"
+msgstr "Weiß fluoreszent"
+
+#: src/sonymn.cpp:169
+#, fuzzy
+msgid "Day White Flourescent"
+msgstr "Tagesweiß fluoreszent"
+
+#: src/sonymn.cpp:172
+#, fuzzy
+msgid "Underwater 1 (Blue Water)"
+msgstr "Unterwasser-Weite1"
+
+#: src/sonymn.cpp:173
+#, fuzzy
+msgid "Underwater 2 (Green Water)"
+msgstr "Unterwasser-Aufnahme"
+
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
+msgstr ""
+
+#: src/sonymn.cpp:188
+#, fuzzy
+msgid "Center AF"
+msgstr "Zentriert"
+
+#: src/sonymn.cpp:189
+#, fuzzy
+msgid "Spot AF"
+msgstr "Punkt"
+
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
+msgstr ""
+
+#: src/sonymn.cpp:191
+#, fuzzy
+msgid "Touch AF"
+msgstr "Ein-Tasten-Weißabgleich"
+
+#: src/sonymn.cpp:192
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Manueller Fokus"
+
+#: src/sonymn.cpp:193
+#, fuzzy
+msgid "Face Detected"
+msgstr "Fehler beim lesen"
+
+#: src/sonymn.cpp:208
+#, fuzzy
+msgid "Close Focus"
+msgstr "Automatischer Fokus"
+
+#: src/sonymn.cpp:224
+#, fuzzy
+msgid "Exposure Bracketing"
+msgstr "Belichtungserfassung"
+
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+#, fuzzy
+msgid "Multi Burst Mode"
+msgstr "Burst Mode"
+
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+#, fuzzy
+msgid "Multi Burst Image Width"
+msgstr "Zugehörige Bildbreite"
+
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+#, fuzzy
+msgid "Multi Burst Image Height"
+msgstr "Bildhöhe"
+
+#: src/sonymn.cpp:315
+#, fuzzy
+msgid "JPEG preview image"
+msgstr "Bildvorschau gültig"
+
+#: src/sonymn.cpp:341
+#, fuzzy
+msgid "Auto HDR"
+msgstr "Automatisch Hoch"
+
+#: src/sonymn.cpp:342
+msgid "High Definition Range Mode"
+msgstr ""
+
+#: src/sonymn.cpp:346
+#, fuzzy
+msgid "Shot Information"
+msgstr "Aufnahmeinformation"
+
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+#, fuzzy
+msgid "Sony Model ID"
+msgstr "Modell-ID"
+
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+#, fuzzy
+msgid "Color Reproduction"
+msgstr "Farbrauschunterdrückung"
+
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+#, fuzzy
+msgid "Dynamic Range Optimizer"
+msgstr "Dynamische Bereichseinstellung"
+
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+#, fuzzy
+msgid "Minolta MakerNote"
+msgstr "Minolta Datum"
+
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+#, fuzzy
+msgid "Full Image Size"
+msgstr "Bildgrõße"
+
+#: src/sonymn.cpp:387
+#, fuzzy
+msgid "Preview Image Size"
+msgstr "Bildvorschau gültig"
+
+#: src/sonymn.cpp:388
+#, fuzzy
+msgid "Preview image size"
+msgstr "Bildvorschau gültig"
+
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
+msgstr ""
+
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Qualität"
+
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
+#, fuzzy
+msgid "Release Mode"
+msgstr "Freigabedatum"
+
+#: src/sonymn.cpp:415
+#, fuzzy
+msgid "Shot number in continous burst mode"
+msgstr "Fortlaufende Nummer (wenn Sie im Burst-Modus fotografieren)"
+
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+#, fuzzy
+msgid "Anti-Blur"
+msgstr "Anti-Unschärfe"
+
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
+#, fuzzy
+msgid "Long Exposure Noise Reduction"
+msgstr "Rauschreduktion einer langen Belichtung"
+
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
+#, fuzzy
+msgid "Intelligent Auto"
+msgstr "Intervalllänge"
+
+#: src/sonymn.cpp:434
+#, fuzzy
+msgid "Unknown Sony1MakerNote tag"
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Sony"
+
+#: src/sonymn.cpp:448
+#, fuzzy
+msgid "Continuous High"
+msgstr "Kontinuierlich, hoch"
+
+#: src/sonymn.cpp:452
+#, fuzzy
+msgid "Continuous Low"
+msgstr "Kontinuierlich, niedrig"
+
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
+#, fuzzy
+msgid "D-Range Optimizer Bracketing Low"
+msgstr "Bildoptimierung"
+
+#: src/sonymn.cpp:487
+#, fuzzy
+msgid "Autumn"
+msgstr "Auktion"
+
+#: src/sonymn.cpp:493
+msgid "ADI"
+msgstr ""
+
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
+msgstr ""
+
+#: src/sonymn.cpp:529
+#, fuzzy
+msgid "Auto No Flash"
+msgstr "Automatisch (Blitz)"
 
-#: src/sigmamn.cpp:107
-msgid "Adjustment Mode"
-msgstr "Anpassungsmodus"
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
+#, fuzzy
+msgid "Dynamic Range Optimizer Level"
+msgstr "Dynamische Bereichseinstellung"
 
-#: src/sigmamn.cpp:108
-msgid "Adjustment mode"
-msgstr "Anpassungsmodus"
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
+#, fuzzy
+msgid "Creative Style"
+msgstr "Erstellungsdatum"
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
-msgstr "Firmware"
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
+#, fuzzy
+msgid "Zone Matching Value"
+msgstr "Zonenabgleich"
 
-#: src/sigmamn.cpp:119
-msgid "Auto Bracket"
-msgstr "Automatische Erfassung"
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
+#, fuzzy
+msgid "AF With Shutter"
+msgstr "Schneller Verschluß"
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
-msgid "Auto bracket"
-msgstr "Automatischer Erfassung"
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+#, fuzzy
+msgid "High ISO NoiseReduction"
+msgstr "Hohe ISO-Rauschreduktion"
 
-#: src/sigmamn.cpp:124
-msgid "Unknown SigmaMakerNote tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Sigma"
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
+#, fuzzy
+msgid "Image Style"
+msgstr "Bildtyp"
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
-msgstr "8-Segment"
+#: src/sonymn.cpp:655
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings tag"
+msgstr "Unbekanntes Feld in den Canon-Kameraeinstellungen 1"
 
-#: src/sonymn.cpp:80
-msgid "Unknown SonyMakerNote tag"
-msgstr "Unbekanntes Herstellerbemerkungsfeld von Sony"
+#: src/sonymn.cpp:719
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings 2 tag"
+msgstr "Unbekanntes Feld in den Canon-Kameraeinstellungen 2"
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
 msgid "Unknown section"
 msgstr "Unbekannter Abschnitt"
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
 msgid "Image data structure"
 msgstr "Bilddatenstruktur"
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
+#, fuzzy
 msgid "Recording offset"
-msgstr ""
+msgstr "Fotoeffekt"
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
 msgid "Image data characteristics"
 msgstr "Bilddatencharakteristik"
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 msgid "Other data"
 msgstr "Andere Daten"
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
 msgid "Exif data structure"
 msgstr "Exif-Datenstruktur"
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
 msgid "Image configuration"
 msgstr "Bildkonfiguration"
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
 msgid "User information"
 msgstr "Benutzerinformationen"
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
 msgid "Related file"
 msgstr "Zugehörige Datei"
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 msgid "Date and time"
 msgstr "Datum und Uhrzeit"
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
 msgid "Picture taking conditions"
 msgstr "Aufnahmebedingungen"
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
 msgid "GPS information"
 msgstr "GPS-Informationen"
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
 msgid "Interoperability information"
 msgstr "Interoperabelitätsinformationen."
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
 msgid "Vendor specific information"
 msgstr "Hersteller spezifische Informationen"
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 msgid "Adobe DNG tags"
 msgstr "Adobe DNG -Felder"
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
+#, fuzzy
 msgid "Panasonic RAW tags"
-msgstr ""
+msgstr "Unbekanntes Herstellerbemerkungsfeld von Panasonic"
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 #, fuzzy
 msgid "TIFF/EP tags"
 msgstr "TIFF/EP Standard ID"
 
-#: src/tags.cpp:193
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
+msgstr ""
+
+#: src/tags.cpp:208
+#, fuzzy
+msgid "Adobe OPI tags"
+msgstr "Adobe DNG -Felder"
+
+#: src/tags.cpp:209
 msgid "Last section"
 msgstr "Letzter Abschnitt"
 
-#: src/tags.cpp:213
+#: src/tags.cpp:225
 msgid "Primary image"
 msgstr "Anfangsbild"
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
 msgid "Thumbnail/Preview image"
 msgstr "Bildvorschau"
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
 msgid "Primary image, Multi page file"
 msgstr "Anfangsbild, Mehrseitendatei"
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
 msgid "Thumbnail/Preview image, Multi page file"
 msgstr "Vorschaubild, Mehrseitendatei"
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
 msgid "Primary image, Transparency mask"
 msgstr "Anfangsbild, Transparenzmaske"
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
 msgid "Thumbnail/Preview image, Transparency mask"
 msgstr "Bildvorschau, Transparenzmaske"
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
 msgstr "Anfangsbild, Mehrseitendatei, Transparenzmaske"
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr "Vorschaubild, Mehrseitendatei, Transparenzmaske"
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+#, fuzzy
+msgid "Full-resolution image data"
+msgstr "Die Bilddaten konnten nicht gelesen werden."
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr ""
+
+#: src/tags.cpp:246
 msgid "inch"
 msgstr "Zoll"
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr "CCITT RLE"
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr "T4/Fax-Gruppe 3"
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr "T6/Fax-Gruppe 4"
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
 msgstr "LZW"
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
 msgstr "JPEG (alter Stil)"
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr "JPEG"
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
 msgid "Adobe Deflate"
 msgstr "Adobe Deflate"
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
 msgstr "JBIG B&W"
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 msgid "JBIG Color"
 msgstr "JBIG Farbe"
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr "Nächsten 2-Bits RLE"
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 msgid "Epson ERF Compressed"
 msgstr "Epson ERF komprimiert"
 
-#: src/tags.cpp:244
+#: src/tags.cpp:264
+#, fuzzy
+msgid "Samsung SRW Compressed"
+msgstr "Epson ERF komprimiert"
+
+#: src/tags.cpp:265
 msgid "CCITT RLE 1-word"
 msgstr "CCITT RLE 1-Wort"
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr "PackBits (Macintosh RLE)"
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr "Thunderscan RLE"
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr "IT8 CT Einlage"
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr "IT8 Zeilenarbeit RLE"
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
 msgid "IT8 Monochrome Picture"
 msgstr "IT8 Monochrombild"
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr "IT8 binäre Zeilenkunst"
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr "Pixar Film (10-Bit LZW)"
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr "Pixar Log (11-Bit ZIP)"
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
 msgid "Pixar Deflate"
 msgstr "Pixar Deflate"
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr "Kodak DCS Encoding"
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
 msgid "ISO JBIG"
 msgstr "ISO JBIG"
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr "SGI Log beleuchtetes RLE"
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr "SGI Log 24-bits gepackt"
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr ""
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 msgid "Nikon NEF Compressed"
 msgstr "Nikon NEF komprimiert"
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
 msgid "Kodak DCR Compressed"
 msgstr "Kodak DCR komprimiert"
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 msgid "Pentax PEF Compressed"
 msgstr "Pentax PEF komprimiert"
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
 msgid "White Is Zero"
 msgstr "Null ist weiß"
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
 msgid "Black Is Zero"
 msgstr "Null ist schwarz"
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr "RGB"
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
 msgstr "RGB Palette"
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
 msgstr "Transparenzmaske"
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr "CIELab"
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr "ICCLab"
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr "ITULab"
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
 msgid "Color Filter Array"
 msgstr "Farbfilterliste"
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr "Pixar LogL"
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr "Pixar LogLuv"
 
-#: src/tags.cpp:279
+#: src/tags.cpp:300
 msgid "Linear Raw"
 msgstr "Lineares Roh"
 
-#: src/tags.cpp:284
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
+msgstr ""
+
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+#, fuzzy
+msgid "Randomized process"
+msgstr "Normale Verarbeitung"
+
+#: src/tags.cpp:312
 msgid "top, left"
 msgstr "oben - links"
 
-#: src/tags.cpp:285
+#: src/tags.cpp:313
 msgid "top, right"
 msgstr "oben - rechts"
 
-#: src/tags.cpp:286
+#: src/tags.cpp:314
 msgid "bottom, right"
 msgstr "unten - rechts"
 
-#: src/tags.cpp:287
+#: src/tags.cpp:315
 msgid "bottom, left"
 msgstr "unten - links"
 
-#: src/tags.cpp:288
+#: src/tags.cpp:316
 msgid "left, top"
 msgstr "links - oben"
 
-#: src/tags.cpp:289
+#: src/tags.cpp:317
 msgid "right, top"
 msgstr "rechts - oben"
 
-#: src/tags.cpp:290
+#: src/tags.cpp:318
 msgid "right, bottom"
 msgstr "rechts - unten"
 
-#: src/tags.cpp:291
+#: src/tags.cpp:319 src/tags.cpp:320
 msgid "left, bottom"
 msgstr "links - unten"
 
-#: src/tags.cpp:296
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
+msgstr ""
+
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+#, fuzzy
+msgid "not CMYK"
+msgstr "CMYK"
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr ""
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
+msgstr ""
+
+#: src/tags.cpp:340 src/tags.cpp:341
+#, fuzzy
+msgid "Undefined data format"
+msgstr "Nicht unterstütztes Datumsformat"
+
+#: src/tags.cpp:346
+#, fuzzy
+msgid "Not indexed"
+msgstr "Undefiniert"
+
+#: src/tags.cpp:347 src/tags.cpp:653
+msgid "Indexed"
+msgstr ""
+
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
+
+#: src/tags.cpp:353
+msgid "B"
+msgstr ""
+
+#: src/tags.cpp:354
+msgid "C"
+msgstr ""
+
+#: src/tags.cpp:355
+#, fuzzy
+msgid "A+B-C"
+msgstr "Autofokus-C"
+
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:358
+msgid "(A+B)/2"
+msgstr ""
+
+#: src/tags.cpp:363
 msgid "Centered"
 msgstr "zentriert"
 
-#: src/tags.cpp:297
+#: src/tags.cpp:364
 msgid "Co-sited"
 msgstr "Co-sited"
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
 msgid "No flash"
 msgstr "Kein Blitz"
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 msgid "Fired, strobe return light not detected"
 msgstr "Blitz ausgelöst, keine Reflektion erkannt"
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 msgid "Fired, strobe return light detected"
 msgstr "Blitz ausgelöst, Reflektion erkannt"
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
 msgid "Yes, did not fire"
 msgstr "Blitz löste nicht aus"
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
 msgid "Yes, compulsory"
 msgstr "Blitz ausgelöst, festgelegter Modus"
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 msgid "Yes, compulsory, return light not detected"
 msgstr "Blitz ausgelöst, festgelegter Modus, keine Reflektion erkannt"
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 msgid "Yes, compulsory, return light detected"
 msgstr "Blitz ausgelöst, festgelegter Modus, Reflektion erkannt"
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
 msgstr "Blitz nicht ausgelöst, festgelegter Modus"
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 msgid "No, did not fire, return not detected"
 msgstr "Blitz wurde nicht ausgelöst, keine Reflektion erkannt"
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 msgid "No, auto"
 msgstr "Blitz nicht ausgelöst, automatisch"
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 msgid "Yes, auto"
 msgstr "Blitz ausgelöst, automatisch"
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 msgid "Yes, auto, return light not detected"
 msgstr "Blitz ausgelöst, automatisch, keine Reflektion erkannt"
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 msgid "Yes, auto, return light detected"
 msgstr "Blitz ausgelöst, automatisch, Reflektion erkannt"
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 msgid "No flash function"
 msgstr "Keine Blitzlichtfunktion."
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 msgid "No, no flash function"
 msgstr "Keine Blitzlichtfunktion."
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
 msgid "Yes, red-eye reduction"
 msgstr "Blitz ausgelöst, Rote-Augen-Reduktion"
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 msgid "Yes, red-eye reduction, return light not detected"
 msgstr "Blitz ausgelöst, Rote-Augen-Reduktion, keine Reflektion erkannt"
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 msgid "Yes, red-eye reduction, return light detected"
 msgstr "Blitz ausgelöst, Rote-Augen-Reduktion, Reflektion erkannt"
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
 msgid "Yes, compulsory, red-eye reduction"
 msgstr "Blitz ausgelöst, fester Modus, Rote-Augen-Reduktion"
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr ""
 "Blitz ausgelöst, fester Modus, Rote-Augen-Reduktion, keine Reflektion erkannt"
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr ""
 "Blitz ausgelöst, fester Modus, Rote-Augen-Reduktion, Reflektion erkannt"
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
 msgid "No, red-eye reduction"
 msgstr "Blitz nicht ausgelöst, Rote-Augen-Reduktion"
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
 msgid "No, auto, red-eye reduction"
 msgstr "Blitz nicht ausgelöst, automatisch, Rote-Augen-Reduktion"
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
 msgid "Yes, auto, red-eye reduction"
 msgstr "Blitz ausgelöst, automatisch, Rote-Augen-Reduktion"
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr "Blitz ausgelöst, Rote-Augen-Reduktion, keine Reflektion erkannt"
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr "Blitz ausgelöst, automatisch, Rote-Augen-Reduktion, Reflektion erkannt"
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
 msgstr ""
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 msgid "Processing Software"
 msgstr "Verarbeitungssoftware"
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
 msgstr ""
 "Der Name und die Version der Software, die benutzt wurde um das Bild nach zu "
 "bearbeiten."
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
 msgid "New Subfile Type"
 msgstr "Neuer Unterdateityp"
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "Genereller Hinweis auf die Art der Daten in dieser Unterdatei"
 
-#: src/tags.cpp:350
+#: src/tags.cpp:416
+#, fuzzy
+msgid "Subfile Type"
+msgstr "Neuer Unterdateityp"
+
+#: src/tags.cpp:417
+#, fuzzy
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
+msgstr "Genereller Hinweis auf die Art der Daten in dieser Unterdatei"
+
+#: src/tags.cpp:421
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -15719,7 +19501,7 @@
 "Zeile. Im JPEG Datenstrom wird ein JPEG Marker anstelle dieses Feldes "
 "verwendet."
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -15727,11 +19509,11 @@
 "Die Anzahl an Spalten in den Bilddaten. In einem JPEG Datenstrom wird ein "
 "JPEG Marker anstelle dieses Feldes verwendet."
 
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr "Bits per Sample."
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 msgid ""
 "The number of bits per image component. In this standard each component of "
 "the image is 8 bits, so the value for this tag is 8. See also "
@@ -15743,7 +19525,7 @@
 "<SamplesPerlPixel>. Im JPEG Datenstrom wird ein JPEG Marker statt diesem "
 "Feld benutzt."
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
 msgid ""
 "The compression scheme used for the image data. When a primary image is JPEG "
 "compressed, this designation is not necessary and is omitted. When "
@@ -15754,31 +19536,63 @@
 "weggelassen. Wenn die Vorschaubilder JPEG Kompression verwenden, hat dieses "
 "Feld den Wert 6."
 
-#: src/tags.cpp:371
+#: src/tags.cpp:442
+msgid ""
+"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
+"of this tag."
+msgstr ""
+"Der Pixel Aufbau. Im JPEG Datenstrom wird ein JPEG Marker statt diesem Feld "
+"benutzt."
+
+#: src/tags.cpp:445
+msgid "Threshholding"
+msgstr ""
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+
+#: src/tags.cpp:449
+#, fuzzy
+msgid "Cell Width"
+msgstr "Breite des Zuschnitts"
+
+#: src/tags.cpp:450
+msgid ""
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:453
+#, fuzzy
+msgid "Cell Length"
+msgstr "Kachellänge"
+
+#: src/tags.cpp:454
 msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
 msgstr ""
-"Der Pixel Aufbau. Im JPEG Datenstrom wird ein JPEG Marker statt diesem Feld "
-"benutzt."
 
-#: src/tags.cpp:374
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr "Füllreihenfolge"
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
 msgstr "Die logische Reihenfolge der Bits in einem Byte."
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
 msgid "Document Name"
 msgstr "Dokumentenname"
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
 msgid "The name of the document from which this image was scanned"
 msgstr "Der Name des Dokuments von dem das Bild eingelesen wurde."
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -15790,7 +19604,7 @@
 "Character Codes können nicht benutzt werden. Wenn ein 2 Byte Code notwendig "
 "ist, sollte das Exif Privatfeld <UserComment> benutzt werden."
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -15801,7 +19615,7 @@
 "welches dieses Bild erzeugte. Wenn das Feld leer ist, wird er als unbekannt "
 "behandelt."
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
@@ -15812,7 +19626,7 @@
 "Equipments, das das Bild generiert hat. Wenn das Feld leer ist, wird es als "
 "unbekannt behandelt."
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -15824,15 +19638,15 @@
 "KBytes überschreitet. In einem JPEG Datenstrom diese Spezifikation nicht "
 "nötig und wird weggelassen. Siehe auch <RowsPerStrip> und <StripByteCounts>."
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Die Bildausrichtung in Sicht von Spalten und Zeilen."
 
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr "Samples pro Pixel"
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
@@ -15842,11 +19656,11 @@
 "YCbCr Bilder bezieht, ist der Wert dieses Feldes immer 3. Im JPEG Datenstrom "
 "wird anstatt diesem Feld ein JPEG Marker benutzt."
 
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr "Zeilen pro Strip"
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
 "strip when an image is divided into strips. With JPEG compressed data this "
@@ -15858,11 +19672,11 @@
 "dieses Feld nicht nötig und wird weggelassen. Siehe auch <StripOffsets> und "
 "<StripByteCounts>."
 
-#: src/tags.cpp:420
+#: src/tags.cpp:503
 msgid "Strip Byte Count"
 msgstr "Strip Byte Anzahl"
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -15870,11 +19684,11 @@
 "Die Anzahl der Bytes pro Strip. In einem JPEG Datenstrom ist dieses Feld "
 "nicht nötig und wird weggelassen."
 
-#: src/tags.cpp:424
+#: src/tags.cpp:507
 msgid "X-Resolution"
 msgstr "Auflösung in x-Richtung"
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -15882,11 +19696,11 @@
 "Die Anzahl an Pixel pro <ResolutionUnit> in der <ImageWidth> Richtung. Wenn "
 "keine bekannt ist, werden 72 [dpi] angenommen."
 
-#: src/tags.cpp:428
+#: src/tags.cpp:511
 msgid "Y-Resolution"
 msgstr "Auflösung in y-Richtung"
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -15894,7 +19708,7 @@
 "Die Anzahl an Pixel pro <ResolutionUnit> in der <ImageLength> Richtung. "
 "Derselbe Wert wie in <XResolution> wird spezifiziert."
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
@@ -15904,7 +19718,43 @@
 "In einem JPEG Bild wird ein JPEG Marker statt diesem Feld benutzt. Wenn "
 "dieses Feld nicht existiert wird das TIFF Default 1 (\"chunky\") angenommen."
 
-#: src/tags.cpp:439
+#: src/tags.cpp:521
+#, fuzzy
+msgid "Gray Response Unit"
+msgstr "Graupunkt"
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr ""
+
+#: src/tags.cpp:524
+#, fuzzy
+msgid "Gray Response Curve"
+msgstr "Farbtonkurve"
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+
+#: src/tags.cpp:527
+#, fuzzy
+msgid "T4 Options"
+msgstr "Option"
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+#, fuzzy
+msgid "T6 Options"
+msgstr "Option"
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -15914,7 +19764,7 @@
 "Einheit wird für <XResolution> und <YResolution> verwendet. Wenn diese "
 "unbekannt ist, wird der Standard von 2 (Zoll) angenommen."
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
@@ -15924,7 +19774,7 @@
 "Normalerweise ist dieses Feld nicht nötig, da der Farbraum bereits im "
 "Farbraum Informationsfeld angegeben wurde (<ColorSpace>)."
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -15937,7 +19787,7 @@
 "empfohlen, das das untenstehende Beispiel nachgeahmt wird. Wenn das Feld "
 "leer ist, wird es als unbekannt angenommen."
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
 "time the file was changed."
@@ -15945,7 +19795,7 @@
 "Das Datum und die Uhrzeit der Erstellung des Bildes. In diesem Exif-Standard "
 "ist es das Datum und die Zeit der letzten Änderung."
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
 "creator. The detailed format is not specified, but it is recommended that "
@@ -15960,11 +19810,12 @@
 "Interoperabilität. Wenn das Feld leer ist, wird der Name als unbekannt "
 "angenommen."
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+#, fuzzy
+msgid "Host Computer"
 msgstr "Host-Rechner"
 
-#: src/tags.cpp:468
+#: src/tags.cpp:563
 msgid ""
 "This tag records information about the host computer used to generate the "
 "image."
@@ -15972,7 +19823,18 @@
 "Dieses Feld enthält Informationen über den Host-Rechner, der benutzt wurde "
 "um das Bild zu generieren."
 
-#: src/tags.cpp:472
+#: src/tags.cpp:566
+#, fuzzy
+msgid "Predictor"
+msgstr "Anbieter"
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+
+#: src/tags.cpp:571
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the colorspace information tag "
@@ -15981,7 +19843,7 @@
 "Die Chromazität des Weißpunktes des Bildes. Normalerweise ist dieses Feld "
 "nicht nötig, da der Farbraum im <ColorSpace>-Feld spezifiziert wird."
 
-#: src/tags.cpp:477
+#: src/tags.cpp:576
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since colorspace is specified in the colorspace "
@@ -15991,28 +19853,51 @@
 "dieses Feld nicht notwendig, da der Farbraum bereits im Farbraum "
 "Informationsfeld <ColorSpace> angeben wurde."
 
-#: src/tags.cpp:481
+#: src/tags.cpp:580
+#, fuzzy
+msgid "Color Map"
+msgstr "Farbmatrix"
+
+#: src/tags.cpp:581
+msgid ""
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
+msgstr ""
+
+#: src/tags.cpp:586
+msgid "Halftone Hints"
+msgstr ""
+
+#: src/tags.cpp:587
+msgid ""
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
+msgstr ""
+
+#: src/tags.cpp:591
 msgid "Tile Width"
 msgstr "Kachelbreite"
 
-#: src/tags.cpp:482
+#: src/tags.cpp:592
 msgid "The tile width in pixels. This is the number of columns in each tile."
 msgstr ""
 
-#: src/tags.cpp:484
+#: src/tags.cpp:594
 msgid "Tile Length"
 msgstr "Kachellänge"
 
-#: src/tags.cpp:485
+#: src/tags.cpp:595
 msgid ""
 "The tile length (height) in pixels. This is the number of rows in each tile."
 msgstr ""
 
-#: src/tags.cpp:487
+#: src/tags.cpp:597
 msgid "Tile Offsets"
 msgstr "Kachel-Offsets"
 
-#: src/tags.cpp:488
+#: src/tags.cpp:598
 msgid ""
 "For each tile, the byte offset of that tile, as compressed and stored on "
 "disk. The offset is specified with respect to the beginning of the TIFF "
@@ -16020,60 +19905,197 @@
 "the locations of other tiles."
 msgstr ""
 
-#: src/tags.cpp:493
+#: src/tags.cpp:603
 msgid "Tile Byte Counts"
 msgstr "Kachel-Byte-Anzahl"
 
-#: src/tags.cpp:494
+#: src/tags.cpp:604
 msgid ""
 "For each tile, the number of (compressed) bytes in that tile. See "
 "TileOffsets for a description of how the byte counts are ordered."
 msgstr ""
 
-#: src/tags.cpp:497
+#: src/tags.cpp:607
 msgid "SubIFD Offsets"
 msgstr "SubIFD Offsets"
 
-#: src/tags.cpp:498
+#: src/tags.cpp:608
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 "Definiert von der Adobe Corporation um TIFF Bäume innerhalb von TIFF Dateien "
 "zu erlauben."
 
-#: src/tags.cpp:500
+#: src/tags.cpp:610
+#, fuzzy
+msgid "Ink Set"
+msgstr "Setzen"
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:613
+#, fuzzy
+msgid "Ink Names"
+msgstr "Besitzername"
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+#, fuzzy
+msgid "Number Of Inks"
+msgstr "Taktanzahl"
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+#, fuzzy
+msgid "Dot Range"
+msgstr "Dynamischer Bereich"
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
+
+#: src/tags.cpp:622
+#, fuzzy
+msgid "Target Printer"
+msgstr "Zielblende"
+
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
+msgstr ""
+
+#: src/tags.cpp:625
+#, fuzzy
+msgid "Extra Samples"
+msgstr "Bits pro Abtastung"
+
+#: src/tags.cpp:626
+msgid ""
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
+msgstr ""
+
+#: src/tags.cpp:629
+#, fuzzy
+msgid "Sample Format"
+msgstr "Dateiformat"
+
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr ""
+
+#: src/tags.cpp:632
+#, fuzzy
+msgid "SMin Sample Value"
+msgstr "Audio-Abtastrate"
+
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr ""
+
+#: src/tags.cpp:635
+#, fuzzy
+msgid "SMax Sample Value"
+msgstr "Maximale Blende"
+
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr ""
+
+#: src/tags.cpp:638
 msgid "Transfer Range"
 msgstr "Transferbereich"
 
-#: src/tags.cpp:501
+#: src/tags.cpp:639
 msgid "Expands the range of the TransferFunction"
 msgstr "Erweitert den Bereich der Transferfunktion"
 
-#: src/tags.cpp:503
+#: src/tags.cpp:641
+msgid "Clip Path"
+msgstr ""
+
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
 #, fuzzy
 msgid "JPEG tables"
 msgstr "JPEG-Verarbeitung"
 
-#: src/tags.cpp:504
+#: src/tags.cpp:659
 msgid ""
 "This optional tag may be used to encode the JPEG quantization andHuffman "
 "tables for subsequent use by the JPEG decompression process."
 msgstr ""
 
-#: src/tags.cpp:507
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
 msgid "JPEG Process"
 msgstr "JPEG-Verarbeitung"
 
-#: src/tags.cpp:508
+#: src/tags.cpp:667
 msgid "This field indicates the process used to produce the compressed data"
 msgstr ""
 "Dieses Feld gibt einen Hinweis auf die Verarbeitung die benutzt wurde, um "
 "die komprimierten Daten zu erzeugen."
 
-#: src/tags.cpp:510
+#: src/tags.cpp:669
 msgid "JPEG Interchange Format"
 msgstr "JPEG Interchange Format"
 
-#: src/tags.cpp:511
+#: src/tags.cpp:670
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -16081,11 +20103,11 @@
 "Der Abstand zum Startbyte (SOI) der JPEG Vorschaubilddaten. Dieses Feld wird "
 "nicht für die primären JPEG Daten benutzt."
 
-#: src/tags.cpp:514
+#: src/tags.cpp:673
 msgid "JPEG Interchange Format Length"
 msgstr "JPEG Interchange Format Länge"
 
-#: src/tags.cpp:515
+#: src/tags.cpp:674
 msgid ""
 "The number of bytes of JPEG compressed thumbnail data. This is not used for "
 "primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
@@ -16100,7 +20122,72 @@
 "aller anderen Daten in weniger als 64 KByte aufgezeichnet werden um in den "
 "APP1 JPEG Marker zu passen."
 
-#: src/tags.cpp:523
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
+msgstr ""
+
+#: src/tags.cpp:682
+#, fuzzy
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
+msgstr ""
+"Dieses Feld gibt einen Hinweis auf die Verarbeitung die benutzt wurde, um "
+"die komprimierten Daten zu erzeugen."
+
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
+msgstr ""
+
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
+msgstr ""
+
+#: src/tags.cpp:690
+msgid ""
+"This Field points to a list of point transform values, one per component."
+msgstr ""
+
+#: src/tags.cpp:692
+#, fuzzy
+msgid "JPEG Q-Tables"
+msgstr "JPEG-Verarbeitung"
+
+#: src/tags.cpp:693
+msgid ""
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:696
+#, fuzzy
+msgid "JPEG DC-Tables"
+msgstr "JPEG-Verarbeitung"
+
+#: src/tags.cpp:697
+msgid ""
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
+msgstr ""
+
+#: src/tags.cpp:700
+#, fuzzy
+msgid "JPEG AC-Tables"
+msgstr "JPEG-Verarbeitung"
+
+#: src/tags.cpp:701
+msgid ""
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:705
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in Appendix E, \"Color "
@@ -16114,11 +20201,11 @@
 "Farbraum ist im Farbraum Informationsfeld deklariert, mit dem Standardwert, "
 "welche die beste Bild Interoperabilität unter diesen Bedingungen ergibt."
 
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr "YCbCr Sub Sampling"
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
 "component. In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -16127,7 +20214,7 @@
 "Helligkeitskomponenten. In JPEG Datenströmen wird ein JPEG Marker anstelle "
 "dieses Feldes verwendet."
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -16142,11 +20229,11 @@
 "both centered and co-sited positioning."
 msgstr ""
 
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr "Schwarz/Weiß Referenz"
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -16160,41 +20247,53 @@
 "mit dem Wert als Standard, der die besten Bildwerte für Interoperabilität "
 "garantiert."
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr "XML Paket"
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr "XMP-Metadaten (Adobe Technische Notiz 9-14-02)"
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 msgid "Windows Rating"
 msgstr "Windows-Bewertung"
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr "Bewertungsfeld das von Windows benutzt wird."
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
 msgid "Windows Rating Percent"
 msgstr "Windows-Bewertung in Prozent"
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr "Bewertungsfeld das von Windows benutzt wird. Der Wert ist in Prozent."
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+#, fuzzy
+msgid "Image ID"
+msgstr "Eindeutige Bildnummer"
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr ""
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
@@ -16204,11 +20303,7 @@
 "Array) des Bildsensors an, wenn ein 1-Chip-Farbflächen-Sensor benutzt wird. "
 "Es bezieht sich nicht auf alle Sensormethoden."
 
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr "Batteriestatus"
-
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
 "photographer and editor copyrights. It is the copyright notice of the person "
@@ -16235,34 +20330,34 @@
 "des Fotographen als auch des Editors in getrennten Feldern. Wenn das Feld "
 "leer ist, wird es als unbekannt gewertet."
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 #, fuzzy
 msgid "Exposure time, given in seconds."
 msgstr "Belichtungszeit in Sekunden."
 
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
 msgid "The F number."
 msgstr "Die F Nummer."
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr "IPTC/NAA"
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr "Enthält den IPTC/NAA Eintrag."
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr "Bildressourcenblock"
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr ""
 "Enthält die Informationen die von dem Programm Adobe Photoshop eingebettet "
 "wurden."
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
@@ -16272,11 +20367,11 @@
 "Struktur wie die des im TIFF spezifizierte IFD, allerdings enthält es keine "
 "Bilddaten wie im Fall von TIFF."
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
 msgid "Inter Color Profile"
 msgstr "Farbprofile"
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
@@ -16284,7 +20379,7 @@
 "Enthält eine Farbrofil zur Charakterisierung des Farbraums gemäß dem "
 "InterColor Consortium (ICC)"
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -16292,12 +20387,12 @@
 "Die Programmklasse, die die Kamera zum Setzen der Belichtungszeit bei der "
 "Aufnahme benutzte."
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
 #, fuzzy
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
 msgstr "Exif-Feld 34852, 0x8824. Spektrale Empfindlichkeit jedes Kanals."
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
@@ -16305,11 +20400,11 @@
 "Ein Zeiger auf das GPS Info IFD. Die Interoperabilitätsstruktur des GPS Info "
 "IFD hat, genau wie das Exif IFD, keine Bilddaten."
 
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
 msgid "ISO Speed Ratings"
 msgstr "ISO Geschwindigkeitsangabe"
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -16317,7 +20412,7 @@
 "Gibt die ISO Geschwindigkeit und Breite der Kamera bzw. des Eingabegeräts "
 "an, wie in ISO 12232 spezifiziert."
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 #, fuzzy
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
@@ -16326,22 +20421,22 @@
 "Exif-Feld 34856, 0x8828. Verfahren zur Messung optoelektronischer Kennlinien "
 "wie in ISO 14524 spezifiziert."
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Interlace"
 msgstr "Interlaced"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Indicates the field number of multifield images."
 msgstr "Gibt das Layout eines Bildes an."
 
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 #, fuzzy
 msgid "Time Zone Offset"
 msgstr "Kachel-Offsets"
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -16349,26 +20444,26 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 #, fuzzy
 msgid "Self Timer Mode"
 msgstr "Selbstauslöser"
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "Date Time Original"
 msgstr "Datum und Uhrzeit (Original)"
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "The date and time when the original image data was generated."
 msgstr "Das Datum und die Uhrzeit der letzten Änderung der Metadaten."
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 #, fuzzy
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
@@ -16376,75 +20471,75 @@
 "für ein komprimiertes Bild verwendet wird ist hier in Teilbits per Pixel "
 "angegeben."
 
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 #, fuzzy
 msgid "Shutter speed."
 msgstr "Verschlussgeschwindigkeit"
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
 #, fuzzy
 msgid "The lens aperture."
 msgstr "Minimale Blende"
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 #, fuzzy
 msgid "The value of brightness."
 msgstr "Die Anzahl der Takte."
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 #, fuzzy
 msgid "The exposure bias."
 msgstr "Belichtungskontrolle"
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
 msgid "Max Aperture Value"
 msgstr "Maximale Blende"
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 #, fuzzy
 msgid "The smallest F number of the lens."
 msgstr "Der Name der Szene."
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr "Die Entfernung zum Motiv (in Metern)."
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
 msgid "The metering mode."
 msgstr "Der Messmodus."
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr "Die Art der Lichtquelle."
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 #, fuzzy
 msgid "Indicates the status of flash when the image was shot."
 msgstr ""
 "Dieses Feld enthält den Weißabgleichsmodus, der zur Aufnahme eingestellt war."
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 msgid "The actual focal length of the lens, in mm."
 msgstr ""
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 msgid "Amount of flash energy (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 #, fuzzy
 msgid "Noise"
 msgstr "Keine"
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr ""
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
@@ -16453,7 +20548,7 @@
 "Die Anzahl an Pixel pro <ResolutionUnit> in der <ImageLength> Richtung. "
 "Derselbe Wert wie in <XResolution> wird spezifiziert."
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
@@ -16462,53 +20557,49 @@
 "Die Anzahl an Pixel pro <ResolutionUnit> in der <ImageLength> Richtung. "
 "Derselbe Wert wie in <XResolution> wird spezifiziert."
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
 "FocalPlaneYResolution(37391)."
 msgstr ""
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 #, fuzzy
 msgid "Security Classification"
 msgstr "Elektronische Vergrößerung"
 
-#: src/tags.cpp:654
-msgid "Security classification assigned to the image."
-msgstr ""
-
-#: src/tags.cpp:655
+#: src/tags.cpp:841
 #, fuzzy
-msgid "Image History"
-msgstr "Bildhöhe"
+msgid "Security classification assigned to the image."
+msgstr "Elektronische Vergrößerung"
 
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 #, fuzzy
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
 msgstr ""
 "Dieses Feld gibt die Position und Größe des Hauptmotivs in der Szene an."
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 #, fuzzy
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 "Gibt den Belichtungsindex an, der in der Kamera oder im Eingabegerät während "
 "der Aufnahme selektiert ist."
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
 msgid "TIFF/EP Standard ID"
 msgstr "TIFF/EP Standard ID"
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
@@ -16516,74 +20607,77 @@
 "Enthält vier ASCII Zeichen, wie z.B. \"1\",\"0\",\"0\",\"0\", die die TIFF/"
 "EP Standardversion der TIFF/EP Datei repräsentiert."
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
+#, fuzzy
 msgid "Type of image sensor."
-msgstr ""
+msgstr "Rohbild-Center"
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
 msgid "Windows Title"
 msgstr "Windows-Titel"
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr "Titelfeld, in UCS2 kodiert, das von Windows benutzt wird."
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
 msgid "Windows Comment"
 msgstr "Windows-Kommentar"
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr "Kommentarfeld, in UCS2 kodiert, das von Windows benutzt wird."
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 msgid "Windows Author"
 msgstr "Windows-Autor"
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr "Autorfeld, in UCS2 kodiert, das von Windows benutzt wird."
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
 msgid "Windows Keywords"
 msgstr "Windows-Schlüsselbegriffe"
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr "Schlüsselfelder, kodiert in UCS2, die von Windows benutzt werden."
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 msgid "Windows Subject"
 msgstr "Windows-Motiv"
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
 msgid "Subject tag used by Windows, encoded in UCS2"
 msgstr "Motivfeld, kodiert in UCS2, das von Windows benutzt wird."
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
+#, fuzzy
 msgid "Print Image Matching"
-msgstr ""
+msgstr "Zonenabgleich"
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
-msgstr ""
+#: src/tags.cpp:866
+#, fuzzy
+msgid "Print Image Matching, description needed."
+msgstr "Zonenabgleich"
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
 msgid "DNG version"
 msgstr "DNG-Version"
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
 "1, 1, 0, 0."
 msgstr ""
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
 msgid "DNG backward version"
 msgstr "DNG-Rückversion"
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -16593,11 +20687,11 @@
 "values, to verify it is able to correctly read the file."
 msgstr ""
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
 msgid "Unique Camera Model"
 msgstr "Eindeutiges Kameramodell"
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -16607,35 +20701,35 @@
 "replacement profiles."
 msgstr ""
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
 msgid "Localized Camera Model"
 msgstr "Lokalisiertes Kameramodell"
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
 msgstr ""
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
 msgid "CFA Plane Color"
 msgstr "CFA Ebenenfarbe"
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr ""
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr ""
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -16644,15 +20738,16 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
+#, fuzzy
 msgid "Black Level Repeat Dim"
-msgstr ""
+msgstr "Schwarzlevel Delta H"
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -16660,11 +20755,11 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 msgid "Black Level Delta H"
 msgstr "Schwarzlevel Delta H"
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -16673,11 +20768,11 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 msgid "Black Level Delta V"
 msgstr "Schwarzlevel Delta V"
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -16685,22 +20780,22 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
 msgid "White Level"
 msgstr "Weißlevel"
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
 msgid "Default Scale"
 msgstr "Standard-Skalierung"
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -16710,11 +20805,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr ""
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16723,11 +20818,12 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
+#, fuzzy
 msgid "Default Crop Size"
-msgstr ""
+msgstr "Standard-Skalierung"
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16735,11 +20831,11 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 msgid "Color Matrix 1"
 msgstr "Farbmatrix 1"
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -16747,22 +20843,22 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 msgid "Color Matrix 2"
 msgstr "Farbmatrix 2"
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 msgid "Camera Calibration 1"
 msgstr "Kamerakalibrierung 1"
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16773,11 +20869,11 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
 msgid "Camera Calibration 2"
 msgstr "Kamerakalibrierung 2"
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16788,11 +20884,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
+#, fuzzy
 msgid "Reduction Matrix 1"
-msgstr ""
+msgstr "Farbmatrix 1"
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16800,11 +20897,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
+#, fuzzy
 msgid "Reduction Matrix 2"
-msgstr ""
+msgstr "Farbmatrix 2"
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16812,11 +20910,11 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
 msgid "Analog Balance"
 msgstr "Analogabgleich"
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -16827,33 +20925,34 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
 msgid "As Shot Neutral"
 msgstr "Neutral wie aufgenommen"
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 msgid "As Shot White XY"
 msgstr "Weiß XY wie aufgenommen "
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
+#, fuzzy
 msgid "Baseline Exposure"
-msgstr ""
+msgstr "Mehrfache Belichtung"
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -16868,11 +20967,11 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
 msgid "Baseline Noise"
 msgstr ""
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -16881,11 +20980,12 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
+#, fuzzy
 msgid "Baseline Sharpness"
-msgstr ""
+msgstr "Schärfe"
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -16893,11 +20993,11 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 msgid "Bayer Green Split"
 msgstr ""
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -16907,11 +21007,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr ""
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -16921,7 +21021,7 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
 "that captured the image."
@@ -16929,21 +21029,21 @@
 "CameraSerialNumber enthält die Seriennummer der Kamera oder des "
 "Kamerakörpers mit dem das Foto gemacht wurde."
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
 msgid "Lens Info"
 msgstr "Linseninformation"
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
 "f-stops are unknown, they should be encoded as 0/0."
 msgstr ""
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr ""
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -16954,11 +21054,12 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
+#, fuzzy
 msgid "Anti Alias Strength"
-msgstr ""
+msgstr "Blitzstärke"
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -16967,32 +21068,33 @@
 "artifacts)."
 msgstr ""
 
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 msgid "Shadow Scale"
 msgstr "Schatten-Skalierung"
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
 msgstr ""
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 msgid "DNG Private Data"
 msgstr "DNG-Privatdaten"
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
 "programs that edit DNG files."
 msgstr ""
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
+#, fuzzy
 msgid "MakerNote Safety"
-msgstr ""
+msgstr "Anmerkungen des Herstellers"
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -17001,22 +21103,23 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr ""
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
+#, fuzzy
 msgid "Calibration Illuminant 2"
-msgstr ""
+msgstr "Verzerrungskorrektur"
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -17025,11 +21128,12 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
+#, fuzzy
 msgid "Best Quality Scale"
-msgstr ""
+msgstr "Standard-Skalierung"
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -17038,11 +21142,11 @@
 "need to be multiplied to achieve the best quality image size."
 msgstr ""
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 msgid "Raw Data Unique ID"
 msgstr "Eindeutige ID der Rohdaten"
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -17052,21 +21156,22 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 msgid "Original Raw File Name"
 msgstr "Originaler Rohdateiname"
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
+#, fuzzy
 msgid "Original Raw File Data"
-msgstr ""
+msgstr "Originaler Rohdateiname"
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -17079,21 +21184,21 @@
 "data blocks."
 msgstr ""
 
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 msgid "Active Area"
 msgstr "Aktiver Bereich"
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
 msgstr ""
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 msgid "Masked Areas"
 msgstr "Maskierte Bereiche"
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -17103,11 +21208,12 @@
 "masked pixels are no longer useful."
 msgstr ""
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
+#, fuzzy
 msgid "As-Shot ICC Profile"
-msgstr ""
+msgstr "Aktuelles ICC-Profil"
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -17120,11 +21226,11 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
 msgid "As-Shot Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -17136,11 +21242,11 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 msgid "Current ICC Profile"
 msgstr "Aktuelles ICC-Profil"
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17148,11 +21254,12 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
+#, fuzzy
 msgid "Current Pre-Profile Matrix"
-msgstr ""
+msgstr "Aktuelles ICC-Profil"
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17160,183 +21267,179 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
 msgid "Unknown IFD tag"
 msgstr "Unbekanntes IFD-Feld"
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr "Undefiniert"
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 msgid "Creative program"
 msgstr "Kreativprogramm"
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 msgid "Action program"
 msgstr "Aktionsprogramm"
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
 msgid "Portrait mode"
 msgstr "Portraitmodus"
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
 msgid "Landscape mode"
 msgstr "Landschaftsmodus"
 
-#: src/tags.cpp:1051
-msgid "Center weighted average"
-msgstr "Mittelpunkt gewichteter Durchschnitt"
-
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 msgid "Multi-spot"
 msgstr "Mehr-Punkt"
 
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 msgid "Tungsten (incandescent light)"
 msgstr "weißglühendes Wolfram Licht"
 
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
 msgstr "Gutes Wetter"
 
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
 msgid "Cloudy weather"
 msgstr "Wolkiges Wetter"
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 msgid "Daylight fluorescent (D 5700 - 7100K)"
 msgstr "Tageslicht Leuchtstoff (D 5700 - 7100K)"
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
 msgid "Day white fluorescent (N 4600 - 5400K)"
 msgstr "Tageslichtweiß Leuchtstoff (N 4600 - 5400K)"
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
 msgid "Cool white fluorescent (W 3900 - 4500K)"
 msgstr "Kühles weißes Leuchtstoff (W 3900 - 4500K)"
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
 msgid "White fluorescent (WW 3200 - 3700K)"
 msgstr "Weißes Leuchtstofflicht (WW 3200 - 3700K)"
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr "Standard Licht A"
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr "Standard Licht B"
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr "Standard Licht C"
 
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr "D55"
 
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr "D65"
 
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr "D75"
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 msgid "D50"
 msgstr "D50"
 
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
 msgid "ISO studio tungsten"
 msgstr "ISO Studio Wolfram"
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 msgid "Other light source"
 msgstr "Andere Lichtquelle"
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr "Unkalibriert"
 
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 msgid "One-chip color area"
 msgstr "Einzel-Chip-Farbsensor"
 
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 msgid "Two-chip color area"
 msgstr "Zwei-Chip-Farbsensor"
 
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 msgid "Three-chip color area"
 msgstr "Drei-Chip-Farbsensor"
 
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 msgid "Color sequential area"
 msgstr "Farb-sequentieller Bereich"
 
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr "Trilinearer Sensor"
 
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 msgid "Color sequential linear"
 msgstr "Farb-sequentieller linear"
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
 msgid "Film scanner"
 msgstr "Filmscanner"
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr "Reflexiondruckscanner"
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
 msgid "Digital still camera"
 msgstr "Digitalkamera"
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr "Direkt fotographiert"
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
 msgid "Normal process"
 msgstr "Normale Verarbeitung"
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
 msgid "Custom process"
 msgstr "Gesonderte Verarbeitung"
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr "Langsamer Zugewinn"
 
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr "Schneller Zugewinn"
 
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
 msgid "Low gain down"
 msgstr "Langsame Abnahme"
 
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr "Schnelle Abnahme"
 
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr "Nahaufnahme"
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr "Große Entfernung"
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Belichtungszeit in Sekunden."
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
 "tag value is an ASCII string compatible with the standard developed by the "
@@ -17346,11 +21449,11 @@
 "Feldes ist eine ASCII-Zeichenkette kompatibel mit dem Standard der vom ASTM "
 "Technical Committee entwickelt wurde."
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr ""
 
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -17360,7 +21463,7 @@
 "14524 spezifiziert ist. <OECF> ist der Zusammenhang zwischen dem optischen "
 "Input und den Bildwerten."
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -17368,11 +21471,11 @@
 "Die Version des Exif Standards die unterstützt wird. Wenn dieses Feld nicht "
 "vorhanden ist wird angenommen, das der Standard nicht beachtet wird."
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
 msgid "Date and Time (original)"
 msgstr "Datum und Uhrzeit (original)"
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
@@ -17380,16 +21483,16 @@
 "Das Datum und die Uhrzeit zu der das Bild generiert wurde. Für eine "
 "Digitalkamera ist das der Zeitpunkt an dem das Bild geschossen wurde."
 
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
 msgid "Date and Time (digitized)"
 msgstr "Datum und Uhrzeit (digitalisiert)"
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 "Das Datum und die Uhrzeit der Speicherung des Bildes als digitale Daten."
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -17406,11 +21509,11 @@
 "komprimierten Daten andere Komponenten als Y, Cb und Cr benutzen, oder um "
 "die Unterstützung anderer Sequenzen zu erlauben."
 
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr "Komprimierte Bits per Pixel"
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -17419,7 +21522,7 @@
 "für ein komprimiertes Bild verwendet wird ist hier in Teilbits per Pixel "
 "angegeben."
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -17427,11 +21530,11 @@
 "Verschlussgeschwindigkeit. Die Einheit ist die APEX (Additive System of "
 "Photographic Exposure) Einstellung"
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Die Linsenblende. Die Einheit ist der APEX Wert."
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -17439,11 +21542,11 @@
 "Die Helligkeit. Die Einheit ist der APEX Wert. Normalerweise ist dieser Wert "
 "zwischen -99.99 und 99.99."
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr "Belichtungskontrolle"
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -17451,7 +21554,7 @@
 "Die Belichtungskontrolle. Die Einheit ist der APEX Wert. Normalerweise wird "
 "diese innerhalb des Bereiches -99.99 bis 99.99 spezifiziert."
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
@@ -17460,14 +21563,14 @@
 "Normalerweise wird es im Bereich von 00.00 bis 99.99 angegeben, ist aber "
 "nicht limitiert auf diesen Bereich."
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "Dieser Eintrag wird aufgezeichnet, wenn das Bild mit einem Blitz gemacht "
 "wurde."
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -17475,18 +21578,18 @@
 "Die wirkliche Brennweite der Linse, in mm. Es wird nicht auf das 35mm "
 "Filmkamera Äquivalent konvertiert."
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 "Dieses Feld gibt die Position und Größe des Hauptmotivs in der Szene an."
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
 msgid "Maker Note"
 msgstr "Anmerkungen des Herstellers"
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -17494,54 +21597,54 @@
 "Ein Feld für die Hersteller von Exif-Schreibern um variable Informationen "
 "abzuspeichern. Der Inhalt ist vom Hersteller abhängig."
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
 msgid "Sub-seconds Time"
 msgstr "Sekundenbruchteile/Zeit"
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 "Das Feld wird benutzt um Sekundenbruchteile für das <DateTime>-Feld zu "
 "erfassen."
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 msgid "Sub-seconds Time Original"
 msgstr "Sekundenbruchteile (original)"
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Das Feld wird benutzt um Sekundenbruchteile für des <DateTimeOriginal>-Feld "
 "zu erfassen."
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 msgid "Sub-seconds Time Digitized"
 msgstr "Sekundenbruchteile (digitalisiert)"
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Das Feld wird benutzt um Sekundenbruchteile für das <DateTimeDigitized>-Feld "
 "zu erfassen."
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
 msgid "FlashPix Version"
 msgstr "FlashPix Version"
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Die FlashPix Formatversion die von einer FPXR Datei unterstützt wird."
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB is used to define the color space based on the PC "
@@ -17556,7 +21659,7 @@
 "wurden kõnnen als sRGB betrachtet werden wenn sie in FlashPix konvertiert "
 "werden."
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -17569,7 +21672,7 @@
 "Marker vorhanden sind. Dieser Feld sollte nicht in einer unkomprimierten "
 "Datei existieren."
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
@@ -17585,7 +21688,7 @@
 "Datei existieren. Da Padding in der Vertikalen nicht nötig ist, ist die "
 "Anzahl an Zeilen in diesem Feld die gleiche wie die im JPEG SOF Marker."
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
@@ -17598,11 +21701,11 @@
 "Zeichenkette bestehend  aus acht Zeichen, einem \".\" und drei weiteren "
 "Zeichen. Der Pfad wird nicht gespeichert."
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
 msgid "Interoperability IFD Pointer"
 msgstr "Interoperabilitäts IFD-Zeiger"
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -17615,7 +21718,7 @@
 "Interoperabilitäts IFD ist die gleiche wie in der TIFF IFD Struktur, enthält "
 "aber keine Bildcharakteristiken wie das normale TIFF IFD."
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -17623,18 +21726,18 @@
 "Gibt die Energie des Blitzes zum Zeitpunkt der Aufnahme an, in Beam Candle "
 "Power Seconds (BCPS)."
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 msgstr ""
 
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 msgid "Focal Plane X-Resolution"
 msgstr "Fokusebene x-Auflösung"
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17642,11 +21745,11 @@
 "Gibt die Anzahl an Pixeln in der Breite (X Ebene) pro "
 "<FocalPlaneResolutionUnit> in der Fokusebene an."
 
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 msgid "Focal Plane Y-Resolution"
 msgstr "Fokusebene y-Auflösung"
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17654,7 +21757,7 @@
 "Gibt die Anzahl an Pixeln in der Höhe (Y Ebene) pro "
 "<FocalPlaneResolutionUnit> in der Fokusebene an."
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -17662,7 +21765,7 @@
 "Gibt die Einheit für die Messung der <FocalPlaneXResolution> und der "
 "<FocalPlaneYResolution> an. Der Wert ist der gleiche wie <ResolutionUnit>."
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -17674,11 +21777,11 @@
 "Bildkante, vor der Rotation (siehe <Rotation>-Feld). Der erste Wert gibt die "
 "X, der zweite die Y Koordinate an."
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
 msgid "Exposure index"
 msgstr "Belichtungsindex"
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -17686,11 +21789,11 @@
 "Gibt den Belichtungsindex an, der in der Kamera oder im Eingabegerät während "
 "der Aufnahme selektiert ist."
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr "Gibt den Sensortyp in der Kamera bzw. Eingabegerät an."
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -17698,7 +21801,7 @@
 "Gibt die Quelle des Bildes an. Wenn das Bild durch eine Digitalkamera "
 "aufgenommen wurde, ist der Wert 3."
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
@@ -17707,11 +21810,12 @@
 "hat, muß diese Zahl immer auf 1 gesetzt werden, um anzugeben, das die Szene "
 "direkt fotographiert wurde."
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
+#, fuzzy
 msgid "Color Filter Array Pattern"
-msgstr ""
+msgstr "Farbfilterliste"
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
@@ -17721,7 +21825,7 @@
 "Array) des Bildsensors an, wenn ein 1 Chip Farbflächen Sensor benutzt wird. "
 "Es bezieht sich nicht auf alle Sensormethoden."
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
@@ -17732,7 +21836,7 @@
 "durchgeführt wurde, dann wird der Betrachter gebeten keine oder nur eine "
 "minimale weitere Verarbeitung durchzuführen."
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
@@ -17742,12 +21846,12 @@
 "der automatischen Erfassung nimmt die Kamera mehrere Bilder derselben Szene "
 "mit verschiedenen Belichtungseinstellungen auf."
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 "Dieses Feld enthält den Weißabgleichsmodus, der zur Aufnahme eingestellt war."
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
@@ -17756,7 +21860,7 @@
 "Dieses Feld gibt die digitale Zoomrate bei der Aufnahme des Bildes an. Wenn "
 "der Divisor 0 ist, wurde kein Digitalzoom benutzt."
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
@@ -17766,7 +21870,7 @@
 "an. Der Wert 0 bedeutet das die Brennweite unbekannt ist. Es unterscheidet "
 "sich vom <FocalLength>-Feld."
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
 "record the mode in which the image was shot. Note that this differs from the "
@@ -17776,11 +21880,12 @@
 "Angeben des Aufnahmemodus verwendet werden. Beachten Sie, das es sich vom "
 "<SceneType>-Feld unterscheidet."
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
+#, fuzzy
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
+msgstr "Dieses Feld gibt den Motivabstand an."
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -17788,7 +21893,7 @@
 "Dieses Feld gibt die Richtung der Kontrastbearbeitung an, die bei der "
 "Aufnahme des Bildes angewandt wurde."
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -17796,7 +21901,7 @@
 "Dieses Feld gibt die Richtung der Sättigungsbearbeitung an, die bei der "
 "Aufnahme des Bildes angewandt wurde."
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -17804,7 +21909,7 @@
 "Dieses Feld gibt die Richtung der Schärfebearbeitung bei der Aufnahme des "
 "Bildes an."
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
@@ -17814,11 +21919,11 @@
 "bestimmten Kameramodells. Es wird nur zur Angabe der Bedingungen im Leser "
 "benutzt."
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
 msgid "This tag indicates the distance to the subject."
 msgstr "Dieses Feld gibt den Motivabstand an."
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
@@ -17828,91 +21933,91 @@
 "Zeichenkette in hexadezimaler Schreibweise aufgezeichnet und hat 128 Bit "
 "Länge."
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
 msgid "Unknown Exif tag"
 msgstr "Unbekanntes Exif-Feld"
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
 msgid "North"
 msgstr "Norden"
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
 msgid "South"
 msgstr "Süden"
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
 msgid "East"
 msgstr "Osten"
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
 msgid "West"
 msgstr "Westen"
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr "Über dem Meeresspiegel"
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
 msgid "Below sea level"
 msgstr "Unter dem Meeresspiegel"
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
 msgid "Measurement in progress"
 msgstr "Messung wird durchgeführt"
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
 msgid "Measurement Interoperability"
 msgstr "Messungskompatibilität"
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr "Zweidimensionale Messung"
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr "Dreidimensionale Messung"
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr "km/h"
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr "mph"
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
 msgid "knots"
 msgstr "Knoten"
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 msgid "True direction"
 msgstr "Echte Richtung"
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 msgid "Magnetic direction"
 msgstr "Magnetische Richtung"
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 msgid "Kilometers"
 msgstr "Kilometer"
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 msgid "Miles"
 msgstr "Meilen"
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 msgid "Knots"
 msgstr "Knoten"
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
 msgid "Without correction"
 msgstr "Ohne Korrektur"
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 msgid "Correction applied"
 msgstr "Korrektur wurde angewendet"
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
 "tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
@@ -17925,11 +22030,11 @@
 "zum <ExifVersion>-Feld. Für die Version 2.0.0.0 ist der Wert des Feldes "
 "02000000 H."
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
 msgid "GPS Latitude Reference"
 msgstr "GPS-Höhenreferenz"
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -17938,7 +22043,7 @@
 "Der ASCII Wert \"N\" gibt nördliche Breite an, der Wert \"S\" ist südliche "
 "Breite."
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17952,11 +22057,11 @@
 "Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, "
 "dann ist das Format, dd/1, mmmm/100, 0/1."
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
 msgid "GPS Longitude Reference"
 msgstr "GPS-Längengradreferenz"
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -17964,7 +22069,7 @@
 "Gibt an, ob die Länge östliche oder westliche Länge ist. ASCII 'E' steht für "
 "östliche Länge und 'W' für westliche."
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17978,7 +22083,7 @@
 "Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, "
 "dann ist das Format, dd/1, mmmm/100, 0/1."
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -17992,7 +22097,7 @@
 "absoluter Wert im <GPSAltitude>-Feld angegeben. Die verwendete Einheit ist "
 "Meter. Beachten sie, das dieses Feld den Typ BYTE hat."
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -18000,7 +22105,7 @@
 "Gibt die Höhe über der Referenz Höhe an in <GPSAltitudeRef> an. Höhe ist ein "
 "RATIONAL Wert. Die Referenzeinheit ist Meter."
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
@@ -18010,7 +22115,7 @@
 "durch drei RATIONAL Werte ausgegeben, die die Stunde, die Minute und die "
 "Sekunden mit einer Atomuhr gemessen angeben."
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -18024,7 +22129,7 @@
 "Zeichen zu speichern. Es ist kein Format vorgegeben. Wenn der GPS-Empfänger "
 "die Messung nicht durchführen kann, dann wird dieser Wert auf NULL gesetzt."
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
@@ -18034,7 +22139,7 @@
 "bedeutet, dass die Messung in Arbeit war und \"V\" bedeutet, dass die "
 "Messung kompatibel ist."
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
@@ -18042,44 +22147,54 @@
 "Gibt den GPS-Messungsmoduis an. \"2\" steht für eine zwei-dimensionale "
 "Messung und \"3\" für drei-dimensional."
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 msgid "GPS Data Degree of Precision"
 msgstr "Grad der Präzision der GPS-Daten"
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
+#, fuzzy
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 msgstr ""
+"Gibt den GPS-Messungsmoduis an. \"2\" steht für eine zwei-dimensionale "
+"Messung und \"3\" für drei-dimensional."
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
+#, fuzzy
 msgid "Indicates the speed of GPS receiver movement."
-msgstr ""
+msgstr "Gibt den Typen eines Audioinhalts an."
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
 msgid "GPS Track Ref"
 msgstr "GPS-Spurreferenz"
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
+#, fuzzy
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
+"Gibt die Referenz für die Richtung des Zielbuildes während der Aufnahme an. "
+"\"T\" bezeichnet die wahre und \"M\" die magnetische Richtung."
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
+#, fuzzy
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
+"Gibt die Richtung an in der das Bild gemacht wurde. Der Wertebereich geht "
+"von 0.00 bis 359.99."
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
@@ -18087,7 +22202,7 @@
 "Gibt die Referenz für die Richtung des Zielbuildes während der Aufnahme an. "
 "\"T\" bezeichnet die wahre und \"M\" die magnetische Richtung."
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
@@ -18095,18 +22210,18 @@
 "Gibt die Richtung an in der das Bild gemacht wurde. Der Wertebereich geht "
 "von 0.00 bis 359.99."
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
 msgid "GPS Destination Latitude Refeference"
 msgstr "GPS Referenz zum Breitengrad des Ziels"
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
 "latitude. The ASCII value \"N\" indicates north latitude, and \"S\" is south "
@@ -18116,7 +22231,7 @@
 "Der ASCII Wert \"N\" gibt nördliche Breite an, der Wert \"S\" ist südliche "
 "Breite."
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -18131,11 +22246,11 @@
 "Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, "
 "dann ist das Format, dd/1, mmmm/100, 0/1."
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
 msgid "GPS Destination Longitude Reference"
 msgstr "GPS Referenz auf den Längengrad des Ziels"
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII \"E\" indicates east longitude, and \"W\" is west longitude."
@@ -18143,7 +22258,7 @@
 "Gibt an, ob die Länge östliche oder westliche Länge ist. ASCII \"E\" steht "
 "für östliche Länge und \"W\" für westliche."
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -18158,7 +22273,7 @@
 "Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, "
 "dann ist das Format, dd/1, mmmm/100, 0/1."
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
@@ -18166,34 +22281,42 @@
 "Gibt eine Referenz für die Richtung des Zielpunktes an. \"T\" bezeichnet die "
 "wahre und \"M\" die magnetische Richtung."
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
+#, fuzzy
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
+"Gibt die Richtung an in der das Bild gemacht wurde. Der Wertebereich geht "
+"von 0.00 bis 359.99."
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
+#, fuzzy
 msgid "GPS Destination Distance Reference"
-msgstr ""
+msgstr "GPS Referenz zur Entfernung des Objektes"
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
 msgstr ""
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
 msgid "Indicates the distance to the destination point."
 msgstr "Gibt den Abstand zum Zielpunkt an."
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
+#, fuzzy
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
 "followed by the name of the method."
 msgstr ""
+"Eine Zeichenkette die den Namen des GPS Bereichs enthält. Das erste Byte "
+"weisst auf den verwendeten Zeichensatz hin und wird dann vom Namen des GPS "
+"Bereichs gefolgt."
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
@@ -18203,30 +22326,30 @@
 "weisst auf den verwendeten Zeichensatz hin und wird dann vom Namen des GPS "
 "Bereichs gefolgt."
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
 msgid "GPS Date Stamp"
 msgstr "GPS Datumsstempel"
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
 msgstr ""
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 msgid "Unknown GPSInfo tag"
 msgstr "Unbekanntes GPSInfo-Feld"
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
 msgid "Interoperability Index"
 msgstr "Interoperabilitätsindex"
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -18239,85 +22362,98 @@
 "\"Recommended Exif Interoperability Rules\" (ExifR98) für andere Felder die "
 "für ExifR98 benutzt werden."
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
 msgid "Interoperability Version"
 msgstr "Interoperabilitätsversion"
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr "Interoperabilitätsversion"
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
 msgid "Related Image File Format"
 msgstr "Zugehöriges Bilddateiformat"
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
 msgid "File format of image file"
 msgstr "Dateiformat der Bilddatei"
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 msgid "Related Image Width"
 msgstr "Zugehörige Bildbreite"
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 msgid "Related Image Length"
 msgstr "Zugehörige Bildlänge"
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 msgid "Unknown Exif Interoperability tag"
 msgstr "Unbekanntes Exif-Kompatibilitätsfeld"
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
 #, fuzzy
 msgid "Offset"
 msgstr "Offset"
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr ""
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 #, fuzzy
 msgid "Byte Order"
 msgstr "Füllreihenfolge"
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
 msgstr ""
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 #, fuzzy
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr "Unbekanntes Herstellerbemerkungsfeld von Nikon2"
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
 msgid "Unknown tag"
 msgstr "Unbekanntes Feld"
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 msgid "Digital zoom not used"
 msgstr "Digital Zoom wurde nicht benutzt"
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 msgid "TIFF header, offset"
 msgstr "TIFF-Header, offset"
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr "\"Little-Endian\" kodiert"
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr "\"Big Endian\" kodiert"
 
+#~ msgid "Software firmware version"
+#~ msgstr "Firmware-Version der Software"
+
+#, fuzzy
+#~ msgid "White Balance Bracketing "
+#~ msgstr "Weißabgleichsreihe"
+
+#~ msgid "(Unknown Error)"
+#~ msgstr "(Unbekannter Fehler)"
+
+#~ msgid "Exposure Speed"
+#~ msgstr "Belichtungsgeschwindigkeit"
+
+#~ msgid "Exposure speed"
+#~ msgstr "Belichtungsgeschwindigkeit"
+
 #~ msgid "Color balance settings 1"
 #~ msgstr "Farbabgleich-Einstellungen 1"
 
-#~ msgid "Tone curve"
-#~ msgstr "Farbtonkurve"
-
 #~ msgid "Compression Curve"
 #~ msgstr "Kompressionskurve"
 
@@ -18333,9 +22469,6 @@
 #~ msgid "On for ISO 1600/3200"
 #~ msgstr "An für ISO 1600/3200"
 
-#~ msgid "Spot Mode"
-#~ msgstr "Punktmodus"
-
 #~ msgid "ImageStabilizer"
 #~ msgstr "Bildstabilisierer"
 
Binary files /tmp/TId3M1M1Ks/exiv2-0.19/po/es.gmo and /tmp/B4Gg93MYI9/exiv2-0.21/po/es.gmo differ
diff -Nru exiv2-0.19/po/es.po exiv2-0.21/po/es.po
--- exiv2-0.19/po/es.po	2009-12-29 10:51:25.000000000 +0000
+++ exiv2-0.21/po/es.po	2010-11-22 15:13:38.000000000 +0000
@@ -3,2584 +3,3333 @@
 #   Free Software Foundation, Inc., 2002
 #   Fabian Mandelbaum <fabman@mandrakesoft.com>, 2002
 # This file is distributed under the same license as the Exiv2 package.
+# Este archivo se distribuye bajo la misma licencia que el paquete Exiv2.
 #
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 msgid ""
 msgstr ""
 "Project-Id-Version: Exiv2\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\n"
 "PO-Revision-Date: 2005-03-12 05:43+0100\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
-msgstr ""
+msgstr "Fallo al abrir el archivo\n"
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 #, fuzzy
 msgid "File name"
-msgstr "Nombre del documento"
+msgstr "Nombre del archivo"
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 #, fuzzy
 msgid "File size"
-msgstr "Fuente de archivo"
+msgstr "Tamaño del archivo"
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 #, fuzzy
 msgid "Bytes"
-msgstr "Centímetro"
+msgstr "Bytes"
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 #, fuzzy
 msgid "MIME type"
-msgstr "Ancho de la imagen"
+msgstr "tipo MIME"
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 #, fuzzy
 msgid "Image size"
-msgstr "Ancho de la imagen"
+msgstr "Tamaño de la imagen"
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
-msgstr ""
+msgstr "No se encontraron datos EXIF en el archivo\n"
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 #, fuzzy
 msgid "Camera make"
 msgstr "Contraste"
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 #, fuzzy
 msgid "Camera model"
-msgstr "Retrato"
+msgstr "Modelo de la cámara"
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 #, fuzzy
 msgid "Image timestamp"
-msgstr "Ancho de la imagen"
+msgstr "Fecha y hora de la imagen"
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 #, fuzzy
 msgid "Image number"
 msgstr "ID único de imagen"
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 #, fuzzy
 msgid "Exposure time"
 msgstr "Tiempo de exposición"
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr "Apertura"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 #, fuzzy
 msgid "Exposure bias"
 msgstr "Ajuste de exposición"
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr "Flash"
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 #, fuzzy
 msgid "Flash bias"
-msgstr "El flash disparó."
+msgstr "Ajuste del Flash"
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 #, fuzzy
 msgid "Focal length"
 msgstr "Distancia focal"
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 #, fuzzy
 msgid "35 mm equivalent"
 msgstr " (equivalente 35: %d mm)"
 
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 #, fuzzy
 msgid "Subject distance"
-msgstr "Distancia del sujeto"
+msgstr "Distancia al sujeto"
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 #, fuzzy
 msgid "ISO speed"
 msgstr "Velocidad ISO"
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 #, fuzzy
 msgid "Exposure mode"
 msgstr "Modo de exposición"
 
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 #, fuzzy
 msgid "Metering mode"
-msgstr "Modo de métrica"
+msgstr "Modo de cálculo de la exposición óptima"
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 #, fuzzy
 msgid "Macro mode"
 msgstr "Macro"
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 #, fuzzy
 msgid "Image quality"
-msgstr "Ancho de la imagen"
+msgstr "Calidad de imágen"
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 #, fuzzy
 msgid "Exif Resolution"
 msgstr "Resolución Y"
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 #, fuzzy
 msgid "White balance"
 msgstr "Balance de blanco"
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
-msgstr ""
+msgstr "Miniatura"
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr ""
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
-msgstr ""
+msgstr "Comentario Exif"
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 #, fuzzy
 msgid "No IPTC data found in the file\n"
-msgstr "El flash no disparó."
+msgstr "No se encontraron metadatos de tipo IPTC en el archivo\n"
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 #, fuzzy
 msgid "No XMP data found in the file\n"
-msgstr "El flash no disparó."
+msgstr "No se encontraron metadatos XMP en el archivo\n"
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
-msgstr ""
+msgstr "(Valor Binario suprimido)"
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 #, fuzzy
 msgid "JPEG comment"
 msgstr "Comentario del usuario"
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 #, fuzzy
 msgid "Preview"
-msgstr "Versión Exif"
+msgstr "Vista Preliminar"
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
-msgstr ""
+msgstr "píxeles"
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 #, fuzzy
 msgid "bytes"
-msgstr "Centímetro"
+msgstr "bytes"
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 #, fuzzy
 msgid "Neither tag"
 msgstr "Otro"
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 #, fuzzy
 msgid "nor"
 msgstr "normal"
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 #, fuzzy
 msgid "found in the file"
-msgstr "El flash no disparó."
+msgstr "encontrado en el archivo"
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
-msgstr ""
+msgstr "No se registró el momento de creación de la imagen"
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
-msgstr ""
+msgstr "Fallo al procesar la fecha y hora"
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 #, fuzzy
 msgid "in the file"
-msgstr "El flash no disparó."
+msgstr "en el archivo"
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
-msgstr ""
+msgstr "Actualizando fecha y hora a"
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 #, fuzzy
 msgid "Erasing thumbnail data"
-msgstr "Desplazamiento de tira"
+msgstr "Borrando miniatura"
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
-msgstr ""
+msgstr "Borrando los datos Exif del archivo"
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
-msgstr ""
+msgstr "Borrando los metadatos IPTC del archivo"
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
-msgstr ""
+msgstr "Borrando los comentarios JPEG del archivo"
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
-msgstr ""
+msgstr "Borrando los metadatos XMP del archivo"
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
-msgstr ""
+msgstr "La imágen no contiene una miniatura Exif\n"
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 #, fuzzy
 msgid "Writing thumbnail"
-msgstr "Desplazamiento de tira"
+msgstr "Escribiendo imágen miniatura"
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 #, fuzzy
 msgid "to file"
-msgstr "Espacio de color"
+msgstr "al archivo"
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
-msgstr ""
+msgstr "los datos Exif no contienen una miniatura\n"
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
-msgstr ""
+msgstr "La imágen no tiene vista previa"
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 msgid "Writing preview"
-msgstr ""
+msgstr "Escribiendo vista previa"
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 #, fuzzy
 msgid "Setting JPEG comment"
-msgstr "Comentario del usuario"
+msgstr "ajustando comentario del usuario"
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
-msgstr ""
+msgstr "Añadir"
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 #, fuzzy
 msgid "Warning"
-msgstr "Nitidez"
+msgstr "Aviso"
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 #, fuzzy
 msgid "Failed to read"
-msgstr "Fuente de archivo"
+msgstr "Fallo al leer"
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 #, fuzzy
 msgid "value"
-msgstr "creativo"
+msgstr "valor"
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 #, fuzzy
 msgid "Set"
-msgstr "Área del sujeto"
+msgstr "Establecer"
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr ""
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr ""
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
-msgstr ""
+msgstr "Metadatos de fecha y hora con clave"
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
-msgstr ""
+msgstr "no establecido\n"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
-msgstr ""
+msgstr "Ajustando"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
-msgstr ""
+msgstr "por"
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 #, fuzzy
 msgid "years"
-msgstr "Centímetro"
+msgstr "años"
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
-msgstr ""
+msgstr "año"
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 #, fuzzy
 msgid "months"
-msgstr "Punto blanco"
+msgstr "meses"
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 #, fuzzy
 msgid "month"
-msgstr "Lugar"
+msgstr "més"
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
-msgstr ""
+msgstr "días"
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
-msgstr ""
+msgstr "día"
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
-msgstr ""
+msgstr "s"
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 msgid "Can't adjust timestamp by"
-msgstr ""
+msgstr "No puedo ajustar fecha y hora"
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 #, fuzzy
 msgid "to"
-msgstr "acción"
+msgstr "a"
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
-msgstr ""
+msgstr "la etiqueta ISO Exif standard ya existe; no se modifica\n"
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
-msgstr ""
+msgstr "Estableciando valor Exif ISO a"
+
+#: src/actions.cpp:1671
+msgid "No Exif user comment found"
+msgstr "No se encontraron comentarios Exif del usuario"
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr "Comentario Exif del usuario con un tipo de valor inesperado"
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr "Comentario Exif UNICODE del usuario no encontrado"
+
+#: src/actions.cpp:1692
+#, fuzzy
+msgid "Setting Exif UNICODE user comment to"
+msgstr "Estableciendo comentario Exif UNICODE del usuario a"
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
-msgstr ""
+msgstr "Escribiendo datos Exif desde"
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
-msgstr ""
+msgstr "Escribiendo datos IPTC desde"
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
-msgstr ""
+msgstr "Escribiendo datos XMP desde"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
-msgstr ""
+msgstr "Escribiendo comentario JPEG desde"
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
-msgstr ""
+msgstr "No se pudieron escribir los metadatos al archivo"
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr ""
+"Nombre del archivo perdido por un problema de formato.(Se produjo un archivo "
+"cuyo nombre es una cadena vacía)"
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
-msgstr ""
+msgstr "El nombre del archivo ya es el correcto"
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 #, fuzzy
 msgid "File"
 msgstr "Orden de llenado"
 
-#: src/actions.cpp:1909
+# context here?  File = archivo , to fill = llenar
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
-msgstr ""
+msgstr "ya existe. S[O]breescribir, [r]enombrar or [s]altar?"
 
-#: src/actions.cpp:1937
+# check that both ``o'' and ``O'' are valid for Overwrite order 
+#: src/actions.cpp:1970
 #, fuzzy
 msgid "Renaming file to"
-msgstr "Método de sensado"
+msgstr "Renombrando archivo a"
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
-msgstr ""
+msgstr "actualizando fecha y hora"
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
-msgstr ""
+msgstr "Fallo al renombrar"
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
-msgstr ""
+msgstr "Sobreescribir"
+
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr "Apagado"
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr "Encendido"
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:69
+#, fuzzy
 msgid "PowerShot A30"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:61
+# don't understand all of these. Lugar = a Place
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr ""
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
+#, fuzzy
 msgid "PowerShot A20"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
+#, fuzzy
 msgid "PowerShot A10"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr ""
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 #, fuzzy
 msgid "PowerShot G2"
 msgstr "Lugar"
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
+#, fuzzy
 msgid "PowerShot S40"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
+#, fuzzy
 msgid "PowerShot S30"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
+#, fuzzy
 msgid "PowerShot A40"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr ""
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
+#, fuzzy
 msgid "PowerShot A100"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr ""
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
+#, fuzzy
 msgid "PowerShot A200"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr ""
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 #, fuzzy
 msgid "PowerShot G3"
 msgstr "Lugar"
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
+#, fuzzy
 msgid "PowerShot S45"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr ""
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr ""
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
+#, fuzzy
 msgid "PowerShot A70"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
+#, fuzzy
 msgid "PowerShot A60"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr ""
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 #, fuzzy
 msgid "PowerShot G5"
 msgstr "Lugar"
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
+#, fuzzy
 msgid "PowerShot A300"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
+#, fuzzy
 msgid "PowerShot S50"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
+#, fuzzy
 msgid "PowerShot A80"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr ""
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
+#, fuzzy
 msgid "PowerShot S1 IS"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
+#, fuzzy
 msgid "PowerShot Pro1"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
+#, fuzzy
 msgid "PowerShot S70"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
+#, fuzzy
 msgid "PowerShot S60"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 #, fuzzy
 msgid "PowerShot G6"
 msgstr "Lugar"
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr ""
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
+#, fuzzy
 msgid "PowerShot A75"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr ""
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
+#, fuzzy
 msgid "PowerShot A400"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
+#, fuzzy
 msgid "PowerShot A310"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
+#, fuzzy
 msgid "PowerShot A85"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr ""
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
+#, fuzzy
 msgid "PowerShot A95"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr ""
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr ""
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
+#, fuzzy
 msgid "PowerShot A520"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
+#, fuzzy
 msgid "PowerShot A510"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr ""
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
+#, fuzzy
 msgid "PowerShot S2 IS"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr ""
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr ""
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr ""
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr ""
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
+#, fuzzy
 msgid "PowerShot A430"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
+#, fuzzy
 msgid "PowerShot A410"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
+#, fuzzy
 msgid "PowerShot S80"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
+#, fuzzy
 msgid "PowerShot A620"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
+#, fuzzy
 msgid "PowerShot A610"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr ""
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr ""
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
+#, fuzzy
 msgid "PowerShot TX1"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr ""
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
+#, fuzzy
 msgid "PowerShot A420"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr ""
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr ""
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
+#, fuzzy
 msgid "PowerShot A700"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr ""
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
+#, fuzzy
 msgid "PowerShot S3 IS"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
+#, fuzzy
 msgid "PowerShot A540"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr ""
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 #, fuzzy
 msgid "PowerShot G7"
 msgstr "Lugar"
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
+#, fuzzy
 msgid "PowerShot A530"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr ""
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr ""
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
+#, fuzzy
 msgid "PowerShot A710 IS"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
+#, fuzzy
 msgid "PowerShot A640"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
+#, fuzzy
 msgid "PowerShot A630"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
+#, fuzzy
 msgid "PowerShot S5 IS"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
+#, fuzzy
 msgid "PowerShot A460"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr ""
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
+#, fuzzy
 msgid "PowerShot A570 IS"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
+#, fuzzy
 msgid "PowerShot A560"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr ""
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr ""
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
+#, fuzzy
 msgid "PowerShot A550"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
+#, fuzzy
 msgid "PowerShot A450"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
+#, fuzzy
 msgid "PowerShot Pro90 IS"
-msgstr ""
+msgstr "Lugar"
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 #, fuzzy
 msgid "PowerShot G1"
 msgstr "Lugar"
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr ""
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr ""
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr ""
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr ""
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr ""
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr ""
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr ""
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr ""
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr ""
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr ""
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr ""
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr ""
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr ""
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr ""
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr ""
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr ""
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr ""
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
+#: src/canonmn.cpp:170
+msgid "EOS 7D"
+msgstr ""
+
+#: src/canonmn.cpp:171
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr ""
+
+#: src/canonmn.cpp:172
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr ""
+
+#: src/canonmn.cpp:173
+msgid "EOS 50D"
+msgstr ""
+
+#: src/canonmn.cpp:174
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr ""
+
+#: src/canonmn.cpp:175
+msgid "EOS-1D Mark IV"
+msgstr ""
+
+#: src/canonmn.cpp:180
+#, fuzzy
+msgid "Format 1"
+msgstr "Fuente de archivo"
+
+#: src/canonmn.cpp:181
+#, fuzzy
+msgid "Format 2"
+msgstr "Fuente de archivo"
+
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+msgid "On (1)"
+msgstr ""
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+msgid "On (2)"
+msgstr ""
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr "sRVA"
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr ""
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
 #, fuzzy
 msgid "Camera Settings"
-msgstr "Contraste"
+msgstr "Ajustes de cámara"
 
-#: src/canonmn.cpp:166
+#: src/canonmn.cpp:200
 #, fuzzy
 msgid "Various camera settings"
-msgstr "Contraste"
+msgstr "Varios ajustes de cámara"
 
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
 msgid "Focal Length"
 msgstr "Distancia focal"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
 #, fuzzy
 msgid "Shot Info"
 msgstr "Modo de exposición"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203
 #, fuzzy
 msgid "Shot information"
 msgstr "Posicionamiento YCbCr"
 
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
 #, fuzzy
 msgid "Panorama"
 msgstr "normal"
 
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
+# ### context? Panorama = Apaisado, Panorámica 
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
 #, fuzzy
 msgid "Image Type"
-msgstr "Ancho de la imagen"
+msgstr "Tipo de imágen"
 
-#: src/canonmn.cpp:171
+#: src/canonmn.cpp:205
 #, fuzzy
 msgid "Image type"
-msgstr "Ancho de la imagen"
+msgstr "Tipo de imágen"
 
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 #, fuzzy
 msgid "Firmware Version"
-msgstr "Versión Exif"
+msgstr "Versión del Firmware"
 
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 #, fuzzy
 msgid "Firmware version"
-msgstr "Versión Exif"
+msgstr "Versión del Firmware"
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File Number"
-msgstr "El número F."
+msgstr "Número del archivo"
 
-#: src/canonmn.cpp:173
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File number"
-msgstr "Nombre del documento"
+msgstr "Número del archivo"
 
-#: src/canonmn.cpp:174
+#: src/canonmn.cpp:208
 #, fuzzy
 msgid "Owner Name"
-msgstr "Nombre del documento"
+msgstr "Propietario"
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 #, fuzzy
 msgid "Serial Number"
-msgstr "El número F."
+msgstr "Número Serie"
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 #, fuzzy
 msgid "Camera serial number"
-msgstr "El número F."
+msgstr "Número serie de la cámara"
+
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera Info"
+msgstr "Retrato"
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera info"
+msgstr "Retrato"
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 #, fuzzy
 msgid "Custom Functions"
-msgstr "Proceso personalizado"
+msgstr "Funciones personalizadas"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 #, fuzzy
 msgid "ModelID"
 msgstr "Modelo"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 #, fuzzy
 msgid "Model ID"
 msgstr "Modelo"
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
 #, fuzzy
 msgid "Picture Info"
-msgstr "Modo de exposición"
+msgstr "Información de imágen"
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 #, fuzzy
 msgid "Picture info"
-msgstr "Modo de exposición"
+msgstr "Información de imágen"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
 #, fuzzy
-msgid "White Balance Table"
-msgstr "Balance de blanco"
+msgid "Thumbnail Image Valid Area"
+msgstr "Desplazamiento de tira"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
 #, fuzzy
-msgid "White balance table"
-msgstr "Balance de blanco"
+msgid "Thumbnail image valid area"
+msgstr "Desplazamiento de tira"
 
-#: src/canonmn.cpp:185
+#: src/canonmn.cpp:215
 #, fuzzy
-msgid "Unknown CanonMakerNote tag"
-msgstr "Versión Exif"
-
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
-msgstr ""
+msgid "Serial Number Format"
+msgstr "El número F."
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
-msgstr ""
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial number format"
+msgstr "El número F."
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
-msgid "Economy"
-msgstr ""
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+#, fuzzy
+msgid "Super Macro"
+msgstr "Macro"
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
-msgid "Normal"
-msgstr "Normal"
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+#, fuzzy
+msgid "Super macro"
+msgstr "Supermacro"
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
 #, fuzzy
-msgid "Fine"
-msgstr "pulg"
+msgid "AF Info"
+msgstr "Modo de exposición"
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
-msgid "RAW"
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF info"
+msgstr "Modo de exposición"
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
 msgstr ""
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
+#, fuzzy
+msgid "White Balance Table"
+msgstr "Tabla de balance de blanco"
+
+#: src/canonmn.cpp:219
+#, fuzzy
+msgid "White balance table"
+msgstr "Tabla de balance de blanco"
+
+#: src/canonmn.cpp:220
+#, fuzzy
+msgid "LensModel"
+msgstr "Tipo de escena"
+
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+#, fuzzy
+msgid "Internal Serial Number"
+msgstr "El número F."
+
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+#, fuzzy
+msgid "Internal serial number"
+msgstr "El número F."
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
+msgstr ""
+
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
+
+#: src/canonmn.cpp:223
+#, fuzzy
+msgid "Custom functions"
+msgstr "Funciones personalizadas"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing Info"
+msgstr "Método de sensado"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing info"
+msgstr "Método de sensado"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured Color"
+msgstr "Manual"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured color"
+msgstr "Manual"
+
+#: src/canonmn.cpp:226
+#, fuzzy
+msgid "ColorSpace"
+msgstr "Espacio de color"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD Offset"
+msgstr "Suave"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD offset"
+msgstr "Suave"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor Info"
+msgstr "Ancho de la imagen"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor info"
+msgstr "Modo de exposición"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color Data"
+msgstr "Espacio de color"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color data"
+msgstr "Mis colores"
+
+#: src/canonmn.cpp:234
+#, fuzzy
+msgid "Unknown CanonMakerNote tag"
+msgstr "etiqueta CanonMakerNote desconocida"
+
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
+msgid "Economy"
+msgstr "Modo económico"
+
+# ## Economía ?  it depends on the context
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
+msgid "Normal"
+msgstr "Normal"
+
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
+#, fuzzy
+msgid "Fine"
+msgstr "pulg"
+
+# ### context? don't understand this. 
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
+msgid "RAW"
+msgstr ""
+
+#: src/canonmn.cpp:254
 msgid "Superfine"
 msgstr ""
 
-#: src/canonmn.cpp:206
+# ### context? maybe Extrafino
+#: src/canonmn.cpp:255
 #, fuzzy
 msgid "Normal Movie"
-msgstr "Proceso normal"
+msgstr "Película normal"
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 #, fuzzy
 msgid "Auto"
-msgstr "acción"
+msgstr "Auto"
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
+#, fuzzy
 msgid "Red-eye"
-msgstr ""
+msgstr "Ojos Rojos"
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 msgid "Slow sync"
-msgstr ""
+msgstr "Sincronización lenta"
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
 #, fuzzy
 msgid "Auto + red-eye"
-msgstr "Auto bracket"
+msgstr "Auto + ojos rojos"
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
+#, fuzzy
 msgid "On + red-eye"
-msgstr ""
+msgstr "Encendido + ojos rojos"
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
+#, fuzzy
 msgid "External"
-msgstr ""
+msgstr "Externo"
 
-#: src/canonmn.cpp:223
-#, fuzzy
+#: src/canonmn.cpp:273
 msgid "Single / timer"
-msgstr "Centímetro"
+msgstr ""
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
+#, fuzzy
 msgid "Continuous"
-msgstr ""
+msgstr "Exposición automática"
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
 #, fuzzy
 msgid "Movie"
-msgstr "Modelo"
+msgstr "Película"
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 #, fuzzy
 msgid "Continuous, speed priority"
-msgstr "Prioridad del obturador"
+msgstr "Exposición automática, Prioridad del obturador"
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
+#, fuzzy
 msgid "Continuous, low"
-msgstr ""
+msgstr "Exposición automática, obturador lento"
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
+#, fuzzy
 msgid "Continuous, high"
-msgstr ""
+msgstr "Exposición automática, obturador rápido"
 
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 msgid "One shot AF"
 msgstr ""
 
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
+#, fuzzy
 msgid "AI servo AF"
-msgstr ""
+msgstr "Exposición automática"
 
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
 #, fuzzy
 msgid "AI focus AF"
 msgstr "Exposición automática"
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 #, fuzzy
 msgid "Manual focus"
 msgstr "Exposición manual"
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
 msgid "Single"
 msgstr ""
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+# ## unico? it depends on the context
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
 #, fuzzy
 msgid "Pan focus"
 msgstr "Exposición manual"
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
 #, fuzzy
 msgid "Large"
-msgstr "promedio"
+msgstr "Promedio"
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+# ## large = grande. mean = promedio... context?
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
+#, fuzzy
 msgid "Medium"
-msgstr ""
+msgstr "Luz de día"
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
+#, fuzzy
 msgid "Small"
-msgstr ""
+msgstr "Pequeño"
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
+#, fuzzy
 msgid "Medium 1"
-msgstr ""
+msgstr "Luz de día 1"
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
+#, fuzzy
 msgid "Medium 2"
-msgstr ""
+msgstr "Luz de día 2"
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
+#, fuzzy
 msgid "Medium 3"
-msgstr ""
+msgstr "Luz de día 3"
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
 #, fuzzy
 msgid "Full auto"
-msgstr "acción"
+msgstr "Automático"
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr "Manual"
 
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr "Paisaje"
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
 #, fuzzy
 msgid "Fast shutter"
-msgstr "obturador"
+msgstr "obturador rápido"
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 #, fuzzy
 msgid "Slow shutter"
-msgstr "obturador"
+msgstr "obturador lento"
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 #, fuzzy
 msgid "Night Scene"
 msgstr "Escena nocturna"
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
+#, fuzzy
 msgid "Gray scale"
-msgstr ""
+msgstr "Escala de gríses"
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
-msgstr ""
+msgstr "Sepia"
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr "Retrato"
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 #, fuzzy
 msgid "Sports"
-msgstr "Lugar"
+msgstr "Deportes"
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 #, fuzzy
 msgid "Macro / close-up"
-msgstr "Macro"
+msgstr "Macro / Primer plano"
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 msgid "Black & white"
-msgstr ""
+msgstr "Blanco y Negro"
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 msgid "Vivid"
-msgstr ""
+msgstr "Expresivo"
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 #, fuzzy
 msgid "Neutral"
-msgstr "Manual"
+msgstr "Neutro"
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
 #, fuzzy
 msgid "Flash off"
-msgstr "Flash"
+msgstr "Sin Flash"
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 #, fuzzy
 msgid "Long shutter"
-msgstr "obturador"
-
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr ""
+msgstr "obturador largo"
 
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
+#, fuzzy
 msgid "Foliage"
-msgstr ""
+msgstr "Follaje"
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
+#, fuzzy
 msgid "Indoor"
-msgstr ""
+msgstr "Interiores"
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
-msgstr ""
+msgstr "Fuegos artificiales"
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
-msgstr ""
+msgstr "Escena de playa"
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 #, fuzzy
 msgid "Underwater"
-msgstr "Tiempo bueno"
+msgstr "Escena subacuática"
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
+#, fuzzy
 msgid "Snow"
-msgstr ""
+msgstr "Nieve"
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
-msgstr ""
+msgstr "Niños y Mascotas"
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 #, fuzzy
 msgid "Night SnapShot"
-msgstr "retrato"
+msgstr "Instantánea Nocturna"
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 #, fuzzy
 msgid "Digital macro"
-msgstr "Relación de zoom digital"
+msgstr "Zoom digital"
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
 #, fuzzy
 msgid "My Colors"
-msgstr "Espacio de color"
+msgstr "Colores personalizados"
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+# ### probably, it depends on the context
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
+#, fuzzy
 msgid "Still image"
-msgstr ""
+msgstr "Foto fija"
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
 #, fuzzy
 msgid "Other"
-msgstr "otro"
+msgstr "Otros"
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
-msgstr ""
+msgstr "Poca luz"
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 #, fuzzy
 msgid "High"
 msgstr "Luz de día"
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr ""
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
 #, fuzzy
 msgid "Auto High"
-msgstr "arriba - derecha"
+msgstr "Auto / arriba - derecha"
 
-#: src/canonmn.cpp:322
+# ## ?
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
+#, fuzzy
 msgid "Default"
-msgstr ""
+msgstr "Por defecto"
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
 msgid "Spot"
-msgstr "Lugar"
+msgstr "Punto"
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr "Promedio"
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
 #, fuzzy
 msgid "Evaluative"
 msgstr "creativo"
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
 msgid "Partial"
 msgstr "Parcial"
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 #, fuzzy
 msgid "Center weighted"
 msgstr "peso centrado"
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 #, fuzzy
 msgid "Not known"
 msgstr "Desconocido"
 
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr "Macro"
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 #, fuzzy
 msgid "Very close"
-msgstr "co-situado"
+msgstr "Muy próximo"
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
 #, fuzzy
 msgid "Close"
-msgstr "co-situado"
+msgstr "Próximo"
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
+#, fuzzy
 msgid "Middle range"
-msgstr ""
+msgstr "Rango medio"
 
-#: src/canonmn.cpp:339
+# ### distancia media, or "objetivo a media distancia" could be better here
+#: src/canonmn.cpp:391
 #, fuzzy
 msgid "Far range"
-msgstr "Rango de transferencia"
+msgstr "Rango lejano"
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 msgid "Infinity"
-msgstr ""
+msgstr "Infinito"
 
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
 #, fuzzy
 msgid "Manual AF point selection"
 msgstr "Balance de blanco manual"
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 msgid "None (MF)"
-msgstr ""
+msgstr "Ninguno (Enfoque manual)"
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 #, fuzzy
 msgid "Auto-selected"
-msgstr "Auto bracket"
+msgstr "Auto seleccionado"
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 #, fuzzy
 msgid "Right"
-msgstr "Escena nocturna"
+msgstr "Correcto"
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 #, fuzzy
 msgid "Center"
-msgstr "Centímetro"
+msgstr "Centrado"
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
+#, fuzzy
 msgid "Left"
-msgstr ""
+msgstr "Izquierda"
 
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
+#, fuzzy
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Balance de blanco manual"
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
+#, fuzzy
 msgid "Easy shooting (Auto)"
-msgstr ""
+msgstr "Modo de métrica (Exposición automática)"
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 #, fuzzy
 msgid "Program (P)"
 msgstr "Modo de exposición"
 
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 #, fuzzy
 msgid "Shutter priority (Tv)"
-msgstr "Prioridad del obturador"
+msgstr "Modo de prioridad a la velocidad del obturador (Tv)"
 
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 #, fuzzy
 msgid "Aperture priority (Av)"
-msgstr "Prioridad de apertura"
+msgstr "Modo de prioridad a la apertura (Av)"
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 #, fuzzy
 msgid "Manual (M)"
 msgstr "Manual"
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr ""
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
 msgid "M-DEP"
 msgstr ""
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 #, fuzzy
 msgid "Did not fire"
-msgstr "El flash no disparó."
+msgstr "El flash no disparó"
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
+#, fuzzy
 msgid "Fired"
-msgstr ""
+msgstr "Disparado"
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 #, fuzzy
 msgid "External flash"
-msgstr "Retrato"
+msgstr "Flash externo"
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
+#, fuzzy
 msgid "Internal flash"
-msgstr ""
+msgstr "Flash interno"
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
-msgstr ""
+msgstr "Medición a través de la Lente (TTL)"
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr ""
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr ""
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr ""
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr ""
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
+#, fuzzy
 msgid "FP sync used"
-msgstr ""
+msgstr "Punto blanco"
 
-#: src/canonmn.cpp:625
+# ### ?
+#: src/canonmn.cpp:707
 #, fuzzy
 msgid "Normal AE"
-msgstr "Normal"
+msgstr "Exposición automática normal"
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
 #, fuzzy
 msgid "Exposure compensation"
 msgstr "Tiempo de exposición"
 
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+# context? tiempo de exposición = Exposure timne. Probably better as "Tiempo de compensación de la exposición"
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
-msgstr ""
+msgstr "Bloqueo de la Exposición Automática"
 
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 #, fuzzy
 msgid "AE lock + exposure compensation"
-msgstr "Tiempo de exposición"
+msgstr "Exposición automática bloqueada + Tiempo de exposición"
 
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
+#, fuzzy
 msgid "No AE"
-msgstr ""
+msgstr "Sin exposición automatica (Normal)"
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
 msgid "On, shot only"
 msgstr ""
 
-#: src/canonmn.cpp:644
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+#, fuzzy
+msgid "AF Point"
+msgstr "Autofocus punto"
+
+#: src/canonmn.cpp:732
 #, fuzzy
 msgid "Smooth"
-msgstr "Lugar"
+msgstr "Suave"
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
-msgstr ""
+msgstr "B/N"
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 #, fuzzy
 msgid "Custom"
 msgstr "Proceso personalizado"
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
+#, fuzzy
 msgid "My color data"
+msgstr "Mis colores"
+
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+#, fuzzy
+msgid "Full"
+msgstr "acción"
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
 msgstr ""
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:759
 #, fuzzy
 msgid "Selftimer"
-msgstr "Centímetro"
+msgstr "disparo retardado (Temporizador)"
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
 #, fuzzy
 msgid "Self timer"
-msgstr "Centímetro"
+msgstr "disparo retardado (Temporizador)"
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 #, fuzzy
 msgid "Quality"
 msgstr "Nivel de la batería"
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+# ## context?
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 #, fuzzy
 msgid "Flash Mode"
-msgstr "Flash"
+msgstr "Modo Flash"
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
 #, fuzzy
 msgid "Flash mode setting"
-msgstr "Contraste"
+msgstr "Ajuste del modo flash"
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
 #, fuzzy
 msgid "Drive Mode"
 msgstr "Modo de métrica"
 
-#: src/canonmn.cpp:657
+# ### ?
+#: src/canonmn.cpp:762
 #, fuzzy
 msgid "Drive mode setting"
 msgstr "Macro"
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+# ### ?
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 #, fuzzy
 msgid "Focus Mode"
-msgstr "Modo de exposición"
+msgstr "Modo de enfoque"
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
 #, fuzzy
 msgid "Focus mode setting"
-msgstr "Modo de exposición"
+msgstr "Ajustes del modo de enfoque"
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 #, fuzzy
 msgid "Image Size"
-msgstr "Ancho de la imagen"
+msgstr "Tamaño de la imagen"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 #, fuzzy
 msgid "Easy Mode"
 msgstr "Flash"
 
-#: src/canonmn.cpp:663
+# ### ? 
+#: src/canonmn.cpp:768
 #, fuzzy
 msgid "Easy shooting mode"
 msgstr "Modo de métrica"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+# ### ? 
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 #, fuzzy
 msgid "Digital Zoom"
 msgstr "Relación de zoom digital"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 #, fuzzy
 msgid "Digital zoom"
 msgstr "Relación de zoom digital"
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
 #, fuzzy
 msgid "Contrast setting"
-msgstr "Contraste"
+msgstr "Ajuste del contraste"
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr "Saturación"
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
 #, fuzzy
 msgid "Saturation setting"
-msgstr "Alta saturación"
+msgstr "Ajuste de la saturación"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr "Nitidez"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
 #, fuzzy
 msgid "Sharpness setting"
 msgstr "Nitidez"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 #, fuzzy
 msgid "ISO Speed Mode"
 msgstr "Velocidad ISO"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
 #, fuzzy
 msgid "ISO speed setting"
-msgstr "Velocidad ISO"
+msgstr "ajuste de velocidad ISO"
 
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
-msgstr "Modo de métrica"
+msgstr "Modo de métrica (Exposición automática)"
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
 #, fuzzy
 msgid "Metering mode setting"
-msgstr "Macro"
+msgstr "ajuste del modo de Exposición automática"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 #, fuzzy
 msgid "Focus Type"
-msgstr "Modo de exposición"
+msgstr "Tipo de enfoque"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 #, fuzzy
 msgid "Focus type setting"
-msgstr "Modo de exposición"
-
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-#, fuzzy
-msgid "AF Point"
-msgstr "Punto blanco"
+msgstr "Ajuste del tipo de enfoque"
 
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 #, fuzzy
 msgid "AF point selected"
-msgstr "Punto blanco"
+msgstr "Autofocus punto seleccionado"
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 #, fuzzy
 msgid "Exposure Program"
-msgstr "Modo de exposición"
+msgstr "Programa de exposición"
 
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
 #, fuzzy
 msgid "Exposure mode setting"
-msgstr "Modo de exposición"
+msgstr "Ajuste del modo de exposición"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 #, fuzzy
 msgid "Lens Type"
-msgstr "Tipo de escena"
+msgstr "Tipo de lente"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 #, fuzzy
 msgid "Lens type"
-msgstr "Espacio de color"
+msgstr "Tipo de lente"
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 #, fuzzy
 msgid "Lens"
-msgstr "Ancho de la imagen"
+msgstr "Lente"
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
 msgstr ""
+"longitud focal 'larga' y 'corta' (en 'unidades focales') y 'unidades focales "
+"por mm' "
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
+#: src/canonmn.cpp:781
 #, fuzzy
-msgid "Max Aperture"
-msgstr "Apertura"
+msgid "Short Focal"
+msgstr "Lugar"
+
+#: src/canonmn.cpp:781
+#, fuzzy
+msgid "Short focal"
+msgstr "Lugar"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal Units"
+msgstr "Distancia focal"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal units"
+msgstr "Distancia focal"
+
+# ### can be improved, '()'?
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
+#, fuzzy
+msgid "Max Aperture"
+msgstr "Apertura máxima"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
 #, fuzzy
 msgid "Max aperture"
-msgstr "apertura"
+msgstr "apertura máxima"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min Aperture"
-msgstr "Apertura"
+msgstr "Apertura mínima"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min aperture"
-msgstr "apertura"
+msgstr "apertura mínima"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 #, fuzzy
 msgid "Flash Activity"
-msgstr "Flash"
+msgstr "Actividad del Flash"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 #, fuzzy
 msgid "Flash activity"
-msgstr "Flash"
+msgstr "Actividad del Flash"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 #, fuzzy
 msgid "Flash Details"
-msgstr "Flash"
+msgstr "Detalles del Flash"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 #, fuzzy
 msgid "Flash details"
-msgstr "Flash"
+msgstr "Detalles del Flash"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 #, fuzzy
 msgid "Focus Continuous"
 msgstr "Exposición automática"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 #, fuzzy
 msgid "Focus continuous setting"
-msgstr "Modo de exposición"
+msgstr "Ajuste del modo de exposición automática"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 #, fuzzy
 msgid "AESetting"
 msgstr "Velocidad ISO"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 #, fuzzy
 msgid "AE setting"
 msgstr "Velocidad ISO"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 #, fuzzy
 msgid "Image Stabilization"
 msgstr "Orientación"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+# ### don't understand this. Context?
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 #, fuzzy
 msgid "Image stabilization"
 msgstr "Orientación"
 
-#: src/canonmn.cpp:687
+# ### ?
+#: src/canonmn.cpp:792
 #, fuzzy
 msgid "Display Aperture"
 msgstr "Apertura"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 #, fuzzy
 msgid "Display aperture"
 msgstr "apertura"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Ancho de la imagen ampliada"
 
-#: src/canonmn.cpp:688
+# ### can be improved
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom source width"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 #, fuzzy
 msgid "Zoom Target Width"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:689
+# ### ?
+#: src/canonmn.cpp:794
 #, fuzzy
 msgid "Zoom target width"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot Metering Mode"
+msgstr "Modo de métrica (Exposición automática)"
+
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot metering mode"
+msgstr "El modo de la métrica."
+
+#: src/canonmn.cpp:797
 #, fuzzy
 msgid "Photo Effect"
 msgstr "Espacio de color"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 #, fuzzy
 msgid "Photo effect"
 msgstr "Espacio de color"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual Flash Output"
+msgstr "Exposición manual"
+
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual flash output"
+msgstr "Exposición manual"
+
+#: src/canonmn.cpp:799
 #, fuzzy
 msgid "Color Tone"
-msgstr "Espacio de color"
+msgstr "Tonos de color"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
 #, fuzzy
 msgid "Color tone"
-msgstr "Espacio de color"
+msgstr "Tonos de color"
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
+msgstr ""
+
+#: src/canonmn.cpp:800
+#, fuzzy
+msgid "SRAW quality"
+msgstr "Calidad de imágen"
+
+#: src/canonmn.cpp:802
 #, fuzzy
 msgid "Unknown Canon Camera Settings 1 tag"
 msgstr "Contraste"
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 #, fuzzy
 msgid "Sunny"
-msgstr "soleado"
+msgstr "Soleado"
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 #, fuzzy
 msgid "Cloudy"
-msgstr "nublado"
+msgstr "Nublado"
 
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 #, fuzzy
 msgid "Tungsten"
-msgstr "tungsteno"
+msgstr "luz de bombilla incandescente (tungsteno)"
 
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
-msgstr "Fluorescente"
+msgstr "iluminación con fluorescente"
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
+#, fuzzy
 msgid "Black & White"
-msgstr ""
+msgstr "Blanco/Negro"
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr "Sombra"
 
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 #, fuzzy
 msgid "Manual Temperature (Kelvin)"
-msgstr "Espacio de color"
+msgstr "Temperatura de color manual (Kelvin)"
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
-msgstr ""
+msgstr "Ajuste PC 1"
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
-msgstr ""
+msgstr "Ajuste PC 2"
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
-msgstr ""
+msgstr "Ajuste PC 13"
 
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
 #, fuzzy
 msgid "Daylight Fluorescent"
-msgstr "Fluorescente"
+msgstr "Fluorescente luz de día"
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 #, fuzzy
 msgid "Custom 1"
-msgstr "Proceso personalizado"
+msgstr "Personalizado 1"
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 #, fuzzy
 msgid "Custom 2"
+msgstr "Personalizado 2"
+
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+#, fuzzy
+msgid "Custom 3"
 msgstr "Proceso personalizado"
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:831
+#, fuzzy
+msgid "PC Set 4"
+msgstr "Ajuste PC 1"
+
+#: src/canonmn.cpp:832
+#, fuzzy
+msgid "PC Set 5"
+msgstr "Ajuste PC 1"
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 #, fuzzy
 msgid "left"
-msgstr "arriba - izquierda"
+msgstr "izquierda"
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 #, fuzzy
 msgid "center"
-msgstr "Centímetro"
+msgstr "centro"
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
 #, fuzzy
 msgid "right"
-msgstr "Copyright"
+msgstr "derecho"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 #, fuzzy
 msgid "ISO Speed Used"
-msgstr "Velocidad ISO"
+msgstr "Velocidad ISO utilizada"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 #, fuzzy
 msgid "ISO speed used"
-msgstr "Velocidad ISO"
+msgstr "Velocidad ISO utilizada"
+
+#: src/canonmn.cpp:867
+msgid "Measured EV"
+msgstr ""
 
-#: src/canonmn.cpp:758
+#: src/canonmn.cpp:868
 #, fuzzy
 msgid "Target Aperture"
 msgstr "Apertura"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 #, fuzzy
 msgid "Target Shutter Speed"
 msgstr "Velocidad del obturador"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 #, fuzzy
 msgid "Target shutter speed"
 msgstr "Velocidad del obturador"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr "Balance de blanco"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
 #, fuzzy
 msgid "White balance setting"
-msgstr "Balance de blanco"
+msgstr "ajuste de balance de blanco"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 #, fuzzy
 msgid "Sequence"
-msgstr "El número F."
+msgstr "Apertura (número F)"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
-msgstr ""
+msgstr "Número de secuencia (si estamos en modo ráfaga)"
 
-#: src/canonmn.cpp:768
+# ##  the word secuence is ambiguous to me here, context?
+#: src/canonmn.cpp:878
 #, fuzzy
 msgid "AF Point Used"
-msgstr "Punto blanco"
+msgstr "Autofocus punto usado"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 #, fuzzy
 msgid "AF point used"
-msgstr "Punto blanco"
+msgstr "Autofocus punto usado"
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 #, fuzzy
 msgid "Flash Bias"
-msgstr "El flash disparó."
+msgstr "Ajuste de flash"
 
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
-msgstr "Distancia del sujeto"
+msgstr "Distancia al sujeto"
 
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 #, fuzzy
 msgid "Subject distance (units are not clear)"
-msgstr "Rango de distancia al sujeto."
+msgstr "Rango de distancia al sujeto (unidades no claras)."
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 #, fuzzy
 msgid "Aperture Value"
-msgstr "apertura"
+msgstr "Apertura del diafragma (valor)"
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 #, fuzzy
 msgid "Shutter Speed Value"
 msgstr "Velocidad del obturador"
 
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr "Velocidad del obturador"
 
-#: src/canonmn.cpp:782
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
+msgstr ""
+
+#: src/canonmn.cpp:892
 #, fuzzy
 msgid "Unknown Canon Camera Settings 2 tag"
 msgstr "Versión Exif"
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+# ### ?
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 #, fuzzy
 msgid "Left to right"
-msgstr "abajo - derecha"
+msgstr "De izquierda a derecha"
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 #, fuzzy
 msgid "Right to left"
-msgstr "derecha - arriba"
+msgstr "de derecha a izquiera"
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 #, fuzzy
 msgid "Bottom to top"
-msgstr "abajo - izquierda"
+msgstr "de abajo a arriba"
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 #, fuzzy
 msgid "Top to bottom"
-msgstr "izquierda - abajo"
+msgstr "de arriba a abajo"
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
-msgstr ""
+msgstr "matriz 2x2 (en sentido de las agujas del reloj)"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 #, fuzzy
 msgid "Panorama Frame"
 msgstr "normal"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 #, fuzzy
 msgid "Panorama frame number"
 msgstr "ID único de imagen"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 #, fuzzy
 msgid "Panorama Direction"
 msgstr "Descripción de la imagen"
 
-#: src/canonmn.cpp:802
+# ##  context?
+#: src/canonmn.cpp:912
 #, fuzzy
 msgid "Panorama direction"
 msgstr "Descripción de la imagen"
 
-#: src/canonmn.cpp:804
+# ##  context?
+#: src/canonmn.cpp:914
 #, fuzzy
 msgid "Unknown Canon Panorama tag"
-msgstr "Desconocido"
+msgstr "Etiqueta Canon Panorama desconocida"
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 #, fuzzy
 msgid "Noise Reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "El flash disparó, modo de reducción de ruido"
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
 #, fuzzy
 msgid "Long exposure noise reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr ""
+"El flash disparó, modo de reducción de ruido en exposiciones prolongadas"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 #, fuzzy
 msgid "Shutter Ae Lock"
-msgstr "Velocidad del obturador"
+msgstr "Obturador con bloqueo de exposición automática"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 #, fuzzy
 msgid "Shutter/AE lock buttons"
 msgstr "obturador"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr ""
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr ""
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
 #, fuzzy
 msgid "Exposure Level Increments"
-msgstr "Índice de exposición"
+msgstr "Incrementos en nivel de exposición"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
-msgstr ""
+msgstr "Tv/Av y nivel de exposición"
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
+#, fuzzy
 msgid "AF Assist"
-msgstr ""
+msgstr "Asistencia Autofocus centrado"
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
-msgstr ""
+msgstr "Apoyo a Autofocus claro"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
+#, fuzzy
 msgid "Flash Sync Speed Av"
-msgstr ""
+msgstr "Flash"
 
-#: src/canonmn.cpp:819
+# ### ?
+#: src/canonmn.cpp:929
 #, fuzzy
 msgid "Shutter speed in Av mode"
 msgstr "Velocidad del obturador"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
+#, fuzzy
 msgid "AEB Sequence"
-msgstr ""
+msgstr "El número F."
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB sequence/auto cancellation"
-msgstr ""
+msgstr "secuencia AEB / autocancelación"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 #, fuzzy
 msgid "Shutter Curtain Sync"
 msgstr "obturador"
 
-#: src/canonmn.cpp:821
+# ### incomplete
+#: src/canonmn.cpp:931
 #, fuzzy
 msgid "Shutter curtain sync"
 msgstr "Prioridad del obturador"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 #, fuzzy
 msgid "Lens AF Stop Button"
 msgstr "Espacio de color"
 
-#: src/canonmn.cpp:822
+# ###  don't understand... context?
+#: src/canonmn.cpp:932
+#, fuzzy
 msgid "Lens AF stop button Fn. Switch"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 #, fuzzy
 msgid "Fill Flash Auto Reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
-msgstr ""
+msgstr "Auto reducción del flash de relleno"
 
-#: src/canonmn.cpp:824
+# ### can be improved probably
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
-msgstr ""
+msgstr "Volver al menú"
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu button return position"
 msgstr ""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
+#, fuzzy
 msgid "Set Button Function"
-msgstr ""
+msgstr "Proceso personalizado"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
+#, fuzzy
 msgid "Sensor Cleaning"
-msgstr ""
+msgstr "Copyright"
 
-#: src/canonmn.cpp:826
+# ### ?
+#: src/canonmn.cpp:936
+#, fuzzy
 msgid "Sensor cleaning"
-msgstr ""
+msgstr "Copyright"
 
-#: src/canonmn.cpp:827
+# ### ?
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
-msgstr ""
+msgstr "Enfoque en imágenes superpuestas"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
-msgstr ""
+msgstr "Enfoque en imágenes superpuestas"
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
 #, fuzzy
 msgid "Unknown Canon Custom Function tag"
 msgstr "Versión Exif"
 
-#: src/canonmn.cpp:841
+# ###?
+#: src/canonmn.cpp:951
 #, fuzzy
 msgid "mid-right"
 msgstr "Copyright"
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+# ### ?
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 #, fuzzy
 msgid "bottom"
-msgstr "izquierda - abajo"
+msgstr "fondo"
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 #, fuzzy
 msgid "top"
-msgstr "acción"
+msgstr "arriba"
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
 #, fuzzy
 msgid "mid-left"
 msgstr "abajo - izquierda"
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
 #, fuzzy
 msgid "upper-left"
 msgstr "arriba - izquierda"
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
 #, fuzzy
 msgid "upper-right"
 msgstr "arriba - derecha"
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
 #, fuzzy
 msgid "lower-left"
 msgstr "arriba - izquierda"
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
 #, fuzzy
 msgid "lower-right"
 msgstr "Copyright"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+# ### ?
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
 msgid "Image Width"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
 #, fuzzy
 msgid "Image width"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
 #, fuzzy
 msgid "Image Height"
 msgstr "Longitud de la imagen"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
 #, fuzzy
 msgid "Image height"
 msgstr "Longitud de la imagen"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 #, fuzzy
 msgid "Image Width As Shot"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:866
+# ### probably right... context?
+#: src/canonmn.cpp:976
 #, fuzzy
 msgid "Image width (as shot)"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 #, fuzzy
 msgid "Image Height As Shot"
 msgstr "Longitud de la imagen"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 #, fuzzy
 msgid "Image height (as shot)"
 msgstr "Longitud de la imagen"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 #, fuzzy
 msgid "AF Points Used"
-msgstr "Punto blanco"
+msgstr "Autofocus Punto blanco"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 #, fuzzy
 msgid "AF points used"
-msgstr "Punto blanco"
+msgstr "Autofocus Punto blanco"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 #, fuzzy
 msgid "AF Points Used 20D"
 msgstr "Punto blanco"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
+#, fuzzy
 msgid "AF points used (20D)"
-msgstr ""
+msgstr "Punto blanco"
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 #, fuzzy
 msgid "Unknown Canon Picture Info tag"
 msgstr "Desconocido"
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
+#, fuzzy
 msgid "ISO"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 #, fuzzy
 msgid "WB"
 msgstr "A"
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
-msgstr ""
+msgstr "Postal"
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
-msgstr ""
+msgstr "Pantalla ancha"
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 #, fuzzy
 msgid "Medium Movie"
 msgstr "Luz de día"
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 #, fuzzy
 msgid "Small Movie"
 msgstr "Modelo"
 
-#: src/canonmn.cpp:905
+# ### ?
+#: src/canonmn.cpp:1015
 msgid "On 1"
 msgstr ""
 
-#: src/canonmn.cpp:906
+# ### ?
+#: src/canonmn.cpp:1016
+#, fuzzy
 msgid "On 2"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 msgid "On (shift AB)"
 msgstr ""
 
-#: src/canonmn.cpp:915
+#: src/canonmn.cpp:1025
 msgid "On (shift GM)"
 msgstr ""
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
-msgstr ""
+msgstr "Amarillo"
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 #, fuzzy
 msgid "Orange"
-msgstr "Rango de transferencia"
+msgstr "Naranja"
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+# ##context? previously "Rango de transferencia"
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 #, fuzzy
 msgid "Red"
-msgstr "Balance de blanco"
+msgstr "Balance de rojo"
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 #, fuzzy
 msgid "Green"
-msgstr "Modo de métrica"
+msgstr "Verde"
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
 #, fuzzy
 msgid "Blue"
-msgstr "creativo"
+msgstr "Azul"
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
-msgstr ""
+msgstr "Púrpura"
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 #, fuzzy
 msgid "Bracket Mode"
-msgstr "acción"
+msgstr "modo horquillado (Bracket)"
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
 #, fuzzy
 msgid "Bracket Value"
 msgstr "acción"
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
 #, fuzzy
 msgid "Bracket Shot Number"
-msgstr "acción"
+msgstr "número de disparos en modo horquillado (Bracket)"
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 #, fuzzy
 msgid "Raw Jpg Quality"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:943
+# ### ?
+#: src/canonmn.cpp:1053
 #, fuzzy
 msgid "Raw Jpg Size"
 msgstr "Ancho de la imagen"
 
-#: src/canonmn.cpp:945
+# ### ? tamaño crudo de jpg?
+#: src/canonmn.cpp:1055
 #, fuzzy
 msgid "WB Bracket Mode"
 msgstr "acción"
 
-#: src/canonmn.cpp:946
+# ### ? 
+#: src/canonmn.cpp:1056
 #, fuzzy
 msgid "WB Bracket Value AB"
 msgstr "Balance de blanco"
 
-#: src/canonmn.cpp:947
+# ### not related, context? 
+#: src/canonmn.cpp:1057
 #, fuzzy
 msgid "WB Bracket Value GM"
 msgstr "Balance de blanco"
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 #, fuzzy
 msgid "Filter Effect"
 msgstr "Espacio de color"
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+# ###? filter effect = color space???
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 #, fuzzy
 msgid "Toning Effect"
 msgstr "Espacio de color"
 
-#: src/canonmn.cpp:951
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro Magnification"
+msgstr "Versión Exif"
+
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro magnification"
+msgstr "Versión Exif"
+
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
+msgstr ""
+
+# ### ?
+#: src/canonmn.cpp:1061
+#, fuzzy
+msgid "Live view shooting"
+msgstr "Macro"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash Exposure Lock"
+msgstr "Tiempo de exposición"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash exposure lock"
+msgstr "Tiempo de exposición"
+
+# ###? toning effect = color space???
+#: src/canonmn.cpp:1064
 #, fuzzy
 msgid "Unknown Canon File Info tag"
 msgstr "Desconocido"
 
-#: src/crwimage.cpp:663
-msgid "Header, offset"
-msgstr ""
+# don't understand well the context
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
+msgstr "Estándar"
 
-#: src/crwimage.cpp:680
+#: src/canonmn.cpp:1082
 #, fuzzy
-msgid "tag"
-msgstr "promedio"
+msgid "Lowest"
+msgstr "arriba - izquierda"
 
-#: src/crwimage.cpp:682
-msgid "dir"
-msgstr ""
+#: src/canonmn.cpp:1086
+#, fuzzy
+msgid "Highest"
+msgstr "Luz de día"
 
-#: src/crwimage.cpp:684
+#: src/canonmn.cpp:1094
 #, fuzzy
-msgid "type"
-msgstr "Escena nocturna"
+msgid "High Saturation"
+msgstr "Saturación"
 
-#: src/crwimage.cpp:685
+#: src/canonmn.cpp:1096
 #, fuzzy
-msgid "size"
-msgstr "Fuente de archivo"
+msgid "Low Saturation"
+msgstr "Saturación"
 
-#: src/crwimage.cpp:686
+#: src/canonmn.cpp:1097
 #, fuzzy
-msgid "offset"
-msgstr "Suave"
+msgid "CM Set 1"
+msgstr "Ajuste PC 1"
 
-#: src/datasets.cpp:79
-msgid "(invalid)"
+#: src/canonmn.cpp:1098
+#, fuzzy
+msgid "CM Set 2"
+msgstr "Ajuste PC 2"
+
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
 msgstr ""
 
-#: src/datasets.cpp:80
-msgid "IIM envelope record"
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
 msgstr ""
 
-#: src/datasets.cpp:81
-msgid "IIM application record 2"
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
 msgstr ""
 
-#: src/datasets.cpp:85
-#, fuzzy
-msgid "Model Version"
-msgstr "Versión Exif"
+#: src/canonmn.cpp:1102
+msgid "PC 1"
+msgstr ""
+
+#: src/canonmn.cpp:1103
+msgid "PC 2"
+msgstr ""
+
+#: src/canonmn.cpp:1104
+msgid "PC 3"
+msgstr ""
+
+#: src/canonmn.cpp:1109
+msgid "Faithful"
+msgstr ""
+
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+#, fuzzy
+msgid "Monochrome"
+msgstr "Macro"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "ToneCurve"
+msgstr "Nombre del documento"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "Tone curve"
+msgstr "Nombre del documento"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "SharpnessFrequency"
+msgstr "Nitidez"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "Sharpness frequency"
+msgstr "Nitidez"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "SensorRedLevel"
+msgstr "Nivel de la batería"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "Sensor red level"
+msgstr "Nivel de la batería"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "SensorBlueLevel"
+msgstr "Nivel de la batería"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "Sensor blue level"
+msgstr "Nivel de la batería"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "WhiteBalanceRed"
+msgstr "Balance de blanco"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "White balance red"
+msgstr "Balance de blanco"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "WhiteBalanceBlue"
+msgstr "Balance de blanco"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "White balance blue"
+msgstr "Tabla de balance de blanco"
+
+#: src/canonmn.cpp:1122
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Balance de blanco"
+
+#: src/canonmn.cpp:1123
+#, fuzzy
+msgid "ColorTemperature"
+msgstr "Espacio de color"
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+#, fuzzy
+msgid "Color Temperature"
+msgstr "Espacio de color"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "PictureStyle"
+msgstr "Modo de exposición"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "Picture style"
+msgstr "Modo de exposición"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "DigitalGain"
+msgstr "Zoom digital"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "Digital gain"
+msgstr "Zoom digital"
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+msgid "WBShift AB"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+#, fuzzy
+msgid "WB Shift GM"
+msgstr "Longitud de la imagen"
+
+#: src/canonmn.cpp:1128
+#, fuzzy
+msgid "Unknown Canon Processing Info tag"
+msgstr "Desconocido"
+
+#: src/crwimage.cpp:664
+msgid "Header, offset"
+msgstr "Encabezado, offset"
+
+#: src/crwimage.cpp:681
+#, fuzzy
+msgid "tag"
+msgstr "etiqueta"
+
+#: src/crwimage.cpp:683
+msgid "dir"
+msgstr "directorio"
+
+#: src/crwimage.cpp:685
+#, fuzzy
+msgid "type"
+msgstr "tipo"
+
+#: src/crwimage.cpp:686
+#, fuzzy
+msgid "size"
+msgstr "talla"
+
+#: src/crwimage.cpp:687
+#, fuzzy
+msgid "offset"
+msgstr "Suave"
+
+# ### ? offset = soft?
+#: src/datasets.cpp:79
+msgid "(invalid)"
+msgstr "(no válida)"
+
+#: src/datasets.cpp:80
+#, fuzzy
+msgid "IIM envelope record"
+msgstr "Prioridad de apertura"
+
+# ###?
+#: src/datasets.cpp:81
+msgid "IIM application record 2"
+msgstr ""
+
+#: src/datasets.cpp:85
+#, fuzzy
+msgid "Model Version"
+msgstr "Versión Exif"
 
 #: src/datasets.cpp:86
 msgid ""
@@ -2588,23 +3337,28 @@
 "Model, Part I, utilised by the provider. Version numbers are assigned by "
 "IPTC and NAA organizations."
 msgstr ""
-
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
+"Un número binario identificando la versión del modelo de intercambio de "
+"información, Parte I, usado por el proveedor. Los números de version son "
+"asignados por las organizaciones IPTC y NAA."
+
+# ### situation de Parte 1 in the phrase?
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
 #, fuzzy
 msgid "Destination"
 msgstr "Orientación"
 
+# ### Destino? context?
 #: src/datasets.cpp:91
 msgid ""
 "This DataSet is to accommodate some providers who require routing "
 "information above the appropriate OSI layers."
 msgstr ""
 
-#: src/datasets.cpp:94
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
 #, fuzzy
 msgid "File Format"
-msgstr "Fuente de archivo"
+msgstr "Formato de archivo"
 
 #: src/datasets.cpp:95
 msgid ""
@@ -2613,30 +3367,39 @@
 "information is used to route the data to the appropriate system and to allow "
 "the receiving system to perform the appropriate actions there to."
 msgstr ""
+"Un número binario representando el formato del archivo. Dicho formato debe "
+"estar registrado por medio de un número único asignado por IPTC o NAA. La "
+"información se usa para dirigir los datos al sistema apropiado y permitir al "
+"sistema receptor ejecutar las acciones que sean apropiadas."
 
 #: src/datasets.cpp:101
 #, fuzzy
 msgid "File Version"
-msgstr "Versión Exif"
+msgstr "Versión del documento"
 
 #: src/datasets.cpp:102
 msgid ""
 "A binary number representing the particular version of the File Format "
 "specified by <FileFormat> tag."
 msgstr ""
+"Un número binario representando la versión particular del formato de archivo "
+"especificado por la etiqueta <FileFormat>."
 
 #: src/datasets.cpp:105
 msgid "Service Id"
-msgstr ""
+msgstr "Id del Servicio"
 
 #: src/datasets.cpp:106
+#, fuzzy
 msgid "Identifies the provider and product"
-msgstr ""
+msgstr "Identifica al proveedor y el producto"
 
 #: src/datasets.cpp:108
+#, fuzzy
 msgid "Envelope Number"
-msgstr ""
+msgstr "El número F."
 
+# ### context? número de sobre
 #: src/datasets.cpp:109
 msgid ""
 "The characters form a number that will be unique for the date specified in "
@@ -2649,7 +3412,7 @@
 
 #: src/datasets.cpp:117
 msgid "Product Id"
-msgstr ""
+msgstr "Id del Producto"
 
 #: src/datasets.cpp:118
 msgid ""
@@ -2657,11 +3420,15 @@
 "provide receiving organisation data on which to select, route, or otherwise "
 "handle data."
 msgstr ""
+"Permite a un proveedor identificar subconjuntos de su servicio global. "
+"Utilizado para recepcionar los datos organizativos de un modo que permita "
+"seleccionar, dirigir o manipular los datos de varios modos."
 
+# ### can be improved 
 #: src/datasets.cpp:122
 #, fuzzy
 msgid "Envelope Priority"
-msgstr "Prioridad de apertura"
+msgstr "Clasificación de los sobres por prioridades"
 
 #: src/datasets.cpp:123
 msgid ""
@@ -2670,21 +3437,29 @@
 "and \"8\" the least urgent copy. The numeral \"9\" indicates a User Defined "
 "Priority. The numeral \"0\" is reserved for future use."
 msgstr ""
+"No especifica la urgencia editorial (para eso véase la etiqueta <Urgency>)"
+"sino la prioridad de manejo de los sobres. \"1\" indica el más urgente, "
+"\"5\" urgencia normal y \"8\" las copias menos urgentes. El \"9\" permite al "
+"usuario definir una prioridad personalizada. El \"0\" está reservado para "
+"usos futuros."
 
 #: src/datasets.cpp:129
 #, fuzzy
 msgid "Date Sent"
-msgstr "Fecha y hora"
+msgstr "Fecha de envío"
 
 #: src/datasets.cpp:130
 msgid ""
 "Uses the format CCYYMMDD (century, year, month, day) as de-fined in ISO 8601 "
 "to indicate year, month and day the service sent the material."
 msgstr ""
+"Usa el formato SSAAMMDD (siglo, año, mes, día) definido en ISO 8601 para "
+"indicar año, mes y día en que el servicio envió el material."
 
 #: src/datasets.cpp:133
+#, fuzzy
 msgid "Time Sent"
-msgstr ""
+msgstr "Hora del envío"
 
 #: src/datasets.cpp:134
 msgid ""
@@ -2693,11 +3468,17 @@
 "Universal Coordinated Time as described in ISO 8601. This is the time the "
 "service sent the material."
 msgstr ""
+"Utiliza el formato HHMMSS:HHMM donde HHMMSS se refiere a la hora local, "
+"minuto y segundos y HHMM se refiere a horas y minutos posteriores (+) o "
+"antes (-) delUniversal Coordinated Time tal y como está descrito en la ISO "
+"8601. Este es el momento en que el servicio envió el material."
 
 #: src/datasets.cpp:139
+#, fuzzy
 msgid "Character Set"
-msgstr ""
+msgstr "Set de caracteres"
 
+# ################################################# stop. rev 26 jul 2010
 #: src/datasets.cpp:140
 msgid ""
 "This tag consisting of one or more control functions used for the "
@@ -2705,10 +3486,15 @@
 "functions follow the ISO 2022 standard and may consist of the escape control "
 "character and one or more graphic characters."
 msgstr ""
+"Esta etiqueta consiste en una o mas funciones de control utilizadas para el "
+"anuncio, invocación o designio de juegos de caracteres codificados. Las "
+"funciones de control siguen el estándar ISO 2022 y pueden consistir en el "
+"caracter de control escape y uno o más caracteres gráficos."
 
 #: src/datasets.cpp:145
+#, fuzzy
 msgid "Unique Name Object"
-msgstr ""
+msgstr "Nombre único de Objeto"
 
 #: src/datasets.cpp:146
 msgid ""
@@ -2716,10 +3502,15 @@
 "in the IIM, independent of provider and for any media form. The provider "
 "must ensure the UNO is unique. Objects with the same UNO are identical."
 msgstr ""
+"Esta etiqueta proporciona un identificador único globalmente para objetos, "
+"independiente del proveedor y para cualquier tipo de medio, tal y como está "
+"especificado en el IIM. El proveedor debe garantizar que el UNO es único. "
+"Los objetos con el mismo UNO son idénticos."
 
 #: src/datasets.cpp:151
+#, fuzzy
 msgid "ARM Identifier"
-msgstr ""
+msgstr "Identificador ARM"
 
 #: src/datasets.cpp:152
 msgid ""
@@ -2727,34 +3518,44 @@
 "which is described in a document registered by the originator of the ARM "
 "with the IPTC and NAA organizations."
 msgstr ""
+"El DataSet identifica al Abstract Relationship Method identifier (ARM) que "
+"es descrito en un documento registrado por el creador del ARM con las "
+"organizaciones IPTC y NAA."
 
+# ## can be improved probably
 #: src/datasets.cpp:156
 #, fuzzy
 msgid "ARM Version"
-msgstr "Versión Exif"
+msgstr "Versión ARM"
 
 #: src/datasets.cpp:157
 msgid ""
 "This tag consisting of a binary number representing the particular version "
 "of the ARM specified by tag <ARMId>."
 msgstr ""
+"Consiste en un número binario representando la versión particular del ARM "
+"especificado por la etiqueta <ARMId>."
 
 #: src/datasets.cpp:170
 #, fuzzy
 msgid "Record Version"
 msgstr "Versión Exif"
 
+# ## ? not translated 
 #: src/datasets.cpp:171
 msgid ""
 "A binary number identifying the version of the Information Interchange "
 "Model, Part II, utilised by the provider. Version numbers are assigned by "
 "IPTC and NAA organizations."
 msgstr ""
+"Número binario, asignado por las organizaciones IPTC y NAA, que identifica "
+"la versión del Modelo de Intercambio de Información, Parte II, utilizado por "
+"el proveedor."
 
 #: src/datasets.cpp:175
 #, fuzzy
 msgid "Object Type"
-msgstr "Área del sujeto"
+msgstr "Tipo de Objeto"
 
 #: src/datasets.cpp:176
 msgid ""
@@ -2765,11 +3566,18 @@
 "Type Number consisting of graphic characters plus spaces either in English "
 "or in the language of the service as indicated in tag <LanguageIdentifier>"
 msgstr ""
+"Tipo de Objeto; se utiliza para distinguir entre diferentes tipos de objetos "
+"dentro del IIM. Consta de dos partes separadas por un signo de dos puntos, "
+"siendo la segunda parte opcional. La primera es un número de referencia "
+"internacional e independiente del lenguaje para un tipo de objeto; La "
+"segunda una representación textual del Object Type Number mediante "
+"caracteres gráficos y espacios, bien en Inglés o en el lenguaje del servicio "
+"indicado en la etiqueta <LanguageIdentifier>."
 
 #: src/datasets.cpp:184
 #, fuzzy
 msgid "Object Attribute"
-msgstr "Área del sujeto"
+msgstr "Atributos del objeto"
 
 #: src/datasets.cpp:185
 msgid ""
@@ -2781,11 +3589,18 @@
 "English, or in the language of the service as indicated in tag "
 "<LanguageIdentifier>"
 msgstr ""
+"El Object Attribute define la naturaleza del objeto independientemente del "
+"tema que trate. Consta de dos partes separadas por un signo de dos puntos, "
+"siendo la segunda parte opcional.La primera es un número de referencia "
+"internacional (independiente del lenguaje) para un atributo del objeto; La "
+"segunda una representación textual del Object Attribute Number mediante "
+"caracteres gráficos y espacios, bien en Inglés o en el lenguaje del servicio "
+"indicado en la etiqueta <LanguageIdentifier>"
 
 #: src/datasets.cpp:193
 #, fuzzy
 msgid "Object Name"
-msgstr "Área del sujeto"
+msgstr "Nombre del Objeto"
 
 #: src/datasets.cpp:194
 msgid ""
@@ -2793,23 +3608,29 @@
 "such as updated stories or new crops on photos, should be identified in tag "
 "<EditStatus>."
 msgstr ""
+"Utilizado como referencia rápida (taquigráfica) para el objeto. Los cambios "
+"a datos existentes, como historias actualizadas o nuevos recortes en fotos, "
+"deben estar identificados en la etiqueta <EditStatus>."
 
 #: src/datasets.cpp:198
 #, fuzzy
 msgid "Document Title"
-msgstr "Nombre del documento"
+msgstr "Título del documento"
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
+#, fuzzy
 msgid "Edit Status"
-msgstr ""
+msgstr "Editar Estátus"
 
+# ### temptatively, can have several meanings here
 #: src/datasets.cpp:200
 msgid "Status of the object data, according to the practice of the provider."
 msgstr ""
+"Estatus de los datos del objeto, de acuerdo con la costumbre del proveedor "
 
 #: src/datasets.cpp:202
 msgid "Editorial Update"
-msgstr ""
+msgstr "Actualización Editorial"
 
 #: src/datasets.cpp:203
 msgid ""
@@ -2817,30 +3638,38 @@
 "The link to the previous object is made using the tags <ARMIdentifier> and "
 "<ARMVersion>, according to the practices of the provider."
 msgstr ""
+"Indica el tipo de actualización que éste objeto proporciona a un objeto "
+"previo. El enlace al objeto previo se hace usando las etiquetas "
+"<ARMIdentifier> y <ARMVersion>, de acuerdo a las costumbres del proveedor."
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
-msgstr ""
+msgstr "Urgencia (de edición)"
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
+"Especifica la urgencia editorial del contenido y no equivale necesariamente "
+"a la prioridad de manejo del sobre (véase <EnvelopePriority>). El \"1\" es "
+"el más  urgente, \"5\" indica normal y \"8\" denota a la copia menos "
+"prioritaria."
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
 #, fuzzy
 msgid "Subject"
-msgstr "Área del sujeto"
+msgstr "Sujeto"
 
 #: src/datasets.cpp:214
 msgid "The Subject Reference is a structured definition of the subject matter."
-msgstr ""
+msgstr "La referencia Sujeto es una definición estructurada del contenido"
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
+#, fuzzy
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #: src/datasets.cpp:217
 msgid ""
@@ -2848,10 +3677,13 @@
 "list of categories will be maintained by a regional registry, where "
 "available, otherwise by the provider."
 msgstr ""
+"Identifica el tema del objeto dato en opinión del proveedor. Donde sea "
+"posible una lista de categorías será mantenida por un registro regional, en "
+"otro caso sera proporcionada por el proveedor."
 
 #: src/datasets.cpp:222
 msgid "Supplemental Category"
-msgstr ""
+msgstr "Categoría suplementaria"
 
 #: src/datasets.cpp:223
 msgid ""
@@ -2860,24 +3692,33 @@
 "in tag <Category>. Otherwise, selection of supplemental categories are left "
 "to the provider."
 msgstr ""
+"Las categorías suplementarias permiten refinar el tema de un objeto de "
+"datos. Una categoría suplementaria puede incluir cualquiera de las "
+"categorías ya reconocidas en la etiqueta <Category>. Por lo demás, la "
+"selección de categorías suplementarias se deja al proveedor."
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
-msgstr ""
+msgstr "Categorías suplementarias"
 
 #: src/datasets.cpp:229
+#, fuzzy
 msgid "Fixture Id"
-msgstr ""
+msgstr "Id de objetos permanentes"
 
+# ## only my best effort, can be improved probably
 #: src/datasets.cpp:230
 msgid ""
 "Identifies object data that recurs often and predictably. Enables users to "
 "immediately find or recall such an object."
 msgstr ""
+"Identifica objetos de datos que recurren a menudo y de modo predecible, "
+"permitiendo a los usuarios encontrarlos inmediatamente o rellamarlos cuando "
+"se precise."
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
-msgstr ""
+msgstr "Palabras Clave"
 
 #: src/datasets.cpp:234
 msgid ""
@@ -2886,10 +3727,16 @@
 "the same keyword, enabling the receiving system or subsystems to search "
 "across all types of data for related material."
 msgstr ""
+"Utilizado para indicar palabras clave específicas. Se espera que un "
+"proveedor de varios tipos de datos ligados a un mismo tema utilice la misma "
+"palabra clave, permitiendo al sistema receptor o a los distintos subsistemas "
+"encontrar rápidamente todo el material relacionado entre todos los tipos de "
+"datos."
 
 #: src/datasets.cpp:240
+#, fuzzy
 msgid "Location Code"
-msgstr ""
+msgstr "Código de Localidad"
 
 #: src/datasets.cpp:241
 msgid ""
@@ -2900,11 +3747,16 @@
 "space, IPTC will assign an appropriate three-character code under the "
 "provisions of ISO 3166 to avoid conflicts."
 msgstr ""
+"Indica el código de País/localización geográfica referenciado por el "
+"contenido de un objeto. Allí donde la ISO 3166 haya establecido un código "
+"apropiado de país se utilizará ése código. En caso contrario (ej. el espacio "
+"o barcos en alta mar, IPTC asignará un código de tres caracteres apropiado "
+"bajo las previsiones de la ISO 3166 para evitar conflictos."
 
 #: src/datasets.cpp:248
 #, fuzzy
 msgid "Location Name"
-msgstr "Nombre del documento"
+msgstr "Nombre de la localización"
 
 #: src/datasets.cpp:249
 msgid ""
@@ -2912,62 +3764,87 @@
 "referenced by the content of the object, according to guidelines of the "
 "provider."
 msgstr ""
+"Proporciona un nombre, publicable y completo, del país o localización "
+"geográfica referenciado por el contenido de un objeto, de acuerdo a las "
+"directrices del proveedor."
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
+#, fuzzy
 msgid "Release Date"
-msgstr ""
+msgstr "Fecha de publicación"
 
 #: src/datasets.cpp:254
 msgid ""
 "Designates in the form CCYYMMDD the earliest date the provider intends the "
 "object to be used. Follows ISO 8601 standard."
 msgstr ""
+"Designa la fecha inicial (expresada en forma CCYYMMDD) a partir de la cual "
+"el proveedor tiene intención de que un objeto concreto pueda ser usado. "
+"Sigue el estándar ISO 8601."
 
 #: src/datasets.cpp:257
+#, fuzzy
 msgid "Release Time"
-msgstr ""
+msgstr "Tiempo de Publicación"
 
 #: src/datasets.cpp:258
 msgid ""
 "Designates in the form HHMMSS:HHMM the earliest time the provider intends "
 "the object to be used. Follows ISO 8601 standard."
 msgstr ""
+"Designa la hora inicial (expresada en forma HHMMSS:HHMM) a partir de la cual "
+"el proveedor tiene intención de que un objeto concreto pueda ser usado. "
+"Sigue el estándar ISO 8601."
 
 #: src/datasets.cpp:261
+#, fuzzy
 msgid "Expiration Date"
-msgstr ""
+msgstr "Fecha de Caducidad"
 
 #: src/datasets.cpp:262
 msgid ""
 "Designates in the form CCYYMMDD the latest date the provider or owner "
 "intends the object data to be used. Follows ISO 8601 standard."
 msgstr ""
+"Designa la fecha de expiración de la validez de un objeto para su uso "
+"(expresada en forma CCYYMMDD) a partir de la cual el proveedor o el usuario "
+"consideran que ya no debe utilizarse mas dicho objeto. Sigue el estándar ISO "
+"8601."
 
 #: src/datasets.cpp:265
+#, fuzzy
 msgid "ExpirationTime"
-msgstr ""
+msgstr "Tiempo de Caducidad"
 
 #: src/datasets.cpp:266
 msgid ""
 "Designates in the form HHMMSS:HHMM the latest time the provider or owner "
 "intends the object data to be used. Follows ISO 8601 standard."
 msgstr ""
+"Designa la hora de expiración de la validez de un objeto para su uso "
+"(expresada en forma HHMMSS:HHMM) a partir de la cual el proveedor o el "
+"usuario consideran que ya no debe utilizarse mas dicho objeto. Sigue el "
+"estándar ISO 8601."
 
 #: src/datasets.cpp:269
+#, fuzzy
 msgid "Special Instructions"
-msgstr ""
+msgstr "Instrucciones especiales"
 
 #: src/datasets.cpp:270
 msgid ""
 "Other editorial instructions concerning the use of the object data, such as "
 "embargoes and warnings."
 msgstr ""
+"Instrucciones editoriales adicionales sobre el uso del objeto dato, como "
+"embargos y advertencias."
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 #, fuzzy
 msgid "Instructions"
-msgstr "Proceso personalizado"
+msgstr "Instrucciones"
 
+# ################################################# stop. rev 18 oct 2010
 #: src/datasets.cpp:274
 #, fuzzy
 msgid "Action Advised"
@@ -3012,7 +3889,7 @@
 "object refers."
 msgstr ""
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
 #, fuzzy
 msgid "Date Created"
 msgstr "Fecha y hora"
@@ -3025,8 +3902,9 @@
 msgstr ""
 
 #: src/datasets.cpp:295
+#, fuzzy
 msgid "Time Created"
-msgstr ""
+msgstr "Fecha y hora"
 
 #: src/datasets.cpp:296
 msgid ""
@@ -3036,8 +3914,9 @@
 msgstr ""
 
 #: src/datasets.cpp:301
+#, fuzzy
 msgid "Digitization Date"
-msgstr ""
+msgstr "Fecha y hora"
 
 #: src/datasets.cpp:302
 msgid ""
@@ -3056,9 +3935,10 @@
 "representation of the object data was created. Follows ISO 8601 standard."
 msgstr ""
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 #, fuzzy
 msgid "Program"
 msgstr "Modo de exposición"
@@ -3077,16 +3957,18 @@
 msgstr ""
 
 #: src/datasets.cpp:316
+#, fuzzy
 msgid "Object Cycle"
-msgstr ""
+msgstr "Área del sujeto"
 
 #: src/datasets.cpp:317
 msgid "Used to identify the editorial cycle of object data."
 msgstr ""
 
 #: src/datasets.cpp:319
+#, fuzzy
 msgid "By-line"
-msgstr ""
+msgstr "pulg"
 
 #: src/datasets.cpp:320
 msgid ""
@@ -3109,7 +3991,7 @@
 "Where used, a by-line title should follow the by-line it modifies."
 msgstr ""
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr ""
 
@@ -3131,8 +4013,9 @@
 msgstr ""
 
 #: src/datasets.cpp:337
+#, fuzzy
 msgid "Province State"
-msgstr ""
+msgstr "Orientación"
 
 #: src/datasets.cpp:338
 msgid ""
@@ -3144,9 +4027,10 @@
 msgid "State/Province"
 msgstr ""
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
+#, fuzzy
 msgid "Country Code"
-msgstr ""
+msgstr "Nombre del documento"
 
 #: src/datasets.cpp:343
 msgid ""
@@ -3171,14 +4055,15 @@
 "guidelines of the provider."
 msgstr ""
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
 #, fuzzy
 msgid "Country"
 msgstr "Nombre del documento"
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
+#, fuzzy
 msgid "Transmission Reference"
-msgstr ""
+msgstr "Referencia Blanco/Negro"
 
 #: src/datasets.cpp:359
 msgid ""
@@ -3186,18 +4071,20 @@
 "practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
+#, fuzzy
 msgid "Headline"
-msgstr ""
+msgstr "pulg"
 
 #: src/datasets.cpp:364
 msgid ""
 "A publishable entry providing a synopsis of the contents of the object data."
 msgstr ""
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
+#, fuzzy
 msgid "Credit"
-msgstr ""
+msgstr "Centímetro"
 
 #: src/datasets.cpp:368
 msgid ""
@@ -3205,8 +4092,8 @@
 "creator."
 msgstr ""
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
 #, fuzzy
 msgid "Source"
 msgstr "Fuente de archivo"
@@ -3226,7 +4113,7 @@
 msgid "Copyright Notice"
 msgstr "Copyright"
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
 #, fuzzy
 msgid "Contact"
 msgstr "Contraste"
@@ -3246,14 +4133,15 @@
 msgid "A textual description of the object data."
 msgstr ""
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 #, fuzzy
 msgid "Description"
 msgstr "Descripción de la imagen"
 
 #: src/datasets.cpp:388
+#, fuzzy
 msgid "Writer"
-msgstr ""
+msgstr "Orden de llenado"
 
 #: src/datasets.cpp:389
 msgid ""
@@ -3262,8 +4150,9 @@
 msgstr ""
 
 #: src/datasets.cpp:392
+#, fuzzy
 msgid "Rasterized Caption"
-msgstr ""
+msgstr "Saturación"
 
 #: src/datasets.cpp:393
 msgid ""
@@ -3272,8 +4161,9 @@
 msgstr ""
 
 #: src/datasets.cpp:397
+#, fuzzy
 msgid "Indicates the color components of an image."
-msgstr ""
+msgstr "Esta etiqueta indica la distancia al sujeto."
 
 #: src/datasets.cpp:399
 #, fuzzy
@@ -3281,12 +4171,14 @@
 msgstr "Orientación"
 
 #: src/datasets.cpp:400
+#, fuzzy
 msgid "Indicates the layout of an image."
-msgstr ""
+msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
+#, fuzzy
 msgid "Language"
-msgstr ""
+msgstr "Fabricante"
 
 #: src/datasets.cpp:403
 msgid ""
@@ -3296,8 +4188,9 @@
 msgstr ""
 
 #: src/datasets.cpp:408
+#, fuzzy
 msgid "Audio Type"
-msgstr ""
+msgstr "acción"
 
 #: src/datasets.cpp:409
 #, fuzzy
@@ -3305,8 +4198,9 @@
 msgstr "Esta etiqueta indica la distancia al sujeto."
 
 #: src/datasets.cpp:411
+#, fuzzy
 msgid "Audio Rate"
-msgstr ""
+msgstr "Baja saturación"
 
 #: src/datasets.cpp:412
 #, fuzzy
@@ -3334,8 +4228,9 @@
 msgstr "Esta etiqueta indica la distancia al sujeto."
 
 #: src/datasets.cpp:420
+#, fuzzy
 msgid "Audio Outcue"
-msgstr ""
+msgstr "Baja saturación"
 
 #: src/datasets.cpp:421
 msgid ""
@@ -3344,8 +4239,9 @@
 msgstr ""
 
 #: src/datasets.cpp:424
+#, fuzzy
 msgid "Preview Format"
-msgstr ""
+msgstr "Orientación"
 
 #: src/datasets.cpp:425
 msgid ""
@@ -3366,8 +4262,9 @@
 msgstr ""
 
 #: src/datasets.cpp:433
+#, fuzzy
 msgid "Preview Data"
-msgstr ""
+msgstr "Versión Exif"
 
 #: src/datasets.cpp:434
 msgid "Binary image preview data."
@@ -3382,219 +4279,222 @@
 msgid "Unknown dataset"
 msgstr "Desconocido"
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr ""
 
-#: src/error.cpp:50
+#: src/error.cpp:56
 #, fuzzy
 msgid "Success"
 msgstr "Fuente de archivo"
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr ""
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr ""
 
-#: src/error.cpp:55
+#: src/error.cpp:61
+#, fuzzy
 msgid "Invalid record name `%1'"
-msgstr ""
+msgstr "El número F."
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr ""
 
-#: src/error.cpp:57
+#: src/error.cpp:63
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
 msgstr ""
 
-#: src/error.cpp:58
+#: src/error.cpp:64
 msgid "Value not set"
 msgstr ""
 
-#: src/error.cpp:59
+#: src/error.cpp:65
 msgid "%1: Failed to open the data source: %2"
 msgstr ""
 
-#: src/error.cpp:60
+#: src/error.cpp:66
 msgid "%1: Failed to open file (%2): %3"
 msgstr ""
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr ""
 
-#: src/error.cpp:64
+#: src/error.cpp:70
+#, fuzzy
 msgid "Failed to read image data"
-msgstr ""
+msgstr "Fuente de archivo"
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr ""
 
-#: src/error.cpp:67
+#: src/error.cpp:72
+msgid "%1: Failed to map file for reading and writing: %2"
+msgstr ""
+
+#: src/error.cpp:73
 msgid "%1: Failed to rename file to %2: %3"
 msgstr ""
 
-#: src/error.cpp:68
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr ""
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr ""
 
-#: src/error.cpp:70
+#: src/error.cpp:76
+#, fuzzy
 msgid "Failed to read input data"
-msgstr ""
+msgstr "Fuente de archivo"
 
-#: src/error.cpp:71
+#: src/error.cpp:77
+#, fuzzy
 msgid "Failed to write image"
-msgstr ""
+msgstr "Fuente de archivo"
 
-#: src/error.cpp:72
+#: src/error.cpp:78
 msgid "Input data does not contain a valid image"
 msgstr ""
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 msgid "Invalid ifdId %1"
 msgstr ""
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr ""
 
-#: src/error.cpp:77
+#: src/error.cpp:83
 msgid "Unsupported data area offset type"
 msgstr ""
 
-#: src/error.cpp:78
+#: src/error.cpp:84
 msgid "Invalid charset: `%1'"
 msgstr ""
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr ""
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr ""
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 msgid "Writing to %1 images is not supported"
 msgstr ""
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr ""
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr ""
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr ""
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr ""
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr ""
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr ""
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr ""
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr ""
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr ""
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 
-#: src/error.cpp:98
+#: src/error.cpp:104
 msgid "Invalid XmpText type `%1'"
 msgstr ""
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr ""
 
-#: src/error.cpp:100
+#: src/error.cpp:106
 msgid "Multiple TIFF array element tags %1 in one directory"
 msgstr ""
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr ""
 
-#: src/error.cpp:103
-#, fuzzy
-msgid "(Unknown Error)"
-msgstr "Desconocido"
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
 msgstr ""
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3602,7 +4502,7 @@
 "of the License, or (at your option) any later version.\n"
 msgstr ""
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3610,7 +4510,7 @@
 "GNU General Public License for more details.\n"
 msgstr ""
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3618,266 +4518,286 @@
 "Boston, MA 02110-1301 USA\n"
 msgstr ""
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr ""
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
 msgstr ""
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr ""
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
 msgstr ""
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
 msgstr ""
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr ""
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
 "                -r format, timestamp options are controlled with -t and -T.\n"
 msgstr ""
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
 "                Requires option -c, -m or -M.\n"
 msgstr ""
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
 msgstr ""
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr ""
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr ""
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr ""
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr ""
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr ""
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 msgid "   -u      Show unknown tags.\n"
 msgstr ""
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr ""
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr ""
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr ""
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr ""
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr ""
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr ""
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr ""
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr ""
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 msgid "             p : list available previews\n"
 msgstr ""
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
 msgstr ""
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 msgid "             E : include Exif tags in the list\n"
 msgstr ""
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 msgid "             I : IPTC datasets\n"
 msgstr ""
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 msgid "             X : XMP properties\n"
 msgstr ""
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 msgid "             x : print a column with the tag number\n"
 msgstr ""
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr ""
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr ""
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr ""
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr ""
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr ""
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr ""
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr ""
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr ""
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr ""
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr ""
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr ""
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr ""
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr ""
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr ""
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr ""
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr ""
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
 "           the same as those for the -d option, plus a modifier:\n"
@@ -3886,7 +4806,7 @@
 "           <file>-thumb.jpg\n"
 msgstr ""
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
 "           are the same as those for the -d option, plus a target to "
@@ -3896,7985 +4816,10664 @@
 "             X : Extract metadata to an XMP sidecar file <file>.xmp\n"
 msgstr ""
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
 msgstr ""
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr ""
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr ""
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr ""
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr ""
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
 msgstr ""
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
 msgstr ""
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
 msgstr ""
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
 msgstr ""
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 #, fuzzy
 msgid "Option"
 msgstr "acción"
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr ""
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr ""
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr ""
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr ""
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr ""
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr ""
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 #, fuzzy
 msgid "Error parsing"
 msgstr "Índice de exposición"
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 #, fuzzy
 msgid "option argument"
 msgstr "Nombre del documento"
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr ""
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr ""
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr ""
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr ""
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr ""
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr ""
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr ""
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr ""
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr ""
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr ""
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr ""
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 #, fuzzy
 msgid "target"
 msgstr "promedio"
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 #, fuzzy
 msgid "Invalid preview number"
 msgstr "El número F."
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr ""
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 #, fuzzy
 msgid "line"
 msgstr "pulg"
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 #, fuzzy
 msgid "-M option"
 msgstr "acción"
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr ""
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr ""
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
-msgstr ""
+msgstr "Clave no válida"
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
+#, fuzzy
 msgid "Soft mode 1"
-msgstr ""
+msgstr "Retrato"
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
+#, fuzzy
 msgid "Soft mode 2"
-msgstr ""
+msgstr "Retrato"
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
 #, fuzzy
 msgid "Hard mode 1"
 msgstr "Macro"
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
 #, fuzzy
 msgid "Hard mode 2"
 msgstr "Macro"
 
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr "Luz de día"
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
 #, fuzzy
 msgid "Fluorescent (daylight)"
-msgstr "Fluorescente"
+msgstr "Fluorescente (luz de día)"
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
 #, fuzzy
 msgid "Fluorescent (warm white)"
-msgstr "Fluorescente"
+msgstr "Fluorescente (luz cálida)"
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
 #, fuzzy
 msgid "Fluorescent (cool white)"
-msgstr "Fluorescente"
+msgstr "Fluorescente (luz fría)"
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
+#, fuzzy
 msgid "Incandescent"
-msgstr ""
+msgstr "Tungsteno (luz incandescente)"
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
 msgid "None (black & white)"
-msgstr ""
+msgstr "Ninguno (B/N)"
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
 #, fuzzy
 msgid "Red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr "Escena nocturna"
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
 #, fuzzy
 msgid "Program AE"
 msgstr "Modo de exposición"
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 #, fuzzy
 msgid "Natural light"
-msgstr "Manual"
+msgstr "luz natural"
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
+#, fuzzy
 msgid "Anti-blur"
-msgstr ""
+msgstr "Contraste"
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
 #, fuzzy
 msgid "Sunset"
-msgstr "Área del sujeto"
+msgstr "Puesta de sol"
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
+#, fuzzy
 msgid "Museum"
-msgstr ""
+msgstr "Museo"
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
 #, fuzzy
 msgid "Party"
-msgstr "Parcial"
+msgstr "Fiesta"
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 #, fuzzy
 msgid "Flower"
-msgstr "Orden de llenado"
+msgstr "Flores"
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
-msgstr ""
+msgstr "Texto"
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
+#, fuzzy
 msgid "Natural light & flash"
-msgstr ""
+msgstr "Natural, luz y flash"
 
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
 #, fuzzy
 msgid "Aperture-priority AE"
 msgstr "Prioridad de apertura"
 
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
 #, fuzzy
 msgid "Shutter speed priority AE"
 msgstr "Prioridad del obturador"
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
 #, fuzzy
 msgid "No flash & flash"
-msgstr "Flash"
-
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr "Estándar"
+msgstr "Sin flash y flash"
 
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
+#, fuzzy
 msgid "Chrome"
-msgstr ""
+msgstr "Macro"
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
 msgid "Wide"
-msgstr ""
+msgstr "Amplio"
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
 #, fuzzy
 msgid "F0/Standard"
 msgstr "Estándar"
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 #, fuzzy
 msgid "F1/Studio portrait"
-msgstr "retrato"
+msgstr "retrato de estudio"
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
-msgstr ""
+msgstr "F2/Fujichrome"
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
+#, fuzzy
 msgid "F3/Studio portrait Ex"
-msgstr ""
+msgstr "retrato"
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr ""
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr ""
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr ""
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
 #, fuzzy
 msgid "Standard (100%)"
 msgstr "Estándar"
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
-msgstr ""
+msgstr "Panorámico 1 (230%)"
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
-msgstr ""
+msgstr "Panorámico 2 (400%)"
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
+#, fuzzy
 msgid "Film simulation mode"
-msgstr ""
+msgstr "Modo simulación de película"
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
 #, fuzzy
 msgid "Version"
 msgstr "Versión Exif"
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
 #, fuzzy
 msgid "Fujifilm Makernote version"
 msgstr "Versión Exif"
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
 msgstr ""
+"Este número es único, y contiene la fecha de manufactura, pero no es el "
+"mismonúmero que el impreso en el cuerpo de la cámara"
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
 #, fuzzy
 msgid "Image quality setting"
 msgstr "Ancho de la imagen"
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
 #, fuzzy
 msgid "Color"
 msgstr "Espacio de color"
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 #, fuzzy
 msgid "Chroma saturation setting"
 msgstr "Alta saturación"
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
 msgid "Tone"
-msgstr ""
+msgstr "Tono"
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
 #, fuzzy
 msgid "Flash firing mode setting"
 msgstr "Contraste"
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
 #, fuzzy
 msgid "Flash Strength"
 msgstr "Contraste"
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
+#, fuzzy
 msgid "Flash firing strength compensation setting"
-msgstr ""
+msgstr "Tiempo de exposición"
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
 #, fuzzy
 msgid "Macro mode setting"
-msgstr "Macro"
+msgstr "ajuste del modo Macro"
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 #, fuzzy
 msgid "Focusing mode setting"
 msgstr "Modo de exposición"
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
-msgstr ""
+msgstr "Sincronización lenta"
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
+#, fuzzy
 msgid "Slow synchro mode setting"
-msgstr ""
+msgstr "Contraste"
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
 #, fuzzy
 msgid "Picture Mode"
 msgstr "Modo de exposición"
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
+#, fuzzy
 msgid "Picture mode setting"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr ""
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
 #, fuzzy
 msgid "Sequence Number"
 msgstr "El número F."
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 #, fuzzy
 msgid "Sequence number"
 msgstr "El número F."
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
+#, fuzzy
 msgid "FinePix Color"
-msgstr ""
+msgstr "Patrón CFA"
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
-msgstr ""
+msgstr "Ajuste de color Fuji FinePix"
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
+#, fuzzy
 msgid "Blur Warning"
-msgstr ""
+msgstr "Nitidez"
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
 msgid "Blur warning status"
 msgstr ""
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
 #, fuzzy
 msgid "Focus Warning"
 msgstr "Modo de exposición"
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
+#, fuzzy
 msgid "Auto Focus warning status"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
 #, fuzzy
 msgid "Exposure Warning"
 msgstr "Índice de exposición"
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
+#, fuzzy
 msgid "Auto exposure warning status"
-msgstr ""
+msgstr "Índice de exposición"
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
+#, fuzzy
 msgid "Dynamic Range"
-msgstr ""
+msgstr "formato planar"
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
+#, fuzzy
 msgid "Dynamic range"
-msgstr ""
+msgstr "formato planar"
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
 #, fuzzy
 msgid "Film Mode"
 msgstr "Modo de exposición"
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
 #, fuzzy
 msgid "Film mode"
 msgstr "Flash"
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
 #, fuzzy
 msgid "Dynamic Range Setting"
 msgstr "Balance de blanco"
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
+#, fuzzy
 msgid "Dynamic range settings"
-msgstr ""
+msgstr "Balance de blanco"
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
 msgid "Development Dynamic Range"
 msgstr ""
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
+#, fuzzy
 msgid "Development dynamic range"
-msgstr ""
+msgstr "Orientación"
 
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
 #, fuzzy
 msgid "Minimum Focal Length"
 msgstr "Distancia focal"
 
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
 #, fuzzy
 msgid "Minimum focal length"
 msgstr "Distancia focal"
 
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
 #, fuzzy
 msgid "Maximum Focal Length"
 msgstr "Distancia focal"
 
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
 #, fuzzy
 msgid "Maximum focal length"
 msgstr "Distancia focal"
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
+#, fuzzy
 msgid "Maximum Aperture at Mininimum Focal"
-msgstr ""
+msgstr "apertura"
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
+#, fuzzy
 msgid "Maximum aperture at mininimum focal"
-msgstr ""
+msgstr "apertura"
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
+#, fuzzy
 msgid "Maximum Aperture at Maxinimum Focal"
-msgstr ""
+msgstr "apertura"
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
+#, fuzzy
 msgid "Maximum aperture at maxinimum focal"
-msgstr ""
+msgstr "apertura"
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr "Fuente de archivo"
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 #, fuzzy
 msgid "File source"
 msgstr "Fuente de archivo"
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
 #, fuzzy
 msgid "Order Number"
 msgstr "ID único de imagen"
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
 #, fuzzy
 msgid "Order number"
 msgstr "ID único de imagen"
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
 #, fuzzy
 msgid "Frame Number"
 msgstr "ID único de imagen"
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
 #, fuzzy
 msgid "Frame number"
 msgstr "ID único de imagen"
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
 #, fuzzy
 msgid "Unknown FujiMakerNote tag"
 msgstr "Versión Exif"
 
 #: src/minoltamn.cpp:56
+#, fuzzy
 msgid "Natural Color"
-msgstr ""
+msgstr "Manual"
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
+#, fuzzy
 msgid "Vivid Color"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
 #, fuzzy
 msgid "Solarization"
 msgstr "Saturación"
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr ""
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
 #, fuzzy
 msgid "Natural"
 msgstr "Manual"
 
 #: src/minoltamn.cpp:64
+#, fuzzy
 msgid "Natural sRGB"
-msgstr ""
+msgstr "Manual"
 
 #: src/minoltamn.cpp:65
+#, fuzzy
 msgid "Natural+ sRGB"
-msgstr ""
+msgstr "Manual"
 
 #: src/minoltamn.cpp:67
+#, fuzzy
 msgid "Evening"
-msgstr ""
+msgstr "Velocidad ISO"
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
 #, fuzzy
 msgid "Night Portrait"
 msgstr "Retrato"
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
+#, fuzzy
 msgid "Super Fine"
-msgstr ""
+msgstr "pulg"
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
 msgid "Extra Fine"
 msgstr ""
 
-#: src/minoltamn.cpp:84
-#, fuzzy
-msgid "ISO Setting Used"
-msgstr "Velocidad ISO"
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-#, fuzzy
-msgid "High Key"
-msgstr "Luz de día"
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr ""
-
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
 #, fuzzy
 msgid "Makernote Version"
 msgstr "Versión Exif"
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr ""
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
+#, fuzzy
 msgid "Camera Settings (Std Old)"
-msgstr ""
+msgstr "Contraste"
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
+#, fuzzy
 msgid "Camera Settings (Std New)"
-msgstr ""
+msgstr "Contraste"
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
 #, fuzzy
 msgid "Camera Settings (7D)"
 msgstr "Contraste"
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
+#, fuzzy
 msgid "Camera Settings (for Dynax 7D model)"
-msgstr ""
+msgstr "Contraste"
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
+#, fuzzy
 msgid "Image Stabilization Data"
-msgstr ""
+msgstr "Orientación"
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
+#, fuzzy
 msgid "Image stabilization data"
+msgstr "Orientación"
+
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
 msgstr ""
 
-#: src/minoltamn.cpp:247
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:111
 #, fuzzy
 msgid "Compressed Image Size"
 msgstr "Bits comprimidos por pixel"
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:112
 #, fuzzy
 msgid "Compressed image size"
 msgstr "Bits comprimidos por pixel"
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
-msgstr ""
+msgstr "miniatura Jpeg 640x480 pixeles"
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
 #, fuzzy
 msgid "Thumbnail Offset"
-msgstr "Desplazamiento de tira"
+msgstr "Desplazamiento de miniatura"
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr ""
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
 #, fuzzy
 msgid "Thumbnail Length"
-msgstr "Longitud de la imagen"
+msgstr "Longitud de la miniatura"
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
+#, fuzzy
 msgid "Size of the thumbnail"
-msgstr ""
+msgstr "Tamaño de la miniatura"
+
+# msgstr "Desplazamiento de tira"
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+#, fuzzy
+msgid "Scene Mode"
+msgstr "Tipo de escena"
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
 #, fuzzy
 msgid "Color Mode"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
 #, fuzzy
 msgid "Color mode"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
 #, fuzzy
 msgid "Image Quality"
 msgstr "Ancho de la imagen"
 
-#: src/minoltamn.cpp:271
-msgid "Zone Matching"
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
 msgstr ""
 
-#: src/minoltamn.cpp:272
-msgid "Zone matching"
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "Tiempo de exposición"
+
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+#, fuzzy
+msgid "Flash exposure compensation in EV"
+msgstr "Tiempo de exposición"
+
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+#, fuzzy
+msgid "Teleconverter Model"
+msgstr "Tipo de escena"
+
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
+msgstr ""
+
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
 msgstr ""
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
 #, fuzzy
-msgid "Color Temperature"
-msgstr "Espacio de color"
+msgid "Zone Matching"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
+
+#: src/minoltamn.cpp:154
+#, fuzzy
+msgid "Zone matching"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
 #, fuzzy
 msgid "Color temperature"
-msgstr "Espacio de color"
+msgstr "Temperatura de color"
 
-#: src/minoltamn.cpp:277
+# msgstr "Espacio de color"
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
 #, fuzzy
 msgid "Lens ID"
-msgstr "Ancho de la imagen"
+msgstr "Lente"
 
-#: src/minoltamn.cpp:278
+# msgstr "Ancho de la imagen"
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
+#, fuzzy
 msgid "Lens identifier"
+msgstr "Centímetro"
+
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+#, fuzzy
+msgid "Color Compensation Filter"
+msgstr "Tiempo de exposición"
+
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
 msgstr ""
+"Filtro de compensación del color: el verde es negativo, el magenta es "
+"positivo"
+
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+#, fuzzy
+msgid "White Balance Fine Tune"
+msgstr "Balance de blanco"
+
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+#, fuzzy
+msgid "White Balance Fine Tune Value"
+msgstr "Balance de blanco"
+
+#: src/minoltamn.cpp:168
+#, fuzzy
+msgid "Image Stabilization A100"
+msgstr "Orientación"
+
+#: src/minoltamn.cpp:169
+#, fuzzy
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr "Orientación"
 
-#: src/minoltamn.cpp:280
+#: src/minoltamn.cpp:173
 #, fuzzy
 msgid "Camera Settings (5D)"
 msgstr "Contraste"
 
-#: src/minoltamn.cpp:281
+#: src/minoltamn.cpp:174
+#, fuzzy
 msgid "Camera Settings (for Dynax 5D model)"
-msgstr ""
+msgstr "Contraste"
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
 msgid "Print IM"
 msgstr ""
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
 #, fuzzy
 msgid "PrintIM information"
 msgstr "Orientación"
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:183
 #, fuzzy
 msgid "Camera Settings (Z1)"
 msgstr "Contraste"
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr ""
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
 #, fuzzy
 msgid "Unknown Minolta MakerNote tag"
 msgstr "Versión Exif"
 
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr "Prioridad de apertura"
 
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr "Prioridad del obturador"
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
 #, fuzzy
 msgid "Fill flash"
 msgstr "Flash"
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
 msgid "Rear flash sync"
 msgstr ""
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
+#, fuzzy
 msgid "Wireless"
-msgstr ""
+msgstr "Orden de llenado"
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
 #, fuzzy
 msgid "Fluorescent 2"
 msgstr "Fluorescente"
 
-#: src/minoltamn.cpp:329 src/properties.cpp:763
+#: src/minoltamn.cpp:231
 #, fuzzy
-msgid "Custom 3"
-msgstr "Proceso personalizado"
-
-#: src/minoltamn.cpp:334
 msgid "Full size"
-msgstr ""
+msgstr "Fuente de archivo"
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
 msgid "Super fine"
 msgstr ""
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr ""
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+#, fuzzy
+msgid "Single Frame"
+msgstr "Nombre del documento"
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
 #, fuzzy
 msgid "Self-timer"
 msgstr "Centímetro"
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
 #, fuzzy
 msgid "Bracketing"
-msgstr "acción"
+msgstr "Horquillado"
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
+#, fuzzy
 msgid "Interval"
-msgstr ""
+msgstr "Intervalo"
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
+#, fuzzy
 msgid "UHS continuous"
-msgstr ""
+msgstr "Exposición automática"
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
+#, fuzzy
 msgid "HS continuous"
-msgstr ""
+msgstr "Exposición automática"
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
 #, fuzzy
 msgid "Multi-segment"
 msgstr "multi-lugar"
 
-#: src/minoltamn.cpp:380
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+#, fuzzy
+msgid "Center weighted average"
+msgstr "Promedio Ponderado en el Centro"
+
+#: src/minoltamn.cpp:271
 msgid "Electronic magnification"
 msgstr ""
 
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
+#, fuzzy
 msgid "Top"
-msgstr ""
+msgstr "acción"
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
 #, fuzzy
 msgid "Top-right"
 msgstr "Copyright"
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 #, fuzzy
 msgid "Bottom-right"
 msgstr "abajo - derecha"
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
+#, fuzzy
 msgid "Bottom"
-msgstr ""
+msgstr "izquierda - abajo"
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
 #, fuzzy
 msgid "Bottom-left"
 msgstr "abajo - izquierda"
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
 #, fuzzy
 msgid "Top-left"
 msgstr "arriba - izquierda"
 
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
 msgid "Hard"
 msgstr "Duro"
 
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
 msgid "Soft"
 msgstr "Suave"
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
 #, fuzzy
 msgid "Night portrait"
 msgstr "retrato"
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
 #, fuzzy
 msgid "Sports action"
 msgstr "Lugar"
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr ""
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 #, fuzzy
 msgid "Standard form"
 msgstr "Estándar"
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
 #, fuzzy
 msgid "Data form"
 msgstr "formato planar"
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
+#, fuzzy
 msgid "Natural color"
-msgstr ""
+msgstr "Manual"
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
 msgid "Black and white"
 msgstr ""
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
 msgid "Vivid color"
 msgstr ""
 
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr ""
-
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
+#, fuzzy
 msgid "No zone"
-msgstr ""
+msgstr "Desconocido"
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
+#, fuzzy
 msgid "Left zone"
-msgstr ""
+msgstr "Escena nocturna"
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 #, fuzzy
 msgid "Right zone"
 msgstr "Escena nocturna"
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
 #, fuzzy
 msgid "Auto focus"
 msgstr "Exposición automática"
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
+#, fuzzy
 msgid "Wide focus (normal)"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
 #, fuzzy
 msgid "Spot focus"
 msgstr "Lugar"
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
 #, fuzzy
 msgid "Exposure"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 #, fuzzy
 msgid "Filter"
 msgstr "Orden de llenado"
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 #, fuzzy
 msgid "Not embedded"
 msgstr "No definido"
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
+#, fuzzy
 msgid "Embedded"
-msgstr ""
+msgstr "No definido"
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr ""
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr ""
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr ""
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
+#, fuzzy
 msgid "Manual flash control"
-msgstr ""
+msgstr "Exposición manual"
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
 #, fuzzy
 msgid "Flash mode"
 msgstr "Flash"
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
 #, fuzzy
 msgid "Drive mode"
 msgstr "Retrato"
 
-#: src/minoltamn.cpp:631
-#, fuzzy
-msgid "Exposure Speed"
-msgstr "Modo de exposición"
-
-#: src/minoltamn.cpp:632
+#: src/minoltamn.cpp:512
 #, fuzzy
-msgid "Exposure speed"
-msgstr "Modo de exposición"
+msgid "ISO Value"
+msgstr "Velocidad ISO"
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr "Tiempo de exposición"
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 #, fuzzy
 msgid "FNumber"
 msgstr "El número F."
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 #, fuzzy
 msgid "The F-Number"
 msgstr "El número F."
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 #, fuzzy
 msgid "Macro Mode"
 msgstr "Macro"
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
 #, fuzzy
 msgid "Exposure Compensation"
 msgstr "Tiempo de exposición"
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
 #, fuzzy
 msgid "Bracket Step"
 msgstr "acción"
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
 #, fuzzy
 msgid "Bracket step"
 msgstr "acción"
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
 #, fuzzy
 msgid "Interval Length"
 msgstr "Distancia focal"
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
+#, fuzzy
 msgid "Interval length"
-msgstr ""
+msgstr "Distancia focal"
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
 #, fuzzy
 msgid "Interval Number"
 msgstr "El número F."
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
 #, fuzzy
 msgid "Interval number"
 msgstr "El número F."
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
 #, fuzzy
 msgid "Focus Distance"
 msgstr "Balance de blanco manual"
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
 #, fuzzy
 msgid "Focus distance"
 msgstr "Balance de blanco manual"
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+#, fuzzy
+msgid "Flash Fired"
+msgstr "El flash disparó."
+
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+#, fuzzy
+msgid "Flash fired"
+msgstr "El flash disparó."
+
+#: src/minoltamn.cpp:547
+#, fuzzy
 msgid "Minolta Date"
-msgstr ""
+msgstr "Modo de métrica"
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
+#, fuzzy
 msgid "Minolta date"
-msgstr ""
+msgstr "Modo de métrica"
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
+#, fuzzy
 msgid "Minolta Time"
-msgstr ""
+msgstr "Retrato"
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
+#, fuzzy
 msgid "Minolta time"
-msgstr ""
+msgstr "Retrato"
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
+#, fuzzy
 msgid "File Number Memory"
-msgstr ""
+msgstr "El número F."
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
+#, fuzzy
 msgid "File number memory"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
+#: src/minoltamn.cpp:559
 #, fuzzy
-msgid "Image Number"
+msgid "Last Image Number"
+msgstr "ID único de imagen"
+
+#: src/minoltamn.cpp:560
+#, fuzzy
+msgid "Last image number"
 msgstr "ID único de imagen"
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:562
 #, fuzzy
 msgid "Color Balance Red"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
 #, fuzzy
 msgid "Color balance red"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
 #, fuzzy
 msgid "Color Balance Green"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
 #, fuzzy
 msgid "Color balance green"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
 #, fuzzy
 msgid "Color Balance Blue"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
 #, fuzzy
 msgid "Color balance blue"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
 #, fuzzy
 msgid "Subject Program"
 msgstr "Área del sujeto"
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
 #, fuzzy
 msgid "Subject program"
 msgstr "Área del sujeto"
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
-msgid "Flash Exposure Compensation"
-msgstr ""
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
+#, fuzzy
+msgid "ISO Settings"
+msgstr "Velocidad ISO"
 
-#: src/minoltamn.cpp:704
-msgid "Flash exposure compensation in EV"
-msgstr ""
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
+#, fuzzy
+msgid "ISO setting"
+msgstr "Velocidad ISO"
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
 #, fuzzy
 msgid "Minolta Model"
 msgstr "Modo de métrica"
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
 #, fuzzy
 msgid "Minolta model"
 msgstr "Retrato"
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
 #, fuzzy
 msgid "Interval Mode"
 msgstr "Modo de métrica"
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
 #, fuzzy
 msgid "Interval mode"
 msgstr "Retrato"
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
 #, fuzzy
 msgid "Folder Name"
 msgstr "Nombre del documento"
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
+#, fuzzy
 msgid "Folder name"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
 #, fuzzy
 msgid "ColorMode"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
 #, fuzzy
 msgid "Color Filter"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
 #, fuzzy
 msgid "Color filter"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
 msgid "Black and White Filter"
 msgstr ""
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
 msgid "Black and white filter"
 msgstr ""
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
+#, fuzzy
 msgid "Internal Flash"
-msgstr ""
+msgstr "Retrato"
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr "Brillo"
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
+#, fuzzy
 msgid "Spot Focus Point X"
-msgstr ""
+msgstr "Lugar"
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
+#, fuzzy
 msgid "Spot focus point X"
-msgstr ""
+msgstr "Lugar"
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
+#, fuzzy
 msgid "Spot Focus Point Y"
-msgstr ""
+msgstr "Lugar"
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
+#, fuzzy
 msgid "Spot focus point Y"
-msgstr ""
+msgstr "Lugar"
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
 #, fuzzy
 msgid "Wide Focus Zone"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
+#, fuzzy
 msgid "Wide focus zone"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
 #, fuzzy
 msgid "Focus mode"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
 #, fuzzy
 msgid "Focus area"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
+#, fuzzy
 msgid "DEC Switch Position"
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
+#, fuzzy
 msgid "DEC switch position"
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
 #, fuzzy
 msgid "Color Profile"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
 #, fuzzy
 msgid "Color profile"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
+#, fuzzy
 msgid "Data Imprint"
-msgstr ""
+msgstr "formato planar"
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
 #, fuzzy
 msgid "Flash Metering"
 msgstr "Contraste"
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
 #, fuzzy
 msgid "Flash metering"
 msgstr "Contraste"
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
+#, fuzzy
 msgid "Unknown Minolta Camera Settings tag"
-msgstr ""
+msgstr "Contraste"
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
 #, fuzzy
 msgid "Program-shift A"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
 #, fuzzy
 msgid "Program-shift S"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
+#, fuzzy
 msgid "Raw+Jpeg"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
+#, fuzzy
 msgid "Kelvin"
-msgstr ""
+msgstr "Versión Exif"
 
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
+#, fuzzy
 msgid "Single-shot AF"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
+#, fuzzy
 msgid "Continuous AF"
-msgstr ""
+msgstr "Exposición automática"
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
+#, fuzzy
 msgid "Automatic AF"
-msgstr ""
+msgstr "multi-lugar"
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
+#, fuzzy
 msgid "sRGB (Natural)"
-msgstr ""
+msgstr "Manual"
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
+#, fuzzy
 msgid "sRGB (Natural+)"
-msgstr ""
+msgstr "Manual"
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr ""
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
 #, fuzzy
 msgid "AF Points"
 msgstr "Punto blanco"
 
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
+#, fuzzy
 msgid "AF points"
-msgstr ""
+msgstr "Punto blanco"
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 #, fuzzy
 msgid "Color space"
 msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 msgid "Free Memory Card Images"
 msgstr ""
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 msgid "Free memory card images"
 msgstr ""
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
+#, fuzzy
 msgid "Hue"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
 #, fuzzy
 msgid "Rotation"
 msgstr "acción"
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+#, fuzzy
+msgid "Image Number"
+msgstr "ID único de imagen"
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
 #, fuzzy
 msgid "Noise reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
 msgid "Zone Matching On"
 msgstr ""
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
+#, fuzzy
 msgid "Zone matching on"
-msgstr ""
+msgstr "Tiempo de exposición"
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
+#, fuzzy
 msgid "Unknown Minolta Camera Settings 7D tag"
-msgstr ""
+msgstr "Contraste"
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
-msgstr ""
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+#, fuzzy
+msgid "Program Shift A"
+msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+#, fuzzy
+msgid "Program Shift S"
+msgstr "Modo de exposición"
+
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+#, fuzzy
+msgid "Night View/Portrait"
+msgstr "Retrato"
+
+#: src/minoltamn.cpp:895
 msgid "200 (Zone Matching High)"
 msgstr ""
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
 msgid "80 (Zone Matching Low)"
 msgstr ""
 
-#: src/minoltamn.cpp:1065
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+msgid "Adobe RGB (ICC)"
+msgstr ""
+
+#: src/minoltamn.cpp:918
 #, fuzzy
 msgid "Central"
 msgstr "Centímetro"
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:919
 msgid "Up"
 msgstr ""
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
 #, fuzzy
 msgid "Up right"
 msgstr "arriba - derecha"
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
 #, fuzzy
 msgid "Down right"
 msgstr "arriba - derecha"
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
+#, fuzzy
 msgid "Down"
-msgstr ""
+msgstr "arriba - izquierda"
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
 #, fuzzy
 msgid "Down left"
 msgstr "arriba - izquierda"
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
 #, fuzzy
 msgid "Up left"
 msgstr "arriba - izquierda"
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 #, fuzzy
 msgid "Selection"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+#, fuzzy
+msgid "Natural+"
+msgstr "Manual"
+
+#: src/minoltamn.cpp:949
+#, fuzzy
+msgid "Wind Scene"
+msgstr "Escena nocturna"
+
+#: src/minoltamn.cpp:950
+#, fuzzy
+msgid "Evening Scene"
+msgstr "Velocidad ISO"
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 #, fuzzy
 msgid "Focus Position"
 msgstr "Posicionamiento YCbCr"
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
+#, fuzzy
 msgid "Focus position"
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
 #, fuzzy
 msgid "Focus Area"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
 #, fuzzy
 msgid "Exposure Revision"
 msgstr "Ajuste de exposición"
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
 #, fuzzy
 msgid "Exposure revision"
 msgstr "Ajuste de exposición"
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+#, fuzzy
+msgid "Rotation2"
+msgstr "acción"
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+#, fuzzy
+msgid "Picture Finish"
+msgstr "Información de imágen"
+
+#: src/minoltamn.cpp:1059
 #, fuzzy
 msgid "Exposure Manual Bias"
 msgstr "Ajuste de exposición"
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
 #, fuzzy
 msgid "Exposure manual bias"
 msgstr "Ajuste de exposición"
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
 #, fuzzy
 msgid "AF Mode"
 msgstr "Modo de exposición"
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
 #, fuzzy
 msgid "AF mode"
 msgstr "Flash"
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
+#, fuzzy
 msgid "Unknown Minolta Camera Settings 5D tag"
-msgstr ""
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
 #, fuzzy
-msgid "Single area"
-msgstr "Nombre del documento"
+msgid "Self-timer 10 sec"
+msgstr "Centímetro"
 
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
 #, fuzzy
-msgid "Dynamic area"
-msgstr "formato planar"
+msgid "Self-timer 2 sec"
+msgstr "Centímetro"
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
-msgstr ""
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+#, fuzzy
+msgid "White Balance Bracketing Low"
+msgstr "Agrupamiento bajo de Balance de blanco"
 
-#: src/nikonmn.cpp:77
-msgid "Group dynamic"
-msgstr ""
+#: src/minoltamn.cpp:1101
+#, fuzzy
+msgid "White Balance Bracketing High"
+msgstr "Agrupamiento alto Balance de blanco"
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr ""
+#: src/minoltamn.cpp:1102
+#, fuzzy
+msgid "Single-frame Bracketing Low"
+msgstr "Nombre del documento"
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
+#: src/minoltamn.cpp:1103
 #, fuzzy
-msgid "Dynamic area (wide)"
-msgstr "Balance de blanco"
+msgid "Continous Bracketing Low"
+msgstr "Auto bracket"
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
+#: src/minoltamn.cpp:1104
 #, fuzzy
-msgid "Upper-left"
-msgstr "arriba - izquierda"
+msgid "Single-frame Bracketing High"
+msgstr "Nombre del documento"
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
+#: src/minoltamn.cpp:1105
 #, fuzzy
-msgid "Upper-right"
-msgstr "arriba - derecha"
+msgid "Continous Bracketing High"
+msgstr "Auto bracket"
+
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
+msgstr "Avanzado"
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
 #, fuzzy
-msgid "Lower-left"
-msgstr "arriba - izquierda"
+msgid "Continuous Bracketing"
+msgstr "Auto bracket"
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
+#: src/minoltamn.cpp:1152
 #, fuzzy
-msgid "Lower-right"
-msgstr "Copyright"
+msgid "Single-Frame Bracketing"
+msgstr "Nombre del documento"
 
-#: src/nikonmn.cpp:96
-msgid "Left-most"
-msgstr ""
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
+#, fuzzy
+msgid "White Balance Bracketing"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:97
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
 #, fuzzy
-msgid "Right-most"
-msgstr "Escena nocturna"
+msgid "Preset"
+msgstr "Área del sujeto"
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
-msgstr "sRVA"
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
+#, fuzzy
+msgid "Color Temperature/Color Filter"
+msgstr "Temperatura de color/ Filtro de color"
 
-#: src/nikonmn.cpp:131
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
 #, fuzzy
-msgid "Fire, manual"
-msgstr "manual"
+msgid "Temperature"
+msgstr "Temperatura de color"
 
-#: src/nikonmn.cpp:132
+#: src/minoltamn.cpp:1209
 #, fuzzy
-msgid "Fire, external"
-msgstr "Tiempo bueno"
+msgid "Setup"
+msgstr "Área del sujeto"
 
-#: src/nikonmn.cpp:133
-msgid "Fire, commander mode"
+#: src/minoltamn.cpp:1210
+msgid "Recall"
 msgstr ""
 
-#: src/nikonmn.cpp:134
-#, fuzzy
-msgid "Fire, TTL mode"
-msgstr "Flash"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
+msgstr "Ok"
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
-msgstr ""
+#: src/minoltamn.cpp:1216
+msgid "Error"
+msgstr "Error"
 
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
+#: src/minoltamn.cpp:1228
 #, fuzzy
-msgid "PC control"
-msgstr "Espacio de color"
+msgid "Image and Information"
+msgstr "Configuración planar"
 
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
+#: src/minoltamn.cpp:1229
 #, fuzzy
-msgid "Exposure bracketing"
-msgstr "Ajuste de exposición"
+msgid "Image Only"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:143
+#: src/minoltamn.cpp:1230
 #, fuzzy
-msgid "Auto ISO"
-msgstr "acción"
+msgid "Image and Histogram"
+msgstr "Imágen e Histograma"
 
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
+#: src/minoltamn.cpp:1236
 #, fuzzy
-msgid "White balance bracketing"
-msgstr "Balance de blanco"
+msgid "Fill Flash"
+msgstr "Flash de relleno"
 
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
+#: src/minoltamn.cpp:1247
 #, fuzzy
-msgid "IR control"
-msgstr "Espacio de color"
+msgid "Focus Hold"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
+#: src/minoltamn.cpp:1248
+#, fuzzy
+msgid "DOF Preview"
+msgstr "Versión Exif"
+
+#: src/minoltamn.cpp:1253
+msgid "Hold"
 msgstr ""
 
-#: src/nikonmn.cpp:162
-#, fuzzy
-msgid "Auto release"
-msgstr "Auto bracket"
+#: src/minoltamn.cpp:1254
+msgid "Toggle"
+msgstr ""
 
-#: src/nikonmn.cpp:163
+#: src/minoltamn.cpp:1255
 #, fuzzy
-msgid "Manual release"
-msgstr "Exposición manual"
+msgid "Spot Hold"
+msgstr "Modo de métrica"
 
-#: src/nikonmn.cpp:168
+#: src/minoltamn.cpp:1256
 #, fuzzy
-msgid "Lossy (type 1)"
-msgstr "Espacio de color"
+msgid "Spot Toggle"
+msgstr "Modo de métrica"
 
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
-msgstr "Descomprimido"
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+#, fuzzy
+msgid "Shutter Speed"
+msgstr "Velocidad del obturador"
 
-#: src/nikonmn.cpp:170
-msgid "Lossless"
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:171
-#, fuzzy
-msgid "Lossy (type 2)"
-msgstr "Espacio de color"
-
-#: src/nikonmn.cpp:177
-msgid "B & W"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
 msgstr ""
 
-#: src/nikonmn.cpp:179
-msgid "Trim"
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
 msgstr ""
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
 msgstr ""
 
-#: src/nikonmn.cpp:181
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
 #, fuzzy
-msgid "D-Lighting"
-msgstr "Luz de día"
+msgid "Automatic"
+msgstr "acción"
 
-#: src/nikonmn.cpp:182
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
 #, fuzzy
-msgid "Red eye"
-msgstr "Balance de blanco"
+msgid "Auto-rotate"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
+#: src/minoltamn.cpp:1287
+msgid "Horizontal"
+msgstr ""
+
+#: src/minoltamn.cpp:1293
 #, fuzzy
-msgid "Cyanotype"
-msgstr "Escena nocturna"
+msgid "Manual Rotate"
+msgstr "Exposición manual"
 
-#: src/nikonmn.cpp:184
+#: src/minoltamn.cpp:1298
 #, fuzzy
-msgid "Sky light"
-msgstr "Luz de día"
+msgid "Within Range"
+msgstr "Rango de transferencia"
 
-#: src/nikonmn.cpp:185
+#: src/minoltamn.cpp:1299
 #, fuzzy
-msgid "Warm tone"
-msgstr "Espacio de color"
+msgid "Under/Over Range"
+msgstr "Rango de transferencia"
+
+#: src/minoltamn.cpp:1300
+msgid "Out of Range"
+msgstr ""
 
-#: src/nikonmn.cpp:186
+#: src/minoltamn.cpp:1305
 #, fuzzy
-msgid "Color custom"
-msgstr "Espacio de color"
+msgid "Not Indicated"
+msgstr "No definido"
 
-#: src/nikonmn.cpp:187
+#: src/minoltamn.cpp:1306
 #, fuzzy
-msgid "Image overlay"
-msgstr "Ancho de la imagen"
+msgid "Under Scale"
+msgstr "Tiempo bueno"
 
-#: src/nikonmn.cpp:193
+#: src/minoltamn.cpp:1307
 #, fuzzy
-msgid "Minimal"
-msgstr "Manual"
+msgid "Bottom of Scale"
+msgstr "abajo - izquierda"
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
-#, fuzzy
-msgid "Nikon Makernote version"
-msgstr "Versión Exif"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
+msgstr ""
 
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
+#: src/minoltamn.cpp:1326
 #, fuzzy
-msgid "ISO Speed"
-msgstr "Velocidad ISO"
+msgid "Over Scale"
+msgstr "Nombre del documento"
 
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
-#, fuzzy
-msgid "Sharpening"
-msgstr "Nitidez"
+#: src/minoltamn.cpp:1331
+msgid "AM"
+msgstr ""
+
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
+msgstr "Enfoque manual"
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
+#: src/minoltamn.cpp:1338
+msgid "Built-in"
+msgstr ""
+
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
 #, fuzzy
-msgid "Image sharpening setting"
-msgstr "Ancho de la imagen"
+msgid "Very Low"
+msgstr "co-situado"
 
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
+#: src/minoltamn.cpp:1346
 #, fuzzy
-msgid "Focus"
-msgstr "Modo de exposición"
+msgid "Half Full"
+msgstr "acción"
+
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
+msgstr ""
 
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
+#: src/minoltamn.cpp:1355
 #, fuzzy
-msgid "Flash Setting"
-msgstr "Contraste"
+msgid "Exposure Compensation Setting"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
+#: src/minoltamn.cpp:1356
 #, fuzzy
-msgid "Flash setting"
-msgstr "Contraste"
+msgid "Exposure compensation setting"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
+#: src/minoltamn.cpp:1358
 #, fuzzy
-msgid "ISO Selection"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "High Speed Sync"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
+#: src/minoltamn.cpp:1359
 #, fuzzy
-msgid "ISO selection"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "High speed sync"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
+#: src/minoltamn.cpp:1361
 #, fuzzy
-msgid "Data Dump"
-msgstr "formato planar"
+msgid "Manual Exposure Time"
+msgstr "Exposición manual"
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
+#: src/minoltamn.cpp:1362
 #, fuzzy
-msgid "Data dump"
-msgstr "formato planar"
+msgid "Manual exposure time"
+msgstr "Exposición manual"
 
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
 #, fuzzy
-msgid "Image Adjustment"
-msgstr "Longitud de la imagen"
+msgid "Manual FNumber"
+msgstr "El número F."
 
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
+#: src/minoltamn.cpp:1373
 #, fuzzy
-msgid "Image adjustment setting"
-msgstr "Ancho de la imagen"
+msgid "Drive Mode 2"
+msgstr "Modo de métrica"
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
+#: src/minoltamn.cpp:1374
 #, fuzzy
-msgid "Auxiliary Lens"
-msgstr "Sensor tri-lineal"
+msgid "Drive mode 2"
+msgstr "Retrato"
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
 msgstr ""
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
 #, fuzzy
-msgid "Manual focus distance"
-msgstr "Balance de blanco manual"
+msgid "AF Area Mode"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
 #, fuzzy
-msgid "Digital zoom setting"
-msgstr "Relación de zoom digital"
+msgid "FlashMode"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:246
+#: src/minoltamn.cpp:1391
 #, fuzzy
-msgid "AF Focus Position"
-msgstr "Posicionamiento YCbCr"
+msgid "Flash Exposure Comp Setting"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:247
+#: src/minoltamn.cpp:1392
 #, fuzzy
-msgid "AF focus position information"
-msgstr "Posicionamiento YCbCr"
+msgid "Flash exposure compensation setting"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:252
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
 #, fuzzy
-msgid "Unknown Nikon1MakerNote tag"
-msgstr "Versión Exif"
-
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
-msgstr ""
+msgid "ISO Setting"
+msgstr "Velocidad ISO"
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
 #, fuzzy
-msgid "Single autofocus"
-msgstr "Exposición automática"
+msgid "Zone Matching Mode"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
 #, fuzzy
-msgid "Not used"
-msgstr "No definido"
+msgid "Dynamic Range Optimizer Mode"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:353
+#: src/minoltamn.cpp:1404
 #, fuzzy
-msgid "guess"
-msgstr "Fuente de archivo"
+msgid "Dynamic range optimizer mode"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
 msgstr ""
 
-#: src/nikonmn.cpp:401
+#: src/minoltamn.cpp:1430
 #, fuzzy
-msgid "VGA Normal"
-msgstr "Normal"
+msgid "Self Timer Time"
+msgstr "Centímetro"
 
-#: src/nikonmn.cpp:402
+#: src/minoltamn.cpp:1431
 #, fuzzy
-msgid "VGA Fine"
-msgstr "pulg"
+msgid "Self timer time"
+msgstr "Centímetro"
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
-msgstr ""
+#: src/minoltamn.cpp:1434
+#, fuzzy
+msgid "Continuous bracketing"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:404
+#: src/minoltamn.cpp:1436
 #, fuzzy
-msgid "SXGA Normal"
-msgstr "Normal"
+msgid "Single Frame Bracketing"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:405
+#: src/minoltamn.cpp:1437
 #, fuzzy
-msgid "SXGA Fine"
-msgstr "pulg"
+msgid "Single frame bracketing"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
 #, fuzzy
-msgid "Monochrome"
-msgstr "Macro"
+msgid "White balance bracketing"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:417
+#: src/minoltamn.cpp:1442
 #, fuzzy
-msgid "Bright+"
-msgstr "Copyright"
+msgid "White Balance Setting"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:418
+#: src/minoltamn.cpp:1445
 #, fuzzy
-msgid "Bright-"
-msgstr "Copyright"
+msgid "Preset White Balance"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:419
+#: src/minoltamn.cpp:1446
 #, fuzzy
-msgid "Contrast+"
-msgstr "Contraste"
+msgid "Preset white balance"
+msgstr "Balance de blanco manual"
 
-#: src/nikonmn.cpp:420
+#: src/minoltamn.cpp:1448
 #, fuzzy
-msgid "Contrast-"
-msgstr "Contraste"
+msgid "Color Temperature Setting"
+msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
-msgstr ""
+#: src/minoltamn.cpp:1449
+#, fuzzy
+msgid "Color temperature setting"
+msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
-msgstr ""
+#: src/minoltamn.cpp:1451
+#, fuzzy
+msgid "Custom WB Setting"
+msgstr "Proceso personalizado"
 
-#: src/nikonmn.cpp:479
+#: src/minoltamn.cpp:1452
 #, fuzzy
-msgid "Unknown Nikon2MakerNote tag"
-msgstr "Versión Exif"
+msgid "Custom WB setting"
+msgstr "Proceso personalizado"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
 #, fuzzy
-msgid "Flash Device"
-msgstr "Flash"
+msgid "Dynamic Range Optimizer Settings"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
+#: src/minoltamn.cpp:1460
 #, fuzzy
-msgid "Flash device"
-msgstr "Flash"
+msgid "Custom WB Red Level"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
+#: src/minoltamn.cpp:1461
 #, fuzzy
-msgid "White Balance Bias"
-msgstr "Balance de blanco"
+msgid "Custom WB red level"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:522
+#: src/minoltamn.cpp:1463
 #, fuzzy
-msgid "White balance bias"
-msgstr "Balance de blanco"
+msgid "Custom WB Green Level"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1464
 #, fuzzy
-msgid "WB RB Levels"
+msgid "Custom WB green level"
 msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB levels"
-msgstr ""
+#: src/minoltamn.cpp:1466
+#, fuzzy
+msgid "Custom WB Blue Level"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:524
+#: src/minoltamn.cpp:1467
 #, fuzzy
-msgid "Program Shift"
-msgstr "Modo de exposición"
+msgid "CustomWB blue level"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:524
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
 #, fuzzy
-msgid "Program shift"
-msgstr "Modo de exposición"
+msgid "Custom WB Error"
+msgstr "Proceso personalizado"
 
-#: src/nikonmn.cpp:525
+#: src/minoltamn.cpp:1473
 #, fuzzy
-msgid "Exposure Difference"
-msgstr "Índice de exposición"
+msgid "White balance fine tune"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:525
+#: src/minoltamn.cpp:1479
 #, fuzzy
-msgid "Exposure difference"
-msgstr "Índice de exposición"
+msgid "Color compensation filter"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
+#, fuzzy
+msgid "Sony Image Size"
+msgstr "Ancho de la imagen"
+
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
 msgstr ""
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
+msgstr ""
+
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
+msgstr ""
+
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
+msgstr ""
+
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
 msgstr ""
 
-#: src/nikonmn.cpp:529
+#: src/minoltamn.cpp:1497
+msgid "Eye start AF"
+msgstr ""
+
+#: src/minoltamn.cpp:1499
 #, fuzzy
-msgid "Flash Comp"
+msgid "Red Eye Reduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
+
+#: src/minoltamn.cpp:1500
+#, fuzzy
+msgid "Red eye reduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
+
+#: src/minoltamn.cpp:1502
+#, fuzzy
+msgid "Flash Default"
 msgstr "Flash"
 
-#: src/nikonmn.cpp:529
+#: src/minoltamn.cpp:1503
 #, fuzzy
-msgid "Flash compensation setting"
-msgstr "Tiempo de exposición"
+msgid "Flash default"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:530
+#: src/minoltamn.cpp:1505
 #, fuzzy
-msgid "ISO Settings"
+msgid "Auto Bracket Order"
+msgstr "Auto bracket"
+
+#: src/minoltamn.cpp:1506
+#, fuzzy
+msgid "Auto bracket order"
+msgstr "Auto bracket"
+
+#: src/minoltamn.cpp:1508
+#, fuzzy
+msgid "Focus Hold Button"
+msgstr "Modo de exposición"
+
+#: src/minoltamn.cpp:1509
+#, fuzzy
+msgid "Focus hold button"
+msgstr "Modo de exposición"
+
+#: src/minoltamn.cpp:1511
+#, fuzzy
+msgid "AEL Button"
 msgstr "Velocidad ISO"
 
-#: src/nikonmn.cpp:530
+#: src/minoltamn.cpp:1512
 #, fuzzy
-msgid "ISO setting"
+msgid "AEL button"
 msgstr "Velocidad ISO"
 
-#: src/nikonmn.cpp:531
+#: src/minoltamn.cpp:1514
 #, fuzzy
-msgid "Image Boundary"
-msgstr "Ancho de la imagen"
+msgid "Control Dial Set"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:531
+#: src/minoltamn.cpp:1515
 #, fuzzy
-msgid "Image boundary"
-msgstr "Ancho de la imagen"
+msgid "Control dial set"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:533
+#: src/minoltamn.cpp:1517
 #, fuzzy
-msgid "Flash Bracket Comp"
-msgstr "El flash disparó."
+msgid "Exposure Compensation Mode"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:533
+#: src/minoltamn.cpp:1518
 #, fuzzy
-msgid "Flash bracket compensation applied"
+msgid "Exposure compensation mode"
 msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:534
+#: src/minoltamn.cpp:1521
 #, fuzzy
-msgid "Exposure Bracket Comp"
-msgstr "Ajuste de exposición"
+msgid "AF assist"
+msgstr "centrado"
 
-#: src/nikonmn.cpp:534
+#: src/minoltamn.cpp:1523
 #, fuzzy
-msgid "AE bracket compensation applied"
-msgstr "Tiempo de exposición"
+msgid "Card Shutter Lock"
+msgstr "Velocidad del obturador"
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
+#: src/minoltamn.cpp:1524
 #, fuzzy
-msgid "Image Processing"
-msgstr "Longitud de la imagen"
+msgid "Card shutter lock"
+msgstr "Velocidad del obturador"
 
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
+#: src/minoltamn.cpp:1526
 #, fuzzy
-msgid "Image processing"
-msgstr "Longitud de la imagen"
+msgid "Lens Shutter Lock"
+msgstr "Velocidad del obturador"
 
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
-msgstr ""
+#: src/minoltamn.cpp:1527
+#, fuzzy
+msgid "Lens shutter lock"
+msgstr "obturador"
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
+#: src/minoltamn.cpp:1529
+msgid "AF Area Illumination"
 msgstr ""
 
-#: src/nikonmn.cpp:539
+#: src/minoltamn.cpp:1530
 #, fuzzy
-msgid "VR Info"
-msgstr "Modo de exposición"
+msgid "AF area illumination"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:539
-msgid "VR info"
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
 msgstr ""
 
-#: src/nikonmn.cpp:540
-#, fuzzy
-msgid "Image Authentication"
-msgstr "Orientación"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
+msgstr ""
 
-#: src/nikonmn.cpp:540
-#, fuzzy
-msgid "Image authentication"
-msgstr "Orientación"
+#: src/minoltamn.cpp:1535
+msgid "Record Display"
+msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
+#: src/minoltamn.cpp:1536
+msgid "Record display"
 msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
 msgstr ""
 
-#: src/nikonmn.cpp:542
-#, fuzzy
-msgid "Picture Control"
-msgstr "Modo de exposición"
+#: src/minoltamn.cpp:1539
+msgid "Play display"
+msgstr ""
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1541
 #, fuzzy
-msgid " Picture control"
-msgstr "Modo de exposición"
+msgid "Exposure Indicator"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1542
 #, fuzzy
-msgid "World Time"
-msgstr "Tiempo de exposición"
+msgid "Exposure indicator"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1544
 #, fuzzy
-msgid "World time"
-msgstr "Tiempo de exposición"
+msgid "AEL Exposure Indicator"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:544
-#, fuzzy
-msgid "ISO Info"
-msgstr "Modo de exposición"
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1547
 #, fuzzy
-msgid "ISO info"
-msgstr "Velocidad ISO"
+msgid "Exposure Bracketing Indicator Last"
+msgstr "Ajuste de exposición"
 
-#: src/nikonmn.cpp:545
-#, fuzzy
-msgid "Vignette Control"
-msgstr "Punto blanco"
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:545
-#, fuzzy
-msgid "Vignette control"
-msgstr "Punto blanco"
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
+msgstr ""
+
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
+msgstr ""
 
-#: src/nikonmn.cpp:547
+#: src/minoltamn.cpp:1553
 #, fuzzy
-msgid "Tone Compensation"
+msgid "Flash Exposure Indicator"
 msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:547
+#: src/minoltamn.cpp:1554
 #, fuzzy
-msgid "Tone compensation"
+msgid "Flash exposure indicator"
 msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:553
+#: src/minoltamn.cpp:1556
 #, fuzzy
-msgid "Mode of flash used"
-msgstr "El flash disparó."
+msgid "Flash Exposure Indicator Next"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
+msgstr ""
+
+#: src/minoltamn.cpp:1559
 #, fuzzy
-msgid "AF Info"
-msgstr "Modo de exposición"
+msgid "Flash Exposure Indicator Last"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
+msgstr ""
+
+#: src/minoltamn.cpp:1565
 #, fuzzy
-msgid "AF info"
+msgid "Focus Mode Switch"
 msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
+#: src/minoltamn.cpp:1566
 #, fuzzy
-msgid "Shooting Mode"
-msgstr "Modo de métrica"
+msgid "Focus mode switch"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
 #, fuzzy
-msgid "Shooting mode"
-msgstr "Modo de métrica"
+msgid "Flash Type"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:556
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
 #, fuzzy
-msgid "Auto Bracket Release"
-msgstr "Auto bracket"
+msgid "Flash type"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:556
-#, fuzzy
-msgid "Auto bracket release"
-msgstr "Auto bracket"
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
+msgid "AE Lock"
+msgstr ""
 
-#: src/nikonmn.cpp:557
-#, fuzzy
-msgid "Lens FStops"
-msgstr "Espacio de color"
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
+msgstr ""
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
+msgstr "Nivel de la batería"
+
+#: src/minoltamn.cpp:1584
 #, fuzzy
-msgid "Contrast Curve"
-msgstr "Contraste"
+msgid "Battery level"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1588
 #, fuzzy
-msgid "Contrast curve"
+msgid "Unknown Sony Camera Settings A100 tag"
 msgstr "Contraste"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
 #, fuzzy
-msgid "Color Hue"
-msgstr "Espacio de color"
+msgid "Clear"
+msgstr "Centímetro"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
 #, fuzzy
-msgid "Color hue"
-msgstr "Espacio de color"
+msgid "Deep"
+msgstr "Centímetro"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
 #, fuzzy
-msgid "Scene Mode"
-msgstr "Tipo de escena"
+msgid "Light"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
+#: src/minoltamn.cpp:1897
 #, fuzzy
-msgid "Scene mode"
-msgstr "Tipo de escena"
+msgid "Night View"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
-msgstr "Fuente de luz"
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
+msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
+#: src/minoltamn.cpp:1937
 #, fuzzy
-msgid "Light source"
-msgstr "Fuente de luz"
+msgid "Local"
+msgstr "Ubicación del sujeto"
 
-#: src/nikonmn.cpp:562
+#: src/minoltamn.cpp:1952
 #, fuzzy
-msgid "Shot info"
-msgstr "Modo de exposición"
+msgid "Top-Right"
+msgstr "Copyright"
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
+#: src/minoltamn.cpp:1954
 #, fuzzy
-msgid "Hue Adjustment"
-msgstr "Longitud de la imagen"
+msgid "Bottom-Right"
+msgstr "abajo - derecha"
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
+#: src/minoltamn.cpp:1956
 #, fuzzy
-msgid "Hue adjustment"
-msgstr "Longitud de la imagen"
+msgid "Bottom-Left"
+msgstr "abajo - izquierda"
 
-#: src/nikonmn.cpp:564
+#: src/minoltamn.cpp:1958
 #, fuzzy
-msgid "NEF Compression"
-msgstr "Compresión"
+msgid "Top-Left"
+msgstr "arriba - izquierda"
 
-#: src/nikonmn.cpp:564
+#: src/minoltamn.cpp:1959
 #, fuzzy
-msgid "NEF compression"
-msgstr "compresión JPEG"
+msgid "Far-Right"
+msgstr "Copyright"
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
+#: src/minoltamn.cpp:1960
 #, fuzzy
-msgid "Linearization Table"
-msgstr "Fecha y hora"
+msgid "Far-Left"
+msgstr "arriba - izquierda"
 
-#: src/nikonmn.cpp:567
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
 #, fuzzy
-msgid "Linearization table"
-msgstr "Fecha y hora"
+msgid "Advanced Auto"
+msgstr "Función de transferencia"
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1975
 #, fuzzy
-msgid "Color Balance"
-msgstr "Espacio de color"
+msgid "Advanced Level"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:568
-#, fuzzy
-msgid "Color balance"
-msgstr "Espacio de color"
+#: src/minoltamn.cpp:1988
+msgid "AF"
+msgstr ""
 
-#: src/nikonmn.cpp:569
+#: src/minoltamn.cpp:1989
 #, fuzzy
-msgid "Lens Data"
-msgstr "Ancho de la imagen"
+msgid "Release"
+msgstr "No definido"
 
-#: src/nikonmn.cpp:569
-#, fuzzy
-msgid "Lens data settings"
-msgstr "Contraste"
+#: src/minoltamn.cpp:2001
+msgid "RAW "
+msgstr ""
 
-#: src/nikonmn.cpp:570
-#, fuzzy
-msgid "Raw Image Center"
-msgstr "Longitud de la imagen"
+#: src/minoltamn.cpp:2002
+msgid "CRAW "
+msgstr ""
 
-#: src/nikonmn.cpp:570
-#, fuzzy
-msgid "Raw image center"
-msgstr "Longitud de la imagen"
+#: src/minoltamn.cpp:2005
+msgid "RAW+JPEG"
+msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
+#: src/minoltamn.cpp:2006
+msgid "CRAW+JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:2063
 #, fuzzy
-msgid "Scene Assist"
-msgstr "centrado"
+msgid "Compressed Raw"
+msgstr "Compresión"
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:2064
 #, fuzzy
-msgid "Scene assist"
-msgstr "centrado"
+msgid "Compressed Raw + JPEG"
+msgstr "Bits comprimidos por pixel"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch History"
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:576
-#, fuzzy
-msgid "Serial NO"
-msgstr "El número F."
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
+msgstr ""
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:577
+#: src/minoltamn.cpp:2110
 #, fuzzy
-msgid "Image Data Size"
-msgstr "Ancho de la imagen"
+msgid "ISO Setting Used"
+msgstr "Velocidad ISO"
 
-#: src/nikonmn.cpp:577
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
 #, fuzzy
-msgid "Image data size"
-msgstr "Ancho de la imagen"
+msgid "High Key"
+msgstr "Luz de día"
 
-#: src/nikonmn.cpp:579
-#, fuzzy
-msgid "Image Count"
-msgstr "Ancho de la imagen"
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
+msgstr ""
 
-#: src/nikonmn.cpp:579
+#: src/nikonmn.cpp:80
 #, fuzzy
-msgid "Image count"
-msgstr "Ancho de la imagen"
+msgid "Extra High"
+msgstr "arriba - derecha"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
 #, fuzzy
-msgid "Deleted Image Count"
-msgstr "Longitud de la imagen"
+msgid "Single area"
+msgstr "Nombre del documento"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
 #, fuzzy
-msgid "Deleted image count"
-msgstr "Longitud de la imagen"
+msgid "Dynamic area"
+msgstr "formato planar"
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
-#, fuzzy
-msgid "Shutter Count"
-msgstr "obturador"
+#: src/nikonmn.cpp:88
+msgid "Dynamic area, closest subject"
+msgstr ""
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
+#: src/nikonmn.cpp:89
+msgid "Group dynamic"
 msgstr ""
 
-#: src/nikonmn.cpp:582
-#, fuzzy
-msgid "Flash info"
-msgstr "Flash"
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
+msgstr ""
 
-#: src/nikonmn.cpp:583
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
 #, fuzzy
-msgid "Image Optimization"
-msgstr "Orientación"
+msgid "Dynamic area (wide)"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:583
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
 #, fuzzy
-msgid "Image optimization"
-msgstr "Orientación"
+msgid "Upper-left"
+msgstr "arriba - izquierda"
 
-#: src/nikonmn.cpp:585
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
 #, fuzzy
-msgid "Program Variation"
-msgstr "Versión Exif"
+msgid "Upper-right"
+msgstr "arriba - derecha"
 
-#: src/nikonmn.cpp:585
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
 #, fuzzy
-msgid "Program variation"
-msgstr "Versión Exif"
+msgid "Lower-left"
+msgstr "arriba - izquierda"
 
-#: src/nikonmn.cpp:587
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
 #, fuzzy
-msgid "AF Response"
-msgstr "Punto blanco"
+msgid "Lower-right"
+msgstr "Copyright"
 
-#: src/nikonmn.cpp:587
+#: src/nikonmn.cpp:108
 #, fuzzy
-msgid "AF response"
-msgstr "Punto blanco"
+msgid "Left-most"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:588
+#: src/nikonmn.cpp:109
 #, fuzzy
-msgid "Multi exposure"
-msgstr "Modo de exposición"
+msgid "Right-most"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:589
+#: src/nikonmn.cpp:143
 #, fuzzy
-msgid "High ISO Noise Reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "Fire, manual"
+msgstr "manual"
 
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
+#: src/nikonmn.cpp:144
 #, fuzzy
-msgid "Toning effect"
-msgstr "Espacio de color"
+msgid "Fire, external"
+msgstr "Tiempo bueno"
 
-#: src/nikonmn.cpp:591
+#: src/nikonmn.cpp:145
 #, fuzzy
-msgid "AF info 2"
-msgstr "Modo de exposición"
+msgid "Fire, commander mode"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:592
+#: src/nikonmn.cpp:146
 #, fuzzy
-msgid "File info"
-msgstr "Nombre del documento"
+msgid "Fire, TTL mode"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:595
-#, fuzzy
-msgid "Capture Data"
-msgstr "Tipo de captura de escena"
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
+msgid "Delay"
+msgstr ""
 
-#: src/nikonmn.cpp:595
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
 #, fuzzy
-msgid "Capture data"
-msgstr "Otro"
+msgid "PC control"
+msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:596
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
 #, fuzzy
-msgid "Capture Version"
-msgstr "Versión Exif"
-
-#: src/nikonmn.cpp:596
-#, fuzzy
-msgid "Capture version"
-msgstr "Versión Exif"
+msgid "Exposure bracketing"
+msgstr "Ajuste de exposición"
 
-#: src/nikonmn.cpp:598
+#: src/nikonmn.cpp:155
 #, fuzzy
-msgid "Capture Offsets"
-msgstr "Desplazamiento de tira"
+msgid "Auto ISO"
+msgstr "acción"
 
-#: src/nikonmn.cpp:598
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
 #, fuzzy
-msgid "Capture offsets"
-msgstr "Desplazamiento de tira"
+msgid "IR control"
+msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:599
-msgid "Scan IFD"
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
 msgstr ""
 
-#: src/nikonmn.cpp:600
+#: src/nikonmn.cpp:174
 #, fuzzy
-msgid "ICC profile"
-msgstr "Espacio de color"
+msgid "Auto release"
+msgstr "Auto bracket"
 
-#: src/nikonmn.cpp:601
+#: src/nikonmn.cpp:175
 #, fuzzy
-msgid "Capture output"
-msgstr "Tipo de captura de escena"
+msgid "Manual release"
+msgstr "Exposición manual"
 
-#: src/nikonmn.cpp:603
+#: src/nikonmn.cpp:180
 #, fuzzy
-msgid "Unknown Nikon3MakerNote tag"
-msgstr "Versión Exif"
+msgid "Lossy (type 1)"
+msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+msgid "Uncompressed"
+msgstr "Descomprimido"
+
+#: src/nikonmn.cpp:182
+msgid "Lossless"
 msgstr ""
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
+#: src/nikonmn.cpp:183
 #, fuzzy
-msgid "Yes"
-msgstr "sí"
-
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
-msgstr ""
+msgid "Lossy (type 2)"
+msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
+#: src/nikonmn.cpp:189
+msgid "B & W"
 msgstr ""
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
+#: src/nikonmn.cpp:191
+msgid "Trim"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
+#: src/nikonmn.cpp:192
 #, fuzzy
-msgid "Vibration Reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "Small picture"
+msgstr "Modelo"
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
+#: src/nikonmn.cpp:193
 #, fuzzy
-msgid "Vibration reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "D-Lighting"
+msgstr "Luz de día"
 
-#: src/nikonmn.cpp:635
+#: src/nikonmn.cpp:194
 #, fuzzy
-msgid "Unknown Nikon Vibration Reduction Tag"
-msgstr "Versión Exif"
+msgid "Red eye"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:645
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
 #, fuzzy
-msgid "Default Settings"
-msgstr "Contraste"
+msgid "Cyanotype"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
+#: src/nikonmn.cpp:196
 #, fuzzy
-msgid "Quick Adjust"
-msgstr "Longitud de la imagen"
+msgid "Sky light"
+msgstr "Luz de día"
 
-#: src/nikonmn.cpp:647
+#: src/nikonmn.cpp:197
 #, fuzzy
-msgid "Full Control"
+msgid "Warm tone"
 msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:668
-msgid "Blue-green"
-msgstr ""
-
-#: src/nikonmn.cpp:670
-msgid "Purple-blue"
-msgstr ""
-
-#: src/nikonmn.cpp:671
-msgid "Red-purple"
-msgstr ""
-
-#: src/nikonmn.cpp:678
+#: src/nikonmn.cpp:198
 #, fuzzy
-msgid "Name"
-msgstr "Nombre del documento"
+msgid "Color custom"
+msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:679
-msgid "Base"
-msgstr ""
+#: src/nikonmn.cpp:199
+#, fuzzy
+msgid "Image overlay"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:680
+#: src/nikonmn.cpp:205
 #, fuzzy
-msgid "Adjust"
-msgstr "Longitud de la imagen"
+msgid "Minimal"
+msgstr "Manual"
 
-#: src/nikonmn.cpp:681
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
 #, fuzzy
-msgid "Quick adjust"
-msgstr "Longitud de la imagen"
+msgid "Nikon Makernote version"
+msgstr "Versión Exif"
 
-#: src/nikonmn.cpp:687
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
 #, fuzzy
-msgid "Filter effect"
-msgstr "Espacio de color"
+msgid "ISO Speed"
+msgstr "Velocidad ISO"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
 #, fuzzy
-msgid "Toning Saturation"
-msgstr "Saturación"
+msgid "Sharpening"
+msgstr "Nitidez"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
 #, fuzzy
-msgid "Toning saturation"
-msgstr "Saturación"
+msgid "Image sharpening setting"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:691
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
 #, fuzzy
-msgid "Unknown Nikon Picture Control Tag"
-msgstr "Desconocido"
+msgid "Focus"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:701
-msgid "Timezone"
-msgstr ""
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
+#, fuzzy
+msgid "Flash Setting"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:702
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
 #, fuzzy
-msgid "Daylight Savings"
-msgstr "Luz de día"
+msgid "Flash setting"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:702
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
 #, fuzzy
-msgid "Daylight savings"
-msgstr "Luz de día"
+msgid "ISO Selection"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/nikonmn.cpp:703
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
 #, fuzzy
-msgid "Date Display Format"
-msgstr "Fuente de archivo"
+msgid "ISO selection"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/nikonmn.cpp:703
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
 #, fuzzy
-msgid "Date display format"
+msgid "Data Dump"
 msgstr "formato planar"
 
-#: src/nikonmn.cpp:705
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
 #, fuzzy
-msgid "Unknown Nikon World Time Tag"
-msgstr "Versión Exif"
-
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
-msgstr ""
-
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
-msgstr ""
-
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
-msgstr ""
-
-#: src/nikonmn.cpp:719
-msgid "Hi 1.0"
-msgstr ""
-
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
-msgstr ""
-
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
-msgstr ""
-
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
-msgstr ""
+msgid "Data dump"
+msgstr "formato planar"
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
-msgstr ""
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+#, fuzzy
+msgid "Image Adjustment"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
-msgstr ""
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+#, fuzzy
+msgid "Image adjustment setting"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
-msgstr ""
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+#, fuzzy
+msgid "Auxiliary Lens"
+msgstr "Sensor tri-lineal"
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
-msgstr ""
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+#, fuzzy
+msgid "Auxiliary lens (adapter)"
+msgstr "Sensor tri-lineal"
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
-msgstr ""
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
+#, fuzzy
+msgid "Manual focus distance"
+msgstr "Balance de blanco manual"
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
 #, fuzzy
-msgid "ISO Expansion"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "Digital zoom setting"
+msgstr "Relación de zoom digital"
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:258
 #, fuzzy
-msgid "ISO expansion"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "AF Focus Position"
+msgstr "Posicionamiento YCbCr"
 
-#: src/nikonmn.cpp:734
+#: src/nikonmn.cpp:259
 #, fuzzy
-msgid "ISO 2"
-msgstr "Modo de exposición"
+msgid "AF focus position information"
+msgstr "Posicionamiento YCbCr"
 
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
-msgstr ""
+#: src/nikonmn.cpp:263
+#, fuzzy
+msgid "Unknown Nikon1MakerNote tag"
+msgstr "Versión Exif"
 
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+msgid "Continuous autofocus"
 msgstr ""
 
-#: src/nikonmn.cpp:737
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
 #, fuzzy
-msgid "Unknown Nikon Iso Info Tag"
-msgstr "Desconocido"
+msgid "Single autofocus"
+msgstr "Exposición automática"
 
-#: src/nikonmn.cpp:747
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
 #, fuzzy
-msgid "Single Area"
-msgstr "Nombre del documento"
+msgid "Not used"
+msgstr "No definido"
 
-#: src/nikonmn.cpp:748
+#: src/nikonmn.cpp:365
 #, fuzzy
-msgid "Dynamic Area"
-msgstr "formato planar"
-
-#: src/nikonmn.cpp:749
-msgid "Dynamic Area, Closest Subject"
-msgstr ""
+msgid "guess"
+msgstr "Fuente de archivo"
 
-#: src/nikonmn.cpp:750
-msgid "Group Dynamic"
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
 msgstr ""
 
-#: src/nikonmn.cpp:751
+#: src/nikonmn.cpp:413
 #, fuzzy
-msgid "Single Area (wide)"
-msgstr "Nombre del documento"
+msgid "VGA Normal"
+msgstr "Normal"
 
-#: src/nikonmn.cpp:752
+#: src/nikonmn.cpp:414
 #, fuzzy
-msgid "Dynamic Area (wide)"
-msgstr "Balance de blanco"
+msgid "VGA Fine"
+msgstr "pulg"
 
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
+#: src/nikonmn.cpp:415
 #, fuzzy
-msgid "Mid-left"
-msgstr "abajo - izquierda"
+msgid "SXGA Basic"
+msgstr "pulg"
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
+#: src/nikonmn.cpp:416
 #, fuzzy
-msgid "Mid-right"
-msgstr "Copyright"
+msgid "SXGA Normal"
+msgstr "Normal"
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
+#: src/nikonmn.cpp:417
 #, fuzzy
-msgid "Far Left"
-msgstr "arriba - izquierda"
+msgid "SXGA Fine"
+msgstr "pulg"
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
+#: src/nikonmn.cpp:429
 #, fuzzy
-msgid "Far Right"
+msgid "Bright+"
 msgstr "Copyright"
 
-#: src/nikonmn.cpp:787
-#, fuzzy
-msgid "AF Area Mode"
-msgstr "Modo de exposición"
-
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:430
 #, fuzzy
-msgid "AF area mode"
-msgstr "Flash"
+msgid "Bright-"
+msgstr "Copyright"
 
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
+#: src/nikonmn.cpp:431
 #, fuzzy
-msgid "AF point"
-msgstr "Punto blanco"
+msgid "Contrast+"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:432
 #, fuzzy
-msgid "AF Points In Focus"
-msgstr "Punto blanco"
+msgid "Contrast-"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:451
 #, fuzzy
-msgid "AF points in focus"
-msgstr "Punto blanco"
+msgid "Speedlight"
+msgstr "Luz de día"
 
-#: src/nikonmn.cpp:791
+#: src/nikonmn.cpp:491
 #, fuzzy
-msgid "Unknown Nikon Auto Focus Tag"
+msgid "Unknown Nikon2MakerNote tag"
 msgstr "Versión Exif"
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
-#, fuzzy
-msgid "Shutter count"
-msgstr "obturador"
-
-#: src/nikonmn.cpp:804
-#, fuzzy
-msgid "Unknown Nikon Shot Info D80 Tag"
-msgstr "Desconocido"
-
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
 #, fuzzy
-msgid "Flash Level"
+msgid "Flash Device"
 msgstr "Flash"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
 #, fuzzy
-msgid "Flash level"
+msgid "Flash device"
 msgstr "Flash"
 
-#: src/nikonmn.cpp:818
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
 #, fuzzy
-msgid "Unknown Nikon Shot Info D40 Tag"
-msgstr "Desconocido"
+msgid "White Balance Bias"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
 #, fuzzy
-msgid "0"
-msgstr "D75"
-
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
-msgid "+1"
-msgstr ""
-
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
-msgid "+2"
-msgstr ""
-
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
-msgid "+4"
-msgstr ""
-
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
-msgid "+8"
-msgstr ""
-
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
-msgid "+16"
-msgstr ""
+msgid "White balance bias"
+msgstr "Balance de blanco"
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
-msgid "-16"
-msgstr ""
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB Levels"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
 #, fuzzy
-msgid "-8"
-msgstr "-"
+msgid "WB RB levels"
+msgstr "Nivel de la batería"
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
+#: src/nikonmn.cpp:536
 #, fuzzy
-msgid "-4"
-msgstr "-"
+msgid "Program Shift"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
+#: src/nikonmn.cpp:536
 #, fuzzy
-msgid "-2"
-msgstr "-"
+msgid "Program shift"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
+#: src/nikonmn.cpp:537
 #, fuzzy
-msgid "-1"
-msgstr "-"
+msgid "Exposure Difference"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
-msgid "+17"
-msgstr ""
+#: src/nikonmn.cpp:537
+#, fuzzy
+msgid "Exposure difference"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
-msgid "-17"
-msgstr ""
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+#, fuzzy
+msgid "Pointer to a preview image"
+msgstr "Orientación"
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
-msgid "+9"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+msgid "Offset to an IFD containing a preview image"
 msgstr ""
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
-msgid "+18"
-msgstr ""
+#: src/nikonmn.cpp:541
+#, fuzzy
+msgid "Flash Comp"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
-msgid "-18"
-msgstr ""
+#: src/nikonmn.cpp:541
+#, fuzzy
+msgid "Flash compensation setting"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
+#: src/nikonmn.cpp:543
 #, fuzzy
-msgid "-9"
-msgstr "-"
+msgid "Image Boundary"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
-msgid "+19"
-msgstr ""
+#: src/nikonmn.cpp:543
+#, fuzzy
+msgid "Image boundary"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
-msgid "-19"
-msgstr ""
+#: src/nikonmn.cpp:544
+#, fuzzy
+msgid "Flash exposure comp"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
-msgid "+5"
-msgstr ""
+#: src/nikonmn.cpp:545
+#, fuzzy
+msgid "Flash Bracket Comp"
+msgstr "El flash disparó."
 
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
-msgid "+10"
-msgstr ""
+#: src/nikonmn.cpp:545
+#, fuzzy
+msgid "Flash bracket compensation applied"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
+#: src/nikonmn.cpp:546
 #, fuzzy
-msgid "+20"
-msgstr "D75"
+msgid "Exposure Bracket Comp"
+msgstr "Ajuste de exposición"
 
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
+#: src/nikonmn.cpp:546
 #, fuzzy
-msgid "-20"
-msgstr "D75"
+msgid "AE bracket compensation applied"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
-msgid "-10"
-msgstr ""
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
+#, fuzzy
+msgid "Image Processing"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
 #, fuzzy
-msgid "-5"
-msgstr "-"
+msgid "Image processing"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
-msgid "+11"
-msgstr ""
+#: src/nikonmn.cpp:548
+#, fuzzy
+msgid "Crop High Speed"
+msgstr "Escena nocturna"
 
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
-msgid "-11"
-msgstr ""
+#: src/nikonmn.cpp:548
+#, fuzzy
+msgid "Crop high speed"
+msgstr "Copyright"
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
-msgid "+3"
-msgstr ""
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure Tuning"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
-msgid "+6"
-msgstr ""
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure tuning"
+msgstr "Índice de exposición"
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
-msgid "+12"
-msgstr ""
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR Info"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
-msgid "-12"
-msgstr ""
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR info"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
+#: src/nikonmn.cpp:553
 #, fuzzy
-msgid "-6"
-msgstr "-"
+msgid "Image Authentication"
+msgstr "Orientación"
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
+#: src/nikonmn.cpp:553
 #, fuzzy
-msgid "-3"
-msgstr "-"
+msgid "Image authentication"
+msgstr "Orientación"
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
-msgid "+13"
-msgstr ""
+#: src/nikonmn.cpp:554
+#, fuzzy
+msgid "ActiveD-Lighting"
+msgstr "Luz de día"
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
-msgid "-13"
-msgstr ""
+#: src/nikonmn.cpp:554
+#, fuzzy
+msgid "ActiveD-lighting"
+msgstr "Luz de día"
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
-msgid "+7"
-msgstr ""
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid "Picture Control"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
-msgid "+14"
-msgstr ""
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid " Picture control"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
-msgid "-14"
-msgstr ""
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World Time"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
+#: src/nikonmn.cpp:556
 #, fuzzy
-msgid "-7"
-msgstr "-"
+msgid "World time"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
-msgid "+15"
-msgstr ""
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO Info"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
-msgid "-15"
-msgstr ""
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO info"
+msgstr "Velocidad ISO"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:558
 #, fuzzy
-msgid "AF Fine Tune Adj"
+msgid "Vignette Control"
 msgstr "Punto blanco"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:558
 #, fuzzy
-msgid "AF fine tune adj"
+msgid "Vignette control"
 msgstr "Punto blanco"
 
-#: src/nikonmn.cpp:878
+#: src/nikonmn.cpp:560
 #, fuzzy
-msgid "Unknown Nikon Shot Info D300 (a) Tag"
-msgstr "Desconocido"
+msgid "Tone Compensation"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:938
+#: src/nikonmn.cpp:560
 #, fuzzy
-msgid "Unknown Nikon Shot Info D300 (b) Tag"
-msgstr "Desconocido"
+msgid "Tone compensation"
+msgstr "Tiempo de exposición"
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
-msgstr ""
-
-#: src/nikonmn.cpp:950
-msgid "On (2)"
-msgstr ""
-
-#: src/nikonmn.cpp:951
-msgid "On (3)"
-msgstr ""
-
-#: src/nikonmn.cpp:964
-#, fuzzy
-msgid "Shutter Count 1"
-msgstr "obturador"
-
-#: src/nikonmn.cpp:964
-#, fuzzy
-msgid "Shutter count 1"
-msgstr "obturador"
-
-#: src/nikonmn.cpp:968
-#, fuzzy
-msgid "Shutter Count 2"
-msgstr "obturador"
-
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:566
 #, fuzzy
-msgid "Shutter count 2"
-msgstr "obturador"
-
-#: src/nikonmn.cpp:969
-#, fuzzy
-msgid "Vibration Reduction 2"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "Mode of flash used"
+msgstr "El flash disparó."
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
 #, fuzzy
-msgid "Vibration reduction 2"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgid "Shooting Mode"
+msgstr "Modo de métrica"
 
-#: src/nikonmn.cpp:973
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
 #, fuzzy
-msgid "Unknown Nikon Shot Info Tag"
-msgstr "Desconocido"
+msgid "Shooting mode"
+msgstr "Modo de métrica"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:569
 #, fuzzy
-msgid "WB RBGG Levels"
-msgstr "Nivel de la batería"
+msgid "Auto Bracket Release"
+msgstr "Auto bracket"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:569
 #, fuzzy
-msgid "WB RBGG levels"
-msgstr "Nivel de la batería"
+msgid "Auto bracket release"
+msgstr "Auto bracket"
 
-#: src/nikonmn.cpp:986
+#: src/nikonmn.cpp:570
 #, fuzzy
-msgid "Unknown Nikon Color Balance 1 Tag"
+msgid "Lens FStops"
 msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:571
 #, fuzzy
-msgid "WB RGGB Levels"
-msgstr "Nivel de la batería"
+msgid "Contrast Curve"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:571
 #, fuzzy
-msgid "WB RGGB levels"
-msgstr "Nivel de la batería"
+msgid "Contrast curve"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:999
+#: src/nikonmn.cpp:572
 #, fuzzy
-msgid "Unknown Nikon Color Balance 2 Tag"
+msgid "Color Hue"
 msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:1012
+#: src/nikonmn.cpp:572
 #, fuzzy
-msgid "Unknown Nikon Color Balance 2a Tag"
+msgid "Color hue"
 msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:1025
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
 #, fuzzy
-msgid "Unknown Nikon Color Balance 2b Tag"
-msgstr "Espacio de color"
+msgid "Scene mode"
+msgstr "Tipo de escena"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
+msgid "Light Source"
+msgstr "Fuente de luz"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
 #, fuzzy
-msgid "WB RGBG Levels"
-msgstr "Nivel de la batería"
+msgid "Light source"
+msgstr "Fuente de luz"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:575
 #, fuzzy
-msgid "WB RGBG levels"
-msgstr "Nivel de la batería"
+msgid "Shot info"
+msgstr "Modo de exposición"
 
-#: src/nikonmn.cpp:1038
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
 #, fuzzy
-msgid "Unknown Nikon Color Balance 3 Tag"
-msgstr "Desconocido"
+msgid "Hue Adjustment"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
 #, fuzzy
-msgid "WB GRBG Levels"
-msgstr "Nivel de la batería"
+msgid "Hue adjustment"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:577
 #, fuzzy
-msgid "WB GRBG levels"
-msgstr "Nivel de la batería"
+msgid "NEF Compression"
+msgstr "Compresión"
 
-#: src/nikonmn.cpp:1051
+#: src/nikonmn.cpp:577
 #, fuzzy
-msgid "Unknown Nikon Color Balance 4 Tag"
-msgstr "Desconocido"
+msgid "NEF compression"
+msgstr "compresión JPEG"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:580 src/tags.cpp:903
 #, fuzzy
-msgid "Lens ID Number"
-msgstr "El número F."
+msgid "Linearization Table"
+msgstr "Fecha y hora"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:580
 #, fuzzy
-msgid "Lens ID number"
-msgstr "El número F."
+msgid "Linearization table"
+msgstr "Fecha y hora"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:581
 #, fuzzy
-msgid "Lens F-Stops"
+msgid "Color Balance"
 msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:581
 #, fuzzy
-msgid "Lens F-stops"
+msgid "Color balance"
 msgstr "Espacio de color"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:582
 #, fuzzy
-msgid "Min Focal Length"
-msgstr "Distancia focal"
+msgid "Lens Data"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:582
 #, fuzzy
-msgid "Min focal length"
-msgstr "Distancia focal"
+msgid "Lens data settings"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:583
 #, fuzzy
-msgid "Max Focal Length"
-msgstr "Distancia focal"
+msgid "Raw Image Center"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:583
 #, fuzzy
-msgid "Max focal length"
-msgstr "Distancia focal"
+msgid "Raw image center"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
+#: src/nikonmn.cpp:584
 #, fuzzy
-msgid "Max Aperture At Min Focal"
-msgstr "apertura"
+msgid "Sensor Pixel Size"
+msgstr "Copyright"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
+#: src/nikonmn.cpp:584
 #, fuzzy
-msgid "Max aperture at min focal"
-msgstr "apertura"
+msgid "Sensor pixel size"
+msgstr "Copyright"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
+#: src/nikonmn.cpp:586
 #, fuzzy
-msgid "Max Aperture At Max Focal"
-msgstr "apertura"
+msgid "Scene Assist"
+msgstr "centrado"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
+#: src/nikonmn.cpp:586
 #, fuzzy
-msgid "Max aperture at max focal"
-msgstr "apertura"
+msgid "Scene assist"
+msgstr "centrado"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:587
 #, fuzzy
-msgid "MCU Version"
-msgstr "Versión Exif"
+msgid "Retouch History"
+msgstr "Longitud de la imagen"
+
+#: src/nikonmn.cpp:587
+msgid "Retouch history"
+msgstr ""
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:589
 #, fuzzy
-msgid "MCU version"
-msgstr "Versión Exif"
+msgid "Serial NO"
+msgstr "El número F."
+
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
+msgstr ""
 
-#: src/nikonmn.cpp:1070
+#: src/nikonmn.cpp:590
 #, fuzzy
-msgid "Unknown Nikon Lens Data 1 Tag"
-msgstr "Versión Exif"
+msgid "Image Data Size"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
+#: src/nikonmn.cpp:590
 #, fuzzy
-msgid "Exit Pupil Position"
-msgstr "Posicionamiento YCbCr"
+msgid "Image data size"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-msgid "Exit pupil position"
-msgstr ""
+#: src/nikonmn.cpp:592
+#, fuzzy
+msgid "Image Count"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:592
 #, fuzzy
-msgid "AF Aperture"
-msgstr "Apertura"
+msgid "Image count"
+msgstr "Ancho de la imagen"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
 #, fuzzy
-msgid "AF aperture"
-msgstr "Apertura"
+msgid "Deleted Image Count"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
 #, fuzzy
-msgid "Effective Max Aperture"
-msgstr "Apertura"
+msgid "Deleted image count"
+msgstr "Longitud de la imagen"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
 #, fuzzy
-msgid "Effective max aperture"
-msgstr "apertura"
+msgid "Shutter Count"
+msgstr "obturador"
+
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
+msgstr ""
 
-#: src/nikonmn.cpp:1095
+#: src/nikonmn.cpp:595
 #, fuzzy
-msgid "Unknown Nikon Lens Data 2 Tag"
-msgstr "Versión Exif"
+msgid "Flash info"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:596
 #, fuzzy
-msgid "Max aperture at min focal length"
-msgstr "apertura"
+msgid "Image Optimization"
+msgstr "Orientación"
 
-#: src/nikonmn.cpp:1116
+#: src/nikonmn.cpp:596
 #, fuzzy
-msgid "Max aperture at max focal length"
-msgstr "apertura"
+msgid "Image optimization"
+msgstr "Orientación"
 
-#: src/nikonmn.cpp:1120
+#: src/nikonmn.cpp:598
 #, fuzzy
-msgid "Unknown Nikon Lens Data 3 Tag"
+msgid "Program Variation"
 msgstr "Versión Exif"
 
-#: src/nikonmn.cpp:1299
-msgid "Closest subject"
-msgstr ""
-
-#: src/nikonmn.cpp:1300
-msgid "Group dynamic-AF"
-msgstr ""
-
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
-msgid "none"
-msgstr ""
+#: src/nikonmn.cpp:598
+#, fuzzy
+msgid "Program variation"
+msgstr "Versión Exif"
 
-#: src/nikonmn.cpp:1333
+#: src/nikonmn.cpp:600
 #, fuzzy
-msgid "used"
-msgstr "No definido"
+msgid "AF Response"
+msgstr "Punto blanco"
 
-#: src/nikonmn.cpp:1359
+#: src/nikonmn.cpp:600
 #, fuzzy
-msgid "All 11 Points"
+msgid "AF response"
 msgstr "Punto blanco"
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
+#: src/nikonmn.cpp:601
 #, fuzzy
-msgid "Single-frame"
-msgstr "Nombre del documento"
+msgid "Multi exposure"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:68
+#: src/nikonmn.cpp:602
 #, fuzzy
-msgid "Standard Quality (SQ)"
-msgstr "Luz estándar A"
+msgid "High ISO Noise Reduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:69
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
 #, fuzzy
-msgid "High Quality (HQ)"
-msgstr "Ancho de la imagen"
-
-#: src/olympusmn.cpp:70
-msgid "Super High Quality (SHQ)"
-msgstr ""
+msgid "Toning effect"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:85
-msgid "On (preset)"
-msgstr ""
+#: src/nikonmn.cpp:604
+#, fuzzy
+msgid "AF info 2"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:91
+#: src/nikonmn.cpp:605
 #, fuzzy
-msgid "Internal"
-msgstr "Centímetro"
+msgid "File info"
+msgstr "Nombre del documento"
 
-#: src/olympusmn.cpp:93
+#: src/nikonmn.cpp:608
 #, fuzzy
-msgid "Internal + External"
-msgstr "El número F."
+msgid "Capture Data"
+msgstr "Tipo de captura de escena"
 
-#: src/olympusmn.cpp:118
+#: src/nikonmn.cpp:608
 #, fuzzy
-msgid "Interlaced"
-msgstr "centrado"
+msgid "Capture data"
+msgstr "Otro"
 
-#: src/olympusmn.cpp:119
+#: src/nikonmn.cpp:609
 #, fuzzy
-msgid "Progressive"
+msgid "Capture Version"
 msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:127
+#: src/nikonmn.cpp:609
 #, fuzzy
-msgid "Thumbnail Image"
-msgstr "Desplazamiento de tira"
+msgid "Capture version"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:128
+#: src/nikonmn.cpp:611
 #, fuzzy
-msgid "Thumbnail image"
+msgid "Capture Offsets"
 msgstr "Desplazamiento de tira"
 
-#: src/olympusmn.cpp:131
-#, fuzzy
-msgid "Special Mode"
-msgstr "Modo de métrica"
-
-#: src/olympusmn.cpp:132
+#: src/nikonmn.cpp:611
 #, fuzzy
-msgid "Picture taking mode"
-msgstr "Modo de exposición"
-
-#: src/olympusmn.cpp:140
-msgid "Black & White Mode"
-msgstr ""
+msgid "Capture offsets"
+msgstr "Desplazamiento de tira"
 
-#: src/olympusmn.cpp:141
-msgid "Black and white mode"
+#: src/nikonmn.cpp:612
+msgid "Scan IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:144
+#: src/nikonmn.cpp:613
 #, fuzzy
-msgid "Digital zoom ratio"
-msgstr "Relación de zoom digital"
+msgid "ICC profile"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
+#: src/nikonmn.cpp:614
 #, fuzzy
-msgid "Focal Plane Diagonal"
-msgstr "Resolución Y del plano focal"
+msgid "Capture output"
+msgstr "Tipo de captura de escena"
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
+#: src/nikonmn.cpp:616
 #, fuzzy
-msgid "Focal plane diagonal"
-msgstr "Resolución Y del plano focal"
-
-#: src/olympusmn.cpp:149
-msgid "Lens Distortion Parameters"
-msgstr ""
+msgid "Unknown Nikon3MakerNote tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:150
-msgid "Lens distortion parameters"
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+msgid "No"
 msgstr ""
 
-#: src/olympusmn.cpp:153
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
 #, fuzzy
-msgid "Software firmware version"
-msgstr "Versión Exif"
+msgid "Yes"
+msgstr "sí"
 
-#: src/olympusmn.cpp:156
-msgid "ASCII format data such as [PictureInfo]"
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
 msgstr ""
 
-#: src/olympusmn.cpp:158
-msgid "Camera ID"
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
 msgstr ""
 
-#: src/olympusmn.cpp:159
-msgid "Camera ID data"
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
 msgstr ""
 
-#: src/olympusmn.cpp:178
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
 #, fuzzy
-msgid "Pre Capture Frames"
-msgstr "Tipo de captura de escena"
-
-#: src/olympusmn.cpp:179
-msgid "Pre-capture frames"
-msgstr ""
-
-#: src/olympusmn.cpp:184
-msgid "One Touch WB"
-msgstr ""
+msgid "Vibration Reduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:185
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
 #, fuzzy
-msgid "One touch white balance"
-msgstr "Balance de blanco automático"
+msgid "Vibration reduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
+#: src/nikonmn.cpp:648
 #, fuzzy
-msgid "Serial number"
-msgstr "El número F."
+msgid "Unknown Nikon Vibration Reduction Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:199
+#: src/nikonmn.cpp:658
 #, fuzzy
-msgid "Data Dump 1"
-msgstr "formato planar"
+msgid "Default Settings"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:200
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
 #, fuzzy
-msgid "Various camera settings 1"
-msgstr "Contraste"
+msgid "Quick Adjust"
+msgstr "Longitud de la imagen"
 
-#: src/olympusmn.cpp:202
+#: src/nikonmn.cpp:660
 #, fuzzy
-msgid "Data Dump 2"
-msgstr "formato planar"
+msgid "Full Control"
+msgstr "Espacio de color"
+
+#: src/nikonmn.cpp:681
+msgid "Blue-green"
+msgstr ""
+
+#: src/nikonmn.cpp:683
+msgid "Purple-blue"
+msgstr ""
 
-#: src/olympusmn.cpp:203
+#: src/nikonmn.cpp:684
+msgid "Red-purple"
+msgstr ""
+
+#: src/nikonmn.cpp:691
 #, fuzzy
-msgid "Various camera settings 2"
-msgstr "Macro"
+msgid "Name"
+msgstr "Nombre del documento"
 
-#: src/olympusmn.cpp:205
+#: src/nikonmn.cpp:692
+msgid "Base"
+msgstr ""
+
+#: src/nikonmn.cpp:693
 #, fuzzy
-msgid "Shutter Speed"
-msgstr "Velocidad del obturador"
+msgid "Adjust"
+msgstr "Longitud de la imagen"
 
-#: src/olympusmn.cpp:206
+#: src/nikonmn.cpp:694
 #, fuzzy
-msgid "Shutter speed value"
-msgstr "Velocidad del obturador"
+msgid "Quick adjust"
+msgstr "Longitud de la imagen"
 
-#: src/olympusmn.cpp:209
+#: src/nikonmn.cpp:700
 #, fuzzy
-msgid "ISO speed value"
-msgstr "Velocidad ISO"
+msgid "Filter effect"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:212
+#: src/nikonmn.cpp:702
 #, fuzzy
-msgid "Aperture value"
-msgstr "apertura"
+msgid "Toning Saturation"
+msgstr "Saturación"
 
-#: src/olympusmn.cpp:215
+#: src/nikonmn.cpp:702
 #, fuzzy
-msgid "Brightness value"
-msgstr "Brillo"
+msgid "Toning saturation"
+msgstr "Saturación"
 
-#: src/olympusmn.cpp:223
+#: src/nikonmn.cpp:704
 #, fuzzy
-msgid "Bracket"
-msgstr "acción"
+msgid "Unknown Nikon Picture Control Tag"
+msgstr "Desconocido"
+
+#: src/nikonmn.cpp:714
+msgid "Timezone"
+msgstr ""
 
-#: src/olympusmn.cpp:224
+#: src/nikonmn.cpp:715
 #, fuzzy
-msgid "Exposure compensation value"
-msgstr "Tiempo de exposición"
+msgid "Daylight Savings"
+msgstr "Luz de día"
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
+#: src/nikonmn.cpp:715
 #, fuzzy
-msgid "Sensor Temperature"
-msgstr "Espacio de color"
+msgid "Daylight savings"
+msgstr "Luz de día"
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
+#: src/nikonmn.cpp:716
 #, fuzzy
-msgid "Sensor temperature"
-msgstr "Espacio de color"
+msgid "Date Display Format"
+msgstr "Fuente de archivo"
 
-#: src/olympusmn.cpp:229
+#: src/nikonmn.cpp:716
 #, fuzzy
-msgid "Lens Temperature"
-msgstr "Espacio de color"
+msgid "Date display format"
+msgstr "formato planar"
 
-#: src/olympusmn.cpp:230
+#: src/nikonmn.cpp:718
 #, fuzzy
-msgid "Lens temperature"
-msgstr "Espacio de color"
+msgid "Unknown Nikon World Time Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:244
-msgid "Zoom"
+#: src/nikonmn.cpp:729
+msgid "Hi 0.3"
 msgstr ""
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
-msgid "Zoom step count"
+#: src/nikonmn.cpp:730
+msgid "Hi 0.5"
 msgstr ""
 
-#: src/olympusmn.cpp:247
-#, fuzzy
-msgid "Macro Focus"
-msgstr "Macro"
+#: src/nikonmn.cpp:731
+msgid "Hi 0.7"
+msgstr ""
 
-#: src/olympusmn.cpp:248
-msgid "Macro focus step count"
+#: src/nikonmn.cpp:732
+msgid "Hi 1.0"
 msgstr ""
 
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
-#, fuzzy
-msgid "Sharpness Factor"
-msgstr "Nitidez"
+#: src/nikonmn.cpp:733
+msgid "Hi 1.3"
+msgstr ""
 
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
-#, fuzzy
-msgid "Sharpness factor"
-msgstr "Nitidez"
+#: src/nikonmn.cpp:734
+msgid "Hi 1.5"
+msgstr ""
 
-#: src/olympusmn.cpp:253
-msgid "Flash Charge Level"
+#: src/nikonmn.cpp:735
+msgid "Hi 1.7"
 msgstr ""
 
-#: src/olympusmn.cpp:254
-msgid "Flash charge level"
+#: src/nikonmn.cpp:736
+msgid "Hi 2.0"
 msgstr ""
 
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
-#, fuzzy
-msgid "Color Matrix"
-msgstr "Espacio de color"
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
+msgstr ""
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
-#, fuzzy
-msgid "Color matrix"
-msgstr "Espacio de color"
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
+msgstr ""
 
-#: src/olympusmn.cpp:259
-#, fuzzy
-msgid "BlackLevel"
-msgstr "Nivel de la batería"
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
+msgstr ""
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
-msgid "Black level"
+#: src/nikonmn.cpp:740
+msgid "Lo 1.0"
 msgstr ""
 
-#: src/olympusmn.cpp:269
+#: src/nikonmn.cpp:746
 #, fuzzy
-msgid "White balance mode"
-msgstr "Balance de blanco"
+msgid "ISO Expansion"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
+#: src/nikonmn.cpp:746
 #, fuzzy
-msgid "Red Balance"
-msgstr "Balance de blanco"
+msgid "ISO expansion"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:275
+#: src/nikonmn.cpp:747
 #, fuzzy
-msgid "Red balance"
-msgstr "Balance de blanco"
+msgid "ISO 2"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
+#: src/nikonmn.cpp:748
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Balance de blanco"
+msgid "ISO Expansion 2"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
+#: src/nikonmn.cpp:748
 #, fuzzy
-msgid "Blue balance"
-msgstr "Balance de blanco"
+msgid "ISO expansion 2"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:283
+#: src/nikonmn.cpp:750
 #, fuzzy
-msgid "Serial Number 2"
-msgstr "El número F."
+msgid "Unknown Nikon Iso Info Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:284
+#: src/nikonmn.cpp:760
 #, fuzzy
-msgid "Serial number 2"
-msgstr "El número F."
+msgid "Single Area"
+msgstr "Nombre del documento"
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
+#: src/nikonmn.cpp:761
 #, fuzzy
-msgid "Flash exposure compensation"
-msgstr "Tiempo de exposición"
-
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
-msgid "External Flash Bounce"
-msgstr ""
-
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
-msgid "External flash bounce"
-msgstr ""
+msgid "Dynamic Area"
+msgstr "formato planar"
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
-msgid "External Flash Zoom"
+#: src/nikonmn.cpp:762
+msgid "Dynamic Area, Closest Subject"
 msgstr ""
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
-msgid "External flash zoom"
+#: src/nikonmn.cpp:763
+msgid "Group Dynamic"
 msgstr ""
 
-#: src/olympusmn.cpp:325
+#: src/nikonmn.cpp:764
 #, fuzzy
-msgid "External Flash Mode"
-msgstr "Flash"
+msgid "Single Area (wide)"
+msgstr "Nombre del documento"
 
-#: src/olympusmn.cpp:326
+#: src/nikonmn.cpp:765
 #, fuzzy
-msgid "External flash mode"
-msgstr "Retrato"
+msgid "Dynamic Area (wide)"
+msgstr "Balance de blanco"
 
-#: src/olympusmn.cpp:334
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
 #, fuzzy
-msgid "Color Control"
-msgstr "Espacio de color"
+msgid "Mid-left"
+msgstr "abajo - izquierda"
 
-#: src/olympusmn.cpp:335
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
 #, fuzzy
-msgid "Color control"
-msgstr "Espacio de color"
+msgid "Mid-right"
+msgstr "Copyright"
 
-#: src/olympusmn.cpp:337
-msgid "ValidBits"
-msgstr ""
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
+#, fuzzy
+msgid "Far Left"
+msgstr "arriba - izquierda"
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
-msgid "Valid bits"
-msgstr ""
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
+#, fuzzy
+msgid "Far Right"
+msgstr "Copyright"
 
-#: src/olympusmn.cpp:340
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
 #, fuzzy
-msgid "CoringFilter"
-msgstr "Espacio de color"
+msgid "AF area mode"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
 #, fuzzy
-msgid "Coring filter"
-msgstr "Espacio de color"
+msgid "AF point"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:361
+#: src/nikonmn.cpp:802
 #, fuzzy
-msgid "Compression Ratio"
-msgstr "Compresión"
+msgid "AF Points In Focus"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:362
+#: src/nikonmn.cpp:802
 #, fuzzy
-msgid "Compression ratio"
-msgstr "Compresión"
+msgid "AF points in focus"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:365
-msgid "Preview image embedded"
-msgstr ""
+#: src/nikonmn.cpp:804
+#, fuzzy
+msgid "Unknown Nikon Auto Focus Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:368
-msgid "Offset of the preview image"
+#: src/nikonmn.cpp:815
+msgid "On (51-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:371
-msgid "Size of the preview image"
+#: src/nikonmn.cpp:816
+msgid "On (11-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:373
-msgid "CCD Scan Mode"
-msgstr ""
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast Detect AF"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:374
-msgid "CCD scan mode"
-msgstr ""
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast detect AF"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:379
-msgid "Infinity Lens Step"
-msgstr ""
+#: src/nikonmn.cpp:824
+#, fuzzy
+msgid "Phase Detect AF"
+msgstr "Fuente de archivo"
 
-#: src/olympusmn.cpp:380
-msgid "Infinity lens step"
-msgstr ""
+#: src/nikonmn.cpp:824
+#, fuzzy
+msgid "Phase detect AF"
+msgstr "Fuente de archivo"
 
-#: src/olympusmn.cpp:382
-msgid "Near Lens Step"
-msgstr ""
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF Point"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:383
-msgid "Near lens step"
-msgstr ""
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF point"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:385
-msgid "Equipment Info"
-msgstr ""
+#: src/nikonmn.cpp:827
+#, fuzzy
+msgid "AF Image Width"
+msgstr "Ancho de la imagen"
 
-#: src/olympusmn.cpp:386
+#: src/nikonmn.cpp:827
 #, fuzzy
-msgid "Camera equipment sub-IFD"
-msgstr "Orientación"
+msgid "AF image width"
+msgstr "Ancho de la imagen"
 
-#: src/olympusmn.cpp:389
+#: src/nikonmn.cpp:828
 #, fuzzy
-msgid "Camera Settings sub-IFD"
-msgstr "Contraste"
+msgid "AF Image Height"
+msgstr "Longitud de la imagen"
 
-#: src/olympusmn.cpp:391
-msgid "Raw Development"
-msgstr ""
+#: src/nikonmn.cpp:828
+#, fuzzy
+msgid "AF image height"
+msgstr "Longitud de la imagen"
 
-#: src/olympusmn.cpp:392
+#: src/nikonmn.cpp:829
 #, fuzzy
-msgid "Raw development sub-IFD"
-msgstr "Orientación"
+msgid "AF Area X Position"
+msgstr "Posicionamiento YCbCr"
 
-#: src/olympusmn.cpp:394
+#: src/nikonmn.cpp:829
 #, fuzzy
-msgid "Raw Development 2"
-msgstr "Orientación"
+msgid "AF area x position"
+msgstr "Posicionamiento YCbCr"
 
-#: src/olympusmn.cpp:395
+#: src/nikonmn.cpp:830
 #, fuzzy
-msgid "Raw development 2 sub-IFD"
-msgstr "Orientación"
+msgid "AF Area Y Position"
+msgstr "Posicionamiento YCbCr"
 
-#: src/olympusmn.cpp:398
+#: src/nikonmn.cpp:830
 #, fuzzy
-msgid "Image processing sub-IFD"
-msgstr "Longitud de la imagen"
+msgid "AF area y position"
+msgstr "Posicionamiento YCbCr"
 
-#: src/olympusmn.cpp:400
+#: src/nikonmn.cpp:831
 #, fuzzy
-msgid "Focus Info"
+msgid "AF Area Width"
 msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:401
+#: src/nikonmn.cpp:831
 #, fuzzy
-msgid "Focus sub-IFD"
+msgid "AF area width"
+msgstr "Flash"
+
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF Area Height"
 msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:403
-msgid "Raw Info"
-msgstr ""
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF area height"
+msgstr "Copyright"
 
-#: src/olympusmn.cpp:404
-msgid "Raw sub-IFD"
-msgstr ""
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast Detect AF In Focus"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:409
+#: src/nikonmn.cpp:833
 #, fuzzy
-msgid "Unknown OlympusMakerNote tag"
-msgstr "Versión Exif"
+msgid "Contrast detect AF in focus"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:424
+#: src/nikonmn.cpp:835
 #, fuzzy
-msgid "Program-shift"
-msgstr "Modo de exposición"
+msgid "Unknown Nikon Auto Focus 2 Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:429
+#: src/nikonmn.cpp:846
 #, fuzzy
-msgid "Center-weighted average"
-msgstr "Promedio Ponderado en el Centro"
+msgid "Directory Number"
+msgstr "ID único de imagen"
 
-#: src/olympusmn.cpp:431
-msgid "ESP"
-msgstr ""
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory number"
+msgstr "ID único de imagen"
 
-#: src/olympusmn.cpp:432
+#: src/nikonmn.cpp:849
 #, fuzzy
-msgid "Pattern+AF"
-msgstr "Patrón CFA"
+msgid "Unknown Nikon File Info Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:433
-msgid "Spot+Highlight control"
-msgstr ""
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
+#, fuzzy
+msgid "Multiple Exposure"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:434
+#: src/nikonmn.cpp:861
 #, fuzzy
-msgid "Spot+Shadow control"
-msgstr "Espacio de color"
+msgid "Image Overlay"
+msgstr "Ancho de la imagen"
 
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
+#: src/nikonmn.cpp:867
 #, fuzzy
-msgid "Super Macro"
-msgstr "Macro"
+msgid "Multi Exposure Mode"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:446
+#: src/nikonmn.cpp:867
 #, fuzzy
-msgid "Single AF"
-msgstr "Nombre del documento"
+msgid "Multi exposure mode"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:447
-msgid "Sequential shooting AF"
-msgstr ""
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi Exposure Shots"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:449
+#: src/nikonmn.cpp:868
 #, fuzzy
-msgid "Multi AF"
-msgstr "multi-lugar"
+msgid "Multi exposure shots"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:450
-msgid "MF"
-msgstr ""
+#: src/nikonmn.cpp:869
+#, fuzzy
+msgid "Multi Exposure Auto Gain"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:455
+#: src/nikonmn.cpp:869
 #, fuzzy
-msgid "AF Not Used"
-msgstr "Punto blanco"
+msgid "Multi exposure auto gain"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:456
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
 #, fuzzy
-msgid "AF Used"
-msgstr "Punto blanco"
+msgid "Unknown Nikon Multi Exposure Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:461
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
 #, fuzzy
-msgid "Not Ready"
-msgstr "No definido"
+msgid "Internal"
+msgstr "Centímetro"
 
-#: src/olympusmn.cpp:462
-msgid "Ready"
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
 msgstr ""
 
-#: src/olympusmn.cpp:469
-msgid "Fill-in"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
 msgstr ""
 
-#: src/olympusmn.cpp:471
-msgid "Slow-sync"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
 msgstr ""
 
-#: src/olympusmn.cpp:472
-#, fuzzy
-msgid "Forced On"
-msgstr "Fluorescente"
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
+msgstr ""
 
-#: src/olympusmn.cpp:473
-msgid "2nd Curtain"
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
 msgstr ""
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
 msgstr ""
 
-#: src/olympusmn.cpp:480
-#, fuzzy
-msgid "6000K (Cloudy)"
-msgstr "nublado"
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
+msgstr ""
 
-#: src/olympusmn.cpp:481
-#, fuzzy
-msgid "5300K (Fine Weather)"
-msgstr "Tiempo bueno"
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
+msgstr ""
 
-#: src/olympusmn.cpp:482
-msgid "3000K (Tungsten light)"
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
-msgid "3600K (Tungsten light-like)"
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
 msgstr ""
 
-#: src/olympusmn.cpp:484
-#, fuzzy
-msgid "6600K (Daylight fluorescent)"
-msgstr "Fluorescente"
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
+msgstr ""
 
-#: src/olympusmn.cpp:485
-#, fuzzy
-msgid "4500K (Neutral white fluorescent)"
-msgstr "Fluorescente"
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
+msgstr ""
 
-#: src/olympusmn.cpp:486
-#, fuzzy
-msgid "4000K (Cool white fluorescent)"
-msgstr "Blanco frío fluorescente"
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:488
-#, fuzzy
-msgid "Custom WB 1"
-msgstr "Proceso personalizado"
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:489
-#, fuzzy
-msgid "Custom WB 2"
-msgstr "Proceso personalizado"
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
+msgstr ""
 
-#: src/olympusmn.cpp:490
-#, fuzzy
-msgid "Custom WB 3"
-msgstr "Proceso personalizado"
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
+msgstr ""
 
-#: src/olympusmn.cpp:491
-#, fuzzy
-msgid "Custom WB 4"
-msgstr "Proceso personalizado"
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:492
-#, fuzzy
-msgid "Custom WB 5400K"
-msgstr "Proceso personalizado"
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
+msgstr ""
 
-#: src/olympusmn.cpp:493
-#, fuzzy
-msgid "Custom WB 2900K"
-msgstr "Proceso personalizado"
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
+msgstr ""
 
-#: src/olympusmn.cpp:494
-#, fuzzy
-msgid "Custom WB 8000K"
-msgstr "Proceso personalizado"
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
+msgstr ""
 
-#: src/olympusmn.cpp:500
-msgid "CM1 (Red Enhance)"
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:501
-msgid "CM2 (Green Enhance)"
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:502
-#, fuzzy
-msgid "CM3 (Blue Enhance)"
-msgstr "Balance de blanco"
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:503
-msgid "CM4 (Skin Tones)"
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
 msgstr ""
 
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
-msgid "Pro Photo RGB"
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
-#, fuzzy
-msgid "Sport"
-msgstr "Lugar"
-
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
-#, fuzzy
-msgid "Landscape+Portrait"
-msgstr "Paisaje"
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
+msgstr ""
 
-#: src/olympusmn.cpp:522
-#, fuzzy
-msgid "Self Portrait"
-msgstr "Retrato"
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
 msgstr ""
 
-#: src/olympusmn.cpp:527
-#, fuzzy
-msgid "Night+Portrait"
-msgstr "Retrato"
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
+msgstr ""
 
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:534
-#, fuzzy
-msgid "Documents"
-msgstr "Nombre del documento"
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:536
-#, fuzzy
-msgid "Shoot & Select"
-msgstr "Espacio de color"
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:537
-msgid "Beach & Snow"
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:538
-#, fuzzy
-msgid "Self Portrait+Timer"
-msgstr "Centímetro"
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
+msgstr ""
 
-#: src/olympusmn.cpp:539
-#, fuzzy
-msgid "Candle"
-msgstr "Luz de día"
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:540
-#, fuzzy
-msgid "Available Light"
-msgstr "Flash"
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
 msgstr ""
 
-#: src/olympusmn.cpp:542
-#, fuzzy
-msgid "My Mode"
-msgstr "Flash"
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
+msgstr ""
 
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-#, fuzzy
-msgid "Pet"
-msgstr "Área del sujeto"
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:544
-#, fuzzy
-msgid "Underwater Wide1"
-msgstr "Tiempo bueno"
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:545
-#, fuzzy
-msgid "Underwater Macro"
-msgstr "Tiempo bueno"
+#: src/nikonmn.cpp:934
+msgid "10.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:546
-msgid "Shoot & Select1"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:547
-msgid "Shoot & Select2"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:549
-#, fuzzy
-msgid "Digital Image Stabilization"
-msgstr "Orientación"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:550
-#, fuzzy
-msgid "Auction"
-msgstr "acción"
+#: src/nikonmn.cpp:938
+msgid "16.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:553
-#, fuzzy
-msgid "Underwater Wide2"
-msgstr "Tiempo bueno"
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:555
-msgid "Children"
+#: src/nikonmn.cpp:940
+msgid "20.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:557
-#, fuzzy
-msgid "Nature Macro"
-msgstr "Manual"
+#: src/nikonmn.cpp:947
+msgid "iTTL-BL"
+msgstr ""
 
-#: src/olympusmn.cpp:558
-#, fuzzy
-msgid "Underwater Snapshot"
-msgstr "Tiempo bueno"
+#: src/nikonmn.cpp:948
+msgid "iTTL"
+msgstr ""
 
-#: src/olympusmn.cpp:559
+#: src/nikonmn.cpp:949
 #, fuzzy
-msgid "Shooting Guide"
-msgstr "Modo de métrica"
+msgid "Auto Aperture"
+msgstr "Apertura"
 
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
-#, fuzzy
-msgid "Noise Filter"
-msgstr "Orden de llenado"
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
+msgstr ""
 
-#: src/olympusmn.cpp:566
-msgid "Noise Filter (ISO Boost)"
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
+msgid "Repeating Flash"
 msgstr ""
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
+#: src/nikonmn.cpp:960
 #, fuzzy
-msgid "Muted"
-msgstr "No definido"
+msgid "Bounce Flash"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
-#, fuzzy
-msgid "Monotone"
-msgstr "Espacio de color"
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
+msgstr ""
 
-#: src/olympusmn.cpp:601
-msgid "SQ"
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
 msgstr ""
 
-#: src/olympusmn.cpp:602
-msgid "HQ"
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
 msgstr ""
 
-#: src/olympusmn.cpp:603
-msgid "SHQ"
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
 msgstr ""
 
-#: src/olympusmn.cpp:608
-#, fuzzy
-msgid "Camera Settings Version"
-msgstr "Contraste"
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
+msgstr ""
 
-#: src/olympusmn.cpp:608
+#: src/nikonmn.cpp:974
 #, fuzzy
-msgid "Camera settings version"
-msgstr "Contraste"
+msgid "Amber"
+msgstr "El número F."
 
-#: src/olympusmn.cpp:609
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "PreviewImage Valid"
-msgstr "Orientación"
+msgid "Flash Source"
+msgstr "Fuente de archivo"
 
-#: src/olympusmn.cpp:609
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "Preview image valid"
-msgstr "Orientación"
+msgid "Flash source"
+msgstr "Fuente de archivo"
 
-#: src/olympusmn.cpp:610
-#, fuzzy
-msgid "PreviewImage Start"
-msgstr "Orientación"
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
+msgid "0x0005"
+msgstr ""
 
-#: src/olympusmn.cpp:610
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Preview image start"
-msgstr "Orientación"
+msgid "External Flash Firmware"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:611
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "PreviewImage Length"
-msgstr "Longitud de la imagen"
+msgid "External flash firmware"
+msgstr "Retrato"
 
-#: src/olympusmn.cpp:611
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
 #, fuzzy
-msgid "Preview image length"
-msgstr "Orientación"
+msgid "External Flash Flags"
+msgstr "Retrato"
 
-#: src/olympusmn.cpp:613
-msgid "AE Lock"
-msgstr ""
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External flash flags"
+msgstr "Retrato"
 
-#: src/olympusmn.cpp:613
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Auto exposure lock"
-msgstr "Modo de exposición"
+msgid "Flash Focal Length"
+msgstr "Distancia focal"
 
-#: src/olympusmn.cpp:617
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Focus Process"
-msgstr "Modo de exposición"
+msgid "Flash focal length"
+msgstr "Distancia focal"
+
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
+msgstr ""
 
-#: src/olympusmn.cpp:617
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
 #, fuzzy
-msgid "Focus process"
-msgstr "Proceso personalizado"
+msgid "Repeating flash rate"
+msgstr "Método de sensado"
 
-#: src/olympusmn.cpp:618
-msgid "AF Search"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF search"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating flash count"
 msgstr ""
 
-#: src/olympusmn.cpp:619
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF Areas"
-msgstr "Modo de exposición"
+msgid "Flash GN Distance"
+msgstr "Balance de blanco manual"
 
-#: src/olympusmn.cpp:619
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF areas"
-msgstr "Modo de exposición"
+msgid "Flash GN distance"
+msgstr "Balance de blanco manual"
 
-#: src/olympusmn.cpp:622
-#, fuzzy
-msgid "White Balance 2"
-msgstr "Balance de blanco"
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
+msgstr ""
 
-#: src/olympusmn.cpp:622
+#: src/nikonmn.cpp:988
 #, fuzzy
-msgid "White balance 2"
-msgstr "Balance de blanco"
+msgid "Flash group a control mode"
+msgstr "El flash disparó, modo automático."
 
-#: src/olympusmn.cpp:623
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
+msgstr ""
+
+#: src/nikonmn.cpp:989
 #, fuzzy
-msgid "White Balance Temperature"
-msgstr "Balance de blanco"
+msgid "Flash group b control mode"
+msgstr "El flash disparó, modo automático."
 
-#: src/olympusmn.cpp:623
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "White balance temperature"
-msgstr "Balance de blanco"
+msgid "Flash Color Filter"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:624
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "White Balance Bracket"
-msgstr "Balance de blanco"
+msgid "Flash color filter"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:624
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
 #, fuzzy
-msgid "White balance bracket"
-msgstr "Balance de blanco"
+msgid "Shutter count"
+msgstr "obturador"
 
-#: src/olympusmn.cpp:625
+#: src/nikonmn.cpp:1044
 #, fuzzy
-msgid "Custom Saturation"
-msgstr "Saturación"
+msgid "Unknown Nikon Shot Info D80 Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:625
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
 #, fuzzy
-msgid "Custom saturation"
-msgstr "Saturación"
+msgid "Flash Level"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:626
+#: src/nikonmn.cpp:1056
 #, fuzzy
-msgid "Modified Saturation"
-msgstr "Saturación"
+msgid "Flash level"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:626
+#: src/nikonmn.cpp:1058
 #, fuzzy
-msgid "Modified saturation"
-msgstr "Saturación"
+msgid "Unknown Nikon Shot Info D40 Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
 #, fuzzy
-msgid "Contrast Setting"
-msgstr "Contraste"
+msgid "0"
+msgstr "D75"
+
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
+msgid "+1"
+msgstr ""
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
 #, fuzzy
-msgid "Sharpness Setting"
-msgstr "Nitidez"
+msgid "+2"
+msgstr "D75"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion Correction"
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
+msgid "+4"
 msgstr ""
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion correction"
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
+msgid "+8"
 msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-#, fuzzy
-msgid "Shading Compensation"
-msgstr "Tiempo de exposición"
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
+msgid "+16"
+msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
 #, fuzzy
-msgid "Shading compensation"
-msgstr "Tiempo de exposición"
+msgid "-16"
+msgstr "-"
 
-#: src/olympusmn.cpp:634
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
 #, fuzzy
-msgid "Compression Factor"
-msgstr "Compresión"
+msgid "-8"
+msgstr "-"
 
-#: src/olympusmn.cpp:634
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
 #, fuzzy
-msgid "Compression factor"
-msgstr "Compresión"
+msgid "-4"
+msgstr "-"
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
 #, fuzzy
-msgid "Gradation"
-msgstr "Saturación"
+msgid "-2"
+msgstr "-"
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
 #, fuzzy
-msgid "Picture mode"
-msgstr "Modo de exposición"
+msgid "-1"
+msgstr "-"
 
-#: src/olympusmn.cpp:637
-#, fuzzy
-msgid "Picture Mode Saturation"
-msgstr "Saturación"
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
+msgid "+17"
+msgstr ""
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
 #, fuzzy
-msgid "Picture mode saturation"
-msgstr "Modo de exposición"
+msgid "-17"
+msgstr "-"
 
-#: src/olympusmn.cpp:638
-#, fuzzy
-msgid "Picture Mode Hue"
-msgstr "Modo de exposición"
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
+msgid "+9"
+msgstr ""
 
-#: src/olympusmn.cpp:638
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
+msgid "+18"
+msgstr ""
+
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
 #, fuzzy
-msgid "Picture mode hue"
-msgstr "Modo de exposición"
+msgid "-18"
+msgstr "-"
 
-#: src/olympusmn.cpp:639
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
 #, fuzzy
-msgid "Picture Mode Contrast"
-msgstr "Modo de exposición"
+msgid "-9"
+msgstr "-"
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
-#, fuzzy
-msgid "Picture mode contrast"
-msgstr "Modo de exposición"
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
+msgid "+19"
+msgstr ""
 
-#: src/olympusmn.cpp:640
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
 #, fuzzy
-msgid "Picture Mode Sharpness"
-msgstr "Modo de exposición"
+msgid "-19"
+msgstr "-"
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
-#, fuzzy
-msgid "Picture mode sharpness"
-msgstr "Modo de exposición"
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
+msgid "+5"
+msgstr ""
 
-#: src/olympusmn.cpp:641
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
 #, fuzzy
-msgid "Picture Mode BW Filter"
-msgstr "Modo de exposición"
+msgid "+10"
+msgstr "D75"
 
-#: src/olympusmn.cpp:641
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
 #, fuzzy
-msgid "Picture mode BW filter"
-msgstr "Modo de exposición"
+msgid "+20"
+msgstr "D75"
 
-#: src/olympusmn.cpp:642
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
 #, fuzzy
-msgid "Picture Mode Tone"
-msgstr "Modo de exposición"
+msgid "-20"
+msgstr "D75"
 
-#: src/olympusmn.cpp:642
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
 #, fuzzy
-msgid "Picture mode tone"
-msgstr "Modo de exposición"
+msgid "-10"
+msgstr "-"
 
-#: src/olympusmn.cpp:643
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
 #, fuzzy
-msgid "Noise filter"
-msgstr "Espacio de color"
+msgid "-5"
+msgstr "-"
 
-#: src/olympusmn.cpp:645
-#, fuzzy
-msgid "Panorama Mode"
-msgstr "normal"
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
+msgid "+11"
+msgstr ""
 
-#: src/olympusmn.cpp:645
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
 #, fuzzy
-msgid "Panorama mode"
-msgstr "normal"
+msgid "-11"
+msgstr "-"
+
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
+msgid "+3"
+msgstr ""
+
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
+msgid "+6"
+msgstr ""
 
-#: src/olympusmn.cpp:646
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
 #, fuzzy
-msgid "Image Quality 2"
-msgstr "Ancho de la imagen"
+msgid "+12"
+msgstr "D75"
 
-#: src/olympusmn.cpp:646
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
 #, fuzzy
-msgid "Image quality 2"
-msgstr "Ancho de la imagen"
+msgid "-12"
+msgstr "-"
 
-#: src/olympusmn.cpp:647
-msgid "Manometer Pressure"
-msgstr ""
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
+#, fuzzy
+msgid "-6"
+msgstr "-"
 
-#: src/olympusmn.cpp:647
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
 #, fuzzy
-msgid "Manometer pressure"
-msgstr "Descomprimido"
+msgid "-3"
+msgstr "-"
 
-#: src/olympusmn.cpp:648
-msgid "Manometer Reading"
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
+msgid "+13"
 msgstr ""
 
-#: src/olympusmn.cpp:648
-msgid "Manometer reading"
-msgstr ""
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
+#, fuzzy
+msgid "-13"
+msgstr "-"
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB Detect"
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
+msgid "+7"
 msgstr ""
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB detect"
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
+msgid "+14"
 msgstr ""
 
-#: src/olympusmn.cpp:651
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
 #, fuzzy
-msgid "Unknown OlympusCs tag"
-msgstr "Versión Exif"
+msgid "-14"
+msgstr "-"
 
-#: src/olympusmn.cpp:662
-msgid "Simple E-System"
-msgstr ""
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
+#, fuzzy
+msgid "-7"
+msgstr "-"
 
-#: src/olympusmn.cpp:663
-msgid "E-System"
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
+msgid "+15"
 msgstr ""
 
-#: src/olympusmn.cpp:679
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
 #, fuzzy
-msgid "Equipment Version"
-msgstr "Versión Exif"
+msgid "-15"
+msgstr "-"
 
-#: src/olympusmn.cpp:679
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
-msgid "Equipment version"
-msgstr "Versión Exif"
+msgid "AF Fine Tune Adj"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:680
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
-msgid "Camera Type"
-msgstr "Contraste"
+msgid "AF fine tune adj"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:680
+#: src/nikonmn.cpp:1118
 #, fuzzy
-msgid "Camera type"
-msgstr "Contraste"
+msgid "Unknown Nikon Shot Info D300 (a) Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
+#: src/nikonmn.cpp:1178
 #, fuzzy
-msgid "Internal Serial Number"
-msgstr "El número F."
+msgid "Unknown Nikon Shot Info D300 (b) Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:682
-#, fuzzy
-msgid "Internal serial number"
-msgstr "El número F."
+#: src/nikonmn.cpp:1191
+msgid "On (3)"
+msgstr ""
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
+#: src/nikonmn.cpp:1204
 #, fuzzy
-msgid "Body Firmware Version"
-msgstr "Versión Exif"
+msgid "Shutter Count 1"
+msgstr "obturador"
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
+#: src/nikonmn.cpp:1204
 #, fuzzy
-msgid "Body firmware version"
-msgstr "Versión Exif"
+msgid "Shutter count 1"
+msgstr "obturador"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/nikonmn.cpp:1208
 #, fuzzy
-msgid "Lens Serial Number"
-msgstr "El número F."
+msgid "Shutter Count 2"
+msgstr "obturador"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/nikonmn.cpp:1208
 #, fuzzy
-msgid "Lens serial number"
-msgstr "El número F."
+msgid "Shutter count 2"
+msgstr "obturador"
 
-#: src/olympusmn.cpp:687
+#: src/nikonmn.cpp:1209
 #, fuzzy
-msgid "Lens Firmware Version"
-msgstr "Versión Exif"
+msgid "Vibration Reduction 2"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:687
+#: src/nikonmn.cpp:1209
 #, fuzzy
-msgid "Lens firmware version"
-msgstr "Versión Exif"
+msgid "Vibration reduction 2"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/olympusmn.cpp:692
+#: src/nikonmn.cpp:1213
 #, fuzzy
-msgid "Max Aperture At Current Focal"
-msgstr "apertura"
+msgid "Unknown Nikon Shot Info Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:692
+#: src/nikonmn.cpp:1224
 #, fuzzy
-msgid "Max aperture at current focal"
-msgstr "apertura"
+msgid "WB RBGG Levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:693
+#: src/nikonmn.cpp:1224
 #, fuzzy
-msgid "Lens Properties"
-msgstr "Espacio de color"
+msgid "WB RBGG levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:693
+#: src/nikonmn.cpp:1226
 #, fuzzy
-msgid "Lens properties"
+msgid "Unknown Nikon Color Balance 1 Tag"
 msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:694
-msgid "Extender"
-msgstr ""
-
-#: src/olympusmn.cpp:695
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
-msgid "Extender Serial Number"
-msgstr "El número F."
+msgid "WB RGGB Levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:695
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
-msgid "Extender serial number"
-msgstr "El número F."
+msgid "WB RGGB levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:696
+#: src/nikonmn.cpp:1239
 #, fuzzy
-msgid "Extender Model"
-msgstr "Tipo de escena"
+msgid "Unknown Nikon Color Balance 2 Tag"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:696
+#: src/nikonmn.cpp:1252
 #, fuzzy
-msgid "Extender model"
-msgstr "Tipo de escena"
+msgid "Unknown Nikon Color Balance 2a Tag"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:697
+#: src/nikonmn.cpp:1265
 #, fuzzy
-msgid "Extender Firmware Version"
-msgstr "Versión Exif"
+msgid "Unknown Nikon Color Balance 2b Tag"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:697
+#: src/nikonmn.cpp:1276
 #, fuzzy
-msgid "Extender firmwareversion"
-msgstr "Versión Exif"
+msgid "WB RGBG Levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:698
+#: src/nikonmn.cpp:1276
 #, fuzzy
-msgid "Flash Type"
-msgstr "Flash"
+msgid "WB RGBG levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:698
+#: src/nikonmn.cpp:1278
 #, fuzzy
-msgid "Flash type"
-msgstr "Flash"
+msgid "Unknown Nikon Color Balance 3 Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:699 src/properties.cpp:354
+#: src/nikonmn.cpp:1289
 #, fuzzy
-msgid "Flash Model"
-msgstr "Flash"
+msgid "WB GRBG Levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:699
+#: src/nikonmn.cpp:1289
 #, fuzzy
-msgid "Flash model"
-msgstr "Flash"
+msgid "WB GRBG levels"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:700
+#: src/nikonmn.cpp:1291
 #, fuzzy
-msgid "Flash Firmware Version"
-msgstr "Versión Exif"
+msgid "Unknown Nikon Color Balance 4 Tag"
+msgstr "Desconocido"
 
-#: src/olympusmn.cpp:700
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
-msgid "Flash firmware version"
-msgstr "Versión Exif"
+msgid "Lens ID Number"
+msgstr "El número F."
 
-#: src/olympusmn.cpp:701
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
-msgid "FlashSerialNumber"
+msgid "Lens ID number"
 msgstr "El número F."
 
-#: src/olympusmn.cpp:703
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
-msgid "Unknown OlympusEq tag"
-msgstr "Versión Exif"
+msgid "Lens F-Stops"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
-msgid "High Speed"
-msgstr "Escena nocturna"
+msgid "Lens F-stops"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 #, fuzzy
-msgid "High Function"
-msgstr "Saturación"
+msgid "Min Focal Length"
+msgstr "Distancia focal"
 
-#: src/olympusmn.cpp:722
-msgid "Advanced High Speed"
-msgstr ""
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+#, fuzzy
+msgid "Min focal length"
+msgstr "Distancia focal"
 
-#: src/olympusmn.cpp:723
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 #, fuzzy
-msgid "Advanced High Function"
-msgstr "Función de transferencia"
+msgid "Max Focal Length"
+msgstr "Distancia focal"
 
-#: src/olympusmn.cpp:728
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 #, fuzzy
-msgid "Original"
-msgstr "Fecha y Hora (original)"
+msgid "Max focal length"
+msgstr "Distancia focal"
 
-#: src/olympusmn.cpp:729
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
 #, fuzzy
-msgid "Edited (Landscape)"
-msgstr "Paisaje"
+msgid "Max Aperture At Min Focal"
+msgstr "apertura"
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
 #, fuzzy
-msgid "Edited (Portrait)"
-msgstr "Retrato"
+msgid "Max aperture at min focal"
+msgstr "apertura"
 
-#: src/olympusmn.cpp:736
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
 #, fuzzy
-msgid "WB Color Temp"
-msgstr "Espacio de color"
+msgid "Max Aperture At Max Focal"
+msgstr "apertura"
 
-#: src/olympusmn.cpp:737
-msgid "WB Gray Point"
-msgstr ""
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
+#, fuzzy
+msgid "Max aperture at max focal"
+msgstr "apertura"
 
-#: src/olympusmn.cpp:747
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
-msgid "Raw Development Version"
-msgstr "Orientación"
+msgid "MCU Version"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:747
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
-msgid "Raw development version"
-msgstr "Orientación"
+msgid "MCU version"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
+#: src/nikonmn.cpp:1310
 #, fuzzy
-msgid "Exposure Bias Value"
-msgstr "Ajuste de exposición"
+msgid "Unknown Nikon Lens Data 1 Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
-msgid "Exposure bias value"
-msgstr "Ajuste de exposición"
+msgid "Exit Pupil Position"
+msgstr "Posicionamiento YCbCr"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
-msgid "White Balance Value"
-msgstr "Balance de blanco"
+msgid "Exit pupil position"
+msgstr "Posicionamiento YCbCr"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
-msgid "White balance value"
-msgstr "Balance de blanco"
+msgid "AF Aperture"
+msgstr "Apertura"
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
-msgid "WB Fine Adjustment"
-msgstr "Longitud de la imagen"
+msgid "AF aperture"
+msgstr "Apertura"
 
-#: src/olympusmn.cpp:750
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
-msgid "WB fine adjustment"
-msgstr "Longitud de la imagen"
+msgid "Effective Max Aperture"
+msgstr "Apertura"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
-msgid "Gray Point"
-msgstr "Punto blanco"
+msgid "Effective max aperture"
+msgstr "apertura"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
+#: src/nikonmn.cpp:1335
 #, fuzzy
-msgid "Gray point"
-msgstr "Punto blanco"
+msgid "Unknown Nikon Lens Data 2 Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/nikonmn.cpp:1355
 #, fuzzy
-msgid "Saturation Emphasis"
-msgstr "Alta saturación"
+msgid "Max aperture at min focal length"
+msgstr "apertura"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/nikonmn.cpp:1356
 #, fuzzy
-msgid "Saturation emphasis"
-msgstr "Alta saturación"
+msgid "Max aperture at max focal length"
+msgstr "apertura"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/nikonmn.cpp:1360
 #, fuzzy
-msgid "Memory Color Emphasis"
-msgstr "Espacio de color"
+msgid "Unknown Nikon Lens Data 3 Tag"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory color emphasis"
+#: src/nikonmn.cpp:1540
+msgid "Closest subject"
+msgstr ""
+
+#: src/nikonmn.cpp:1541
+msgid "Group dynamic-AF"
+msgstr ""
+
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
+msgid "none"
 msgstr ""
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/nikonmn.cpp:1574
 #, fuzzy
-msgid "Contrast Value"
-msgstr "Contraste"
+msgid "used"
+msgstr "No definido"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/nikonmn.cpp:1600
 #, fuzzy
-msgid "Contrast value"
-msgstr "Contraste"
+msgid "All 11 Points"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
 #, fuzzy
-msgid "Sharpness Value"
-msgstr "Nitidez"
+msgid "Single-frame"
+msgstr "Nombre del documento"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/olympusmn.cpp:71
 #, fuzzy
-msgid "Sharpness value"
-msgstr "Nitidez"
+msgid "Standard Quality (SQ)"
+msgstr "Luz estándar A"
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
+#: src/olympusmn.cpp:72
 #, fuzzy
-msgid "Engine"
-msgstr "Centímetro"
+msgid "High Quality (HQ)"
+msgstr "Ancho de la imagen"
 
-#: src/olympusmn.cpp:759
+#: src/olympusmn.cpp:73
 #, fuzzy
-msgid "Edit status"
-msgstr "Vista distante"
+msgid "Super High Quality (SHQ)"
+msgstr "Ancho de la imagen"
 
-#: src/olympusmn.cpp:760
+#: src/olympusmn.cpp:88
+msgid "On (preset)"
+msgstr ""
+
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
 #, fuzzy
-msgid "Settings"
-msgstr "Velocidad ISO"
+msgid "Sport"
+msgstr "Lugar"
 
-#: src/olympusmn.cpp:762
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
 #, fuzzy
-msgid "Unknown OlympusRd tag"
-msgstr "Versión Exif"
+msgid "Landscape+Portrait"
+msgstr "Paisaje"
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:100
 #, fuzzy
-msgid "Raw Development 2 Version"
-msgstr "Orientación"
+msgid "Self Portrait"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:102
+msgid "2 in 1"
+msgstr ""
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:105
 #, fuzzy
-msgid "Raw development 2 version"
-msgstr "Orientación"
+msgid "Night+Portrait"
+msgstr "Retrato"
 
-#: src/olympusmn.cpp:821
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
+msgstr ""
+
+#: src/olympusmn.cpp:112
 #, fuzzy
-msgid "White balance fine adjustment"
-msgstr "Balance de blanco"
+msgid "Documents"
+msgstr "Nombre del documento"
 
-#: src/olympusmn.cpp:831
+#: src/olympusmn.cpp:114
 #, fuzzy
-msgid "PM Saturation"
-msgstr "Saturación"
+msgid "Shoot & Select"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:832
+#: src/olympusmn.cpp:115
+msgid "Beach & Snow"
+msgstr ""
+
+#: src/olympusmn.cpp:116
 #, fuzzy
-msgid "PM Contrast"
-msgstr "Contraste"
+msgid "Self Portrait+Timer"
+msgstr "Centímetro"
 
-#: src/olympusmn.cpp:833
+#: src/olympusmn.cpp:117
 #, fuzzy
-msgid "PM Sharpness"
-msgstr "Nitidez"
+msgid "Candle"
+msgstr "Luz de día"
 
-#: src/olympusmn.cpp:834
+#: src/olympusmn.cpp:118
 #, fuzzy
-msgid "PM BW Filter"
-msgstr "Orden de llenado"
+msgid "Available Light"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:834
-msgid "PM BW filter"
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
 msgstr ""
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:120
 #, fuzzy
-msgid "PM Picture Tone"
-msgstr "Modo de exposición"
+msgid "My Mode"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
 #, fuzzy
-msgid "PM picture tone"
-msgstr "Modo de exposición"
+msgid "Pet"
+msgstr "Área del sujeto"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:122
 #, fuzzy
-msgid "Auto Gradation"
-msgstr "Baja saturación"
+msgid "Underwater Wide1"
+msgstr "Tiempo bueno"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:123
 #, fuzzy
-msgid "Auto gradation"
-msgstr "Baja saturación"
+msgid "Underwater Macro"
+msgstr "Tiempo bueno"
 
-#: src/olympusmn.cpp:839
-msgid "PM Noise Filter"
-msgstr ""
+#: src/olympusmn.cpp:124
+#, fuzzy
+msgid "Shoot & Select1"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:839
+#: src/olympusmn.cpp:125
 #, fuzzy
-msgid "Picture mode noise filter"
-msgstr "Modo de exposición"
+msgid "Shoot & Select2"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:841
+#: src/olympusmn.cpp:127
 #, fuzzy
-msgid "Unknown OlympusRd2 tag"
-msgstr "Versión Exif"
+msgid "Digital Image Stabilization"
+msgstr "Orientación"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:128
 #, fuzzy
-msgid "Image Processing Version"
-msgstr "Longitud de la imagen"
+msgid "Auction"
+msgstr "acción"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:131
 #, fuzzy
-msgid "Image processing version"
-msgstr "Configuración planar"
+msgid "Underwater Wide2"
+msgstr "Tiempo bueno"
 
-#: src/olympusmn.cpp:852
-msgid "WB RB Levels 3000K"
+#: src/olympusmn.cpp:133
+msgid "Children"
 msgstr ""
 
-#: src/olympusmn.cpp:852
-msgid "WB RB levels 3000K"
-msgstr ""
+#: src/olympusmn.cpp:135
+#, fuzzy
+msgid "Nature Macro"
+msgstr "Manual"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB Levels 3300K"
-msgstr ""
+#: src/olympusmn.cpp:136
+#, fuzzy
+msgid "Underwater Snapshot"
+msgstr "Tiempo bueno"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB levels 3300K"
-msgstr ""
+#: src/olympusmn.cpp:137
+#, fuzzy
+msgid "Shooting Guide"
+msgstr "Modo de métrica"
 
-#: src/olympusmn.cpp:854
-msgid "WB RB Levels 3600K"
-msgstr ""
+#: src/olympusmn.cpp:145
+#, fuzzy
+msgid "Internal + External"
+msgstr "El número F."
 
-#: src/olympusmn.cpp:854
-msgid "WB RB levels 3600K"
-msgstr ""
+#: src/olympusmn.cpp:176
+#, fuzzy
+msgid "Interlaced"
+msgstr "centrado"
 
-#: src/olympusmn.cpp:855
-msgid "WB RB Levels 3900K"
-msgstr ""
+#: src/olympusmn.cpp:177
+#, fuzzy
+msgid "Progressive"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:855
-msgid "WB RB levels 3900K"
-msgstr ""
+#: src/olympusmn.cpp:188
+#, fuzzy
+msgid "Thumbnail Image"
+msgstr "Desplazamiento de tira"
 
-#: src/olympusmn.cpp:856
-msgid "WB RB Levels 4000K"
-msgstr ""
+#: src/olympusmn.cpp:189
+#, fuzzy
+msgid "Thumbnail image"
+msgstr "Desplazamiento de tira"
 
-#: src/olympusmn.cpp:856
-msgid "WB RB levels 4000K"
-msgstr ""
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body Firmware Version"
+msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:857
-msgid "WB RB Levels 4300K"
-msgstr ""
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body firmware version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:195
+#, fuzzy
+msgid "Special Mode"
+msgstr "Modo de métrica"
+
+#: src/olympusmn.cpp:196
+#, fuzzy
+msgid "Picture taking mode"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:204
+#, fuzzy
+msgid "Black & White Mode"
+msgstr "acción"
+
+#: src/olympusmn.cpp:205
+msgid "Black and white mode"
+msgstr ""
+
+#: src/olympusmn.cpp:208
+#, fuzzy
+msgid "Digital zoom ratio"
+msgstr "Relación de zoom digital"
+
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
+#, fuzzy
+msgid "Focal Plane Diagonal"
+msgstr "Resolución Y del plano focal"
+
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
+#, fuzzy
+msgid "Focal plane diagonal"
+msgstr "Resolución Y del plano focal"
+
+#: src/olympusmn.cpp:213
+msgid "Lens Distortion Parameters"
+msgstr ""
+
+#: src/olympusmn.cpp:214
+msgid "Lens distortion parameters"
+msgstr ""
+
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
+#, fuzzy
+msgid "Camera Type"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
+#, fuzzy
+msgid "Camera type"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:220
+msgid "ASCII format data such as [PictureInfo]"
+msgstr ""
+
+#: src/olympusmn.cpp:222
+#, fuzzy
+msgid "Camera ID"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:223
+#, fuzzy
+msgid "Camera ID data"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
+msgstr "Software"
+
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
+#, fuzzy
+msgid "Preview Image"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
+#, fuzzy
+msgid "Preview image"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:237
+#, fuzzy
+msgid "Pre Capture Frames"
+msgstr "Tipo de captura de escena"
+
+#: src/olympusmn.cpp:238
+#, fuzzy
+msgid "Pre-capture frames"
+msgstr "Tipo de captura de escena"
+
+#: src/olympusmn.cpp:240
+#, fuzzy
+msgid "White Board"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:241
+#, fuzzy
+msgid "White board"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:243
+#, fuzzy
+msgid "One Touch WB"
+msgstr "Balance de blanco automático"
+
+#: src/olympusmn.cpp:244
+#, fuzzy
+msgid "One touch white balance"
+msgstr "Balance de blanco automático"
+
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White Balance Bracket"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White balance bracket"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+#, fuzzy
+msgid "Firmware"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:256
+#, fuzzy
+msgid "Firmwarer"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:261
+#, fuzzy
+msgid "Data Dump 1"
+msgstr "formato planar"
+
+#: src/olympusmn.cpp:262
+#, fuzzy
+msgid "Various camera settings 1"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:264
+#, fuzzy
+msgid "Data Dump 2"
+msgstr "formato planar"
+
+#: src/olympusmn.cpp:265
+#, fuzzy
+msgid "Various camera settings 2"
+msgstr "Macro"
+
+#: src/olympusmn.cpp:268
+#, fuzzy
+msgid "Shutter speed value"
+msgstr "Velocidad del obturador"
+
+#: src/olympusmn.cpp:271
+#, fuzzy
+msgid "ISO speed value"
+msgstr "Velocidad ISO"
+
+#: src/olympusmn.cpp:274
+#, fuzzy
+msgid "Aperture value"
+msgstr "apertura"
+
+#: src/olympusmn.cpp:277
+#, fuzzy
+msgid "Brightness value"
+msgstr "Brillo"
+
+#: src/olympusmn.cpp:285
+#, fuzzy
+msgid "Bracket"
+msgstr "acción"
+
+#: src/olympusmn.cpp:286
+#, fuzzy
+msgid "Exposure compensation value"
+msgstr "Tiempo de exposición"
+
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
+#, fuzzy
+msgid "Sensor Temperature"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
+#, fuzzy
+msgid "Sensor temperature"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:291
+#, fuzzy
+msgid "Lens Temperature"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:292
+#, fuzzy
+msgid "Lens temperature"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:294
+#, fuzzy
+msgid "Light Condition"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:295
+#, fuzzy
+msgid "Light condition"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:297
+#, fuzzy
+msgid "Focus Range"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:298
+#, fuzzy
+msgid "Focus range"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:306
+#, fuzzy
+msgid "Zoom"
+msgstr "izquierda - abajo"
+
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
+#, fuzzy
+msgid "Zoom step count"
+msgstr "obturador"
+
+#: src/olympusmn.cpp:309
+#, fuzzy
+msgid "Macro Focus"
+msgstr "Macro"
+
+#: src/olympusmn.cpp:310
+#, fuzzy
+msgid "Macro focus step count"
+msgstr "Posicionamiento YCbCr"
+
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
+#, fuzzy
+msgid "Sharpness Factor"
+msgstr "Nitidez"
+
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
+#, fuzzy
+msgid "Sharpness factor"
+msgstr "Nitidez"
+
+#: src/olympusmn.cpp:315
+#, fuzzy
+msgid "Flash Charge Level"
+msgstr "Flash"
+
+#: src/olympusmn.cpp:316
+#, fuzzy
+msgid "Flash charge level"
+msgstr "Flash"
+
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
+#, fuzzy
+msgid "Color Matrix"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
+#, fuzzy
+msgid "Color matrix"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:321
+#, fuzzy
+msgid "BlackLevel"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
+#, fuzzy
+msgid "Black level"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:331
+#, fuzzy
+msgid "White balance mode"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
+#, fuzzy
+msgid "Red Balance"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
+#, fuzzy
+msgid "Red balance"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
+#, fuzzy
+msgid "Blue Balance"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
+#, fuzzy
+msgid "Blue balance"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:342
+#, fuzzy
+msgid "Color Matrix Number"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:343
+#, fuzzy
+msgid "Color matrix mumber"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:345
+#, fuzzy
+msgid "Serial Number 2"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:346
+#, fuzzy
+msgid "Serial number 2"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
+#, fuzzy
+msgid "Flash exposure compensation"
+msgstr "Tiempo de exposición"
+
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
+#, fuzzy
+msgid "External Flash Bounce"
+msgstr "Flash"
+
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
+#, fuzzy
+msgid "External flash bounce"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
+#, fuzzy
+msgid "External Flash Zoom"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
+#, fuzzy
+msgid "External flash zoom"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:387
+#, fuzzy
+msgid "External Flash Mode"
+msgstr "Flash"
+
+#: src/olympusmn.cpp:388
+#, fuzzy
+msgid "External flash mode"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:396
+#, fuzzy
+msgid "Color Control"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:397
+#, fuzzy
+msgid "Color control"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:399
+msgid "ValidBits"
+msgstr ""
+
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
+msgid "Valid bits"
+msgstr ""
+
+#: src/olympusmn.cpp:402
+#, fuzzy
+msgid "CoringFilter"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
+msgid "Coring filter"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:423
+#, fuzzy
+msgid "Compression Ratio"
+msgstr "Compresión"
+
+#: src/olympusmn.cpp:424
+#, fuzzy
+msgid "Compression ratio"
+msgstr "Compresión"
+
+#: src/olympusmn.cpp:427
+#, fuzzy
+msgid "Preview image embedded"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:430
+#, fuzzy
+msgid "Offset of the preview image"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:433
+#, fuzzy
+msgid "Size of the preview image"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:435
+#, fuzzy
+msgid "CCD Scan Mode"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:436
+#, fuzzy
+msgid "CCD scan mode"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:441
+msgid "Infinity Lens Step"
+msgstr ""
+
+#: src/olympusmn.cpp:442
+msgid "Infinity lens step"
+msgstr ""
+
+#: src/olympusmn.cpp:444
+#, fuzzy
+msgid "Near Lens Step"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:445
+msgid "Near lens step"
+msgstr ""
+
+#: src/olympusmn.cpp:447
+#, fuzzy
+msgid "Equipment Info"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:448
+#, fuzzy
+msgid "Camera equipment sub-IFD"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:451
+#, fuzzy
+msgid "Camera Settings sub-IFD"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:453
+#, fuzzy
+msgid "Raw Development"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:454
+#, fuzzy
+msgid "Raw development sub-IFD"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:456
+#, fuzzy
+msgid "Raw Development 2"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:457
+#, fuzzy
+msgid "Raw development 2 sub-IFD"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:460
+#, fuzzy
+msgid "Image processing sub-IFD"
+msgstr "Longitud de la imagen"
+
+#: src/olympusmn.cpp:462
+#, fuzzy
+msgid "Focus Info"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:463
+#, fuzzy
+msgid "Focus sub-IFD"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:465
+#, fuzzy
+msgid "Raw Info"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:466
+#, fuzzy
+msgid "Raw sub-IFD"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:470
+#, fuzzy
+msgid "Unknown OlympusMakerNote tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:486
+#, fuzzy
+msgid "Program-shift"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:491
+#, fuzzy
+msgid "Center-weighted average"
+msgstr "Promedio Ponderado en el Centro"
+
+#: src/olympusmn.cpp:493
+msgid "ESP"
+msgstr ""
+
+#: src/olympusmn.cpp:494
+#, fuzzy
+msgid "Pattern+AF"
+msgstr "Patrón CFA"
+
+#: src/olympusmn.cpp:495
+#, fuzzy
+msgid "Spot+Highlight control"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:496
+#, fuzzy
+msgid "Spot+Shadow control"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
+#, fuzzy
+msgid "Single AF"
+msgstr "Nombre del documento"
+
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
+msgid "Sequential shooting AF"
+msgstr ""
+
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
+#, fuzzy
+msgid "Multi AF"
+msgstr "multi-lugar"
+
+#: src/olympusmn.cpp:517
+#, fuzzy
+msgid "AF Not Used"
+msgstr "Autofocus no utilizado"
+
+#: src/olympusmn.cpp:518
+#, fuzzy
+msgid "AF Used"
+msgstr "Autofocus utilizado"
+
+#: src/olympusmn.cpp:523
+#, fuzzy
+msgid "Not Ready"
+msgstr "No definido"
+
+#: src/olympusmn.cpp:524
+#, fuzzy
+msgid "Ready"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:531
+#, fuzzy
+msgid "Fill-in"
+msgstr "Relleno"
+
+#: src/olympusmn.cpp:533
+msgid "Slow-sync"
+msgstr ""
+
+#: src/olympusmn.cpp:534
+#, fuzzy
+msgid "Forced On"
+msgstr "Fluorescente"
+
+#: src/olympusmn.cpp:535
+msgid "2nd Curtain"
+msgstr ""
+
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
+msgstr ""
+
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
+msgstr ""
+
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
+msgstr ""
+
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
+msgstr ""
+
+#: src/olympusmn.cpp:566
+#, fuzzy
+msgid "7500K (Fine Weather with Shade)"
+msgstr "7500K (Buen tiempo con sombra"
+
+#: src/olympusmn.cpp:567
+#, fuzzy
+msgid "6000K (Cloudy)"
+msgstr "6000K (Nublado)"
+
+#: src/olympusmn.cpp:568
+#, fuzzy
+msgid "5300K (Fine Weather)"
+msgstr "5300K (Buen tiempo)"
+
+#: src/olympusmn.cpp:569
+msgid "3000K (Tungsten light)"
+msgstr "3000K (Bombilla incandescente)"
+
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
+msgid "3600K (Tungsten light-like)"
+msgstr ""
+
+#: src/olympusmn.cpp:571
+#, fuzzy
+msgid "6600K (Daylight fluorescent)"
+msgstr "Fluorescente luz de día"
+
+#: src/olympusmn.cpp:572
+#, fuzzy
+msgid "4500K (Neutral white fluorescent)"
+msgstr "Fluorescente"
+
+#: src/olympusmn.cpp:573
+#, fuzzy
+msgid "4000K (Cool white fluorescent)"
+msgstr "Blanco frío fluorescente"
+
+#: src/olympusmn.cpp:575
+#, fuzzy
+msgid "Custom WB 1"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:576
+#, fuzzy
+msgid "Custom WB 2"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:577
+#, fuzzy
+msgid "Custom WB 3"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:578
+#, fuzzy
+msgid "Custom WB 4"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:579
+#, fuzzy
+msgid "Custom WB 5400K"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:580
+#, fuzzy
+msgid "Custom WB 2900K"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:581
+#, fuzzy
+msgid "Custom WB 8000K"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:587
+#, fuzzy
+msgid "CM1 (Red Enhance)"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:588
+#, fuzzy
+msgid "CM2 (Green Enhance)"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:589
+#, fuzzy
+msgid "CM3 (Blue Enhance)"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:590
+msgid "CM4 (Skin Tones)"
+msgstr ""
+
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
+msgid "Pro Photo RGB"
+msgstr ""
+
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
+#, fuzzy
+msgid "Noise Filter"
+msgstr "Orden de llenado"
+
+#: src/olympusmn.cpp:604
+#, fuzzy
+msgid "Noise Filter (ISO Boost)"
+msgstr "Orden de llenado"
+
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
+#, fuzzy
+msgid "Muted"
+msgstr "No definido"
+
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
+#, fuzzy
+msgid "Monotone"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:640
+msgid "SQ"
+msgstr ""
+
+#: src/olympusmn.cpp:641
+msgid "HQ"
+msgstr ""
+
+#: src/olympusmn.cpp:642
+msgid "SHQ"
+msgstr ""
+
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
+#, fuzzy
+msgid "On, Mode 1"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
+#, fuzzy
+msgid "On, Mode 2"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:651
+#, fuzzy
+msgid "On, Mode 3"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:655
+#, fuzzy
+msgid "Camera Settings Version"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:655
+#, fuzzy
+msgid "Camera settings version"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:656
+#, fuzzy
+msgid "PreviewImage Valid"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:656
+#, fuzzy
+msgid "Preview image valid"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:657
+#, fuzzy
+msgid "PreviewImage Start"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:657
+#, fuzzy
+msgid "Preview image start"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:658
+#, fuzzy
+msgid "PreviewImage Length"
+msgstr "Longitud de la imagen"
+
+#: src/olympusmn.cpp:658
+#, fuzzy
+msgid "Preview image length"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:660
+#, fuzzy
+msgid "Auto exposure lock"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure Shift"
+msgstr "Tiempo de exposición"
+
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure shift"
+msgstr "Tiempo de exposición"
+
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus Process"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus process"
+msgstr "Proceso personalizado"
+
+#: src/olympusmn.cpp:666
+msgid "AF Search"
+msgstr ""
+
+#: src/olympusmn.cpp:666
+#, fuzzy
+msgid "AF search"
+msgstr "Punto blanco"
+
+#: src/olympusmn.cpp:667
+#, fuzzy
+msgid "AF Areas"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:667
+#, fuzzy
+msgid "AF areas"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:668
+#, fuzzy
+msgid "AFPointSelected"
+msgstr "Autofocus punto seleccionado"
+
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF Fine Tune Adjust"
+msgstr "Punto blanco"
+
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF fine tune adjust"
+msgstr "Punto blanco"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash Remote Control"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash remote control"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash Control Mode"
+msgstr "El flash disparó, modo automático."
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash control mode"
+msgstr "El flash disparó, modo automático."
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash Intensity"
+msgstr "Actividad del Flash"
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash intensity"
+msgstr "Actividad del Flash"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual Flash Strength"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual flash strength"
+msgstr "Exposición manual"
+
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
+#, fuzzy
+msgid "White Balance 2"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
+#, fuzzy
+msgid "White balance 2"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:677
+#, fuzzy
+msgid "White Balance Temperature"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:677
+#, fuzzy
+msgid "White balance temperature"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:679
+#, fuzzy
+msgid "Custom Saturation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:679
+#, fuzzy
+msgid "Custom saturation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:680
+#, fuzzy
+msgid "Modified Saturation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:680
+#, fuzzy
+msgid "Modified saturation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
+#, fuzzy
+msgid "Contrast Setting"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
+#, fuzzy
+msgid "Sharpness Setting"
+msgstr "Nitidez"
+
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+#, fuzzy
+msgid "Distortion Correction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
+
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+#, fuzzy
+msgid "Distortion correction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
+
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+#, fuzzy
+msgid "Shading Compensation"
+msgstr "Tiempo de exposición"
+
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+#, fuzzy
+msgid "Shading compensation"
+msgstr "Tiempo de exposición"
+
+#: src/olympusmn.cpp:688
+#, fuzzy
+msgid "Compression Factor"
+msgstr "Compresión"
+
+#: src/olympusmn.cpp:688
+#, fuzzy
+msgid "Compression factor"
+msgstr "Compresión"
+
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
+#, fuzzy
+msgid "Gradation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
+#, fuzzy
+msgid "Picture mode"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:691
+#, fuzzy
+msgid "Picture Mode Saturation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
+#, fuzzy
+msgid "Picture mode saturation"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:692
+#, fuzzy
+msgid "Picture Mode Hue"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:692
+#, fuzzy
+msgid "Picture mode hue"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:693
+#, fuzzy
+msgid "Picture Mode Contrast"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
+#, fuzzy
+msgid "Picture mode contrast"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:694
+#, fuzzy
+msgid "Picture Mode Sharpness"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
+#, fuzzy
+msgid "Picture mode sharpness"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:695
+#, fuzzy
+msgid "Picture Mode BW Filter"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:695
+#, fuzzy
+msgid "Picture mode BW filter"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:696
+#, fuzzy
+msgid "Picture Mode Tone"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:696
+#, fuzzy
+msgid "Picture mode tone"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:697
+#, fuzzy
+msgid "Noise filter"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art Filter"
+msgstr "Orden de llenado"
+
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art filter"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic Filter"
+msgstr "Relación de zoom digital"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic filter"
+msgstr "Relación de zoom digital"
+
+#: src/olympusmn.cpp:701
+#, fuzzy
+msgid "Panorama Mode"
+msgstr "normal"
+
+#: src/olympusmn.cpp:701
+#, fuzzy
+msgid "Panorama mode"
+msgstr "normal"
+
+#: src/olympusmn.cpp:702
+#, fuzzy
+msgid "Image Quality 2"
+msgstr "Ancho de la imagen"
+
+#: src/olympusmn.cpp:702
+#, fuzzy
+msgid "Image quality 2"
+msgstr "Ancho de la imagen"
+
+#: src/olympusmn.cpp:704
+#, fuzzy
+msgid "Manometer Pressure"
+msgstr "Descomprimido"
+
+#: src/olympusmn.cpp:704
+#, fuzzy
+msgid "Manometer pressure"
+msgstr "Descomprimido"
+
+#: src/olympusmn.cpp:705
+#, fuzzy
+msgid "Manometer Reading"
+msgstr "Descomprimido"
+
+#: src/olympusmn.cpp:705
+#, fuzzy
+msgid "Manometer reading"
+msgstr "Descomprimido"
+
+#: src/olympusmn.cpp:706
+#, fuzzy
+msgid "Extended WB Detect"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:706
+#, fuzzy
+msgid "Extended WB detect"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
+msgstr ""
+
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:710
+#, fuzzy
+msgid "Unknown OlympusCs tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:721
+msgid "Simple E-System"
+msgstr ""
+
+#: src/olympusmn.cpp:722
+msgid "E-System"
+msgstr ""
+
+#: src/olympusmn.cpp:739
+#, fuzzy
+msgid "Equipment Version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:739
+#, fuzzy
+msgid "Equipment version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:741
+#, fuzzy
+msgid "Serial number"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+#, fuzzy
+msgid "Lens Serial Number"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+#, fuzzy
+msgid "Lens serial number"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:747 src/properties.cpp:374
+#, fuzzy
+msgid "Lens Model"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:747
+#, fuzzy
+msgid "Lens model"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:748
+#, fuzzy
+msgid "Lens Firmware Version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:748
+#, fuzzy
+msgid "Lens firmware version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:753
+#, fuzzy
+msgid "Max Aperture At Current Focal"
+msgstr "apertura"
+
+#: src/olympusmn.cpp:753
+#, fuzzy
+msgid "Max aperture at current focal"
+msgstr "apertura"
+
+#: src/olympusmn.cpp:754
+#, fuzzy
+msgid "Lens Properties"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:754
+#, fuzzy
+msgid "Lens properties"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:755
+#, fuzzy
+msgid "Extender"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:756
+#, fuzzy
+msgid "Extender Serial Number"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:756
+#, fuzzy
+msgid "Extender serial number"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:757
+#, fuzzy
+msgid "Extender Model"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:757
+#, fuzzy
+msgid "Extender model"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:758
+#, fuzzy
+msgid "Extender Firmware Version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:758
+#, fuzzy
+msgid "Extender firmwareversion"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:760 src/properties.cpp:370
+#, fuzzy
+msgid "Flash Model"
+msgstr "Flash"
+
+#: src/olympusmn.cpp:760
+#, fuzzy
+msgid "Flash model"
+msgstr "Flash"
+
+#: src/olympusmn.cpp:761
+#, fuzzy
+msgid "Flash Firmware Version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:761
+#, fuzzy
+msgid "Flash firmware version"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:762
+#, fuzzy
+msgid "FlashSerialNumber"
+msgstr "El número F."
+
+#: src/olympusmn.cpp:764
+#, fuzzy
+msgid "Unknown OlympusEq tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
+#, fuzzy
+msgid "High Speed"
+msgstr "Escena nocturna"
+
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
+#, fuzzy
+msgid "High Function"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:783
+#, fuzzy
+msgid "Advanced High Speed"
+msgstr "Escena nocturna"
+
+#: src/olympusmn.cpp:784
+#, fuzzy
+msgid "Advanced High Function"
+msgstr "Función de transferencia"
+
+#: src/olympusmn.cpp:789
+#, fuzzy
+msgid "Original"
+msgstr "Fecha y Hora (original)"
+
+#: src/olympusmn.cpp:790
+#, fuzzy
+msgid "Edited (Landscape)"
+msgstr "Paisaje"
+
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
+#, fuzzy
+msgid "Edited (Portrait)"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:797
+#, fuzzy
+msgid "WB Color Temp"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:798
+#, fuzzy
+msgid "WB Gray Point"
+msgstr "Punto blanco"
+
+#: src/olympusmn.cpp:808
+#, fuzzy
+msgid "Raw Development Version"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:808
+#, fuzzy
+msgid "Raw development version"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
+#, fuzzy
+msgid "Exposure Bias Value"
+msgstr "Ajuste de exposición"
+
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
+#, fuzzy
+msgid "Exposure bias value"
+msgstr "Ajuste de exposición"
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+#, fuzzy
+msgid "White Balance Value"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+#, fuzzy
+msgid "White balance value"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
+#, fuzzy
+msgid "WB Fine Adjustment"
+msgstr "Longitud de la imagen"
+
+#: src/olympusmn.cpp:811
+#, fuzzy
+msgid "WB fine adjustment"
+msgstr "Longitud de la imagen"
+
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
+#, fuzzy
+msgid "Gray Point"
+msgstr "Punto blanco"
+
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
+#, fuzzy
+msgid "Gray point"
+msgstr "Punto blanco"
+
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+#, fuzzy
+msgid "Saturation Emphasis"
+msgstr "Alta saturación"
+
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+#, fuzzy
+msgid "Saturation emphasis"
+msgstr "Alta saturación"
+
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
+msgid "Memory Color Emphasis"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
+msgid "Memory color emphasis"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+#, fuzzy
+msgid "Contrast Value"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+#, fuzzy
+msgid "Contrast value"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+#, fuzzy
+msgid "Sharpness Value"
+msgstr "Nitidez"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+#, fuzzy
+msgid "Sharpness value"
+msgstr "Nitidez"
+
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
+#, fuzzy
+msgid "Engine"
+msgstr "Centímetro"
+
+#: src/olympusmn.cpp:820
+#, fuzzy
+msgid "Edit status"
+msgstr "Vista distante"
+
+#: src/olympusmn.cpp:821
+#, fuzzy
+msgid "Settings"
+msgstr "Velocidad ISO"
+
+#: src/olympusmn.cpp:823
+#, fuzzy
+msgid "Unknown OlympusRd tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:878
+#, fuzzy
+msgid "Raw Development 2 Version"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:878
+#, fuzzy
+msgid "Raw development 2 version"
+msgstr "Orientación"
+
+#: src/olympusmn.cpp:882
+#, fuzzy
+msgid "White balance fine adjustment"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:892
+#, fuzzy
+msgid "PM Saturation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:893
+#, fuzzy
+msgid "PM Contrast"
+msgstr "Contraste"
+
+#: src/olympusmn.cpp:894
+#, fuzzy
+msgid "PM Sharpness"
+msgstr "Nitidez"
+
+#: src/olympusmn.cpp:895
+#, fuzzy
+msgid "PM BW Filter"
+msgstr "Orden de llenado"
+
+#: src/olympusmn.cpp:895
+#, fuzzy
+msgid "PM BW filter"
+msgstr "Orden de llenado"
+
+#: src/olympusmn.cpp:896
+#, fuzzy
+msgid "PM Picture Tone"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:896
+#, fuzzy
+msgid "PM picture tone"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:899
+#, fuzzy
+msgid "Auto Gradation"
+msgstr "Baja saturación"
+
+#: src/olympusmn.cpp:899
+#, fuzzy
+msgid "Auto gradation"
+msgstr "Baja saturación"
+
+#: src/olympusmn.cpp:900
+#, fuzzy
+msgid "PM Noise Filter"
+msgstr "Orden de llenado"
+
+#: src/olympusmn.cpp:900
+#, fuzzy
+msgid "Picture mode noise filter"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:902
+#, fuzzy
+msgid "Unknown OlympusRd2 tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:913
+msgid "On (2 frames)"
+msgstr ""
+
+#: src/olympusmn.cpp:914
+msgid "On (3 frames)"
+msgstr ""
+
+#: src/olympusmn.cpp:919
+msgid "4:3"
+msgstr ""
+
+#: src/olympusmn.cpp:920
+#, fuzzy
+msgid "3:2"
+msgstr "D75"
+
+#: src/olympusmn.cpp:921
+msgid "16:9"
+msgstr ""
+
+#: src/olympusmn.cpp:922
+msgid "6:6"
+msgstr ""
+
+#: src/olympusmn.cpp:923
+msgid "5:4"
+msgstr ""
+
+#: src/olympusmn.cpp:924
+msgid "7:6"
+msgstr ""
+
+#: src/olympusmn.cpp:925
+#, fuzzy
+msgid "6:5"
+msgstr "D65"
+
+#: src/olympusmn.cpp:926
+#, fuzzy
+msgid "7:5"
+msgstr "D75"
+
+#: src/olympusmn.cpp:927
+msgid "3:4"
+msgstr ""
+
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image Processing Version"
+msgstr "Longitud de la imagen"
+
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image processing version"
+msgstr "Configuración planar"
+
+#: src/olympusmn.cpp:933
+#, fuzzy
+msgid "WB RB Levels 3000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:933
+#, fuzzy
+msgid "WB RB levels 3000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:934
+#, fuzzy
+msgid "WB RB Levels 3300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:934
+#, fuzzy
+msgid "WB RB levels 3300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:935
+#, fuzzy
+msgid "WB RB Levels 3600K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:935
+#, fuzzy
+msgid "WB RB levels 3600K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:936
+#, fuzzy
+msgid "WB RB Levels 3900K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:936
+#, fuzzy
+msgid "WB RB levels 3900K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:937
+#, fuzzy
+msgid "WB RB Levels 4000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:937
+#, fuzzy
+msgid "WB RB levels 4000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:938
+#, fuzzy
+msgid "WB RB Levels 4300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:938
+#, fuzzy
+msgid "WB RB levels 4300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:939
+#, fuzzy
+msgid "WB RB Levels 4500K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:939
+#, fuzzy
+msgid "WB RB levels 4500K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:940
+#, fuzzy
+msgid "WB RB Levels 4800K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:940
+#, fuzzy
+msgid "WB RB levels 4800K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:941
+#, fuzzy
+msgid "WB RB Levels 5300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:941
+#, fuzzy
+msgid "WB RB levels 5300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:942
+#, fuzzy
+msgid "WB RB Levels 6000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:942
+#, fuzzy
+msgid "WB RB levels 6000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:943
+#, fuzzy
+msgid "WB RB Levels 6600K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:943
+#, fuzzy
+msgid "WB RB levels 6600K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:944
+#, fuzzy
+msgid "WB RB Levels 7500K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:944
+#, fuzzy
+msgid "WB RB levels 7500K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:945
+#, fuzzy
+msgid "WB RB Levels CWB1"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:945
+#, fuzzy
+msgid "WB RB levels CWB1"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:946
+#, fuzzy
+msgid "WB RB Levels CWB2"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:946
+#, fuzzy
+msgid "WB RB levels CWB2"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:947
+#, fuzzy
+msgid "WB RB Levels CWB3"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:947
+#, fuzzy
+msgid "WB RB levels CWB3"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:948
+#, fuzzy
+msgid "WB RB Levels CWB4"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:948
+#, fuzzy
+msgid "WB RB levels CWB4"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:949
+#, fuzzy
+msgid "WB G Level 3000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:949
+#, fuzzy
+msgid "WB G level 3000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:950
+#, fuzzy
+msgid "WB G Level 3300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:950
+#, fuzzy
+msgid "WB G level 3300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:951
+#, fuzzy
+msgid "WB G Level 3600K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:951
+#, fuzzy
+msgid "WB G level 3600K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:952
+#, fuzzy
+msgid "WB G Level 3900K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:952
+#, fuzzy
+msgid "WB G level 3900K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:953
+#, fuzzy
+msgid "WB G Level 4000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:953
+#, fuzzy
+msgid "WB G level 4000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:954
+#, fuzzy
+msgid "WB G Level 4300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:954
+#, fuzzy
+msgid "WB G level 4300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:955
+#, fuzzy
+msgid "WB G Level 4500K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:955
+#, fuzzy
+msgid "WB G level 4500K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:956
+#, fuzzy
+msgid "WB G Level 4800K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:956
+#, fuzzy
+msgid "WB G level 4800K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:957
+#, fuzzy
+msgid "WB G Level 5300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:957
+#, fuzzy
+msgid "WB G level 5300K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:958
+#, fuzzy
+msgid "WB G Level 6000K"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:958
+#, fuzzy
+msgid "WB G level 6000K"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:857
-msgid "WB RB levels 4300K"
-msgstr ""
+#: src/olympusmn.cpp:959
+#, fuzzy
+msgid "WB G Level 6600K"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:858
-msgid "WB RB Levels 4500K"
-msgstr ""
+#: src/olympusmn.cpp:959
+#, fuzzy
+msgid "WB G level 6600K"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:858
-msgid "WB RB levels 4500K"
-msgstr ""
+#: src/olympusmn.cpp:960
+#, fuzzy
+msgid "WB G Level 7500K"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB Levels 4800K"
-msgstr ""
+#: src/olympusmn.cpp:960
+#, fuzzy
+msgid "WB G level 7500K"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB levels 4800K"
-msgstr ""
+#: src/olympusmn.cpp:961
+#, fuzzy
+msgid "WB G Level"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:860
-msgid "WB RB Levels 5300K"
+#: src/olympusmn.cpp:961
+#, fuzzy
+msgid "WB G level"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:963
+#, fuzzy
+msgid "Enhancer"
+msgstr "Centímetro"
+
+#: src/olympusmn.cpp:964
+#, fuzzy
+msgid "Enhancer Values"
+msgstr "Centímetro"
+
+#: src/olympusmn.cpp:964
+#, fuzzy
+msgid "Enhancer values"
+msgstr "Centímetro"
+
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
+msgid "Coring Filter"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring Values"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring values"
+msgstr "Espacio de color"
+
+#: src/olympusmn.cpp:967 src/tags.cpp:913
+#, fuzzy
+msgid "Black Level"
+msgstr "Nivel de la batería"
+
+#: src/olympusmn.cpp:968
+msgid "Gain Base"
 msgstr ""
 
-#: src/olympusmn.cpp:860
-msgid "WB RB levels 5300K"
+#: src/olympusmn.cpp:968
+msgid "Gain base"
 msgstr ""
 
-#: src/olympusmn.cpp:861
-msgid "WB RB Levels 6000K"
+#: src/olympusmn.cpp:969
+msgid "Valid Bits"
 msgstr ""
 
-#: src/olympusmn.cpp:861
-msgid "WB RB levels 6000K"
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
+#, fuzzy
+msgid "Crop Left"
+msgstr "arriba - izquierda"
+
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
+#, fuzzy
+msgid "Crop left"
+msgstr "arriba - izquierda"
+
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
+#, fuzzy
+msgid "Crop Top"
+msgstr "izquierda - abajo"
+
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
+#, fuzzy
+msgid "Crop top"
+msgstr "izquierda - abajo"
+
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
+#, fuzzy
+msgid "Crop Width"
+msgstr "Copyright"
+
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
+#, fuzzy
+msgid "Crop width"
+msgstr "Copyright"
+
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
+#, fuzzy
+msgid "Crop Height"
+msgstr "Copyright"
+
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
+#, fuzzy
+msgid "Crop height"
+msgstr "Copyright"
+
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple Exposure Mode"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple exposure mode"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+msgid "Aspect Ratio"
+msgstr "Ratio de aspecto"
+
+#: src/olympusmn.cpp:978
+#, fuzzy
+msgid "Aspect ratio"
+msgstr "Ratio de aspecto"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect Frame"
+msgstr "Ratio de aspecto"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect frame"
+msgstr "Ratio de aspecto"
+
+#: src/olympusmn.cpp:980
+#, fuzzy
+msgid "Face Detect"
+msgstr "Fuente de archivo"
+
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+#, fuzzy
+msgid "Face detect"
+msgstr "Fuente de archivo"
+
+#: src/olympusmn.cpp:981
+#, fuzzy
+msgid "Face Detect Area"
+msgstr "Fuente de archivo"
+
+#: src/olympusmn.cpp:981
+#, fuzzy
+msgid "Face detect area"
+msgstr "Fuente de archivo"
+
+#: src/olympusmn.cpp:983
+#, fuzzy
+msgid "Unknown OlympusIp tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:993
+msgid "Bounce or Off"
 msgstr ""
 
-#: src/olympusmn.cpp:862
-msgid "WB RB Levels 6600K"
+#: src/olympusmn.cpp:994
+msgid "Direct"
 msgstr ""
 
-#: src/olympusmn.cpp:862
-msgid "WB RB levels 6600K"
-msgstr ""
+#: src/olympusmn.cpp:998
+#, fuzzy
+msgid "Focus Info Version"
+msgstr "Posicionamiento YCbCr"
+
+#: src/olympusmn.cpp:998
+#, fuzzy
+msgid "Focus info version"
+msgstr "Posicionamiento YCbCr"
+
+#: src/olympusmn.cpp:999
+#, fuzzy
+msgid "Auto Focus"
+msgstr "Exposición automática"
+
+#: src/olympusmn.cpp:1000
+#, fuzzy
+msgid "Scene Detect"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:1000
+#, fuzzy
+msgid "Scene detect"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:1001
+#, fuzzy
+msgid "Scene Area"
+msgstr "centrado"
+
+#: src/olympusmn.cpp:1001
+#, fuzzy
+msgid "Scene area"
+msgstr "Nombre del documento"
+
+#: src/olympusmn.cpp:1002
+#, fuzzy
+msgid "Scene Detect Data"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:1002
+#, fuzzy
+msgid "Scene detect data"
+msgstr "Tipo de escena"
+
+#: src/olympusmn.cpp:1003
+#, fuzzy
+msgid "Zoom Step Count"
+msgstr "obturador"
+
+#: src/olympusmn.cpp:1004
+#, fuzzy
+msgid "Focus Step Count"
+msgstr "Exposición automática"
+
+#: src/olympusmn.cpp:1004
+#, fuzzy
+msgid "Focus step count"
+msgstr "Posicionamiento YCbCr"
+
+#: src/olympusmn.cpp:1005
+#, fuzzy
+msgid "Focus Step Infinity"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:1005
+#, fuzzy
+msgid "Focus step infinity"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:1006
+#, fuzzy
+msgid "Focus Step Near"
+msgstr "Modo de exposición"
+
+#: src/olympusmn.cpp:1006
+#, fuzzy
+msgid "Focus step near"
+msgstr "Balance de blanco manual"
+
+#: src/olympusmn.cpp:1009
+#, fuzzy
+msgid "External Flash"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:1010
+#, fuzzy
+msgid "External Flash Guide Number"
+msgstr "Flash"
+
+#: src/olympusmn.cpp:1010
+#, fuzzy
+msgid "External flash guide number"
+msgstr "Retrato"
+
+#: src/olympusmn.cpp:1014
+#, fuzzy
+msgid "Manual Flash"
+msgstr "Exposición manual"
+
+#: src/olympusmn.cpp:1014
+#, fuzzy
+msgid "Manual flash"
+msgstr "Exposición manual"
+
+#: src/olympusmn.cpp:1018
+#, fuzzy
+msgid "Unknown OlympusFi tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:1029
+#, fuzzy
+msgid "Unknown OlympusFe tag"
+msgstr "Versión Exif"
+
+#: src/olympusmn.cpp:1042
+#, fuzzy
+msgid "Fine Weather"
+msgstr "Tiempo bueno"
 
-#: src/olympusmn.cpp:863
-msgid "WB RB Levels 7500K"
-msgstr ""
+#: src/olympusmn.cpp:1043
+#, fuzzy
+msgid "Tungsten (incandescent)"
+msgstr "Tungsteno (luz incandescente)"
 
-#: src/olympusmn.cpp:863
-msgid "WB RB levels 7500K"
+#: src/olympusmn.cpp:1044
+msgid "Evening Sunlight"
 msgstr ""
 
-#: src/olympusmn.cpp:864
-msgid "WB RB Levels CWB1"
-msgstr ""
+#: src/olympusmn.cpp:1045
+#, fuzzy
+msgid "Daylight Fluorescent (D 5700 - 7100K)"
+msgstr "Luz de día fluorescente"
 
-#: src/olympusmn.cpp:864
-msgid "WB RB levels CWB1"
-msgstr ""
+#: src/olympusmn.cpp:1046
+#, fuzzy
+msgid "Day White Fluorescent (N 4600 - 5400K)"
+msgstr "Día blanco fluorescente"
 
-#: src/olympusmn.cpp:865
-msgid "WB RB Levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:1047
+#, fuzzy
+msgid "Cool White Fluorescent (W 3900 - 4500K)"
+msgstr "Blanco frío fluorescente"
 
-#: src/olympusmn.cpp:865
-msgid "WB RB levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:1048
+#, fuzzy
+msgid "White Fluorescent (WW 3200 - 3700K)"
+msgstr "Blanco fluorescente"
 
-#: src/olympusmn.cpp:866
-msgid "WB RB Levels CWB3"
-msgstr ""
+#: src/olympusmn.cpp:1049
+#, fuzzy
+msgid "One Touch White Balance"
+msgstr "Balance de blanco automático"
 
-#: src/olympusmn.cpp:866
-msgid "WB RB levels CWB3"
-msgstr ""
+#: src/olympusmn.cpp:1050
+#, fuzzy
+msgid "Custom 1-4"
+msgstr "Proceso personalizado"
 
-#: src/olympusmn.cpp:867
-msgid "WB RB Levels CWB4"
-msgstr ""
+#: src/olympusmn.cpp:1054
+#, fuzzy
+msgid "Raw Info Version"
+msgstr "Posicionamiento YCbCr"
 
-#: src/olympusmn.cpp:867
-msgid "WB RB levels CWB4"
-msgstr ""
+#: src/olympusmn.cpp:1054
+#, fuzzy
+msgid "Raw info version"
+msgstr "Orientación"
 
-#: src/olympusmn.cpp:868
-msgid "WB G Level 3000K"
-msgstr ""
+#: src/olympusmn.cpp:1055
+#, fuzzy
+msgid "WB_RB Levels Used"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:868
-msgid "WB G level 3000K"
-msgstr ""
+#: src/olympusmn.cpp:1055
+#, fuzzy
+msgid "WB_RB levels used"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:869
-msgid "WB G Level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:1056
+#, fuzzy
+msgid "WB_RB Levels Auto"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:869
-msgid "WB G level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:1056
+#, fuzzy
+msgid "WB_RB levels auto"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:870
-msgid "WB G Level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:1057
+#, fuzzy
+msgid "WB_RB Levels Shade"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:870
-msgid "WB G level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:1057
+#, fuzzy
+msgid "WB_RB levels shade"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:871
-msgid "WB G Level 3900K"
-msgstr ""
+#: src/olympusmn.cpp:1058
+#, fuzzy
+msgid "WB_RB Levels Cloudy"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:871
-msgid "WB G level 3900K"
-msgstr ""
+#: src/olympusmn.cpp:1058
+#, fuzzy
+msgid "WB_RB levels cloudy"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:872
-msgid "WB G Level 4000K"
-msgstr ""
+#: src/olympusmn.cpp:1059
+#, fuzzy
+msgid "WB_RB Levels Fine Weather"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:872
-msgid "WB G level 4000K"
-msgstr ""
+#: src/olympusmn.cpp:1059
+#, fuzzy
+msgid "WB_RB levels fine weather"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:873
-msgid "WB G Level 4300K"
-msgstr ""
+#: src/olympusmn.cpp:1060
+#, fuzzy
+msgid "WB_RB Levels Tungsten"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:873
-msgid "WB G level 4300K"
-msgstr ""
+#: src/olympusmn.cpp:1060
+#, fuzzy
+msgid "WB_RB levels tungsten"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:874
-msgid "WB G Level 4500K"
-msgstr ""
+#: src/olympusmn.cpp:1061
+#, fuzzy
+msgid "WB_RB Levels Evening Sunlight"
+msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:874
-msgid "WB G level 4500K"
-msgstr ""
+#: src/olympusmn.cpp:1061
+#, fuzzy
+msgid "WB_RB levels evening sunlight"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:875
-msgid "WB G Level 4800K"
-msgstr ""
+#: src/olympusmn.cpp:1062
+#, fuzzy
+msgid "WB_RB Levels Daylight Fluor"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:875
-msgid "WB G level 4800K"
-msgstr ""
+#: src/olympusmn.cpp:1062
+#, fuzzy
+msgid "WB_RB levels daylight fluor"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:876
-msgid "WB G Level 5300K"
-msgstr ""
+#: src/olympusmn.cpp:1063
+#, fuzzy
+msgid "WB_RB Levels Day White Fluor"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:876
-msgid "WB G level 5300K"
-msgstr ""
+#: src/olympusmn.cpp:1063
+#, fuzzy
+msgid "WB_RB levels day white fluor"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:877
-msgid "WB G Level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:1064
+#, fuzzy
+msgid "WB_RB Levels Cool White Fluor"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:877
-msgid "WB G level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:1064
+#, fuzzy
+msgid "WB_RB levels cool white fluor"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:878
-msgid "WB G Level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:1065
+#, fuzzy
+msgid "WB_RB Levels White Fluorescent"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:878
-msgid "WB G level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:1065
+#, fuzzy
+msgid "WB_RB levels white fluorescent"
+msgstr "Fluorescente"
 
-#: src/olympusmn.cpp:879
-msgid "WB G Level 7500K"
-msgstr ""
+#: src/olympusmn.cpp:1066
+#, fuzzy
+msgid "Color Matrix2"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:879
-msgid "WB G level 7500K"
-msgstr ""
+#: src/olympusmn.cpp:1066
+#, fuzzy
+msgid "Color matrix 2"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:1069
 #, fuzzy
-msgid "WB G Level"
+msgid "Black Level 2"
 msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:1069
 #, fuzzy
-msgid "WB G level"
+msgid "Black level 2"
 msgstr "Nivel de la batería"
 
-#: src/olympusmn.cpp:882
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
+msgid "YCbCr Coefficients"
+msgstr "Coeficientes YCbCr"
+
+#: src/olympusmn.cpp:1070
 #, fuzzy
-msgid "Enhancer"
-msgstr "Centímetro"
+msgid "YCbCr coefficients"
+msgstr "Coeficientes YCbCr"
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer Values"
+#: src/olympusmn.cpp:1071
+msgid "Valid Pixel Depth"
 msgstr ""
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer values"
+#: src/olympusmn.cpp:1071
+msgid "Valid pixel depth"
 msgstr ""
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:1077
 #, fuzzy
-msgid "Coring Filter"
-msgstr "Espacio de color"
+msgid "White Balance Comp"
+msgstr "Balance de blanco"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:1077
 #, fuzzy
-msgid "Coring Values"
-msgstr "Espacio de color"
+msgid "White balance comp"
+msgstr "Balance de blanco"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:1078
 #, fuzzy
-msgid "Coring values"
-msgstr "Espacio de color"
+msgid "Saturation Setting"
+msgstr "Alta saturación"
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
+#: src/olympusmn.cpp:1079
 #, fuzzy
-msgid "Black Level"
-msgstr "Nivel de la batería"
+msgid "Hue Setting"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:887
-msgid "Gain Base"
-msgstr ""
+#: src/olympusmn.cpp:1079
+#, fuzzy
+msgid "Hue setting"
+msgstr "Velocidad ISO"
 
-#: src/olympusmn.cpp:887
-msgid "Gain base"
-msgstr ""
+#: src/olympusmn.cpp:1082
+#, fuzzy
+msgid "CM Exposure Compensation"
+msgstr "Tiempo de exposición"
 
-#: src/olympusmn.cpp:888
-msgid "Valid Bits"
-msgstr ""
+#: src/olympusmn.cpp:1082
+#, fuzzy
+msgid "CM exposure compensation"
+msgstr "Tiempo de exposición"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
+#: src/olympusmn.cpp:1083
 #, fuzzy
-msgid "Crop Left"
-msgstr "arriba - izquierda"
+msgid "CM White Balance"
+msgstr "Balance de blanco"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
+#: src/olympusmn.cpp:1083
 #, fuzzy
-msgid "Crop left"
-msgstr "arriba - izquierda"
+msgid "CM white balance"
+msgstr "Balance de blanco manual"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
+#: src/olympusmn.cpp:1084
 #, fuzzy
-msgid "Crop Top"
-msgstr "izquierda - abajo"
+msgid "CM White Balance Comp"
+msgstr "Balance de blanco"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
+#: src/olympusmn.cpp:1084
 #, fuzzy
-msgid "Crop top"
-msgstr "izquierda - abajo"
+msgid "CM white balance comp"
+msgstr "Balance de blanco manual"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
+#: src/olympusmn.cpp:1085
 #, fuzzy
-msgid "Crop Width"
-msgstr "Copyright"
+msgid "CM White Balance Gray Point"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:1085
+#, fuzzy
+msgid "CM white balance gray point"
+msgstr "Balance de blanco"
+
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM Saturation"
+msgstr "Saturación"
+
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM saturation"
+msgstr "Saturación"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
+#: src/olympusmn.cpp:1087
 #, fuzzy
-msgid "Crop width"
-msgstr "Copyright"
+msgid "CM Hue"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
+#: src/olympusmn.cpp:1087
 #, fuzzy
-msgid "Crop Height"
-msgstr "Copyright"
+msgid "CM hue"
+msgstr "Espacio de color"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
+#: src/olympusmn.cpp:1088
 #, fuzzy
-msgid "Crop height"
-msgstr "Copyright"
-
-#: src/olympusmn.cpp:896
-msgid "Face Detect"
-msgstr ""
+msgid "CM Contrast"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:896
-msgid "Face detect"
-msgstr ""
+#: src/olympusmn.cpp:1088
+#, fuzzy
+msgid "CM contrast"
+msgstr "Contraste"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:1089
 #, fuzzy
-msgid "Face Detect Area"
-msgstr "Fuente de archivo"
+msgid "CM Sharpness"
+msgstr "Nitidez"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:1089
 #, fuzzy
-msgid "Face detect area"
-msgstr "Fuente de archivo"
+msgid "CM sharpness"
+msgstr "Nitidez"
 
-#: src/olympusmn.cpp:899
+#: src/olympusmn.cpp:1091
 #, fuzzy
-msgid "Unknown OlympusIp tag"
+msgid "Unknown OlympusRi tag"
 msgstr "Versión Exif"
 
-#: src/olympusmn.cpp:909
-msgid "Bounce or Off"
-msgstr ""
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
+#, fuzzy
+msgid "User-Selected"
+msgstr "Auto bracket"
 
-#: src/olympusmn.cpp:910
-msgid "Direct"
+#: src/olympusmn.cpp:1115
+msgid "Auto-Override"
 msgstr ""
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:1151
 #, fuzzy
-msgid "Focus Info Version"
-msgstr "Posicionamiento YCbCr"
+msgid "Fast"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:914
-#, fuzzy
-msgid "Focus info version"
-msgstr "Posicionamiento YCbCr"
+#: src/olympusmn.cpp:1208
+msgid "3000 Kelvin"
+msgstr ""
 
-#: src/olympusmn.cpp:915
-#, fuzzy
-msgid "Auto Focus"
-msgstr "Exposición automática"
+#: src/olympusmn.cpp:1209
+msgid "3700 Kelvin"
+msgstr ""
 
-#: src/olympusmn.cpp:916
-#, fuzzy
-msgid "Scene Detect"
-msgstr "Tipo de escena"
+#: src/olympusmn.cpp:1210
+msgid "4000 Kelvin"
+msgstr ""
 
-#: src/olympusmn.cpp:916
-#, fuzzy
-msgid "Scene detect"
-msgstr "Tipo de escena"
+#: src/olympusmn.cpp:1211
+msgid "4500 Kelvin"
+msgstr ""
 
-#: src/olympusmn.cpp:917
-#, fuzzy
-msgid "Scene Area"
-msgstr "centrado"
+#: src/olympusmn.cpp:1212
+msgid "5500 Kelvin"
+msgstr ""
 
-#: src/olympusmn.cpp:917
-#, fuzzy
-msgid "Scene area"
-msgstr "Nombre del documento"
+#: src/olympusmn.cpp:1213
+msgid "6500 Kelvin"
+msgstr ""
 
-#: src/olympusmn.cpp:918
-msgid "Scene Detect Data"
+#: src/olympusmn.cpp:1214
+msgid "7500 Kelvin"
 msgstr ""
 
-#: src/olympusmn.cpp:918
-msgid "Scene detect data"
+#: src/olympusmn.cpp:1220
+msgid "One-touch"
 msgstr ""
 
-#: src/olympusmn.cpp:919
-#, fuzzy
-msgid "Zoom Step Count"
-msgstr "obturador"
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
+msgstr ""
 
-#: src/olympusmn.cpp:920
-#, fuzzy
-msgid "Focus Step Count"
-msgstr "Exposición automática"
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
+msgstr ""
 
-#: src/olympusmn.cpp:920
-#, fuzzy
-msgid "Focus step count"
-msgstr "Posicionamiento YCbCr"
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:921
-#, fuzzy
-msgid "Focus Step Infinity"
-msgstr "Modo de exposición"
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
+msgstr ""
 
-#: src/olympusmn.cpp:921
-#, fuzzy
-msgid "Focus step infinity"
-msgstr "Modo de exposición"
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
+msgstr ""
 
-#: src/olympusmn.cpp:922
-#, fuzzy
-msgid "Focus Step Near"
-msgstr "Modo de exposición"
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
+msgstr ""
 
-#: src/olympusmn.cpp:922
-#, fuzzy
-msgid "Focus step near"
-msgstr "Balance de blanco manual"
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
+msgstr ""
 
-#: src/olympusmn.cpp:925
-#, fuzzy
-msgid "External Flash"
-msgstr "Retrato"
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
+msgstr ""
 
-#: src/olympusmn.cpp:926
-#, fuzzy
-msgid "External Flash Guide Number"
-msgstr "Flash"
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
+msgstr ""
 
-#: src/olympusmn.cpp:926
-#, fuzzy
-msgid "External flash guide number"
-msgstr "Retrato"
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
+msgstr ""
 
-#: src/olympusmn.cpp:930
-#, fuzzy
-msgid "Manual Flash"
-msgstr "Exposición manual"
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
+msgstr ""
 
-#: src/olympusmn.cpp:930
-#, fuzzy
-msgid "Manual flash"
-msgstr "Exposición manual"
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
+msgstr ""
 
-#: src/olympusmn.cpp:934
-#, fuzzy
-msgid "Unknown OlympusFi tag"
-msgstr "Versión Exif"
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:945
-#, fuzzy
-msgid "Unknown OlympusFe tag"
-msgstr "Versión Exif"
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
+msgstr ""
 
-#: src/olympusmn.cpp:958
-#, fuzzy
-msgid "Fine Weather"
-msgstr "Tiempo bueno"
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
+msgstr ""
 
-#: src/olympusmn.cpp:959
-#, fuzzy
-msgid "Tungsten (incandescent)"
-msgstr "Tungsteno (luz incandescente)"
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:960
-msgid "Evening Sunlight"
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
 msgstr ""
 
-#: src/olympusmn.cpp:961
-#, fuzzy
-msgid "Daylight Fluorescent (D 5700 - 7100K)"
-msgstr "Luz de día fluorescente"
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:962
-#, fuzzy
-msgid "Day White Fluorescent (N 4600 - 5400K)"
-msgstr "Día blanco fluorescente"
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:963
-#, fuzzy
-msgid "Cool White Fluorescent (W 3900 - 4500K)"
-msgstr "Blanco frío fluorescente"
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
+msgstr ""
 
-#: src/olympusmn.cpp:964
-#, fuzzy
-msgid "White Fluorescent (WW 3200 - 3700K)"
-msgstr "Blanco fluorescente"
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
+msgstr ""
 
-#: src/olympusmn.cpp:965
-#, fuzzy
-msgid "One Touch White Balance"
-msgstr "Balance de blanco automático"
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
+msgstr ""
 
-#: src/olympusmn.cpp:966
-#, fuzzy
-msgid "Custom 1-4"
-msgstr "Proceso personalizado"
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
+msgstr ""
 
-#: src/olympusmn.cpp:970
-#, fuzzy
-msgid "Raw Info Version"
-msgstr "Posicionamiento YCbCr"
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:970
-#, fuzzy
-msgid "Raw info version"
-msgstr "Orientación"
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
+msgstr ""
 
-#: src/olympusmn.cpp:971
-#, fuzzy
-msgid "WB_RB Levels Used"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:971
-#, fuzzy
-msgid "WB_RB levels used"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
+msgstr ""
 
-#: src/olympusmn.cpp:972
-#, fuzzy
-msgid "WB_RB Levels Auto"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
+msgstr ""
 
-#: src/olympusmn.cpp:972
-#, fuzzy
-msgid "WB_RB levels auto"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:973
-#, fuzzy
-msgid "WB_RB Levels Shade"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
+msgstr ""
 
-#: src/olympusmn.cpp:973
-#, fuzzy
-msgid "WB_RB levels shade"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
+msgstr ""
 
-#: src/olympusmn.cpp:974
-#, fuzzy
-msgid "WB_RB Levels Cloudy"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
+msgstr ""
 
-#: src/olympusmn.cpp:974
-#, fuzzy
-msgid "WB_RB levels cloudy"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
+msgstr ""
 
-#: src/olympusmn.cpp:975
-#, fuzzy
-msgid "WB_RB Levels Fine Weather"
-msgstr "Fluorescente"
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
+msgstr ""
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB levels fine weather"
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
 msgstr ""
 
-#: src/olympusmn.cpp:976
-#, fuzzy
-msgid "WB_RB Levels Tungsten"
-msgstr "Nivel de la batería"
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
+msgstr ""
 
-#: src/olympusmn.cpp:976
-#, fuzzy
-msgid "WB_RB levels tungsten"
-msgstr "Fluorescente"
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
+msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB Levels Evening Sunlight"
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB levels evening sunlight"
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
 msgstr ""
 
-#: src/olympusmn.cpp:978
-#, fuzzy
-msgid "WB_RB Levels Daylight Fluor"
-msgstr "Fluorescente"
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
+msgstr ""
 
-#: src/olympusmn.cpp:978
-msgid "WB_RB levels daylight fluor"
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
 msgstr ""
 
-#: src/olympusmn.cpp:979
-#, fuzzy
-msgid "WB_RB Levels Day White Fluor"
-msgstr "Fluorescente"
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:979
-msgid "WB_RB levels day white fluor"
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB Levels Cool White Fluor"
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB levels cool white fluor"
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
 msgstr ""
 
-#: src/olympusmn.cpp:981
-#, fuzzy
-msgid "WB_RB Levels White Fluorescent"
-msgstr "Fluorescente"
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
+msgstr ""
 
-#: src/olympusmn.cpp:981
-#, fuzzy
-msgid "WB_RB levels white fluorescent"
-msgstr "Fluorescente"
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
+msgstr ""
 
-#: src/olympusmn.cpp:982
-#, fuzzy
-msgid "Color Matrix2"
-msgstr "Espacio de color"
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
+msgstr ""
 
-#: src/olympusmn.cpp:982
-#, fuzzy
-msgid "Color matrix 2"
-msgstr "Espacio de color"
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
+msgstr ""
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1386
 #, fuzzy
-msgid "Black Level 2"
-msgstr "Nivel de la batería"
+msgid "Imager AF"
+msgstr "ID único de imagen"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1387
 #, fuzzy
-msgid "Black level 2"
-msgstr "Nivel de la batería"
-
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
-msgid "YCbCr Coefficients"
-msgstr "Coeficientes YCbCr"
+msgid "AF sensor"
+msgstr "Punto blanco"
 
-#: src/olympusmn.cpp:986
+#: src/olympusmn.cpp:1433
 #, fuzzy
-msgid "YCbCr coefficients"
-msgstr "Coeficientes YCbCr"
+msgid "Soft Focus"
+msgstr "Lugar"
 
-#: src/olympusmn.cpp:987
-msgid "Valid Pixel Depth"
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
 msgstr ""
 
-#: src/olympusmn.cpp:987
-msgid "Valid pixel depth"
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
 msgstr ""
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:1436
 #, fuzzy
-msgid "White Balance Comp"
-msgstr "Balance de blanco"
+msgid "Light Tone"
+msgstr "Escena nocturna"
 
-#: src/olympusmn.cpp:993
-#, fuzzy
-msgid "White balance comp"
-msgstr "Balance de blanco"
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
+msgstr ""
 
-#: src/olympusmn.cpp:994
-#, fuzzy
-msgid "Saturation Setting"
-msgstr "Alta saturación"
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
+msgstr ""
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:1439
 #, fuzzy
-msgid "Hue Setting"
-msgstr "Contraste"
+msgid "Diorama"
+msgstr "normal"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:1440
 #, fuzzy
-msgid "Hue setting"
-msgstr "Velocidad ISO"
+msgid "Cross Process"
+msgstr "Modo de exposición"
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:1441
 #, fuzzy
-msgid "CM Exposure Compensation"
-msgstr "Tiempo de exposición"
+msgid "Fish Eye"
+msgstr "Flash"
 
-#: src/olympusmn.cpp:998
-#, fuzzy
-msgid "CM exposure compensation"
-msgstr "Tiempo de exposición"
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
+msgstr ""
 
-#: src/olympusmn.cpp:999
+#: src/olympusmn.cpp:1489
 #, fuzzy
-msgid "CM White Balance"
-msgstr "Balance de blanco"
+msgid "Left (or n/a)"
+msgstr "Escena nocturna"
 
-#: src/olympusmn.cpp:999
-#, fuzzy
-msgid "CM white balance"
-msgstr "Balance de blanco manual"
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
+msgid "Center (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1000
-#, fuzzy
-msgid "CM White Balance Comp"
-msgstr "Balance de blanco"
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
+msgid "Center (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1000
-#, fuzzy
-msgid "CM white balance comp"
-msgstr "Balance de blanco manual"
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1001
+#: src/olympusmn.cpp:1504
 #, fuzzy
-msgid "CM White Balance Gray Point"
-msgstr "Balance de blanco"
+msgid "Top-center (horizontal)"
+msgstr "Centímetro"
 
-#: src/olympusmn.cpp:1001
-#, fuzzy
-msgid "CM white balance gray point"
-msgstr "Balance de blanco"
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:1506
 #, fuzzy
-msgid "CM Saturation"
-msgstr "Saturación"
+msgid "Left (horizontal)"
+msgstr "Escena nocturna"
 
-#: src/olympusmn.cpp:1002
-#, fuzzy
-msgid "CM saturation"
-msgstr "Saturación"
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1003
-#, fuzzy
-msgid "CM Hue"
-msgstr "Espacio de color"
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1003
+#: src/olympusmn.cpp:1510
 #, fuzzy
-msgid "CM hue"
-msgstr "Espacio de color"
+msgid "Right (horizontal)"
+msgstr "Escena nocturna"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:1511
 #, fuzzy
-msgid "CM Contrast"
-msgstr "Contraste"
+msgid "Bottom-left (horizontal)"
+msgstr "abajo - izquierda"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:1512
 #, fuzzy
-msgid "CM contrast"
-msgstr "Contraste"
+msgid "Bottom-center (horizontal)"
+msgstr "abajo - izquierda"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:1513
 #, fuzzy
-msgid "CM Sharpness"
-msgstr "Nitidez"
+msgid "Bottom-right (horizontal)"
+msgstr "abajo - derecha"
 
-#: src/olympusmn.cpp:1005
-#, fuzzy
-msgid "CM sharpness"
-msgstr "Nitidez"
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1007
+#: src/olympusmn.cpp:1515
 #, fuzzy
-msgid "Unknown OlympusRi tag"
-msgstr "Versión Exif"
+msgid "Top-center (vertical)"
+msgstr "Centímetro"
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
+#: src/olympusmn.cpp:1516
 #, fuzzy
-msgid "User-Selected"
-msgstr "Auto bracket"
+msgid "Top-right (vertical)"
+msgstr "Copyright"
 
-#: src/olympusmn.cpp:1031
-msgid "Auto-Override"
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
 msgstr ""
 
-#: src/olympusmn.cpp:1067
-#, fuzzy
-msgid "Fast"
-msgstr "Flash"
-
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
 msgstr ""
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:1520
+#, fuzzy
+msgid "Mid-right (vertical)"
+msgstr "Copyright"
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
 msgstr ""
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:1522
+#, fuzzy
+msgid "Bottom-left (vertical)"
+msgstr "abajo - izquierda"
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:1523
+#, fuzzy
+msgid "Bottom-center (vertical)"
+msgstr "abajo - izquierda"
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:1524
+#, fuzzy
+msgid "Bottom-right (vertical)"
+msgstr "abajo - derecha"
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:1561
+#, fuzzy
+msgid "Single Target"
+msgstr "Nombre del documento"
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
-msgstr ""
+#: src/olympusmn.cpp:1562
+#, fuzzy
+msgid "All Target"
+msgstr "promedio"
+
+#: src/olympusmn.cpp:1563
+#, fuzzy
+msgid "Dynamic Single Target"
+msgstr "Balance de blanco"
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
 #, fuzzy
 msgid "Very High"
 msgstr "Luz de día"
 
-#: src/panasonicmn.cpp:57
+#: src/panasonicmn.cpp:59
 #, fuzzy
 msgid "Motion Picture"
 msgstr "Modo de exposición"
 
-#: src/panasonicmn.cpp:65
+#: src/panasonicmn.cpp:67
 msgid "Halogen"
 msgstr ""
 
-#: src/panasonicmn.cpp:76
+#: src/panasonicmn.cpp:79
 #, fuzzy
 msgid "Auto, focus button"
 msgstr "Exposición automática"
 
-#: src/panasonicmn.cpp:77
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
 #, fuzzy
 msgid "Auto, continuous"
 msgstr "Exposición automática"
 
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
-msgstr ""
-
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
-msgstr ""
-
-#: src/panasonicmn.cpp:91
+#: src/panasonicmn.cpp:95
 #, fuzzy
 msgid "Tele-macro"
 msgstr "Macro"
 
-#: src/panasonicmn.cpp:99
+#: src/panasonicmn.cpp:103
 #, fuzzy
 msgid "Scenery"
 msgstr "centrado"
 
-#: src/panasonicmn.cpp:104
+#: src/panasonicmn.cpp:108
 #, fuzzy
 msgid "Shutter-speed priority"
 msgstr "Prioridad del obturador"
 
-#: src/panasonicmn.cpp:108
+#: src/panasonicmn.cpp:112
 #, fuzzy
 msgid "Movie preview"
 msgstr "Vista cercana"
 
-#: src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:113
+#, fuzzy
 msgid "Panning"
-msgstr ""
+msgstr "Nitidez"
 
-#: src/panasonicmn.cpp:110
+#: src/panasonicmn.cpp:114
 #, fuzzy
 msgid "Simple"
 msgstr "Orden de llenado"
 
-#: src/panasonicmn.cpp:111
+#: src/panasonicmn.cpp:115
 #, fuzzy
 msgid "Color effects"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:115
+#: src/panasonicmn.cpp:119
 #, fuzzy
 msgid "Night scenery"
 msgstr "Escena nocturna"
 
-#: src/panasonicmn.cpp:117
+#: src/panasonicmn.cpp:121
 msgid "Baby"
 msgstr ""
 
-#: src/panasonicmn.cpp:118
+#: src/panasonicmn.cpp:122
 #, fuzzy
 msgid "Soft skin"
 msgstr "Suave"
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
 #, fuzzy
 msgid "Candlelight"
 msgstr "Luz de día"
 
-#: src/panasonicmn.cpp:120
+#: src/panasonicmn.cpp:124
 #, fuzzy
 msgid "Starry night"
 msgstr "Luz estándar A"
 
-#: src/panasonicmn.cpp:121
+#: src/panasonicmn.cpp:125
 #, fuzzy
 msgid "High sensitivity"
 msgstr "Sensibilidad espectral"
 
-#: src/panasonicmn.cpp:122
+#: src/panasonicmn.cpp:126
 #, fuzzy
 msgid "Panorama assist"
 msgstr "normal"
 
-#: src/panasonicmn.cpp:125
+#: src/panasonicmn.cpp:129
 msgid "Aerial photo"
 msgstr ""
 
-#: src/panasonicmn.cpp:128
+#: src/panasonicmn.cpp:132
 msgid "Intelligent ISO"
 msgstr ""
 
-#: src/panasonicmn.cpp:129
+#: src/panasonicmn.cpp:133
 #, fuzzy
 msgid "High speed continuous shooting"
 msgstr "Modo de exposición"
 
-#: src/panasonicmn.cpp:130
+#: src/panasonicmn.cpp:134
 msgid "Intelligent auto"
 msgstr ""
 
-#: src/panasonicmn.cpp:142
+#: src/panasonicmn.cpp:146
+#, fuzzy
 msgid "Warm"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:143
+#: src/panasonicmn.cpp:147
 #, fuzzy
 msgid "Cool"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:151
+#: src/panasonicmn.cpp:155
 #, fuzzy
 msgid "Low/High quality"
 msgstr "Ancho de la imagen"
 
-#: src/panasonicmn.cpp:152
+#: src/panasonicmn.cpp:156
 msgid "Infinite"
 msgstr ""
 
-#: src/panasonicmn.cpp:160
+#: src/panasonicmn.cpp:164
+#, fuzzy
 msgid "Medium low"
-msgstr ""
+msgstr "Luz de día"
 
-#: src/panasonicmn.cpp:161
+#: src/panasonicmn.cpp:165
 #, fuzzy
 msgid "Medium high"
 msgstr "Luz de día"
 
-#: src/panasonicmn.cpp:170
+#: src/panasonicmn.cpp:175
 msgid "Low (-1)"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
+#: src/panasonicmn.cpp:176
 #, fuzzy
 msgid "High (+1)"
 msgstr "Luz de día"
 
-#: src/panasonicmn.cpp:172
+#: src/panasonicmn.cpp:177
 msgid "Lowest (-2)"
 msgstr ""
 
-#: src/panasonicmn.cpp:173
+#: src/panasonicmn.cpp:178
+#, fuzzy
 msgid "Highest (+2)"
-msgstr ""
+msgstr "Luz de día"
 
-#: src/panasonicmn.cpp:179
+#: src/panasonicmn.cpp:184
 msgid "10s"
 msgstr ""
 
-#: src/panasonicmn.cpp:180
+#: src/panasonicmn.cpp:185
 msgid "2s"
 msgstr ""
 
-#: src/panasonicmn.cpp:200
+#: src/panasonicmn.cpp:205
 msgid "EX optics"
 msgstr ""
 
-#: src/panasonicmn.cpp:207
+#: src/panasonicmn.cpp:212
 msgid "Telephoto"
 msgstr ""
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
 #, fuzzy
 msgid "Home"
 msgstr "Normal"
 
-#: src/panasonicmn.cpp:219
+#: src/panasonicmn.cpp:225
 #, fuzzy
 msgid "Standard (color)"
 msgstr "Estándar"
 
-#: src/panasonicmn.cpp:220
+#: src/panasonicmn.cpp:226
 #, fuzzy
 msgid "Dynamic (color)"
 msgstr "formato planar"
 
-#: src/panasonicmn.cpp:221
+#: src/panasonicmn.cpp:227
 #, fuzzy
 msgid "Nature (color)"
 msgstr "Manual"
 
-#: src/panasonicmn.cpp:222
+#: src/panasonicmn.cpp:228
 #, fuzzy
 msgid "Smooth (color)"
 msgstr "Lugar"
 
-#: src/panasonicmn.cpp:223
+#: src/panasonicmn.cpp:229
 #, fuzzy
 msgid "Standard (B&W)"
 msgstr "Estándar"
 
-#: src/panasonicmn.cpp:224
+#: src/panasonicmn.cpp:230
 #, fuzzy
 msgid "Dynamic (B&W)"
 msgstr "formato planar"
 
-#: src/panasonicmn.cpp:225
+#: src/panasonicmn.cpp:231
 #, fuzzy
 msgid "Smooth (B&W)"
 msgstr "Lugar"
 
-#: src/panasonicmn.cpp:239
+#: src/panasonicmn.cpp:245
 #, fuzzy
 msgid "Audio"
 msgstr "acción"
 
-#: src/panasonicmn.cpp:242
+#: src/panasonicmn.cpp:248
 #, fuzzy
 msgid "White balance adjustment"
 msgstr "Balance de blanco"
 
-#: src/panasonicmn.cpp:243
+#: src/panasonicmn.cpp:249
 #, fuzzy
 msgid "FlashBias"
 msgstr "El flash disparó."
 
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
 #, fuzzy
 msgid "Exif version"
 msgstr "Versión Exif"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 #, fuzzy
 msgid "Color Effect"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 #, fuzzy
 msgid "Color effect"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:248
+#: src/panasonicmn.cpp:254
 msgid ""
 "Time in 1/100 s from when the camera was powered on to when the image is "
 "written to memory card"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 #, fuzzy
 msgid "Burst Mode"
 msgstr "Modo de exposición"
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 #, fuzzy
 msgid "Burst mode"
 msgstr "Modo de exposición"
 
-#: src/panasonicmn.cpp:252
+#: src/panasonicmn.cpp:258
 #, fuzzy
 msgid "NoiseReduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/panasonicmn.cpp:253
+#: src/panasonicmn.cpp:259
 #, fuzzy
 msgid "Self Timer"
 msgstr "Centímetro"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
 msgid "Baby Age"
 msgstr ""
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
 msgid "Baby (or pet) age"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical Zoom Mode"
 msgstr "Modo de métrica"
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical zoom mode"
 msgstr "Flash"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion Lens"
 msgstr "Versión Exif"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion lens"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel Day"
 msgstr ""
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel day"
 msgstr ""
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World Time Location"
 msgstr "Ubicación del sujeto"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World time location"
 msgstr "Ubicación del sujeto"
 
-#: src/panasonicmn.cpp:264
+#: src/panasonicmn.cpp:270
 #, fuzzy
 msgid "Program ISO"
 msgstr "Modo de exposición"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 #, fuzzy
 msgid "WB Adjust AB"
 msgstr "Longitud de la imagen"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 msgid "WB adjust AB. Positive is a shift toward blue."
 msgstr ""
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 #, fuzzy
 msgid "WB Adjust GM"
 msgstr "Longitud de la imagen"
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 msgid "WBAdjustGM. Positive is a shift toward green."
 msgstr ""
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory Type"
 msgstr "Tipo de escena"
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory type"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote Version"
 msgstr "Versión Exif"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote version"
 msgstr "Versión Exif"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB Red Level"
 msgstr "Nivel de la batería"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB red level"
 msgstr "Nivel de la batería"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB Green Level"
 msgstr "Nivel de la batería"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB green level"
 msgstr "Nivel de la batería"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB Blue Level"
 msgstr "Nivel de la batería"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB blue level"
 msgstr "Nivel de la batería"
 
-#: src/panasonicmn.cpp:282
+#: src/panasonicmn.cpp:288
 #, fuzzy
 msgid "Unknown PanasonicMakerNote tag"
 msgstr "Versión Exif"
 
-#: src/panasonicmn.cpp:299
+#: src/panasonicmn.cpp:305
 #, fuzzy
 msgid "Spot mode on"
 msgstr "Retrato"
 
-#: src/panasonicmn.cpp:300
+#: src/panasonicmn.cpp:306
 msgid "Spot mode off or 3-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:301
+#: src/panasonicmn.cpp:307
 #, fuzzy
 msgid "Spot focussing"
 msgstr "Lugar"
 
-#: src/panasonicmn.cpp:302
+#: src/panasonicmn.cpp:308
 msgid "5-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:303
+#: src/panasonicmn.cpp:309
 msgid "1-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:304
+#: src/panasonicmn.cpp:310
 msgid "1-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:305
+#: src/panasonicmn.cpp:311
 msgid "3-area (auto)"
 msgstr ""
 
-#: src/panasonicmn.cpp:306
+#: src/panasonicmn.cpp:312
 msgid "3-area (left)"
 msgstr ""
 
-#: src/panasonicmn.cpp:307
+#: src/panasonicmn.cpp:313
 msgid "3-area (center)"
 msgstr ""
 
-#: src/panasonicmn.cpp:308
+#: src/panasonicmn.cpp:314
 msgid "3-area (right)"
 msgstr ""
 
-#: src/panasonicmn.cpp:320
+#: src/panasonicmn.cpp:326
 msgid " EV"
 msgstr ""
 
-#: src/panasonicmn.cpp:329
+#: src/panasonicmn.cpp:335
 #, fuzzy
 msgid "Panasonic raw version"
 msgstr "Versión Exif"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor Width"
 msgstr "Copyright"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor width"
 msgstr "Copyright"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor Height"
 msgstr "Copyright"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor height"
 msgstr "Copyright"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor Top Border"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor top border"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor Left Border"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor left border"
 msgstr "Espacio de color"
 
-#: src/panasonicmn.cpp:336
-msgid "Red balance (found in Digilux 2 RAW images)"
-msgstr ""
-
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview Image"
-msgstr "Orientación"
-
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview image"
-msgstr "Orientación"
+#: src/panasonicmn.cpp:342
+msgid "Red balance (found in Digilux 2 RAW images)"
+msgstr ""
 
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
 msgid "Manufacturer"
 msgstr "Fabricante"
 
-#: src/panasonicmn.cpp:343
+#: src/panasonicmn.cpp:349
 msgid "The manufacturer of the recording equipment"
 msgstr ""
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
 msgid "Model"
 msgstr "Modelo"
 
-#: src/panasonicmn.cpp:344
+#: src/panasonicmn.cpp:350
+#, fuzzy
 msgid "The model name or model number of the equipment"
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
 msgid "Strip Offsets"
 msgstr "Desplazamiento de tira"
 
-#: src/panasonicmn.cpp:345
+#: src/panasonicmn.cpp:351
 #, fuzzy
 msgid "Strip offsets"
 msgstr "Desplazamiento de tira"
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
 msgid "Orientation"
 msgstr "Orientación"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 #, fuzzy
 msgid "Rows Per Strip"
 msgstr "Filas por tira"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 #, fuzzy
 msgid "The number of rows per strip"
 msgstr "El número F."
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip Byte Counts"
 msgstr "Cantidad de bytes por tira"
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip byte counts"
 msgstr "Cantidad de bytes por tira"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw Data Offset"
 msgstr "Desplazamiento de tira"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw data offset"
 msgstr "Desconocido"
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
 msgid "Exif IFD Pointer"
 msgstr ""
 
-#: src/panasonicmn.cpp:350
+#: src/panasonicmn.cpp:356
 msgid "A pointer to the Exif IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
 msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: src/panasonicmn.cpp:351
+#: src/panasonicmn.cpp:357
 msgid "A pointer to the GPS Info IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:353
+#: src/panasonicmn.cpp:359
 #, fuzzy
 msgid "Unknown PanasonicRaw tag"
 msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:57
 #, fuzzy
 msgid "Night-Scene"
 msgstr "Escena nocturna"
 
-#: src/pentaxmn.cpp:62
+#: src/pentaxmn.cpp:63
+#, fuzzy
 msgid "Optio 330/430"
-msgstr ""
+msgstr "acción"
 
-#: src/pentaxmn.cpp:63
+#: src/pentaxmn.cpp:64
 #, fuzzy
 msgid "Optio 230"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:64
+#: src/pentaxmn.cpp:65
+#, fuzzy
 msgid "Optio 330GS"
-msgstr ""
+msgstr "acción"
 
-#: src/pentaxmn.cpp:65
+#: src/pentaxmn.cpp:66
+#, fuzzy
 msgid "Optio 450/550"
-msgstr ""
+msgstr "acción"
 
-#: src/pentaxmn.cpp:66
+#: src/pentaxmn.cpp:67
 #, fuzzy
 msgid "Optio S"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:67
+#: src/pentaxmn.cpp:68
 msgid "*ist D"
 msgstr ""
 
-#: src/pentaxmn.cpp:68
+#: src/pentaxmn.cpp:69
 #, fuzzy
 msgid "Optio 33L"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:69
+#: src/pentaxmn.cpp:70
 #, fuzzy
 msgid "Optio 33LF"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:70
+#: src/pentaxmn.cpp:71
 msgid "Optio 33WR/43WR/555"
 msgstr ""
 
-#: src/pentaxmn.cpp:71
+#: src/pentaxmn.cpp:72
 #, fuzzy
 msgid "Optio S4"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:72
+#: src/pentaxmn.cpp:73
 #, fuzzy
 msgid "Optio MX"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:73
+#: src/pentaxmn.cpp:74
 #, fuzzy
 msgid "Optio S40"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:74
+#: src/pentaxmn.cpp:75
 #, fuzzy
 msgid "Optio S4i"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:75
+#: src/pentaxmn.cpp:76
 #, fuzzy
 msgid "Optio 30"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:76
+#: src/pentaxmn.cpp:77
 #, fuzzy
 msgid "Optio S30"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:77
+#: src/pentaxmn.cpp:78
 #, fuzzy
 msgid "Optio 750Z"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:78
+#: src/pentaxmn.cpp:79
 #, fuzzy
 msgid "Optio SV"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:79
+#: src/pentaxmn.cpp:80
 #, fuzzy
 msgid "Optio SVi"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:80
+#: src/pentaxmn.cpp:81
 #, fuzzy
 msgid "Optio X"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:81
+#: src/pentaxmn.cpp:82
 #, fuzzy
 msgid "Optio S5i"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:82
+#: src/pentaxmn.cpp:83
 #, fuzzy
 msgid "Optio S50"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:83
+#: src/pentaxmn.cpp:84
 msgid "*ist DS"
 msgstr ""
 
-#: src/pentaxmn.cpp:84
+#: src/pentaxmn.cpp:85
 #, fuzzy
 msgid "Optio MX4"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:85
+#: src/pentaxmn.cpp:86
 #, fuzzy
 msgid "Optio S5n"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:86
+#: src/pentaxmn.cpp:87
 #, fuzzy
 msgid "Optio WP"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:87
+#: src/pentaxmn.cpp:88
 #, fuzzy
 msgid "Optio S55"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:88
+#: src/pentaxmn.cpp:89
 #, fuzzy
 msgid "Optio S5z"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:89
+#: src/pentaxmn.cpp:90
 msgid "*ist DL"
 msgstr ""
 
-#: src/pentaxmn.cpp:90
+#: src/pentaxmn.cpp:91
 #, fuzzy
 msgid "Optio S60"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:91
+#: src/pentaxmn.cpp:92
 #, fuzzy
 msgid "Optio S45"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:92
+#: src/pentaxmn.cpp:93
 #, fuzzy
 msgid "Optio S6"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:93
+#: src/pentaxmn.cpp:94
 #, fuzzy
 msgid "Optio WPi"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:94
+#: src/pentaxmn.cpp:95
 msgid "BenQ DC X600"
 msgstr ""
 
-#: src/pentaxmn.cpp:95
+#: src/pentaxmn.cpp:96
 msgid "*ist DS2"
 msgstr ""
 
-#: src/pentaxmn.cpp:96
+#: src/pentaxmn.cpp:97
 msgid "Samsung GX-1S"
 msgstr ""
 
-#: src/pentaxmn.cpp:97
+#: src/pentaxmn.cpp:98
 #, fuzzy
 msgid "Optio A10"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:98
+#: src/pentaxmn.cpp:99
 msgid "*ist DL2"
 msgstr ""
 
-#: src/pentaxmn.cpp:99
+#: src/pentaxmn.cpp:100
 msgid "Samsung GX-1L"
 msgstr ""
 
-#: src/pentaxmn.cpp:100
+#: src/pentaxmn.cpp:101
 msgid "K100D"
 msgstr ""
 
-#: src/pentaxmn.cpp:101
+#: src/pentaxmn.cpp:102
 msgid "K110D"
 msgstr ""
 
-#: src/pentaxmn.cpp:102
+#: src/pentaxmn.cpp:103
 msgid "K100D Super"
 msgstr ""
 
-#: src/pentaxmn.cpp:103
+#: src/pentaxmn.cpp:104
 #, fuzzy
-msgid "Optio T10"
+msgid "Optio T10/T20"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:104
+#: src/pentaxmn.cpp:105
 #, fuzzy
 msgid "Optio W10"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:105
+#: src/pentaxmn.cpp:106
 #, fuzzy
 msgid "Optio M10"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:106
+#: src/pentaxmn.cpp:107
 msgid "K10D"
 msgstr ""
 
-#: src/pentaxmn.cpp:107
+#: src/pentaxmn.cpp:108
 msgid "Samsung GX10"
 msgstr ""
 
-#: src/pentaxmn.cpp:108
+#: src/pentaxmn.cpp:109
 #, fuzzy
 msgid "Optio S7"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:109
+#: src/pentaxmn.cpp:110
+#, fuzzy
+msgid "Optio L20"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:111
 #, fuzzy
 msgid "Optio M20"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:110
+#: src/pentaxmn.cpp:112
 #, fuzzy
 msgid "Optio W20"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:111
+#: src/pentaxmn.cpp:113
 #, fuzzy
 msgid "Optio A20"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:112
+#: src/pentaxmn.cpp:114
 #, fuzzy
 msgid "Optio M30"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:113
+#: src/pentaxmn.cpp:115
 #, fuzzy
 msgid "Optio E30"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:114
+#: src/pentaxmn.cpp:116
+#, fuzzy
+msgid "Optio E35"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:117
 #, fuzzy
 msgid "Optio T30"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:115
+#: src/pentaxmn.cpp:118
 #, fuzzy
 msgid "Optio W30"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:116
+#: src/pentaxmn.cpp:119
 #, fuzzy
 msgid "Optio A30"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:117
+#: src/pentaxmn.cpp:120
 #, fuzzy
 msgid "Optio E40"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:118
+#: src/pentaxmn.cpp:121
 #, fuzzy
 msgid "Optio M40"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:119
+#: src/pentaxmn.cpp:122
 #, fuzzy
 msgid "Optio Z10"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
+#: src/pentaxmn.cpp:123
+msgid "K20D"
+msgstr ""
+
+#: src/pentaxmn.cpp:124
+msgid "Samsung GX20"
+msgstr ""
+
+#: src/pentaxmn.cpp:125
 #, fuzzy
 msgid "Optio S10"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
+#: src/pentaxmn.cpp:126
 #, fuzzy
 msgid "Optio A40"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
+#: src/pentaxmn.cpp:127
 #, fuzzy
 msgid "Optio V10"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:123
-msgid "K20D"
-msgstr ""
-
-#: src/pentaxmn.cpp:127
+#: src/pentaxmn.cpp:128
 msgid "K200D"
 msgstr ""
 
-#: src/pentaxmn.cpp:128
+#: src/pentaxmn.cpp:129
+#, fuzzy
+msgid "Optio S12"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:130
 #, fuzzy
 msgid "Optio E50"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:129
+#: src/pentaxmn.cpp:131
 #, fuzzy
 msgid "Optio M50"
 msgstr "acción"
 
+#: src/pentaxmn.cpp:132
+#, fuzzy
+msgid "Optio V20"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:133
+#, fuzzy
+msgid "Optio W60"
+msgstr "acción"
+
 #: src/pentaxmn.cpp:134
+#, fuzzy
+msgid "Optio M60"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:135
+#, fuzzy
+msgid "Optio E60"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:136
+msgid "K2000"
+msgstr ""
+
+#: src/pentaxmn.cpp:137
+msgid "K-m"
+msgstr ""
+
+#: src/pentaxmn.cpp:138
+#, fuzzy
+msgid "Optio P70"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:139
+#, fuzzy
+msgid "Optio E70"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:140
+msgid "X70"
+msgstr ""
+
+#: src/pentaxmn.cpp:141
+#, fuzzy
+msgid "K-7"
+msgstr "-"
+
+#: src/pentaxmn.cpp:142
+#, fuzzy
+msgid "Optio W80"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:143
+#, fuzzy
+msgid "Optio P80"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:144
+#, fuzzy
+msgid "Optio WS80"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:145
+msgid "K-x"
+msgstr ""
+
+#: src/pentaxmn.cpp:146
+msgid "645D"
+msgstr ""
+
+#: src/pentaxmn.cpp:147
+#, fuzzy
+msgid "Optio I-10"
+msgstr "acción"
+
+#: src/pentaxmn.cpp:152
 msgid "Good"
 msgstr ""
 
-#: src/pentaxmn.cpp:135
+#: src/pentaxmn.cpp:153
 #, fuzzy
 msgid "Better"
 msgstr "Centímetro"
 
-#: src/pentaxmn.cpp:136
+#: src/pentaxmn.cpp:154
 #, fuzzy
 msgid "Best"
 msgstr "Centímetro"
 
-#: src/pentaxmn.cpp:137
+#: src/pentaxmn.cpp:155
 msgid "TIFF"
 msgstr ""
 
-#: src/pentaxmn.cpp:139
+#: src/pentaxmn.cpp:157
 msgid "Premium"
 msgstr ""
 
-#: src/pentaxmn.cpp:144
+#: src/pentaxmn.cpp:162
 msgid "640x480"
 msgstr ""
 
-#: src/pentaxmn.cpp:145
-#, fuzzy
-msgid "Full"
-msgstr "acción"
-
-#: src/pentaxmn.cpp:146
+#: src/pentaxmn.cpp:164
 msgid "1024x768"
 msgstr ""
 
-#: src/pentaxmn.cpp:147
+#: src/pentaxmn.cpp:165
 msgid "1280x960"
 msgstr ""
 
-#: src/pentaxmn.cpp:148
+#: src/pentaxmn.cpp:166
 msgid "1600x1200"
 msgstr ""
 
-#: src/pentaxmn.cpp:149
+#: src/pentaxmn.cpp:167
 msgid "2048x1536"
 msgstr ""
 
-#: src/pentaxmn.cpp:150
+#: src/pentaxmn.cpp:168
 msgid "2560x1920 or 2304x1728"
 msgstr ""
 
-#: src/pentaxmn.cpp:151
+#: src/pentaxmn.cpp:169
 msgid "3072x2304"
 msgstr ""
 
-#: src/pentaxmn.cpp:152
+#: src/pentaxmn.cpp:170
 msgid "3264x2448"
 msgstr ""
 
-#: src/pentaxmn.cpp:153
+#: src/pentaxmn.cpp:171
 msgid "320x240"
 msgstr ""
 
-#: src/pentaxmn.cpp:154
+#: src/pentaxmn.cpp:172
 msgid "2288x1712"
 msgstr ""
 
-#: src/pentaxmn.cpp:155
+#: src/pentaxmn.cpp:173
 msgid "2592x1944"
 msgstr ""
 
-#: src/pentaxmn.cpp:156
+#: src/pentaxmn.cpp:174
 msgid "2304x1728 or 2592x1944"
 msgstr ""
 
-#: src/pentaxmn.cpp:157
+#: src/pentaxmn.cpp:175
 msgid "3056x2296"
 msgstr ""
 
-#: src/pentaxmn.cpp:158
+#: src/pentaxmn.cpp:176
 msgid "2816x2212 or 2816x2112"
 msgstr ""
 
-#: src/pentaxmn.cpp:159
+#: src/pentaxmn.cpp:177
 msgid "3648x2736"
 msgstr ""
 
-#: src/pentaxmn.cpp:164
+#: src/pentaxmn.cpp:182
 #, fuzzy
 msgid "Auto, Did not fire"
 msgstr "El flash no disparó."
 
-#: src/pentaxmn.cpp:166
+#: src/pentaxmn.cpp:184
 #, fuzzy
 msgid "Auto, Did not fire, Red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/pentaxmn.cpp:167
+#: src/pentaxmn.cpp:185
 #, fuzzy
 msgid "Auto, Fired"
 msgstr "Auto bracket"
 
-#: src/pentaxmn.cpp:169
+#: src/pentaxmn.cpp:187
 #, fuzzy
 msgid "Auto, Fired, Red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/pentaxmn.cpp:170
+#: src/pentaxmn.cpp:188
 #, fuzzy
 msgid "On, Red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/pentaxmn.cpp:171
+#: src/pentaxmn.cpp:189
 msgid "On, Wireless"
 msgstr ""
 
-#: src/pentaxmn.cpp:172
+#: src/pentaxmn.cpp:190
 #, fuzzy
 msgid "On, Soft"
 msgstr "Suave"
 
-#: src/pentaxmn.cpp:173
+#: src/pentaxmn.cpp:191
 msgid "On, Slow-sync"
 msgstr ""
 
-#: src/pentaxmn.cpp:174
+#: src/pentaxmn.cpp:192
 #, fuzzy
 msgid "On, Slow-sync, Red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/pentaxmn.cpp:175
+#: src/pentaxmn.cpp:193
 msgid "On, Trailing-curtain Sync"
 msgstr ""
 
-#: src/pentaxmn.cpp:184
+#: src/pentaxmn.cpp:203
 #, fuzzy
 msgid "Pan Focus"
 msgstr "Exposición manual"
 
-#: src/pentaxmn.cpp:185
+#: src/pentaxmn.cpp:204
 msgid "AF-S"
 msgstr ""
 
-#: src/pentaxmn.cpp:186
+#: src/pentaxmn.cpp:205
 msgid "AF-C"
 msgstr ""
 
-#: src/pentaxmn.cpp:192
+#: src/pentaxmn.cpp:206
+msgid "AF-A"
+msgstr ""
+
+#: src/pentaxmn.cpp:212
 #, fuzzy
 msgid "Fixed Center"
 msgstr "Tiempo bueno"
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
+#: src/pentaxmn.cpp:213
+#, fuzzy
+msgid "Automatic Tracking AF"
+msgstr "Auto bracket"
+
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
+msgstr ""
+
+#: src/pentaxmn.cpp:231
+#, fuzzy
+msgid "Fixed Center or multiple"
+msgstr "Tiempo bueno"
+
+#: src/pentaxmn.cpp:233
+#, fuzzy
+msgid "Top-center"
+msgstr "Centímetro"
+
+#: src/pentaxmn.cpp:239
+#, fuzzy
+msgid "Bottom-center"
+msgstr "abajo - izquierda"
+
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
 #, fuzzy
 msgid "50"
 msgstr "D75"
 
-#: src/pentaxmn.cpp:209
+#: src/pentaxmn.cpp:246
 msgid "64"
 msgstr ""
 
-#: src/pentaxmn.cpp:210
+#: src/pentaxmn.cpp:247
+#, fuzzy
 msgid "80"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
+#, fuzzy
 msgid "100"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:212
+#: src/pentaxmn.cpp:249
+#, fuzzy
 msgid "125"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:213
+#: src/pentaxmn.cpp:250
 msgid "160"
 msgstr ""
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
+#, fuzzy
 msgid "200"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:215
+#: src/pentaxmn.cpp:252
 #, fuzzy
 msgid "250"
 msgstr "D75"
 
-#: src/pentaxmn.cpp:216
+#: src/pentaxmn.cpp:253
+#, fuzzy
 msgid "320"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
+#, fuzzy
 msgid "400"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:218
+#: src/pentaxmn.cpp:255
 #, fuzzy
 msgid "500"
 msgstr "D75"
 
-#: src/pentaxmn.cpp:219
+#: src/pentaxmn.cpp:256
 msgid "640"
 msgstr ""
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
+#, fuzzy
 msgid "800"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:221
+#: src/pentaxmn.cpp:258
 msgid "1000"
 msgstr ""
 
-#: src/pentaxmn.cpp:222
+#: src/pentaxmn.cpp:259
+#, fuzzy
 msgid "1250"
-msgstr ""
+msgstr "D75"
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
 msgid "1600"
 msgstr ""
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
+#: src/pentaxmn.cpp:261
+msgid "2000"
+msgstr ""
+
+#: src/pentaxmn.cpp:262
+#, fuzzy
+msgid "2500"
+msgstr "D75"
+
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
 msgid "3200"
 msgstr ""
 
-#: src/pentaxmn.cpp:249
+#: src/pentaxmn.cpp:264
+msgid "4000"
+msgstr ""
+
+#: src/pentaxmn.cpp:265
+#, fuzzy
+msgid "5000"
+msgstr "D75"
+
+#: src/pentaxmn.cpp:266
+msgid "6400"
+msgstr ""
+
+#: src/pentaxmn.cpp:276
+#, fuzzy
+msgid "70"
+msgstr "D75"
+
+#: src/pentaxmn.cpp:278
+msgid "140"
+msgstr ""
+
+#: src/pentaxmn.cpp:280
+#, fuzzy
+msgid "280"
+msgstr "D75"
+
+#: src/pentaxmn.cpp:282
+#, fuzzy
+msgid "560"
+msgstr "D75"
+
+#: src/pentaxmn.cpp:284
+msgid "1100"
+msgstr ""
+
+#: src/pentaxmn.cpp:286
+msgid "2200"
+msgstr ""
+
+#: src/pentaxmn.cpp:304
 #, fuzzy
 msgid "Multi Segment"
 msgstr "multi-lugar"
 
-#: src/pentaxmn.cpp:250
+#: src/pentaxmn.cpp:305
 #, fuzzy
 msgid "Center Weighted"
 msgstr "peso centrado"
 
-#: src/pentaxmn.cpp:262
+#: src/pentaxmn.cpp:317
 #, fuzzy
 msgid "DaylightFluorescent"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:263
+#: src/pentaxmn.cpp:318
 #, fuzzy
 msgid "DaywhiteFluorescent"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:264
+#: src/pentaxmn.cpp:319
 #, fuzzy
 msgid "WhiteFluorescent"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:268
+#: src/pentaxmn.cpp:324
 #, fuzzy
 msgid "User Selected"
 msgstr "Auto bracket"
 
-#: src/pentaxmn.cpp:273
+#: src/pentaxmn.cpp:329
 #, fuzzy
 msgid "Auto (Daylight)"
 msgstr "Luz de día"
 
-#: src/pentaxmn.cpp:274
+#: src/pentaxmn.cpp:330
+#, fuzzy
 msgid "Auto (Shade)"
-msgstr ""
+msgstr "Sombra"
 
-#: src/pentaxmn.cpp:275
+#: src/pentaxmn.cpp:331
 #, fuzzy
 msgid "Auto (Flash)"
 msgstr "Auto bracket"
 
-#: src/pentaxmn.cpp:276
+#: src/pentaxmn.cpp:332
 #, fuzzy
 msgid "Auto (Tungsten)"
 msgstr "tungsteno"
 
-#: src/pentaxmn.cpp:277
+#: src/pentaxmn.cpp:333
 #, fuzzy
 msgid "Auto (DaywhiteFluorescent)"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:278
+#: src/pentaxmn.cpp:334
 #, fuzzy
 msgid "Auto (WhiteFluorescent)"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:279
+#: src/pentaxmn.cpp:335
 #, fuzzy
 msgid "Auto (Cloudy)"
 msgstr "nublado"
 
-#: src/pentaxmn.cpp:281
+#: src/pentaxmn.cpp:337
 msgid "Preset (Fireworks?)"
 msgstr ""
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
+#, fuzzy
 msgid "Med Low"
-msgstr ""
+msgstr "co-situado"
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
 #, fuzzy
 msgid "Med High"
 msgstr "Luz de día"
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-#, fuzzy
-msgid "Very Low"
-msgstr "co-situado"
-
-#: src/pentaxmn.cpp:311
+#: src/pentaxmn.cpp:369
 #, fuzzy
 msgid "Med Soft"
 msgstr "Suave"
 
-#: src/pentaxmn.cpp:312
+#: src/pentaxmn.cpp:370
 #, fuzzy
 msgid "Med Hard"
 msgstr "Duro"
 
-#: src/pentaxmn.cpp:313
+#: src/pentaxmn.cpp:371
 #, fuzzy
 msgid "Very Soft"
 msgstr "co-situado"
 
-#: src/pentaxmn.cpp:314
+#: src/pentaxmn.cpp:372
 #, fuzzy
 msgid "Very Hard"
 msgstr "Luz de día"
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
+#, fuzzy
 msgid "Home town"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/pentaxmn.cpp:325
+#: src/pentaxmn.cpp:383
 msgid "Pago Pago"
 msgstr ""
 
-#: src/pentaxmn.cpp:326
+#: src/pentaxmn.cpp:384
 msgid "Honolulu"
 msgstr ""
 
-#: src/pentaxmn.cpp:327
+#: src/pentaxmn.cpp:385
 #, fuzzy
 msgid "Anchorage"
 msgstr "Promedio"
 
-#: src/pentaxmn.cpp:328
+#: src/pentaxmn.cpp:386
 msgid "Vancouver"
 msgstr ""
 
-#: src/pentaxmn.cpp:329
+#: src/pentaxmn.cpp:387
 msgid "San Fransisco"
 msgstr ""
 
-#: src/pentaxmn.cpp:330
+#: src/pentaxmn.cpp:388
+#, fuzzy
 msgid "Los Angeles"
-msgstr ""
+msgstr "arriba - izquierda"
 
-#: src/pentaxmn.cpp:331
+#: src/pentaxmn.cpp:389
 msgid "Calgary"
 msgstr ""
 
-#: src/pentaxmn.cpp:332
+#: src/pentaxmn.cpp:390
 #, fuzzy
 msgid "Denver"
 msgstr "Centímetro"
 
-#: src/pentaxmn.cpp:333
+#: src/pentaxmn.cpp:391
+#, fuzzy
 msgid "Mexico City"
-msgstr ""
+msgstr "Copyright"
 
-#: src/pentaxmn.cpp:334
+#: src/pentaxmn.cpp:392
 msgid "Chicago"
 msgstr ""
 
-#: src/pentaxmn.cpp:335
+#: src/pentaxmn.cpp:393
 msgid "Miami"
 msgstr ""
 
-#: src/pentaxmn.cpp:336
+#: src/pentaxmn.cpp:394
 #, fuzzy
 msgid "Toronto"
 msgstr "Espacio de color"
 
-#: src/pentaxmn.cpp:337
+#: src/pentaxmn.cpp:395
 msgid "New York"
 msgstr ""
 
-#: src/pentaxmn.cpp:338
+#: src/pentaxmn.cpp:396
 msgid "Santiago"
 msgstr ""
 
-#: src/pentaxmn.cpp:339
+#: src/pentaxmn.cpp:397
 msgid "Caracus"
 msgstr ""
 
-#: src/pentaxmn.cpp:340
+#: src/pentaxmn.cpp:398
 msgid "Halifax"
 msgstr ""
 
-#: src/pentaxmn.cpp:341
+#: src/pentaxmn.cpp:399
 msgid "Buenos Aires"
 msgstr ""
 
-#: src/pentaxmn.cpp:342
+#: src/pentaxmn.cpp:400
 msgid "Sao Paulo"
 msgstr ""
 
-#: src/pentaxmn.cpp:343
+#: src/pentaxmn.cpp:401
 msgid "Rio de Janeiro"
 msgstr ""
 
-#: src/pentaxmn.cpp:344
+#: src/pentaxmn.cpp:402
 #, fuzzy
 msgid "Madrid"
 msgstr "Duro"
 
-#: src/pentaxmn.cpp:345
+#: src/pentaxmn.cpp:403
 #, fuzzy
 msgid "London"
 msgstr "Ganancia baja baja"
 
-#: src/pentaxmn.cpp:346
+#: src/pentaxmn.cpp:404
 #, fuzzy
 msgid "Paris"
 msgstr "Parcial"
 
-#: src/pentaxmn.cpp:347
+#: src/pentaxmn.cpp:405
+#, fuzzy
 msgid "Milan"
-msgstr ""
+msgstr "Manual"
 
-#: src/pentaxmn.cpp:348
+#: src/pentaxmn.cpp:406
+#, fuzzy
 msgid "Rome"
-msgstr ""
+msgstr "Normal"
 
-#: src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:407
 #, fuzzy
 msgid "Berlin"
 msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:350
+#: src/pentaxmn.cpp:408
 msgid "Johannesburg"
 msgstr ""
 
-#: src/pentaxmn.cpp:351
+#: src/pentaxmn.cpp:409
 msgid "Istanbul"
 msgstr ""
 
-#: src/pentaxmn.cpp:352
+#: src/pentaxmn.cpp:410
 #, fuzzy
 msgid "Cairo"
 msgstr "acción"
 
-#: src/pentaxmn.cpp:353
+#: src/pentaxmn.cpp:411
 msgid "Jerusalem"
 msgstr ""
 
-#: src/pentaxmn.cpp:354
+#: src/pentaxmn.cpp:412
 msgid "Moscow"
 msgstr ""
 
-#: src/pentaxmn.cpp:355
+#: src/pentaxmn.cpp:413
 msgid "Jeddah"
 msgstr ""
 
-#: src/pentaxmn.cpp:356
+#: src/pentaxmn.cpp:414
 msgid "Tehran"
 msgstr ""
 
-#: src/pentaxmn.cpp:357
+#: src/pentaxmn.cpp:415
+#, fuzzy
 msgid "Dubai"
-msgstr ""
+msgstr "Saturación"
 
-#: src/pentaxmn.cpp:358
+#: src/pentaxmn.cpp:416
 msgid "Karachi"
 msgstr ""
 
-#: src/pentaxmn.cpp:359
+#: src/pentaxmn.cpp:417
+#, fuzzy
 msgid "Kabul"
-msgstr ""
+msgstr "promedio"
 
-#: src/pentaxmn.cpp:360
+#: src/pentaxmn.cpp:418
 #, fuzzy
 msgid "Male"
 msgstr "Manual"
 
-#: src/pentaxmn.cpp:361
+#: src/pentaxmn.cpp:419
 msgid "Delhi"
 msgstr ""
 
-#: src/pentaxmn.cpp:362
+#: src/pentaxmn.cpp:420
 #, fuzzy
 msgid "Colombo"
 msgstr "Espacio de color"
 
-#: src/pentaxmn.cpp:363
+#: src/pentaxmn.cpp:421
 msgid "Kathmandu"
 msgstr ""
 
-#: src/pentaxmn.cpp:364
+#: src/pentaxmn.cpp:422
 msgid "Dacca"
 msgstr ""
 
-#: src/pentaxmn.cpp:365
+#: src/pentaxmn.cpp:423
 msgid "Yangon"
 msgstr ""
 
-#: src/pentaxmn.cpp:366
+#: src/pentaxmn.cpp:424
 msgid "Bangkok"
 msgstr ""
 
-#: src/pentaxmn.cpp:367
+#: src/pentaxmn.cpp:425
 msgid "Kuala Lumpur"
 msgstr ""
 
-#: src/pentaxmn.cpp:368
+#: src/pentaxmn.cpp:426
 #, fuzzy
 msgid "Vientiane"
 msgstr "Orientación"
 
-#: src/pentaxmn.cpp:369
+#: src/pentaxmn.cpp:427
 #, fuzzy
 msgid "Singapore"
 msgstr "Nombre del documento"
 
-#: src/pentaxmn.cpp:370
+#: src/pentaxmn.cpp:428
 msgid "Phnom Penh"
 msgstr ""
 
-#: src/pentaxmn.cpp:371
+#: src/pentaxmn.cpp:429
 msgid "Ho Chi Minh"
 msgstr ""
 
-#: src/pentaxmn.cpp:372
+#: src/pentaxmn.cpp:430
 msgid "Jakarta"
 msgstr ""
 
-#: src/pentaxmn.cpp:373
+#: src/pentaxmn.cpp:431
 msgid "Hong Kong"
 msgstr ""
 
-#: src/pentaxmn.cpp:374
+#: src/pentaxmn.cpp:432
 #, fuzzy
 msgid "Perth"
 msgstr "otro"
 
-#: src/pentaxmn.cpp:375
+#: src/pentaxmn.cpp:433
+#, fuzzy
 msgid "Beijing"
-msgstr ""
+msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:376
+#: src/pentaxmn.cpp:434
 msgid "Shanghai"
 msgstr ""
 
-#: src/pentaxmn.cpp:377
+#: src/pentaxmn.cpp:435
 #, fuzzy
 msgid "Manila"
 msgstr "Manual"
 
-#: src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:436
+#, fuzzy
 msgid "Taipei"
-msgstr ""
+msgstr "Escena nocturna"
 
-#: src/pentaxmn.cpp:379
+#: src/pentaxmn.cpp:437
 #, fuzzy
 msgid "Seoul"
 msgstr "Lugar"
 
-#: src/pentaxmn.cpp:380
+#: src/pentaxmn.cpp:438
 msgid "Adelaide"
 msgstr ""
 
-#: src/pentaxmn.cpp:381
+#: src/pentaxmn.cpp:439
 msgid "Tokyo"
 msgstr ""
 
-#: src/pentaxmn.cpp:382
+#: src/pentaxmn.cpp:440
 msgid "Guam"
 msgstr ""
 
-#: src/pentaxmn.cpp:383
+#: src/pentaxmn.cpp:441
 #, fuzzy
 msgid "Sydney"
 msgstr "centrado"
 
-#: src/pentaxmn.cpp:384
+#: src/pentaxmn.cpp:442
 #, fuzzy
 msgid "Noumea"
 msgstr "Normal"
 
-#: src/pentaxmn.cpp:385
+#: src/pentaxmn.cpp:443
 msgid "Wellington"
 msgstr ""
 
-#: src/pentaxmn.cpp:386
+#: src/pentaxmn.cpp:444
 msgid "Auckland"
 msgstr ""
 
-#: src/pentaxmn.cpp:387
+#: src/pentaxmn.cpp:445
 msgid "Lima"
 msgstr ""
 
-#: src/pentaxmn.cpp:388
+#: src/pentaxmn.cpp:446
 msgid "Dakar"
 msgstr ""
 
-#: src/pentaxmn.cpp:389
+#: src/pentaxmn.cpp:447
 msgid "Algiers"
 msgstr ""
 
-#: src/pentaxmn.cpp:390
+#: src/pentaxmn.cpp:448
 msgid "Helsinki"
 msgstr ""
 
-#: src/pentaxmn.cpp:391
+#: src/pentaxmn.cpp:449
 #, fuzzy
 msgid "Athens"
 msgstr "Ancho de la imagen"
 
-#: src/pentaxmn.cpp:392
+#: src/pentaxmn.cpp:450
+#, fuzzy
 msgid "Nairobi"
-msgstr ""
+msgstr "acción"
 
-#: src/pentaxmn.cpp:393
+#: src/pentaxmn.cpp:451
 msgid "Amsterdam"
 msgstr ""
 
-#: src/pentaxmn.cpp:394
+#: src/pentaxmn.cpp:452
 msgid "Stockholm"
 msgstr ""
 
-#: src/pentaxmn.cpp:395
+#: src/pentaxmn.cpp:453
 msgid "Lisbon"
 msgstr ""
 
-#: src/pentaxmn.cpp:400
+#: src/pentaxmn.cpp:454
+#, fuzzy
+msgid "Copenhagen"
+msgstr "Promedio"
+
+#: src/pentaxmn.cpp:459
 #, fuzzy
 msgid "Unprocessed"
 msgstr "Descomprimido"
 
-#: src/pentaxmn.cpp:401
+#: src/pentaxmn.cpp:460
 #, fuzzy
 msgid "Digital Filter"
 msgstr "Relación de zoom digital"
 
-#: src/pentaxmn.cpp:402
+#: src/pentaxmn.cpp:461
+#, fuzzy
 msgid "Cropped"
-msgstr ""
+msgstr "izquierda - abajo"
 
-#: src/pentaxmn.cpp:404
+#: src/pentaxmn.cpp:463
 msgid "Frame Synthesis?"
 msgstr ""
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
 #, fuzzy
 msgid "MTF Program"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:416
+#: src/pentaxmn.cpp:475
 #, fuzzy
 msgid "Night Scene Portrait"
 msgstr "Retrato"
 
-#: src/pentaxmn.cpp:417
+#: src/pentaxmn.cpp:476
 #, fuzzy
 msgid "No Flash"
 msgstr "Flash"
 
-#: src/pentaxmn.cpp:420
+#: src/pentaxmn.cpp:479
 msgid "Surf & Snow"
 msgstr ""
 
-#: src/pentaxmn.cpp:423
+#: src/pentaxmn.cpp:482
 msgid "Kids"
 msgstr ""
 
-#: src/pentaxmn.cpp:428
+#: src/pentaxmn.cpp:487
+#, fuzzy
+msgid "Stage Lighting"
+msgstr "Luz de día"
+
+#: src/pentaxmn.cpp:488
+#, fuzzy
+msgid "Night Snap"
+msgstr "retrato"
+
+#: src/pentaxmn.cpp:490
+#, fuzzy
 msgid "Auto PICT (Standard)"
-msgstr ""
+msgstr "Paisaje"
 
-#: src/pentaxmn.cpp:429
+#: src/pentaxmn.cpp:491
+#, fuzzy
 msgid "Auto PICT (Portrait)"
-msgstr ""
+msgstr "Contraste"
 
-#: src/pentaxmn.cpp:430
+#: src/pentaxmn.cpp:492
 #, fuzzy
 msgid "Auto PICT (Landscape)"
 msgstr "Paisaje"
 
-#: src/pentaxmn.cpp:431
+#: src/pentaxmn.cpp:493
+#, fuzzy
 msgid "Auto PICT (Macro)"
-msgstr ""
+msgstr "Paisaje"
 
-#: src/pentaxmn.cpp:432
+#: src/pentaxmn.cpp:494
+#, fuzzy
 msgid "Auto PICT (Sport)"
-msgstr ""
+msgstr "Paisaje"
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
 #, fuzzy
 msgid "Green Mode"
 msgstr "Modo de métrica"
 
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
 #, fuzzy
 msgid "Shutter Speed Priority"
 msgstr "Prioridad del obturador"
 
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
 #, fuzzy
 msgid "Aperture Priority"
 msgstr "Prioridad de apertura"
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
 msgid "Bulb"
 msgstr ""
 
-#: src/pentaxmn.cpp:442
+#: src/pentaxmn.cpp:504
 #, fuzzy
 msgid "Hi-speed Program"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:443
+#: src/pentaxmn.cpp:505
 #, fuzzy
 msgid "DOF Program"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:448
+#: src/pentaxmn.cpp:510
 #, fuzzy
 msgid "Program Tv Shift"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:449
+#: src/pentaxmn.cpp:511
 #, fuzzy
 msgid "Program Av Shift"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:452
+#: src/pentaxmn.cpp:514
 #, fuzzy
 msgid "Aperture Priority (Off-Auto-Aperture)"
 msgstr "Prioridad de apertura"
 
-#: src/pentaxmn.cpp:453
+#: src/pentaxmn.cpp:515
+#, fuzzy
 msgid "Manual (Off-Auto-Aperture)"
-msgstr ""
+msgstr "Prioridad de apertura"
 
-#: src/pentaxmn.cpp:454
+#: src/pentaxmn.cpp:516
+#, fuzzy
 msgid "Bulb (Off-Auto-Aperture)"
-msgstr ""
+msgstr "Prioridad de apertura"
 
-#: src/pentaxmn.cpp:456
+#: src/pentaxmn.cpp:518
 #, fuzzy
 msgid "Shutter Priority"
 msgstr "Prioridad del obturador"
 
-#: src/pentaxmn.cpp:457
+#: src/pentaxmn.cpp:519
 #, fuzzy
 msgid "Shutter & Aperture Priority AE"
 msgstr "Prioridad del obturador"
 
-#: src/pentaxmn.cpp:458
+#: src/pentaxmn.cpp:520
 #, fuzzy
 msgid "Shutter & Aperture Priority AE (1)"
 msgstr "Prioridad del obturador"
 
-#: src/pentaxmn.cpp:459
+#: src/pentaxmn.cpp:521
+#, fuzzy
 msgid "Sensitivity Priority AE"
-msgstr ""
+msgstr "Sensibilidad espectral"
 
-#: src/pentaxmn.cpp:460
+#: src/pentaxmn.cpp:522
+#, fuzzy
 msgid "Sensitivity Priority AE (1)"
-msgstr ""
+msgstr "Prioridad del obturador"
 
-#: src/pentaxmn.cpp:461
+#: src/pentaxmn.cpp:523
 msgid "Flash X-Sync Speed AE"
 msgstr ""
 
-#: src/pentaxmn.cpp:462
+#: src/pentaxmn.cpp:524
 msgid "Flash X-Sync Speed AE (1)"
 msgstr ""
 
-#: src/pentaxmn.cpp:471
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:535
 #, fuzzy
 msgid "Continuous (Hi)"
 msgstr "Exposición automática"
 
-#: src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
 #, fuzzy
 msgid "Burst"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:473
+#: src/pentaxmn.cpp:538
 #, fuzzy
 msgid "Self-timer (12 sec)"
 msgstr "Centímetro"
 
-#: src/pentaxmn.cpp:474
+#: src/pentaxmn.cpp:539
 #, fuzzy
 msgid "Self-timer (2 sec)"
 msgstr "Centímetro"
 
-#: src/pentaxmn.cpp:475
+#: src/pentaxmn.cpp:540
 #, fuzzy
 msgid "Remote Control (3 sec)"
 msgstr "Espacio de color"
 
-#: src/pentaxmn.cpp:476
+#: src/pentaxmn.cpp:541
 #, fuzzy
 msgid "Remote Control"
 msgstr "Espacio de color"
 
-#: src/pentaxmn.cpp:477
-#, fuzzy
-msgid "Multiple Exposure"
-msgstr "Modo de exposición"
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
+msgid "Video"
+msgstr ""
 
-#: src/pentaxmn.cpp:488
+#: src/pentaxmn.cpp:554
 msgid "M-42 or No Lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:489
+#: src/pentaxmn.cpp:555
 #, fuzzy
 msgid "K,M Lens"
 msgstr "Ancho de la imagen"
 
-#: src/pentaxmn.cpp:490
+#: src/pentaxmn.cpp:556
 msgid "A Series Lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:625
+#: src/pentaxmn.cpp:703
 #, fuzzy
 msgid "Bright"
 msgstr "Copyright"
 
-#: src/pentaxmn.cpp:628
+#: src/pentaxmn.cpp:706
 msgid "Vibrant"
 msgstr ""
 
-#: src/pentaxmn.cpp:641
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
+msgstr ""
+
+#: src/pentaxmn.cpp:720
 msgid "Weakest"
 msgstr ""
 
-#: src/pentaxmn.cpp:642
+#: src/pentaxmn.cpp:721
 msgid "Weak"
 msgstr ""
 
-#: src/pentaxmn.cpp:643
+#: src/pentaxmn.cpp:722
 #, fuzzy
 msgid "Strong"
 msgstr "Saturación"
 
-#: src/pentaxmn.cpp:752
+#: src/pentaxmn.cpp:832
 #, fuzzy
 msgid "No extended bracketing"
 msgstr "Balance de blanco"
 
-#: src/pentaxmn.cpp:758
+#: src/pentaxmn.cpp:838
 msgid "WB-BA"
 msgstr ""
 
-#: src/pentaxmn.cpp:761
+#: src/pentaxmn.cpp:841
 msgid "WB-GM"
 msgstr ""
 
-#: src/pentaxmn.cpp:773
+#: src/pentaxmn.cpp:853
 #, fuzzy
 msgid "Unknown "
 msgstr "Desconocido"
 
-#: src/pentaxmn.cpp:786
+#: src/pentaxmn.cpp:866
 #, fuzzy
 msgid "Pentax Makernote version"
 msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:789
+#: src/pentaxmn.cpp:869
 #, fuzzy
 msgid "Camera shooting mode"
 msgstr "Modo de métrica"
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
 msgid "Resolution of a preview image"
 msgstr ""
 
-#: src/pentaxmn.cpp:794
+#: src/pentaxmn.cpp:874
+#, fuzzy
 msgid "Length of a preview image"
-msgstr ""
+msgstr "Orientación"
 
-#: src/pentaxmn.cpp:795
+#: src/pentaxmn.cpp:875
 msgid "Size of an IFD containing a preview image"
 msgstr ""
 
-#: src/pentaxmn.cpp:800
+#: src/pentaxmn.cpp:880
 #, fuzzy
 msgid "Model identification"
 msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:801
+#: src/pentaxmn.cpp:881
+#, fuzzy
 msgid "Pentax model idenfication"
-msgstr ""
+msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
 #, fuzzy
 msgid "Date"
 msgstr "Fecha y hora"
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
+#, fuzzy
 msgid "Time"
-msgstr ""
+msgstr "Orden de llenado"
 
-#: src/pentaxmn.cpp:810
+#: src/pentaxmn.cpp:890
 #, fuzzy
 msgid "Image quality settings"
 msgstr "Ancho de la imagen"
 
-#: src/pentaxmn.cpp:813
+#: src/pentaxmn.cpp:893
 #, fuzzy
 msgid "Image size settings"
 msgstr "Ancho de la imagen"
 
-#: src/pentaxmn.cpp:817
+#: src/pentaxmn.cpp:897
 #, fuzzy
 msgid "Flash mode settings"
 msgstr "Contraste"
 
-#: src/pentaxmn.cpp:820
+#: src/pentaxmn.cpp:900
 #, fuzzy
 msgid "Focus mode settings"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:823
+#: src/pentaxmn.cpp:903
 #, fuzzy
 msgid "Selected AF point"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+#, fuzzy
+msgid "AF point in focus"
+msgstr "Punto blanco"
+
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
 #, fuzzy
 msgid "F-Number"
 msgstr "El número F."
 
-#: src/pentaxmn.cpp:832
+#: src/pentaxmn.cpp:915
 #, fuzzy
 msgid "ISO sensitivity"
 msgstr "Sensibilidad espectral"
 
-#: src/pentaxmn.cpp:833
+#: src/pentaxmn.cpp:916
 #, fuzzy
 msgid "ISO sensitivity settings"
 msgstr "Velocidad ISO"
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
 #, fuzzy
 msgid "MeteringMode"
 msgstr "Modo de métrica"
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
 #, fuzzy
 msgid "AutoBracketing"
 msgstr "Auto bracket"
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
 #, fuzzy
 msgid "White ballance"
 msgstr "Balance de blanco"
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
 #, fuzzy
 msgid "White ballance mode"
 msgstr "Balance de blanco"
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
+#: src/pentaxmn.cpp:936
+#, fuzzy
+msgid "Blue color balance"
+msgstr "Balance de blanco"
+
+#: src/pentaxmn.cpp:939
+#, fuzzy
+msgid "Red color balance"
+msgstr "Espacio de color"
+
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
 #, fuzzy
 msgid "FocalLength"
 msgstr "Distancia focal"
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
 #, fuzzy
 msgid "Location"
 msgstr "Ubicación del sujeto"
 
-#: src/pentaxmn.cpp:869
+#: src/pentaxmn.cpp:959
+#, fuzzy
 msgid "Hometown"
-msgstr ""
+msgstr "Normal"
 
-#: src/pentaxmn.cpp:875
+#: src/pentaxmn.cpp:965
 msgid "Hometown DST"
 msgstr ""
 
-#: src/pentaxmn.cpp:876
+#: src/pentaxmn.cpp:966
 msgid "Whether day saving time is active in home town"
 msgstr ""
 
-#: src/pentaxmn.cpp:878
+#: src/pentaxmn.cpp:968
 #, fuzzy
 msgid "Destination DST"
 msgstr "Orientación"
 
-#: src/pentaxmn.cpp:879
+#: src/pentaxmn.cpp:969
 msgid "Whether day saving time is active in destination"
 msgstr ""
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
 #, fuzzy
 msgid "DSPFirmwareVersion"
 msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
 #, fuzzy
 msgid "CPUFirmwareVersion"
 msgstr "Versión Exif"
 
-#: src/pentaxmn.cpp:891
+#: src/pentaxmn.cpp:981
 #, fuzzy
 msgid "Light value"
 msgstr "Brillo"
 
-#: src/pentaxmn.cpp:892
+#: src/pentaxmn.cpp:982
 msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+#, fuzzy
+msgid "Image area offset"
+msgstr "Ancho de la imagen"
+
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+#, fuzzy
+msgid "Raw image size"
+msgstr "Ancho de la imagen"
+
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
 #, fuzzy
 msgid "Preview image borders"
 msgstr "Orientación"
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
 #, fuzzy
 msgid "Sensitivity adjust"
 msgstr "Sensibilidad espectral"
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
 #, fuzzy
 msgid "Digital filter"
 msgstr "Relación de zoom digital"
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-#, fuzzy
-msgid "Temperature"
-msgstr "Espacio de color"
-
-#: src/pentaxmn.cpp:923
+#: src/pentaxmn.cpp:1019
 #, fuzzy
 msgid "Camera temperature"
 msgstr "Espacio de color"
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
 #, fuzzy
 msgid "Image tone"
 msgstr "Ancho de la imagen"
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
 #, fuzzy
 msgid "Colort temperature"
 msgstr "Espacio de color"
 
-#: src/pentaxmn.cpp:943
+#: src/pentaxmn.cpp:1039
 #, fuzzy
 msgid "Shake reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:1040
 #, fuzzy
 msgid "Shake reduction information"
 msgstr "Contraste"
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
 #, fuzzy
 msgid "Dynamic range expansion"
 msgstr "Balance de blanco"
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+#, fuzzy
+msgid "AF Adjustment"
+msgstr "Longitud de la imagen"
+
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
+#, fuzzy
 msgid "Black point"
-msgstr ""
+msgstr "Punto blanco"
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
 #, fuzzy
 msgid "White point"
 msgstr "Punto blanco"
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
 #, fuzzy
 msgid "ShotInfo"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
+#, fuzzy
 msgid "AEInfo"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
 #, fuzzy
 msgid "LensInfo"
 msgstr "Ancho de la imagen"
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
 #, fuzzy
 msgid "FlashInfo"
 msgstr "Flash"
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
 #, fuzzy
 msgid "AEMeteringSegments"
 msgstr "Modo de métrica"
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
 #, fuzzy
 msgid "FlashADump"
 msgstr "Flash"
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
 #, fuzzy
 msgid "FlashBDump"
 msgstr "Flash"
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
+#, fuzzy
 msgid "WB_RGGBLevelsDaylight"
-msgstr ""
+msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
+#, fuzzy
 msgid "WB_RGGBLevelsShade"
-msgstr ""
+msgstr "Nivel de la batería"
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
+#, fuzzy
 msgid "WB_RGGBLevelsCloudy"
-msgstr ""
+msgstr "Nivel de la batería"
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
+#, fuzzy
 msgid "WB_RGGBLevelsTungsten"
-msgstr ""
+msgstr "Nivel de la batería"
 
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentD"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentN"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentW"
 msgstr "Fluorescente"
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
+#, fuzzy
 msgid "WB_RGGBLevelsFlash"
-msgstr ""
+msgstr "Nivel de la batería"
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
 #, fuzzy
 msgid "CameraInfo"
 msgstr "Retrato"
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
 #, fuzzy
 msgid "BatteryInfo"
 msgstr "Patrón"
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
 #, fuzzy
 msgid "AFInfo"
 msgstr "Modo de exposición"
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
 #, fuzzy
 msgid "ColorInfo"
 msgstr "Espacio de color"
 
-#: src/pentaxmn.cpp:1023
+#: src/pentaxmn.cpp:1125
 #, fuzzy
 msgid "Unknown PentaxMakerNote tag"
 msgstr "Versión Exif"
 
-#: src/properties.cpp:92
+#: src/properties.cpp:97
 msgid "Dublin Core schema"
 msgstr ""
 
-#: src/properties.cpp:93
+#: src/properties.cpp:98
 msgid "digiKam Photo Management schema"
 msgstr ""
 
-#: src/properties.cpp:94
-msgid "XMP Basic schema"
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
 msgstr ""
 
-#: src/properties.cpp:95
+#: src/properties.cpp:100
+#, fuzzy
+msgid "XMP Basic schema"
+msgstr "formato planar"
+
+#: src/properties.cpp:101
 msgid "XMP Rights Management schema"
 msgstr ""
 
-#: src/properties.cpp:96
+#: src/properties.cpp:102
+#, fuzzy
 msgid "XMP Media Management schema"
-msgstr ""
+msgstr "formato planar"
 
-#: src/properties.cpp:97
+#: src/properties.cpp:103
+#, fuzzy
 msgid "XMP Basic Job Ticket schema"
-msgstr ""
+msgstr "formato planar"
 
-#: src/properties.cpp:98
+#: src/properties.cpp:104
+#, fuzzy
 msgid "XMP Paged-Text schema"
-msgstr ""
+msgstr "formato planar"
 
-#: src/properties.cpp:99
+#: src/properties.cpp:105
 #, fuzzy
 msgid "XMP Dynamic Media schema"
 msgstr "formato planar"
 
-#: src/properties.cpp:100
+#: src/properties.cpp:106
 msgid "Microsoft Photo schema"
 msgstr ""
 
-#: src/properties.cpp:101
+#: src/properties.cpp:107
 msgid "Adobe PDF schema"
 msgstr ""
 
-#: src/properties.cpp:102
+#: src/properties.cpp:108
 msgid "Adobe photoshop schema"
 msgstr ""
 
-#: src/properties.cpp:103
+#: src/properties.cpp:109
 #, fuzzy
 msgid "Camera Raw schema"
 msgstr "Contraste"
 
-#: src/properties.cpp:104
+#: src/properties.cpp:110
 msgid "Exif Schema for TIFF Properties"
 msgstr ""
 
-#: src/properties.cpp:105
+#: src/properties.cpp:111
 msgid "Exif schema for Exif-specific Properties"
 msgstr ""
 
-#: src/properties.cpp:106
+#: src/properties.cpp:112
 msgid "Exif schema for Additional Exif Properties"
 msgstr ""
 
-#: src/properties.cpp:107
+#: src/properties.cpp:113
 msgid "IPTC Core schema"
 msgstr ""
 
-#: src/properties.cpp:109
+#: src/properties.cpp:115
 msgid "IPTC Extension schema"
 msgstr ""
 
-#: src/properties.cpp:111
+#: src/properties.cpp:117
 msgid "PLUS License Data Format schema"
 msgstr ""
 
-#: src/properties.cpp:114
+#: src/properties.cpp:118
+#, fuzzy
+msgid "iView Media Pro schema"
+msgstr "formato planar"
+
+#: src/properties.cpp:119
+msgid "Expression Media schema"
+msgstr ""
+
+#: src/properties.cpp:122
 #, fuzzy
 msgid "Colorant structure"
 msgstr "Espacio de color"
 
-#: src/properties.cpp:115
+#: src/properties.cpp:123
+#, fuzzy
 msgid "Dimensions structure"
-msgstr ""
+msgstr "Desplazamiento de tira"
 
-#: src/properties.cpp:116
+#: src/properties.cpp:124
+#, fuzzy
 msgid "Font structure"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/properties.cpp:117
+#: src/properties.cpp:125
 #, fuzzy
 msgid "Thumbnail structure"
 msgstr "Desplazamiento de tira"
 
-#: src/properties.cpp:118
+#: src/properties.cpp:126
+#, fuzzy
 msgid "Resource Event structure"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/properties.cpp:119
+#: src/properties.cpp:127
+#, fuzzy
 msgid "ResourceRef structure"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/properties.cpp:120
+#: src/properties.cpp:128
+#, fuzzy
 msgid "Version structure"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/properties.cpp:121
+#: src/properties.cpp:129
 msgid "Basic Job/Workflow structure"
 msgstr ""
 
-#: src/properties.cpp:124
+#: src/properties.cpp:132
 msgid "Qualifier for xmp:Identifier"
 msgstr ""
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 #, fuzzy
 msgid "Contributor"
 msgstr "Contraste"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributors to the resource (other than the authors)."
 msgstr ""
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 #, fuzzy
 msgid "Coverage"
 msgstr "Promedio"
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid ""
 "The spatial or temporal topic of the resource, the spatial applicability of "
 "the resource, or the jurisdiction under which the resource is relevant."
 msgstr ""
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 #, fuzzy
 msgid "Creator"
 msgstr "Centímetro"
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid ""
 "The authors of the resource (listed in order of precedence, if significant)."
 msgstr ""
 
-#: src/properties.cpp:132
+#: src/properties.cpp:140
 msgid "Date(s) that something interesting happened to the resource."
 msgstr ""
 
-#: src/properties.cpp:133
+#: src/properties.cpp:141
 msgid ""
 "A textual description of the content of the resource. Multiple values may be "
 "present for different languages."
 msgstr ""
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 #, fuzzy
 msgid "Format"
 msgstr "Fuente de archivo"
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid ""
 "The file format used when saving the resource. Tools and applications should "
 "set this property to the save format of the data. It may include appropriate "
 "qualifiers."
 msgstr ""
 
-#: src/properties.cpp:137 src/properties.cpp:180
+#: src/properties.cpp:145 src/properties.cpp:196
 #, fuzzy
 msgid "Identifier"
 msgstr "Centímetro"
 
-#: src/properties.cpp:137
+#: src/properties.cpp:145
 msgid ""
 "Unique identifier of the resource. Recommended best practice is to identify "
 "the resource by means of a string conforming to a formal identification "
 "system."
 msgstr ""
 
-#: src/properties.cpp:139
+#: src/properties.cpp:147
 msgid "An unordered array specifying the languages used in the resource."
 msgstr ""
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid "Publisher"
 msgstr ""
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid ""
 "An entity responsible for making the resource available. Examples of a "
 "Publisher include a person, an organization, or a service. Typically, the "
 "name of a Publisher should be used to indicate the entity."
 msgstr ""
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 #, fuzzy
 msgid "Relation"
 msgstr "acción"
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid ""
 "Relationships to other documents. Recommended best practice is to identify "
 "the related resource by means of a string conforming to a formal "
 "identification system."
 msgstr ""
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 #, fuzzy
 msgid "Rights"
 msgstr "Escena nocturna"
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid ""
 "Informal rights statement, selected by language. Typically, rights "
 "information includes a statement about various property rights associated "
 "with the resource, including intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:148
+#: src/properties.cpp:156
 msgid "Unique identifier of the work from which this resource was derived."
 msgstr ""
 
-#: src/properties.cpp:149
+#: src/properties.cpp:157
 msgid ""
 "An unordered array of descriptive phrases or keywords that specify the topic "
 "of the content of the resource."
 msgstr ""
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 #, fuzzy
 msgid "Title"
 msgstr "Orden de llenado"
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid ""
 "The title of the document, or the name given to the resource. Typically, it "
 "will be a name by which the resource is formally known."
 msgstr ""
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 #, fuzzy
 msgid "Type"
 msgstr "Escena nocturna"
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "A document type; for example, novel, poem, or working paper."
 msgstr ""
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid "Tags List"
 msgstr ""
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid ""
 "The list of complete tags path as string. The path hierarchy is separated by "
 "'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
 msgstr ""
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 #, fuzzy
 msgid "Captions Author Names"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 msgid ""
 "The list of all captions author names for each language alternative captions "
 "set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 #, fuzzy
 msgid "Captions Date Time Stamps"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 msgid ""
 "The list of all captions date time stamps for each language alternative "
 "captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:168
+#: src/properties.cpp:170 src/tags.cpp:842
+#, fuzzy
+msgid "Image History"
+msgstr "Longitud de la imagen"
+
+#: src/properties.cpp:170
+msgid ""
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
+msgstr ""
+
+#: src/properties.cpp:171
+#, fuzzy
+msgid "Lens Correction Settings"
+msgstr "Contraste"
+
+#: src/properties.cpp:171
+msgid ""
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
+msgstr ""
+
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
+msgstr ""
+
+#: src/properties.cpp:177
+msgid ""
+"The list of files processed with Enfuse program through ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:178
+#, fuzzy
+msgid "Enfuse Settings"
+msgstr "Contraste"
+
+#: src/properties.cpp:178
+msgid ""
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:184
 #, fuzzy
 msgid "Advisory"
 msgstr "acción"
 
-#: src/properties.cpp:168
+#: src/properties.cpp:184
 msgid ""
 "An unordered array specifying properties that were edited outside the "
 "authoring application. Each item should contain a single namespace and XPath "
 "separated by one ASCII space (U+0020)."
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid "Base URL"
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid ""
 "The base URL for relative URLs in the document content. If this document "
 "contains Internet links, and those links are relative, they are relative to "
@@ -11883,29 +15482,30 @@
 "based on their notion of where URLs will be interpreted."
 msgstr ""
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 #, fuzzy
 msgid "Create Date"
 msgstr "Tipo de captura de escena"
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 #, fuzzy
 msgid "The date and time the resource was originally created."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
+#, fuzzy
 msgid "Creator Tool"
-msgstr ""
+msgstr "Centímetro"
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid ""
 "The name of the first known tool used to create the resource. If history is "
 "present in the metadata, this value should be equivalent to that of xmpMM:"
 "History's softwareAgent property."
 msgstr ""
 
-#: src/properties.cpp:180
+#: src/properties.cpp:196
 msgid ""
 "An unordered array of text strings that unambiguously identify the resource "
 "within a given context. An array item may be qualified with xmpidq:Scheme to "
@@ -11915,119 +15515,123 @@
 "(single-valued) property."
 msgstr ""
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 #, fuzzy
 msgid "Label"
 msgstr "promedio"
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid ""
 "A word or short phrase that identifies a document as a member of a user-"
 "defined collection. Used to organize documents in a file browser."
 msgstr ""
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
+#, fuzzy
 msgid "Metadata Date"
-msgstr ""
+msgstr "Tipo de captura de escena"
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid ""
 "The date and time that any metadata for this resource was last changed. It "
 "should be the same as or more recent than xmp:ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
+#, fuzzy
 msgid "Modify Date"
-msgstr ""
+msgstr "Orden de llenado"
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid ""
 "The date and time the resource was last modified. Note: The value of this "
 "property is not necessarily the same as the file's system modification date "
 "because it is set before the file is saved."
 msgstr ""
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
+#, fuzzy
 msgid "Nickname"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "A short informal name for the resource."
 msgstr ""
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 #, fuzzy
 msgid "Rating"
 msgstr "acción"
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid ""
 "A number that indicates a document's status relative to other documents, "
 "used to organize documents in a file browser. Values are user-defined within "
 "an application-defined range."
 msgstr ""
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 #, fuzzy
 msgid "Thumbnails"
 msgstr "Desplazamiento de tira"
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid ""
 "An alternative array of thumbnail images for a file, which can differ in "
 "characteristics such as size or image encoding."
 msgstr ""
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Certificate"
 msgstr ""
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Online rights management certificate."
 msgstr ""
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 #, fuzzy
 msgid "Marked"
 msgstr "Duro"
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 msgid "Indicates that this is a rights-managed resource."
 msgstr ""
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 #, fuzzy
 msgid "Owner"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "An unordered array specifying the legal owner(s) of a resource."
 msgstr ""
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Usage Terms"
 msgstr ""
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Text instructions on how a resource can be legally used."
 msgstr ""
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
+#, fuzzy
 msgid "Web Statement"
-msgstr ""
+msgstr "multi-lugar"
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid ""
 "The location of a web page describing the owner and/or rights statement for "
 "this resource."
 msgstr ""
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 #, fuzzy
 msgid "Derived From"
 msgstr "Modo de métrica"
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid ""
 "A reference to the original document from which this one is derived. It is a "
 "minimal reference; missing components can be assumed to be unchanged. For "
@@ -12036,22 +15640,23 @@
 "specify the instance ID and rendition class of the original."
 msgstr ""
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 #, fuzzy
 msgid "Document ID"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid ""
 "The common identifier for all versions and renditions of a document. It "
 "should be based on a UUID; see Document and Instance IDs below."
 msgstr ""
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
+#, fuzzy
 msgid "History"
-msgstr ""
+msgstr "Longitud de la imagen"
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid ""
 "An ordered array of high-level user actions that resulted in this resource. "
 "It is intended to give human readers a general indication of the steps taken "
@@ -12060,22 +15665,24 @@
 "other detailed history."
 msgstr ""
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
+#, fuzzy
 msgid "Instance ID"
-msgstr ""
+msgstr "centrado"
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid ""
 "An identifier for a specific incarnation of a document, updated each time a "
 "file is saved. It should be based on a UUID; see Document and Instance IDs "
 "below."
 msgstr ""
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
+#, fuzzy
 msgid "Managed From"
-msgstr ""
+msgstr "Fabricante"
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid ""
 "A reference to the document as it was prior to becoming managed. It is set "
 "when a managed document is introduced to an asset management system that "
@@ -12083,23 +15690,24 @@
 "management systems."
 msgstr ""
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 #, fuzzy
 msgid "Manager"
 msgstr "Fabricante"
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid ""
 "The name of the asset management system that manages this resource. Along "
 "with xmpMM: ManagerVariant, it tells applications which asset management "
 "system to contact concerning this document."
 msgstr ""
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
+#, fuzzy
 msgid "Manage To"
-msgstr ""
+msgstr "Fabricante"
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 msgid ""
 "A URI identifying the managed resource to the asset management system; the "
 "presence of this property is the formal indication that this resource is "
@@ -12107,52 +15715,54 @@
 "system."
 msgstr ""
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
+#, fuzzy
 msgid "Manage UI"
-msgstr ""
+msgstr "Fabricante"
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 msgid ""
 "A URI that can be used to access information about the managed resource "
 "through a web browser. It might require a custom browser plug-in."
 msgstr ""
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
+#, fuzzy
 msgid "Manager Variant"
-msgstr ""
+msgstr "Fabricante"
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 msgid ""
 "Specifies a particular variant of the asset management system. The format of "
 "this property is private to the specific asset management system."
 msgstr ""
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid "Rendition Class"
 msgstr ""
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid ""
 "The rendition class name for this resource. This property should be absent "
 "or set to default for a document version that is not a derived rendition."
 msgstr ""
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid "Rendition Params"
 msgstr ""
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid ""
 "Can be used to provide additional rendition parameters that are too complex "
 "or verbose to encode in xmpMM: RenditionClass."
 msgstr ""
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 #, fuzzy
 msgid "Version ID"
 msgstr "Versión Exif"
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid ""
 "The document version identifier for this resource. Each version of a "
 "document gets a new identifier, usually simply by incrementing integers 1, "
@@ -12160,12 +15770,12 @@
 "support branching which requires a more complex scheme."
 msgstr ""
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 #, fuzzy
 msgid "Versions"
 msgstr "Versión Exif"
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid ""
 "The version history associated with this resource. Entry [1] is the oldest "
 "known version for this document, entry [last()] is the most recent version. "
@@ -12176,38 +15786,39 @@
 "the version history can be truncated at some point."
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Last URL"
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Deprecated for privacy protection."
 msgstr ""
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
+#, fuzzy
 msgid "Rendition Of"
-msgstr ""
+msgstr "acción"
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid ""
 "Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
 "which this is a rendition."
 msgstr ""
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Save ID"
 msgstr ""
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
 msgstr ""
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 #, fuzzy
 msgid "Job Reference"
 msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 msgid ""
 "References an external job management file for a job process in which the "
 "document is being used. Use of job names is under user control. Typical use "
@@ -12217,737 +15828,741 @@
 "historical information about what jobs a document was part of previously."
 msgstr ""
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 #, fuzzy
 msgid "Maximum Page Size"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid ""
 "The size of the largest page in the document (including any in contained "
 "documents)."
 msgstr ""
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 #, fuzzy
 msgid "Number of Pages"
 msgstr "El número F."
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid ""
 "The number of pages in the document (including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 #, fuzzy
 msgid "Fonts"
 msgstr "Punto blanco"
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid ""
 "An unordered array of fonts that are used in the document (including any in "
 "contained documents)."
 msgstr ""
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 #, fuzzy
 msgid "Colorants"
 msgstr "Espacio de color"
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid ""
 "An ordered array of colorants (swatches) that are used in the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 #, fuzzy
 msgid "Plate Names"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid ""
 "An ordered array of plate names that are needed to print the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 #, fuzzy
 msgid "Project Reference"
 msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "A reference to the project that created this file."
 msgstr ""
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
+#, fuzzy
 msgid "Video Frame Rate"
-msgstr ""
+msgstr "Orden de llenado"
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "The video frame rate. One of: 24, NTSC, PAL."
 msgstr ""
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
+#, fuzzy
 msgid "Video Frame Size"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "The frame size. For example: w:720, h: 480, unit:pixels"
 msgstr ""
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "Video Pixel Aspect Ratio"
 msgstr ""
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
 msgstr ""
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
+#, fuzzy
 msgid "Video Pixel Depth"
-msgstr ""
+msgstr "Orden de llenado"
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid ""
 "The size in bits of each color component of a pixel. Standard Windows 32-bit "
 "pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 #, fuzzy
 msgid "Video Color Space"
 msgstr "Espacio de color"
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid ""
 "The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
 "CCIR-709 (used for HD)."
 msgstr ""
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 #, fuzzy
 msgid "Video Alpha Mode"
 msgstr "Modo de métrica"
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 msgid "The alpha mode. One of: straight, pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid "Video Alpha Premultiple Color"
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid ""
 "A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
 "is pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "Video Alpha Unity Is Transparent"
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "When true, unity is clear, when false, it is opaque."
 msgstr ""
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 #, fuzzy
 msgid "Video Compressor"
 msgstr "Compresión"
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video compression used. For example, jpeg."
 msgstr ""
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 #, fuzzy
 msgid "Video Field Order"
 msgstr "Orden de llenado"
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "The field order for video. One of: Upper, Lower, Progressive."
 msgstr ""
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid "Pull Down"
 msgstr ""
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid ""
 "The sampling phase of film to be converted to video (pull-down). One of: "
 "WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
 "WWWSS_24p, WWSSW_24p."
 msgstr ""
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid "Audio Sample Rate"
 msgstr ""
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid ""
 "The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
 msgstr ""
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
+#, fuzzy
 msgid "Audio Sample Type"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "Audio Channel Type"
 msgstr ""
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
 msgstr ""
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 #, fuzzy
 msgid "Audio Compressor"
 msgstr "Compresión"
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "The audio compression used. For example, MP3."
 msgstr ""
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid "Speaker Placement"
 msgstr ""
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid ""
 "A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
 msgstr ""
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 #, fuzzy
 msgid "File Data Rate"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 msgid ""
 "The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
 "sec"
 msgstr ""
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 #, fuzzy
 msgid "Tape Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid ""
 "The name of the tape from which the clip was captured, as set during the "
 "capture process."
 msgstr ""
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 #, fuzzy
 msgid "Alternative Tape Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid ""
 "An alternative tape name, set via the project window or timecode dialog in "
 "Premiere. If an alternative name has been set and has not been reverted, "
 "that name is displayed."
 msgstr ""
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 #, fuzzy
 msgid "Start Time Code"
 msgstr "Flash"
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid ""
 "The timecode of the first frame of video in the file, as obtained from the "
 "device control."
 msgstr ""
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 #, fuzzy
 msgid "Alternative Time code"
 msgstr "Flash"
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid ""
 "A timecode set by the user. When specified, it is used instead of the "
 "startTimecode."
 msgstr ""
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 #, fuzzy
 msgid "Duration"
 msgstr "Saturación"
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 #, fuzzy
 msgid "The duration of the media file."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 #, fuzzy
 msgid "Scene"
 msgstr "centrado"
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 #, fuzzy
 msgid "The name of the scene."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 #, fuzzy
 msgid "Shot Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 #, fuzzy
 msgid "The name of the shot or take."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 #, fuzzy
 msgid "Shot Date"
 msgstr "Fecha y hora"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 #, fuzzy
 msgid "The date and time when the video was shot."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 #, fuzzy
 msgid "Shot Location"
 msgstr "Ubicación del sujeto"
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid ""
 "The name of the location where the video was shot. For example: "
 "\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
 "GPS values."
 msgstr ""
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "Log Comment"
 msgstr "Comentario del usuario"
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "User's log comments."
 msgstr "Comentario del usuario"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 #, fuzzy
 msgid "Markers"
 msgstr "Duro"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "An ordered list of markers"
 msgstr ""
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 #, fuzzy
 msgid "Contributed Media"
 msgstr "Contraste"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 msgid "An unordered list of all media used to create this media."
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid "Absolute Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid ""
 "The absolute path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid "Relative Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid ""
 "The relative path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 #, fuzzy
 msgid "Video Modified Date"
 msgstr "Orden de llenado"
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 #, fuzzy
 msgid "The date and time when the video was last modified."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
+#, fuzzy
 msgid "Audio Modified Date"
-msgstr ""
+msgstr "Orden de llenado"
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 #, fuzzy
 msgid "The date and time when the audio was last modified."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
+#, fuzzy
 msgid "Metadata Modified Date"
-msgstr ""
+msgstr "Orden de llenado"
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 #, fuzzy
 msgid "The date and time when the metadata was last modified."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
 msgid "Artist"
 msgstr "Artista"
 
-#: src/properties.cpp:323
+#: src/properties.cpp:339
 #, fuzzy
 msgid "The name of the artist or artists."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 #, fuzzy
 msgid "Album"
 msgstr "creativo"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 #, fuzzy
 msgid "The name of the album."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 #, fuzzy
 msgid "Track Number"
 msgstr "ID único de imagen"
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid ""
 "A numeric value indicating the order of the audio file within its original "
 "recording."
 msgstr ""
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 #, fuzzy
 msgid "Genre"
 msgstr "centrado"
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 #, fuzzy
 msgid "The name of the genre."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:327
+#: src/properties.cpp:343
 #, fuzzy
 msgid "The copyright information."
 msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:328
+#: src/properties.cpp:344
 #, fuzzy
 msgid "The date the title was released."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 #, fuzzy
 msgid "Composer"
 msgstr "Descomprimido"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "The composer's name."
 msgstr ""
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 #, fuzzy
 msgid "Engineer"
 msgstr "Centímetro"
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "The engineer's name."
 msgstr ""
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "Tempo"
 msgstr ""
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "The audio's tempo."
 msgstr ""
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 #, fuzzy
 msgid "Instrument"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "The musical instrument."
 msgstr ""
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 #, fuzzy
 msgid "Intro Time"
 msgstr "Fecha y hora"
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
+#, fuzzy
 msgid "The duration of lead time for queuing music."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "Out Cue"
 msgstr ""
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "The time at which to fade out."
 msgstr ""
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 #, fuzzy
 msgid "Relative Timestamp"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "The start time of the media inside the audio project."
 msgstr ""
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 #, fuzzy
 msgid "Loop"
 msgstr "Ganancia baja baja"
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "When true, the clip can be looped seemlessly."
 msgstr ""
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 #, fuzzy
 msgid "Number Of Beats"
 msgstr "El número F."
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 #, fuzzy
 msgid "The number of beats."
 msgstr "El número F."
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid "Key"
 msgstr ""
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid ""
 "The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
 msgstr ""
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 #, fuzzy
 msgid "Stretch Mode"
 msgstr "Longitud de la imagen"
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid ""
 "The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
 "Splice, Hybrid."
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Time Scale Parameters"
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Additional parameters for Time-Scale stretch mode."
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Resample Parameters"
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Additional parameters for Resample stretch mode."
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Beat Splice Parameters"
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Additional parameters for Beat Splice stretch mode."
 msgstr ""
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 #, fuzzy
 msgid "Time Signature"
 msgstr "Espacio de color"
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid ""
 "The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
 "12/8, other."
 msgstr ""
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 #, fuzzy
 msgid "Scale Type"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid ""
 "The musical scale used in the music. One of: Major, Minor, Both, Neither. "
 "Neither is most often used for instruments with no associated scale, such as "
 "drums."
 msgstr ""
 
-#: src/properties.cpp:351 src/tags.cpp:889
+#: src/properties.cpp:367 src/tags.cpp:1076
 #, fuzzy
 msgid "Camera Serial Number"
 msgstr "El número F."
 
-#: src/properties.cpp:351
+#: src/properties.cpp:367
 #, fuzzy
 msgid "Camera Serial Number."
 msgstr "El número F."
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired"
 msgstr "Fecha y hora"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired."
 msgstr "Fecha y hora"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 #, fuzzy
 msgid "Flash Manufacturer"
 msgstr "Fabricante"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 #, fuzzy
 msgid "Flash Manufacturer."
 msgstr "Fabricante"
 
-#: src/properties.cpp:354
+#: src/properties.cpp:370
 #, fuzzy
 msgid "Flash Model."
 msgstr "Flash"
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
 msgid "Last Keyword IPTC"
 msgstr ""
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
 msgid "Last Keyword IPTC."
 msgstr ""
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 msgid "Last Keyword XMP"
 msgstr ""
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 msgid "Last Keyword XMP."
 msgstr ""
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 #, fuzzy
 msgid "Lens Manufacturer"
 msgstr "Fabricante"
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 #, fuzzy
 msgid "Lens Manufacturer."
 msgstr "Fabricante"
 
-#: src/properties.cpp:358
-#, fuzzy
-msgid "Lens Model"
-msgstr "Tipo de escena"
-
-#: src/properties.cpp:358
+#: src/properties.cpp:374
 #, fuzzy
 msgid "Lens Model."
 msgstr "Tipo de escena"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 #, fuzzy
 msgid "Rating Percent"
 msgstr "acción"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
+#, fuzzy
 msgid "Rating Percent."
-msgstr ""
+msgstr "acción"
 
-#: src/properties.cpp:365
+#: src/properties.cpp:381
 msgid "Keywords."
 msgstr ""
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 #, fuzzy
 msgid "PDF Version"
 msgstr "Versión Exif"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
 msgstr ""
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "Producer"
 msgstr ""
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
+#, fuzzy
 msgid "The name of the tool that created the PDF document."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 #, fuzzy
 msgid "Authors Position"
 msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 msgid "By-line title."
 msgstr ""
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 #, fuzzy
 msgid "Caption Writer"
 msgstr "acción"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 msgid "Writer/editor."
 msgstr ""
 
-#: src/properties.cpp:375
+#: src/properties.cpp:391
 msgid "Category. Limited to 3 7-bit ASCII characters."
 msgstr ""
 
-#: src/properties.cpp:376
+#: src/properties.cpp:392
 msgid "City."
 msgstr ""
 
-#: src/properties.cpp:377
+#: src/properties.cpp:393
 msgid "Country/primary location."
 msgstr ""
 
-#: src/properties.cpp:378
+#: src/properties.cpp:394
 msgid "Credit."
 msgstr ""
 
-#: src/properties.cpp:379
+#: src/properties.cpp:395
 msgid ""
 "The date the intellectual content of the document was created (rather than "
 "the creation date of the physical representation), following IIM "
@@ -12956,424 +16571,425 @@
 "photo was digitized for archiving."
 msgstr ""
 
-#: src/properties.cpp:383
+#: src/properties.cpp:399
 #, fuzzy
 msgid "Headline."
 msgstr "pulg"
 
-#: src/properties.cpp:384
+#: src/properties.cpp:400
 #, fuzzy
 msgid "Special instructions."
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:385
+#: src/properties.cpp:401
 #, fuzzy
 msgid "Source."
 msgstr "Fuente de archivo"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 #, fuzzy
 msgid "State"
 msgstr "Fecha y hora"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "Province/state."
 msgstr ""
 
-#: src/properties.cpp:387
+#: src/properties.cpp:403
 msgid "Supplemental category."
 msgstr ""
 
-#: src/properties.cpp:388
+#: src/properties.cpp:404
 msgid "Original transmission reference."
 msgstr ""
 
-#: src/properties.cpp:389
+#: src/properties.cpp:405
 msgid "Urgency. Valid range is 1-8."
 msgstr ""
 
-#: src/properties.cpp:397
+#: src/properties.cpp:413
 #, fuzzy
 msgid "inches"
 msgstr "Pulgada"
 
-#: src/properties.cpp:398 src/tags.cpp:227
+#: src/properties.cpp:414 src/tags.cpp:247
 msgid "cm"
 msgstr "cm"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 #, fuzzy
 msgid "Auto Brightness"
 msgstr "Brillo"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "When true, \"Brightness\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 #, fuzzy
 msgid "Auto Contrast"
 msgstr "Contraste"
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "When true, \"Contrast\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 #, fuzzy
 msgid "Auto Exposure"
 msgstr "Modo de exposición"
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "When true, \"Exposure\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 #, fuzzy
 msgid "Auto Shadows"
 msgstr "Sombra"
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "When true,\"Shadows\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 #, fuzzy
 msgid "Blue Hue"
 msgstr "Balance de blanco"
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 #, fuzzy
 msgid "\"Blue Hue\" setting. Range -100 to 100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 #, fuzzy
 msgid "Blue Saturation"
 msgstr "Saturación"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 #, fuzzy
 msgid "\"Blue Saturation\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:408
+#: src/properties.cpp:424
 #, fuzzy
 msgid "\"Brightness\" setting. Range 0 to +150."
 msgstr "Nitidez"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 #, fuzzy
 msgid "Camera Profile"
 msgstr "Espacio de color"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 #, fuzzy
 msgid "\"Camera Profile\" setting."
 msgstr "Contraste"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 #, fuzzy
 msgid "Chromatic Aberration Blue"
 msgstr "Alta saturación"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 #, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 #, fuzzy
 msgid "Chromatic Aberration Red"
 msgstr "Alta saturación"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 #, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 #, fuzzy
 msgid "Color Noise Reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 #, fuzzy
 msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:413
+#: src/properties.cpp:429
 #, fuzzy
 msgid "\"Contrast\" setting. Range -50 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:414
+#: src/properties.cpp:430
 msgid "When \"Has Crop\" is true, top of crop rectangle"
 msgstr ""
 
-#: src/properties.cpp:415
+#: src/properties.cpp:431
 msgid "When \"Has Crop\" is true, left of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 #, fuzzy
 msgid "Crop Bottom"
 msgstr "izquierda - abajo"
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "When \"Has Crop\" is true, bottom of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 #, fuzzy
 msgid "Crop Right"
 msgstr "Copyright"
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "When \"Has Crop\" is true, right of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 #, fuzzy
 msgid "Crop Angle"
 msgstr "arriba - izquierda"
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "When \"Has Crop\" is true, angle of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:419
+#: src/properties.cpp:435
 msgid "Width of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:420
+#: src/properties.cpp:436
 msgid "Height of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 #, fuzzy
 msgid "Crop Units"
 msgstr "Copyright"
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
 msgstr ""
 
-#: src/properties.cpp:422
+#: src/properties.cpp:438
 #, fuzzy
 msgid "\"Exposure\" setting. Range -4.0 to +4.0."
 msgstr "Nitidez"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 #, fuzzy
 msgid "GreenHue"
 msgstr "Modo de métrica"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 #, fuzzy
 msgid "\"Green Hue\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 #, fuzzy
 msgid "Green Saturation"
 msgstr "Saturación"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 #, fuzzy
 msgid "\"Green Saturation\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 #, fuzzy
 msgid "Has Crop"
-msgstr "Flash"
+msgstr "Tiene crop"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "When true, image has a cropping rectangle."
 msgstr ""
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 #, fuzzy
 msgid "Has Settings"
 msgstr "Contraste"
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "When true, non-default camera raw settings."
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 msgid "Luminance Smoothing"
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 #, fuzzy
 msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 #, fuzzy
 msgid "Raw File Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "File name of raw file (not a complete path)."
 msgstr ""
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 #, fuzzy
 msgid "Red Hue"
 msgstr "Balance de blanco"
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 #, fuzzy
 msgid "\"Red Hue\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 #, fuzzy
 msgid "Red Saturation"
 msgstr "Saturación"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 #, fuzzy
 msgid "\"Red Saturation\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:431
+#: src/properties.cpp:447
 #, fuzzy
 msgid "\"Saturation\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 #, fuzzy
 msgid "Shadows"
 msgstr "Sombra"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 #, fuzzy
 msgid "\"Shadows\" setting. Range 0 to +100."
 msgstr "Nitidez"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 #, fuzzy
 msgid "Shadow Tint"
 msgstr "Sombra"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 #, fuzzy
 msgid "\"Shadow Tint\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:434
+#: src/properties.cpp:450
 #, fuzzy
 msgid "\"Sharpness\" setting. Range 0 to +100."
 msgstr "Nitidez"
 
-#: src/properties.cpp:435
+#: src/properties.cpp:451
 #, fuzzy
 msgid "\"Temperature\" setting. Range 2000 to 50000."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 #, fuzzy
 msgid "Tint"
 msgstr "Orden de llenado"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 #, fuzzy
 msgid "\"Tint\" setting. Range -150 to +150."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
+#, fuzzy
 msgid "Tone Curve"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
 msgstr ""
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 #, fuzzy
 msgid "Tone Curve Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid ""
 "The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
 "Contrast, Strong Contrast, Custom or a user-defined preset name."
 msgstr ""
 
-#: src/properties.cpp:440
+#: src/properties.cpp:456
 msgid "Version of Camera Raw plugin."
 msgstr ""
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 #, fuzzy
 msgid "Vignette Amount"
 msgstr "Punto blanco"
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 #, fuzzy
 msgid "\"Vignetting Amount\" setting. Range -100 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 #, fuzzy
 msgid "Vignette Midpoint"
 msgstr "Punto blanco"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 #, fuzzy
 msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
 msgstr "Alta saturación"
 
-#: src/properties.cpp:443
+#: src/properties.cpp:459
 msgid ""
 "\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
 "Tungsten, Fluorescent, Flash, Custom"
 msgstr ""
 
-#: src/properties.cpp:450
+#: src/properties.cpp:466
 msgid "TIFF tag 256, 0x100. Image width in pixels."
 msgstr ""
 
-#: src/properties.cpp:451 src/tags.cpp:354
+#: src/properties.cpp:467 src/tags.cpp:425
 msgid "Image Length"
 msgstr "Longitud de la imagen"
 
-#: src/properties.cpp:451
+#: src/properties.cpp:467
 msgid "TIFF tag 257, 0x101. Image height in pixels."
 msgstr ""
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 #, fuzzy
 msgid "Bits Per Sample"
 msgstr "Bits por muestra"
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
 msgstr ""
 
-#: src/properties.cpp:453 src/tags.cpp:364
+#: src/properties.cpp:469 src/tags.cpp:435
 msgid "Compression"
 msgstr "Compresión"
 
-#: src/properties.cpp:453
+#: src/properties.cpp:469
 msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
 msgstr ""
 
-#: src/properties.cpp:454 src/tags.cpp:370
+#: src/properties.cpp:470 src/tags.cpp:441
 msgid "Photometric Interpretation"
 msgstr "Interpretación fotométrica"
 
-#: src/properties.cpp:454
+#: src/properties.cpp:470
 msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
 msgstr ""
 
-#: src/properties.cpp:455
+#: src/properties.cpp:471
 msgid ""
 "TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
 "0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
@@ -13382,120 +16998,120 @@
 "0th column at bottom 8 = 0th row at left, 0th column at bottom"
 msgstr ""
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 #, fuzzy
 msgid "Samples Per Pixel"
 msgstr "Muestras por pixel"
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 msgid "TIFF tag 277, 0x115. Number of components per pixel."
 msgstr ""
 
-#: src/properties.cpp:465 src/tags.cpp:432
+#: src/properties.cpp:481 src/tags.cpp:515
 #, fuzzy
 msgid "Planar Configuration"
 msgstr "Configuración planar"
 
-#: src/properties.cpp:465
+#: src/properties.cpp:481
 msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
 msgstr ""
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 #, fuzzy
 msgid "YCbCr Sub Sampling"
 msgstr "Sub-muestreo YCbCr"
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid ""
 "TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
 "YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
+#: src/properties.cpp:484 src/tags.cpp:718
 msgid "YCbCr Positioning"
 msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:468
+#: src/properties.cpp:484
 msgid ""
 "TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
 "centered; 2 = co-sited."
 msgstr ""
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 #, fuzzy
 msgid "X Resolution"
 msgstr "Resolución Y"
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
 msgstr ""
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 #, fuzzy
 msgid "Y Resolution"
 msgstr "Resolución Y"
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
 msgstr ""
 
-#: src/properties.cpp:472 src/tags.cpp:438
+#: src/properties.cpp:488 src/tags.cpp:533
 msgid "Resolution Unit"
 msgstr "Unidad de resolución"
 
-#: src/properties.cpp:472
+#: src/properties.cpp:488
 msgid ""
 "TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
 "of: 2 = inches; 3 = centimeters."
 msgstr ""
 
-#: src/properties.cpp:474 src/tags.cpp:443
+#: src/properties.cpp:490 src/tags.cpp:538
 msgid "Transfer Function"
 msgstr "Función de transferencia"
 
-#: src/properties.cpp:474
+#: src/properties.cpp:490
 msgid ""
 "TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
 "with 3 * 256 entries."
 msgstr ""
 
-#: src/properties.cpp:476 src/tags.cpp:471
+#: src/properties.cpp:492 src/tags.cpp:570
 msgid "White Point"
 msgstr "Punto blanco"
 
-#: src/properties.cpp:476
+#: src/properties.cpp:492
 msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
 msgstr ""
 
-#: src/properties.cpp:477 src/tags.cpp:476
+#: src/properties.cpp:493 src/tags.cpp:575
 #, fuzzy
 msgid "Primary Chromaticities"
 msgstr "Cromaticidades primarias"
 
-#: src/properties.cpp:477
+#: src/properties.cpp:493
 msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
 msgstr ""
 
-#: src/properties.cpp:478
+#: src/properties.cpp:494
 msgid ""
 "TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
 msgstr ""
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 #, fuzzy
 msgid "Reference Black White"
 msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "TIFF tag 532, 0x214. Reference black and white point values."
 msgstr ""
 
-#: src/properties.cpp:480 src/tags.cpp:455
+#: src/properties.cpp:496 src/tags.cpp:550
 #, fuzzy
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: src/properties.cpp:480
+#: src/properties.cpp:496
 msgid ""
 "TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
 "and time of image creation (no time zone in EXIF), stored in ISO 8601 "
@@ -13504,91 +17120,86 @@
 "ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
+#: src/properties.cpp:502 src/tags.cpp:463
 msgid "Image Description"
 msgstr "Descripción de la imagen"
 
-#: src/properties.cpp:486
+#: src/properties.cpp:502
 msgid ""
 "TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
 "in XMP as dc:description."
 msgstr ""
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 #, fuzzy
 msgid "Make"
 msgstr "Duro"
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
 msgstr ""
 
-#: src/properties.cpp:488
+#: src/properties.cpp:504
 msgid "TIFF tag 272, 0x110. Model name or number of equipment."
 msgstr ""
 
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
-msgstr "Software"
-
-#: src/properties.cpp:489
+#: src/properties.cpp:505
 msgid ""
 "TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
 "property is stored in XMP as xmp:CreatorTool. "
 msgstr ""
 
-#: src/properties.cpp:491
+#: src/properties.cpp:507
 msgid ""
 "TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
 "property is stored in XMP as the first item in the dc:creator array."
 msgstr ""
 
-#: src/properties.cpp:493
+#: src/properties.cpp:509
 msgid ""
 "TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
 "in XMP as dc:rights."
 msgstr ""
 
-#: src/properties.cpp:500 src/tags.cpp:1198
+#: src/properties.cpp:516 src/tags.cpp:1388
 #, fuzzy
 msgid "Exif Version"
 msgstr "Versión Exif"
 
-#: src/properties.cpp:500
+#: src/properties.cpp:516
 msgid "EXIF tag 36864, 0x9000. EXIF version number."
 msgstr ""
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 #, fuzzy
 msgid "Flashpix Version"
 msgstr "Flash"
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
 msgstr ""
 
-#: src/properties.cpp:502
+#: src/properties.cpp:518
 msgid "EXIF tag 40961, 0xA001. Color space information"
 msgstr ""
 
-#: src/properties.cpp:503 src/tags.cpp:1209
+#: src/properties.cpp:519 src/tags.cpp:1399
 #, fuzzy
 msgid "Components Configuration"
 msgstr "Configuración planar"
 
-#: src/properties.cpp:503
+#: src/properties.cpp:519
 msgid ""
 "EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
 "compressed data), 1 2 3 0 (other cases)."
 msgstr ""
 
-#: src/properties.cpp:505 src/tags.cpp:636
+#: src/properties.cpp:521 src/tags.cpp:823
 #, fuzzy
 msgid "Compressed Bits Per Pixel"
 msgstr "Bits comprimidos por pixel"
 
-#: src/properties.cpp:505
+#: src/properties.cpp:521
 #, fuzzy
 msgid ""
 "EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
@@ -13598,57 +17209,57 @@
 "utilizado para una imagen comprimida está indicado en unidades de bits por "
 "pixel."
 
-#: src/properties.cpp:507 src/tags.cpp:1293
+#: src/properties.cpp:523 src/tags.cpp:1483
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: src/properties.cpp:507
+#: src/properties.cpp:523
 msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
 msgstr ""
 
-#: src/properties.cpp:508 src/tags.cpp:1300
+#: src/properties.cpp:524 src/tags.cpp:1490
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: src/properties.cpp:508
+#: src/properties.cpp:524
 msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
 msgstr ""
 
-#: src/properties.cpp:509 src/tags.cpp:1267
+#: src/properties.cpp:525 src/tags.cpp:1457
 msgid "User Comment"
 msgstr "Comentario del usuario"
 
-#: src/properties.cpp:509
+#: src/properties.cpp:525
 msgid "EXIF tag 37510, 0x9286. Comments from user."
 msgstr ""
 
-#: src/properties.cpp:510 src/tags.cpp:1309
+#: src/properties.cpp:526 src/tags.cpp:1499
 msgid "Related Sound File"
 msgstr ""
 
-#: src/properties.cpp:510
+#: src/properties.cpp:526
 msgid ""
 "EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
 msgstr ""
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 #, fuzzy
 msgid "Date and Time Original"
 msgstr "Fecha y Hora (original)"
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid ""
 "EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
 "time when original image was generated, in ISO 8601 format. Includes the "
 "EXIF SubSecTimeOriginal data."
 msgstr ""
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 #, fuzzy
 msgid "Date and Time Digitized"
 msgstr "Fecha y Hora (digitalizado)"
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid ""
 "EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
 "time when image was stored as digital data, can be the same as "
@@ -13656,37 +17267,40 @@
 "format. Includes the EXIF SubSecTimeDigitized data."
 msgstr ""
 
-#: src/properties.cpp:518
+#: src/properties.cpp:534
+#, fuzzy
 msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
-msgstr ""
+msgstr "Tiempo de exposición, dado en segundos (seg)."
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 #, fuzzy
 msgid "F Number"
 msgstr "El número F."
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "EXIF tag 33437, 0x829D. F number."
 msgstr ""
 
-#: src/properties.cpp:520
+#: src/properties.cpp:536
 msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
 msgstr ""
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
 msgid "Spectral Sensitivity"
 msgstr "Sensibilidad espectral"
 
-#: src/properties.cpp:521
+#: src/properties.cpp:537
+#, fuzzy
 msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
 msgstr ""
+"Indica el tipo de sensor de imagen en la cámara o dispositivo de entrada."
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 #, fuzzy
 msgid "ISOSpeedRatings"
 msgstr "Velocidad ISO"
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 #, fuzzy
 msgid ""
 "EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
@@ -13695,74 +17309,84 @@
 "Indica la velocidad ISO y la latitud ISO de la cámara o dispositivo de "
 "entrada como se especifica en ISO 12232."
 
-#: src/properties.cpp:524 src/tags.cpp:625
+#: src/properties.cpp:540 src/tags.cpp:812
 msgid "OECF"
 msgstr ""
 
-#: src/properties.cpp:524
+#: src/properties.cpp:540
+#, fuzzy
 msgid ""
 "EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
 "ISO 14524."
 msgstr ""
+"Indica la Función de Conversión Opto-Electrónica (OECF) especificada en ISO "
+"14524. <OECF> es la relación entre la entrada óptica de la cámara y los "
+"valores de la imagen."
 
-#: src/properties.cpp:525
+#: src/properties.cpp:541
 msgid ""
 "EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
 "specification."
 msgstr ""
 
-#: src/properties.cpp:526
+#: src/properties.cpp:542
+#, fuzzy
 msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:527 src/tags.cpp:639
+#: src/properties.cpp:543 src/tags.cpp:826
 #, fuzzy
 msgid "Brightness Value"
 msgstr "Brillo"
 
-#: src/properties.cpp:527
+#: src/properties.cpp:543
+#, fuzzy
 msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:528
+#: src/properties.cpp:544
 msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
 msgstr ""
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 #, fuzzy
 msgid "Maximum Aperture Value"
 msgstr "apertura"
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
+#, fuzzy
 msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:530
+#: src/properties.cpp:546
 #, fuzzy
 msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
 msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:531
+#: src/properties.cpp:547
+#, fuzzy
 msgid "EXIF tag 37383, 0x9207. Metering mode."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:532
+#: src/properties.cpp:548
+#, fuzzy
 msgid "EXIF tag 37384, 0x9208. Light source."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:533
+#: src/properties.cpp:549
 msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
 msgstr ""
 
-#: src/properties.cpp:534
+#: src/properties.cpp:550
+#, fuzzy
 msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:535 src/tags.cpp:1259
+#: src/properties.cpp:551 src/tags.cpp:1449
 msgid "Subject Area"
 msgstr "Área del sujeto"
 
-#: src/properties.cpp:535
+#: src/properties.cpp:551
 #, fuzzy
 msgid ""
 "EXIF tag 37396, 0x9214. The location and area of the main subject in the "
@@ -13771,19 +17395,19 @@
 "Esta etiqueta indica la ubicación y el área del sujeto principal en la "
 "escena general."
 
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
 msgid "Flash Energy"
 msgstr "Energía del flash"
 
-#: src/properties.cpp:536
+#: src/properties.cpp:552
 msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
 msgstr ""
 
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
 msgid "Spatial Frequency Response"
 msgstr "Respuesta en frecuencia espacial"
 
-#: src/properties.cpp:537
+#: src/properties.cpp:553
 #, fuzzy
 msgid ""
 "EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
@@ -13792,101 +17416,108 @@
 "Indica la velocidad ISO y la latitud ISO de la cámara o dispositivo de "
 "entrada como se especifica en ISO 12232."
 
-#: src/properties.cpp:539 src/tags.cpp:650
+#: src/properties.cpp:555 src/tags.cpp:837
 #, fuzzy
 msgid "Focal Plane X Resolution"
 msgstr "Resolución X del plano focal"
 
-#: src/properties.cpp:539
+#: src/properties.cpp:555
 msgid ""
 "EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
 "unit."
 msgstr ""
 
-#: src/properties.cpp:540 src/tags.cpp:651
+#: src/properties.cpp:556 src/tags.cpp:838
 #, fuzzy
 msgid "Focal Plane Y Resolution"
 msgstr "Resolución X del plano focal"
 
-#: src/properties.cpp:540
+#: src/properties.cpp:556
 msgid ""
 "EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
 "unit."
 msgstr ""
 
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
 msgid "Focal Plane Resolution Unit"
 msgstr "Unidad de resolución del plano focal"
 
-#: src/properties.cpp:541
+#: src/properties.cpp:557
 msgid ""
 "EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
 "FocalPlaneYResolution."
 msgstr ""
 
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
 msgid "Subject Location"
 msgstr "Ubicación del sujeto"
 
-#: src/properties.cpp:542
+#: src/properties.cpp:558
 msgid ""
 "EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
 "value is the horizontal pixel and the second value is the vertical pixel at "
 "which the main subject appears."
 msgstr ""
 
-#: src/properties.cpp:545 src/tags.cpp:657
+#: src/properties.cpp:561 src/tags.cpp:844
 #, fuzzy
 msgid "Exposure Index"
 msgstr "Índice de exposición"
 
-#: src/properties.cpp:545
+#: src/properties.cpp:561
+#, fuzzy
 msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
 msgstr ""
+"Indica el tipo de sensor de imagen en la cámara o dispositivo de entrada."
 
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
 msgid "Sensing Method"
 msgstr "Método de sensado"
 
-#: src/properties.cpp:546
+#: src/properties.cpp:562
 #, fuzzy
 msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
 msgstr ""
 "Indica el tipo de sensor de imagen en la cámara o dispositivo de entrada."
 
-#: src/properties.cpp:547
+#: src/properties.cpp:563
+#, fuzzy
 msgid "EXIF tag 41728, 0xA300. Indicates image source."
-msgstr ""
+msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/properties.cpp:548 src/tags.cpp:1364
+#: src/properties.cpp:564 src/tags.cpp:1554
 msgid "Scene Type"
 msgstr "Tipo de escena"
 
-#: src/properties.cpp:548
+#: src/properties.cpp:564
+#, fuzzy
 msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
-msgstr ""
+msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/properties.cpp:549 src/tags.cpp:572
+#: src/properties.cpp:565 src/tags.cpp:759
 msgid "CFA Pattern"
 msgstr "Patrón CFA"
 
-#: src/properties.cpp:549
+#: src/properties.cpp:565
 msgid ""
 "EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
 "sense."
 msgstr ""
 
-#: src/properties.cpp:550 src/tags.cpp:1374
+#: src/properties.cpp:566 src/tags.cpp:1564
 msgid "Custom Rendered"
 msgstr "Render personalizado"
 
-#: src/properties.cpp:550
+#: src/properties.cpp:566
+#, fuzzy
 msgid ""
 "EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
 "data."
 msgstr ""
+"Esta etiqueta indica el modo de balance de blanco ajustado cuando se tomó la "
+"imagen."
 
-#: src/properties.cpp:551
+#: src/properties.cpp:567
 #, fuzzy
 msgid ""
 "EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
@@ -13895,7 +17526,7 @@
 "Esta etiqueta indica el modo de balance de blanco ajustado cuando se tomó la "
 "imagen."
 
-#: src/properties.cpp:552
+#: src/properties.cpp:568
 #, fuzzy
 msgid ""
 "EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
@@ -13904,11 +17535,11 @@
 "Esta etiqueta indica el modo de balance de blanco ajustado cuando se tomó la "
 "imagen."
 
-#: src/properties.cpp:553 src/tags.cpp:1388
+#: src/properties.cpp:569 src/tags.cpp:1578
 msgid "Digital Zoom Ratio"
 msgstr "Relación de zoom digital"
 
-#: src/properties.cpp:553
+#: src/properties.cpp:569
 #, fuzzy
 msgid ""
 "EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
@@ -13917,11 +17548,11 @@
 "Esta etiqueta indica el modo de balance de blanco ajustado cuando se tomó la "
 "imagen."
 
-#: src/properties.cpp:554 src/tags.cpp:1393
+#: src/properties.cpp:570 src/tags.cpp:1583
 msgid "Focal Length In 35mm Film"
 msgstr "Distancia focal en película de 35mm"
 
-#: src/properties.cpp:554
+#: src/properties.cpp:570
 #, fuzzy
 msgid ""
 "EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
@@ -13932,19 +17563,22 @@
 "película de 35mm, en mm. Un valor de 0 significa que se desconoce la "
 "distancia focal. Note que esta etiqueta difiere de la etiqueta FocalLength."
 
-#: src/properties.cpp:557 src/tags.cpp:1399
+#: src/properties.cpp:573 src/tags.cpp:1589
 msgid "Scene Capture Type"
 msgstr "Tipo de captura de escena"
 
-#: src/properties.cpp:557
+#: src/properties.cpp:573
+#, fuzzy
 msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
 msgstr ""
+"Esta etiqueta indica el modo de balance de blanco ajustado cuando se tomó la "
+"imagen."
 
-#: src/properties.cpp:558 src/tags.cpp:1404
+#: src/properties.cpp:574 src/tags.cpp:1594
 msgid "Gain Control"
 msgstr "Control de ganancia"
 
-#: src/properties.cpp:558
+#: src/properties.cpp:574
 #, fuzzy
 msgid ""
 "EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
@@ -13952,7 +17586,7 @@
 msgstr ""
 "Esta etiqueta indica el grado del ajuste de ganancia general de imagen."
 
-#: src/properties.cpp:559
+#: src/properties.cpp:575
 #, fuzzy
 msgid ""
 "EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
@@ -13961,7 +17595,7 @@
 "Esta etiqueta indica la dirección del procesamiento de contraste aplicado "
 "por la cámara cuando se tomó la imagen."
 
-#: src/properties.cpp:560
+#: src/properties.cpp:576
 #, fuzzy
 msgid ""
 "EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
@@ -13970,7 +17604,7 @@
 "Esta etiqueta indica la dirección del procesamiento de stauración aplicado "
 "por la cámara cuando se tomó la imagen."
 
-#: src/properties.cpp:561
+#: src/properties.cpp:577
 #, fuzzy
 msgid ""
 "EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
@@ -13979,11 +17613,11 @@
 "Esta etiqueta indica la dirección del procesamiento de nitidez aplicado por "
 "la cámara cuando se tomó la imagen."
 
-#: src/properties.cpp:562 src/tags.cpp:1419
+#: src/properties.cpp:578 src/tags.cpp:1609
 msgid "Device Setting Description"
 msgstr "Descripción de ajuste del dispositivo"
 
-#: src/properties.cpp:562
+#: src/properties.cpp:578
 #, fuzzy
 msgid ""
 "EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
@@ -13993,20 +17627,20 @@
 "un modelo de cámara en particular. La etiqueta sólo se usa para indicar las "
 "condiciones de toma de fotos en el lector."
 
-#: src/properties.cpp:563 src/tags.cpp:1424
+#: src/properties.cpp:579 src/tags.cpp:1614
 msgid "Subject Distance Range"
 msgstr "Rango de distancia al sujeto."
 
-#: src/properties.cpp:563
+#: src/properties.cpp:579
 #, fuzzy
 msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
 msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/properties.cpp:564 src/tags.cpp:1427
+#: src/properties.cpp:580 src/tags.cpp:1617
 msgid "Image Unique ID"
 msgstr "ID único de imagen"
 
-#: src/properties.cpp:564
+#: src/properties.cpp:580
 #, fuzzy
 msgid ""
 "EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
@@ -14017,58 +17651,60 @@
 "Se registra como una cadena de caracteres ASCII equivalente a notación "
 "hexadecimal y de una longitud fija de 128 bits."
 
-#: src/properties.cpp:566 src/tags.cpp:1501
+#: src/properties.cpp:582 src/tags.cpp:1691
+#, fuzzy
 msgid "GPS Version ID"
-msgstr ""
+msgstr "Versión Exif"
 
-#: src/properties.cpp:566
+#: src/properties.cpp:582
 msgid ""
 "GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
 "period separators. The current value is \"2.0.0.0\"."
 msgstr ""
 
-#: src/properties.cpp:568 src/tags.cpp:1512
+#: src/properties.cpp:584 src/tags.cpp:1702
 msgid "GPS Latitude"
 msgstr ""
 
-#: src/properties.cpp:568
+#: src/properties.cpp:584
 msgid ""
 "GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
 msgstr ""
 
-#: src/properties.cpp:569 src/tags.cpp:1524
+#: src/properties.cpp:585 src/tags.cpp:1714
 msgid "GPS Longitude"
 msgstr ""
 
-#: src/properties.cpp:569
+#: src/properties.cpp:585
 msgid ""
 "GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
 msgstr ""
 
-#: src/properties.cpp:570 src/tags.cpp:1532
+#: src/properties.cpp:586 src/tags.cpp:1722
+#, fuzzy
 msgid "GPS Altitude Reference"
-msgstr ""
+msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:570
+#: src/properties.cpp:586
 #, fuzzy
 msgid ""
 "GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
 msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:571 src/tags.cpp:1540
+#: src/properties.cpp:587 src/tags.cpp:1730
 msgid "GPS Altitude"
 msgstr ""
 
-#: src/properties.cpp:571
+#: src/properties.cpp:587
 #, fuzzy
 msgid "GPS tag 6, 0x06. Indicates altitude in meters."
 msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:572 src/tags.cpp:1544
+#: src/properties.cpp:588 src/tags.cpp:1734
 msgid "GPS Time Stamp"
 msgstr ""
 
-#: src/properties.cpp:572
+#: src/properties.cpp:588
 msgid ""
 "GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
 "data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
@@ -14078,182 +17714,197 @@
 "no date is available, do not write exif:GPSTimeStamp to XMP."
 msgstr ""
 
-#: src/properties.cpp:578 src/tags.cpp:1549
+#: src/properties.cpp:594 src/tags.cpp:1739
+#, fuzzy
 msgid "GPS Satellites"
-msgstr ""
+msgstr "Velocidad ISO"
 
-#: src/properties.cpp:578
+#: src/properties.cpp:594
 msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
 msgstr ""
 
-#: src/properties.cpp:579 src/tags.cpp:1556
+#: src/properties.cpp:595 src/tags.cpp:1746
 msgid "GPS Status"
 msgstr ""
 
-#: src/properties.cpp:579
+#: src/properties.cpp:595
+#, fuzzy
 msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:580 src/tags.cpp:1561
+#: src/properties.cpp:596 src/tags.cpp:1751
 #, fuzzy
 msgid "GPS Measure Mode"
 msgstr "Modo de exposición"
 
-#: src/properties.cpp:580
+#: src/properties.cpp:596
 msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 msgid "GPS DOP"
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
+#, fuzzy
 msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:582 src/tags.cpp:1569
+#: src/properties.cpp:598 src/tags.cpp:1759
+#, fuzzy
 msgid "GPS Speed Reference"
-msgstr ""
+msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:582
+#: src/properties.cpp:598
+#, fuzzy
 msgid "GPS tag 12, 0x0C. Units used to speed measurement."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:583 src/tags.cpp:1573
+#: src/properties.cpp:599 src/tags.cpp:1763
 #, fuzzy
 msgid "GPS Speed"
 msgstr "Velocidad ISO"
 
-#: src/properties.cpp:583
+#: src/properties.cpp:599
 msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
 msgstr ""
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
 #, fuzzy
 msgid "GPS Track Reference"
 msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
+#, fuzzy
 msgid "GPS tag 14, 0x0E. Reference for movement direction."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:585 src/tags.cpp:1580
+#: src/properties.cpp:601 src/tags.cpp:1770
+#, fuzzy
 msgid "GPS Track"
-msgstr ""
+msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:585
+#: src/properties.cpp:601
 msgid ""
 "GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
 msgstr ""
 
-#: src/properties.cpp:586 src/tags.cpp:1584
+#: src/properties.cpp:602 src/tags.cpp:1774
+#, fuzzy
 msgid "GPS Image Direction Reference"
-msgstr ""
+msgstr "Descripción de la imagen"
 
-#: src/properties.cpp:586
+#: src/properties.cpp:602
 #, fuzzy
 msgid "GPS tag 16, 0x10. Reference for image direction."
 msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:587 src/tags.cpp:1588
+#: src/properties.cpp:603 src/tags.cpp:1778
 #, fuzzy
 msgid "GPS Image Direction"
 msgstr "Descripción de la imagen"
 
-#: src/properties.cpp:587
+#: src/properties.cpp:603
 msgid ""
 "GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
 "359.99."
 msgstr ""
 
-#: src/properties.cpp:588 src/tags.cpp:1592
+#: src/properties.cpp:604 src/tags.cpp:1782
 msgid "GPS Map Datum"
 msgstr ""
 
-#: src/properties.cpp:588
+#: src/properties.cpp:604
 msgid "GPS tag 18, 0x12. Geodetic survey data."
 msgstr ""
 
-#: src/properties.cpp:589 src/tags.cpp:1600
+#: src/properties.cpp:605 src/tags.cpp:1790
+#, fuzzy
 msgid "GPS Destination Latitude"
-msgstr ""
+msgstr "Distancia del sujeto"
 
-#: src/properties.cpp:589
+#: src/properties.cpp:605
 msgid ""
 "GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
 "destination latitude."
 msgstr ""
 
-#: src/properties.cpp:590 src/tags.cpp:1612
+#: src/properties.cpp:606 src/tags.cpp:1802
+#, fuzzy
 msgid "GPS Destination Longitude"
-msgstr ""
+msgstr "Distancia del sujeto"
 
-#: src/properties.cpp:590
+#: src/properties.cpp:606
 msgid ""
 "GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
 "longitude."
 msgstr ""
 
-#: src/properties.cpp:591 src/tags.cpp:1619
+#: src/properties.cpp:607 src/tags.cpp:1809
+#, fuzzy
 msgid "GPS Destination Bearing Reference"
-msgstr ""
+msgstr "Distancia del sujeto"
 
-#: src/properties.cpp:591
+#: src/properties.cpp:607
+#, fuzzy
 msgid "GPS tag 23, 0x17. Reference for movement direction."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:592 src/tags.cpp:1623
+#: src/properties.cpp:608 src/tags.cpp:1813
+#, fuzzy
 msgid "GPS Destination Bearing"
-msgstr ""
+msgstr "Distancia del sujeto"
 
-#: src/properties.cpp:592
+#: src/properties.cpp:608
 msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
 msgstr ""
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
 #, fuzzy
 msgid "GPS Destination Distance Refefrence"
 msgstr "Distancia del sujeto"
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
+#, fuzzy
 msgid "GPS tag 25, 0x19. Units used for speed measurement."
-msgstr ""
+msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:594 src/tags.cpp:1631
+#: src/properties.cpp:610 src/tags.cpp:1821
 #, fuzzy
 msgid "GPS Destination Distance"
 msgstr "Distancia del sujeto"
 
-#: src/properties.cpp:594
+#: src/properties.cpp:610
 #, fuzzy
 msgid "GPS tag 26, 0x1A. Distance to destination."
 msgstr "La distancia al sujeto, dada en metros."
 
-#: src/properties.cpp:595 src/tags.cpp:1634
+#: src/properties.cpp:611 src/tags.cpp:1824
 #, fuzzy
 msgid "GPS Processing Method"
 msgstr "Método de sensado"
 
-#: src/properties.cpp:595
+#: src/properties.cpp:611
 msgid ""
 "GPS tag 27, 0x1B. A character string recording the name of the method used "
 "for location finding."
 msgstr ""
 
-#: src/properties.cpp:596 src/tags.cpp:1639
+#: src/properties.cpp:612 src/tags.cpp:1829
+#, fuzzy
 msgid "GPS Area Information"
-msgstr ""
+msgstr "Orientación"
 
-#: src/properties.cpp:596
+#: src/properties.cpp:612
 msgid ""
 "GPS tag 28, 0x1C. A character string recording the name of the GPS area."
 msgstr ""
 
-#: src/properties.cpp:597 src/tags.cpp:1647
+#: src/properties.cpp:613 src/tags.cpp:1837
 msgid "GPS Differential"
 msgstr ""
 
-#: src/properties.cpp:597
+#: src/properties.cpp:613
 #, fuzzy
 msgid ""
 "GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
@@ -14262,94 +17913,99 @@
 "Esta etiqueta indica la dirección del procesamiento de stauración aplicado "
 "por la cámara cuando se tomó la imagen."
 
-#: src/properties.cpp:603
+#: src/properties.cpp:619
 msgid ""
 "A description of the lens used to take the photograph. For example, \"70-200 "
 "mm f/2.8-4.0\"."
 msgstr ""
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 #, fuzzy
 msgid "SerialNumber"
 msgstr "El número F."
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid ""
 "The serial number of the camera or camera body used to take the photograph."
 msgstr ""
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
+#, fuzzy
 msgid "Contact Info-City"
-msgstr ""
+msgstr "Ubicación del sujeto"
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
 #, fuzzy
 msgid "The contact information city part."
 msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 msgid "Contact Info-Country"
 msgstr ""
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 #, fuzzy
 msgid "The contact information country part."
 msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid "Contact Info-Address"
 msgstr ""
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid ""
 "The contact information address part. Comprises an optional company name and "
 "all required information to locate the building or postbox to which mail "
 "should be sent."
 msgstr ""
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
 msgid "Contact Info-Postal Code"
 msgstr ""
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
+#, fuzzy
 msgid "The contact information part denoting the local postal code."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid "Contact Info-State/Province"
 msgstr ""
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid ""
 "The contact information part denoting regional information like state or "
 "province."
 msgstr ""
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
 msgid "Contact Info-Email"
 msgstr ""
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
+#, fuzzy
 msgid "The contact information email address part."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
 msgid "Contact Info-Phone"
 msgstr ""
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
+#, fuzzy
 msgid "The contact information phone number part."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
 msgid "Contact Info-Web URL"
 msgstr ""
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
+#, fuzzy
 msgid "The contact information web address part."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:619
+#: src/properties.cpp:635
 msgid ""
 "Code of the country the content is focussing on -- either the country shown "
 "in visual media or referenced in text or audio media. This element is at the "
@@ -14358,28 +18014,28 @@
 "should go to the \"Country\" element."
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid "Creator's Contact Info"
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid ""
 "The creator's contact information provides all necessary information to get "
 "in contact with the creator of this news object and comprises a set of sub-"
 "properties for proper addressing."
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid "Intellectual Genre"
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid ""
 "Describes the nature, intellectual or journalistic characteristic of a news "
 "object, not specifically its content."
 msgstr ""
 
-#: src/properties.cpp:627
+#: src/properties.cpp:643
 msgid ""
 "Name of a location the content is focussing on -- either the location shown "
 "in visual media or referenced by text or audio media. This location name "
@@ -14389,174 +18045,177 @@
 "geographical hierarchy."
 msgstr ""
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
+#, fuzzy
 msgid "IPTC Scene"
-msgstr ""
+msgstr "centrado"
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid ""
 "Describes the scene of a photo content. Specifies one or more terms from the "
 "IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
 "in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 #, fuzzy
 msgid "IPTC Subject Code"
 msgstr "Área del sujeto"
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid ""
 "Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
 "to categorize the content. Each Subject is represented as a string of 8 "
 "digits in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
+#, fuzzy
 msgid "Additional model info"
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
 msgid ""
 "Information about the ethnicity and other facts of the model(s) in a model-"
 "released image."
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid "Code of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid ""
 "Code from controlled vocabulary for identyfing the organisation or company "
 "which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid "Controlled Vocabulary Term"
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid ""
 "A term to describe the content of the image by a value from a Controlled "
 "Vocabulary."
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 #, fuzzy
 msgid "Model age"
 msgstr "Modelo"
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 msgid ""
 "Age of the human model(s) at the time this image was taken in a model "
 "released image."
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of the organisation or company which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 #, fuzzy
 msgid "Person shown"
 msgstr "Versión Exif"
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 msgid "Name of a person shown in the image."
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 #, fuzzy
 msgid "Digital Image Identifier"
 msgstr "Orientación"
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 msgid ""
 "Globally unique identifier for this digital image. It is created and applied "
 "by the creator of the digital image at the time of its creation. this value "
 "shall not be changed after that time."
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 msgid "Physical type of original photo"
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 #, fuzzy
 msgid "The type of the source digital file."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
 msgid "Event"
 msgstr ""
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665
 msgid "Names or describes the specific event at which the photo was taken."
 msgstr ""
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 #, fuzzy
 msgid "Maximum available height"
 msgstr "Flash"
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 msgid ""
 "The maximum available height in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 #, fuzzy
 msgid "Maximum available width"
 msgstr "Distancia focal"
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 msgid ""
 "The maximum available width in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid "Registry Entry"
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid ""
 "Both a Registry Item Id and a Registry Organisation Id to record any "
 "registration of this digital image with a registry."
 msgstr ""
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
+#, fuzzy
 msgid "Registry Entry-Item Identifier"
-msgstr ""
+msgstr "Orientación"
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
 msgid ""
 "A unique identifier created by a registry and applied by the creator of the "
 "digital image. This value shall not be changed after being applied. This "
 "identifier is linked to a corresponding Registry Organisation Identifier."
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid "Registry Entry-Organisation Identifier"
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid ""
 "An identifier for the registry which issued the corresponding Registry Image "
 "Id."
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 msgid "IPTC Fields Last Edited"
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 #, fuzzy
 msgid ""
 "The date and optionally time when any of the IPTC photo metadata fields has "
@@ -14564,96 +18223,103 @@
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
 #, fuzzy
 msgid "Location shown"
 msgstr "Ubicación del sujeto"
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
 msgid "A location shown in the image."
 msgstr ""
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "Location Created"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "The location the photo was taken."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Location-City"
 msgstr "Ubicación del sujeto"
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Name of the city of a location."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
+#, fuzzy
 msgid "Location-Country ISO-Code"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
+#, fuzzy
 msgid "The ISO code of a country of a location."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "Location-Country Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "The name of a country of a location."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
+#, fuzzy
 msgid "Location-Province/State"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
+#, fuzzy
 msgid ""
 "The name of a subregion of a country - a province or state - of a location."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 #, fuzzy
 msgid "Location-Sublocation"
 msgstr "Ubicación del sujeto"
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 msgid ""
 "Name of a sublocation. This sublocation name could either be the name of a "
 "sublocation to a city or the name of a well known location or (natural) "
 "monument outside a city."
 msgstr ""
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
+#, fuzzy
 msgid "Location-World Region"
-msgstr ""
+msgstr "Ubicación del sujeto"
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
+#, fuzzy
 msgid "The name of a world region of a location."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
+#, fuzzy
 msgid "Artwork or object in the image"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
 msgid "A set of metadata about artwork or an object in the image."
 msgstr ""
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 #, fuzzy
 msgid "Artwork or object-Copyright notice"
 msgstr "Copyright"
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 msgid ""
 "Contains any necessary copyright notice for claiming the intellectual "
 "property for artwork or an object in the image and should identify the "
@@ -14661,1708 +18327,2257 @@
 "property rights."
 msgstr ""
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
+#, fuzzy
 msgid "Artwork or object-Creator"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
 msgid ""
 "Contains the name of the artist who has created artwork or an object in the "
 "image. In cases where the artist could or should not be identified the name "
 "of a company or organisation may be appropriate."
 msgstr ""
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
+#, fuzzy
 msgid "Artwork or object-Date Created"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
 msgid ""
 "Designates the date and optionally the time the artwork or object in the "
 "image was created. This relates to artwork or objects with associated "
 "intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
+#, fuzzy
 msgid "Artwork or object-Source"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
 msgid ""
 "The organisation or body holding and registering the artwork or object in "
 "the image for inventory purposes."
 msgstr ""
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
+#, fuzzy
 msgid "Artwork or object-Source inventory number"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
 msgid ""
 "The inventory number issued by the organisation or body holding and "
 "registering the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
+#, fuzzy
 msgid "Artwork or object-Title"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
 msgid "A reference for the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:677
+#: src/properties.cpp:693
 msgid "Scan from film"
 msgstr ""
 
-#: src/properties.cpp:678
+#: src/properties.cpp:694
 msgid "Scan from transparency (including slide)"
 msgstr ""
 
-#: src/properties.cpp:679
+#: src/properties.cpp:695
 msgid "Scan from print"
 msgstr ""
 
-#: src/properties.cpp:680
+#: src/properties.cpp:696
 #, fuzzy
 msgid "Camera RAW"
 msgstr "Contraste"
 
-#: src/properties.cpp:681
+#: src/properties.cpp:697
 #, fuzzy
 msgid "Camera TIFF"
 msgstr "Contraste"
 
-#: src/properties.cpp:682
+#: src/properties.cpp:698
 #, fuzzy
 msgid "Camera JPEG"
 msgstr "Espacio de color"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 #, fuzzy
 msgid "PLUS Version"
 msgstr "Versión Exif"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 msgid ""
 "The version number of the PLUS standards in place at the time of the "
 "transaction."
 msgstr ""
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 #, fuzzy
 msgid "Licensee"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 msgid ""
 "Party or parties to whom the license is granted by the Licensor/s under the "
 "license transaction."
 msgstr ""
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 #, fuzzy
 msgid "Licensee ID"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 msgid "Optional PLUS-ID identifying each Licensee."
 msgstr ""
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Licensee Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Name of each Licensee."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
+#, fuzzy
 msgid "End User"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 msgid "Party or parties ultimately making use of the image under the license."
 msgstr ""
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
+#, fuzzy
 msgid "End User ID"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
 msgid "Optional PLUS-ID identifying each End User."
 msgstr ""
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
 #, fuzzy
 msgid "End User Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
+#, fuzzy
 msgid "Name of each End User."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 #, fuzzy
 msgid "Licensor"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 msgid "Party or parties granting the license to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 #, fuzzy
 msgid "Licensor ID"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 msgid "Optional PLUS-ID identifying each Licensor."
 msgstr ""
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
 #, fuzzy
 msgid "Licensor Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
+#, fuzzy
 msgid "Name of each Licensor."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor Address"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor street address."
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
 msgid "Licensor Address Detail"
 msgstr ""
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
+#, fuzzy
 msgid "Additional Licensor mailing address details."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
 #, fuzzy
 msgid "Licensor City"
 msgstr "Copyright"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
+#, fuzzy
 msgid "Licensor City name."
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
 msgid "Licensor State or Province"
 msgstr ""
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
+#, fuzzy
 msgid "Licensor State or Province name."
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
+#, fuzzy
 msgid "Licensor Postal Code"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
 msgid "Licensor Postal Code or Zip Code."
 msgstr ""
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country name."
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1"
-msgstr ""
+msgstr "El número F."
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1."
-msgstr ""
+msgstr "El número F."
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
+#, fuzzy
 msgid "Licensor Telephone 1"
-msgstr ""
+msgstr "El número F."
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
 #, fuzzy
 msgid "Licensor Telephone number 1."
 msgstr "El número F."
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2"
-msgstr ""
+msgstr "El número F."
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2."
-msgstr ""
+msgstr "El número F."
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
+#, fuzzy
 msgid "Licensor Telephone 2"
-msgstr ""
+msgstr "El número F."
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
 #, fuzzy
 msgid "Licensor Telephone number 2."
 msgstr "El número F."
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email address."
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
+#, fuzzy
 msgid "Licensor URL"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 msgid "Licensor world wide web address."
 msgstr ""
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 #, fuzzy
 msgid "Licensor Notes"
 msgstr "Espacio de color"
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 msgid ""
 "Supplemental information for use in identifying and contacting the Licensor/"
 "s."
 msgstr ""
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 #, fuzzy
 msgid "PLUS Media Summary Code"
 msgstr "Modo de exposición"
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 msgid ""
 "A PLUS-standardized alphanumeric code string summarizing the media usages "
 "included in the license."
 msgstr ""
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
+#, fuzzy
 msgid "License Start Date"
-msgstr ""
+msgstr "Rango de transferencia"
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "The date on which the license takes effect."
 msgstr ""
-"La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
+"La fecha y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "License End Date"
 msgstr "Rango de transferencia"
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "The date on which the license expires."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 #, fuzzy
 msgid "Media Constraints"
 msgstr "Contraste"
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 msgid ""
 "Constraints limiting the scope of PLUS Media Usage/s included in the license "
 "to particular named media or to media not yet specifically defined in the "
 "PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
+#, fuzzy
 msgid "Region Constraints"
-msgstr ""
+msgstr "Contraste"
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
 msgid ""
 "Constraints limiting the scope of geographic distribution to specific "
 "cities, states, provinces or other areas to be included in or excluded from "
 "the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
+#, fuzzy
 msgid "Product or Service Constraints"
-msgstr ""
+msgstr "Contraste"
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
 msgid ""
 "Constraints limiting usage of the image to promotion of/association with a "
 "named product or service."
 msgstr ""
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 #, fuzzy
 msgid "Image File Constraints"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 msgid ""
 "Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
+#, fuzzy
 msgid "Image Alteration Constraints"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
 msgid ""
 "Constraints on alteration of the image by cropping, flipping, retouching, "
 "colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 #, fuzzy
 msgid "Image Duplication Constraints"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
+#, fuzzy
 msgid "Model Release Status"
-msgstr ""
+msgstr "Modelo"
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 msgid ""
 "Summarizes the availability and scope of model releases authorizing usage of "
 "the likenesses of persons appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 #, fuzzy
 msgid "Model Release ID"
 msgstr "Modelo"
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid ""
 "Age of the youngest model pictured in the image, at the time that the image "
 "was made."
 msgstr ""
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
 msgid "Property Release Status"
 msgstr ""
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
 msgid ""
 "Summarizes the availability and scope of property releases authorizing usage "
 "of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
+#, fuzzy
 msgid "Property Release ID"
-msgstr ""
+msgstr "Modelo"
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
 msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
 #, fuzzy
 msgid "Other Constraints"
 msgstr "Contraste"
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
+#, fuzzy
 msgid "Additional constraints on the license."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
+#, fuzzy
 msgid "Credit Line Required"
-msgstr ""
+msgstr "No definido"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
 msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Other License Requirements"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Additional license requirements."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
 msgid "Terms and Conditions Text"
 msgstr ""
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
 msgid "Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
 msgid "Terms and Conditions URL"
 msgstr ""
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
 msgid "URL for Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
+#, fuzzy
 msgid "Other License Conditions"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
+#, fuzzy
 msgid "Additional license conditions."
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:731
+#: src/properties.cpp:747
 #, fuzzy
 msgid "Identifies the type of image delivered."
 msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
+#, fuzzy
 msgid "Licensor Image ID"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
 msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
 msgid "Image File Name As Delivered"
 msgstr ""
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
 msgid ""
 "Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
+#, fuzzy
 msgid "Image File Format As Delivered"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 msgid ""
 "File format of the image file delivered to the Licensee for use under the "
 "license."
 msgstr ""
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
 msgid "Image File Size As Delivered"
 msgstr ""
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
 msgid "Size of the image file delivered to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright Status"
 msgstr "Copyright"
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright status of the image."
 msgstr "Copyright"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
+#, fuzzy
 msgid "Copyright Registration Number"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
 msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 msgid "First Publication Date"
 msgstr ""
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "The date on which the image was first published."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 #, fuzzy
 msgid "Copyright Owner"
 msgstr "Copyright"
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 #, fuzzy
 msgid "Copyright Owner ID"
 msgstr "Copyright"
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
 #, fuzzy
 msgid "Copyright Owner Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
+#, fuzzy
 msgid "Name of Copyright Owner."
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
+#, fuzzy
 msgid "Copyright Owner Image ID"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
 msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Image Creator"
 msgstr "Orientación"
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
+#, fuzzy
 msgid "Creator/s of the image."
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 #, fuzzy
 msgid "Image Creator ID"
 msgstr "Orientación"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 msgid "Optional PLUS-ID identifying each Image Creator."
 msgstr ""
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Image Creator Name"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Name of Image Creator."
 msgstr "Longitud de la imagen"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
+#, fuzzy
 msgid "Image Creator Image ID"
-msgstr ""
+msgstr "Orientación"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
 msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 #, fuzzy
 msgid "Image Supplier ID"
 msgstr "ID único de imagen"
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
 #, fuzzy
 msgid "Image Supplier Name"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
+#, fuzzy
 msgid "Name of Image Supplier."
-msgstr ""
+msgstr "Longitud de la imagen"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
+#, fuzzy
 msgid "Image Supplier Image ID"
-msgstr ""
+msgstr "ID único de imagen"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
 msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
+#, fuzzy
 msgid "Licensee Image ID"
-msgstr ""
+msgstr "Longitud de la imagen"
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
 msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
 #, fuzzy
 msgid "Licensee Image Notes"
 msgstr "Longitud de la imagen"
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
+#, fuzzy
 msgid "Notes added by Licensee."
-msgstr ""
+msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
+#, fuzzy
 msgid "Other Image Info"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
 #, fuzzy
 msgid "Additional image information."
 msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 #, fuzzy
 msgid "License ID"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
+#, fuzzy
 msgid "Licensor Transaction ID"
-msgstr ""
+msgstr "Fecha y hora"
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
 msgid ""
 "Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
+#, fuzzy
 msgid "Licensee Transaction ID"
-msgstr ""
+msgstr "Fecha y hora"
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
 msgid ""
 "Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 #, fuzzy
 msgid "Licensee Project Reference"
 msgstr "Referencia Blanco/Negro"
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "License Transaction Date"
 msgstr "Fecha y hora"
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "The date of the License Transaction."
 msgstr "El tipo de fuente de luz."
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 #, fuzzy
 msgid "Reuse"
 msgstr "No definido"
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 msgid ""
 "Indicates whether a license is a repeat or an initial license.  Reuse may "
 "require that licenses stored in files previously delivered to the customer "
 "be updated."
 msgstr ""
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
+#, fuzzy
 msgid "Other License Documents"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
 msgid ""
 "Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Other License Info"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Additional license information."
 msgstr "Posicionamiento YCbCr"
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
 msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:764
+#: src/properties.cpp:780
 #, fuzzy
 msgid "Custom 4"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:765
+#: src/properties.cpp:781
 #, fuzzy
 msgid "Custom 5"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:766
+#: src/properties.cpp:782
 #, fuzzy
 msgid "Custom 6"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
 msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:767
+#: src/properties.cpp:783
 #, fuzzy
 msgid "Custom 7"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:768
+#: src/properties.cpp:784
 #, fuzzy
 msgid "Custom 8"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:769
+#: src/properties.cpp:785
 #, fuzzy
 msgid "Custom 9"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:770
+#: src/properties.cpp:786
 #, fuzzy
 msgid "Custom 10"
 msgstr "Proceso personalizado"
 
-#: src/properties.cpp:777
+#: src/properties.cpp:793
 msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:778
+#: src/properties.cpp:794
 #, fuzzy
 msgid "Not Required"
 msgstr "No definido"
 
-#: src/properties.cpp:784
+#: src/properties.cpp:800
 msgid "Protected"
 msgstr ""
 
-#: src/properties.cpp:785
+#: src/properties.cpp:801
 msgid "Public Domain"
 msgstr ""
 
-#: src/properties.cpp:791
+#: src/properties.cpp:807
+#, fuzzy
 msgid "Credit Adjacent To Image"
-msgstr ""
+msgstr "Orientación"
 
-#: src/properties.cpp:792
+#: src/properties.cpp:808
 msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:793
+#: src/properties.cpp:809
 #, fuzzy
 msgid "Credit on Image"
 msgstr "Orientación"
 
-#: src/properties.cpp:794
+#: src/properties.cpp:810
 #, fuzzy
 msgid "Not Require"
 msgstr "No definido"
 
-#: src/properties.cpp:799
+#: src/properties.cpp:815
 #, fuzzy
 msgid "No Colorization"
 msgstr "Saturación"
 
-#: src/properties.cpp:800
+#: src/properties.cpp:816
 msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:801
+#: src/properties.cpp:817
 #, fuzzy
 msgid "No De-Colorization"
 msgstr "Saturación"
 
-#: src/properties.cpp:802
+#: src/properties.cpp:818
 msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:803
+#: src/properties.cpp:819
+#, fuzzy
 msgid "No Merging"
-msgstr ""
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/properties.cpp:804
+#: src/properties.cpp:820
 #, fuzzy
 msgid "No Retouching"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/properties.cpp:809
+#: src/properties.cpp:825
 msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:810
+#: src/properties.cpp:826
+#, fuzzy
 msgid "No Duplication Constraints"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:811
+#: src/properties.cpp:827
 #, fuzzy
 msgid "No Duplication"
 msgstr "Baja saturación"
 
-#: src/properties.cpp:816
+#: src/properties.cpp:832
 #, fuzzy
 msgid "Maintain File Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:817
+#: src/properties.cpp:833
+#, fuzzy
 msgid "Maintain File Type"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:818
+#: src/properties.cpp:834
 #, fuzzy
 msgid "Maintain ID in File Name"
 msgstr "Nombre del documento"
 
-#: src/properties.cpp:819
+#: src/properties.cpp:835
+#, fuzzy
 msgid "Maintain Metadata"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/properties.cpp:824
+#: src/properties.cpp:840
 msgid "Windows Bitmap (BMP)"
 msgstr ""
 
-#: src/properties.cpp:825
+#: src/properties.cpp:841
 msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:826
+#: src/properties.cpp:842
 msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
-#: src/properties.cpp:827
+#: src/properties.cpp:843
 #, fuzzy
 msgid "Graphics Interchange Format (GIF)"
 msgstr "Formato de intercambio de JPEG"
 
-#: src/properties.cpp:828
+#: src/properties.cpp:844
 #, fuzzy
 msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
 msgstr "Formato de intercambio de JPEG"
 
-#: src/properties.cpp:830
+#: src/properties.cpp:846
 msgid "Macintosh Picture (PICT)"
 msgstr ""
 
-#: src/properties.cpp:831
+#: src/properties.cpp:847
 msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:832
+#: src/properties.cpp:848
 msgid "Photoshop Document (PSD)"
 msgstr ""
 
-#: src/properties.cpp:833
+#: src/properties.cpp:849
 msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:834
+#: src/properties.cpp:850
 msgid "Tagged Image File Format (TIFF)"
 msgstr ""
 
-#: src/properties.cpp:835
+#: src/properties.cpp:851
 msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:840
+#: src/properties.cpp:856
 msgid "Greater than 50 MB"
 msgstr ""
 
-#: src/properties.cpp:841
+#: src/properties.cpp:857
+#, fuzzy
 msgid "Up to 1 MB"
-msgstr ""
+msgstr "acción"
 
-#: src/properties.cpp:842
+#: src/properties.cpp:858
 #, fuzzy
 msgid "Up to 10 MB"
 msgstr "acción"
 
-#: src/properties.cpp:843
+#: src/properties.cpp:859
 #, fuzzy
 msgid "Up to 30 MB"
 msgstr "acción"
 
-#: src/properties.cpp:844
+#: src/properties.cpp:860
 #, fuzzy
 msgid "Up to 50 MB"
 msgstr "acción"
 
-#: src/properties.cpp:849
+#: src/properties.cpp:865
 #, fuzzy
 msgid "Illustrated Image"
 msgstr "Ancho de la imagen"
 
-#: src/properties.cpp:850
+#: src/properties.cpp:866
 msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:852
+#: src/properties.cpp:868
 msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:853
-msgid "Video"
-msgstr ""
-
-#: src/properties.cpp:858
+#: src/properties.cpp:874
 msgid "Cell"
 msgstr ""
 
-#: src/properties.cpp:859
+#: src/properties.cpp:875
 msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:861
+#: src/properties.cpp:877
 #, fuzzy
 msgid "Pager"
 msgstr "Fabricante"
 
-#: src/properties.cpp:862
+#: src/properties.cpp:878
 msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:867
+#: src/properties.cpp:883
 #, fuzzy
 msgid "Age Unknown"
-msgstr "Desconocido"
+msgstr "Edad Desconocida"
 
-#: src/properties.cpp:868
+#: src/properties.cpp:884
 msgid "Age 25 or Over"
-msgstr ""
+msgstr "Edad 25 años o superior"
 
-#: src/properties.cpp:869
+#: src/properties.cpp:885
 msgid "Age 24"
-msgstr ""
+msgstr "Edad 24"
 
-#: src/properties.cpp:870
+#: src/properties.cpp:886
 msgid "Age 23"
-msgstr ""
+msgstr "Edad 23"
 
-#: src/properties.cpp:871
+#: src/properties.cpp:887
 msgid "Age 22"
-msgstr ""
+msgstr "Edad 22"
 
-#: src/properties.cpp:872
+#: src/properties.cpp:888
 msgid "Age 21"
-msgstr ""
+msgstr "Edad 21"
 
-#: src/properties.cpp:873
+#: src/properties.cpp:889
 msgid "Age 20"
-msgstr ""
+msgstr "Edad 20"
 
-#: src/properties.cpp:874
+#: src/properties.cpp:890
 msgid "Age 19"
-msgstr ""
+msgstr "Edad 19"
 
-#: src/properties.cpp:875
+#: src/properties.cpp:891
 msgid "Age 18"
-msgstr ""
+msgstr "Edad 18"
 
-#: src/properties.cpp:876
+#: src/properties.cpp:892
 msgid "Age 17"
-msgstr ""
+msgstr "Edad 17"
 
-#: src/properties.cpp:877
+#: src/properties.cpp:893
 msgid "Age 16"
-msgstr ""
+msgstr "Edad 16"
 
-#: src/properties.cpp:878
+#: src/properties.cpp:894
 msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:879
+#: src/properties.cpp:895
 msgid "Age 14 or Under"
-msgstr ""
+msgstr "Edad 14 o por debajo"
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
 msgid "Not Applicable"
-msgstr ""
+msgstr "No aplicable"
 
-#: src/properties.cpp:886
+#: src/properties.cpp:902
+#, fuzzy
 msgid "Unlimited Model Releases"
-msgstr ""
+msgstr "Modelo"
 
-#: src/properties.cpp:887
+#: src/properties.cpp:903
 msgid "Limited or Incomplete Model Releases"
 msgstr ""
 
-#: src/properties.cpp:894
+#: src/properties.cpp:910
 msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:895
+#: src/properties.cpp:911
 msgid "Limited or Incomplete Property Releases"
 msgstr ""
 
-#: src/properties.cpp:901
+#: src/properties.cpp:917
 msgid "Repeat Use"
 msgstr ""
 
-#: src/sigmamn.cpp:60
+#: src/properties.cpp:921 src/properties.cpp:930
+#, fuzzy
+msgid "Fixture Identification"
+msgstr "Versión Exif"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+#, fuzzy
+msgid "Status"
+msgstr "Fecha y hora"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
+msgstr ""
+
+#: src/properties.cpp:923 src/properties.cpp:932
+msgid "People"
+msgstr "Gente"
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
+msgstr ""
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
+msgstr ""
+
+#: src/sigmamn.cpp:62
 #, fuzzy
 msgid "Resolution Mode"
 msgstr "Resolución X"
 
-#: src/sigmamn.cpp:61
+#: src/sigmamn.cpp:63
 #, fuzzy
 msgid "Resolution mode"
 msgstr "Resolución X"
 
-#: src/sigmamn.cpp:62
+#: src/sigmamn.cpp:65
 #, fuzzy
 msgid "Autofocus Mode"
 msgstr "Exposición automática"
 
-#: src/sigmamn.cpp:63
+#: src/sigmamn.cpp:66
 #, fuzzy
 msgid "Autofocus mode"
 msgstr "Exposición automática"
 
-#: src/sigmamn.cpp:65
+#: src/sigmamn.cpp:68
 #, fuzzy
 msgid "Focus Setting"
 msgstr "Modo de exposición"
 
-#: src/sigmamn.cpp:66
+#: src/sigmamn.cpp:69
 #, fuzzy
 msgid "Focus setting"
 msgstr "Modo de exposición"
 
-#: src/sigmamn.cpp:77
+#: src/sigmamn.cpp:80
+#, fuzzy
+msgid "Lens Range"
+msgstr "Rango de transferencia"
+
+#: src/sigmamn.cpp:81
+#, fuzzy
+msgid "Lens focal length range"
+msgstr "Distancia focal"
+
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+#, fuzzy
+msgid "Shadow"
+msgstr "Sombra"
+
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
+#, fuzzy
+msgid "Highlight"
+msgstr "Luz de día"
+
+#: src/sigmamn.cpp:104
+#, fuzzy
+msgid "Fill Light"
+msgstr "Flash de relleno suave"
+
+#: src/sigmamn.cpp:105
+#, fuzzy
+msgid "X3 Fill light"
+msgstr "Luz de relleno X3"
+
+#: src/sigmamn.cpp:107
+#, fuzzy
+msgid "Color Adjustment"
+msgstr "Ajuste de color"
+
+#: src/sigmamn.cpp:108
+#, fuzzy
+msgid "Color adjustment"
+msgstr "Ajuste de color"
+
+#: src/sigmamn.cpp:110
+#, fuzzy
+msgid "Adjustment Mode"
+msgstr "Modo de ajuste"
+
+#: src/sigmamn.cpp:111
+#, fuzzy
+msgid "Adjustment mode"
+msgstr "Modo de ajuste"
+
+#: src/sigmamn.cpp:122
+#, fuzzy
+msgid "Auto Bracket"
+msgstr "Auto horquillado (Auto bracket)"
+
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
+msgid "Auto bracket"
+msgstr "Auto horquillado (Auto bracket)"
+
+#: src/sigmamn.cpp:127
+#, fuzzy
+msgid "Unknown SigmaMakerNote tag"
+msgstr "Etiqueta SigmaMakerNote desconocida"
+
+#: src/sigmamn.cpp:170
+#, fuzzy
+msgid "8-Segment"
+msgstr "multi-lugar"
+
+#: src/sonymn.cpp:88
+#, fuzzy
+msgid "Standard "
+msgstr "Estándar"
+
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
+msgstr "Lv1 avanzado"
+
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
+msgstr "Lv2 avanzado"
+
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
+msgstr "Lv3 avanzado"
+
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
+msgstr "Lv4 avanzado"
+
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
+msgstr "Lv5 avanzado"
+
+#: src/sonymn.cpp:109
+#, fuzzy
+msgid "Landscape "
+msgstr "Paisaje"
+
+#: src/sonymn.cpp:113
+#, fuzzy
+msgid "Night Scene / Twilight"
+msgstr "Escena nocturna / Crepúsculo"
+
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
+msgstr "Obturador alta velocidad"
+
+#: src/sonymn.cpp:115
+#, fuzzy
+msgid "Twilight Portrait"
+msgstr "Retrato Crepúsculo"
+
+#: src/sonymn.cpp:116
+#, fuzzy
+msgid "Soft Snap"
+msgstr "Suave"
+
+#: src/sonymn.cpp:118
+#, fuzzy
+msgid "Smile Shutter"
+msgstr "obturador lento"
+
+#: src/sonymn.cpp:120
+#, fuzzy
+msgid "High Sensitivity"
+msgstr "Alta Sensibilidad"
+
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
+msgstr "Deportes"
+
+#: src/sonymn.cpp:123
+#, fuzzy
+msgid "Gourmet"
+msgstr "Alimentos"
+
+#: src/sonymn.cpp:125
+#, fuzzy
+msgid "Handheld Twilight"
+msgstr "Luz de día"
+
+#: src/sonymn.cpp:126
+#, fuzzy
+msgid "Anti Motion Blur"
+msgstr "Modo de exposición"
+
+#: src/sonymn.cpp:128
+msgid "Backlight Correction HDR"
+msgstr "Correccion HDR Backlight"
+
+#: src/sonymn.cpp:142
+#, fuzzy
+msgid "On (Continuous)"
+msgstr "Exposición automática"
+
+#: src/sonymn.cpp:143
+#, fuzzy
+msgid "On (Shooting)"
+msgstr "Modo de métrica"
+
+#: src/sonymn.cpp:151
+msgid "Plus"
+msgstr ""
+
+#: src/sonymn.cpp:167
+#, fuzzy
+msgid "White Flourescent"
+msgstr "Fluorescente"
+
+#: src/sonymn.cpp:168
+#, fuzzy
+msgid "Cool White Flourescent"
+msgstr "Fluorescente"
+
+#: src/sonymn.cpp:169
+#, fuzzy
+msgid "Day White Flourescent"
+msgstr "Fluorescente"
+
+#: src/sonymn.cpp:172
+#, fuzzy
+msgid "Underwater 1 (Blue Water)"
+msgstr "Tiempo bueno"
+
+#: src/sonymn.cpp:173
+#, fuzzy
+msgid "Underwater 2 (Green Water)"
+msgstr "Tiempo bueno"
+
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
+msgstr "Auto enfoque permanente"
+
+#: src/sonymn.cpp:188
+#, fuzzy
+msgid "Center AF"
+msgstr "Autofocus centrado"
+
+#: src/sonymn.cpp:189
+#, fuzzy
+msgid "Spot AF"
+msgstr "Autofocus punto"
+
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
+msgstr "Autoenfoque de punto flexible"
+
+#: src/sonymn.cpp:191
+msgid "Touch AF"
+msgstr "Autofocus Touch"
+
+#: src/sonymn.cpp:192
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Enfoque manual"
+
+#: src/sonymn.cpp:193
+#, fuzzy
+msgid "Face Detected"
+msgstr "Cara detectada"
+
+#: src/sonymn.cpp:208
+#, fuzzy
+msgid "Close Focus"
+msgstr "Exposición automática"
+
+#: src/sonymn.cpp:224
+#, fuzzy
+msgid "Exposure Bracketing"
+msgstr "Ajuste de exposición"
+
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+#, fuzzy
+msgid "Multi Burst Mode"
+msgstr "Modo de exposición multi ráfaga"
+
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+#, fuzzy
+msgid "Multi Burst Image Width"
+msgstr "Ancho de la imagen en modo ráfaga"
+
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+#, fuzzy
+msgid "Multi Burst Image Height"
+msgstr "Longitud de la imagen en modo ráfaga"
+
+#: src/sonymn.cpp:315
+#, fuzzy
+msgid "JPEG preview image"
+msgstr "Orientación"
+
+#: src/sonymn.cpp:341
+#, fuzzy
+msgid "Auto HDR"
+msgstr "Alto Rango Dinámico automático"
+
+#: src/sonymn.cpp:342
+#, fuzzy
+msgid "High Definition Range Mode"
+msgstr "Rango de alta definición automático"
+
+#: src/sonymn.cpp:346
+#, fuzzy
+msgid "Shot Information"
+msgstr "Posicionamiento YCbCr"
+
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+#, fuzzy
+msgid "Sony Model ID"
+msgstr "Modelo Sony"
+
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+#, fuzzy
+msgid "Color Reproduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
+
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+#, fuzzy
+msgid "Dynamic Range Optimizer"
+msgstr "Balance de blanco"
+
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+#, fuzzy
+msgid "Minolta MakerNote"
+msgstr "Versión Exif"
+
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+#, fuzzy
+msgid "Full Image Size"
+msgstr "Tamaño de la imagen"
+
+#: src/sonymn.cpp:387
+#, fuzzy
+msgid "Preview Image Size"
+msgstr "Tamaño de vista previa"
+
+#: src/sonymn.cpp:388
+#, fuzzy
+msgid "Preview image size"
+msgstr "Tamaño de vista previa"
+
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
+msgstr "Autoenfoque Iluminador"
+
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Nivel de la batería"
+
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
 #, fuzzy
-msgid "Lens Range"
-msgstr "Rango de transferencia"
+msgid "Release Mode"
+msgstr "Flash"
+
+#: src/sonymn.cpp:415
+msgid "Shot number in continous burst mode"
+msgstr "Número de dispáros en modo ráfaga contínua"
 
-#: src/sigmamn.cpp:78
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+msgid "Anti-Blur"
+msgstr "anti-borroso"
+
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
 #, fuzzy
-msgid "Lens focal length range"
-msgstr "Distancia focal"
+msgid "Long Exposure Noise Reduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
+msgid "Intelligent Auto"
+msgstr "Modo auto inteligente"
+
+#: src/sonymn.cpp:434
 #, fuzzy
-msgid "Shadow"
-msgstr "Sombra"
+msgid "Unknown Sony1MakerNote tag"
+msgstr "Versión Exif"
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+#: src/sonymn.cpp:448
 #, fuzzy
-msgid "Highlight"
-msgstr "Luz de día"
+msgid "Continuous High"
+msgstr "Exposición automática, alta"
 
-#: src/sigmamn.cpp:101
+#: src/sonymn.cpp:452
 #, fuzzy
-msgid "Fill Light"
-msgstr "Flash"
+msgid "Continuous Low"
+msgstr "Exposición automática, baja"
 
-#: src/sigmamn.cpp:102
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
 #, fuzzy
-msgid "X3 Fill light"
-msgstr "Flash"
+msgid "D-Range Optimizer Bracketing Low"
+msgstr "Orientación"
 
-#: src/sigmamn.cpp:104
+#: src/sonymn.cpp:487
 #, fuzzy
-msgid "Color Adjustment"
-msgstr "Longitud de la imagen"
+msgid "Autumn"
+msgstr "Otoño"
 
-#: src/sigmamn.cpp:105
+#: src/sonymn.cpp:493
+msgid "ADI"
+msgstr "Imágen Digital Avanzada"
+
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
+msgstr ""
+
+#: src/sonymn.cpp:529
 #, fuzzy
-msgid "Color adjustment"
-msgstr "Longitud de la imagen"
+msgid "Auto No Flash"
+msgstr "Auto sin flash"
 
-#: src/sigmamn.cpp:107
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
 #, fuzzy
-msgid "Adjustment Mode"
-msgstr "Longitud de la imagen"
+msgid "Dynamic Range Optimizer Level"
+msgstr "Balance de blanco"
 
-#: src/sigmamn.cpp:108
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
 #, fuzzy
-msgid "Adjustment mode"
-msgstr "Longitud de la imagen"
+msgid "Creative Style"
+msgstr "Creativo"
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
-msgstr ""
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
+#, fuzzy
+msgid "Zone Matching Value"
+msgstr "Espacio de color"
 
-#: src/sigmamn.cpp:119
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
 #, fuzzy
-msgid "Auto Bracket"
-msgstr "Auto bracket"
+msgid "AF With Shutter"
+msgstr "obturador"
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
-msgid "Auto bracket"
-msgstr "Auto bracket"
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+#, fuzzy
+msgid "High ISO NoiseReduction"
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/sigmamn.cpp:124
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
 #, fuzzy
-msgid "Unknown SigmaMakerNote tag"
-msgstr "Versión Exif"
+msgid "Image Style"
+msgstr "Estilo de imágen"
 
-#: src/sigmamn.cpp:167
+#: src/sonymn.cpp:655
 #, fuzzy
-msgid "8-Segment"
-msgstr "multi-lugar"
+msgid "Unknown Sony1 Camera Settings tag"
+msgstr "Contraste"
 
-#: src/sonymn.cpp:80
+#: src/sonymn.cpp:719
 #, fuzzy
-msgid "Unknown SonyMakerNote tag"
+msgid "Unknown Sony1 Camera Settings 2 tag"
 msgstr "Versión Exif"
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
 #, fuzzy
 msgid "Unknown section"
 msgstr "Versión Exif"
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
+#, fuzzy
 msgid "Image data structure"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
+#, fuzzy
 msgid "Recording offset"
-msgstr ""
+msgstr "Grabando offset"
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
+#, fuzzy
 msgid "Image data characteristics"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 #, fuzzy
 msgid "Other data"
-msgstr "Otro"
+msgstr "Otros"
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
+#, fuzzy
 msgid "Exif data structure"
-msgstr ""
+msgstr "Estructura de datos Exif"
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
 #, fuzzy
 msgid "Image configuration"
 msgstr "Configuración planar"
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
+#, fuzzy
 msgid "User information"
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
+#, fuzzy
 msgid "Related file"
-msgstr ""
+msgstr "Archivo relacionado"
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 #, fuzzy
 msgid "Date and time"
 msgstr "Fecha y hora"
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
+#, fuzzy
 msgid "Picture taking conditions"
-msgstr ""
+msgstr "Condiciones de toma de la imágen"
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
+#, fuzzy
 msgid "GPS information"
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
+#, fuzzy
 msgid "Interoperability information"
-msgstr ""
+msgstr "Posicionamiento YCbCr"
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
+#, fuzzy
 msgid "Vendor specific information"
-msgstr ""
+msgstr "Información específica del vendedor"
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 msgid "Adobe DNG tags"
-msgstr ""
+msgstr "Etiquetas Adobe DNG"
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
+#, fuzzy
 msgid "Panasonic RAW tags"
-msgstr ""
+msgstr "etiquetas Panasonic RAW"
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 msgid "TIFF/EP tags"
 msgstr ""
 
-#: src/tags.cpp:193
-msgid "Last section"
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
 msgstr ""
 
-#: src/tags.cpp:213
+#: src/tags.cpp:208
+msgid "Adobe OPI tags"
+msgstr ""
+
+#: src/tags.cpp:209
+#, fuzzy
+msgid "Last section"
+msgstr "Contraste"
+
+#: src/tags.cpp:225
 #, fuzzy
 msgid "Primary image"
 msgstr "Cromaticidades primarias"
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
+#, fuzzy
 msgid "Thumbnail/Preview image"
-msgstr ""
+msgstr "Miniatura / Vista previa"
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
+#, fuzzy
 msgid "Primary image, Multi page file"
-msgstr ""
+msgstr "Cromaticidades primarias"
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
 msgid "Thumbnail/Preview image, Multi page file"
-msgstr ""
+msgstr "Miniatura / Vista previa, archivo multipagina"
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
 msgid "Primary image, Transparency mask"
-msgstr ""
+msgstr "Máscara de transparencia, imágen principal"
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
 msgid "Thumbnail/Preview image, Transparency mask"
-msgstr ""
+msgstr "Miniatura / Vista previa, máscara de transparencia"
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
-msgstr ""
+msgstr "Imágen principal, Archivo multi-página, Máscara de transparencia"
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr ""
+"Imágen miniatura/ Vista previa, Archivo multi-página, Máscara de "
+"transparencia"
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+msgid "Full-resolution image data"
+msgstr "datos de imágen de alta resolución"
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr "datos de imágen de baja resolución"
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr "Una única página de una imágen multipágina"
+
+#: src/tags.cpp:246
 #, fuzzy
 msgid "inch"
 msgstr "Pulgada"
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr ""
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr ""
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr ""
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
-msgstr ""
+msgstr "LZW (compresión sin pérdidas para tiff)"
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
-msgstr ""
+msgstr "JPEG (estilo antiguo)"
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr ""
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
 msgid "Adobe Deflate"
 msgstr ""
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
-msgstr ""
+msgstr "JBIG B/N"
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 #, fuzzy
 msgid "JBIG Color"
-msgstr "Espacio de color"
+msgstr "JBIG en color"
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr ""
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 #, fuzzy
 msgid "Epson ERF Compressed"
-msgstr "Descomprimido"
+msgstr "Epson ERF Comprimido"
+
+#: src/tags.cpp:264
+#, fuzzy
+msgid "Samsung SRW Compressed"
+msgstr "Epson ERF Comprimido"
 
-#: src/tags.cpp:244
+#: src/tags.cpp:265
 msgid "CCITT RLE 1-word"
 msgstr ""
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr ""
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr ""
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr ""
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr ""
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
+#, fuzzy
 msgid "IT8 Monochrome Picture"
-msgstr ""
+msgstr "IT8 Imágen monocromática"
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr ""
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr ""
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr ""
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
 msgid "Pixar Deflate"
 msgstr ""
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr ""
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
+#, fuzzy
 msgid "ISO JBIG"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr ""
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr ""
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr ""
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 #, fuzzy
 msgid "Nikon NEF Compressed"
-msgstr "Descomprimido"
+msgstr "Nikon NEF Comprimido"
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
 #, fuzzy
 msgid "Kodak DCR Compressed"
-msgstr "Descomprimido"
+msgstr "Kodak DCR Comprimido"
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 #, fuzzy
 msgid "Pentax PEF Compressed"
-msgstr "Descomprimido"
+msgstr "Pentax PEF Comprimido"
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
 msgid "White Is Zero"
-msgstr ""
+msgstr "el blanco es el cero"
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
 msgid "Black Is Zero"
-msgstr ""
+msgstr "el negro es el cero"
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr "RVA"
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
-msgstr ""
+msgstr "Paleta RVA (RGB)"
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
-msgstr ""
+msgstr "Máscara de transparencia"
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr "TCvCr"
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr ""
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr ""
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr ""
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
+#, fuzzy
 msgid "Color Filter Array"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr ""
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr ""
 
-#: src/tags.cpp:279
-msgid "Linear Raw"
+#: src/tags.cpp:300
+msgid "Linear Raw"
+msgstr ""
+
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
+msgstr ""
+
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+#, fuzzy
+msgid "Randomized process"
+msgstr "Proceso aleatorio"
+
+#: src/tags.cpp:312
+#, fuzzy
+msgid "top, left"
+msgstr "arriba - izquierda"
+
+#: src/tags.cpp:313
+#, fuzzy
+msgid "top, right"
+msgstr "arriba - derecha"
+
+#: src/tags.cpp:314
+#, fuzzy
+msgid "bottom, right"
+msgstr "abajo - derecha"
+
+#: src/tags.cpp:315
+#, fuzzy
+msgid "bottom, left"
+msgstr "abajo - izquierda"
+
+#: src/tags.cpp:316
+#, fuzzy
+msgid "left, top"
+msgstr "izquierda - arriba"
+
+#: src/tags.cpp:317
+#, fuzzy
+msgid "right, top"
+msgstr "derecha - arriba"
+
+#: src/tags.cpp:318
+#, fuzzy
+msgid "right, bottom"
+msgstr "derecha - abajo"
+
+#: src/tags.cpp:319 src/tags.cpp:320
+#, fuzzy
+msgid "left, bottom"
+msgstr "izquierda - abajo"
+
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
+msgstr ""
+
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+msgid "not CMYK"
+msgstr "sin CMYK"
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr "datos enteros no firmados"
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
 msgstr ""
 
-#: src/tags.cpp:284
+#: src/tags.cpp:340 src/tags.cpp:341
 #, fuzzy
-msgid "top, left"
-msgstr "arriba - izquierda"
+msgid "Undefined data format"
+msgstr "Formato de datos indefinido"
 
-#: src/tags.cpp:285
+#: src/tags.cpp:346
 #, fuzzy
-msgid "top, right"
-msgstr "arriba - derecha"
+msgid "Not indexed"
+msgstr "No definido"
 
-#: src/tags.cpp:286
+#: src/tags.cpp:347 src/tags.cpp:653
 #, fuzzy
-msgid "bottom, right"
-msgstr "abajo - derecha"
+msgid "Indexed"
+msgstr "Indefinido"
 
-#: src/tags.cpp:287
-#, fuzzy
-msgid "bottom, left"
-msgstr "abajo - izquierda"
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
 
-#: src/tags.cpp:288
+#: src/tags.cpp:353
 #, fuzzy
-msgid "left, top"
-msgstr "izquierda - arriba"
+msgid "B"
+msgstr "A"
 
-#: src/tags.cpp:289
+#: src/tags.cpp:354
 #, fuzzy
-msgid "right, top"
-msgstr "derecha - arriba"
+msgid "C"
+msgstr "Cb"
 
-#: src/tags.cpp:290
-#, fuzzy
-msgid "right, bottom"
-msgstr "derecha - abajo"
+#: src/tags.cpp:355
+msgid "A+B-C"
+msgstr ""
 
-#: src/tags.cpp:291
-#, fuzzy
-msgid "left, bottom"
-msgstr "izquierda - abajo"
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
+msgstr ""
 
-#: src/tags.cpp:296
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:358
+msgid "(A+B)/2"
+msgstr ""
+
+#: src/tags.cpp:363
 #, fuzzy
 msgid "Centered"
 msgstr "centrado"
 
-#: src/tags.cpp:297
+#: src/tags.cpp:364
 #, fuzzy
 msgid "Co-sited"
 msgstr "co-situado"
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
 #, fuzzy
 msgid "No flash"
-msgstr "Flash"
+msgstr "Sin Flash"
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 #, fuzzy
 msgid "Fired, strobe return light not detected"
 msgstr "Luz de retorno estrosboscópica no detectada."
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 #, fuzzy
 msgid "Fired, strobe return light detected"
 msgstr "Luz de retorno estrosboscópica detectada."
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
 #, fuzzy
 msgid "Yes, did not fire"
 msgstr "El flash no disparó."
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
+#, fuzzy
 msgid "Yes, compulsory"
-msgstr ""
+msgstr "El flash disparó en modo compulsivo, modo de reducción de ojos rojos."
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 #, fuzzy
 msgid "Yes, compulsory, return light not detected"
-msgstr ""
-"El flash disparó, modo compulsivo del flash, luz de retorno no detectada."
+msgstr "Flash disparado en modo compulsivo, luz de retorno no detectada."
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 #, fuzzy
 msgid "Yes, compulsory, return light detected"
-msgstr "El flash disparó, modo compulsivo del flash, luz de retorno detectada."
+msgstr "Flash disparado en modo compulsivo, luz de retorno detectada."
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
-msgstr ""
+msgstr "No, modo compulsivo"
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 #, fuzzy
 msgid "No, did not fire, return not detected"
-msgstr "Luz de retorno estrosboscópica no detectada."
+msgstr "Flash no disparó y Luz de retorno estrosboscópica no detectada."
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 #, fuzzy
 msgid "No, auto"
-msgstr "acción"
+msgstr "No, auto"
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 #, fuzzy
 msgid "Yes, auto"
-msgstr "acción"
+msgstr "Si, auto"
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 #, fuzzy
 msgid "Yes, auto, return light not detected"
 msgstr "Luz de retorno estrosboscópica no detectada."
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 #, fuzzy
 msgid "Yes, auto, return light detected"
 msgstr "Luz de retorno estrosboscópica detectada."
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 #, fuzzy
 msgid "No flash function"
 msgstr "Sin función de flash."
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 #, fuzzy
 msgid "No, no flash function"
-msgstr "Sin función de flash."
+msgstr "No, Sin función de flash."
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
 #, fuzzy
 msgid "Yes, red-eye reduction"
-msgstr "El flash disparó, modo de reducción de ojos rojos."
+msgstr "Flash disparado en modo ojos rojos."
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 #, fuzzy
 msgid "Yes, red-eye reduction, return light not detected"
-msgstr ""
-"El flash disparó, modo de reducción de ojos rojos, luz de retorno no "
-"detectada."
+msgstr "Flash disparado en modo ojos rojos, luz de retorno no detectada."
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 #, fuzzy
 msgid "Yes, red-eye reduction, return light detected"
-msgstr ""
-"El flash disparó, modo de reducción de ojos rojos, luz de retorno detectada."
+msgstr "Flash disparado en modo ojos rojos, luz de retorno detectada."
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
 #, fuzzy
 msgid "Yes, compulsory, red-eye reduction"
-msgstr ""
-"El flash disparó, modo compulsivo del flash, modo de reducción de ojos rojos."
+msgstr "El flash disparó en modo compulsivo y de reducción de ojos rojos."
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 #, fuzzy
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr ""
-"El flash disparó, modo compulsivo del flash, modo de reducción de ojos "
-"rojos, luz de retorno no detectada."
+"Flash disparado en modos compulsivo y de reducción de ojos rojos, luz de "
+"retorno no detectada."
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 #, fuzzy
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr ""
-"El flash disparó, modo compulsivo del flash, modo de reducción de ojos "
-"rojos, luz de retorno detectada."
+"Flash disparado en modos compulsivo y de reducción de ojos rojos, luz de "
+"retorno detectada."
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
 #, fuzzy
 msgid "No, red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
 #, fuzzy
 msgid "No, auto, red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
 #, fuzzy
 msgid "Yes, auto, red-eye reduction"
 msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 #, fuzzy
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr ""
 "El flash disparó, modo de reducción de ojos rojos, luz de retorno no "
 "detectada."
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 #, fuzzy
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr ""
 "El flash disparó, modo de reducción de ojos rojos, luz de retorno detectada."
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
-msgstr ""
+msgstr "Escena rectangular (o cuadrada)"
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 #, fuzzy
 msgid "Processing Software"
 msgstr "Método de sensado"
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
-msgstr ""
+msgstr "Nombre y versión del software usado para post-procesar la imágen"
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
+#, fuzzy
 msgid "New Subfile Type"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
+msgstr "Indicación general del tipo de datos contenido"
+
+#: src/tags.cpp:416
+#, fuzzy
+msgid "Subfile Type"
+msgstr "Ancho de la imagen"
+
+#: src/tags.cpp:417
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
 msgstr ""
+"Una indicación general del tipo de datos contenidos en éste subdocumento. En "
+"desusousar el campo NewSubfileType en su lugar."
 
-#: src/tags.cpp:350
+#: src/tags.cpp:421
 #, fuzzy
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
-"La cantidad de columnas de los datos de la imagen, igual a la cantidad de "
-"pixels por fila. En datos comprimidos JPEG se utiliza un marcador JPEG en "
-"vez de esta etiqueta."
+"La cantidad de columnas de los datos de la imagen, igual al número de "
+"píxeles por fila. En datos comprimidos JPEG se usa un marcador JPEG en vez "
+"de esta etiqueta."
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -16370,11 +20585,11 @@
 "La cantidad de filas de datos de la imagen. En datos comprimidos JPEG se "
 "utiliza un marcador JPEG en vez de esta etiqueta."
 
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr "Bits por muestra"
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 #, fuzzy
 msgid ""
 "The number of bits per image component. In this standard each component of "
@@ -16382,47 +20597,83 @@
 "<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
 "this tag."
 msgstr ""
-"La cantidad de bits por componente de imagen. En este estándar cada "
-"componente de imagen es 8 bits, por lo que el valor de esta etiqueta es 9. "
-"Vea también <SamplesPerPixel>. En datos comprimidos JPEG se utliza un "
-"marcador JPEG en vez de esta etiqueta."
+"El número de bits por componente de imagen. En este estándar cada componente "
+"de imagen es 8 bits, por lo que el valor de esta etiqueta es 8. Vea también "
+"<SamplesPerPixel>. En datos comprimidos JPEG se utiliza un marcador JPEG en "
+"vez de esta etiqueta."
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
 msgid ""
 "The compression scheme used for the image data. When a primary image is JPEG "
 "compressed, this designation is not necessary and is omitted. When "
 "thumbnails use JPEG compression, this tag value is set to 6."
 msgstr ""
-"El esquema de compresión utilizado para los datos de la imagen. Cuando una "
+"El esquema de compresión usado para los datos de la imagen. Cuando una "
 "imagen primaria está comprimida con JPEG, esto no es necesario y se omite. "
-"Cuando las diapositivas utilizan compresión JPEG, el valor de esta etiqueta "
-"es 6."
+"Cuando las miniaturas utilizan compresión JPEG, el valor de esta etiqueta es "
+"6."
 
-#: src/tags.cpp:371
+#: src/tags.cpp:442
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
-"La composición del pixel. En datos comprimidos JPEG se utliza un marcador "
+"La composición del pixel. En datos comprimidos JPEG se utiliza un marcador "
 "JPEG en vez de esta etiqueta."
 
-#: src/tags.cpp:374
+#: src/tags.cpp:445
+#, fuzzy
+msgid "Threshholding"
+msgstr "Umbral (Reducción de imágen a B/N puros)"
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+"Para TIFFs en blanco y negro, la técnica usada para convertirlos tonos de "
+"grís en pixeles blancos o negros (puros)."
+
+#: src/tags.cpp:449
+#, fuzzy
+msgid "Cell Width"
+msgstr "Ancho de céldas"
+
+#: src/tags.cpp:450
+msgid ""
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:453
+#, fuzzy
+msgid "Cell Length"
+msgstr "Longitud de la imagen"
+
+#: src/tags.cpp:454
+msgid ""
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr "Orden de llenado"
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
-msgstr ""
+msgstr "Órden lógico de bits dentro de un byte"
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
 msgid "Document Name"
 msgstr "Nombre del documento"
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
+#, fuzzy
 msgid "The name of the document from which this image was scanned"
-msgstr ""
+msgstr "Nombre del documento desde el que se ha escaneado ésta imágen"
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -16430,11 +20681,11 @@
 "is to be used."
 msgstr ""
 "Una cadena de caracteres que da título a la imagen. Puede ser un comentario "
-"como \"picnic de 1988\" o algo por el estilo. No se pueden utilizar "
-"caracteres codificados con 2 bytes. Cuando se necesita un código de 2 bytes, "
-"se debe usar la etiqueta privada Exif <UserComment>."
+"como \"picnic de 1988\" o algo por el estilo. No se permiten caracteres "
+"codificados con 2 bytes, si se necesita un código de 2 bytes debe usarsela "
+"etiqueta privada Exif <UserComment>."
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -16444,7 +20695,7 @@
 "digitalizador de vídeo u otro equipo que generó la imagen. Cuando el campo "
 "se deja en blanco, se trata como desconocido."
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
@@ -16454,7 +20705,7 @@
 "número del DSC, escáner, digitalizador de vídeo u otro equipo que generó la "
 "imagen. Cuando el campo se deja en blanco, se trata como desconocido."
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -16466,30 +20717,30 @@
 "datos comprimidos JPEG esto no es necesario y se omite. Vea también "
 "<RowsPerStrip> y <StripByteCounts>."
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 #, fuzzy
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "La orientación de la imagen vista en términos de filas y columnas."
 
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr "Muestras por pixel"
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
 "JPEG marker is used instead of this tag."
 msgstr ""
-"La cantidad de componentes por pixel. Debido a que este estándar se aplica a "
-"imágenes RGB e YCbCr, el valor para esta etiqueta es 3. En datos comprimidos "
-"JPEG se utliza un marcador JPEG en vez de esta etiqueta."
+"El número de componentes por pixel. Desde que este estándar se aplica a "
+"imágenes RGB e YCbCr, el valor de esta etiqueta es 3. En JPEG comprimidos se "
+"utiliza un marcador JPEG en vez de esta etiqueta."
 
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr "Filas por tira"
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 #, fuzzy
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
@@ -16498,41 +20749,40 @@
 "<StripByteCounts>."
 msgstr ""
 "La cantidad de filas por tira. Esta es la cantidad de filas en la imagen de "
-"una tira cuando se divide a la imagen en tiras. En datos comprimidos JPEG "
-"esto no es necesario y se omite. Vea también <RowsPerStrip> y "
-"<StripByteCounts>."
+"una tira cuando se divide a la imagen en tiras. En JPEG comprimidos esto no "
+"es necesario y se omite. Vea también <RowsPerStrip> y <StripByteCounts>."
 
-#: src/tags.cpp:420
+#: src/tags.cpp:503
 msgid "Strip Byte Count"
 msgstr "Cantidad de bytes por tira"
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
-"La cantidad total de bytes en cada tira. En datos comprimidos JPEG esto no "
-"es necesario y se omite."
+"La cantidad total de bytes en cada tira. Innecesaria y se omite en datos "
+"comprimidos JPEG."
 
-#: src/tags.cpp:424
+#: src/tags.cpp:507
 #, fuzzy
 msgid "X-Resolution"
-msgstr "Resolución Y"
+msgstr "Resolución X"
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
-"La cantidad de pixels por <ResolutionUnit> en la dirección <ImageWidth>. "
+"La cantidad de píxeles por <ResolutionUnit> en la dirección <ImageWidth>. "
 "Cuando se desconoce la resolución de una imagen, se utilizan 72 [dpi]."
 
-#: src/tags.cpp:428
+#: src/tags.cpp:511
 #, fuzzy
 msgid "Y-Resolution"
 msgstr "Resolución Y"
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -16540,38 +20790,75 @@
 "La cantidad de pixels por <ResolutionUnit> en la dirección <ImageLength>. Se "
 "utiliza el mismo valor que <XResolution>."
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
 "If this field does not exist, the TIFF default of 1 (chunky) is assumed."
 msgstr ""
 "Indica si los componentes de pixel se graban en formato planar o por trozos. "
-"En datos comprimidos JPEG se utliza un marcador JPEG en vez de esta "
+"En datos comprimidos JPEG se utiliza un marcador JPEG en vez de esta "
 "etiqueta. Si este campo no existe, se asume el predeterminado de TIFF, 1 "
 "(por trozos)."
 
-#: src/tags.cpp:439
+#: src/tags.cpp:521
+#, fuzzy
+msgid "Gray Response Unit"
+msgstr "Punto blanco"
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr "Precisión de la información contenida en GrayResponseCurve. "
+
+#: src/tags.cpp:524
+#, fuzzy
+msgid "Gray Response Curve"
+msgstr "Compresión"
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+"Densidad óptica de cada posible valor del pixel con datos en escala de grís."
+
+#: src/tags.cpp:527
+#, fuzzy
+msgid "T4 Options"
+msgstr "acción"
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+#, fuzzy
+msgid "T6 Options"
+msgstr "acción"
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
 "unknown, 2 (inches) is designated."
 msgstr ""
-"La unidad para medir <XResolution> e <YResolution>. Se utiliza la misma "
-"unidad para ambas. Si la resolución de la imagen se desconoce, se designa 2 "
+"La unidad para medir tanto <XResolution> como <YResolution> (Es la misma "
+"para ambas). Si la resolución de la imagen se desconoce, se designa 2 "
 "(pulgadas)."
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 "Una función de transferencia para la imagen, descripta en forma tabular. "
-"Normalmente esta etiqueta no es necesaria, dado que el espacio de color se "
+"Normalmente esta etiqueta no es necesaria, ya que el espacio de color se "
 "especifica en la etiqueta de información de espacio de color (<ColorSpace>)."
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -16579,12 +20866,12 @@
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 "Esta etiqueta registra el nombre y la versión del software o firmware de la "
-"cámara o dispositivo de entrada de imagen utilizado para generar la imágen. "
-"No se especifica el formato detallado, pero se recomienda que se siga el "
-"ejemplo mostrado debajo. Cuando el campo se deja en blanco, se trata como "
-"desconocido."
+"cámara o dispositivo de entrada de imagen usado para generar la imágen. No "
+"se especifica el formato detallado, pero se recomienda que se siga el "
+"ejemplo mostrado debajo. Tratado como desconocido si el campo se deja en "
+"blanco."
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 #, fuzzy
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
@@ -16593,7 +20880,7 @@
 "La fecha y hora de la creación de la imagen. En este estándar (EXIF-2.1) es "
 "la fecha y hora en la que cambió el archivo."
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 #, fuzzy
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
@@ -16605,21 +20892,36 @@
 msgstr ""
 "Esta etiqueta registra el nombre del dueño de la cámara, fotógrafo o creador "
 "de la imagen. No se especifica el formato detallado, pero se recomienda que "
-"se escriba la información en como en el ejemplo de abajo para facilitar la "
+"se escriba la información siguiendo el ejemplo de abajo para facilitar la "
 "inter-operabilidad. Cuando el campo se deja en blanco, se trata como "
 "desconocido."
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+msgid "Host Computer"
 msgstr ""
 
-#: src/tags.cpp:468
+#: src/tags.cpp:563
 msgid ""
 "This tag records information about the host computer used to generate the "
 "image."
 msgstr ""
+"Esta etiqueta guarda información sobre la computadora huesped usada para "
+"generar la imágen."
+
+#: src/tags.cpp:566
+#, fuzzy
+msgid "Predictor"
+msgstr "Pronosticador"
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+"Operador matemático aplicado a la imágen antes de que se aplique un sistema "
+"de codificación."
 
-#: src/tags.cpp:472
+#: src/tags.cpp:571
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the colorspace information tag "
@@ -16629,101 +20931,266 @@
 "es necesaria ya que el espacio de color se especifica en la etiqueta de "
 "información del espacio de color (<ColorSpace>)."
 
-#: src/tags.cpp:477
+#: src/tags.cpp:576
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since colorspace is specified in the colorspace "
 "information tag (<ColorSpace>)."
 msgstr ""
-"La cromaticidad de los tres colores primarios de la imagen. Normalmente esta "
-"etiqueta no es necesaria ya que el espacio de color se especifica en la "
-"etiqueta de información del espacio de color (<ColorSpace>)."
+"La cromaticidad de los tres colores primarios de la imagen. Innecesaria "
+"normalmente, ya que el espacio de color se especifica en la etiqueta de "
+"información del espacio de color (<ColorSpace>)."
+
+#: src/tags.cpp:580
+#, fuzzy
+msgid "Color Map"
+msgstr "Espacio de color"
+
+#: src/tags.cpp:581
+msgid ""
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
+msgstr ""
+
+#: src/tags.cpp:586
+msgid "Halftone Hints"
+msgstr ""
+
+#: src/tags.cpp:587
+msgid ""
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
+msgstr ""
+
+#: src/tags.cpp:591
+#, fuzzy
+msgid "Tile Width"
+msgstr "Ancho de la imágen mosaico"
+
+#: src/tags.cpp:592
+msgid "The tile width in pixels. This is the number of columns in each tile."
+msgstr ""
+"El ancho del mosaico en píxeles, es el número de columnas en cada mosaico"
+
+#: src/tags.cpp:594
+#, fuzzy
+msgid "Tile Length"
+msgstr "Longitud de la imagen mosaico"
+
+#: src/tags.cpp:595
+msgid ""
+"The tile length (height) in pixels. This is the number of rows in each tile."
+msgstr ""
+"La altura del mosaico en píxeles, es el número de filas en cada mosaico"
+
+#: src/tags.cpp:597
+#, fuzzy
+msgid "Tile Offsets"
+msgstr "Desplazamiento de tira"
+
+#: src/tags.cpp:598
+msgid ""
+"For each tile, the byte offset of that tile, as compressed and stored on "
+"disk. The offset is specified with respect to the beginning of the TIFF "
+"file. Note that this implies that each tile has a location independent of "
+"the locations of other tiles."
+msgstr ""
+
+#: src/tags.cpp:603
+#, fuzzy
+msgid "Tile Byte Counts"
+msgstr "Cantidad de bytes por tira"
+
+#: src/tags.cpp:604
+msgid ""
+"For each tile, the number of (compressed) bytes in that tile. See "
+"TileOffsets for a description of how the byte counts are ordered."
+msgstr ""
+
+#: src/tags.cpp:607
+#, fuzzy
+msgid "SubIFD Offsets"
+msgstr "Desplazamiento de tira"
+
+#: src/tags.cpp:608
+msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
+msgstr ""
+
+#: src/tags.cpp:610
+#, fuzzy
+msgid "Ink Set"
+msgstr "Área del sujeto (Tinta)"
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+"The set de tintas usadas en una imágen (PhotometricInterpretation=5) "
+"separada."
+
+# can be improved
+#: src/tags.cpp:613
+#, fuzzy
+msgid "Ink Names"
+msgstr "Nombre de las tintas"
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+#, fuzzy
+msgid "Number Of Inks"
+msgstr "El número F."
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+#, fuzzy
+msgid "Dot Range"
+msgstr "Rango de transferencia"
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
 
-#: src/tags.cpp:481
+#: src/tags.cpp:622
 #, fuzzy
-msgid "Tile Width"
-msgstr "Ancho de la imagen"
+msgid "Target Printer"
+msgstr "Apertura"
 
-#: src/tags.cpp:482
-msgid "The tile width in pixels. This is the number of columns in each tile."
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
 msgstr ""
 
-#: src/tags.cpp:484
+#: src/tags.cpp:625
 #, fuzzy
-msgid "Tile Length"
-msgstr "Longitud de la imagen"
+msgid "Extra Samples"
+msgstr "Muestras Extra"
 
-#: src/tags.cpp:485
+#: src/tags.cpp:626
 msgid ""
-"The tile length (height) in pixels. This is the number of rows in each tile."
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
 msgstr ""
 
-#: src/tags.cpp:487
+#: src/tags.cpp:629
 #, fuzzy
-msgid "Tile Offsets"
-msgstr "Desplazamiento de tira"
+msgid "Sample Format"
+msgstr "Formato de muestra"
 
-#: src/tags.cpp:488
-msgid ""
-"For each tile, the byte offset of that tile, as compressed and stored on "
-"disk. The offset is specified with respect to the beginning of the TIFF "
-"file. Note that this implies that each tile has a location independent of "
-"the locations of other tiles."
-msgstr ""
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr "Especifica como interpretar cada dato de muestra en un pixel"
 
-#: src/tags.cpp:493
+#: src/tags.cpp:632
 #, fuzzy
-msgid "Tile Byte Counts"
-msgstr "Cantidad de bytes por tira"
+msgid "SMin Sample Value"
+msgstr "Nitidez"
 
-#: src/tags.cpp:494
-msgid ""
-"For each tile, the number of (compressed) bytes in that tile. See "
-"TileOffsets for a description of how the byte counts are ordered."
-msgstr ""
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr "Especifica el valor mínimo de muestra"
 
-#: src/tags.cpp:497
+#: src/tags.cpp:635
 #, fuzzy
-msgid "SubIFD Offsets"
-msgstr "Desplazamiento de tira"
+msgid "SMax Sample Value"
+msgstr "apertura"
 
-#: src/tags.cpp:498
-msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
-msgstr ""
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr "Especifica el valor máximo de muestra"
 
-#: src/tags.cpp:500
+#: src/tags.cpp:638
 msgid "Transfer Range"
 msgstr "Rango de transferencia"
 
-#: src/tags.cpp:501
+#: src/tags.cpp:639
 msgid "Expands the range of the TransferFunction"
+msgstr "Expande el rango de la función TransferFunction"
+
+#: src/tags.cpp:641
+msgid "Clip Path"
 msgstr ""
 
-#: src/tags.cpp:503
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
 #, fuzzy
 msgid "JPEG tables"
 msgstr "compresión JPEG"
 
-#: src/tags.cpp:504
+#: src/tags.cpp:659
 msgid ""
 "This optional tag may be used to encode the JPEG quantization andHuffman "
 "tables for subsequent use by the JPEG decompression process."
 msgstr ""
 
-#: src/tags.cpp:507
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
 #, fuzzy
 msgid "JPEG Process"
 msgstr "compresión JPEG"
 
-#: src/tags.cpp:508
+#: src/tags.cpp:667
 msgid "This field indicates the process used to produce the compressed data"
-msgstr ""
+msgstr "Este campo indica el proceso usado para producir los datos comprimidos"
 
-#: src/tags.cpp:510
+#: src/tags.cpp:669
 msgid "JPEG Interchange Format"
 msgstr "Formato de intercambio de JPEG"
 
-#: src/tags.cpp:511
+#: src/tags.cpp:670
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -16731,11 +21198,11 @@
 "El desplazamiento del byte de comienzo (SOI) de los datos comprimidos de la "
 "diapositiva JPEG. Esto no se utiliza para los datos primarios de imagen JPEG."
 
-#: src/tags.cpp:514
+#: src/tags.cpp:673
 msgid "JPEG Interchange Format Length"
 msgstr "Longitud del formato de intercambio de JPEG"
 
-#: src/tags.cpp:515
+#: src/tags.cpp:674
 msgid ""
 "The number of bytes of JPEG compressed thumbnail data. This is not used for "
 "primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
@@ -16750,7 +21217,72 @@
 "deberían grabarse en no más de 64 Kbytes, incluyendo todos los otros datos a "
 "grabar en APP1."
 
-#: src/tags.cpp:523
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
+msgstr ""
+
+#: src/tags.cpp:682
+#, fuzzy
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
+msgstr ""
+"Esta etiqueta indica la dirección del procesamiento de nitidez aplicado por "
+"la cámara cuando se tomó la imagen."
+
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
+msgstr ""
+
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
+msgstr ""
+
+#: src/tags.cpp:690
+msgid ""
+"This Field points to a list of point transform values, one per component."
+msgstr ""
+
+#: src/tags.cpp:692
+#, fuzzy
+msgid "JPEG Q-Tables"
+msgstr "compresión JPEG"
+
+#: src/tags.cpp:693
+msgid ""
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:696
+#, fuzzy
+msgid "JPEG DC-Tables"
+msgstr "compresión JPEG"
+
+#: src/tags.cpp:697
+msgid ""
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
+msgstr ""
+
+#: src/tags.cpp:700
+#, fuzzy
+msgid "JPEG AC-Tables"
+msgstr "compresión JPEG"
+
+#: src/tags.cpp:701
+msgid ""
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:705
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in Appendix E, \"Color "
@@ -16758,27 +21290,27 @@
 "color space information tag, with the default being the value that gives the "
 "optimal image characteristics Interoperability this condition."
 msgstr ""
-"Los coeficientes de la matriz para la transformación de RGB a datos de "
-"imagen YCbCr. No hay predeterminados en TIFF; pero aquí se utiliza el valor "
-"dado en el Apéndice E, \"Color Space Guidelines\" como predeterminado. El "
-"espacio de color se declara en una etiqueta de información del espacio de "
-"color, siendo el predeterminado el que da las características óptimas de "
-"inter-operabilidad para la imagen."
+"Los coeficientes de la matriz para transformar los datos de RGB a YCbCr. En "
+"TIF no se proporcionan valores por defecto pero aquí se toma el valor dado "
+"en el Apéndice E, \"Color Space Guidelines\" como predeterminado. El espacio "
+"de color se declara en una etiqueta de información del espacio de color, "
+"tomando como predeterminado el que dé las características óptimas de inter-"
+"operabilidad para la imagen."
 
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr "Sub-muestreo YCbCr"
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
 "component. In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 "La relación de muestreo de los componentes de crominancia en relación con el "
-"componente de luminancia. En datos comprimidos JPEG se utliza un marcador "
+"componente de luminancia. En datos comprimidos JPEG se utiliza un marcador "
 "JPEG en vez de esta etiqueta."
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -16793,22 +21325,22 @@
 "both centered and co-sited positioning."
 msgstr ""
 "La posición de los componentes de crominancia en relación con el de "
-"luminancia. Este campo se designa sólo para datos comprimidos JPEG o datos "
-"no comprimidos YCbCr. El valor predeterminado TIFF es 1 (centrado); pero "
-"cuando Y:Cb:Cr = 4:2:2 se recomienda en este estándar que se utilice 2 (co-"
-"sitiado) para registrar los datos, para mejorar la calidad de la imagen "
-"cuando se ve en sistemas de TV. Cuando este campo no existe, el lector "
-"deberá asumir el predeterminado TIFF. En caso que Y:Cb:Cr = 4:2:0, se "
-"recomienda el predeterminado TIFF (centrado). Si el lector no tiene la "
-"capacidad de soportar ambos tipos de <YCbCrPositioning>, debería seguir el "
-"predeterminado TIFF sin importar el valor de este campo. Es preferible que "
-"los lectores puedan soportar el posicionamiento centrado y co-sitiado."
+"luminancia. Este campo se designa sólo para JPG comprimidos o datos no "
+"comprimidos YCbCr. El valor predeterminado TIFF es 1 (centrado); pero cuando "
+"Y:Cb:Cr = 4:2:2 se recomienda en este estándar que se utilice 2 (co-sitiado) "
+"para registrar los datos, para mejorar la calidad de la imagen cuando se ve "
+"en sistemas de TV. Cuando este campo no existe, el lector deberá asumir el "
+"predeterminado TIFF. En caso que Y:Cb:Cr = 4:2:0, se recomienda el "
+"predeterminado TIFF (centrado). Si el lector no tiene la capacidad de "
+"soportar ambos tipos de <YCbCrPositioning>, debería seguir el predeterminado "
+"TIFF sin importar el valor de este campo. Es preferible que los lectores "
+"puedan soportar el posicionamiento centrado y co-sitiado."
 
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr "Referencia Blanco/Negro"
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -16822,42 +21354,55 @@
 "color, siendo el valor predeterminado aquel que da las características de "
 "inter-operabilidad óptimas para la imagen."
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr ""
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr ""
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 #, fuzzy
 msgid "Windows Rating"
 msgstr "acción"
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr ""
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
+#, fuzzy
 msgid "Windows Rating Percent"
-msgstr ""
+msgstr "acción"
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr ""
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+#, fuzzy
+msgid "Image ID"
+msgstr "ID único de imagen"
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr ""
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 #, fuzzy
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
@@ -16865,14 +21410,10 @@
 "methods"
 msgstr ""
 "Indica el patrón geométrico de la matriz de filtro de color (CFA) del sensor "
-"de imagen cuando se utiliza un sensor de área color de un chip. No aplica a "
-"todos los métodos de sensado."
+"de imagen cuando se utiliza un sensor de área color de un chip. No se aplica "
+"a todos los métodos de sensado."
 
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr "Nivel de la batería"
-
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 #, fuzzy
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
@@ -16908,32 +21449,32 @@
 "código de terminación NULL, luego se da el copyright del editor (vea el "
 "ejemplo 3). Cuando el campo se deja en blanco, se trata como desconocido."
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 #, fuzzy
 msgid "Exposure time, given in seconds."
 msgstr "Tiempo de exposición, dado en segundos (seg)."
 
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
 msgid "The F number."
 msgstr "El número F."
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr ""
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr ""
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr ""
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr ""
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
@@ -16943,17 +21484,18 @@
 "estructura que la del IFD especificado en TIFF. Sin embargo, por lo común, "
 "no contiene datos de imagen como en el caso de TIFF."
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
+#, fuzzy
 msgid "Inter Color Profile"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
 msgstr ""
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -16961,13 +21503,13 @@
 "La clase de programa utilizado por la cámara para ajustar la exposición "
 "cuando se toma la foto."
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
 #, fuzzy
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
 msgstr ""
 "Indica el tipo de sensor de imagen en la cámara o dispositivo de entrada."
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
@@ -16975,11 +21517,11 @@
 "Un puntero al GPS Info IFD. La estructura de inter-operabilidad del GPS Info "
 "IFD, como la del IFD Exif, no tiene datos de imagen."
 
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
 msgid "ISO Speed Ratings"
 msgstr "Velocidad ISO"
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -16987,7 +21529,7 @@
 "Indica la velocidad ISO y la latitud ISO de la cámara o dispositivo de "
 "entrada como se especifica en ISO 12232."
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 #, fuzzy
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
@@ -16997,21 +21539,21 @@
 "14524. <OECF> es la relación entre la entrada óptica de la cámara y los "
 "valores de la imagen."
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Interlace"
 msgstr "centrado"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 msgid "Indicates the field number of multifield images."
 msgstr ""
 
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 #, fuzzy
 msgid "Time Zone Offset"
 msgstr "Desplazamiento de tira"
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -17019,27 +21561,27 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 #, fuzzy
 msgid "Self Timer Mode"
 msgstr "Centímetro"
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "Date Time Original"
 msgstr "Fecha y Hora (original)"
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "The date and time when the original image data was generated."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 #, fuzzy
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
@@ -17047,77 +21589,77 @@
 "utilizado para una imagen comprimida está indicado en unidades de bits por "
 "pixel."
 
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 #, fuzzy
 msgid "Shutter speed."
 msgstr "Velocidad del obturador"
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
 #, fuzzy
 msgid "The lens aperture."
 msgstr "apertura"
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 #, fuzzy
 msgid "The value of brightness."
 msgstr "El número F."
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 #, fuzzy
 msgid "The exposure bias."
 msgstr "Ajuste de exposición"
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
 #, fuzzy
 msgid "Max Aperture Value"
 msgstr "apertura"
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 #, fuzzy
 msgid "The smallest F number of the lens."
 msgstr "El tipo de fuente de luz."
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr "La distancia al sujeto, dada en metros."
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
 msgid "The metering mode."
 msgstr "El modo de la métrica."
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr "El tipo de fuente de luz."
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 #, fuzzy
 msgid "Indicates the status of flash when the image was shot."
 msgstr ""
 "Esta etiqueta indica el modo de balance de blanco ajustado cuando se tomó la "
 "imagen."
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 msgid "The actual focal length of the lens, in mm."
 msgstr ""
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 msgid "Amount of flash energy (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 #, fuzzy
 msgid "Noise"
 msgstr "No definido"
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr ""
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
@@ -17126,7 +21668,7 @@
 "La cantidad de pixels por <ResolutionUnit> en la dirección <ImageLength>. Se "
 "utiliza el mismo valor que <XResolution>."
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
@@ -17135,34 +21677,29 @@
 "La cantidad de pixels por <ResolutionUnit> en la dirección <ImageLength>. Se "
 "utiliza el mismo valor que <XResolution>."
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
 "FocalPlaneYResolution(37391)."
 msgstr ""
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security Classification"
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security classification assigned to the image."
 msgstr ""
 
-#: src/tags.cpp:655
-#, fuzzy
-msgid "Image History"
-msgstr "Longitud de la imagen"
-
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 #, fuzzy
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
@@ -17170,96 +21707,100 @@
 "Esta etiqueta indica la ubicación y el área del sujeto principal en la "
 "escena general."
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 #, fuzzy
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 "Indica el índice de exposición seleccionado en la cámara o dispositivo de "
 "entrada en el momento que se captura la imagen."
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
+#, fuzzy
 msgid "TIFF/EP Standard ID"
-msgstr ""
+msgstr "Estándar"
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
 msgstr ""
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
+#, fuzzy
 msgid "Type of image sensor."
-msgstr ""
+msgstr "Longitud de la imagen"
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
+#, fuzzy
 msgid "Windows Title"
-msgstr ""
+msgstr "acción"
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
 #, fuzzy
 msgid "Windows Comment"
 msgstr "Comentario del usuario"
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 #, fuzzy
 msgid "Windows Author"
 msgstr "acción"
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
+#, fuzzy
 msgid "Windows Keywords"
-msgstr ""
+msgstr "acción"
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 #, fuzzy
 msgid "Windows Subject"
 msgstr "Área del sujeto"
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
 msgid "Subject tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
 msgid "Print Image Matching"
 msgstr ""
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
+#: src/tags.cpp:866
+msgid "Print Image Matching, description needed."
 msgstr ""
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
 #, fuzzy
 msgid "DNG version"
 msgstr "Versión Exif"
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
 "1, 1, 0, 0."
 msgstr ""
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
 #, fuzzy
 msgid "DNG backward version"
 msgstr "Versión Exif"
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -17269,12 +21810,12 @@
 "values, to verify it is able to correctly read the file."
 msgstr ""
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
 #, fuzzy
 msgid "Unique Camera Model"
 msgstr "Retrato"
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -17284,37 +21825,37 @@
 "replacement profiles."
 msgstr ""
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
 #, fuzzy
 msgid "Localized Camera Model"
 msgstr "Retrato"
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
 msgstr ""
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
 #, fuzzy
 msgid "CFA Plane Color"
 msgstr "Patrón CFA"
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr ""
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr ""
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -17323,16 +21864,16 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
 #, fuzzy
 msgid "Black Level Repeat Dim"
 msgstr "Nivel de la batería"
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -17340,12 +21881,12 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 #, fuzzy
 msgid "Black Level Delta H"
 msgstr "Nivel de la batería"
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -17354,12 +21895,12 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 #, fuzzy
 msgid "Black Level Delta V"
 msgstr "Nivel de la batería"
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -17367,23 +21908,24 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
 #, fuzzy
 msgid "White Level"
 msgstr "Nivel de la batería"
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
+#, fuzzy
 msgid "Default Scale"
-msgstr ""
+msgstr "Contraste"
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -17393,11 +21935,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr ""
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -17406,11 +21948,12 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
+#, fuzzy
 msgid "Default Crop Size"
-msgstr ""
+msgstr "Contraste"
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -17418,12 +21961,12 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 #, fuzzy
 msgid "Color Matrix 1"
 msgstr "Espacio de color"
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -17431,24 +21974,24 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 #, fuzzy
 msgid "Color Matrix 2"
 msgstr "Espacio de color"
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 #, fuzzy
 msgid "Camera Calibration 1"
 msgstr "Contraste"
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -17459,11 +22002,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
+#, fuzzy
 msgid "Camera Calibration 2"
-msgstr ""
+msgstr "Contraste"
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -17474,11 +22018,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
+#, fuzzy
 msgid "Reduction Matrix 1"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -17486,11 +22031,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
+#, fuzzy
 msgid "Reduction Matrix 2"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -17498,12 +22044,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
 #, fuzzy
 msgid "Analog Balance"
 msgstr "Espacio de color"
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -17514,35 +22060,35 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
 #, fuzzy
 msgid "As Shot Neutral"
 msgstr "Manual"
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 msgid "As Shot White XY"
 msgstr ""
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
 #, fuzzy
 msgid "Baseline Exposure"
 msgstr "Modo de exposición"
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -17557,11 +22103,12 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
+#, fuzzy
 msgid "Baseline Noise"
-msgstr ""
+msgstr "Modo de exposición"
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -17570,12 +22117,12 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
 #, fuzzy
 msgid "Baseline Sharpness"
 msgstr "Nitidez"
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -17583,11 +22130,11 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 msgid "Bayer Green Split"
 msgstr ""
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -17597,11 +22144,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr ""
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -17611,28 +22158,28 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
 "that captured the image."
 msgstr ""
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
 #, fuzzy
 msgid "Lens Info"
 msgstr "Ancho de la imagen"
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
 "f-stops are unknown, they should be encoded as 0/0."
 msgstr ""
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr ""
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -17643,12 +22190,12 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
 #, fuzzy
 msgid "Anti Alias Strength"
 msgstr "Contraste"
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -17657,34 +22204,34 @@
 "artifacts)."
 msgstr ""
 
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 #, fuzzy
 msgid "Shadow Scale"
-msgstr "Sombra"
+msgstr "Escala de Sombra"
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
 msgstr ""
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 msgid "DNG Private Data"
-msgstr ""
+msgstr "Datos privados DNG"
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
 "programs that edit DNG files."
 msgstr ""
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
 #, fuzzy
 msgid "MakerNote Safety"
 msgstr "Nota del fabricante"
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -17693,22 +22240,23 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr ""
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
+#, fuzzy
 msgid "Calibration Illuminant 2"
-msgstr ""
+msgstr "El flash disparó, modo de reducción de ojos rojos."
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -17717,11 +22265,12 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
+#, fuzzy
 msgid "Best Quality Scale"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -17730,12 +22279,12 @@
 "need to be multiplied to achieve the best quality image size."
 msgstr ""
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 #, fuzzy
 msgid "Raw Data Unique ID"
 msgstr "ID único de imagen"
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -17745,22 +22294,23 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 #, fuzzy
 msgid "Original Raw File Name"
 msgstr "Nombre del documento"
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
+#, fuzzy
 msgid "Original Raw File Data"
-msgstr ""
+msgstr "Nombre del documento"
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -17773,23 +22323,23 @@
 "data blocks."
 msgstr ""
 
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 #, fuzzy
 msgid "Active Area"
 msgstr "Área del sujeto"
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
 msgstr ""
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 #, fuzzy
 msgid "Masked Areas"
 msgstr "Duro"
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -17799,11 +22349,12 @@
 "masked pixels are no longer useful."
 msgstr ""
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
+#, fuzzy
 msgid "As-Shot ICC Profile"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -17816,11 +22367,11 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
 msgid "As-Shot Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -17832,12 +22383,12 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 #, fuzzy
 msgid "Current ICC Profile"
 msgstr "Espacio de color"
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17845,11 +22396,12 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
+#, fuzzy
 msgid "Current Pre-Profile Matrix"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17857,202 +22409,199 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
 #, fuzzy
 msgid "Unknown IFD tag"
 msgstr "Desconocido"
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr "No definido"
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 #, fuzzy
 msgid "Creative program"
 msgstr "creativo"
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 #, fuzzy
 msgid "Action program"
 msgstr "normal"
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
 #, fuzzy
 msgid "Portrait mode"
-msgstr "Retrato"
+msgstr "Modo Retrato"
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
 #, fuzzy
 msgid "Landscape mode"
-msgstr "Paisaje"
+msgstr "Modo Paisaje"
 
-#: src/tags.cpp:1051
-#, fuzzy
-msgid "Center weighted average"
-msgstr "Promedio Ponderado en el Centro"
-
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 #, fuzzy
 msgid "Multi-spot"
 msgstr "multi-lugar"
 
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 #, fuzzy
 msgid "Tungsten (incandescent light)"
 msgstr "Tungsteno (luz incandescente)"
 
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
-msgstr "Tiempo bueno"
+msgstr "Buen Tiempo"
 
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
 msgid "Cloudy weather"
 msgstr "Tiempo nublado"
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 #, fuzzy
 msgid "Daylight fluorescent (D 5700 - 7100K)"
-msgstr "Luz de día fluorescente"
+msgstr "Luz de día fluorescente (D 5700 - 7100K)"
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
 #, fuzzy
 msgid "Day white fluorescent (N 4600 - 5400K)"
-msgstr "Día blanco fluorescente"
+msgstr "Día blanco fluorescente (N 4600 - 5400K)"
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
 #, fuzzy
 msgid "Cool white fluorescent (W 3900 - 4500K)"
-msgstr "Blanco frío fluorescente"
+msgstr "Blanco frío fluorescente (W 3900 - 4500K)"
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
 #, fuzzy
 msgid "White fluorescent (WW 3200 - 3700K)"
-msgstr "Blanco fluorescente"
+msgstr "Blanco fluorescente (WW 3200 - 3700K)"
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr "Luz estándar A"
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr "Luz estándar B"
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr "Luz estándar C"
 
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr "D55"
 
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr "D65"
 
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr "D75"
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 #, fuzzy
 msgid "D50"
 msgstr "D75"
 
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
 msgid "ISO studio tungsten"
 msgstr "tungsteno de estudio ISO"
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 #, fuzzy
 msgid "Other light source"
 msgstr "El tipo de fuente de luz."
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr "Descalibrado"
 
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 #, fuzzy
 msgid "One-chip color area"
 msgstr "Sensor de área de color de un chip"
 
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 #, fuzzy
 msgid "Two-chip color area"
 msgstr "Sensor de área de color de dos chips"
 
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 #, fuzzy
 msgid "Three-chip color area"
 msgstr "Sensor de área de color de tres chips"
 
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 #, fuzzy
 msgid "Color sequential area"
 msgstr "Sensor de área de color secuencial"
 
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr "Sensor tri-lineal"
 
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 #, fuzzy
 msgid "Color sequential linear"
 msgstr "Sensor lineal secuencial de color"
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
+#, fuzzy
 msgid "Film scanner"
-msgstr ""
+msgstr "Escáner de película"
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr ""
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
+#, fuzzy
 msgid "Digital still camera"
-msgstr ""
+msgstr "Relación de zoom digital"
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr ""
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
 msgid "Normal process"
 msgstr "Proceso normal"
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
 msgid "Custom process"
 msgstr "Proceso personalizado"
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr "Ganancia baja alta"
 
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr "Ganancia alta alta"
 
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
 msgid "Low gain down"
 msgstr "Ganancia baja baja"
 
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr "Ganancia alta baja"
 
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr "Vista cercana"
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr "Vista distante"
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Tiempo de exposición, dado en segundos (seg)."
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 #, fuzzy
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
@@ -18063,11 +22612,11 @@
 "valor de la etiqueta es una cadena de caracteres ASCII compatible con el "
 "estándar desarrollado por el ASTM Tecnical committee."
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr ""
 
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -18077,19 +22626,19 @@
 "14524. <OECF> es la relación entre la entrada óptica de la cámara y los "
 "valores de la imagen."
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
-"La versión soportada de este estándar. Si este campo no existe se toma como "
-"que significa que no se cumple con el estándar."
+"La versión soportada de este estándar. Si este campo no existe se interpreta "
+"que no se cumple con el estándar."
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
 msgid "Date and Time (original)"
 msgstr "Fecha y Hora (original)"
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
@@ -18097,17 +22646,17 @@
 "La fecha y hora cuando se generaron los datos originales de la imagen. Para "
 "una cámara digital se registra la fecha y la hora en la que se tomó la foto."
 
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
 msgid "Date and Time (digitized)"
 msgstr "Fecha y Hora (digitalizado)"
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 #, fuzzy
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 "La fehca y hora cuando se almacenó la imagen en forma de datos digitales."
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -18120,15 +22669,15 @@
 "componente se arreglan en orden desde el 1er componente al 4to. Para datos "
 "no comprimidos el arreglo de los datos se da en la etiqueta "
 "<PhometricInterpretation>. Sin embargo, debido a que dicha etiqueta sólo "
-"puede expresar el orden de Y, Cb y Cr, esta etiqueta se da para los casos en "
-"los que los datos comprimidos usan componentes que no son Y, Cb y Cr y para "
+"puede expresar el orden de Y, Cb y Cr, se proporciona para los casos en los "
+"que los datos comprimidos usan componentes que no son Y, Cb y Cr y para "
 "permitir el soporte de otras secuencias."
 
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr "Bits comprimidos por pixel"
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -18137,7 +22686,7 @@
 "utilizado para una imagen comprimida está indicado en unidades de bits por "
 "pixel."
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 #, fuzzy
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
@@ -18146,11 +22695,11 @@
 "Velocidad del obturador. La unidad es el ajuste APEX (Sistema aditivo de "
 "exposición fotográfica) (vea el Apéndice C)."
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "La apertura de la lente. La unidad es el valor APEX."
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -18158,11 +22707,11 @@
 "El valor del brillo. La unidad es el valor APEX. Por lo general, se da en el "
 "rango de -99,99 a 99,99."
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr "Ajuste de exposición"
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -18170,7 +22719,7 @@
 "El ajuste de exposición. La unidad es el valor APEX. Por lo general, se da "
 "en el rango -99,99 a 99,99."
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
@@ -18179,14 +22728,14 @@
 "general, se da en el rango de 00,00 a 99,99 pero no está limitado a dicho "
 "rango."
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "Esta etiqueta se registra cuando se toma una imagen usando una luz "
 "estrosboscópica (flash)."
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -18194,19 +22743,19 @@
 "La distancia focal real de la lente, en mm. No se realiza la conversión a la "
 "distancia focal de una máquina de película de 35 mm."
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
-"Esta etiqueta indica la ubicación y el área del sujeto principal en la "
-"escena general."
+"Esta etiqueta indica la ubicación y área del sujeto principal en la escena "
+"general."
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
 msgid "Maker Note"
 msgstr "Nota del fabricante"
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -18214,57 +22763,58 @@
 "Una etiqueta para que los fabricantes o escritores Exif registren cualquier "
 "información deseada. El contenido queda a cargo del fabricante."
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
+#, fuzzy
 msgid "Sub-seconds Time"
-msgstr ""
+msgstr "Fecha y Hora (original)"
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 "Una etiqueta utilizada para registrar fracciones de segundo para la etiqueta "
 "<DateTime>."
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 #, fuzzy
 msgid "Sub-seconds Time Original"
 msgstr "Fecha y Hora (original)"
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Una etiqueta utilizada para registrar fracciones de segundo para la etiqueta "
 "<DateTimeOriginal>."
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 #, fuzzy
 msgid "Sub-seconds Time Digitized"
 msgstr "Fecha y Hora (digitalizado)"
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Una etiqueta utilizada para registrar fracciones de segundo para la etiqueta "
 "<DateTimeDigitized>."
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
 #, fuzzy
 msgid "FlashPix Version"
 msgstr "Flash"
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "La versión del formato FlashPix soportada por un archivo FPXR."
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 #, fuzzy
 msgid ""
 "The color space information tag is always recorded as the color space "
@@ -18281,7 +22831,7 @@
 "registrados como no calibrados pueden tratarse como sRGB cuando se convierte "
 "a FlashPix. Vea el Apéndice E sobre sRGB."
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 #, fuzzy
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
@@ -18295,7 +22845,7 @@
 "reinicio. Esta etiqueta no debería existir en un archivo no comprimido. Vea "
 "la sección 2.8.1 y el Apéndice F para más detalles."
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 #, fuzzy
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
@@ -18314,19 +22864,20 @@
 "registradas en esta etiqueta válida de altura de imagen será, de hecho, la "
 "misma que la registrada en el SOF."
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
 "name and extension (an ASCII string consisting of 8 characters + '.' + 3 "
 "characters). The path is not recorded."
 msgstr ""
+"Se usa para guardar el nombre del archivo de audio relativo a la imágen "
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -18341,7 +22892,7 @@
 "TIFF, pero no contiene los datos de imagen característicos del IFD normal de "
 "TIFF."
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -18349,7 +22900,7 @@
 "Indica la energía del flash en el momento que se captura la imagen, medida "
 "en Beam Candle Power Seconds (BCPS)."
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
@@ -18359,12 +22910,12 @@
 "dispositivo de entrada y los valores SFR en las direcciones de ancho, alto y "
 "diagonal de la imagen, como se especifica en ISO 12233."
 
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 #, fuzzy
 msgid "Focal Plane X-Resolution"
 msgstr "Resolución X del plano focal"
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -18372,12 +22923,12 @@
 "Indica la cantidad de pixels en la dirección del ancho (X) de la imagen por "
 "<FocalPlaneResolutionUnit> del plano focal de la cámara."
 
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 #, fuzzy
 msgid "Focal Plane Y-Resolution"
 msgstr "Resolución X del plano focal"
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -18385,7 +22936,7 @@
 "Indica la cantidad de pixels en la dirección del alto (Y) de la imagen por "
 "<FocalPlaneResolutionUnit> del plano focal de la cámara."
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -18393,7 +22944,7 @@
 "Indica la unidad para medir <FocalPlaneXResolution> e "
 "<FocalPlaneYResolution>. Este valor es el mismo que <ResolutionUnit>."
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -18406,11 +22957,11 @@
 "<Rotation>. El primer valor indica el número de columna X y el segundo el "
 "número de fila Y."
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
 msgid "Exposure index"
 msgstr "Índice de exposición"
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -18418,12 +22969,12 @@
 "Indica el índice de exposición seleccionado en la cámara o dispositivo de "
 "entrada en el momento que se captura la imagen."
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 "Indica el tipo de sensor de imagen en la cámara o dispositivo de entrada."
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -18432,7 +22983,7 @@
 "de esta etiqueta siempre debe ser 3, indicando que la imagen se registró en "
 "un DSC."
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
@@ -18441,21 +22992,22 @@
 "esta etiqueta siempre debe ser 1, indicando que la imagen se registró en un "
 "DSC."
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
+#, fuzzy
 msgid "Color Filter Array Pattern"
-msgstr ""
+msgstr "Espacio de color"
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods."
 msgstr ""
 "Indica el patrón geométrico de la matriz de filtro de color (CFA) del sensor "
-"de imagen cuando se utiliza un sensor de área color de un chip. No aplica a "
-"todos los métodos de sensado."
+"de imagen cuando se utiliza un sensor de área color de un chip. No se aplica "
+"a todos los métodos de sensado."
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
@@ -18466,7 +23018,7 @@
 "procesamiento especial, se espera que el lector deshabilite o minimice el "
 "procesado siguiente."
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
@@ -18476,13 +23028,13 @@
 "imagen. En el modo auto-bracketing, la cámara toma una serie de cuadros de "
 "la misma escena con ajustes de exposición diferentes."
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
-"Esta etiqueta indica el modo de balance de blanco ajustado cuando se tomó la "
-"imagen."
+"Esta etiqueta indica el modo de balance de blanco establecido cuando se tomó "
+"la imagen."
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
@@ -18492,7 +23044,7 @@
 "Si el numerador del valor registrado es 0, esto indica que no se utilizó el "
 "zoom digital."
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 #, fuzzy
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
@@ -18503,7 +23055,7 @@
 "película de 35mm, en mm. Un valor de 0 significa que se desconoce la "
 "distancia focal. Note que esta etiqueta difiere de la etiqueta FocalLength."
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
 #, fuzzy
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
@@ -18514,12 +23066,12 @@
 "utilizar para registrar el modo en el cual se tomó la imagen. Note que esto "
 "difiere de la etiqueta SceneType."
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 "Esta etiqueta indica el grado del ajuste de ganancia general de imagen."
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -18527,7 +23079,7 @@
 "Esta etiqueta indica la dirección del procesamiento de contraste aplicado "
 "por la cámara cuando se tomó la imagen."
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -18535,7 +23087,7 @@
 "Esta etiqueta indica la dirección del procesamiento de stauración aplicado "
 "por la cámara cuando se tomó la imagen."
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -18543,7 +23095,7 @@
 "Esta etiqueta indica la dirección del procesamiento de nitidez aplicado por "
 "la cámara cuando se tomó la imagen."
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
@@ -18553,11 +23105,11 @@
 "un modelo de cámara en particular. La etiqueta sólo se usa para indicar las "
 "condiciones de toma de fotos en el lector."
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
 msgid "This tag indicates the distance to the subject."
 msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
@@ -18567,100 +23119,105 @@
 "Se registra como una cadena de caracteres ASCII equivalente a notación "
 "hexadecimal y de una longitud fija de 128 bits."
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
 #, fuzzy
 msgid "Unknown Exif tag"
 msgstr "Desconocido"
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
 #, fuzzy
 msgid "North"
 msgstr "otro"
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
 #, fuzzy
 msgid "South"
 msgstr "Lugar"
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
+#, fuzzy
 msgid "East"
-msgstr ""
+msgstr "Flash"
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
+#, fuzzy
 msgid "West"
-msgstr ""
+msgstr "Centímetro"
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr ""
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
+#, fuzzy
 msgid "Below sea level"
-msgstr ""
+msgstr "Nivel de la batería"
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
 msgid "Measurement in progress"
 msgstr ""
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
 msgid "Measurement Interoperability"
 msgstr ""
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr ""
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr ""
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
+#, fuzzy
 msgid "knots"
-msgstr ""
+msgstr "Punto blanco"
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 #, fuzzy
 msgid "True direction"
 msgstr "Descripción de la imagen"
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 #, fuzzy
 msgid "Magnetic direction"
 msgstr "Descripción de la imagen"
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 #, fuzzy
 msgid "Kilometers"
 msgstr "Orden de llenado"
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 #, fuzzy
 msgid "Miles"
 msgstr "Orden de llenado"
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 #, fuzzy
 msgid "Knots"
 msgstr "Punto blanco"
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
+#, fuzzy
 msgid "Without correction"
-msgstr ""
+msgstr "Ubicación del sujeto"
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 #, fuzzy
 msgid "Correction applied"
 msgstr "Tiempo de exposición"
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 #, fuzzy
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
@@ -18674,11 +23231,12 @@
 "<ExifVersion>. Cuando la versión es 2.0.0.0, el valor de la etiqueta es "
 "02000000.H)."
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
+#, fuzzy
 msgid "GPS Latitude Reference"
-msgstr ""
+msgstr "Referencia Blanco/Negro"
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -18686,7 +23244,7 @@
 "Indica si la latitud es Norte o Sur. El valor ASCII 'N' indica latitud "
 "Norte, y 'S' indica latitud Sur."
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 #, fuzzy
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
@@ -18695,17 +23253,18 @@
 "degrees and minutes are used and, for example, fractions of minutes are "
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
-"Indica la latitud. La latitud se expresa como tres valores RACIONALES dando "
-"los grados, minutos y segundos, respectivamente. Cuando se expresan grados, "
-"minutos y segundos, el formato es gg/1,mm/1,ss/1. Cuando se utilizan grados "
-"y minutos y, por ejemplo, se dan fracciones de minutos hasta con dos "
-"posiciones decimales, el formato es gg/1,mmmm/100,0/1."
+"Indica la latitud, expresada como tres valores RACIONALES dando los grados, "
+"minutos y segundos, respectivamente. Cuando se expresan grados, minutos y "
+"segundos, el formato es gg/1,mm/1,ss/1. Cuando se utilizan grados y minutos "
+"y, por ejemplo, se dan fracciones de minutos hasta con dos posiciones "
+"decimales, el formato es gg/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
+#, fuzzy
 msgid "GPS Longitude Reference"
-msgstr ""
+msgstr "Referencia Blanco/Negro"
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -18713,7 +23272,7 @@
 "Indica si la longitud es Este u Oeste. El valor ASCII 'E' indica longitud "
 "Este, y 'W' indica longitud Oeste."
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -18727,7 +23286,7 @@
 "grados y minutos y, por ejemplo, se dan fracciones de minutos hasta con dos "
 "posiciones decimales, el formato es gg/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -18736,20 +23295,20 @@
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
 "(atomic clock)."
 msgstr ""
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -18758,90 +23317,95 @@
 "the tag is set to NULL."
 msgstr ""
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
 "Interoperability."
 msgstr ""
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
 msgstr ""
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 msgid "GPS Data Degree of Precision"
 msgstr ""
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 msgstr ""
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
+#, fuzzy
 msgid "Indicates the speed of GPS receiver movement."
-msgstr ""
+msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
+#, fuzzy
 msgid "GPS Track Ref"
-msgstr ""
+msgstr "Referencia Blanco/Negro"
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
+"Indica la dirección de la imágen cuando fue capturada. El rango de valores "
+"va de 0.00 a 359.99."
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
+#, fuzzy
 msgid "GPS Destination Latitude Refeference"
-msgstr ""
+msgstr "Distancia del sujeto"
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 #, fuzzy
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
 "latitude. The ASCII value \"N\" indicates north latitude, and \"S\" is south "
 "latitude."
 msgstr ""
-"Indica si la latitud es Norte o Sur. El valor ASCII 'N' indica latitud "
-"Norte, y 'S' indica latitud Sur."
+"Indica si la latitud del punto de destino es Norte o Sur. El valor ASCII 'N' "
+"indica latitud Norte, y 'S' indica latitud Sur."
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 #, fuzzy
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
@@ -18851,17 +23415,18 @@
 "and, for example, fractions of minutes are given up to two decimal places, "
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
-"Indica la latitud. La latitud se expresa como tres valores RACIONALES dando "
+"Indica la latitud del destino, expresada como tres valores RACIONALES dando "
 "los grados, minutos y segundos, respectivamente. Cuando se expresan grados, "
 "minutos y segundos, el formato es gg/1,mm/1,ss/1. Cuando se utilizan grados "
 "y minutos y, por ejemplo, se dan fracciones de minutos hasta con dos "
 "posiciones decimales, el formato es gg/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
+#, fuzzy
 msgid "GPS Destination Longitude Reference"
-msgstr ""
+msgstr "Distancia del sujeto"
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 #, fuzzy
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
@@ -18870,7 +23435,7 @@
 "Indica si la longitud es Este u Oeste. El valor ASCII 'E' indica longitud "
 "Este, y 'W' indica longitud Oeste."
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 #, fuzzy
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
@@ -18886,168 +23451,195 @@
 "grados y minutos y, por ejemplo, se dan fracciones de minutos hasta con dos "
 "posiciones decimales, el formato es gg/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
+#, fuzzy
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
-msgstr ""
+msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
+#, fuzzy
 msgid "GPS Destination Distance Reference"
-msgstr ""
+msgstr "Distancia del sujeto"
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
 msgstr ""
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
 #, fuzzy
 msgid "Indicates the distance to the destination point."
 msgstr "Esta etiqueta indica la distancia al sujeto."
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
 "followed by the name of the method."
 msgstr ""
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
 "GPS area."
 msgstr ""
+"Una cadena de caracteres con el nombre del área GPS. El primer byte indica "
+"el código de caracteres empleado, y le sigue el nombre del área GPS."
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
+#, fuzzy
 msgid "GPS Date Stamp"
-msgstr ""
+msgstr "Fecha y hora"
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
 msgstr ""
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
+#, fuzzy
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
+"Esta etiqueta indica la dirección del procesamiento de stauración aplicado "
+"por la cámara cuando se tomó la imagen."
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 #, fuzzy
 msgid "Unknown GPSInfo tag"
 msgstr "Desconocido"
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
+#, fuzzy
 msgid "Interoperability Index"
-msgstr ""
+msgstr "Versión Exif"
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
 "(NULL). see the separate volume of Recommended Exif Interoperability Rules "
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
-"Indica la identificación de la regla de inter-operatibilidad. Utilice \"R98"
-"\" para indicar reglas ExifR98. Se utilizan cuatro bytes incluyendo el "
+"Indica la identificación de la regla de inter-operatibilidad. Utilice "
+"\"R98\" para indicar reglas ExifR98. Se utilizan cuatro bytes incluyendo el "
 "código de terminación (NULL). Vea el volumen separado de Recommended Exif "
 "Interoperatibility Rules (ExifR98) para otras etiquetas usadas en ExifR98."
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
+#, fuzzy
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Versión Exif"
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr ""
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
+#, fuzzy
 msgid "Related Image File Format"
-msgstr ""
+msgstr "Ancho de la imagen"
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
 msgid "File format of image file"
 msgstr ""
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 #, fuzzy
 msgid "Related Image Width"
 msgstr "Ancho de la imagen"
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 #, fuzzy
 msgid "Related Image Length"
 msgstr "Longitud de la imagen"
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 #, fuzzy
 msgid "Unknown Exif Interoperability tag"
 msgstr "Versión Exif"
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
 #, fuzzy
 msgid "Offset"
 msgstr "Suave"
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr ""
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 #, fuzzy
 msgid "Byte Order"
 msgstr "Orden de llenado"
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
 msgstr ""
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 #, fuzzy
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr "Versión Exif"
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
 #, fuzzy
 msgid "Unknown tag"
 msgstr "Desconocido"
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 #, fuzzy
 msgid "Digital zoom not used"
 msgstr "Relación de zoom digital"
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 msgid "TIFF header, offset"
 msgstr ""
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr ""
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Color balance settings 1"
-#~ msgstr "Espacio de color"
+#~ msgid "Software firmware version"
+#~ msgstr "Versión Exif"
 
 #, fuzzy
-#~ msgid "Compression Curve"
-#~ msgstr "Compresión"
+#~ msgid "White Balance Bracketing "
+#~ msgstr "Balance de blanco"
+
+#, fuzzy
+#~ msgid "(Unknown Error)"
+#~ msgstr "Desconocido"
+
+#, fuzzy
+#~ msgid "Exposure Speed"
+#~ msgstr "Modo de exposición"
+
+#, fuzzy
+#~ msgid "Exposure speed"
+#~ msgstr "Modo de exposición"
+
+#, fuzzy
+#~ msgid "Color balance settings 1"
+#~ msgstr "Espacio de color"
 
 #, fuzzy
 #~ msgid "Compression curve"
@@ -19062,10 +23654,6 @@
 #~ msgstr "Balance de blanco"
 
 #, fuzzy
-#~ msgid "Spot Mode"
-#~ msgstr "Modo de métrica"
-
-#, fuzzy
 #~ msgid "ImageStabilizer"
 #~ msgstr "Orientación"
 
@@ -19090,10 +23678,6 @@
 #~ msgstr "Nota del fabricante"
 
 #, fuzzy
-#~ msgid "element"
-#~ msgstr "multi-lugar"
-
-#, fuzzy
 #~ msgid "NEF Thumbnail Size"
 #~ msgstr "Desplazamiento de tira"
 
@@ -19151,14 +23735,6 @@
 #~ msgstr "DSC"
 
 #, fuzzy
-#~ msgid "Manual exposure"
-#~ msgstr "Exposición manual"
-
-#, fuzzy
-#~ msgid "Auto white balance"
-#~ msgstr "Balance de blanco manual"
-
-#, fuzzy
 #~ msgid "Date Time"
 #~ msgstr "Fecha y hora"
 
@@ -19168,7 +23744,7 @@
 
 #, fuzzy
 #~ msgid "scene"
-#~ msgstr "Centímetro"
+#~ msgstr "escenario"
 
 #, fuzzy
 #~ msgid "artist"
@@ -19179,10 +23755,6 @@
 #~ msgstr "Copyright"
 
 #, fuzzy
-#~ msgid "releaseDate"
-#~ msgstr "Tipo de captura de escena"
-
-#, fuzzy
 #~ msgid "CenterWeightedAverage"
 #~ msgstr "Promedio Ponderado en el Centro"
 
@@ -19191,14 +23763,6 @@
 #~ msgstr "Multi Lugar"
 
 #, fuzzy
-#~ msgid "Preview Informations"
-#~ msgstr "Orientación"
-
-#, fuzzy
-#~ msgid "White balance fine tune"
-#~ msgstr "Balance de blanco"
-
-#, fuzzy
 #~ msgid "Flash exposure bracket value"
 #~ msgstr "Tiempo de exposición"
 
@@ -19210,10 +23774,6 @@
 #~ msgid "Lens adapter used"
 #~ msgstr "Espacio de color"
 
-#, fuzzy
-#~ msgid "FlashMode"
-#~ msgstr "Flash"
-
 #~ msgid "Invalid format '%s', expected '%s'."
 #~ msgstr "Formato no válido '%s', se esperaba '%s'."
 
@@ -19288,9 +23848,6 @@
 #~ msgid "Flash did not fire."
 #~ msgstr "El flash no disparó."
 
-#~ msgid "Flash fired."
-#~ msgstr "El flash disparó."
-
 #, fuzzy
 #~ msgid "W/o strobe"
 #~ msgstr "sin estrosboscópica"
@@ -19301,7 +23858,7 @@
 
 #, fuzzy
 #~ msgid "Flash fired, compulsatory flash mode"
-#~ msgstr "El flash no disparó, modo compulsivo del flash."
+#~ msgstr "Flash disparado, modo compulsivo del flash."
 
 #, fuzzy
 #~ msgid "Flash did not fire, compulsatory flash mode."
@@ -19310,9 +23867,6 @@
 #~ msgid "Flash did not fire, auto mode."
 #~ msgstr "El flash no disparó, modo automático."
 
-#~ msgid "Flash fired, auto mode."
-#~ msgstr "El flash disparó, modo automático."
-
 #~ msgid "Flash fired, auto mode, return light not detected."
 #~ msgstr "El flash disparó, modo automático, luz de retorno no detectada."
 
@@ -19361,9 +23915,6 @@
 #~ msgid "Y"
 #~ msgstr "Y"
 
-#~ msgid "Cb"
-#~ msgstr "Cb"
-
 #~ msgid "Cr"
 #~ msgstr "Cr"
 
@@ -19396,16 +23947,9 @@
 #~ msgstr "Cantidad de componentes inesperada (%li, esperados 2, 3, o 4)."
 
 #, fuzzy
-#~ msgid "Short"
-#~ msgstr "Lugar"
-
-#, fuzzy
 #~ msgid "SShort"
 #~ msgstr "Lugar"
 
-#~ msgid "Undefined"
-#~ msgstr "Indefinido"
-
 #~ msgid ""
 #~ "A tag for Exif users to write keywords or comments on the image besides "
 #~ "those in <ImageDescription>, and without the character code limitations "
@@ -19453,7 +23997,7 @@
 #~ "data. The only relational information recorded here is the Exif audio "
 #~ "file name and extension (an ASCII string consisting of 8 characters + '.' "
 #~ "+ 3 characters). The path is not recorded. Stipulations on audio are "
-#~ "given in  section 3.6.3. File naming conventions are given in section "
+#~ "given in section 3.6.3. File naming conventions are given in section "
 #~ "3.7.1. When using this tag, audio files must be recorded in conformance "
 #~ "to the Exif audio format. Writers are also allowed to store the data such "
 #~ "as Audio within APP2 as FlashPix extension stream data. Audio files must "
@@ -19475,43 +24019,39 @@
 #~ "audio file end."
 #~ msgstr ""
 #~ "Esta etiqueta se utiliza para registrar el nombre de un archivo de audio "
-#~ "relacionado a los datos de imagen. La única información relacional "
-#~ "registrada aquí es el nombre y la extensión del archivo de audio Exif "
-#~ "(una cadena de caracteres ASCII que consiste en 8 caracteres, un '.' y 3 "
-#~ "caracteres más). No se registra la ruta. Las estipulaciones acerca del "
-#~ "audio se dan en la sección 3.6.3. Las convenciones para los nombres de "
-#~ "archivo se dan en la sección 3.7.1. Cuando se usa esta etiqueta, los "
-#~ "archivos de audio se deben grabar en conformidad con el formato de audio "
-#~ "Exif. También se permite a los escritores almacenar los datos tales como "
-#~ "Audio dentro de APP2 como un flujo de datos de extensión de FlashPix. Los "
-#~ "archivos de audio se deben grabar en conformidad con el formato de audio "
-#~ "Exif. El mapeo de archivos de imagen y archivos de audio Exif se realiza "
-#~ "en cualquiera de las tres maneras que se muestran en la Tabla 8. Si "
-#~ "múltiples archivos mapean a uno solo como en [2] o [3] de la tabla, el "
-#~ "formato anterior se usa para registrar sólo un nombre de archivo de "
-#~ "audio. Si hay múltiples archivos de audio, se da el primero grabado. En "
-#~ "el caso de [3] en la Tabla 8, por ejemplo, para el archivo de imagen Exif "
-#~ "\"DSC00001.JPG\" sólo se da \"SND00001.WAV\" como el archivo de audio "
-#~ "Exif relacionado. Cuando hay tres archivos de audio Exif, \"SND00001.WAV"
-#~ "\", \"SND00002.WAV\" y \"SND00003.WAV\", se indica el nombre de archivo "
-#~ "de imagen Exif para cada uno de ellos, \"DSC00001.JPG\". Al combinar "
-#~ "información relacional múltiple, es posible soportar una variedad de "
-#~ "posibilidades de reproducción. El método de utilizar información "
-#~ "relacional se deja a la implementación del lado del reproductor. Dado que "
-#~ "esta información es una cadena de caracteres ASCII, la misma está "
-#~ "terminada por NULL. Cuando esta etiqueta se utiliza para mapear archivos "
-#~ "de audio, también se debe indicar al final del archivo de audio la "
-#~ "relación a los datos de la imagen."
+#~ "relacionado con la imagen. La única información relacional registrada "
+#~ "aquí es el nombre y la extensión del archivo de audio Exif (una cadena de "
+#~ "caracteres ASCII que consiste en 8 caracteres, un '.' y 3 caracteres "
+#~ "más). No se registra la ruta. Las estipulaciones acerca del audio se dan "
+#~ "en la sección 3.6.3 y las convenciones para los nombres de archivo en la "
+#~ "sección 3.7.1. Cuando se usa esta etiqueta, los archivosde audio se deben "
+#~ "grabar en conformidad con el formato de audio Exif. También se permite a "
+#~ "los escritores almacenar los datos tales como Audio dentro de APP2 como "
+#~ "un flujo de datos de extensión de FlashPix. Los archivos de audio se "
+#~ "deben grabar en conformidad con el formato de audio Exif. El mapeo de "
+#~ "archivos de imagen y archivos de audio Exif se realiza en cualquiera de "
+#~ "las tres maneras que se muestran en la Tabla 8. Si múltiples archivos "
+#~ "mapean a uno solo como en [2] o [3] de la tabla, el formato anterior se "
+#~ "usa para registrar sólo un nombre de archivo de audio. Si hay múltiples "
+#~ "archivos de audio, se da el primero grabado. En el caso de [3] en la "
+#~ "Tabla 8, por ejemplo, para el archivo de imagen Exif \"DSC00001.JPG\" "
+#~ "sólo se da \"SND00001.WAV\" como el archivo de audio Exif relacionado. "
+#~ "Cuando hay tres archivos de audio Exif, \"SND00001.WAV\", \"SND00002.WAV"
+#~ "\" y \"SND00003.WAV\", se indica el nombre de archivo de imagen Exif para "
+#~ "cada uno de ellos, \"DSC00001.JPG\". Al combinar información relacional "
+#~ "múltiple, es posible soportar una variedad de posibilidades de "
+#~ "reproducción. El método de utilizar información relacional se deja a la "
+#~ "implementación del lado del reproductor. Dado que esta información es una "
+#~ "cadena de caracteres ASCII, la misma está terminada por NULL. Cuando esta "
+#~ "etiqueta se utiliza para mapear archivos de audio, también se debe "
+#~ "indicar al final del archivo de audio la relación a los datos de la "
+#~ "imagen."
 
 #, fuzzy
 #~ msgid "Flash is on Camera"
 #~ msgstr "Energía del flash"
 
 #, fuzzy
-#~ msgid "Fisheye On"
-#~ msgstr "Flash"
-
-#, fuzzy
 #~ msgid "Unknown value %hi"
 #~ msgstr "Desconocido"
 
@@ -19537,7 +24077,7 @@
 
 #, fuzzy
 #~ msgid "Converter"
-#~ msgstr "Centímetro"
+#~ msgstr "Convertidor"
 
 #, fuzzy
 #~ msgid "Night-scene"
@@ -19581,7 +24121,7 @@
 
 #, fuzzy
 #~ msgid " / Subject Distance (mm) : %u"
-#~ msgstr "Distancia del sujeto"
+#~ msgstr "Distancia al sujeto"
 
 #, fuzzy
 #~ msgid "Unknown 2"
diff -Nru exiv2-0.19/po/exiv2.pot exiv2-0.21/po/exiv2.pot
--- exiv2-0.19/po/exiv2.pot	2009-12-29 10:51:25.000000000 +0000
+++ exiv2-0.21/po/exiv2.pot	2010-11-22 15:13:38.000000000 +0000
@@ -3,2380 +3,2911 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
 msgstr ""
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 msgid "File name"
 msgstr ""
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 msgid "File size"
 msgstr ""
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 msgid "Bytes"
 msgstr ""
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 msgid "MIME type"
 msgstr ""
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 msgid "Image size"
 msgstr ""
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
 msgstr ""
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 msgid "Camera make"
 msgstr ""
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 msgid "Camera model"
 msgstr ""
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 msgid "Image timestamp"
 msgstr ""
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 msgid "Image number"
 msgstr ""
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 msgid "Exposure time"
 msgstr ""
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr ""
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 msgid "Exposure bias"
 msgstr ""
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr ""
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 msgid "Flash bias"
 msgstr ""
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 msgid "Focal length"
 msgstr ""
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 msgid "35 mm equivalent"
 msgstr ""
 
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 msgid "Subject distance"
 msgstr ""
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 msgid "ISO speed"
 msgstr ""
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 msgid "Exposure mode"
 msgstr ""
 
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 msgid "Metering mode"
 msgstr ""
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 msgid "Macro mode"
 msgstr ""
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 msgid "Image quality"
 msgstr ""
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 msgid "Exif Resolution"
 msgstr ""
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 msgid "White balance"
 msgstr ""
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
 msgstr ""
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr ""
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr ""
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
 msgstr ""
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 msgid "No IPTC data found in the file\n"
 msgstr ""
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 msgid "No XMP data found in the file\n"
 msgstr ""
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
 msgstr ""
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 msgid "JPEG comment"
 msgstr ""
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 msgid "Preview"
 msgstr ""
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
 msgstr ""
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 msgid "bytes"
 msgstr ""
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 msgid "Neither tag"
 msgstr ""
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 msgid "nor"
 msgstr ""
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 msgid "found in the file"
 msgstr ""
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
 msgstr ""
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
 msgstr ""
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 msgid "in the file"
 msgstr ""
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
 msgstr ""
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 msgid "Erasing thumbnail data"
 msgstr ""
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
 msgstr ""
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
 msgstr ""
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
 msgstr ""
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
 msgstr ""
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
 msgstr ""
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 msgid "Writing thumbnail"
 msgstr ""
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 msgid "to file"
 msgstr ""
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
 msgstr ""
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
 msgstr ""
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 msgid "Writing preview"
 msgstr ""
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 msgid "Setting JPEG comment"
 msgstr ""
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
 msgstr ""
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 msgid "Warning"
 msgstr ""
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 msgid "Failed to read"
 msgstr ""
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 msgid "value"
 msgstr ""
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 msgid "Set"
 msgstr ""
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr ""
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr ""
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
 msgstr ""
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
 msgstr ""
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
 msgstr ""
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
 msgstr ""
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 msgid "years"
 msgstr ""
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
 msgstr ""
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 msgid "months"
 msgstr ""
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 msgid "month"
 msgstr ""
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
 msgstr ""
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
 msgstr ""
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
 msgstr ""
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 msgid "Can't adjust timestamp by"
 msgstr ""
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 msgid "to"
 msgstr ""
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr ""
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
 msgstr ""
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1671
+msgid "No Exif user comment found"
+msgstr ""
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:1692
+msgid "Setting Exif UNICODE user comment to"
+msgstr ""
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
 msgstr ""
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
 msgstr ""
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
 msgstr ""
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
 msgstr ""
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
 msgstr ""
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr ""
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
 msgstr ""
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 msgid "File"
 msgstr ""
 
-#: src/actions.cpp:1909
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
 msgstr ""
 
-#: src/actions.cpp:1937
+#: src/actions.cpp:1970
 msgid "Renaming file to"
 msgstr ""
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
 msgstr ""
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
 msgstr ""
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
 msgstr ""
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr ""
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr ""
+
+#: src/canonmn.cpp:69
 msgid "PowerShot A30"
 msgstr ""
 
-#: src/canonmn.cpp:61
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr ""
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
 msgid "PowerShot A20"
 msgstr ""
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
 msgid "PowerShot A10"
 msgstr ""
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr ""
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 msgid "PowerShot G2"
 msgstr ""
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
 msgid "PowerShot S40"
 msgstr ""
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
 msgid "PowerShot S30"
 msgstr ""
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
 msgid "PowerShot A40"
 msgstr ""
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr ""
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
 msgid "PowerShot A100"
 msgstr ""
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr ""
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
 msgid "PowerShot A200"
 msgstr ""
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr ""
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 msgid "PowerShot G3"
 msgstr ""
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
 msgid "PowerShot S45"
 msgstr ""
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr ""
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr ""
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
 msgid "PowerShot A70"
 msgstr ""
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
 msgid "PowerShot A60"
 msgstr ""
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr ""
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 msgid "PowerShot G5"
 msgstr ""
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
 msgid "PowerShot A300"
 msgstr ""
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
 msgid "PowerShot S50"
 msgstr ""
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
 msgid "PowerShot A80"
 msgstr ""
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr ""
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
 msgid "PowerShot S1 IS"
 msgstr ""
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
 msgid "PowerShot Pro1"
 msgstr ""
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
 msgid "PowerShot S70"
 msgstr ""
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
 msgid "PowerShot S60"
 msgstr ""
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 msgid "PowerShot G6"
 msgstr ""
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr ""
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
 msgid "PowerShot A75"
 msgstr ""
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr ""
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
 msgid "PowerShot A400"
 msgstr ""
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
 msgid "PowerShot A310"
 msgstr ""
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
 msgid "PowerShot A85"
 msgstr ""
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr ""
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
 msgid "PowerShot A95"
 msgstr ""
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr ""
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr ""
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
 msgid "PowerShot A520"
 msgstr ""
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
 msgid "PowerShot A510"
 msgstr ""
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr ""
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
 msgid "PowerShot S2 IS"
 msgstr ""
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr ""
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr ""
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr ""
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr ""
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
 msgid "PowerShot A430"
 msgstr ""
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
 msgid "PowerShot A410"
 msgstr ""
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
 msgid "PowerShot S80"
 msgstr ""
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
 msgid "PowerShot A620"
 msgstr ""
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
 msgid "PowerShot A610"
 msgstr ""
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr ""
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr ""
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
 msgid "PowerShot TX1"
 msgstr ""
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr ""
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
 msgid "PowerShot A420"
 msgstr ""
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr ""
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr ""
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
 msgid "PowerShot A700"
 msgstr ""
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr ""
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
 msgid "PowerShot S3 IS"
 msgstr ""
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
 msgid "PowerShot A540"
 msgstr ""
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr ""
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 msgid "PowerShot G7"
 msgstr ""
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
 msgid "PowerShot A530"
 msgstr ""
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr ""
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr ""
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
 msgid "PowerShot A710 IS"
 msgstr ""
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
 msgid "PowerShot A640"
 msgstr ""
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
 msgid "PowerShot A630"
 msgstr ""
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
 msgid "PowerShot S5 IS"
 msgstr ""
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
 msgid "PowerShot A460"
 msgstr ""
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr ""
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
 msgid "PowerShot A570 IS"
 msgstr ""
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
 msgid "PowerShot A560"
 msgstr ""
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr ""
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr ""
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
 msgid "PowerShot A550"
 msgstr ""
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
 msgid "PowerShot A450"
 msgstr ""
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
 msgid "PowerShot Pro90 IS"
 msgstr ""
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 msgid "PowerShot G1"
 msgstr ""
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr ""
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr ""
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr ""
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr ""
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr ""
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr ""
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr ""
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr ""
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr ""
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr ""
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr ""
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr ""
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr ""
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr ""
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr ""
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr ""
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr ""
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
+#: src/canonmn.cpp:170
+msgid "EOS 7D"
+msgstr ""
+
+#: src/canonmn.cpp:171
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr ""
+
+#: src/canonmn.cpp:172
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr ""
+
+#: src/canonmn.cpp:173
+msgid "EOS 50D"
+msgstr ""
+
+#: src/canonmn.cpp:174
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr ""
+
+#: src/canonmn.cpp:175
+msgid "EOS-1D Mark IV"
+msgstr ""
+
+#: src/canonmn.cpp:180
+msgid "Format 1"
+msgstr ""
+
+#: src/canonmn.cpp:181
+msgid "Format 2"
+msgstr ""
+
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+msgid "On (1)"
+msgstr ""
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+msgid "On (2)"
+msgstr ""
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr ""
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr ""
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
 msgid "Unknown"
 msgstr ""
 
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
 msgid "Camera Settings"
 msgstr ""
 
-#: src/canonmn.cpp:166
+#: src/canonmn.cpp:200
 msgid "Various camera settings"
 msgstr ""
 
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
 msgid "Focal Length"
 msgstr ""
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
 msgid "Shot Info"
 msgstr ""
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203
 msgid "Shot information"
 msgstr ""
 
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
 msgid "Panorama"
 msgstr ""
 
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
 msgid "Image Type"
 msgstr ""
 
-#: src/canonmn.cpp:171
+#: src/canonmn.cpp:205
 msgid "Image type"
 msgstr ""
 
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware Version"
 msgstr ""
 
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware version"
 msgstr ""
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
 msgid "File Number"
 msgstr ""
 
-#: src/canonmn.cpp:173
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
 msgid "File number"
 msgstr ""
 
-#: src/canonmn.cpp:174
+#: src/canonmn.cpp:208
 msgid "Owner Name"
 msgstr ""
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 msgid "Serial Number"
 msgstr ""
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 msgid "Camera serial number"
 msgstr ""
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+msgid "Camera Info"
+msgstr ""
+
+#: src/canonmn.cpp:210
+msgid "Camera info"
+msgstr ""
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 msgid "Custom Functions"
 msgstr ""
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "ModelID"
 msgstr ""
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "Model ID"
 msgstr ""
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
 msgid "Picture Info"
 msgstr ""
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 msgid "Picture info"
 msgstr ""
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
+msgid "Thumbnail Image Valid Area"
+msgstr ""
+
+#: src/canonmn.cpp:214
+msgid "Thumbnail image valid area"
+msgstr ""
+
+#: src/canonmn.cpp:215
+msgid "Serial Number Format"
+msgstr ""
+
+#: src/canonmn.cpp:215
+msgid "Serial number format"
+msgstr ""
+
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+msgid "Super Macro"
+msgstr ""
+
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+msgid "Super macro"
+msgstr ""
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+msgid "AF Info"
+msgstr ""
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+msgid "AF info"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
 msgid "White Balance Table"
 msgstr ""
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:219
 msgid "White balance table"
 msgstr ""
 
-#: src/canonmn.cpp:185
-msgid "Unknown CanonMakerNote tag"
+#: src/canonmn.cpp:220
+msgid "LensModel"
 msgstr ""
 
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+msgid "Internal Serial Number"
 msgstr ""
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+msgid "Internal serial number"
+msgstr ""
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
+msgstr ""
+
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
+
+#: src/canonmn.cpp:223
+msgid "Custom functions"
+msgstr ""
+
+#: src/canonmn.cpp:224
+msgid "Processing Info"
+msgstr ""
+
+#: src/canonmn.cpp:224
+msgid "Processing info"
+msgstr ""
+
+#: src/canonmn.cpp:225
+msgid "Measured Color"
+msgstr ""
+
+#: src/canonmn.cpp:225
+msgid "Measured color"
+msgstr ""
+
+#: src/canonmn.cpp:226
+msgid "ColorSpace"
+msgstr ""
+
+#: src/canonmn.cpp:230
+msgid "VRD Offset"
+msgstr ""
+
+#: src/canonmn.cpp:230
+msgid "VRD offset"
+msgstr ""
+
+#: src/canonmn.cpp:231
+msgid "Sensor Info"
+msgstr ""
+
+#: src/canonmn.cpp:231
+msgid "Sensor info"
+msgstr ""
+
+#: src/canonmn.cpp:232
+msgid "Color Data"
+msgstr ""
+
+#: src/canonmn.cpp:232
+msgid "Color data"
+msgstr ""
+
+#: src/canonmn.cpp:234
+msgid "Unknown CanonMakerNote tag"
 msgstr ""
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
 msgid "Economy"
 msgstr ""
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
 msgid "Normal"
 msgstr ""
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
 msgid "Fine"
 msgstr ""
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
 msgid "RAW"
 msgstr ""
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:254
 msgid "Superfine"
 msgstr ""
 
-#: src/canonmn.cpp:206
+#: src/canonmn.cpp:255
 msgid "Normal Movie"
 msgstr ""
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 msgid "Auto"
 msgstr ""
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
 msgid "Red-eye"
 msgstr ""
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 msgid "Slow sync"
 msgstr ""
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
 msgid "Auto + red-eye"
 msgstr ""
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
 msgid "On + red-eye"
 msgstr ""
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
 msgid "External"
 msgstr ""
 
-#: src/canonmn.cpp:223
+#: src/canonmn.cpp:273
 msgid "Single / timer"
 msgstr ""
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
 msgid "Continuous"
 msgstr ""
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
 msgid "Movie"
 msgstr ""
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 msgid "Continuous, speed priority"
 msgstr ""
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
 msgid "Continuous, low"
 msgstr ""
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
 msgid "Continuous, high"
 msgstr ""
 
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 msgid "One shot AF"
 msgstr ""
 
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
 msgid "AI servo AF"
 msgstr ""
 
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
 msgid "AI focus AF"
 msgstr ""
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 msgid "Manual focus"
 msgstr ""
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
 msgid "Single"
 msgstr ""
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
 msgid "Pan focus"
 msgstr ""
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
 msgid "Large"
 msgstr ""
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
 msgid "Medium"
 msgstr ""
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
 msgid "Small"
 msgstr ""
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
 msgid "Medium 1"
 msgstr ""
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
 msgid "Medium 2"
 msgstr ""
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
 msgid "Medium 3"
 msgstr ""
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
 msgid "Full auto"
 msgstr ""
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr ""
 
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr ""
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
 msgid "Fast shutter"
 msgstr ""
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 msgid "Slow shutter"
 msgstr ""
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 msgid "Night Scene"
 msgstr ""
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
 msgid "Gray scale"
 msgstr ""
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
 msgstr ""
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr ""
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 msgid "Sports"
 msgstr ""
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 msgid "Macro / close-up"
 msgstr ""
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 msgid "Black & white"
 msgstr ""
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 msgid "Vivid"
 msgstr ""
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 msgid "Neutral"
 msgstr ""
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
 msgid "Flash off"
 msgstr ""
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 msgid "Long shutter"
 msgstr ""
 
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr ""
-
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
 msgid "Foliage"
 msgstr ""
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
 msgid "Indoor"
 msgstr ""
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
 msgstr ""
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
 msgstr ""
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 msgid "Underwater"
 msgstr ""
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
 msgid "Snow"
 msgstr ""
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
 msgstr ""
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 msgid "Night SnapShot"
 msgstr ""
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 msgid "Digital macro"
 msgstr ""
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
 msgid "My Colors"
 msgstr ""
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
 msgid "Still image"
 msgstr ""
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
 msgid "Other"
 msgstr ""
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
 msgstr ""
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 msgid "High"
 msgstr ""
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr ""
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
 msgid "Auto High"
 msgstr ""
 
-#: src/canonmn.cpp:322
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
 msgid "Default"
 msgstr ""
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
 msgid "Spot"
 msgstr ""
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr ""
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
 msgid "Evaluative"
 msgstr ""
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
 msgid "Partial"
 msgstr ""
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 msgid "Center weighted"
 msgstr ""
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 msgid "Not known"
 msgstr ""
 
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr ""
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 msgid "Very close"
 msgstr ""
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
 msgid "Close"
 msgstr ""
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
 msgid "Middle range"
 msgstr ""
 
-#: src/canonmn.cpp:339
+#: src/canonmn.cpp:391
 msgid "Far range"
 msgstr ""
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 msgid "Infinity"
 msgstr ""
 
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
 msgid "Manual AF point selection"
 msgstr ""
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 msgid "None (MF)"
 msgstr ""
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 msgid "Auto-selected"
 msgstr ""
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 msgid "Right"
 msgstr ""
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 msgid "Center"
 msgstr ""
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
 msgid "Left"
 msgstr ""
 
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
 msgid "Auto AF point selection"
 msgstr ""
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
 msgid "Easy shooting (Auto)"
 msgstr ""
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 msgid "Program (P)"
 msgstr ""
 
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 msgid "Shutter priority (Tv)"
 msgstr ""
 
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 msgid "Aperture priority (Av)"
 msgstr ""
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 msgid "Manual (M)"
 msgstr ""
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr ""
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
 msgid "M-DEP"
 msgstr ""
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 msgid "Did not fire"
 msgstr ""
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
 msgid "Fired"
 msgstr ""
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 msgid "External flash"
 msgstr ""
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
 msgid "Internal flash"
 msgstr ""
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
 msgstr ""
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr ""
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr ""
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr ""
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr ""
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
 msgid "FP sync used"
 msgstr ""
 
-#: src/canonmn.cpp:625
+#: src/canonmn.cpp:707
 msgid "Normal AE"
 msgstr ""
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
 msgid "Exposure compensation"
 msgstr ""
 
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
 msgstr ""
 
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 msgid "AE lock + exposure compensation"
 msgstr ""
 
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
 msgid "No AE"
 msgstr ""
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
 msgid "On, shot only"
 msgstr ""
 
-#: src/canonmn.cpp:644
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+msgid "AF Point"
+msgstr ""
+
+#: src/canonmn.cpp:732
 msgid "Smooth"
 msgstr ""
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
 msgstr ""
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 msgid "Custom"
 msgstr ""
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
 msgid "My color data"
 msgstr ""
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+msgid "Full"
+msgstr ""
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:759
 msgid "Selftimer"
 msgstr ""
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
 msgid "Self timer"
 msgstr ""
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 msgid "Quality"
 msgstr ""
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 msgid "Flash Mode"
 msgstr ""
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
 msgid "Flash mode setting"
 msgstr ""
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
 msgid "Drive Mode"
 msgstr ""
 
-#: src/canonmn.cpp:657
+#: src/canonmn.cpp:762
 msgid "Drive mode setting"
 msgstr ""
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 msgid "Focus Mode"
 msgstr ""
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
 msgid "Focus mode setting"
 msgstr ""
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 msgid "Image Size"
 msgstr ""
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy Mode"
 msgstr ""
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy shooting mode"
 msgstr ""
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 msgid "Digital Zoom"
 msgstr ""
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 msgid "Digital zoom"
 msgstr ""
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr ""
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
 msgid "Contrast setting"
 msgstr ""
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr ""
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
 msgid "Saturation setting"
 msgstr ""
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr ""
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
 msgid "Sharpness setting"
 msgstr ""
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 msgid "ISO Speed Mode"
 msgstr ""
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
 msgid "ISO speed setting"
 msgstr ""
 
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
 msgstr ""
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
 msgid "Metering mode setting"
 msgstr ""
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus Type"
 msgstr ""
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus type setting"
 msgstr ""
 
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-msgid "AF Point"
-msgstr ""
-
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 msgid "AF point selected"
 msgstr ""
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 msgid "Exposure Program"
 msgstr ""
 
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
 msgid "Exposure mode setting"
 msgstr ""
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 msgid "Lens Type"
 msgstr ""
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 msgid "Lens type"
 msgstr ""
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 msgid "Lens"
 msgstr ""
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
 msgstr ""
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
+#: src/canonmn.cpp:781
+msgid "Short Focal"
+msgstr ""
+
+#: src/canonmn.cpp:781
+msgid "Short focal"
+msgstr ""
+
+#: src/canonmn.cpp:782
+msgid "Focal Units"
+msgstr ""
+
+#: src/canonmn.cpp:782
+msgid "Focal units"
+msgstr ""
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
 msgid "Max Aperture"
 msgstr ""
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
 msgid "Max aperture"
 msgstr ""
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 msgid "Min Aperture"
 msgstr ""
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 msgid "Min aperture"
 msgstr ""
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash Activity"
 msgstr ""
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash activity"
 msgstr ""
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash Details"
 msgstr ""
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash details"
 msgstr ""
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus Continuous"
 msgstr ""
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus continuous setting"
 msgstr ""
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AESetting"
 msgstr ""
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AE setting"
 msgstr ""
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 msgid "Image Stabilization"
 msgstr ""
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 msgid "Image stabilization"
 msgstr ""
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display Aperture"
 msgstr ""
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display aperture"
 msgstr ""
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom Source Width"
 msgstr ""
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom source width"
 msgstr ""
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom Target Width"
 msgstr ""
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom target width"
 msgstr ""
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:796
+msgid "Spot Metering Mode"
+msgstr ""
+
+#: src/canonmn.cpp:796
+msgid "Spot metering mode"
+msgstr ""
+
+#: src/canonmn.cpp:797
 msgid "Photo Effect"
 msgstr ""
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 msgid "Photo effect"
 msgstr ""
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+msgid "Manual Flash Output"
+msgstr ""
+
+#: src/canonmn.cpp:798
+msgid "Manual flash output"
+msgstr ""
+
+#: src/canonmn.cpp:799
 msgid "Color Tone"
 msgstr ""
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
 msgid "Color tone"
 msgstr ""
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
+msgstr ""
+
+#: src/canonmn.cpp:800
+msgid "SRAW quality"
+msgstr ""
+
+#: src/canonmn.cpp:802
 msgid "Unknown Canon Camera Settings 1 tag"
 msgstr ""
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 msgid "Sunny"
 msgstr ""
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 msgid "Cloudy"
 msgstr ""
 
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 msgid "Tungsten"
 msgstr ""
 
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
 msgstr ""
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
 msgid "Black & White"
 msgstr ""
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr ""
 
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 msgid "Manual Temperature (Kelvin)"
 msgstr ""
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
 msgstr ""
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
 msgstr ""
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
 msgstr ""
 
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
 msgid "Daylight Fluorescent"
 msgstr ""
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 msgid "Custom 1"
 msgstr ""
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 msgid "Custom 2"
 msgstr ""
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+msgid "Custom 3"
+msgstr ""
+
+#: src/canonmn.cpp:831
+msgid "PC Set 4"
+msgstr ""
+
+#: src/canonmn.cpp:832
+msgid "PC Set 5"
+msgstr ""
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 msgid "left"
 msgstr ""
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 msgid "center"
 msgstr ""
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
 msgid "right"
 msgstr ""
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO Speed Used"
 msgstr ""
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO speed used"
 msgstr ""
 
-#: src/canonmn.cpp:758
+#: src/canonmn.cpp:867
+msgid "Measured EV"
+msgstr ""
+
+#: src/canonmn.cpp:868
 msgid "Target Aperture"
 msgstr ""
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target Shutter Speed"
 msgstr ""
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target shutter speed"
 msgstr ""
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr ""
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
 msgid "White balance setting"
 msgstr ""
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence"
 msgstr ""
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
 msgstr ""
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF Point Used"
 msgstr ""
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF point used"
 msgstr ""
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 msgid "Flash Bias"
 msgstr ""
 
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
 msgstr ""
 
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 msgid "Subject distance (units are not clear)"
 msgstr ""
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 msgid "Aperture Value"
 msgstr ""
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 msgid "Shutter Speed Value"
 msgstr ""
 
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr ""
 
-#: src/canonmn.cpp:782
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
+msgstr ""
+
+#: src/canonmn.cpp:892
 msgid "Unknown Canon Camera Settings 2 tag"
 msgstr ""
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 msgid "Left to right"
 msgstr ""
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 msgid "Right to left"
 msgstr ""
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 msgid "Bottom to top"
 msgstr ""
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 msgid "Top to bottom"
 msgstr ""
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
 msgstr ""
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama Frame"
 msgstr ""
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama frame number"
 msgstr ""
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama Direction"
 msgstr ""
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama direction"
 msgstr ""
 
-#: src/canonmn.cpp:804
+#: src/canonmn.cpp:914
 msgid "Unknown Canon Panorama tag"
 msgstr ""
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 msgid "Noise Reduction"
 msgstr ""
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
 msgid "Long exposure noise reduction"
 msgstr ""
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 msgid "Shutter Ae Lock"
 msgstr ""
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 msgid "Shutter/AE lock buttons"
 msgstr ""
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr ""
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr ""
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
 msgid "Exposure Level Increments"
 msgstr ""
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
 msgid "AF Assist"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
 msgstr ""
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Flash Sync Speed Av"
 msgstr ""
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Shutter speed in Av mode"
 msgstr ""
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB Sequence"
 msgstr ""
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB sequence/auto cancellation"
 msgstr ""
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 msgid "Shutter Curtain Sync"
 msgstr ""
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 msgid "Shutter curtain sync"
 msgstr ""
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF Stop Button"
 msgstr ""
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF stop button Fn. Switch"
 msgstr ""
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Fill Flash Auto Reduction"
 msgstr ""
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu button return position"
 msgstr ""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "Set Button Function"
 msgstr ""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor Cleaning"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor cleaning"
 msgstr ""
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
 msgstr ""
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
 msgid "Unknown Canon Custom Function tag"
 msgstr ""
 
-#: src/canonmn.cpp:841
+#: src/canonmn.cpp:951
 msgid "mid-right"
 msgstr ""
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 msgid "bottom"
 msgstr ""
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 msgid "top"
 msgstr ""
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
 msgid "mid-left"
 msgstr ""
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
 msgid "upper-left"
 msgstr ""
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
 msgid "upper-right"
 msgstr ""
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
 msgid "lower-left"
 msgstr ""
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
 msgid "lower-right"
 msgstr ""
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
 msgid "Image Width"
 msgstr ""
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
 msgid "Image width"
 msgstr ""
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
 msgid "Image Height"
 msgstr ""
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
 msgid "Image height"
 msgstr ""
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image Width As Shot"
 msgstr ""
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image width (as shot)"
 msgstr ""
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image Height As Shot"
 msgstr ""
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image height (as shot)"
 msgstr ""
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF Points Used"
 msgstr ""
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF points used"
 msgstr ""
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF Points Used 20D"
 msgstr ""
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF points used (20D)"
 msgstr ""
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 msgid "Unknown Canon Picture Info tag"
 msgstr ""
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
 msgid "ISO"
 msgstr ""
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 msgid "WB"
 msgstr ""
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
 msgstr ""
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
 msgstr ""
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 msgid "Medium Movie"
 msgstr ""
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 msgid "Small Movie"
 msgstr ""
 
-#: src/canonmn.cpp:905
+#: src/canonmn.cpp:1015
 msgid "On 1"
 msgstr ""
 
-#: src/canonmn.cpp:906
+#: src/canonmn.cpp:1016
 msgid "On 2"
 msgstr ""
 
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 msgid "On (shift AB)"
 msgstr ""
 
-#: src/canonmn.cpp:915
+#: src/canonmn.cpp:1025
 msgid "On (shift GM)"
 msgstr ""
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
 msgstr ""
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 msgid "Orange"
 msgstr ""
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 msgid "Red"
 msgstr ""
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 msgid "Green"
 msgstr ""
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
 msgid "Blue"
 msgstr ""
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
 msgstr ""
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 msgid "Bracket Mode"
 msgstr ""
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
 msgid "Bracket Value"
 msgstr ""
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
 msgid "Bracket Shot Number"
 msgstr ""
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 msgid "Raw Jpg Quality"
 msgstr ""
 
-#: src/canonmn.cpp:943
+#: src/canonmn.cpp:1053
 msgid "Raw Jpg Size"
 msgstr ""
 
-#: src/canonmn.cpp:945
+#: src/canonmn.cpp:1055
 msgid "WB Bracket Mode"
 msgstr ""
 
-#: src/canonmn.cpp:946
+#: src/canonmn.cpp:1056
 msgid "WB Bracket Value AB"
 msgstr ""
 
-#: src/canonmn.cpp:947
+#: src/canonmn.cpp:1057
 msgid "WB Bracket Value GM"
 msgstr ""
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 msgid "Filter Effect"
 msgstr ""
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 msgid "Toning Effect"
 msgstr ""
 
-#: src/canonmn.cpp:951
-msgid "Unknown Canon File Info tag"
+#: src/canonmn.cpp:1060
+msgid "Macro Magnification"
 msgstr ""
 
-#: src/crwimage.cpp:663
-msgid "Header, offset"
+#: src/canonmn.cpp:1060
+msgid "Macro magnification"
 msgstr ""
 
-#: src/crwimage.cpp:680
-msgid "tag"
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
 msgstr ""
 
-#: src/crwimage.cpp:682
-msgid "dir"
+#: src/canonmn.cpp:1061
+msgid "Live view shooting"
 msgstr ""
 
-#: src/crwimage.cpp:684
-msgid "type"
+#: src/canonmn.cpp:1062
+msgid "Flash Exposure Lock"
 msgstr ""
 
-#: src/crwimage.cpp:685
-msgid "size"
+#: src/canonmn.cpp:1062
+msgid "Flash exposure lock"
 msgstr ""
 
-#: src/crwimage.cpp:686
-msgid "offset"
+#: src/canonmn.cpp:1064
+msgid "Unknown Canon File Info tag"
 msgstr ""
 
-#: src/datasets.cpp:79
-msgid "(invalid)"
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
 msgstr ""
 
-#: src/datasets.cpp:80
-msgid "IIM envelope record"
+#: src/canonmn.cpp:1082
+msgid "Lowest"
 msgstr ""
 
-#: src/datasets.cpp:81
-msgid "IIM application record 2"
+#: src/canonmn.cpp:1086
+msgid "Highest"
 msgstr ""
 
-#: src/datasets.cpp:85
-msgid "Model Version"
+#: src/canonmn.cpp:1094
+msgid "High Saturation"
 msgstr ""
 
-#: src/datasets.cpp:86
-msgid ""
-"A binary number identifying the version of the Information Interchange "
-"Model, Part I, utilised by the provider. Version numbers are assigned by "
-"IPTC and NAA organizations."
+#: src/canonmn.cpp:1096
+msgid "Low Saturation"
 msgstr ""
 
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
-msgid "Destination"
+#: src/canonmn.cpp:1097
+msgid "CM Set 1"
 msgstr ""
 
-#: src/datasets.cpp:91
-msgid ""
-"This DataSet is to accommodate some providers who require routing "
-"information above the appropriate OSI layers."
+#: src/canonmn.cpp:1098
+msgid "CM Set 2"
 msgstr ""
 
-#: src/datasets.cpp:94
-msgid "File Format"
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
 msgstr ""
 
-#: src/datasets.cpp:95
-msgid ""
-"A binary number representing the file format. The file format must be "
-"registered with IPTC or NAA with a unique number assigned to it. The "
-"information is used to route the data to the appropriate system and to allow "
-"the receiving system to perform the appropriate actions there to."
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
 msgstr ""
 
-#: src/datasets.cpp:101
-msgid "File Version"
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
 msgstr ""
 
-#: src/datasets.cpp:102
-msgid ""
-"A binary number representing the particular version of the File Format "
-"specified by <FileFormat> tag."
+#: src/canonmn.cpp:1102
+msgid "PC 1"
 msgstr ""
 
-#: src/datasets.cpp:105
-msgid "Service Id"
+#: src/canonmn.cpp:1103
+msgid "PC 2"
 msgstr ""
 
-#: src/datasets.cpp:106
-msgid "Identifies the provider and product"
+#: src/canonmn.cpp:1104
+msgid "PC 3"
 msgstr ""
 
-#: src/datasets.cpp:108
-msgid "Envelope Number"
+#: src/canonmn.cpp:1109
+msgid "Faithful"
 msgstr ""
 
-#: src/datasets.cpp:109
-msgid ""
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+msgid "Monochrome"
+msgstr ""
+
+#: src/canonmn.cpp:1115
+msgid "ToneCurve"
+msgstr ""
+
+#: src/canonmn.cpp:1115
+msgid "Tone curve"
+msgstr ""
+
+#: src/canonmn.cpp:1117
+msgid "SharpnessFrequency"
+msgstr ""
+
+#: src/canonmn.cpp:1117
+msgid "Sharpness frequency"
+msgstr ""
+
+#: src/canonmn.cpp:1118
+msgid "SensorRedLevel"
+msgstr ""
+
+#: src/canonmn.cpp:1118
+msgid "Sensor red level"
+msgstr ""
+
+#: src/canonmn.cpp:1119
+msgid "SensorBlueLevel"
+msgstr ""
+
+#: src/canonmn.cpp:1119
+msgid "Sensor blue level"
+msgstr ""
+
+#: src/canonmn.cpp:1120
+msgid "WhiteBalanceRed"
+msgstr ""
+
+#: src/canonmn.cpp:1120
+msgid "White balance red"
+msgstr ""
+
+#: src/canonmn.cpp:1121
+msgid "WhiteBalanceBlue"
+msgstr ""
+
+#: src/canonmn.cpp:1121
+msgid "White balance blue"
+msgstr ""
+
+#: src/canonmn.cpp:1122
+msgid "WhiteBalance"
+msgstr ""
+
+#: src/canonmn.cpp:1123
+msgid "ColorTemperature"
+msgstr ""
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+msgid "Color Temperature"
+msgstr ""
+
+#: src/canonmn.cpp:1124
+msgid "PictureStyle"
+msgstr ""
+
+#: src/canonmn.cpp:1124
+msgid "Picture style"
+msgstr ""
+
+#: src/canonmn.cpp:1125
+msgid "DigitalGain"
+msgstr ""
+
+#: src/canonmn.cpp:1125
+msgid "Digital gain"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+msgid "WBShift AB"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+msgid "WB Shift GM"
+msgstr ""
+
+#: src/canonmn.cpp:1128
+msgid "Unknown Canon Processing Info tag"
+msgstr ""
+
+#: src/crwimage.cpp:664
+msgid "Header, offset"
+msgstr ""
+
+#: src/crwimage.cpp:681
+msgid "tag"
+msgstr ""
+
+#: src/crwimage.cpp:683
+msgid "dir"
+msgstr ""
+
+#: src/crwimage.cpp:685
+msgid "type"
+msgstr ""
+
+#: src/crwimage.cpp:686
+msgid "size"
+msgstr ""
+
+#: src/crwimage.cpp:687
+msgid "offset"
+msgstr ""
+
+#: src/datasets.cpp:79
+msgid "(invalid)"
+msgstr ""
+
+#: src/datasets.cpp:80
+msgid "IIM envelope record"
+msgstr ""
+
+#: src/datasets.cpp:81
+msgid "IIM application record 2"
+msgstr ""
+
+#: src/datasets.cpp:85
+msgid "Model Version"
+msgstr ""
+
+#: src/datasets.cpp:86
+msgid ""
+"A binary number identifying the version of the Information Interchange "
+"Model, Part I, utilised by the provider. Version numbers are assigned by "
+"IPTC and NAA organizations."
+msgstr ""
+
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
+msgid "Destination"
+msgstr ""
+
+#: src/datasets.cpp:91
+msgid ""
+"This DataSet is to accommodate some providers who require routing "
+"information above the appropriate OSI layers."
+msgstr ""
+
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
+msgid "File Format"
+msgstr ""
+
+#: src/datasets.cpp:95
+msgid ""
+"A binary number representing the file format. The file format must be "
+"registered with IPTC or NAA with a unique number assigned to it. The "
+"information is used to route the data to the appropriate system and to allow "
+"the receiving system to perform the appropriate actions there to."
+msgstr ""
+
+#: src/datasets.cpp:101
+msgid "File Version"
+msgstr ""
+
+#: src/datasets.cpp:102
+msgid ""
+"A binary number representing the particular version of the File Format "
+"specified by <FileFormat> tag."
+msgstr ""
+
+#: src/datasets.cpp:105
+msgid "Service Id"
+msgstr ""
+
+#: src/datasets.cpp:106
+msgid "Identifies the provider and product"
+msgstr ""
+
+#: src/datasets.cpp:108
+msgid "Envelope Number"
+msgstr ""
+
+#: src/datasets.cpp:109
+msgid ""
 "The characters form a number that will be unique for the date specified in "
 "<DateSent> tag and for the Service Identifier specified by "
 "<ServiceIdentifier> tag. If identical envelope numbers appear with the same "
@@ -2529,7 +3060,7 @@
 msgid "Document Title"
 msgstr ""
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
 msgid "Edit Status"
 msgstr ""
 
@@ -2548,18 +3079,18 @@
 "<ARMVersion>, according to the practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
 msgstr ""
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
 msgid "Subject"
 msgstr ""
 
@@ -2567,7 +3098,7 @@
 msgid "The Subject Reference is a structured definition of the subject matter."
 msgstr ""
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
 msgid "Category"
 msgstr ""
 
@@ -2590,7 +3121,7 @@
 "to the provider."
 msgstr ""
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
 msgstr ""
 
@@ -2604,7 +3135,7 @@
 "immediately find or recall such an object."
 msgstr ""
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
 msgstr ""
 
@@ -2641,7 +3172,7 @@
 "provider."
 msgstr ""
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
 msgid "Release Date"
 msgstr ""
 
@@ -2691,7 +3222,7 @@
 "embargoes and warnings."
 msgstr ""
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 msgid "Instructions"
 msgstr ""
 
@@ -2735,7 +3266,7 @@
 "object refers."
 msgstr ""
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
 msgid "Date Created"
 msgstr ""
 
@@ -2777,9 +3308,10 @@
 "representation of the object data was created. Follows ISO 8601 standard."
 msgstr ""
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 msgid "Program"
 msgstr ""
 
@@ -2827,7 +3359,7 @@
 "Where used, a by-line title should follow the by-line it modifies."
 msgstr ""
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr ""
 
@@ -2861,7 +3393,7 @@
 msgid "State/Province"
 msgstr ""
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
 msgid "Country Code"
 msgstr ""
 
@@ -2887,11 +3419,11 @@
 "guidelines of the provider."
 msgstr ""
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
 msgid "Country"
 msgstr ""
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
 msgid "Transmission Reference"
 msgstr ""
 
@@ -2901,7 +3433,7 @@
 "practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
 msgid "Headline"
 msgstr ""
 
@@ -2910,7 +3442,7 @@
 "A publishable entry providing a synopsis of the contents of the object data."
 msgstr ""
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
 msgid "Credit"
 msgstr ""
 
@@ -2920,8 +3452,8 @@
 "creator."
 msgstr ""
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
 msgid "Source"
 msgstr ""
 
@@ -2939,7 +3471,7 @@
 msgid "Copyright Notice"
 msgstr ""
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
 msgid "Contact"
 msgstr ""
 
@@ -2957,7 +3489,7 @@
 msgid "A textual description of the object data."
 msgstr ""
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 msgid "Description"
 msgstr ""
 
@@ -2993,7 +3525,7 @@
 msgid "Indicates the layout of an image."
 msgstr ""
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
 msgid "Language"
 msgstr ""
 
@@ -3083,217 +3615,217 @@
 msgid "Unknown dataset"
 msgstr ""
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr ""
 
-#: src/error.cpp:50
+#: src/error.cpp:56
 msgid "Success"
 msgstr ""
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr ""
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr ""
 
-#: src/error.cpp:55
+#: src/error.cpp:61
 msgid "Invalid record name `%1'"
 msgstr ""
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr ""
 
-#: src/error.cpp:57
+#: src/error.cpp:63
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
 msgstr ""
 
-#: src/error.cpp:58
+#: src/error.cpp:64
 msgid "Value not set"
 msgstr ""
 
-#: src/error.cpp:59
+#: src/error.cpp:65
 msgid "%1: Failed to open the data source: %2"
 msgstr ""
 
-#: src/error.cpp:60
+#: src/error.cpp:66
 msgid "%1: Failed to open file (%2): %3"
 msgstr ""
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr ""
 
-#: src/error.cpp:64
+#: src/error.cpp:70
 msgid "Failed to read image data"
 msgstr ""
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr ""
 
-#: src/error.cpp:67
+#: src/error.cpp:72
+msgid "%1: Failed to map file for reading and writing: %2"
+msgstr ""
+
+#: src/error.cpp:73
 msgid "%1: Failed to rename file to %2: %3"
 msgstr ""
 
-#: src/error.cpp:68
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr ""
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr ""
 
-#: src/error.cpp:70
+#: src/error.cpp:76
 msgid "Failed to read input data"
 msgstr ""
 
-#: src/error.cpp:71
+#: src/error.cpp:77
 msgid "Failed to write image"
 msgstr ""
 
-#: src/error.cpp:72
+#: src/error.cpp:78
 msgid "Input data does not contain a valid image"
 msgstr ""
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 msgid "Invalid ifdId %1"
 msgstr ""
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr ""
 
-#: src/error.cpp:77
+#: src/error.cpp:83
 msgid "Unsupported data area offset type"
 msgstr ""
 
-#: src/error.cpp:78
+#: src/error.cpp:84
 msgid "Invalid charset: `%1'"
 msgstr ""
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr ""
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr ""
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 msgid "Writing to %1 images is not supported"
 msgstr ""
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr ""
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr ""
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr ""
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr ""
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr ""
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr ""
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr ""
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr ""
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr ""
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 
-#: src/error.cpp:98
+#: src/error.cpp:104
 msgid "Invalid XmpText type `%1'"
 msgstr ""
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr ""
 
-#: src/error.cpp:100
+#: src/error.cpp:106
 msgid "Multiple TIFF array element tags %1 in one directory"
 msgstr ""
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr ""
 
-#: src/error.cpp:103
-msgid "(Unknown Error)"
-msgstr ""
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
 msgstr ""
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3301,7 +3833,7 @@
 "of the License, or (at your option) any later version.\n"
 msgstr ""
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3309,7 +3841,7 @@
 "GNU General Public License for more details.\n"
 msgstr ""
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3317,266 +3849,286 @@
 "Boston, MA 02110-1301 USA\n"
 msgstr ""
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr ""
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
 msgstr ""
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr ""
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
 msgstr ""
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
 msgstr ""
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr ""
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
 "                -r format, timestamp options are controlled with -t and -T.\n"
 msgstr ""
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
 "                Requires option -c, -m or -M.\n"
 msgstr ""
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
 msgstr ""
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr ""
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr ""
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr ""
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr ""
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr ""
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 msgid "   -u      Show unknown tags.\n"
 msgstr ""
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr ""
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr ""
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr ""
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr ""
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr ""
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr ""
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr ""
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr ""
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 msgid "             p : list available previews\n"
 msgstr ""
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
 msgstr ""
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 msgid "             E : include Exif tags in the list\n"
 msgstr ""
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 msgid "             I : IPTC datasets\n"
 msgstr ""
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 msgid "             X : XMP properties\n"
 msgstr ""
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 msgid "             x : print a column with the tag number\n"
 msgstr ""
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr ""
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr ""
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr ""
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr ""
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr ""
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr ""
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr ""
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr ""
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr ""
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr ""
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr ""
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr ""
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr ""
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr ""
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr ""
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr ""
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
 "           the same as those for the -d option, plus a modifier:\n"
@@ -3585,7 +4137,7 @@
 "           <file>-thumb.jpg\n"
 msgstr ""
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
 "           are the same as those for the -d option, plus a target to "
@@ -3595,614 +4147,617 @@
 "             X : Extract metadata to an XMP sidecar file <file>.xmp\n"
 msgstr ""
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
 msgstr ""
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr ""
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr ""
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr ""
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr ""
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
 msgstr ""
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
 msgstr ""
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
 msgstr ""
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
 msgstr ""
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 msgid "Option"
 msgstr ""
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr ""
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr ""
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr ""
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr ""
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr ""
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr ""
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 msgid "Error parsing"
 msgstr ""
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 msgid "option argument"
 msgstr ""
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr ""
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr ""
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr ""
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr ""
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr ""
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr ""
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr ""
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr ""
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr ""
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr ""
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr ""
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 msgid "target"
 msgstr ""
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 msgid "Invalid preview number"
 msgstr ""
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr ""
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 msgid "line"
 msgstr ""
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 msgid "-M option"
 msgstr ""
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr ""
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr ""
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
 msgstr ""
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
 msgid "Soft mode 1"
 msgstr ""
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
 msgid "Soft mode 2"
 msgstr ""
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
 msgid "Hard mode 1"
 msgstr ""
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
 msgid "Hard mode 2"
 msgstr ""
 
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr ""
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
 msgid "Fluorescent (daylight)"
 msgstr ""
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
 msgid "Fluorescent (warm white)"
 msgstr ""
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
 msgid "Fluorescent (cool white)"
 msgstr ""
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
 msgid "Incandescent"
 msgstr ""
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
 msgid "None (black & white)"
 msgstr ""
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
 msgid "Red-eye reduction"
 msgstr ""
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr ""
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
 msgid "Program AE"
 msgstr ""
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 msgid "Natural light"
 msgstr ""
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
 msgid "Anti-blur"
 msgstr ""
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
 msgid "Sunset"
 msgstr ""
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
 msgid "Museum"
 msgstr ""
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
 msgid "Party"
 msgstr ""
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 msgid "Flower"
 msgstr ""
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
 msgstr ""
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
 msgid "Natural light & flash"
 msgstr ""
 
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
 msgid "Aperture-priority AE"
 msgstr ""
 
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
 msgid "Shutter speed priority AE"
 msgstr ""
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
 msgid "No flash & flash"
 msgstr ""
 
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr ""
-
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
 msgid "Chrome"
 msgstr ""
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
 msgid "Wide"
 msgstr ""
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
 msgid "F0/Standard"
 msgstr ""
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 msgid "F1/Studio portrait"
 msgstr ""
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
 msgstr ""
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
 msgid "F3/Studio portrait Ex"
 msgstr ""
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr ""
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr ""
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr ""
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
 msgid "Standard (100%)"
 msgstr ""
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
 msgstr ""
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
 msgstr ""
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
 msgid "Film simulation mode"
 msgstr ""
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
 msgid "Version"
 msgstr ""
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
 msgid "Fujifilm Makernote version"
 msgstr ""
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
 msgstr ""
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
 msgid "Image quality setting"
 msgstr ""
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
 msgid "Color"
 msgstr ""
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 msgid "Chroma saturation setting"
 msgstr ""
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
 msgid "Tone"
 msgstr ""
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
 msgid "Flash firing mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
 msgid "Flash Strength"
 msgstr ""
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
 msgid "Flash firing strength compensation setting"
 msgstr ""
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
 msgid "Macro mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 msgid "Focusing mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
 msgstr ""
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
 msgid "Slow synchro mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
 msgid "Picture Mode"
 msgstr ""
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
 msgid "Picture mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr ""
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
 msgid "Sequence Number"
 msgstr ""
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 msgid "Sequence number"
 msgstr ""
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
 msgid "FinePix Color"
 msgstr ""
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
 msgstr ""
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
 msgid "Blur Warning"
 msgstr ""
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
 msgid "Blur warning status"
 msgstr ""
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
 msgid "Focus Warning"
 msgstr ""
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
 msgid "Auto Focus warning status"
 msgstr ""
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
 msgid "Exposure Warning"
 msgstr ""
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
 msgid "Auto exposure warning status"
 msgstr ""
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
 msgid "Dynamic Range"
 msgstr ""
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
 msgid "Dynamic range"
 msgstr ""
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
 msgid "Film Mode"
 msgstr ""
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
 msgid "Film mode"
 msgstr ""
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
 msgid "Dynamic Range Setting"
 msgstr ""
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
 msgid "Dynamic range settings"
 msgstr ""
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
 msgid "Development Dynamic Range"
 msgstr ""
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
 msgid "Development dynamic range"
 msgstr ""
 
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
 msgid "Minimum Focal Length"
 msgstr ""
 
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
 msgid "Minimum focal length"
 msgstr ""
 
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
 msgid "Maximum Focal Length"
 msgstr ""
 
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
 msgid "Maximum focal length"
 msgstr ""
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
 msgid "Maximum Aperture at Mininimum Focal"
 msgstr ""
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
 msgid "Maximum aperture at mininimum focal"
 msgstr ""
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
 msgid "Maximum Aperture at Maxinimum Focal"
 msgstr ""
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
 msgid "Maximum aperture at maxinimum focal"
 msgstr ""
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr ""
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 msgid "File source"
 msgstr ""
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
 msgid "Order Number"
 msgstr ""
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
 msgid "Order number"
 msgstr ""
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
 msgid "Frame Number"
 msgstr ""
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
 msgid "Frame number"
 msgstr ""
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
 msgid "Unknown FujiMakerNote tag"
 msgstr ""
 
@@ -4210,20 +4765,20 @@
 msgid "Natural Color"
 msgstr ""
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
 msgid "Vivid Color"
 msgstr ""
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
 msgid "Solarization"
 msgstr ""
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr ""
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
 msgid "Natural"
 msgstr ""
 
@@ -4239,10429 +4794,12924 @@
 msgid "Evening"
 msgstr ""
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
 msgid "Night Portrait"
 msgstr ""
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
 msgid "Super Fine"
 msgstr ""
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
 msgid "Extra Fine"
 msgstr ""
 
-#: src/minoltamn.cpp:84
-msgid "ISO Setting Used"
-msgstr ""
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr ""
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr ""
-
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
 msgid "Makernote Version"
 msgstr ""
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr ""
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
 msgid "Camera Settings (Std Old)"
 msgstr ""
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
 msgid "Camera Settings (Std New)"
 msgstr ""
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
 msgid "Camera Settings (7D)"
 msgstr ""
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
 msgid "Camera Settings (for Dynax 7D model)"
 msgstr ""
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
 msgid "Image Stabilization Data"
 msgstr ""
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
 msgid "Image stabilization data"
 msgstr ""
 
-#: src/minoltamn.cpp:247
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
+msgstr ""
+
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:111
 msgid "Compressed Image Size"
 msgstr ""
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:112
 msgid "Compressed image size"
 msgstr ""
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
 msgstr ""
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
 msgid "Thumbnail Offset"
 msgstr ""
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr ""
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
 msgid "Thumbnail Length"
 msgstr ""
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
 msgid "Size of the thumbnail"
 msgstr ""
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+msgid "Scene Mode"
+msgstr ""
+
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
 msgid "Color Mode"
 msgstr ""
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
 msgid "Color mode"
 msgstr ""
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
 msgid "Image Quality"
 msgstr ""
 
-#: src/minoltamn.cpp:271
-msgid "Zone Matching"
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
 msgstr ""
 
-#: src/minoltamn.cpp:272
-msgid "Zone matching"
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
-msgid "Color Temperature"
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+msgid "Flash exposure compensation in EV"
+msgstr ""
+
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+msgid "Teleconverter Model"
 msgstr ""
 
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
+msgstr ""
+
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
+msgstr ""
+
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
+msgid "Zone Matching"
+msgstr ""
+
+#: src/minoltamn.cpp:154
+msgid "Zone matching"
+msgstr ""
+
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
 msgid "Color temperature"
 msgstr ""
 
-#: src/minoltamn.cpp:277
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
 msgid "Lens ID"
 msgstr ""
 
-#: src/minoltamn.cpp:278
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
 msgid "Lens identifier"
 msgstr ""
 
-#: src/minoltamn.cpp:280
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+msgid "Color Compensation Filter"
+msgstr ""
+
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
+msgstr ""
+
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+msgid "White Balance Fine Tune"
+msgstr ""
+
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+msgid "White Balance Fine Tune Value"
+msgstr ""
+
+#: src/minoltamn.cpp:168
+msgid "Image Stabilization A100"
+msgstr ""
+
+#: src/minoltamn.cpp:169
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:173
 msgid "Camera Settings (5D)"
 msgstr ""
 
-#: src/minoltamn.cpp:281
+#: src/minoltamn.cpp:174
 msgid "Camera Settings (for Dynax 5D model)"
 msgstr ""
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
 msgid "Print IM"
 msgstr ""
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
 msgid "PrintIM information"
 msgstr ""
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:183
 msgid "Camera Settings (Z1)"
 msgstr ""
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr ""
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
 msgid "Unknown Minolta MakerNote tag"
 msgstr ""
 
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr ""
 
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr ""
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
 msgid "Fill flash"
 msgstr ""
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
 msgid "Rear flash sync"
 msgstr ""
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
 msgid "Wireless"
 msgstr ""
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
 msgid "Fluorescent 2"
 msgstr ""
 
-#: src/minoltamn.cpp:329 src/properties.cpp:763
-msgid "Custom 3"
-msgstr ""
-
-#: src/minoltamn.cpp:334
+#: src/minoltamn.cpp:231
 msgid "Full size"
 msgstr ""
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
 msgid "Super fine"
 msgstr ""
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr ""
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+msgid "Single Frame"
+msgstr ""
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
 msgid "Self-timer"
 msgstr ""
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
 msgid "Bracketing"
 msgstr ""
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
 msgid "Interval"
 msgstr ""
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
 msgid "UHS continuous"
 msgstr ""
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
 msgid "HS continuous"
 msgstr ""
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
 msgid "Multi-segment"
 msgstr ""
 
-#: src/minoltamn.cpp:380
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+msgid "Center weighted average"
+msgstr ""
+
+#: src/minoltamn.cpp:271
 msgid "Electronic magnification"
 msgstr ""
 
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
 msgid "Top"
 msgstr ""
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
 msgid "Top-right"
 msgstr ""
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 msgid "Bottom-right"
 msgstr ""
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
 msgid "Bottom"
 msgstr ""
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
 msgid "Bottom-left"
 msgstr ""
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
 msgid "Top-left"
 msgstr ""
 
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
 msgid "Hard"
 msgstr ""
 
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
 msgid "Soft"
 msgstr ""
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
 msgid "Night portrait"
 msgstr ""
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
 msgid "Sports action"
 msgstr ""
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr ""
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 msgid "Standard form"
 msgstr ""
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
 msgid "Data form"
 msgstr ""
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
 msgid "Natural color"
 msgstr ""
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
 msgid "Black and white"
 msgstr ""
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
 msgid "Vivid color"
 msgstr ""
 
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr ""
-
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
 msgid "No zone"
 msgstr ""
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
 msgid "Left zone"
 msgstr ""
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 msgid "Right zone"
 msgstr ""
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
 msgid "Auto focus"
 msgstr ""
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
 msgid "Wide focus (normal)"
 msgstr ""
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
 msgid "Spot focus"
 msgstr ""
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
 msgid "Exposure"
 msgstr ""
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 msgid "Filter"
 msgstr ""
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 msgid "Not embedded"
 msgstr ""
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
 msgid "Embedded"
 msgstr ""
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr ""
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr ""
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr ""
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
 msgid "Manual flash control"
 msgstr ""
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr ""
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
 msgid "Flash mode"
 msgstr ""
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
 msgid "Drive mode"
 msgstr ""
 
-#: src/minoltamn.cpp:631
-msgid "Exposure Speed"
-msgstr ""
-
-#: src/minoltamn.cpp:632
-msgid "Exposure speed"
+#: src/minoltamn.cpp:512
+msgid "ISO Value"
 msgstr ""
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr ""
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 msgid "FNumber"
 msgstr ""
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 msgid "The F-Number"
 msgstr ""
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 msgid "Macro Mode"
 msgstr ""
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
 msgid "Exposure Compensation"
 msgstr ""
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
 msgid "Bracket Step"
 msgstr ""
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
 msgid "Bracket step"
 msgstr ""
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
 msgid "Interval Length"
 msgstr ""
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
 msgid "Interval length"
 msgstr ""
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
 msgid "Interval Number"
 msgstr ""
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
 msgid "Interval number"
 msgstr ""
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
 msgid "Focus Distance"
 msgstr ""
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
 msgid "Focus distance"
 msgstr ""
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+msgid "Flash Fired"
+msgstr ""
+
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+msgid "Flash fired"
+msgstr ""
+
+#: src/minoltamn.cpp:547
 msgid "Minolta Date"
 msgstr ""
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
 msgid "Minolta date"
 msgstr ""
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
 msgid "Minolta Time"
 msgstr ""
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
 msgid "Minolta time"
 msgstr ""
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
 msgid "File Number Memory"
 msgstr ""
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
 msgid "File number memory"
 msgstr ""
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
-msgid "Image Number"
+#: src/minoltamn.cpp:559
+msgid "Last Image Number"
 msgstr ""
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:560
+msgid "Last image number"
+msgstr ""
+
+#: src/minoltamn.cpp:562
 msgid "Color Balance Red"
 msgstr ""
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
 msgid "Color balance red"
 msgstr ""
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
 msgid "Color Balance Green"
 msgstr ""
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
 msgid "Color balance green"
 msgstr ""
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
 msgid "Color Balance Blue"
 msgstr ""
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
 msgid "Color balance blue"
 msgstr ""
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
 msgid "Subject Program"
 msgstr ""
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
 msgid "Subject program"
 msgstr ""
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
-msgid "Flash Exposure Compensation"
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
+msgid "ISO Settings"
 msgstr ""
 
-#: src/minoltamn.cpp:704
-msgid "Flash exposure compensation in EV"
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
+msgid "ISO setting"
 msgstr ""
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
 msgid "Minolta Model"
 msgstr ""
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
 msgid "Minolta model"
 msgstr ""
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
 msgid "Interval Mode"
 msgstr ""
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
 msgid "Interval mode"
 msgstr ""
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
 msgid "Folder Name"
 msgstr ""
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
 msgid "Folder name"
 msgstr ""
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
 msgid "ColorMode"
 msgstr ""
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
 msgid "Color Filter"
 msgstr ""
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
 msgid "Color filter"
 msgstr ""
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
 msgid "Black and White Filter"
 msgstr ""
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
 msgid "Black and white filter"
 msgstr ""
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
 msgid "Internal Flash"
 msgstr ""
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr ""
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
 msgid "Spot Focus Point X"
 msgstr ""
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
 msgid "Spot focus point X"
 msgstr ""
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
 msgid "Spot Focus Point Y"
 msgstr ""
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
 msgid "Spot focus point Y"
 msgstr ""
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
 msgid "Wide Focus Zone"
 msgstr ""
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
 msgid "Wide focus zone"
 msgstr ""
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
 msgid "Focus mode"
 msgstr ""
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
 msgid "Focus area"
 msgstr ""
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
 msgid "DEC Switch Position"
 msgstr ""
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
 msgid "DEC switch position"
 msgstr ""
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
 msgid "Color Profile"
 msgstr ""
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
 msgid "Color profile"
 msgstr ""
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
 msgid "Data Imprint"
 msgstr ""
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
 msgid "Flash Metering"
 msgstr ""
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
 msgid "Flash metering"
 msgstr ""
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
 msgid "Unknown Minolta Camera Settings tag"
 msgstr ""
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
 msgid "Program-shift A"
 msgstr ""
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
 msgid "Program-shift S"
 msgstr ""
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
 msgid "Raw+Jpeg"
 msgstr ""
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
 msgid "Kelvin"
 msgstr ""
 
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
 msgid "Single-shot AF"
 msgstr ""
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
 msgid "Continuous AF"
 msgstr ""
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
 msgid "Automatic AF"
 msgstr ""
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
 msgid "sRGB (Natural)"
 msgstr ""
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
 msgid "sRGB (Natural+)"
 msgstr ""
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr ""
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
 msgid "AF Points"
 msgstr ""
 
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
 msgid "AF points"
 msgstr ""
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr ""
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 msgid "Color space"
 msgstr ""
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 msgid "Free Memory Card Images"
 msgstr ""
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 msgid "Free memory card images"
 msgstr ""
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
 msgid "Hue"
 msgstr ""
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
 msgid "Rotation"
 msgstr ""
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+msgid "Image Number"
+msgstr ""
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
 msgid "Noise reduction"
 msgstr ""
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
 msgid "Zone Matching On"
 msgstr ""
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
 msgid "Zone matching on"
 msgstr ""
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
 msgid "Unknown Minolta Camera Settings 7D tag"
 msgstr ""
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+msgid "Program Shift A"
 msgstr ""
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+msgid "Program Shift S"
+msgstr ""
+
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+msgid "Night View/Portrait"
+msgstr ""
+
+#: src/minoltamn.cpp:895
 msgid "200 (Zone Matching High)"
 msgstr ""
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
 msgid "80 (Zone Matching Low)"
 msgstr ""
 
-#: src/minoltamn.cpp:1065
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+msgid "Adobe RGB (ICC)"
+msgstr ""
+
+#: src/minoltamn.cpp:918
 msgid "Central"
 msgstr ""
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:919
 msgid "Up"
 msgstr ""
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
 msgid "Up right"
 msgstr ""
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
 msgid "Down right"
 msgstr ""
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
 msgid "Down"
 msgstr ""
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
 msgid "Down left"
 msgstr ""
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
 msgid "Up left"
 msgstr ""
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 msgid "Selection"
 msgstr ""
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+msgid "Natural+"
+msgstr ""
+
+#: src/minoltamn.cpp:949
+msgid "Wind Scene"
+msgstr ""
+
+#: src/minoltamn.cpp:950
+msgid "Evening Scene"
+msgstr ""
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus Position"
 msgstr ""
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus position"
 msgstr ""
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
 msgid "Focus Area"
 msgstr ""
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
 msgid "Exposure Revision"
 msgstr ""
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
 msgid "Exposure revision"
 msgstr ""
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+msgid "Rotation2"
+msgstr ""
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+msgid "Picture Finish"
+msgstr ""
+
+#: src/minoltamn.cpp:1059
 msgid "Exposure Manual Bias"
 msgstr ""
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
 msgid "Exposure manual bias"
 msgstr ""
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
 msgid "AF Mode"
 msgstr ""
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
 msgid "AF mode"
 msgstr ""
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
 msgid "Unknown Minolta Camera Settings 5D tag"
 msgstr ""
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
-msgid "Single area"
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
+msgid "Self-timer 10 sec"
 msgstr ""
 
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
-msgid "Dynamic area"
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
+msgid "Self-timer 2 sec"
 msgstr ""
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+msgid "White Balance Bracketing Low"
 msgstr ""
 
-#: src/nikonmn.cpp:77
-msgid "Group dynamic"
+#: src/minoltamn.cpp:1101
+msgid "White Balance Bracketing High"
 msgstr ""
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
+#: src/minoltamn.cpp:1102
+msgid "Single-frame Bracketing Low"
 msgstr ""
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
+#: src/minoltamn.cpp:1103
+msgid "Continous Bracketing Low"
 msgstr ""
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
-msgid "Upper-left"
+#: src/minoltamn.cpp:1104
+msgid "Single-frame Bracketing High"
 msgstr ""
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
-msgid "Upper-right"
+#: src/minoltamn.cpp:1105
+msgid "Continous Bracketing High"
 msgstr ""
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
-msgid "Lower-left"
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
 msgstr ""
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
-msgid "Lower-right"
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
+msgid "Continuous Bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:96
-msgid "Left-most"
+#: src/minoltamn.cpp:1152
+msgid "Single-Frame Bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:97
-msgid "Right-most"
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
+msgid "White Balance Bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
+msgid "Preset"
 msgstr ""
 
-#: src/nikonmn.cpp:131
-msgid "Fire, manual"
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
+msgid "Color Temperature/Color Filter"
 msgstr ""
 
-#: src/nikonmn.cpp:132
-msgid "Fire, external"
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
+msgid "Temperature"
 msgstr ""
 
-#: src/nikonmn.cpp:133
-msgid "Fire, commander mode"
+#: src/minoltamn.cpp:1209
+msgid "Setup"
 msgstr ""
 
-#: src/nikonmn.cpp:134
-msgid "Fire, TTL mode"
+#: src/minoltamn.cpp:1210
+msgid "Recall"
 msgstr ""
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
 msgstr ""
 
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
-msgid "PC control"
+#: src/minoltamn.cpp:1216
+msgid "Error"
 msgstr ""
 
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
-msgid "Exposure bracketing"
+#: src/minoltamn.cpp:1228
+msgid "Image and Information"
 msgstr ""
 
-#: src/nikonmn.cpp:143
-msgid "Auto ISO"
+#: src/minoltamn.cpp:1229
+msgid "Image Only"
 msgstr ""
 
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
-msgid "White balance bracketing"
+#: src/minoltamn.cpp:1230
+msgid "Image and Histogram"
 msgstr ""
 
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
-msgid "IR control"
+#: src/minoltamn.cpp:1236
+msgid "Fill Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
+#: src/minoltamn.cpp:1247
+msgid "Focus Hold"
 msgstr ""
 
-#: src/nikonmn.cpp:162
-msgid "Auto release"
+#: src/minoltamn.cpp:1248
+msgid "DOF Preview"
 msgstr ""
 
-#: src/nikonmn.cpp:163
-msgid "Manual release"
+#: src/minoltamn.cpp:1253
+msgid "Hold"
 msgstr ""
 
-#: src/nikonmn.cpp:168
-msgid "Lossy (type 1)"
+#: src/minoltamn.cpp:1254
+msgid "Toggle"
 msgstr ""
 
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
+#: src/minoltamn.cpp:1255
+msgid "Spot Hold"
 msgstr ""
 
-#: src/nikonmn.cpp:170
-msgid "Lossless"
+#: src/minoltamn.cpp:1256
+msgid "Spot Toggle"
 msgstr ""
 
-#: src/nikonmn.cpp:171
-msgid "Lossy (type 2)"
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+msgid "Shutter Speed"
 msgstr ""
 
-#: src/nikonmn.cpp:177
-msgid "B & W"
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:179
-msgid "Trim"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
 msgstr ""
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
 msgstr ""
 
-#: src/nikonmn.cpp:181
-msgid "D-Lighting"
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
 msgstr ""
 
-#: src/nikonmn.cpp:182
-msgid "Red eye"
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
+msgid "Automatic"
 msgstr ""
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
-msgid "Cyanotype"
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
+msgid "Auto-rotate"
 msgstr ""
 
-#: src/nikonmn.cpp:184
-msgid "Sky light"
+#: src/minoltamn.cpp:1287
+msgid "Horizontal"
 msgstr ""
 
-#: src/nikonmn.cpp:185
-msgid "Warm tone"
+#: src/minoltamn.cpp:1293
+msgid "Manual Rotate"
 msgstr ""
 
-#: src/nikonmn.cpp:186
-msgid "Color custom"
+#: src/minoltamn.cpp:1298
+msgid "Within Range"
 msgstr ""
 
-#: src/nikonmn.cpp:187
-msgid "Image overlay"
+#: src/minoltamn.cpp:1299
+msgid "Under/Over Range"
 msgstr ""
 
-#: src/nikonmn.cpp:193
-msgid "Minimal"
+#: src/minoltamn.cpp:1300
+msgid "Out of Range"
 msgstr ""
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
-msgid "Nikon Makernote version"
+#: src/minoltamn.cpp:1305
+msgid "Not Indicated"
 msgstr ""
 
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
-msgid "ISO Speed"
+#: src/minoltamn.cpp:1306
+msgid "Under Scale"
 msgstr ""
 
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
-msgid "Sharpening"
+#: src/minoltamn.cpp:1307
+msgid "Bottom of Scale"
 msgstr ""
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
-msgid "Image sharpening setting"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
 msgstr ""
 
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
-msgid "Focus"
+#: src/minoltamn.cpp:1326
+msgid "Over Scale"
 msgstr ""
 
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
-msgid "Flash Setting"
+#: src/minoltamn.cpp:1331
+msgid "AM"
 msgstr ""
 
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
-msgid "Flash setting"
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
 msgstr ""
 
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
-msgid "ISO Selection"
+#: src/minoltamn.cpp:1338
+msgid "Built-in"
 msgstr ""
 
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
-msgid "ISO selection"
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
+msgid "Very Low"
 msgstr ""
 
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data Dump"
+#: src/minoltamn.cpp:1346
+msgid "Half Full"
 msgstr ""
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data dump"
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
 msgstr ""
 
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
-msgid "Image Adjustment"
+#: src/minoltamn.cpp:1355
+msgid "Exposure Compensation Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
-msgid "Image adjustment setting"
+#: src/minoltamn.cpp:1356
+msgid "Exposure compensation setting"
 msgstr ""
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
-msgid "Auxiliary Lens"
+#: src/minoltamn.cpp:1358
+msgid "High Speed Sync"
 msgstr ""
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
+#: src/minoltamn.cpp:1359
+msgid "High speed sync"
 msgstr ""
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
-msgid "Manual focus distance"
+#: src/minoltamn.cpp:1361
+msgid "Manual Exposure Time"
 msgstr ""
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
-msgid "Digital zoom setting"
+#: src/minoltamn.cpp:1362
+msgid "Manual exposure time"
 msgstr ""
 
-#: src/nikonmn.cpp:246
-msgid "AF Focus Position"
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
+msgid "Manual FNumber"
 msgstr ""
 
-#: src/nikonmn.cpp:247
-msgid "AF focus position information"
+#: src/minoltamn.cpp:1373
+msgid "Drive Mode 2"
 msgstr ""
 
-#: src/nikonmn.cpp:252
-msgid "Unknown Nikon1MakerNote tag"
+#: src/minoltamn.cpp:1374
+msgid "Drive mode 2"
 msgstr ""
 
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
 msgstr ""
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
+msgid "AF Area Mode"
 msgstr ""
 
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
-msgid "Not used"
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
+msgid "FlashMode"
 msgstr ""
 
-#: src/nikonmn.cpp:353
-msgid "guess"
+#: src/minoltamn.cpp:1391
+msgid "Flash Exposure Comp Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
+#: src/minoltamn.cpp:1392
+msgid "Flash exposure compensation setting"
 msgstr ""
 
-#: src/nikonmn.cpp:401
-msgid "VGA Normal"
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
+msgid "ISO Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:402
-msgid "VGA Fine"
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
+msgid "Zone Matching Mode"
 msgstr ""
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
+msgid "Dynamic Range Optimizer Mode"
 msgstr ""
 
-#: src/nikonmn.cpp:404
-msgid "SXGA Normal"
+#: src/minoltamn.cpp:1404
+msgid "Dynamic range optimizer mode"
 msgstr ""
 
-#: src/nikonmn.cpp:405
-msgid "SXGA Fine"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
 msgstr ""
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
-msgid "Monochrome"
+#: src/minoltamn.cpp:1430
+msgid "Self Timer Time"
 msgstr ""
 
-#: src/nikonmn.cpp:417
-msgid "Bright+"
+#: src/minoltamn.cpp:1431
+msgid "Self timer time"
 msgstr ""
 
-#: src/nikonmn.cpp:418
-msgid "Bright-"
+#: src/minoltamn.cpp:1434
+msgid "Continuous bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:419
-msgid "Contrast+"
+#: src/minoltamn.cpp:1436
+msgid "Single Frame Bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:420
-msgid "Contrast-"
+#: src/minoltamn.cpp:1437
+msgid "Single frame bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
+msgid "White balance bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
+#: src/minoltamn.cpp:1442
+msgid "White Balance Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:479
-msgid "Unknown Nikon2MakerNote tag"
+#: src/minoltamn.cpp:1445
+msgid "Preset White Balance"
 msgstr ""
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
-msgid "Flash Device"
+#: src/minoltamn.cpp:1446
+msgid "Preset white balance"
 msgstr ""
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
-msgid "Flash device"
+#: src/minoltamn.cpp:1448
+msgid "Color Temperature Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
-msgid "White Balance Bias"
+#: src/minoltamn.cpp:1449
+msgid "Color temperature setting"
 msgstr ""
 
-#: src/nikonmn.cpp:522
-msgid "White balance bias"
+#: src/minoltamn.cpp:1451
+msgid "Custom WB Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB Levels"
+#: src/minoltamn.cpp:1452
+msgid "Custom WB setting"
 msgstr ""
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB levels"
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
+msgid "Dynamic Range Optimizer Settings"
 msgstr ""
 
-#: src/nikonmn.cpp:524
-msgid "Program Shift"
+#: src/minoltamn.cpp:1460
+msgid "Custom WB Red Level"
 msgstr ""
 
-#: src/nikonmn.cpp:524
-msgid "Program shift"
+#: src/minoltamn.cpp:1461
+msgid "Custom WB red level"
 msgstr ""
 
-#: src/nikonmn.cpp:525
-msgid "Exposure Difference"
+#: src/minoltamn.cpp:1463
+msgid "Custom WB Green Level"
 msgstr ""
 
-#: src/nikonmn.cpp:525
-msgid "Exposure difference"
+#: src/minoltamn.cpp:1464
+msgid "Custom WB green level"
 msgstr ""
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
+#: src/minoltamn.cpp:1466
+msgid "Custom WB Blue Level"
 msgstr ""
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
+#: src/minoltamn.cpp:1467
+msgid "CustomWB blue level"
 msgstr ""
 
-#: src/nikonmn.cpp:529
-msgid "Flash Comp"
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
+msgid "Custom WB Error"
 msgstr ""
 
-#: src/nikonmn.cpp:529
-msgid "Flash compensation setting"
+#: src/minoltamn.cpp:1473
+msgid "White balance fine tune"
 msgstr ""
 
-#: src/nikonmn.cpp:530
-msgid "ISO Settings"
+#: src/minoltamn.cpp:1479
+msgid "Color compensation filter"
 msgstr ""
 
-#: src/nikonmn.cpp:530
-msgid "ISO setting"
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
+msgid "Sony Image Size"
 msgstr ""
 
-#: src/nikonmn.cpp:531
-msgid "Image Boundary"
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
 msgstr ""
 
-#: src/nikonmn.cpp:531
-msgid "Image boundary"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
 msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash Bracket Comp"
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
 msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash bracket compensation applied"
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "Exposure Bracket Comp"
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "AE bracket compensation applied"
+#: src/minoltamn.cpp:1497
+msgid "Eye start AF"
 msgstr ""
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
-msgid "Image Processing"
+#: src/minoltamn.cpp:1499
+msgid "Red Eye Reduction"
 msgstr ""
 
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
-msgid "Image processing"
+#: src/minoltamn.cpp:1500
+msgid "Red eye reduction"
 msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
+#: src/minoltamn.cpp:1502
+msgid "Flash Default"
 msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
+#: src/minoltamn.cpp:1503
+msgid "Flash default"
 msgstr ""
 
-#: src/nikonmn.cpp:539
-msgid "VR Info"
+#: src/minoltamn.cpp:1505
+msgid "Auto Bracket Order"
 msgstr ""
 
-#: src/nikonmn.cpp:539
-msgid "VR info"
+#: src/minoltamn.cpp:1506
+msgid "Auto bracket order"
 msgstr ""
 
-#: src/nikonmn.cpp:540
-msgid "Image Authentication"
+#: src/minoltamn.cpp:1508
+msgid "Focus Hold Button"
 msgstr ""
 
-#: src/nikonmn.cpp:540
-msgid "Image authentication"
+#: src/minoltamn.cpp:1509
+msgid "Focus hold button"
 msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
+#: src/minoltamn.cpp:1511
+msgid "AEL Button"
 msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
+#: src/minoltamn.cpp:1512
+msgid "AEL button"
 msgstr ""
 
-#: src/nikonmn.cpp:542
-msgid "Picture Control"
+#: src/minoltamn.cpp:1514
+msgid "Control Dial Set"
 msgstr ""
 
-#: src/nikonmn.cpp:542
-msgid " Picture control"
+#: src/minoltamn.cpp:1515
+msgid "Control dial set"
 msgstr ""
 
-#: src/nikonmn.cpp:543
-msgid "World Time"
+#: src/minoltamn.cpp:1517
+msgid "Exposure Compensation Mode"
 msgstr ""
 
-#: src/nikonmn.cpp:543
-msgid "World time"
+#: src/minoltamn.cpp:1518
+msgid "Exposure compensation mode"
 msgstr ""
 
-#: src/nikonmn.cpp:544
-msgid "ISO Info"
+#: src/minoltamn.cpp:1521
+msgid "AF assist"
 msgstr ""
 
-#: src/nikonmn.cpp:544
-msgid "ISO info"
+#: src/minoltamn.cpp:1523
+msgid "Card Shutter Lock"
 msgstr ""
 
-#: src/nikonmn.cpp:545
-msgid "Vignette Control"
+#: src/minoltamn.cpp:1524
+msgid "Card shutter lock"
 msgstr ""
 
-#: src/nikonmn.cpp:545
-msgid "Vignette control"
+#: src/minoltamn.cpp:1526
+msgid "Lens Shutter Lock"
 msgstr ""
 
-#: src/nikonmn.cpp:547
-msgid "Tone Compensation"
+#: src/minoltamn.cpp:1527
+msgid "Lens shutter lock"
 msgstr ""
 
-#: src/nikonmn.cpp:547
-msgid "Tone compensation"
+#: src/minoltamn.cpp:1529
+msgid "AF Area Illumination"
 msgstr ""
 
-#: src/nikonmn.cpp:553
-msgid "Mode of flash used"
+#: src/minoltamn.cpp:1530
+msgid "AF area illumination"
 msgstr ""
 
-#: src/nikonmn.cpp:554
-msgid "AF Info"
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
 msgstr ""
 
-#: src/nikonmn.cpp:554
-msgid "AF info"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
 msgstr ""
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
-msgid "Shooting Mode"
+#: src/minoltamn.cpp:1535
+msgid "Record Display"
 msgstr ""
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
-msgid "Shooting mode"
+#: src/minoltamn.cpp:1536
+msgid "Record display"
 msgstr ""
 
-#: src/nikonmn.cpp:556
-msgid "Auto Bracket Release"
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
 msgstr ""
 
-#: src/nikonmn.cpp:556
-msgid "Auto bracket release"
+#: src/minoltamn.cpp:1539
+msgid "Play display"
 msgstr ""
 
-#: src/nikonmn.cpp:557
-msgid "Lens FStops"
+#: src/minoltamn.cpp:1541
+msgid "Exposure Indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:558
-msgid "Contrast Curve"
+#: src/minoltamn.cpp:1542
+msgid "Exposure indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:558
-msgid "Contrast curve"
+#: src/minoltamn.cpp:1544
+msgid "AEL Exposure Indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:559
-msgid "Color Hue"
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:559
-msgid "Color hue"
+#: src/minoltamn.cpp:1547
+msgid "Exposure Bracketing Indicator Last"
 msgstr ""
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene Mode"
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene mode"
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
 msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
-msgid "Light source"
+#: src/minoltamn.cpp:1553
+msgid "Flash Exposure Indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:562
-msgid "Shot info"
+#: src/minoltamn.cpp:1554
+msgid "Flash exposure indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue Adjustment"
+#: src/minoltamn.cpp:1556
+msgid "Flash Exposure Indicator Next"
 msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue adjustment"
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:564
-msgid "NEF Compression"
+#: src/minoltamn.cpp:1559
+msgid "Flash Exposure Indicator Last"
 msgstr ""
 
-#: src/nikonmn.cpp:564
-msgid "NEF compression"
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
-msgid "Linearization Table"
+#: src/minoltamn.cpp:1565
+msgid "Focus Mode Switch"
 msgstr ""
 
-#: src/nikonmn.cpp:567
-msgid "Linearization table"
+#: src/minoltamn.cpp:1566
+msgid "Focus mode switch"
 msgstr ""
 
-#: src/nikonmn.cpp:568
-msgid "Color Balance"
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
+msgid "Flash Type"
 msgstr ""
 
-#: src/nikonmn.cpp:568
-msgid "Color balance"
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
+msgid "Flash type"
 msgstr ""
 
-#: src/nikonmn.cpp:569
-msgid "Lens Data"
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
+msgid "AE Lock"
 msgstr ""
 
-#: src/nikonmn.cpp:569
-msgid "Lens data settings"
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
 msgstr ""
 
-#: src/nikonmn.cpp:570
-msgid "Raw Image Center"
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
 msgstr ""
 
-#: src/nikonmn.cpp:570
-msgid "Raw image center"
+#: src/minoltamn.cpp:1584
+msgid "Battery level"
 msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
+#: src/minoltamn.cpp:1588
+msgid "Unknown Sony Camera Settings A100 tag"
 msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
+msgid "Clear"
 msgstr ""
 
-#: src/nikonmn.cpp:573
-msgid "Scene Assist"
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
+msgid "Deep"
 msgstr ""
 
-#: src/nikonmn.cpp:573
-msgid "Scene assist"
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
+msgid "Light"
 msgstr ""
 
-#: src/nikonmn.cpp:574
-msgid "Retouch History"
+#: src/minoltamn.cpp:1897
+msgid "Night View"
 msgstr ""
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
 msgstr ""
 
-#: src/nikonmn.cpp:576
-msgid "Serial NO"
+#: src/minoltamn.cpp:1937
+msgid "Local"
 msgstr ""
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
+#: src/minoltamn.cpp:1952
+msgid "Top-Right"
 msgstr ""
 
-#: src/nikonmn.cpp:577
-msgid "Image Data Size"
+#: src/minoltamn.cpp:1954
+msgid "Bottom-Right"
 msgstr ""
 
-#: src/nikonmn.cpp:577
-msgid "Image data size"
+#: src/minoltamn.cpp:1956
+msgid "Bottom-Left"
 msgstr ""
 
-#: src/nikonmn.cpp:579
-msgid "Image Count"
+#: src/minoltamn.cpp:1958
+msgid "Top-Left"
 msgstr ""
 
-#: src/nikonmn.cpp:579
-msgid "Image count"
+#: src/minoltamn.cpp:1959
+msgid "Far-Right"
 msgstr ""
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
-msgid "Deleted Image Count"
+#: src/minoltamn.cpp:1960
+msgid "Far-Left"
 msgstr ""
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
-msgid "Deleted image count"
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
+msgid "Advanced Auto"
 msgstr ""
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
-msgid "Shutter Count"
+#: src/minoltamn.cpp:1975
+msgid "Advanced Level"
 msgstr ""
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
+#: src/minoltamn.cpp:1988
+msgid "AF"
 msgstr ""
 
-#: src/nikonmn.cpp:582
-msgid "Flash info"
+#: src/minoltamn.cpp:1989
+msgid "Release"
 msgstr ""
 
-#: src/nikonmn.cpp:583
-msgid "Image Optimization"
+#: src/minoltamn.cpp:2001
+msgid "RAW "
 msgstr ""
 
-#: src/nikonmn.cpp:583
-msgid "Image optimization"
+#: src/minoltamn.cpp:2002
+msgid "CRAW "
 msgstr ""
 
-#: src/nikonmn.cpp:585
-msgid "Program Variation"
+#: src/minoltamn.cpp:2005
+msgid "RAW+JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:585
-msgid "Program variation"
+#: src/minoltamn.cpp:2006
+msgid "CRAW+JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:587
-msgid "AF Response"
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:587
-msgid "AF response"
+#: src/minoltamn.cpp:2063
+msgid "Compressed Raw"
 msgstr ""
 
-#: src/nikonmn.cpp:588
-msgid "Multi exposure"
+#: src/minoltamn.cpp:2064
+msgid "Compressed Raw + JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:589
-msgid "High ISO Noise Reduction"
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
-msgid "Toning effect"
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:591
-msgid "AF info 2"
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:592
-msgid "File info"
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:595
-msgid "Capture Data"
+#: src/minoltamn.cpp:2110
+msgid "ISO Setting Used"
 msgstr ""
 
-#: src/nikonmn.cpp:595
-msgid "Capture data"
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
+msgid "High Key"
 msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture Version"
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
 msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture version"
+#: src/nikonmn.cpp:80
+msgid "Extra High"
 msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture Offsets"
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
+msgid "Single area"
 msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture offsets"
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
+msgid "Dynamic area"
 msgstr ""
 
-#: src/nikonmn.cpp:599
-msgid "Scan IFD"
+#: src/nikonmn.cpp:88
+msgid "Dynamic area, closest subject"
 msgstr ""
 
-#: src/nikonmn.cpp:600
-msgid "ICC profile"
+#: src/nikonmn.cpp:89
+msgid "Group dynamic"
 msgstr ""
 
-#: src/nikonmn.cpp:601
-msgid "Capture output"
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
 msgstr ""
 
-#: src/nikonmn.cpp:603
-msgid "Unknown Nikon3MakerNote tag"
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
+msgid "Dynamic area (wide)"
 msgstr ""
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
+msgid "Upper-left"
 msgstr ""
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
-msgid "Yes"
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
+msgid "Upper-right"
 msgstr ""
 
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
+msgid "Lower-left"
 msgstr ""
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
+msgid "Lower-right"
 msgstr ""
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
+#: src/nikonmn.cpp:108
+msgid "Left-most"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-msgid "Vibration Reduction"
+#: src/nikonmn.cpp:109
+msgid "Right-most"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-msgid "Vibration reduction"
+#: src/nikonmn.cpp:143
+msgid "Fire, manual"
 msgstr ""
 
-#: src/nikonmn.cpp:635
-msgid "Unknown Nikon Vibration Reduction Tag"
+#: src/nikonmn.cpp:144
+msgid "Fire, external"
 msgstr ""
 
-#: src/nikonmn.cpp:645
-msgid "Default Settings"
+#: src/nikonmn.cpp:145
+msgid "Fire, commander mode"
 msgstr ""
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
-msgid "Quick Adjust"
+#: src/nikonmn.cpp:146
+msgid "Fire, TTL mode"
 msgstr ""
 
-#: src/nikonmn.cpp:647
-msgid "Full Control"
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
+msgid "Delay"
 msgstr ""
 
-#: src/nikonmn.cpp:668
-msgid "Blue-green"
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
+msgid "PC control"
 msgstr ""
 
-#: src/nikonmn.cpp:670
-msgid "Purple-blue"
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
+msgid "Exposure bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:671
-msgid "Red-purple"
+#: src/nikonmn.cpp:155
+msgid "Auto ISO"
 msgstr ""
 
-#: src/nikonmn.cpp:678
-msgid "Name"
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
+msgid "IR control"
 msgstr ""
 
-#: src/nikonmn.cpp:679
-msgid "Base"
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
 msgstr ""
 
-#: src/nikonmn.cpp:680
-msgid "Adjust"
+#: src/nikonmn.cpp:174
+msgid "Auto release"
 msgstr ""
 
-#: src/nikonmn.cpp:681
-msgid "Quick adjust"
+#: src/nikonmn.cpp:175
+msgid "Manual release"
 msgstr ""
 
-#: src/nikonmn.cpp:687
-msgid "Filter effect"
+#: src/nikonmn.cpp:180
+msgid "Lossy (type 1)"
 msgstr ""
 
-#: src/nikonmn.cpp:689
-msgid "Toning Saturation"
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+msgid "Uncompressed"
 msgstr ""
 
-#: src/nikonmn.cpp:689
-msgid "Toning saturation"
+#: src/nikonmn.cpp:182
+msgid "Lossless"
 msgstr ""
 
-#: src/nikonmn.cpp:691
-msgid "Unknown Nikon Picture Control Tag"
+#: src/nikonmn.cpp:183
+msgid "Lossy (type 2)"
 msgstr ""
 
-#: src/nikonmn.cpp:701
-msgid "Timezone"
+#: src/nikonmn.cpp:189
+msgid "B & W"
 msgstr ""
 
-#: src/nikonmn.cpp:702
-msgid "Daylight Savings"
+#: src/nikonmn.cpp:191
+msgid "Trim"
 msgstr ""
 
-#: src/nikonmn.cpp:702
-msgid "Daylight savings"
+#: src/nikonmn.cpp:192
+msgid "Small picture"
 msgstr ""
 
-#: src/nikonmn.cpp:703
-msgid "Date Display Format"
+#: src/nikonmn.cpp:193
+msgid "D-Lighting"
 msgstr ""
 
-#: src/nikonmn.cpp:703
-msgid "Date display format"
+#: src/nikonmn.cpp:194
+msgid "Red eye"
 msgstr ""
 
-#: src/nikonmn.cpp:705
-msgid "Unknown Nikon World Time Tag"
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
+msgid "Cyanotype"
 msgstr ""
 
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
+#: src/nikonmn.cpp:196
+msgid "Sky light"
 msgstr ""
 
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
+#: src/nikonmn.cpp:197
+msgid "Warm tone"
 msgstr ""
 
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
+#: src/nikonmn.cpp:198
+msgid "Color custom"
 msgstr ""
 
-#: src/nikonmn.cpp:719
-msgid "Hi 1.0"
+#: src/nikonmn.cpp:199
+msgid "Image overlay"
 msgstr ""
 
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
+#: src/nikonmn.cpp:205
+msgid "Minimal"
 msgstr ""
 
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
+msgid "Nikon Makernote version"
 msgstr ""
 
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
+msgid "ISO Speed"
 msgstr ""
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
+msgid "Sharpening"
 msgstr ""
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
+msgid "Image sharpening setting"
 msgstr ""
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
+msgid "Focus"
 msgstr ""
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
+msgid "Flash Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
+msgid "Flash setting"
 msgstr ""
 
-#: src/nikonmn.cpp:733
-msgid "ISO Expansion"
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
+msgid "ISO Selection"
 msgstr ""
 
-#: src/nikonmn.cpp:733
-msgid "ISO expansion"
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
+msgid "ISO selection"
 msgstr ""
 
-#: src/nikonmn.cpp:734
-msgid "ISO 2"
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data Dump"
 msgstr ""
 
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data dump"
 msgstr ""
 
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+msgid "Image Adjustment"
 msgstr ""
 
-#: src/nikonmn.cpp:737
-msgid "Unknown Nikon Iso Info Tag"
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+msgid "Image adjustment setting"
 msgstr ""
 
-#: src/nikonmn.cpp:747
-msgid "Single Area"
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+msgid "Auxiliary Lens"
 msgstr ""
 
-#: src/nikonmn.cpp:748
-msgid "Dynamic Area"
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+msgid "Auxiliary lens (adapter)"
 msgstr ""
 
-#: src/nikonmn.cpp:749
-msgid "Dynamic Area, Closest Subject"
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
+msgid "Manual focus distance"
 msgstr ""
 
-#: src/nikonmn.cpp:750
-msgid "Group Dynamic"
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
+msgid "Digital zoom setting"
 msgstr ""
 
-#: src/nikonmn.cpp:751
-msgid "Single Area (wide)"
+#: src/nikonmn.cpp:258
+msgid "AF Focus Position"
 msgstr ""
 
-#: src/nikonmn.cpp:752
-msgid "Dynamic Area (wide)"
+#: src/nikonmn.cpp:259
+msgid "AF focus position information"
 msgstr ""
 
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
-msgid "Mid-left"
+#: src/nikonmn.cpp:263
+msgid "Unknown Nikon1MakerNote tag"
 msgstr ""
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
-msgid "Mid-right"
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+msgid "Continuous autofocus"
 msgstr ""
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
-msgid "Far Left"
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
+msgid "Single autofocus"
 msgstr ""
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
-msgid "Far Right"
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
+msgid "Not used"
 msgstr ""
 
-#: src/nikonmn.cpp:787
-msgid "AF Area Mode"
+#: src/nikonmn.cpp:365
+msgid "guess"
 msgstr ""
 
-#: src/nikonmn.cpp:787
-msgid "AF area mode"
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
 msgstr ""
 
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
-msgid "AF point"
+#: src/nikonmn.cpp:413
+msgid "VGA Normal"
 msgstr ""
 
-#: src/nikonmn.cpp:789
-msgid "AF Points In Focus"
+#: src/nikonmn.cpp:414
+msgid "VGA Fine"
 msgstr ""
 
-#: src/nikonmn.cpp:789
-msgid "AF points in focus"
+#: src/nikonmn.cpp:415
+msgid "SXGA Basic"
 msgstr ""
 
-#: src/nikonmn.cpp:791
-msgid "Unknown Nikon Auto Focus Tag"
+#: src/nikonmn.cpp:416
+msgid "SXGA Normal"
 msgstr ""
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
-msgid "Shutter count"
+#: src/nikonmn.cpp:417
+msgid "SXGA Fine"
 msgstr ""
 
-#: src/nikonmn.cpp:804
-msgid "Unknown Nikon Shot Info D80 Tag"
+#: src/nikonmn.cpp:429
+msgid "Bright+"
 msgstr ""
 
-#: src/nikonmn.cpp:816
-msgid "Flash Level"
+#: src/nikonmn.cpp:430
+msgid "Bright-"
 msgstr ""
 
-#: src/nikonmn.cpp:816
-msgid "Flash level"
+#: src/nikonmn.cpp:431
+msgid "Contrast+"
 msgstr ""
 
-#: src/nikonmn.cpp:818
-msgid "Unknown Nikon Shot Info D40 Tag"
+#: src/nikonmn.cpp:432
+msgid "Contrast-"
 msgstr ""
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
-msgid "0"
+#: src/nikonmn.cpp:451
+msgid "Speedlight"
 msgstr ""
 
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
-msgid "+1"
+#: src/nikonmn.cpp:491
+msgid "Unknown Nikon2MakerNote tag"
 msgstr ""
 
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
-msgid "+2"
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
+msgid "Flash Device"
 msgstr ""
 
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
-msgid "+4"
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
+msgid "Flash device"
 msgstr ""
 
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
-msgid "+8"
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
+msgid "White Balance Bias"
 msgstr ""
 
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
-msgid "+16"
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
+msgid "White balance bias"
 msgstr ""
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
-msgid "-16"
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+msgid "WB RB Levels"
 msgstr ""
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
-msgid "-8"
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+msgid "WB RB levels"
 msgstr ""
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
-msgid "-4"
+#: src/nikonmn.cpp:536
+msgid "Program Shift"
 msgstr ""
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
-msgid "-2"
+#: src/nikonmn.cpp:536
+msgid "Program shift"
 msgstr ""
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
-msgid "-1"
+#: src/nikonmn.cpp:537
+msgid "Exposure Difference"
 msgstr ""
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
-msgid "+17"
+#: src/nikonmn.cpp:537
+msgid "Exposure difference"
 msgstr ""
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
-msgid "-17"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+msgid "Pointer to a preview image"
 msgstr ""
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
-msgid "+9"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+msgid "Offset to an IFD containing a preview image"
 msgstr ""
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
-msgid "+18"
+#: src/nikonmn.cpp:541
+msgid "Flash Comp"
 msgstr ""
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
-msgid "-18"
+#: src/nikonmn.cpp:541
+msgid "Flash compensation setting"
 msgstr ""
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
-msgid "-9"
+#: src/nikonmn.cpp:543
+msgid "Image Boundary"
 msgstr ""
 
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
-msgid "+19"
+#: src/nikonmn.cpp:543
+msgid "Image boundary"
 msgstr ""
 
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
-msgid "-19"
+#: src/nikonmn.cpp:544
+msgid "Flash exposure comp"
 msgstr ""
 
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
-msgid "+5"
+#: src/nikonmn.cpp:545
+msgid "Flash Bracket Comp"
 msgstr ""
 
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
-msgid "+10"
+#: src/nikonmn.cpp:545
+msgid "Flash bracket compensation applied"
 msgstr ""
 
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
-msgid "+20"
+#: src/nikonmn.cpp:546
+msgid "Exposure Bracket Comp"
 msgstr ""
 
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
-msgid "-20"
+#: src/nikonmn.cpp:546
+msgid "AE bracket compensation applied"
 msgstr ""
 
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
-msgid "-10"
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
+msgid "Image Processing"
 msgstr ""
 
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
-msgid "-5"
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+msgid "Image processing"
 msgstr ""
 
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
-msgid "+11"
+#: src/nikonmn.cpp:548
+msgid "Crop High Speed"
 msgstr ""
 
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
-msgid "-11"
+#: src/nikonmn.cpp:548
+msgid "Crop high speed"
 msgstr ""
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
-msgid "+3"
+#: src/nikonmn.cpp:549
+msgid "Exposure Tuning"
 msgstr ""
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
-msgid "+6"
+#: src/nikonmn.cpp:549
+msgid "Exposure tuning"
 msgstr ""
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
-msgid "+12"
+#: src/nikonmn.cpp:552
+msgid "VR Info"
 msgstr ""
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
-msgid "-12"
+#: src/nikonmn.cpp:552
+msgid "VR info"
 msgstr ""
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
-msgid "-6"
+#: src/nikonmn.cpp:553
+msgid "Image Authentication"
 msgstr ""
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
-msgid "-3"
+#: src/nikonmn.cpp:553
+msgid "Image authentication"
 msgstr ""
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
-msgid "+13"
+#: src/nikonmn.cpp:554
+msgid "ActiveD-Lighting"
 msgstr ""
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
-msgid "-13"
+#: src/nikonmn.cpp:554
+msgid "ActiveD-lighting"
 msgstr ""
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
-msgid "+7"
+#: src/nikonmn.cpp:555
+msgid "Picture Control"
 msgstr ""
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
-msgid "+14"
+#: src/nikonmn.cpp:555
+msgid " Picture control"
 msgstr ""
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
-msgid "-14"
+#: src/nikonmn.cpp:556
+msgid "World Time"
 msgstr ""
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
-msgid "-7"
+#: src/nikonmn.cpp:556
+msgid "World time"
 msgstr ""
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
-msgid "+15"
+#: src/nikonmn.cpp:557
+msgid "ISO Info"
 msgstr ""
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
-msgid "-15"
+#: src/nikonmn.cpp:557
+msgid "ISO info"
 msgstr ""
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
-msgid "AF Fine Tune Adj"
+#: src/nikonmn.cpp:558
+msgid "Vignette Control"
 msgstr ""
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
-msgid "AF fine tune adj"
+#: src/nikonmn.cpp:558
+msgid "Vignette control"
 msgstr ""
 
-#: src/nikonmn.cpp:878
-msgid "Unknown Nikon Shot Info D300 (a) Tag"
+#: src/nikonmn.cpp:560
+msgid "Tone Compensation"
 msgstr ""
 
-#: src/nikonmn.cpp:938
-msgid "Unknown Nikon Shot Info D300 (b) Tag"
+#: src/nikonmn.cpp:560
+msgid "Tone compensation"
 msgstr ""
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
+#: src/nikonmn.cpp:566
+msgid "Mode of flash used"
 msgstr ""
 
-#: src/nikonmn.cpp:950
-msgid "On (2)"
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
+msgid "Shooting Mode"
 msgstr ""
 
-#: src/nikonmn.cpp:951
-msgid "On (3)"
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
+msgid "Shooting mode"
 msgstr ""
 
-#: src/nikonmn.cpp:964
-msgid "Shutter Count 1"
+#: src/nikonmn.cpp:569
+msgid "Auto Bracket Release"
 msgstr ""
 
-#: src/nikonmn.cpp:964
-msgid "Shutter count 1"
+#: src/nikonmn.cpp:569
+msgid "Auto bracket release"
 msgstr ""
 
-#: src/nikonmn.cpp:968
-msgid "Shutter Count 2"
+#: src/nikonmn.cpp:570
+msgid "Lens FStops"
 msgstr ""
 
-#: src/nikonmn.cpp:968
-msgid "Shutter count 2"
+#: src/nikonmn.cpp:571
+msgid "Contrast Curve"
 msgstr ""
 
-#: src/nikonmn.cpp:969
-msgid "Vibration Reduction 2"
+#: src/nikonmn.cpp:571
+msgid "Contrast curve"
 msgstr ""
 
-#: src/nikonmn.cpp:969
-msgid "Vibration reduction 2"
+#: src/nikonmn.cpp:572
+msgid "Color Hue"
 msgstr ""
 
-#: src/nikonmn.cpp:973
-msgid "Unknown Nikon Shot Info Tag"
+#: src/nikonmn.cpp:572
+msgid "Color hue"
 msgstr ""
 
-#: src/nikonmn.cpp:984
-msgid "WB RBGG Levels"
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
+msgid "Scene mode"
 msgstr ""
 
-#: src/nikonmn.cpp:984
-msgid "WB RBGG levels"
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
+msgid "Light Source"
 msgstr ""
 
-#: src/nikonmn.cpp:986
-msgid "Unknown Nikon Color Balance 1 Tag"
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
+msgid "Light source"
 msgstr ""
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
-msgid "WB RGGB Levels"
+#: src/nikonmn.cpp:575
+msgid "Shot info"
 msgstr ""
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
-msgid "WB RGGB levels"
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue Adjustment"
 msgstr ""
 
-#: src/nikonmn.cpp:999
-msgid "Unknown Nikon Color Balance 2 Tag"
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue adjustment"
 msgstr ""
 
-#: src/nikonmn.cpp:1012
-msgid "Unknown Nikon Color Balance 2a Tag"
+#: src/nikonmn.cpp:577
+msgid "NEF Compression"
 msgstr ""
 
-#: src/nikonmn.cpp:1025
-msgid "Unknown Nikon Color Balance 2b Tag"
+#: src/nikonmn.cpp:577
+msgid "NEF compression"
 msgstr ""
 
-#: src/nikonmn.cpp:1036
-msgid "WB RGBG Levels"
+#: src/nikonmn.cpp:580 src/tags.cpp:903
+msgid "Linearization Table"
 msgstr ""
 
-#: src/nikonmn.cpp:1036
-msgid "WB RGBG levels"
+#: src/nikonmn.cpp:580
+msgid "Linearization table"
 msgstr ""
 
-#: src/nikonmn.cpp:1038
-msgid "Unknown Nikon Color Balance 3 Tag"
+#: src/nikonmn.cpp:581
+msgid "Color Balance"
 msgstr ""
 
-#: src/nikonmn.cpp:1049
-msgid "WB GRBG Levels"
+#: src/nikonmn.cpp:581
+msgid "Color balance"
 msgstr ""
 
-#: src/nikonmn.cpp:1049
-msgid "WB GRBG levels"
+#: src/nikonmn.cpp:582
+msgid "Lens Data"
 msgstr ""
 
-#: src/nikonmn.cpp:1051
-msgid "Unknown Nikon Color Balance 4 Tag"
+#: src/nikonmn.cpp:582
+msgid "Lens data settings"
 msgstr ""
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
-msgid "Lens ID Number"
+#: src/nikonmn.cpp:583
+msgid "Raw Image Center"
 msgstr ""
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
-msgid "Lens ID number"
+#: src/nikonmn.cpp:583
+msgid "Raw image center"
 msgstr ""
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
-msgid "Lens F-Stops"
+#: src/nikonmn.cpp:584
+msgid "Sensor Pixel Size"
 msgstr ""
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
-msgid "Lens F-stops"
+#: src/nikonmn.cpp:584
+msgid "Sensor pixel size"
 msgstr ""
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
-msgid "Min Focal Length"
+#: src/nikonmn.cpp:586
+msgid "Scene Assist"
 msgstr ""
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
-msgid "Min focal length"
+#: src/nikonmn.cpp:586
+msgid "Scene assist"
 msgstr ""
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
-msgid "Max Focal Length"
+#: src/nikonmn.cpp:587
+msgid "Retouch History"
 msgstr ""
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
-msgid "Max focal length"
+#: src/nikonmn.cpp:587
+msgid "Retouch history"
 msgstr ""
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
-msgid "Max Aperture At Min Focal"
+#: src/nikonmn.cpp:589
+msgid "Serial NO"
 msgstr ""
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
-msgid "Max aperture at min focal"
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
 msgstr ""
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
-msgid "Max Aperture At Max Focal"
+#: src/nikonmn.cpp:590
+msgid "Image Data Size"
 msgstr ""
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
-msgid "Max aperture at max focal"
+#: src/nikonmn.cpp:590
+msgid "Image data size"
 msgstr ""
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
-msgid "MCU Version"
+#: src/nikonmn.cpp:592
+msgid "Image Count"
 msgstr ""
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
-msgid "MCU version"
+#: src/nikonmn.cpp:592
+msgid "Image count"
 msgstr ""
 
-#: src/nikonmn.cpp:1070
-msgid "Unknown Nikon Lens Data 1 Tag"
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+msgid "Deleted Image Count"
 msgstr ""
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-msgid "Exit Pupil Position"
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+msgid "Deleted image count"
 msgstr ""
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-msgid "Exit pupil position"
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
+msgid "Shutter Count"
 msgstr ""
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
-msgid "AF Aperture"
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
 msgstr ""
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
-msgid "AF aperture"
+#: src/nikonmn.cpp:595
+msgid "Flash info"
 msgstr ""
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
-msgid "Effective Max Aperture"
+#: src/nikonmn.cpp:596
+msgid "Image Optimization"
 msgstr ""
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
-msgid "Effective max aperture"
+#: src/nikonmn.cpp:596
+msgid "Image optimization"
 msgstr ""
 
-#: src/nikonmn.cpp:1095
-msgid "Unknown Nikon Lens Data 2 Tag"
+#: src/nikonmn.cpp:598
+msgid "Program Variation"
 msgstr ""
 
-#: src/nikonmn.cpp:1115
-msgid "Max aperture at min focal length"
+#: src/nikonmn.cpp:598
+msgid "Program variation"
 msgstr ""
 
-#: src/nikonmn.cpp:1116
-msgid "Max aperture at max focal length"
+#: src/nikonmn.cpp:600
+msgid "AF Response"
 msgstr ""
 
-#: src/nikonmn.cpp:1120
-msgid "Unknown Nikon Lens Data 3 Tag"
+#: src/nikonmn.cpp:600
+msgid "AF response"
 msgstr ""
 
-#: src/nikonmn.cpp:1299
-msgid "Closest subject"
+#: src/nikonmn.cpp:601
+msgid "Multi exposure"
 msgstr ""
 
-#: src/nikonmn.cpp:1300
-msgid "Group dynamic-AF"
+#: src/nikonmn.cpp:602
+msgid "High ISO Noise Reduction"
 msgstr ""
 
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
-msgid "none"
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
+msgid "Toning effect"
 msgstr ""
 
-#: src/nikonmn.cpp:1333
-msgid "used"
+#: src/nikonmn.cpp:604
+msgid "AF info 2"
 msgstr ""
 
-#: src/nikonmn.cpp:1359
-msgid "All 11 Points"
+#: src/nikonmn.cpp:605
+msgid "File info"
 msgstr ""
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
-msgid "Single-frame"
+#: src/nikonmn.cpp:608
+msgid "Capture Data"
 msgstr ""
 
-#: src/olympusmn.cpp:68
-msgid "Standard Quality (SQ)"
+#: src/nikonmn.cpp:608
+msgid "Capture data"
 msgstr ""
 
-#: src/olympusmn.cpp:69
-msgid "High Quality (HQ)"
+#: src/nikonmn.cpp:609
+msgid "Capture Version"
 msgstr ""
 
-#: src/olympusmn.cpp:70
-msgid "Super High Quality (SHQ)"
+#: src/nikonmn.cpp:609
+msgid "Capture version"
 msgstr ""
 
-#: src/olympusmn.cpp:85
-msgid "On (preset)"
+#: src/nikonmn.cpp:611
+msgid "Capture Offsets"
 msgstr ""
 
-#: src/olympusmn.cpp:91
-msgid "Internal"
+#: src/nikonmn.cpp:611
+msgid "Capture offsets"
 msgstr ""
 
-#: src/olympusmn.cpp:93
-msgid "Internal + External"
+#: src/nikonmn.cpp:612
+msgid "Scan IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:118
-msgid "Interlaced"
+#: src/nikonmn.cpp:613
+msgid "ICC profile"
 msgstr ""
 
-#: src/olympusmn.cpp:119
-msgid "Progressive"
+#: src/nikonmn.cpp:614
+msgid "Capture output"
 msgstr ""
 
-#: src/olympusmn.cpp:127
-msgid "Thumbnail Image"
+#: src/nikonmn.cpp:616
+msgid "Unknown Nikon3MakerNote tag"
 msgstr ""
 
-#: src/olympusmn.cpp:128
-msgid "Thumbnail image"
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+msgid "No"
 msgstr ""
 
-#: src/olympusmn.cpp:131
-msgid "Special Mode"
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
+msgid "Yes"
 msgstr ""
 
-#: src/olympusmn.cpp:132
-msgid "Picture taking mode"
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
 msgstr ""
 
-#: src/olympusmn.cpp:140
-msgid "Black & White Mode"
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
 msgstr ""
 
-#: src/olympusmn.cpp:141
-msgid "Black and white mode"
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
 msgstr ""
 
-#: src/olympusmn.cpp:144
-msgid "Digital zoom ratio"
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+msgid "Vibration Reduction"
 msgstr ""
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
-msgid "Focal Plane Diagonal"
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+msgid "Vibration reduction"
 msgstr ""
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
-msgid "Focal plane diagonal"
+#: src/nikonmn.cpp:648
+msgid "Unknown Nikon Vibration Reduction Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:149
-msgid "Lens Distortion Parameters"
+#: src/nikonmn.cpp:658
+msgid "Default Settings"
 msgstr ""
 
-#: src/olympusmn.cpp:150
-msgid "Lens distortion parameters"
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
+msgid "Quick Adjust"
 msgstr ""
 
-#: src/olympusmn.cpp:153
-msgid "Software firmware version"
+#: src/nikonmn.cpp:660
+msgid "Full Control"
 msgstr ""
 
-#: src/olympusmn.cpp:156
-msgid "ASCII format data such as [PictureInfo]"
+#: src/nikonmn.cpp:681
+msgid "Blue-green"
 msgstr ""
 
-#: src/olympusmn.cpp:158
-msgid "Camera ID"
+#: src/nikonmn.cpp:683
+msgid "Purple-blue"
 msgstr ""
 
-#: src/olympusmn.cpp:159
-msgid "Camera ID data"
+#: src/nikonmn.cpp:684
+msgid "Red-purple"
 msgstr ""
 
-#: src/olympusmn.cpp:178
-msgid "Pre Capture Frames"
+#: src/nikonmn.cpp:691
+msgid "Name"
 msgstr ""
 
-#: src/olympusmn.cpp:179
-msgid "Pre-capture frames"
+#: src/nikonmn.cpp:692
+msgid "Base"
 msgstr ""
 
-#: src/olympusmn.cpp:184
-msgid "One Touch WB"
+#: src/nikonmn.cpp:693
+msgid "Adjust"
 msgstr ""
 
-#: src/olympusmn.cpp:185
-msgid "One touch white balance"
+#: src/nikonmn.cpp:694
+msgid "Quick adjust"
 msgstr ""
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
-msgid "Serial number"
+#: src/nikonmn.cpp:700
+msgid "Filter effect"
 msgstr ""
 
-#: src/olympusmn.cpp:199
-msgid "Data Dump 1"
+#: src/nikonmn.cpp:702
+msgid "Toning Saturation"
 msgstr ""
 
-#: src/olympusmn.cpp:200
-msgid "Various camera settings 1"
+#: src/nikonmn.cpp:702
+msgid "Toning saturation"
 msgstr ""
 
-#: src/olympusmn.cpp:202
-msgid "Data Dump 2"
+#: src/nikonmn.cpp:704
+msgid "Unknown Nikon Picture Control Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:203
-msgid "Various camera settings 2"
+#: src/nikonmn.cpp:714
+msgid "Timezone"
 msgstr ""
 
-#: src/olympusmn.cpp:205
-msgid "Shutter Speed"
+#: src/nikonmn.cpp:715
+msgid "Daylight Savings"
 msgstr ""
 
-#: src/olympusmn.cpp:206
-msgid "Shutter speed value"
+#: src/nikonmn.cpp:715
+msgid "Daylight savings"
 msgstr ""
 
-#: src/olympusmn.cpp:209
-msgid "ISO speed value"
+#: src/nikonmn.cpp:716
+msgid "Date Display Format"
 msgstr ""
 
-#: src/olympusmn.cpp:212
-msgid "Aperture value"
+#: src/nikonmn.cpp:716
+msgid "Date display format"
 msgstr ""
 
-#: src/olympusmn.cpp:215
-msgid "Brightness value"
+#: src/nikonmn.cpp:718
+msgid "Unknown Nikon World Time Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:223
-msgid "Bracket"
+#: src/nikonmn.cpp:729
+msgid "Hi 0.3"
 msgstr ""
 
-#: src/olympusmn.cpp:224
-msgid "Exposure compensation value"
+#: src/nikonmn.cpp:730
+msgid "Hi 0.5"
 msgstr ""
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
-msgid "Sensor Temperature"
+#: src/nikonmn.cpp:731
+msgid "Hi 0.7"
 msgstr ""
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
-msgid "Sensor temperature"
+#: src/nikonmn.cpp:732
+msgid "Hi 1.0"
 msgstr ""
 
-#: src/olympusmn.cpp:229
-msgid "Lens Temperature"
+#: src/nikonmn.cpp:733
+msgid "Hi 1.3"
 msgstr ""
 
-#: src/olympusmn.cpp:230
-msgid "Lens temperature"
+#: src/nikonmn.cpp:734
+msgid "Hi 1.5"
 msgstr ""
 
-#: src/olympusmn.cpp:244
-msgid "Zoom"
+#: src/nikonmn.cpp:735
+msgid "Hi 1.7"
 msgstr ""
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
-msgid "Zoom step count"
+#: src/nikonmn.cpp:736
+msgid "Hi 2.0"
 msgstr ""
 
-#: src/olympusmn.cpp:247
-msgid "Macro Focus"
-msgstr ""
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
+msgstr ""
 
-#: src/olympusmn.cpp:248
-msgid "Macro focus step count"
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
 msgstr ""
 
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
-msgid "Sharpness Factor"
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
 msgstr ""
 
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
-msgid "Sharpness factor"
+#: src/nikonmn.cpp:740
+msgid "Lo 1.0"
 msgstr ""
 
-#: src/olympusmn.cpp:253
-msgid "Flash Charge Level"
+#: src/nikonmn.cpp:746
+msgid "ISO Expansion"
 msgstr ""
 
-#: src/olympusmn.cpp:254
-msgid "Flash charge level"
+#: src/nikonmn.cpp:746
+msgid "ISO expansion"
 msgstr ""
 
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
-msgid "Color Matrix"
+#: src/nikonmn.cpp:747
+msgid "ISO 2"
 msgstr ""
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
-msgid "Color matrix"
+#: src/nikonmn.cpp:748
+msgid "ISO Expansion 2"
 msgstr ""
 
-#: src/olympusmn.cpp:259
-msgid "BlackLevel"
+#: src/nikonmn.cpp:748
+msgid "ISO expansion 2"
 msgstr ""
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
-msgid "Black level"
+#: src/nikonmn.cpp:750
+msgid "Unknown Nikon Iso Info Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:269
-msgid "White balance mode"
+#: src/nikonmn.cpp:760
+msgid "Single Area"
 msgstr ""
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
-msgid "Red Balance"
+#: src/nikonmn.cpp:761
+msgid "Dynamic Area"
 msgstr ""
 
-#: src/olympusmn.cpp:275
-msgid "Red balance"
+#: src/nikonmn.cpp:762
+msgid "Dynamic Area, Closest Subject"
 msgstr ""
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
-msgid "Blue Balance"
+#: src/nikonmn.cpp:763
+msgid "Group Dynamic"
 msgstr ""
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
-msgid "Blue balance"
+#: src/nikonmn.cpp:764
+msgid "Single Area (wide)"
 msgstr ""
 
-#: src/olympusmn.cpp:283
-msgid "Serial Number 2"
+#: src/nikonmn.cpp:765
+msgid "Dynamic Area (wide)"
 msgstr ""
 
-#: src/olympusmn.cpp:284
-msgid "Serial number 2"
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
+msgid "Mid-left"
 msgstr ""
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
-msgid "Flash exposure compensation"
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
+msgid "Mid-right"
 msgstr ""
 
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
-msgid "External Flash Bounce"
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
+msgid "Far Left"
 msgstr ""
 
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
-msgid "External flash bounce"
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
+msgid "Far Right"
 msgstr ""
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
-msgid "External Flash Zoom"
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
+msgid "AF area mode"
 msgstr ""
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
-msgid "External flash zoom"
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
+msgid "AF point"
 msgstr ""
 
-#: src/olympusmn.cpp:325
-msgid "External Flash Mode"
+#: src/nikonmn.cpp:802
+msgid "AF Points In Focus"
 msgstr ""
 
-#: src/olympusmn.cpp:326
-msgid "External flash mode"
+#: src/nikonmn.cpp:802
+msgid "AF points in focus"
 msgstr ""
 
-#: src/olympusmn.cpp:334
-msgid "Color Control"
+#: src/nikonmn.cpp:804
+msgid "Unknown Nikon Auto Focus Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:335
-msgid "Color control"
+#: src/nikonmn.cpp:815
+msgid "On (51-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:337
-msgid "ValidBits"
+#: src/nikonmn.cpp:816
+msgid "On (11-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
-msgid "Valid bits"
+#: src/nikonmn.cpp:822
+msgid "Contrast Detect AF"
 msgstr ""
 
-#: src/olympusmn.cpp:340
-msgid "CoringFilter"
+#: src/nikonmn.cpp:822
+msgid "Contrast detect AF"
 msgstr ""
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
-msgid "Coring filter"
+#: src/nikonmn.cpp:824
+msgid "Phase Detect AF"
 msgstr ""
 
-#: src/olympusmn.cpp:361
-msgid "Compression Ratio"
+#: src/nikonmn.cpp:824
+msgid "Phase detect AF"
 msgstr ""
 
-#: src/olympusmn.cpp:362
-msgid "Compression ratio"
+#: src/nikonmn.cpp:825
+msgid "Primary AF Point"
 msgstr ""
 
-#: src/olympusmn.cpp:365
-msgid "Preview image embedded"
+#: src/nikonmn.cpp:825
+msgid "Primary AF point"
 msgstr ""
 
-#: src/olympusmn.cpp:368
-msgid "Offset of the preview image"
+#: src/nikonmn.cpp:827
+msgid "AF Image Width"
 msgstr ""
 
-#: src/olympusmn.cpp:371
-msgid "Size of the preview image"
+#: src/nikonmn.cpp:827
+msgid "AF image width"
 msgstr ""
 
-#: src/olympusmn.cpp:373
-msgid "CCD Scan Mode"
+#: src/nikonmn.cpp:828
+msgid "AF Image Height"
 msgstr ""
 
-#: src/olympusmn.cpp:374
-msgid "CCD scan mode"
+#: src/nikonmn.cpp:828
+msgid "AF image height"
 msgstr ""
 
-#: src/olympusmn.cpp:379
-msgid "Infinity Lens Step"
+#: src/nikonmn.cpp:829
+msgid "AF Area X Position"
 msgstr ""
 
-#: src/olympusmn.cpp:380
-msgid "Infinity lens step"
+#: src/nikonmn.cpp:829
+msgid "AF area x position"
 msgstr ""
 
-#: src/olympusmn.cpp:382
-msgid "Near Lens Step"
+#: src/nikonmn.cpp:830
+msgid "AF Area Y Position"
 msgstr ""
 
-#: src/olympusmn.cpp:383
-msgid "Near lens step"
+#: src/nikonmn.cpp:830
+msgid "AF area y position"
 msgstr ""
 
-#: src/olympusmn.cpp:385
-msgid "Equipment Info"
+#: src/nikonmn.cpp:831
+msgid "AF Area Width"
 msgstr ""
 
-#: src/olympusmn.cpp:386
-msgid "Camera equipment sub-IFD"
+#: src/nikonmn.cpp:831
+msgid "AF area width"
 msgstr ""
 
-#: src/olympusmn.cpp:389
-msgid "Camera Settings sub-IFD"
+#: src/nikonmn.cpp:832
+msgid "AF Area Height"
 msgstr ""
 
-#: src/olympusmn.cpp:391
-msgid "Raw Development"
+#: src/nikonmn.cpp:832
+msgid "AF area height"
 msgstr ""
 
-#: src/olympusmn.cpp:392
-msgid "Raw development sub-IFD"
+#: src/nikonmn.cpp:833
+msgid "Contrast Detect AF In Focus"
 msgstr ""
 
-#: src/olympusmn.cpp:394
-msgid "Raw Development 2"
+#: src/nikonmn.cpp:833
+msgid "Contrast detect AF in focus"
 msgstr ""
 
-#: src/olympusmn.cpp:395
-msgid "Raw development 2 sub-IFD"
+#: src/nikonmn.cpp:835
+msgid "Unknown Nikon Auto Focus 2 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:398
-msgid "Image processing sub-IFD"
+#: src/nikonmn.cpp:846
+msgid "Directory Number"
 msgstr ""
 
-#: src/olympusmn.cpp:400
-msgid "Focus Info"
+#: src/nikonmn.cpp:846
+msgid "Directory number"
 msgstr ""
 
-#: src/olympusmn.cpp:401
-msgid "Focus sub-IFD"
+#: src/nikonmn.cpp:849
+msgid "Unknown Nikon File Info Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:403
-msgid "Raw Info"
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
+msgid "Multiple Exposure"
 msgstr ""
 
-#: src/olympusmn.cpp:404
-msgid "Raw sub-IFD"
+#: src/nikonmn.cpp:861
+msgid "Image Overlay"
 msgstr ""
 
-#: src/olympusmn.cpp:409
-msgid "Unknown OlympusMakerNote tag"
+#: src/nikonmn.cpp:867
+msgid "Multi Exposure Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:424
-msgid "Program-shift"
+#: src/nikonmn.cpp:867
+msgid "Multi exposure mode"
 msgstr ""
 
-#: src/olympusmn.cpp:429
-msgid "Center-weighted average"
+#: src/nikonmn.cpp:868
+msgid "Multi Exposure Shots"
 msgstr ""
 
-#: src/olympusmn.cpp:431
-msgid "ESP"
+#: src/nikonmn.cpp:868
+msgid "Multi exposure shots"
 msgstr ""
 
-#: src/olympusmn.cpp:432
-msgid "Pattern+AF"
+#: src/nikonmn.cpp:869
+msgid "Multi Exposure Auto Gain"
 msgstr ""
 
-#: src/olympusmn.cpp:433
-msgid "Spot+Highlight control"
+#: src/nikonmn.cpp:869
+msgid "Multi exposure auto gain"
 msgstr ""
 
-#: src/olympusmn.cpp:434
-msgid "Spot+Shadow control"
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
+msgid "Unknown Nikon Multi Exposure Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
-msgid "Super Macro"
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
+msgid "Internal"
 msgstr ""
 
-#: src/olympusmn.cpp:446
-msgid "Single AF"
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
 msgstr ""
 
-#: src/olympusmn.cpp:447
-msgid "Sequential shooting AF"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
 msgstr ""
 
-#: src/olympusmn.cpp:449
-msgid "Multi AF"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
 msgstr ""
 
-#: src/olympusmn.cpp:450
-msgid "MF"
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
 msgstr ""
 
-#: src/olympusmn.cpp:455
-msgid "AF Not Used"
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
 msgstr ""
 
-#: src/olympusmn.cpp:456
-msgid "AF Used"
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
 msgstr ""
 
-#: src/olympusmn.cpp:461
-msgid "Not Ready"
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:462
-msgid "Ready"
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:469
-msgid "Fill-in"
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:471
-msgid "Slow-sync"
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
 msgstr ""
 
-#: src/olympusmn.cpp:472
-msgid "Forced On"
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
 msgstr ""
 
-#: src/olympusmn.cpp:473
-msgid "2nd Curtain"
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
 msgstr ""
 
-#: src/olympusmn.cpp:480
-msgid "6000K (Cloudy)"
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
 msgstr ""
 
-#: src/olympusmn.cpp:481
-msgid "5300K (Fine Weather)"
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
 msgstr ""
 
-#: src/olympusmn.cpp:482
-msgid "3000K (Tungsten light)"
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
-msgid "3600K (Tungsten light-like)"
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:484
-msgid "6600K (Daylight fluorescent)"
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
 msgstr ""
 
-#: src/olympusmn.cpp:485
-msgid "4500K (Neutral white fluorescent)"
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:486
-msgid "4000K (Cool white fluorescent)"
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
 msgstr ""
 
-#: src/olympusmn.cpp:488
-msgid "Custom WB 1"
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:489
-msgid "Custom WB 2"
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:490
-msgid "Custom WB 3"
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
 msgstr ""
 
-#: src/olympusmn.cpp:491
-msgid "Custom WB 4"
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
 msgstr ""
 
-#: src/olympusmn.cpp:492
-msgid "Custom WB 5400K"
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:493
-msgid "Custom WB 2900K"
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:494
-msgid "Custom WB 8000K"
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:500
-msgid "CM1 (Red Enhance)"
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
 msgstr ""
 
-#: src/olympusmn.cpp:501
-msgid "CM2 (Green Enhance)"
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:502
-msgid "CM3 (Blue Enhance)"
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:503
-msgid "CM4 (Skin Tones)"
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
 msgstr ""
 
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
-msgid "Pro Photo RGB"
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
-msgid "Sport"
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
-msgid "Landscape+Portrait"
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:522
-msgid "Self Portrait"
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:527
-msgid "Night+Portrait"
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
 msgstr ""
 
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:534
-msgid "Documents"
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:536
-msgid "Shoot & Select"
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:537
-msgid "Beach & Snow"
+#: src/nikonmn.cpp:934
+msgid "10.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:538
-msgid "Self Portrait+Timer"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:539
-msgid "Candle"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:540
-msgid "Available Light"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
+#: src/nikonmn.cpp:938
+msgid "16.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:542
-msgid "My Mode"
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-msgid "Pet"
+#: src/nikonmn.cpp:940
+msgid "20.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:544
-msgid "Underwater Wide1"
+#: src/nikonmn.cpp:947
+msgid "iTTL-BL"
 msgstr ""
 
-#: src/olympusmn.cpp:545
-msgid "Underwater Macro"
+#: src/nikonmn.cpp:948
+msgid "iTTL"
 msgstr ""
 
-#: src/olympusmn.cpp:546
-msgid "Shoot & Select1"
+#: src/nikonmn.cpp:949
+msgid "Auto Aperture"
 msgstr ""
 
-#: src/olympusmn.cpp:547
-msgid "Shoot & Select2"
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
 msgstr ""
 
-#: src/olympusmn.cpp:549
-msgid "Digital Image Stabilization"
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
+msgid "Repeating Flash"
 msgstr ""
 
-#: src/olympusmn.cpp:550
-msgid "Auction"
+#: src/nikonmn.cpp:960
+msgid "Bounce Flash"
 msgstr ""
 
-#: src/olympusmn.cpp:553
-msgid "Underwater Wide2"
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
 msgstr ""
 
-#: src/olympusmn.cpp:555
-msgid "Children"
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
 msgstr ""
 
-#: src/olympusmn.cpp:557
-msgid "Nature Macro"
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
 msgstr ""
 
-#: src/olympusmn.cpp:558
-msgid "Underwater Snapshot"
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
 msgstr ""
 
-#: src/olympusmn.cpp:559
-msgid "Shooting Guide"
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
 msgstr ""
 
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
-msgid "Noise Filter"
+#: src/nikonmn.cpp:974
+msgid "Amber"
 msgstr ""
 
-#: src/olympusmn.cpp:566
-msgid "Noise Filter (ISO Boost)"
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
+msgid "Flash Source"
 msgstr ""
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
-msgid "Muted"
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
+msgid "Flash source"
 msgstr ""
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
-msgid "Monotone"
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
+msgid "0x0005"
 msgstr ""
 
-#: src/olympusmn.cpp:601
-msgid "SQ"
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
+msgid "External Flash Firmware"
 msgstr ""
 
-#: src/olympusmn.cpp:602
-msgid "HQ"
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
+msgid "External flash firmware"
 msgstr ""
 
-#: src/olympusmn.cpp:603
-msgid "SHQ"
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+msgid "External Flash Flags"
 msgstr ""
 
-#: src/olympusmn.cpp:608
-msgid "Camera Settings Version"
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+msgid "External flash flags"
 msgstr ""
 
-#: src/olympusmn.cpp:608
-msgid "Camera settings version"
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
+msgid "Flash Focal Length"
 msgstr ""
 
-#: src/olympusmn.cpp:609
-msgid "PreviewImage Valid"
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
+msgid "Flash focal length"
 msgstr ""
 
-#: src/olympusmn.cpp:609
-msgid "Preview image valid"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
 msgstr ""
 
-#: src/olympusmn.cpp:610
-msgid "PreviewImage Start"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating flash rate"
 msgstr ""
 
-#: src/olympusmn.cpp:610
-msgid "Preview image start"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
 msgstr ""
 
-#: src/olympusmn.cpp:611
-msgid "PreviewImage Length"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating flash count"
 msgstr ""
 
-#: src/olympusmn.cpp:611
-msgid "Preview image length"
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
+msgid "Flash GN Distance"
 msgstr ""
 
-#: src/olympusmn.cpp:613
-msgid "AE Lock"
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
+msgid "Flash GN distance"
 msgstr ""
 
-#: src/olympusmn.cpp:613
-msgid "Auto exposure lock"
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:617
-msgid "Focus Process"
+#: src/nikonmn.cpp:988
+msgid "Flash group a control mode"
 msgstr ""
 
-#: src/olympusmn.cpp:617
-msgid "Focus process"
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF Search"
+#: src/nikonmn.cpp:989
+msgid "Flash group b control mode"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF search"
+#: src/nikonmn.cpp:1029
+msgid "Flash Color Filter"
 msgstr ""
 
-#: src/olympusmn.cpp:619
-msgid "AF Areas"
+#: src/nikonmn.cpp:1029
+msgid "Flash color filter"
 msgstr ""
 
-#: src/olympusmn.cpp:619
-msgid "AF areas"
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
+msgid "Shutter count"
 msgstr ""
 
-#: src/olympusmn.cpp:622
-msgid "White Balance 2"
+#: src/nikonmn.cpp:1044
+msgid "Unknown Nikon Shot Info D80 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:622
-msgid "White balance 2"
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
+msgid "Flash Level"
 msgstr ""
 
-#: src/olympusmn.cpp:623
-msgid "White Balance Temperature"
+#: src/nikonmn.cpp:1056
+msgid "Flash level"
 msgstr ""
 
-#: src/olympusmn.cpp:623
-msgid "White balance temperature"
+#: src/nikonmn.cpp:1058
+msgid "Unknown Nikon Shot Info D40 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:624
-msgid "White Balance Bracket"
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
+msgid "0"
 msgstr ""
 
-#: src/olympusmn.cpp:624
-msgid "White balance bracket"
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
+msgid "+1"
 msgstr ""
 
-#: src/olympusmn.cpp:625
-msgid "Custom Saturation"
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
+msgid "+2"
 msgstr ""
 
-#: src/olympusmn.cpp:625
-msgid "Custom saturation"
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
+msgid "+4"
 msgstr ""
 
-#: src/olympusmn.cpp:626
-msgid "Modified Saturation"
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
+msgid "+8"
 msgstr ""
 
-#: src/olympusmn.cpp:626
-msgid "Modified saturation"
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
+msgid "+16"
 msgstr ""
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
-msgid "Contrast Setting"
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
+msgid "-16"
 msgstr ""
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
-msgid "Sharpness Setting"
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
+msgid "-8"
 msgstr ""
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion Correction"
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
+msgid "-4"
 msgstr ""
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion correction"
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
+msgid "-2"
 msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-msgid "Shading Compensation"
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
+msgid "-1"
 msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-msgid "Shading compensation"
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
+msgid "+17"
 msgstr ""
 
-#: src/olympusmn.cpp:634
-msgid "Compression Factor"
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
+msgid "-17"
 msgstr ""
 
-#: src/olympusmn.cpp:634
-msgid "Compression factor"
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
+msgid "+9"
 msgstr ""
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
-msgid "Gradation"
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
+msgid "+18"
 msgstr ""
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
-msgid "Picture mode"
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
+msgid "-18"
 msgstr ""
 
-#: src/olympusmn.cpp:637
-msgid "Picture Mode Saturation"
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
+msgid "-9"
 msgstr ""
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
-msgid "Picture mode saturation"
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
+msgid "+19"
 msgstr ""
 
-#: src/olympusmn.cpp:638
-msgid "Picture Mode Hue"
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
+msgid "-19"
 msgstr ""
 
-#: src/olympusmn.cpp:638
-msgid "Picture mode hue"
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
+msgid "+5"
 msgstr ""
 
-#: src/olympusmn.cpp:639
-msgid "Picture Mode Contrast"
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
+msgid "+10"
 msgstr ""
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
-msgid "Picture mode contrast"
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
+msgid "+20"
 msgstr ""
 
-#: src/olympusmn.cpp:640
-msgid "Picture Mode Sharpness"
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
+msgid "-20"
 msgstr ""
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
-msgid "Picture mode sharpness"
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
+msgid "-10"
 msgstr ""
 
-#: src/olympusmn.cpp:641
-msgid "Picture Mode BW Filter"
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
+msgid "-5"
 msgstr ""
 
-#: src/olympusmn.cpp:641
-msgid "Picture mode BW filter"
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
+msgid "+11"
 msgstr ""
 
-#: src/olympusmn.cpp:642
-msgid "Picture Mode Tone"
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
+msgid "-11"
 msgstr ""
 
-#: src/olympusmn.cpp:642
-msgid "Picture mode tone"
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
+msgid "+3"
 msgstr ""
 
-#: src/olympusmn.cpp:643
-msgid "Noise filter"
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
+msgid "+6"
 msgstr ""
 
-#: src/olympusmn.cpp:645
-msgid "Panorama Mode"
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
+msgid "+12"
 msgstr ""
 
-#: src/olympusmn.cpp:645
-msgid "Panorama mode"
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
+msgid "-12"
 msgstr ""
 
-#: src/olympusmn.cpp:646
-msgid "Image Quality 2"
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
+msgid "-6"
 msgstr ""
 
-#: src/olympusmn.cpp:646
-msgid "Image quality 2"
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
+msgid "-3"
 msgstr ""
 
-#: src/olympusmn.cpp:647
-msgid "Manometer Pressure"
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
+msgid "+13"
 msgstr ""
 
-#: src/olympusmn.cpp:647
-msgid "Manometer pressure"
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
+msgid "-13"
 msgstr ""
 
-#: src/olympusmn.cpp:648
-msgid "Manometer Reading"
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
+msgid "+7"
 msgstr ""
 
-#: src/olympusmn.cpp:648
-msgid "Manometer reading"
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
+msgid "+14"
 msgstr ""
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB Detect"
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
+msgid "-14"
 msgstr ""
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB detect"
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
+msgid "-7"
 msgstr ""
 
-#: src/olympusmn.cpp:651
-msgid "Unknown OlympusCs tag"
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
+msgid "+15"
 msgstr ""
 
-#: src/olympusmn.cpp:662
-msgid "Simple E-System"
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
+msgid "-15"
 msgstr ""
 
-#: src/olympusmn.cpp:663
-msgid "E-System"
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
+msgid "AF Fine Tune Adj"
 msgstr ""
 
-#: src/olympusmn.cpp:679
-msgid "Equipment Version"
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
+msgid "AF fine tune adj"
 msgstr ""
 
-#: src/olympusmn.cpp:679
-msgid "Equipment version"
+#: src/nikonmn.cpp:1118
+msgid "Unknown Nikon Shot Info D300 (a) Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:680
-msgid "Camera Type"
+#: src/nikonmn.cpp:1178
+msgid "Unknown Nikon Shot Info D300 (b) Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:680
-msgid "Camera type"
+#: src/nikonmn.cpp:1191
+msgid "On (3)"
 msgstr ""
 
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
-msgid "Internal Serial Number"
+#: src/nikonmn.cpp:1204
+msgid "Shutter Count 1"
 msgstr ""
 
-#: src/olympusmn.cpp:682
-msgid "Internal serial number"
+#: src/nikonmn.cpp:1204
+msgid "Shutter count 1"
 msgstr ""
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-msgid "Body Firmware Version"
+#: src/nikonmn.cpp:1208
+msgid "Shutter Count 2"
 msgstr ""
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-msgid "Body firmware version"
+#: src/nikonmn.cpp:1208
+msgid "Shutter count 2"
 msgstr ""
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
-msgid "Lens Serial Number"
+#: src/nikonmn.cpp:1209
+msgid "Vibration Reduction 2"
 msgstr ""
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
-msgid "Lens serial number"
+#: src/nikonmn.cpp:1209
+msgid "Vibration reduction 2"
 msgstr ""
 
-#: src/olympusmn.cpp:687
-msgid "Lens Firmware Version"
+#: src/nikonmn.cpp:1213
+msgid "Unknown Nikon Shot Info Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:687
-msgid "Lens firmware version"
+#: src/nikonmn.cpp:1224
+msgid "WB RBGG Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:692
-msgid "Max Aperture At Current Focal"
+#: src/nikonmn.cpp:1224
+msgid "WB RBGG levels"
 msgstr ""
 
-#: src/olympusmn.cpp:692
-msgid "Max aperture at current focal"
+#: src/nikonmn.cpp:1226
+msgid "Unknown Nikon Color Balance 1 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:693
-msgid "Lens Properties"
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
+msgid "WB RGGB Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:693
-msgid "Lens properties"
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
+msgid "WB RGGB levels"
 msgstr ""
 
-#: src/olympusmn.cpp:694
-msgid "Extender"
+#: src/nikonmn.cpp:1239
+msgid "Unknown Nikon Color Balance 2 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:695
-msgid "Extender Serial Number"
+#: src/nikonmn.cpp:1252
+msgid "Unknown Nikon Color Balance 2a Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:695
-msgid "Extender serial number"
+#: src/nikonmn.cpp:1265
+msgid "Unknown Nikon Color Balance 2b Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:696
-msgid "Extender Model"
+#: src/nikonmn.cpp:1276
+msgid "WB RGBG Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:696
-msgid "Extender model"
+#: src/nikonmn.cpp:1276
+msgid "WB RGBG levels"
 msgstr ""
 
-#: src/olympusmn.cpp:697
-msgid "Extender Firmware Version"
+#: src/nikonmn.cpp:1278
+msgid "Unknown Nikon Color Balance 3 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:697
-msgid "Extender firmwareversion"
+#: src/nikonmn.cpp:1289
+msgid "WB GRBG Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:698
-msgid "Flash Type"
+#: src/nikonmn.cpp:1289
+msgid "WB GRBG levels"
 msgstr ""
 
-#: src/olympusmn.cpp:698
-msgid "Flash type"
+#: src/nikonmn.cpp:1291
+msgid "Unknown Nikon Color Balance 4 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:699 src/properties.cpp:354
-msgid "Flash Model"
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
+msgid "Lens ID Number"
 msgstr ""
 
-#: src/olympusmn.cpp:699
-msgid "Flash model"
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
+msgid "Lens ID number"
 msgstr ""
 
-#: src/olympusmn.cpp:700
-msgid "Flash Firmware Version"
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
+msgid "Lens F-Stops"
 msgstr ""
 
-#: src/olympusmn.cpp:700
-msgid "Flash firmware version"
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
+msgid "Lens F-stops"
 msgstr ""
 
-#: src/olympusmn.cpp:701
-msgid "FlashSerialNumber"
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+msgid "Min Focal Length"
 msgstr ""
 
-#: src/olympusmn.cpp:703
-msgid "Unknown OlympusEq tag"
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+msgid "Min focal length"
 msgstr ""
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
-msgid "High Speed"
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+msgid "Max Focal Length"
 msgstr ""
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
-msgid "High Function"
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+msgid "Max focal length"
 msgstr ""
 
-#: src/olympusmn.cpp:722
-msgid "Advanced High Speed"
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
+msgid "Max Aperture At Min Focal"
 msgstr ""
 
-#: src/olympusmn.cpp:723
-msgid "Advanced High Function"
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
+msgid "Max aperture at min focal"
 msgstr ""
 
-#: src/olympusmn.cpp:728
-msgid "Original"
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
+msgid "Max Aperture At Max Focal"
 msgstr ""
 
-#: src/olympusmn.cpp:729
-msgid "Edited (Landscape)"
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
+msgid "Max aperture at max focal"
 msgstr ""
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
-msgid "Edited (Portrait)"
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+msgid "MCU Version"
 msgstr ""
 
-#: src/olympusmn.cpp:736
-msgid "WB Color Temp"
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+msgid "MCU version"
 msgstr ""
 
-#: src/olympusmn.cpp:737
-msgid "WB Gray Point"
+#: src/nikonmn.cpp:1310
+msgid "Unknown Nikon Lens Data 1 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:747
-msgid "Raw Development Version"
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+msgid "Exit Pupil Position"
 msgstr ""
 
-#: src/olympusmn.cpp:747
-msgid "Raw development version"
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+msgid "Exit pupil position"
 msgstr ""
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
-msgid "Exposure Bias Value"
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+msgid "AF Aperture"
 msgstr ""
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
-msgid "Exposure bias value"
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+msgid "AF aperture"
 msgstr ""
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
-msgid "White Balance Value"
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+msgid "Effective Max Aperture"
 msgstr ""
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
-msgid "White balance value"
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+msgid "Effective max aperture"
 msgstr ""
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
-msgid "WB Fine Adjustment"
+#: src/nikonmn.cpp:1335
+msgid "Unknown Nikon Lens Data 2 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:750
-msgid "WB fine adjustment"
+#: src/nikonmn.cpp:1355
+msgid "Max aperture at min focal length"
 msgstr ""
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
-msgid "Gray Point"
+#: src/nikonmn.cpp:1356
+msgid "Max aperture at max focal length"
 msgstr ""
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
-msgid "Gray point"
+#: src/nikonmn.cpp:1360
+msgid "Unknown Nikon Lens Data 3 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
-msgid "Saturation Emphasis"
+#: src/nikonmn.cpp:1540
+msgid "Closest subject"
 msgstr ""
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
-msgid "Saturation emphasis"
+#: src/nikonmn.cpp:1541
+msgid "Group dynamic-AF"
 msgstr ""
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory Color Emphasis"
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
+msgid "none"
 msgstr ""
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory color emphasis"
+#: src/nikonmn.cpp:1574
+msgid "used"
 msgstr ""
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
-msgid "Contrast Value"
+#: src/nikonmn.cpp:1600
+msgid "All 11 Points"
 msgstr ""
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
-msgid "Contrast value"
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
+msgid "Single-frame"
 msgstr ""
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
-msgid "Sharpness Value"
+#: src/olympusmn.cpp:71
+msgid "Standard Quality (SQ)"
 msgstr ""
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
-msgid "Sharpness value"
+#: src/olympusmn.cpp:72
+msgid "High Quality (HQ)"
 msgstr ""
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
-msgid "Engine"
+#: src/olympusmn.cpp:73
+msgid "Super High Quality (SHQ)"
 msgstr ""
 
-#: src/olympusmn.cpp:759
-msgid "Edit status"
+#: src/olympusmn.cpp:88
+msgid "On (preset)"
 msgstr ""
 
-#: src/olympusmn.cpp:760
-msgid "Settings"
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
+msgid "Sport"
 msgstr ""
 
-#: src/olympusmn.cpp:762
-msgid "Unknown OlympusRd tag"
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
+msgid "Landscape+Portrait"
 msgstr ""
 
-#: src/olympusmn.cpp:817
-msgid "Raw Development 2 Version"
+#: src/olympusmn.cpp:100
+msgid "Self Portrait"
 msgstr ""
 
-#: src/olympusmn.cpp:817
-msgid "Raw development 2 version"
+#: src/olympusmn.cpp:102
+msgid "2 in 1"
 msgstr ""
 
-#: src/olympusmn.cpp:821
-msgid "White balance fine adjustment"
+#: src/olympusmn.cpp:105
+msgid "Night+Portrait"
 msgstr ""
 
-#: src/olympusmn.cpp:831
-msgid "PM Saturation"
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
 msgstr ""
 
-#: src/olympusmn.cpp:832
-msgid "PM Contrast"
+#: src/olympusmn.cpp:112
+msgid "Documents"
 msgstr ""
 
-#: src/olympusmn.cpp:833
-msgid "PM Sharpness"
+#: src/olympusmn.cpp:114
+msgid "Shoot & Select"
 msgstr ""
 
-#: src/olympusmn.cpp:834
-msgid "PM BW Filter"
+#: src/olympusmn.cpp:115
+msgid "Beach & Snow"
 msgstr ""
 
-#: src/olympusmn.cpp:834
-msgid "PM BW filter"
+#: src/olympusmn.cpp:116
+msgid "Self Portrait+Timer"
 msgstr ""
 
-#: src/olympusmn.cpp:835
-msgid "PM Picture Tone"
+#: src/olympusmn.cpp:117
+msgid "Candle"
 msgstr ""
 
-#: src/olympusmn.cpp:835
-msgid "PM picture tone"
+#: src/olympusmn.cpp:118
+msgid "Available Light"
 msgstr ""
 
-#: src/olympusmn.cpp:838
-msgid "Auto Gradation"
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
 msgstr ""
 
-#: src/olympusmn.cpp:838
-msgid "Auto gradation"
+#: src/olympusmn.cpp:120
+msgid "My Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:839
-msgid "PM Noise Filter"
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
+msgid "Pet"
 msgstr ""
 
-#: src/olympusmn.cpp:839
-msgid "Picture mode noise filter"
+#: src/olympusmn.cpp:122
+msgid "Underwater Wide1"
 msgstr ""
 
-#: src/olympusmn.cpp:841
-msgid "Unknown OlympusRd2 tag"
+#: src/olympusmn.cpp:123
+msgid "Underwater Macro"
 msgstr ""
 
-#: src/olympusmn.cpp:850
-msgid "Image Processing Version"
+#: src/olympusmn.cpp:124
+msgid "Shoot & Select1"
 msgstr ""
 
-#: src/olympusmn.cpp:850
-msgid "Image processing version"
+#: src/olympusmn.cpp:125
+msgid "Shoot & Select2"
 msgstr ""
 
-#: src/olympusmn.cpp:852
-msgid "WB RB Levels 3000K"
+#: src/olympusmn.cpp:127
+msgid "Digital Image Stabilization"
 msgstr ""
 
-#: src/olympusmn.cpp:852
-msgid "WB RB levels 3000K"
+#: src/olympusmn.cpp:128
+msgid "Auction"
 msgstr ""
 
-#: src/olympusmn.cpp:853
-msgid "WB RB Levels 3300K"
+#: src/olympusmn.cpp:131
+msgid "Underwater Wide2"
 msgstr ""
 
-#: src/olympusmn.cpp:853
-msgid "WB RB levels 3300K"
+#: src/olympusmn.cpp:133
+msgid "Children"
 msgstr ""
 
-#: src/olympusmn.cpp:854
-msgid "WB RB Levels 3600K"
+#: src/olympusmn.cpp:135
+msgid "Nature Macro"
 msgstr ""
 
-#: src/olympusmn.cpp:854
-msgid "WB RB levels 3600K"
+#: src/olympusmn.cpp:136
+msgid "Underwater Snapshot"
 msgstr ""
 
-#: src/olympusmn.cpp:855
-msgid "WB RB Levels 3900K"
+#: src/olympusmn.cpp:137
+msgid "Shooting Guide"
 msgstr ""
 
-#: src/olympusmn.cpp:855
-msgid "WB RB levels 3900K"
+#: src/olympusmn.cpp:145
+msgid "Internal + External"
 msgstr ""
 
-#: src/olympusmn.cpp:856
-msgid "WB RB Levels 4000K"
+#: src/olympusmn.cpp:176
+msgid "Interlaced"
 msgstr ""
 
-#: src/olympusmn.cpp:856
-msgid "WB RB levels 4000K"
+#: src/olympusmn.cpp:177
+msgid "Progressive"
 msgstr ""
 
-#: src/olympusmn.cpp:857
-msgid "WB RB Levels 4300K"
+#: src/olympusmn.cpp:188
+msgid "Thumbnail Image"
 msgstr ""
 
-#: src/olympusmn.cpp:857
-msgid "WB RB levels 4300K"
+#: src/olympusmn.cpp:189
+msgid "Thumbnail image"
 msgstr ""
 
-#: src/olympusmn.cpp:858
-msgid "WB RB Levels 4500K"
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+msgid "Body Firmware Version"
 msgstr ""
 
-#: src/olympusmn.cpp:858
-msgid "WB RB levels 4500K"
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+msgid "Body firmware version"
 msgstr ""
 
-#: src/olympusmn.cpp:859
-msgid "WB RB Levels 4800K"
+#: src/olympusmn.cpp:195
+msgid "Special Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:859
-msgid "WB RB levels 4800K"
+#: src/olympusmn.cpp:196
+msgid "Picture taking mode"
 msgstr ""
 
-#: src/olympusmn.cpp:860
-msgid "WB RB Levels 5300K"
+#: src/olympusmn.cpp:204
+msgid "Black & White Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:860
-msgid "WB RB levels 5300K"
+#: src/olympusmn.cpp:205
+msgid "Black and white mode"
 msgstr ""
 
-#: src/olympusmn.cpp:861
-msgid "WB RB Levels 6000K"
+#: src/olympusmn.cpp:208
+msgid "Digital zoom ratio"
 msgstr ""
 
-#: src/olympusmn.cpp:861
-msgid "WB RB levels 6000K"
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
+msgid "Focal Plane Diagonal"
 msgstr ""
 
-#: src/olympusmn.cpp:862
-msgid "WB RB Levels 6600K"
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
+msgid "Focal plane diagonal"
 msgstr ""
 
-#: src/olympusmn.cpp:862
-msgid "WB RB levels 6600K"
+#: src/olympusmn.cpp:213
+msgid "Lens Distortion Parameters"
 msgstr ""
 
-#: src/olympusmn.cpp:863
-msgid "WB RB Levels 7500K"
+#: src/olympusmn.cpp:214
+msgid "Lens distortion parameters"
 msgstr ""
 
-#: src/olympusmn.cpp:863
-msgid "WB RB levels 7500K"
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
+msgid "Camera Type"
 msgstr ""
 
-#: src/olympusmn.cpp:864
-msgid "WB RB Levels CWB1"
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
+msgid "Camera type"
 msgstr ""
 
-#: src/olympusmn.cpp:864
-msgid "WB RB levels CWB1"
+#: src/olympusmn.cpp:220
+msgid "ASCII format data such as [PictureInfo]"
 msgstr ""
 
-#: src/olympusmn.cpp:865
-msgid "WB RB Levels CWB2"
+#: src/olympusmn.cpp:222
+msgid "Camera ID"
 msgstr ""
 
-#: src/olympusmn.cpp:865
-msgid "WB RB levels CWB2"
+#: src/olympusmn.cpp:223
+msgid "Camera ID data"
 msgstr ""
 
-#: src/olympusmn.cpp:866
-msgid "WB RB Levels CWB3"
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
 msgstr ""
 
-#: src/olympusmn.cpp:866
-msgid "WB RB levels CWB3"
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
+msgid "Preview Image"
 msgstr ""
 
-#: src/olympusmn.cpp:867
-msgid "WB RB Levels CWB4"
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
+msgid "Preview image"
 msgstr ""
 
-#: src/olympusmn.cpp:867
-msgid "WB RB levels CWB4"
+#: src/olympusmn.cpp:237
+msgid "Pre Capture Frames"
 msgstr ""
 
-#: src/olympusmn.cpp:868
-msgid "WB G Level 3000K"
+#: src/olympusmn.cpp:238
+msgid "Pre-capture frames"
 msgstr ""
 
-#: src/olympusmn.cpp:868
-msgid "WB G level 3000K"
+#: src/olympusmn.cpp:240
+msgid "White Board"
 msgstr ""
 
-#: src/olympusmn.cpp:869
-msgid "WB G Level 3300K"
+#: src/olympusmn.cpp:241
+msgid "White board"
 msgstr ""
 
-#: src/olympusmn.cpp:869
-msgid "WB G level 3300K"
+#: src/olympusmn.cpp:243
+msgid "One Touch WB"
 msgstr ""
 
-#: src/olympusmn.cpp:870
-msgid "WB G Level 3600K"
+#: src/olympusmn.cpp:244
+msgid "One touch white balance"
 msgstr ""
 
-#: src/olympusmn.cpp:870
-msgid "WB G level 3600K"
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
+msgid "White Balance Bracket"
 msgstr ""
 
-#: src/olympusmn.cpp:871
-msgid "WB G Level 3900K"
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
+msgid "White balance bracket"
 msgstr ""
 
-#: src/olympusmn.cpp:871
-msgid "WB G level 3900K"
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+msgid "Firmware"
 msgstr ""
 
-#: src/olympusmn.cpp:872
-msgid "WB G Level 4000K"
+#: src/olympusmn.cpp:256
+msgid "Firmwarer"
 msgstr ""
 
-#: src/olympusmn.cpp:872
-msgid "WB G level 4000K"
+#: src/olympusmn.cpp:261
+msgid "Data Dump 1"
 msgstr ""
 
-#: src/olympusmn.cpp:873
-msgid "WB G Level 4300K"
+#: src/olympusmn.cpp:262
+msgid "Various camera settings 1"
 msgstr ""
 
-#: src/olympusmn.cpp:873
-msgid "WB G level 4300K"
+#: src/olympusmn.cpp:264
+msgid "Data Dump 2"
 msgstr ""
 
-#: src/olympusmn.cpp:874
-msgid "WB G Level 4500K"
+#: src/olympusmn.cpp:265
+msgid "Various camera settings 2"
 msgstr ""
 
-#: src/olympusmn.cpp:874
-msgid "WB G level 4500K"
+#: src/olympusmn.cpp:268
+msgid "Shutter speed value"
 msgstr ""
 
-#: src/olympusmn.cpp:875
-msgid "WB G Level 4800K"
+#: src/olympusmn.cpp:271
+msgid "ISO speed value"
 msgstr ""
 
-#: src/olympusmn.cpp:875
-msgid "WB G level 4800K"
+#: src/olympusmn.cpp:274
+msgid "Aperture value"
 msgstr ""
 
-#: src/olympusmn.cpp:876
-msgid "WB G Level 5300K"
+#: src/olympusmn.cpp:277
+msgid "Brightness value"
 msgstr ""
 
-#: src/olympusmn.cpp:876
-msgid "WB G level 5300K"
+#: src/olympusmn.cpp:285
+msgid "Bracket"
 msgstr ""
 
-#: src/olympusmn.cpp:877
-msgid "WB G Level 6000K"
+#: src/olympusmn.cpp:286
+msgid "Exposure compensation value"
 msgstr ""
 
-#: src/olympusmn.cpp:877
-msgid "WB G level 6000K"
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
+msgid "Sensor Temperature"
 msgstr ""
 
-#: src/olympusmn.cpp:878
-msgid "WB G Level 6600K"
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
+msgid "Sensor temperature"
 msgstr ""
 
-#: src/olympusmn.cpp:878
-msgid "WB G level 6600K"
+#: src/olympusmn.cpp:291
+msgid "Lens Temperature"
 msgstr ""
 
-#: src/olympusmn.cpp:879
-msgid "WB G Level 7500K"
+#: src/olympusmn.cpp:292
+msgid "Lens temperature"
 msgstr ""
 
-#: src/olympusmn.cpp:879
-msgid "WB G level 7500K"
+#: src/olympusmn.cpp:294
+msgid "Light Condition"
 msgstr ""
 
-#: src/olympusmn.cpp:880
-msgid "WB G Level"
+#: src/olympusmn.cpp:295
+msgid "Light condition"
 msgstr ""
 
-#: src/olympusmn.cpp:880
-msgid "WB G level"
+#: src/olympusmn.cpp:297
+msgid "Focus Range"
 msgstr ""
 
-#: src/olympusmn.cpp:882
-msgid "Enhancer"
+#: src/olympusmn.cpp:298
+msgid "Focus range"
 msgstr ""
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer Values"
+#: src/olympusmn.cpp:306
+msgid "Zoom"
 msgstr ""
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer values"
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
+msgid "Zoom step count"
 msgstr ""
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
-msgid "Coring Filter"
+#: src/olympusmn.cpp:309
+msgid "Macro Focus"
 msgstr ""
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
-msgid "Coring Values"
+#: src/olympusmn.cpp:310
+msgid "Macro focus step count"
 msgstr ""
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
-msgid "Coring values"
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
+msgid "Sharpness Factor"
 msgstr ""
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
-msgid "Black Level"
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
+msgid "Sharpness factor"
 msgstr ""
 
-#: src/olympusmn.cpp:887
-msgid "Gain Base"
+#: src/olympusmn.cpp:315
+msgid "Flash Charge Level"
 msgstr ""
 
-#: src/olympusmn.cpp:887
-msgid "Gain base"
+#: src/olympusmn.cpp:316
+msgid "Flash charge level"
 msgstr ""
 
-#: src/olympusmn.cpp:888
-msgid "Valid Bits"
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
+msgid "Color Matrix"
 msgstr ""
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
-msgid "Crop Left"
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
+msgid "Color matrix"
 msgstr ""
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
-msgid "Crop left"
+#: src/olympusmn.cpp:321
+msgid "BlackLevel"
 msgstr ""
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
-msgid "Crop Top"
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
+msgid "Black level"
 msgstr ""
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
-msgid "Crop top"
+#: src/olympusmn.cpp:331
+msgid "White balance mode"
 msgstr ""
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
-msgid "Crop Width"
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
+msgid "Red Balance"
 msgstr ""
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
-msgid "Crop width"
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
+msgid "Red balance"
 msgstr ""
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
-msgid "Crop Height"
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
+msgid "Blue Balance"
 msgstr ""
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
-msgid "Crop height"
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
+msgid "Blue balance"
 msgstr ""
 
-#: src/olympusmn.cpp:896
-msgid "Face Detect"
+#: src/olympusmn.cpp:342
+msgid "Color Matrix Number"
 msgstr ""
 
-#: src/olympusmn.cpp:896
-msgid "Face detect"
+#: src/olympusmn.cpp:343
+msgid "Color matrix mumber"
 msgstr ""
 
-#: src/olympusmn.cpp:897
-msgid "Face Detect Area"
+#: src/olympusmn.cpp:345
+msgid "Serial Number 2"
 msgstr ""
 
-#: src/olympusmn.cpp:897
-msgid "Face detect area"
+#: src/olympusmn.cpp:346
+msgid "Serial number 2"
 msgstr ""
 
-#: src/olympusmn.cpp:899
-msgid "Unknown OlympusIp tag"
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
+msgid "Flash exposure compensation"
 msgstr ""
 
-#: src/olympusmn.cpp:909
-msgid "Bounce or Off"
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
+msgid "External Flash Bounce"
 msgstr ""
 
-#: src/olympusmn.cpp:910
-msgid "Direct"
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
+msgid "External flash bounce"
 msgstr ""
 
-#: src/olympusmn.cpp:914
-msgid "Focus Info Version"
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
+msgid "External Flash Zoom"
 msgstr ""
 
-#: src/olympusmn.cpp:914
-msgid "Focus info version"
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
+msgid "External flash zoom"
 msgstr ""
 
-#: src/olympusmn.cpp:915
-msgid "Auto Focus"
+#: src/olympusmn.cpp:387
+msgid "External Flash Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:916
-msgid "Scene Detect"
+#: src/olympusmn.cpp:388
+msgid "External flash mode"
 msgstr ""
 
-#: src/olympusmn.cpp:916
-msgid "Scene detect"
+#: src/olympusmn.cpp:396
+msgid "Color Control"
 msgstr ""
 
-#: src/olympusmn.cpp:917
-msgid "Scene Area"
+#: src/olympusmn.cpp:397
+msgid "Color control"
 msgstr ""
 
-#: src/olympusmn.cpp:917
-msgid "Scene area"
+#: src/olympusmn.cpp:399
+msgid "ValidBits"
 msgstr ""
 
-#: src/olympusmn.cpp:918
-msgid "Scene Detect Data"
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
+msgid "Valid bits"
 msgstr ""
 
-#: src/olympusmn.cpp:918
-msgid "Scene detect data"
+#: src/olympusmn.cpp:402
+msgid "CoringFilter"
 msgstr ""
 
-#: src/olympusmn.cpp:919
-msgid "Zoom Step Count"
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+msgid "Coring filter"
 msgstr ""
 
-#: src/olympusmn.cpp:920
-msgid "Focus Step Count"
+#: src/olympusmn.cpp:423
+msgid "Compression Ratio"
 msgstr ""
 
-#: src/olympusmn.cpp:920
-msgid "Focus step count"
+#: src/olympusmn.cpp:424
+msgid "Compression ratio"
 msgstr ""
 
-#: src/olympusmn.cpp:921
-msgid "Focus Step Infinity"
+#: src/olympusmn.cpp:427
+msgid "Preview image embedded"
 msgstr ""
 
-#: src/olympusmn.cpp:921
-msgid "Focus step infinity"
+#: src/olympusmn.cpp:430
+msgid "Offset of the preview image"
 msgstr ""
 
-#: src/olympusmn.cpp:922
-msgid "Focus Step Near"
+#: src/olympusmn.cpp:433
+msgid "Size of the preview image"
 msgstr ""
 
-#: src/olympusmn.cpp:922
-msgid "Focus step near"
+#: src/olympusmn.cpp:435
+msgid "CCD Scan Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:925
-msgid "External Flash"
+#: src/olympusmn.cpp:436
+msgid "CCD scan mode"
 msgstr ""
 
-#: src/olympusmn.cpp:926
-msgid "External Flash Guide Number"
+#: src/olympusmn.cpp:441
+msgid "Infinity Lens Step"
 msgstr ""
 
-#: src/olympusmn.cpp:926
-msgid "External flash guide number"
+#: src/olympusmn.cpp:442
+msgid "Infinity lens step"
 msgstr ""
 
-#: src/olympusmn.cpp:930
-msgid "Manual Flash"
+#: src/olympusmn.cpp:444
+msgid "Near Lens Step"
 msgstr ""
 
-#: src/olympusmn.cpp:930
-msgid "Manual flash"
+#: src/olympusmn.cpp:445
+msgid "Near lens step"
 msgstr ""
 
-#: src/olympusmn.cpp:934
-msgid "Unknown OlympusFi tag"
+#: src/olympusmn.cpp:447
+msgid "Equipment Info"
 msgstr ""
 
-#: src/olympusmn.cpp:945
-msgid "Unknown OlympusFe tag"
+#: src/olympusmn.cpp:448
+msgid "Camera equipment sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:958
-msgid "Fine Weather"
+#: src/olympusmn.cpp:451
+msgid "Camera Settings sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:959
-msgid "Tungsten (incandescent)"
+#: src/olympusmn.cpp:453
+msgid "Raw Development"
 msgstr ""
 
-#: src/olympusmn.cpp:960
-msgid "Evening Sunlight"
+#: src/olympusmn.cpp:454
+msgid "Raw development sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:961
-msgid "Daylight Fluorescent (D 5700 - 7100K)"
+#: src/olympusmn.cpp:456
+msgid "Raw Development 2"
 msgstr ""
 
-#: src/olympusmn.cpp:962
-msgid "Day White Fluorescent (N 4600 - 5400K)"
+#: src/olympusmn.cpp:457
+msgid "Raw development 2 sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:963
-msgid "Cool White Fluorescent (W 3900 - 4500K)"
+#: src/olympusmn.cpp:460
+msgid "Image processing sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:964
-msgid "White Fluorescent (WW 3200 - 3700K)"
+#: src/olympusmn.cpp:462
+msgid "Focus Info"
 msgstr ""
 
-#: src/olympusmn.cpp:965
-msgid "One Touch White Balance"
+#: src/olympusmn.cpp:463
+msgid "Focus sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:966
-msgid "Custom 1-4"
+#: src/olympusmn.cpp:465
+msgid "Raw Info"
 msgstr ""
 
-#: src/olympusmn.cpp:970
-msgid "Raw Info Version"
+#: src/olympusmn.cpp:466
+msgid "Raw sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:970
-msgid "Raw info version"
+#: src/olympusmn.cpp:470
+msgid "Unknown OlympusMakerNote tag"
 msgstr ""
 
-#: src/olympusmn.cpp:971
-msgid "WB_RB Levels Used"
+#: src/olympusmn.cpp:486
+msgid "Program-shift"
 msgstr ""
 
-#: src/olympusmn.cpp:971
-msgid "WB_RB levels used"
+#: src/olympusmn.cpp:491
+msgid "Center-weighted average"
 msgstr ""
 
-#: src/olympusmn.cpp:972
-msgid "WB_RB Levels Auto"
+#: src/olympusmn.cpp:493
+msgid "ESP"
 msgstr ""
 
-#: src/olympusmn.cpp:972
-msgid "WB_RB levels auto"
+#: src/olympusmn.cpp:494
+msgid "Pattern+AF"
 msgstr ""
 
-#: src/olympusmn.cpp:973
-msgid "WB_RB Levels Shade"
+#: src/olympusmn.cpp:495
+msgid "Spot+Highlight control"
 msgstr ""
 
-#: src/olympusmn.cpp:973
-msgid "WB_RB levels shade"
+#: src/olympusmn.cpp:496
+msgid "Spot+Shadow control"
 msgstr ""
 
-#: src/olympusmn.cpp:974
-msgid "WB_RB Levels Cloudy"
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
+msgid "Single AF"
 msgstr ""
 
-#: src/olympusmn.cpp:974
-msgid "WB_RB levels cloudy"
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
+msgid "Sequential shooting AF"
 msgstr ""
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB Levels Fine Weather"
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
+msgid "Multi AF"
 msgstr ""
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB levels fine weather"
+#: src/olympusmn.cpp:517
+msgid "AF Not Used"
 msgstr ""
 
-#: src/olympusmn.cpp:976
-msgid "WB_RB Levels Tungsten"
+#: src/olympusmn.cpp:518
+msgid "AF Used"
 msgstr ""
 
-#: src/olympusmn.cpp:976
-msgid "WB_RB levels tungsten"
+#: src/olympusmn.cpp:523
+msgid "Not Ready"
 msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB Levels Evening Sunlight"
+#: src/olympusmn.cpp:524
+msgid "Ready"
 msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB levels evening sunlight"
+#: src/olympusmn.cpp:531
+msgid "Fill-in"
 msgstr ""
 
-#: src/olympusmn.cpp:978
-msgid "WB_RB Levels Daylight Fluor"
+#: src/olympusmn.cpp:533
+msgid "Slow-sync"
 msgstr ""
 
-#: src/olympusmn.cpp:978
-msgid "WB_RB levels daylight fluor"
+#: src/olympusmn.cpp:534
+msgid "Forced On"
 msgstr ""
 
-#: src/olympusmn.cpp:979
-msgid "WB_RB Levels Day White Fluor"
+#: src/olympusmn.cpp:535
+msgid "2nd Curtain"
 msgstr ""
 
-#: src/olympusmn.cpp:979
-msgid "WB_RB levels day white fluor"
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB Levels Cool White Fluor"
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB levels cool white fluor"
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:981
-msgid "WB_RB Levels White Fluorescent"
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:981
-msgid "WB_RB levels white fluorescent"
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:982
-msgid "Color Matrix2"
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:982
-msgid "Color matrix 2"
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:985
-msgid "Black Level 2"
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:985
-msgid "Black level 2"
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
 msgstr ""
 
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
-msgid "YCbCr Coefficients"
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
 msgstr ""
 
-#: src/olympusmn.cpp:986
-msgid "YCbCr coefficients"
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
 msgstr ""
 
-#: src/olympusmn.cpp:987
-msgid "Valid Pixel Depth"
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
 msgstr ""
 
-#: src/olympusmn.cpp:987
-msgid "Valid pixel depth"
+#: src/olympusmn.cpp:566
+msgid "7500K (Fine Weather with Shade)"
 msgstr ""
 
-#: src/olympusmn.cpp:993
-msgid "White Balance Comp"
+#: src/olympusmn.cpp:567
+msgid "6000K (Cloudy)"
 msgstr ""
 
-#: src/olympusmn.cpp:993
-msgid "White balance comp"
+#: src/olympusmn.cpp:568
+msgid "5300K (Fine Weather)"
 msgstr ""
 
-#: src/olympusmn.cpp:994
-msgid "Saturation Setting"
+#: src/olympusmn.cpp:569
+msgid "3000K (Tungsten light)"
 msgstr ""
 
-#: src/olympusmn.cpp:995
-msgid "Hue Setting"
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
+msgid "3600K (Tungsten light-like)"
 msgstr ""
 
-#: src/olympusmn.cpp:995
-msgid "Hue setting"
+#: src/olympusmn.cpp:571
+msgid "6600K (Daylight fluorescent)"
 msgstr ""
 
-#: src/olympusmn.cpp:998
-msgid "CM Exposure Compensation"
+#: src/olympusmn.cpp:572
+msgid "4500K (Neutral white fluorescent)"
 msgstr ""
 
-#: src/olympusmn.cpp:998
-msgid "CM exposure compensation"
+#: src/olympusmn.cpp:573
+msgid "4000K (Cool white fluorescent)"
 msgstr ""
 
-#: src/olympusmn.cpp:999
-msgid "CM White Balance"
+#: src/olympusmn.cpp:575
+msgid "Custom WB 1"
 msgstr ""
 
-#: src/olympusmn.cpp:999
-msgid "CM white balance"
+#: src/olympusmn.cpp:576
+msgid "Custom WB 2"
 msgstr ""
 
-#: src/olympusmn.cpp:1000
-msgid "CM White Balance Comp"
+#: src/olympusmn.cpp:577
+msgid "Custom WB 3"
 msgstr ""
 
-#: src/olympusmn.cpp:1000
-msgid "CM white balance comp"
+#: src/olympusmn.cpp:578
+msgid "Custom WB 4"
 msgstr ""
 
-#: src/olympusmn.cpp:1001
-msgid "CM White Balance Gray Point"
+#: src/olympusmn.cpp:579
+msgid "Custom WB 5400K"
 msgstr ""
 
-#: src/olympusmn.cpp:1001
-msgid "CM white balance gray point"
+#: src/olympusmn.cpp:580
+msgid "Custom WB 2900K"
 msgstr ""
 
-#: src/olympusmn.cpp:1002
-msgid "CM Saturation"
+#: src/olympusmn.cpp:581
+msgid "Custom WB 8000K"
 msgstr ""
 
-#: src/olympusmn.cpp:1002
-msgid "CM saturation"
+#: src/olympusmn.cpp:587
+msgid "CM1 (Red Enhance)"
 msgstr ""
 
-#: src/olympusmn.cpp:1003
-msgid "CM Hue"
+#: src/olympusmn.cpp:588
+msgid "CM2 (Green Enhance)"
 msgstr ""
 
-#: src/olympusmn.cpp:1003
-msgid "CM hue"
+#: src/olympusmn.cpp:589
+msgid "CM3 (Blue Enhance)"
 msgstr ""
 
-#: src/olympusmn.cpp:1004
-msgid "CM Contrast"
+#: src/olympusmn.cpp:590
+msgid "CM4 (Skin Tones)"
 msgstr ""
 
-#: src/olympusmn.cpp:1004
-msgid "CM contrast"
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
+msgid "Pro Photo RGB"
 msgstr ""
 
-#: src/olympusmn.cpp:1005
-msgid "CM Sharpness"
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
+msgid "Noise Filter"
 msgstr ""
 
-#: src/olympusmn.cpp:1005
-msgid "CM sharpness"
+#: src/olympusmn.cpp:604
+msgid "Noise Filter (ISO Boost)"
 msgstr ""
 
-#: src/olympusmn.cpp:1007
-msgid "Unknown OlympusRi tag"
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
+msgid "Muted"
 msgstr ""
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
-msgid "User-Selected"
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
+msgid "Monotone"
 msgstr ""
 
-#: src/olympusmn.cpp:1031
-msgid "Auto-Override"
+#: src/olympusmn.cpp:640
+msgid "SQ"
 msgstr ""
 
-#: src/olympusmn.cpp:1067
-msgid "Fast"
+#: src/olympusmn.cpp:641
+msgid "HQ"
 msgstr ""
 
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
+#: src/olympusmn.cpp:642
+msgid "SHQ"
 msgstr ""
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
+msgid "On, Mode 1"
 msgstr ""
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
+msgid "On, Mode 2"
 msgstr ""
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
+#: src/olympusmn.cpp:651
+msgid "On, Mode 3"
 msgstr ""
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
+#: src/olympusmn.cpp:655
+msgid "Camera Settings Version"
 msgstr ""
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
+#: src/olympusmn.cpp:655
+msgid "Camera settings version"
 msgstr ""
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
+#: src/olympusmn.cpp:656
+msgid "PreviewImage Valid"
 msgstr ""
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
+#: src/olympusmn.cpp:656
+msgid "Preview image valid"
 msgstr ""
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
-msgid "Very High"
+#: src/olympusmn.cpp:657
+msgid "PreviewImage Start"
 msgstr ""
 
-#: src/panasonicmn.cpp:57
-msgid "Motion Picture"
+#: src/olympusmn.cpp:657
+msgid "Preview image start"
 msgstr ""
 
-#: src/panasonicmn.cpp:65
-msgid "Halogen"
+#: src/olympusmn.cpp:658
+msgid "PreviewImage Length"
 msgstr ""
 
-#: src/panasonicmn.cpp:76
-msgid "Auto, focus button"
+#: src/olympusmn.cpp:658
+msgid "Preview image length"
 msgstr ""
 
-#: src/panasonicmn.cpp:77
-msgid "Auto, continuous"
+#: src/olympusmn.cpp:660
+msgid "Auto exposure lock"
 msgstr ""
 
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
+#: src/olympusmn.cpp:662
+msgid "Exposure Shift"
 msgstr ""
 
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
+#: src/olympusmn.cpp:662
+msgid "Exposure shift"
 msgstr ""
 
-#: src/panasonicmn.cpp:91
-msgid "Tele-macro"
+#: src/olympusmn.cpp:665
+msgid "Focus Process"
 msgstr ""
 
-#: src/panasonicmn.cpp:99
-msgid "Scenery"
+#: src/olympusmn.cpp:665
+msgid "Focus process"
 msgstr ""
 
-#: src/panasonicmn.cpp:104
-msgid "Shutter-speed priority"
+#: src/olympusmn.cpp:666
+msgid "AF Search"
 msgstr ""
 
-#: src/panasonicmn.cpp:108
-msgid "Movie preview"
+#: src/olympusmn.cpp:666
+msgid "AF search"
 msgstr ""
 
-#: src/panasonicmn.cpp:109
-msgid "Panning"
+#: src/olympusmn.cpp:667
+msgid "AF Areas"
 msgstr ""
 
-#: src/panasonicmn.cpp:110
-msgid "Simple"
+#: src/olympusmn.cpp:667
+msgid "AF areas"
 msgstr ""
 
-#: src/panasonicmn.cpp:111
-msgid "Color effects"
+#: src/olympusmn.cpp:668
+msgid "AFPointSelected"
 msgstr ""
 
-#: src/panasonicmn.cpp:115
-msgid "Night scenery"
+#: src/olympusmn.cpp:669
+msgid "AF Fine Tune Adjust"
 msgstr ""
 
-#: src/panasonicmn.cpp:117
-msgid "Baby"
+#: src/olympusmn.cpp:669
+msgid "AF fine tune adjust"
 msgstr ""
 
-#: src/panasonicmn.cpp:118
-msgid "Soft skin"
+#: src/olympusmn.cpp:672
+msgid "Flash Remote Control"
 msgstr ""
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
-msgid "Candlelight"
+#: src/olympusmn.cpp:672
+msgid "Flash remote control"
 msgstr ""
 
-#: src/panasonicmn.cpp:120
-msgid "Starry night"
+#: src/olympusmn.cpp:673
+msgid "Flash Control Mode"
 msgstr ""
 
-#: src/panasonicmn.cpp:121
-msgid "High sensitivity"
+#: src/olympusmn.cpp:673
+msgid "Flash control mode"
 msgstr ""
 
-#: src/panasonicmn.cpp:122
-msgid "Panorama assist"
+#: src/olympusmn.cpp:674
+msgid "Flash Intensity"
 msgstr ""
 
-#: src/panasonicmn.cpp:125
-msgid "Aerial photo"
+#: src/olympusmn.cpp:674
+msgid "Flash intensity"
 msgstr ""
 
-#: src/panasonicmn.cpp:128
-msgid "Intelligent ISO"
+#: src/olympusmn.cpp:675
+msgid "Manual Flash Strength"
 msgstr ""
 
-#: src/panasonicmn.cpp:129
-msgid "High speed continuous shooting"
+#: src/olympusmn.cpp:675
+msgid "Manual flash strength"
 msgstr ""
 
-#: src/panasonicmn.cpp:130
-msgid "Intelligent auto"
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
+msgid "White Balance 2"
 msgstr ""
 
-#: src/panasonicmn.cpp:142
-msgid "Warm"
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
+msgid "White balance 2"
 msgstr ""
 
-#: src/panasonicmn.cpp:143
-msgid "Cool"
+#: src/olympusmn.cpp:677
+msgid "White Balance Temperature"
 msgstr ""
 
-#: src/panasonicmn.cpp:151
-msgid "Low/High quality"
+#: src/olympusmn.cpp:677
+msgid "White balance temperature"
 msgstr ""
 
-#: src/panasonicmn.cpp:152
-msgid "Infinite"
+#: src/olympusmn.cpp:679
+msgid "Custom Saturation"
 msgstr ""
 
-#: src/panasonicmn.cpp:160
-msgid "Medium low"
+#: src/olympusmn.cpp:679
+msgid "Custom saturation"
 msgstr ""
 
-#: src/panasonicmn.cpp:161
-msgid "Medium high"
+#: src/olympusmn.cpp:680
+msgid "Modified Saturation"
 msgstr ""
 
-#: src/panasonicmn.cpp:170
-msgid "Low (-1)"
+#: src/olympusmn.cpp:680
+msgid "Modified saturation"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
-msgid "High (+1)"
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
+msgid "Contrast Setting"
 msgstr ""
 
-#: src/panasonicmn.cpp:172
-msgid "Lowest (-2)"
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
+msgid "Sharpness Setting"
 msgstr ""
 
-#: src/panasonicmn.cpp:173
-msgid "Highest (+2)"
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+msgid "Distortion Correction"
 msgstr ""
 
-#: src/panasonicmn.cpp:179
-msgid "10s"
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+msgid "Distortion correction"
 msgstr ""
 
-#: src/panasonicmn.cpp:180
-msgid "2s"
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+msgid "Shading Compensation"
 msgstr ""
 
-#: src/panasonicmn.cpp:200
-msgid "EX optics"
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+msgid "Shading compensation"
 msgstr ""
 
-#: src/panasonicmn.cpp:207
-msgid "Telephoto"
+#: src/olympusmn.cpp:688
+msgid "Compression Factor"
 msgstr ""
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
-msgid "Home"
+#: src/olympusmn.cpp:688
+msgid "Compression factor"
 msgstr ""
 
-#: src/panasonicmn.cpp:219
-msgid "Standard (color)"
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
+msgid "Gradation"
 msgstr ""
 
-#: src/panasonicmn.cpp:220
-msgid "Dynamic (color)"
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
+msgid "Picture mode"
 msgstr ""
 
-#: src/panasonicmn.cpp:221
-msgid "Nature (color)"
+#: src/olympusmn.cpp:691
+msgid "Picture Mode Saturation"
 msgstr ""
 
-#: src/panasonicmn.cpp:222
-msgid "Smooth (color)"
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
+msgid "Picture mode saturation"
 msgstr ""
 
-#: src/panasonicmn.cpp:223
-msgid "Standard (B&W)"
+#: src/olympusmn.cpp:692
+msgid "Picture Mode Hue"
 msgstr ""
 
-#: src/panasonicmn.cpp:224
-msgid "Dynamic (B&W)"
+#: src/olympusmn.cpp:692
+msgid "Picture mode hue"
 msgstr ""
 
-#: src/panasonicmn.cpp:225
-msgid "Smooth (B&W)"
+#: src/olympusmn.cpp:693
+msgid "Picture Mode Contrast"
 msgstr ""
 
-#: src/panasonicmn.cpp:239
-msgid "Audio"
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
+msgid "Picture mode contrast"
 msgstr ""
 
-#: src/panasonicmn.cpp:242
-msgid "White balance adjustment"
+#: src/olympusmn.cpp:694
+msgid "Picture Mode Sharpness"
 msgstr ""
 
-#: src/panasonicmn.cpp:243
-msgid "FlashBias"
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
+msgid "Picture mode sharpness"
 msgstr ""
 
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
-msgid "Exif version"
+#: src/olympusmn.cpp:695
+msgid "Picture Mode BW Filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:247
-msgid "Color Effect"
+#: src/olympusmn.cpp:695
+msgid "Picture mode BW filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:247
-msgid "Color effect"
+#: src/olympusmn.cpp:696
+msgid "Picture Mode Tone"
 msgstr ""
 
-#: src/panasonicmn.cpp:248
-msgid ""
-"Time in 1/100 s from when the camera was powered on to when the image is "
-"written to memory card"
+#: src/olympusmn.cpp:696
+msgid "Picture mode tone"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
-msgid "Burst Mode"
+#: src/olympusmn.cpp:697
+msgid "Noise filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
-msgid "Burst mode"
+#: src/olympusmn.cpp:698
+msgid "Art Filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:252
-msgid "NoiseReduction"
+#: src/olympusmn.cpp:698
+msgid "Art filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:253
-msgid "Self Timer"
+#: src/olympusmn.cpp:699
+msgid "Magic Filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
-msgid "Baby Age"
+#: src/olympusmn.cpp:699
+msgid "Magic filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
-msgid "Baby (or pet) age"
+#: src/olympusmn.cpp:701
+msgid "Panorama Mode"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
-msgid "Optical Zoom Mode"
+#: src/olympusmn.cpp:701
+msgid "Panorama mode"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
-msgid "Optical zoom mode"
+#: src/olympusmn.cpp:702
+msgid "Image Quality 2"
 msgstr ""
 
-#: src/panasonicmn.cpp:260
-msgid "Conversion Lens"
+#: src/olympusmn.cpp:702
+msgid "Image quality 2"
 msgstr ""
 
-#: src/panasonicmn.cpp:260
-msgid "Conversion lens"
+#: src/olympusmn.cpp:704
+msgid "Manometer Pressure"
 msgstr ""
 
-#: src/panasonicmn.cpp:261
-msgid "Travel Day"
+#: src/olympusmn.cpp:704
+msgid "Manometer pressure"
 msgstr ""
 
-#: src/panasonicmn.cpp:261
-msgid "Travel day"
+#: src/olympusmn.cpp:705
+msgid "Manometer Reading"
 msgstr ""
 
-#: src/panasonicmn.cpp:263
-msgid "World Time Location"
+#: src/olympusmn.cpp:705
+msgid "Manometer reading"
 msgstr ""
 
-#: src/panasonicmn.cpp:263
-msgid "World time location"
+#: src/olympusmn.cpp:706
+msgid "Extended WB Detect"
 msgstr ""
 
-#: src/panasonicmn.cpp:264
-msgid "Program ISO"
+#: src/olympusmn.cpp:706
+msgid "Extended WB detect"
 msgstr ""
 
-#: src/panasonicmn.cpp:268
-msgid "WB Adjust AB"
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
 msgstr ""
 
-#: src/panasonicmn.cpp:268
-msgid "WB adjust AB. Positive is a shift toward blue."
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
 msgstr ""
 
-#: src/panasonicmn.cpp:269
-msgid "WB Adjust GM"
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
 msgstr ""
 
-#: src/panasonicmn.cpp:269
-msgid "WBAdjustGM. Positive is a shift toward green."
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
 msgstr ""
 
-#: src/panasonicmn.cpp:272
-msgid "Accessory Type"
+#: src/olympusmn.cpp:710
+msgid "Unknown OlympusCs tag"
 msgstr ""
 
-#: src/panasonicmn.cpp:272
-msgid "Accessory type"
+#: src/olympusmn.cpp:721
+msgid "Simple E-System"
 msgstr ""
 
-#: src/panasonicmn.cpp:275
-msgid "MakerNote Version"
+#: src/olympusmn.cpp:722
+msgid "E-System"
 msgstr ""
 
-#: src/panasonicmn.cpp:275
-msgid "MakerNote version"
+#: src/olympusmn.cpp:739
+msgid "Equipment Version"
 msgstr ""
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
-msgid "WB Red Level"
+#: src/olympusmn.cpp:739
+msgid "Equipment version"
 msgstr ""
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
-msgid "WB red level"
+#: src/olympusmn.cpp:741
+msgid "Serial number"
 msgstr ""
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
-msgid "WB Green Level"
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+msgid "Lens Serial Number"
 msgstr ""
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
-msgid "WB green level"
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+msgid "Lens serial number"
 msgstr ""
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
-msgid "WB Blue Level"
+#: src/olympusmn.cpp:747 src/properties.cpp:374
+msgid "Lens Model"
 msgstr ""
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
-msgid "WB blue level"
+#: src/olympusmn.cpp:747
+msgid "Lens model"
 msgstr ""
 
-#: src/panasonicmn.cpp:282
-msgid "Unknown PanasonicMakerNote tag"
+#: src/olympusmn.cpp:748
+msgid "Lens Firmware Version"
 msgstr ""
 
-#: src/panasonicmn.cpp:299
-msgid "Spot mode on"
+#: src/olympusmn.cpp:748
+msgid "Lens firmware version"
 msgstr ""
 
-#: src/panasonicmn.cpp:300
-msgid "Spot mode off or 3-area (high speed)"
+#: src/olympusmn.cpp:753
+msgid "Max Aperture At Current Focal"
 msgstr ""
 
-#: src/panasonicmn.cpp:301
-msgid "Spot focussing"
+#: src/olympusmn.cpp:753
+msgid "Max aperture at current focal"
 msgstr ""
 
-#: src/panasonicmn.cpp:302
-msgid "5-area"
+#: src/olympusmn.cpp:754
+msgid "Lens Properties"
 msgstr ""
 
-#: src/panasonicmn.cpp:303
-msgid "1-area"
+#: src/olympusmn.cpp:754
+msgid "Lens properties"
 msgstr ""
 
-#: src/panasonicmn.cpp:304
-msgid "1-area (high speed)"
+#: src/olympusmn.cpp:755
+msgid "Extender"
 msgstr ""
 
-#: src/panasonicmn.cpp:305
-msgid "3-area (auto)"
+#: src/olympusmn.cpp:756
+msgid "Extender Serial Number"
 msgstr ""
 
-#: src/panasonicmn.cpp:306
-msgid "3-area (left)"
+#: src/olympusmn.cpp:756
+msgid "Extender serial number"
 msgstr ""
 
-#: src/panasonicmn.cpp:307
-msgid "3-area (center)"
+#: src/olympusmn.cpp:757
+msgid "Extender Model"
 msgstr ""
 
-#: src/panasonicmn.cpp:308
-msgid "3-area (right)"
+#: src/olympusmn.cpp:757
+msgid "Extender model"
 msgstr ""
 
-#: src/panasonicmn.cpp:320
-msgid " EV"
+#: src/olympusmn.cpp:758
+msgid "Extender Firmware Version"
 msgstr ""
 
-#: src/panasonicmn.cpp:329
-msgid "Panasonic raw version"
+#: src/olympusmn.cpp:758
+msgid "Extender firmwareversion"
 msgstr ""
 
-#: src/panasonicmn.cpp:330
-msgid "Sensor Width"
+#: src/olympusmn.cpp:760 src/properties.cpp:370
+msgid "Flash Model"
 msgstr ""
 
-#: src/panasonicmn.cpp:330
-msgid "Sensor width"
+#: src/olympusmn.cpp:760
+msgid "Flash model"
 msgstr ""
 
-#: src/panasonicmn.cpp:331
-msgid "Sensor Height"
+#: src/olympusmn.cpp:761
+msgid "Flash Firmware Version"
 msgstr ""
 
-#: src/panasonicmn.cpp:331
-msgid "Sensor height"
+#: src/olympusmn.cpp:761
+msgid "Flash firmware version"
 msgstr ""
 
-#: src/panasonicmn.cpp:332
-msgid "Sensor Top Border"
+#: src/olympusmn.cpp:762
+msgid "FlashSerialNumber"
 msgstr ""
 
-#: src/panasonicmn.cpp:332
-msgid "Sensor top border"
+#: src/olympusmn.cpp:764
+msgid "Unknown OlympusEq tag"
 msgstr ""
 
-#: src/panasonicmn.cpp:333
-msgid "Sensor Left Border"
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
+msgid "High Speed"
 msgstr ""
 
-#: src/panasonicmn.cpp:333
-msgid "Sensor left border"
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
+msgid "High Function"
 msgstr ""
 
-#: src/panasonicmn.cpp:336
-msgid "Red balance (found in Digilux 2 RAW images)"
+#: src/olympusmn.cpp:783
+msgid "Advanced High Speed"
 msgstr ""
 
-#: src/panasonicmn.cpp:342
-msgid "Preview Image"
+#: src/olympusmn.cpp:784
+msgid "Advanced High Function"
 msgstr ""
 
-#: src/panasonicmn.cpp:342
-msgid "Preview image"
+#: src/olympusmn.cpp:789
+msgid "Original"
 msgstr ""
 
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
-msgid "Manufacturer"
+#: src/olympusmn.cpp:790
+msgid "Edited (Landscape)"
 msgstr ""
 
-#: src/panasonicmn.cpp:343
-msgid "The manufacturer of the recording equipment"
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
+msgid "Edited (Portrait)"
 msgstr ""
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
-msgid "Model"
+#: src/olympusmn.cpp:797
+msgid "WB Color Temp"
 msgstr ""
 
-#: src/panasonicmn.cpp:344
-msgid "The model name or model number of the equipment"
+#: src/olympusmn.cpp:798
+msgid "WB Gray Point"
 msgstr ""
 
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
-msgid "Strip Offsets"
+#: src/olympusmn.cpp:808
+msgid "Raw Development Version"
 msgstr ""
 
-#: src/panasonicmn.cpp:345
-msgid "Strip offsets"
+#: src/olympusmn.cpp:808
+msgid "Raw development version"
 msgstr ""
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
-msgid "Orientation"
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
+msgid "Exposure Bias Value"
 msgstr ""
 
-#: src/panasonicmn.cpp:347
-msgid "Rows Per Strip"
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
+msgid "Exposure bias value"
 msgstr ""
 
-#: src/panasonicmn.cpp:347
-msgid "The number of rows per strip"
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+msgid "White Balance Value"
 msgstr ""
 
-#: src/panasonicmn.cpp:348
-msgid "Strip Byte Counts"
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+msgid "White balance value"
 msgstr ""
 
-#: src/panasonicmn.cpp:348
-msgid "Strip byte counts"
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
+msgid "WB Fine Adjustment"
 msgstr ""
 
-#: src/panasonicmn.cpp:349
-msgid "Raw Data Offset"
+#: src/olympusmn.cpp:811
+msgid "WB fine adjustment"
 msgstr ""
 
-#: src/panasonicmn.cpp:349
-msgid "Raw data offset"
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
+msgid "Gray Point"
 msgstr ""
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
-msgid "Exif IFD Pointer"
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
+msgid "Gray point"
 msgstr ""
 
-#: src/panasonicmn.cpp:350
-msgid "A pointer to the Exif IFD"
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+msgid "Saturation Emphasis"
 msgstr ""
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
-msgid "GPS Info IFD Pointer"
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+msgid "Saturation emphasis"
 msgstr ""
 
-#: src/panasonicmn.cpp:351
-msgid "A pointer to the GPS Info IFD"
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+msgid "Memory Color Emphasis"
 msgstr ""
 
-#: src/panasonicmn.cpp:353
-msgid "Unknown PanasonicRaw tag"
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+msgid "Memory color emphasis"
 msgstr ""
 
-#: src/pentaxmn.cpp:56
-msgid "Night-Scene"
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+msgid "Contrast Value"
 msgstr ""
 
-#: src/pentaxmn.cpp:62
-msgid "Optio 330/430"
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+msgid "Contrast value"
 msgstr ""
 
-#: src/pentaxmn.cpp:63
-msgid "Optio 230"
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+msgid "Sharpness Value"
 msgstr ""
 
-#: src/pentaxmn.cpp:64
-msgid "Optio 330GS"
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+msgid "Sharpness value"
 msgstr ""
 
-#: src/pentaxmn.cpp:65
-msgid "Optio 450/550"
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
+msgid "Engine"
 msgstr ""
 
-#: src/pentaxmn.cpp:66
-msgid "Optio S"
+#: src/olympusmn.cpp:820
+msgid "Edit status"
 msgstr ""
 
-#: src/pentaxmn.cpp:67
-msgid "*ist D"
+#: src/olympusmn.cpp:821
+msgid "Settings"
 msgstr ""
 
-#: src/pentaxmn.cpp:68
-msgid "Optio 33L"
+#: src/olympusmn.cpp:823
+msgid "Unknown OlympusRd tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:69
-msgid "Optio 33LF"
+#: src/olympusmn.cpp:878
+msgid "Raw Development 2 Version"
 msgstr ""
 
-#: src/pentaxmn.cpp:70
-msgid "Optio 33WR/43WR/555"
+#: src/olympusmn.cpp:878
+msgid "Raw development 2 version"
 msgstr ""
 
-#: src/pentaxmn.cpp:71
-msgid "Optio S4"
+#: src/olympusmn.cpp:882
+msgid "White balance fine adjustment"
 msgstr ""
 
-#: src/pentaxmn.cpp:72
-msgid "Optio MX"
+#: src/olympusmn.cpp:892
+msgid "PM Saturation"
 msgstr ""
 
-#: src/pentaxmn.cpp:73
-msgid "Optio S40"
+#: src/olympusmn.cpp:893
+msgid "PM Contrast"
 msgstr ""
 
-#: src/pentaxmn.cpp:74
-msgid "Optio S4i"
+#: src/olympusmn.cpp:894
+msgid "PM Sharpness"
 msgstr ""
 
-#: src/pentaxmn.cpp:75
-msgid "Optio 30"
+#: src/olympusmn.cpp:895
+msgid "PM BW Filter"
 msgstr ""
 
-#: src/pentaxmn.cpp:76
-msgid "Optio S30"
+#: src/olympusmn.cpp:895
+msgid "PM BW filter"
 msgstr ""
 
-#: src/pentaxmn.cpp:77
-msgid "Optio 750Z"
+#: src/olympusmn.cpp:896
+msgid "PM Picture Tone"
 msgstr ""
 
-#: src/pentaxmn.cpp:78
-msgid "Optio SV"
+#: src/olympusmn.cpp:896
+msgid "PM picture tone"
 msgstr ""
 
-#: src/pentaxmn.cpp:79
-msgid "Optio SVi"
+#: src/olympusmn.cpp:899
+msgid "Auto Gradation"
 msgstr ""
 
-#: src/pentaxmn.cpp:80
-msgid "Optio X"
+#: src/olympusmn.cpp:899
+msgid "Auto gradation"
 msgstr ""
 
-#: src/pentaxmn.cpp:81
-msgid "Optio S5i"
+#: src/olympusmn.cpp:900
+msgid "PM Noise Filter"
 msgstr ""
 
-#: src/pentaxmn.cpp:82
-msgid "Optio S50"
+#: src/olympusmn.cpp:900
+msgid "Picture mode noise filter"
 msgstr ""
 
-#: src/pentaxmn.cpp:83
-msgid "*ist DS"
+#: src/olympusmn.cpp:902
+msgid "Unknown OlympusRd2 tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:84
-msgid "Optio MX4"
+#: src/olympusmn.cpp:913
+msgid "On (2 frames)"
 msgstr ""
 
-#: src/pentaxmn.cpp:85
-msgid "Optio S5n"
+#: src/olympusmn.cpp:914
+msgid "On (3 frames)"
 msgstr ""
 
-#: src/pentaxmn.cpp:86
-msgid "Optio WP"
+#: src/olympusmn.cpp:919
+msgid "4:3"
 msgstr ""
 
-#: src/pentaxmn.cpp:87
-msgid "Optio S55"
+#: src/olympusmn.cpp:920
+msgid "3:2"
 msgstr ""
 
-#: src/pentaxmn.cpp:88
-msgid "Optio S5z"
+#: src/olympusmn.cpp:921
+msgid "16:9"
 msgstr ""
 
-#: src/pentaxmn.cpp:89
-msgid "*ist DL"
+#: src/olympusmn.cpp:922
+msgid "6:6"
 msgstr ""
 
-#: src/pentaxmn.cpp:90
-msgid "Optio S60"
+#: src/olympusmn.cpp:923
+msgid "5:4"
 msgstr ""
 
-#: src/pentaxmn.cpp:91
-msgid "Optio S45"
+#: src/olympusmn.cpp:924
+msgid "7:6"
 msgstr ""
 
-#: src/pentaxmn.cpp:92
-msgid "Optio S6"
+#: src/olympusmn.cpp:925
+msgid "6:5"
 msgstr ""
 
-#: src/pentaxmn.cpp:93
-msgid "Optio WPi"
+#: src/olympusmn.cpp:926
+msgid "7:5"
 msgstr ""
 
-#: src/pentaxmn.cpp:94
-msgid "BenQ DC X600"
+#: src/olympusmn.cpp:927
+msgid "3:4"
 msgstr ""
 
-#: src/pentaxmn.cpp:95
-msgid "*ist DS2"
+#: src/olympusmn.cpp:931
+msgid "Image Processing Version"
 msgstr ""
 
-#: src/pentaxmn.cpp:96
-msgid "Samsung GX-1S"
+#: src/olympusmn.cpp:931
+msgid "Image processing version"
 msgstr ""
 
-#: src/pentaxmn.cpp:97
-msgid "Optio A10"
+#: src/olympusmn.cpp:933
+msgid "WB RB Levels 3000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:98
-msgid "*ist DL2"
+#: src/olympusmn.cpp:933
+msgid "WB RB levels 3000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:99
-msgid "Samsung GX-1L"
+#: src/olympusmn.cpp:934
+msgid "WB RB Levels 3300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:100
-msgid "K100D"
+#: src/olympusmn.cpp:934
+msgid "WB RB levels 3300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:101
-msgid "K110D"
+#: src/olympusmn.cpp:935
+msgid "WB RB Levels 3600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:102
-msgid "K100D Super"
+#: src/olympusmn.cpp:935
+msgid "WB RB levels 3600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:103
-msgid "Optio T10"
+#: src/olympusmn.cpp:936
+msgid "WB RB Levels 3900K"
 msgstr ""
 
-#: src/pentaxmn.cpp:104
-msgid "Optio W10"
+#: src/olympusmn.cpp:936
+msgid "WB RB levels 3900K"
 msgstr ""
 
-#: src/pentaxmn.cpp:105
-msgid "Optio M10"
+#: src/olympusmn.cpp:937
+msgid "WB RB Levels 4000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:106
-msgid "K10D"
+#: src/olympusmn.cpp:937
+msgid "WB RB levels 4000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:107
-msgid "Samsung GX10"
+#: src/olympusmn.cpp:938
+msgid "WB RB Levels 4300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:108
-msgid "Optio S7"
+#: src/olympusmn.cpp:938
+msgid "WB RB levels 4300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:109
-msgid "Optio M20"
+#: src/olympusmn.cpp:939
+msgid "WB RB Levels 4500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:110
-msgid "Optio W20"
+#: src/olympusmn.cpp:939
+msgid "WB RB levels 4500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:111
-msgid "Optio A20"
+#: src/olympusmn.cpp:940
+msgid "WB RB Levels 4800K"
 msgstr ""
 
-#: src/pentaxmn.cpp:112
-msgid "Optio M30"
+#: src/olympusmn.cpp:940
+msgid "WB RB levels 4800K"
 msgstr ""
 
-#: src/pentaxmn.cpp:113
-msgid "Optio E30"
+#: src/olympusmn.cpp:941
+msgid "WB RB Levels 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:114
-msgid "Optio T30"
+#: src/olympusmn.cpp:941
+msgid "WB RB levels 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:115
-msgid "Optio W30"
+#: src/olympusmn.cpp:942
+msgid "WB RB Levels 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:116
-msgid "Optio A30"
+#: src/olympusmn.cpp:942
+msgid "WB RB levels 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:117
-msgid "Optio E40"
+#: src/olympusmn.cpp:943
+msgid "WB RB Levels 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:118
-msgid "Optio M40"
+#: src/olympusmn.cpp:943
+msgid "WB RB levels 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:119
-msgid "Optio Z10"
+#: src/olympusmn.cpp:944
+msgid "WB RB Levels 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
-msgid "Optio S10"
+#: src/olympusmn.cpp:944
+msgid "WB RB levels 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
-msgid "Optio A40"
+#: src/olympusmn.cpp:945
+msgid "WB RB Levels CWB1"
 msgstr ""
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
-msgid "Optio V10"
+#: src/olympusmn.cpp:945
+msgid "WB RB levels CWB1"
 msgstr ""
 
-#: src/pentaxmn.cpp:123
-msgid "K20D"
+#: src/olympusmn.cpp:946
+msgid "WB RB Levels CWB2"
 msgstr ""
 
-#: src/pentaxmn.cpp:127
-msgid "K200D"
+#: src/olympusmn.cpp:946
+msgid "WB RB levels CWB2"
 msgstr ""
 
-#: src/pentaxmn.cpp:128
-msgid "Optio E50"
+#: src/olympusmn.cpp:947
+msgid "WB RB Levels CWB3"
 msgstr ""
 
-#: src/pentaxmn.cpp:129
-msgid "Optio M50"
+#: src/olympusmn.cpp:947
+msgid "WB RB levels CWB3"
 msgstr ""
 
-#: src/pentaxmn.cpp:134
-msgid "Good"
+#: src/olympusmn.cpp:948
+msgid "WB RB Levels CWB4"
 msgstr ""
 
-#: src/pentaxmn.cpp:135
-msgid "Better"
+#: src/olympusmn.cpp:948
+msgid "WB RB levels CWB4"
 msgstr ""
 
-#: src/pentaxmn.cpp:136
-msgid "Best"
+#: src/olympusmn.cpp:949
+msgid "WB G Level 3000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:137
-msgid "TIFF"
+#: src/olympusmn.cpp:949
+msgid "WB G level 3000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:139
-msgid "Premium"
+#: src/olympusmn.cpp:950
+msgid "WB G Level 3300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:144
-msgid "640x480"
+#: src/olympusmn.cpp:950
+msgid "WB G level 3300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:145
-msgid "Full"
+#: src/olympusmn.cpp:951
+msgid "WB G Level 3600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:146
-msgid "1024x768"
+#: src/olympusmn.cpp:951
+msgid "WB G level 3600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:147
-msgid "1280x960"
+#: src/olympusmn.cpp:952
+msgid "WB G Level 3900K"
 msgstr ""
 
-#: src/pentaxmn.cpp:148
-msgid "1600x1200"
+#: src/olympusmn.cpp:952
+msgid "WB G level 3900K"
 msgstr ""
 
-#: src/pentaxmn.cpp:149
-msgid "2048x1536"
+#: src/olympusmn.cpp:953
+msgid "WB G Level 4000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:150
-msgid "2560x1920 or 2304x1728"
+#: src/olympusmn.cpp:953
+msgid "WB G level 4000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:151
-msgid "3072x2304"
+#: src/olympusmn.cpp:954
+msgid "WB G Level 4300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:152
-msgid "3264x2448"
+#: src/olympusmn.cpp:954
+msgid "WB G level 4300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:153
-msgid "320x240"
+#: src/olympusmn.cpp:955
+msgid "WB G Level 4500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:154
-msgid "2288x1712"
+#: src/olympusmn.cpp:955
+msgid "WB G level 4500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:155
-msgid "2592x1944"
+#: src/olympusmn.cpp:956
+msgid "WB G Level 4800K"
 msgstr ""
 
-#: src/pentaxmn.cpp:156
-msgid "2304x1728 or 2592x1944"
+#: src/olympusmn.cpp:956
+msgid "WB G level 4800K"
 msgstr ""
 
-#: src/pentaxmn.cpp:157
-msgid "3056x2296"
+#: src/olympusmn.cpp:957
+msgid "WB G Level 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:158
-msgid "2816x2212 or 2816x2112"
+#: src/olympusmn.cpp:957
+msgid "WB G level 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:159
-msgid "3648x2736"
+#: src/olympusmn.cpp:958
+msgid "WB G Level 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:164
-msgid "Auto, Did not fire"
+#: src/olympusmn.cpp:958
+msgid "WB G level 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:166
-msgid "Auto, Did not fire, Red-eye reduction"
+#: src/olympusmn.cpp:959
+msgid "WB G Level 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:167
-msgid "Auto, Fired"
+#: src/olympusmn.cpp:959
+msgid "WB G level 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:169
-msgid "Auto, Fired, Red-eye reduction"
+#: src/olympusmn.cpp:960
+msgid "WB G Level 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:170
-msgid "On, Red-eye reduction"
+#: src/olympusmn.cpp:960
+msgid "WB G level 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:171
-msgid "On, Wireless"
+#: src/olympusmn.cpp:961
+msgid "WB G Level"
 msgstr ""
 
-#: src/pentaxmn.cpp:172
-msgid "On, Soft"
+#: src/olympusmn.cpp:961
+msgid "WB G level"
 msgstr ""
 
-#: src/pentaxmn.cpp:173
-msgid "On, Slow-sync"
+#: src/olympusmn.cpp:963
+msgid "Enhancer"
 msgstr ""
 
-#: src/pentaxmn.cpp:174
-msgid "On, Slow-sync, Red-eye reduction"
+#: src/olympusmn.cpp:964
+msgid "Enhancer Values"
 msgstr ""
 
-#: src/pentaxmn.cpp:175
-msgid "On, Trailing-curtain Sync"
+#: src/olympusmn.cpp:964
+msgid "Enhancer values"
 msgstr ""
 
-#: src/pentaxmn.cpp:184
-msgid "Pan Focus"
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+msgid "Coring Filter"
 msgstr ""
 
-#: src/pentaxmn.cpp:185
-msgid "AF-S"
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+msgid "Coring Values"
 msgstr ""
 
-#: src/pentaxmn.cpp:186
-msgid "AF-C"
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+msgid "Coring values"
 msgstr ""
 
-#: src/pentaxmn.cpp:192
-msgid "Fixed Center"
+#: src/olympusmn.cpp:967 src/tags.cpp:913
+msgid "Black Level"
 msgstr ""
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
-msgid "50"
+#: src/olympusmn.cpp:968
+msgid "Gain Base"
 msgstr ""
 
-#: src/pentaxmn.cpp:209
-msgid "64"
+#: src/olympusmn.cpp:968
+msgid "Gain base"
 msgstr ""
 
-#: src/pentaxmn.cpp:210
-msgid "80"
+#: src/olympusmn.cpp:969
+msgid "Valid Bits"
 msgstr ""
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
-msgid "100"
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
+msgid "Crop Left"
 msgstr ""
 
-#: src/pentaxmn.cpp:212
-msgid "125"
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
+msgid "Crop left"
 msgstr ""
 
-#: src/pentaxmn.cpp:213
-msgid "160"
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
+msgid "Crop Top"
 msgstr ""
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
-msgid "200"
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
+msgid "Crop top"
 msgstr ""
 
-#: src/pentaxmn.cpp:215
-msgid "250"
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
+msgid "Crop Width"
 msgstr ""
 
-#: src/pentaxmn.cpp:216
-msgid "320"
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
+msgid "Crop width"
 msgstr ""
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
-msgid "400"
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
+msgid "Crop Height"
 msgstr ""
 
-#: src/pentaxmn.cpp:218
-msgid "500"
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
+msgid "Crop height"
 msgstr ""
 
-#: src/pentaxmn.cpp:219
-msgid "640"
+#: src/olympusmn.cpp:977
+msgid "Multiple Exposure Mode"
 msgstr ""
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
-msgid "800"
+#: src/olympusmn.cpp:977
+msgid "Multiple exposure mode"
 msgstr ""
 
-#: src/pentaxmn.cpp:221
-msgid "1000"
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+msgid "Aspect Ratio"
 msgstr ""
 
-#: src/pentaxmn.cpp:222
-msgid "1250"
+#: src/olympusmn.cpp:978
+msgid "Aspect ratio"
 msgstr ""
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
-msgid "1600"
+#: src/olympusmn.cpp:979
+msgid "Aspect Frame"
 msgstr ""
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
-msgid "3200"
+#: src/olympusmn.cpp:979
+msgid "Aspect frame"
 msgstr ""
 
-#: src/pentaxmn.cpp:249
-msgid "Multi Segment"
+#: src/olympusmn.cpp:980
+msgid "Face Detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:250
-msgid "Center Weighted"
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+msgid "Face detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:262
-msgid "DaylightFluorescent"
+#: src/olympusmn.cpp:981
+msgid "Face Detect Area"
 msgstr ""
 
-#: src/pentaxmn.cpp:263
-msgid "DaywhiteFluorescent"
+#: src/olympusmn.cpp:981
+msgid "Face detect area"
 msgstr ""
 
-#: src/pentaxmn.cpp:264
-msgid "WhiteFluorescent"
+#: src/olympusmn.cpp:983
+msgid "Unknown OlympusIp tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:268
-msgid "User Selected"
+#: src/olympusmn.cpp:993
+msgid "Bounce or Off"
 msgstr ""
 
-#: src/pentaxmn.cpp:273
-msgid "Auto (Daylight)"
+#: src/olympusmn.cpp:994
+msgid "Direct"
 msgstr ""
 
-#: src/pentaxmn.cpp:274
-msgid "Auto (Shade)"
+#: src/olympusmn.cpp:998
+msgid "Focus Info Version"
 msgstr ""
 
-#: src/pentaxmn.cpp:275
-msgid "Auto (Flash)"
+#: src/olympusmn.cpp:998
+msgid "Focus info version"
 msgstr ""
 
-#: src/pentaxmn.cpp:276
-msgid "Auto (Tungsten)"
+#: src/olympusmn.cpp:999
+msgid "Auto Focus"
 msgstr ""
 
-#: src/pentaxmn.cpp:277
-msgid "Auto (DaywhiteFluorescent)"
+#: src/olympusmn.cpp:1000
+msgid "Scene Detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:278
-msgid "Auto (WhiteFluorescent)"
+#: src/olympusmn.cpp:1000
+msgid "Scene detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:279
-msgid "Auto (Cloudy)"
+#: src/olympusmn.cpp:1001
+msgid "Scene Area"
 msgstr ""
 
-#: src/pentaxmn.cpp:281
-msgid "Preset (Fireworks?)"
+#: src/olympusmn.cpp:1001
+msgid "Scene area"
 msgstr ""
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
-msgid "Med Low"
+#: src/olympusmn.cpp:1002
+msgid "Scene Detect Data"
 msgstr ""
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
-msgid "Med High"
+#: src/olympusmn.cpp:1002
+msgid "Scene detect data"
 msgstr ""
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-msgid "Very Low"
+#: src/olympusmn.cpp:1003
+msgid "Zoom Step Count"
 msgstr ""
 
-#: src/pentaxmn.cpp:311
-msgid "Med Soft"
+#: src/olympusmn.cpp:1004
+msgid "Focus Step Count"
 msgstr ""
 
-#: src/pentaxmn.cpp:312
-msgid "Med Hard"
+#: src/olympusmn.cpp:1004
+msgid "Focus step count"
 msgstr ""
 
-#: src/pentaxmn.cpp:313
-msgid "Very Soft"
+#: src/olympusmn.cpp:1005
+msgid "Focus Step Infinity"
 msgstr ""
 
-#: src/pentaxmn.cpp:314
-msgid "Very Hard"
+#: src/olympusmn.cpp:1005
+msgid "Focus step infinity"
 msgstr ""
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
-msgid "Home town"
+#: src/olympusmn.cpp:1006
+msgid "Focus Step Near"
 msgstr ""
 
-#: src/pentaxmn.cpp:325
-msgid "Pago Pago"
+#: src/olympusmn.cpp:1006
+msgid "Focus step near"
 msgstr ""
 
-#: src/pentaxmn.cpp:326
-msgid "Honolulu"
+#: src/olympusmn.cpp:1009
+msgid "External Flash"
 msgstr ""
 
-#: src/pentaxmn.cpp:327
-msgid "Anchorage"
+#: src/olympusmn.cpp:1010
+msgid "External Flash Guide Number"
 msgstr ""
 
-#: src/pentaxmn.cpp:328
-msgid "Vancouver"
+#: src/olympusmn.cpp:1010
+msgid "External flash guide number"
 msgstr ""
 
-#: src/pentaxmn.cpp:329
-msgid "San Fransisco"
+#: src/olympusmn.cpp:1014
+msgid "Manual Flash"
 msgstr ""
 
-#: src/pentaxmn.cpp:330
-msgid "Los Angeles"
+#: src/olympusmn.cpp:1014
+msgid "Manual flash"
 msgstr ""
 
-#: src/pentaxmn.cpp:331
-msgid "Calgary"
+#: src/olympusmn.cpp:1018
+msgid "Unknown OlympusFi tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:332
-msgid "Denver"
+#: src/olympusmn.cpp:1029
+msgid "Unknown OlympusFe tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:333
-msgid "Mexico City"
+#: src/olympusmn.cpp:1042
+msgid "Fine Weather"
 msgstr ""
 
-#: src/pentaxmn.cpp:334
-msgid "Chicago"
+#: src/olympusmn.cpp:1043
+msgid "Tungsten (incandescent)"
 msgstr ""
 
-#: src/pentaxmn.cpp:335
-msgid "Miami"
+#: src/olympusmn.cpp:1044
+msgid "Evening Sunlight"
 msgstr ""
 
-#: src/pentaxmn.cpp:336
-msgid "Toronto"
+#: src/olympusmn.cpp:1045
+msgid "Daylight Fluorescent (D 5700 - 7100K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:337
-msgid "New York"
+#: src/olympusmn.cpp:1046
+msgid "Day White Fluorescent (N 4600 - 5400K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:338
-msgid "Santiago"
+#: src/olympusmn.cpp:1047
+msgid "Cool White Fluorescent (W 3900 - 4500K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:339
-msgid "Caracus"
+#: src/olympusmn.cpp:1048
+msgid "White Fluorescent (WW 3200 - 3700K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:340
-msgid "Halifax"
+#: src/olympusmn.cpp:1049
+msgid "One Touch White Balance"
 msgstr ""
 
-#: src/pentaxmn.cpp:341
-msgid "Buenos Aires"
+#: src/olympusmn.cpp:1050
+msgid "Custom 1-4"
 msgstr ""
 
-#: src/pentaxmn.cpp:342
-msgid "Sao Paulo"
+#: src/olympusmn.cpp:1054
+msgid "Raw Info Version"
 msgstr ""
 
-#: src/pentaxmn.cpp:343
-msgid "Rio de Janeiro"
+#: src/olympusmn.cpp:1054
+msgid "Raw info version"
 msgstr ""
 
-#: src/pentaxmn.cpp:344
-msgid "Madrid"
+#: src/olympusmn.cpp:1055
+msgid "WB_RB Levels Used"
 msgstr ""
 
-#: src/pentaxmn.cpp:345
-msgid "London"
+#: src/olympusmn.cpp:1055
+msgid "WB_RB levels used"
 msgstr ""
 
-#: src/pentaxmn.cpp:346
-msgid "Paris"
+#: src/olympusmn.cpp:1056
+msgid "WB_RB Levels Auto"
 msgstr ""
 
-#: src/pentaxmn.cpp:347
-msgid "Milan"
+#: src/olympusmn.cpp:1056
+msgid "WB_RB levels auto"
 msgstr ""
 
-#: src/pentaxmn.cpp:348
-msgid "Rome"
+#: src/olympusmn.cpp:1057
+msgid "WB_RB Levels Shade"
 msgstr ""
 
-#: src/pentaxmn.cpp:349
-msgid "Berlin"
+#: src/olympusmn.cpp:1057
+msgid "WB_RB levels shade"
 msgstr ""
 
-#: src/pentaxmn.cpp:350
-msgid "Johannesburg"
+#: src/olympusmn.cpp:1058
+msgid "WB_RB Levels Cloudy"
 msgstr ""
 
-#: src/pentaxmn.cpp:351
-msgid "Istanbul"
+#: src/olympusmn.cpp:1058
+msgid "WB_RB levels cloudy"
 msgstr ""
 
-#: src/pentaxmn.cpp:352
-msgid "Cairo"
+#: src/olympusmn.cpp:1059
+msgid "WB_RB Levels Fine Weather"
 msgstr ""
 
-#: src/pentaxmn.cpp:353
-msgid "Jerusalem"
+#: src/olympusmn.cpp:1059
+msgid "WB_RB levels fine weather"
 msgstr ""
 
-#: src/pentaxmn.cpp:354
-msgid "Moscow"
+#: src/olympusmn.cpp:1060
+msgid "WB_RB Levels Tungsten"
 msgstr ""
 
-#: src/pentaxmn.cpp:355
-msgid "Jeddah"
+#: src/olympusmn.cpp:1060
+msgid "WB_RB levels tungsten"
 msgstr ""
 
-#: src/pentaxmn.cpp:356
-msgid "Tehran"
+#: src/olympusmn.cpp:1061
+msgid "WB_RB Levels Evening Sunlight"
 msgstr ""
 
-#: src/pentaxmn.cpp:357
-msgid "Dubai"
+#: src/olympusmn.cpp:1061
+msgid "WB_RB levels evening sunlight"
 msgstr ""
 
-#: src/pentaxmn.cpp:358
-msgid "Karachi"
+#: src/olympusmn.cpp:1062
+msgid "WB_RB Levels Daylight Fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:359
-msgid "Kabul"
+#: src/olympusmn.cpp:1062
+msgid "WB_RB levels daylight fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:360
-msgid "Male"
+#: src/olympusmn.cpp:1063
+msgid "WB_RB Levels Day White Fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:361
-msgid "Delhi"
+#: src/olympusmn.cpp:1063
+msgid "WB_RB levels day white fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:362
-msgid "Colombo"
+#: src/olympusmn.cpp:1064
+msgid "WB_RB Levels Cool White Fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:363
-msgid "Kathmandu"
+#: src/olympusmn.cpp:1064
+msgid "WB_RB levels cool white fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:364
-msgid "Dacca"
+#: src/olympusmn.cpp:1065
+msgid "WB_RB Levels White Fluorescent"
 msgstr ""
 
-#: src/pentaxmn.cpp:365
-msgid "Yangon"
+#: src/olympusmn.cpp:1065
+msgid "WB_RB levels white fluorescent"
 msgstr ""
 
-#: src/pentaxmn.cpp:366
-msgid "Bangkok"
+#: src/olympusmn.cpp:1066
+msgid "Color Matrix2"
 msgstr ""
 
-#: src/pentaxmn.cpp:367
-msgid "Kuala Lumpur"
+#: src/olympusmn.cpp:1066
+msgid "Color matrix 2"
 msgstr ""
 
-#: src/pentaxmn.cpp:368
-msgid "Vientiane"
+#: src/olympusmn.cpp:1069
+msgid "Black Level 2"
 msgstr ""
 
-#: src/pentaxmn.cpp:369
-msgid "Singapore"
+#: src/olympusmn.cpp:1069
+msgid "Black level 2"
 msgstr ""
 
-#: src/pentaxmn.cpp:370
-msgid "Phnom Penh"
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
+msgid "YCbCr Coefficients"
 msgstr ""
 
-#: src/pentaxmn.cpp:371
-msgid "Ho Chi Minh"
+#: src/olympusmn.cpp:1070
+msgid "YCbCr coefficients"
 msgstr ""
 
-#: src/pentaxmn.cpp:372
-msgid "Jakarta"
+#: src/olympusmn.cpp:1071
+msgid "Valid Pixel Depth"
 msgstr ""
 
-#: src/pentaxmn.cpp:373
-msgid "Hong Kong"
+#: src/olympusmn.cpp:1071
+msgid "Valid pixel depth"
 msgstr ""
 
-#: src/pentaxmn.cpp:374
-msgid "Perth"
+#: src/olympusmn.cpp:1077
+msgid "White Balance Comp"
 msgstr ""
 
-#: src/pentaxmn.cpp:375
-msgid "Beijing"
+#: src/olympusmn.cpp:1077
+msgid "White balance comp"
 msgstr ""
 
-#: src/pentaxmn.cpp:376
-msgid "Shanghai"
+#: src/olympusmn.cpp:1078
+msgid "Saturation Setting"
 msgstr ""
 
-#: src/pentaxmn.cpp:377
-msgid "Manila"
+#: src/olympusmn.cpp:1079
+msgid "Hue Setting"
 msgstr ""
 
-#: src/pentaxmn.cpp:378
-msgid "Taipei"
+#: src/olympusmn.cpp:1079
+msgid "Hue setting"
 msgstr ""
 
-#: src/pentaxmn.cpp:379
-msgid "Seoul"
+#: src/olympusmn.cpp:1082
+msgid "CM Exposure Compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:380
-msgid "Adelaide"
+#: src/olympusmn.cpp:1082
+msgid "CM exposure compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:381
-msgid "Tokyo"
+#: src/olympusmn.cpp:1083
+msgid "CM White Balance"
 msgstr ""
 
-#: src/pentaxmn.cpp:382
-msgid "Guam"
+#: src/olympusmn.cpp:1083
+msgid "CM white balance"
 msgstr ""
 
-#: src/pentaxmn.cpp:383
-msgid "Sydney"
+#: src/olympusmn.cpp:1084
+msgid "CM White Balance Comp"
 msgstr ""
 
-#: src/pentaxmn.cpp:384
-msgid "Noumea"
+#: src/olympusmn.cpp:1084
+msgid "CM white balance comp"
 msgstr ""
 
-#: src/pentaxmn.cpp:385
-msgid "Wellington"
+#: src/olympusmn.cpp:1085
+msgid "CM White Balance Gray Point"
 msgstr ""
 
-#: src/pentaxmn.cpp:386
-msgid "Auckland"
+#: src/olympusmn.cpp:1085
+msgid "CM white balance gray point"
 msgstr ""
 
-#: src/pentaxmn.cpp:387
-msgid "Lima"
+#: src/olympusmn.cpp:1086
+msgid "CM Saturation"
 msgstr ""
 
-#: src/pentaxmn.cpp:388
-msgid "Dakar"
+#: src/olympusmn.cpp:1086
+msgid "CM saturation"
 msgstr ""
 
-#: src/pentaxmn.cpp:389
-msgid "Algiers"
+#: src/olympusmn.cpp:1087
+msgid "CM Hue"
 msgstr ""
 
-#: src/pentaxmn.cpp:390
-msgid "Helsinki"
+#: src/olympusmn.cpp:1087
+msgid "CM hue"
 msgstr ""
 
-#: src/pentaxmn.cpp:391
-msgid "Athens"
+#: src/olympusmn.cpp:1088
+msgid "CM Contrast"
 msgstr ""
 
-#: src/pentaxmn.cpp:392
-msgid "Nairobi"
+#: src/olympusmn.cpp:1088
+msgid "CM contrast"
 msgstr ""
 
-#: src/pentaxmn.cpp:393
-msgid "Amsterdam"
+#: src/olympusmn.cpp:1089
+msgid "CM Sharpness"
 msgstr ""
 
-#: src/pentaxmn.cpp:394
-msgid "Stockholm"
+#: src/olympusmn.cpp:1089
+msgid "CM sharpness"
 msgstr ""
 
-#: src/pentaxmn.cpp:395
-msgid "Lisbon"
+#: src/olympusmn.cpp:1091
+msgid "Unknown OlympusRi tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:400
-msgid "Unprocessed"
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
+msgid "User-Selected"
 msgstr ""
 
-#: src/pentaxmn.cpp:401
-msgid "Digital Filter"
+#: src/olympusmn.cpp:1115
+msgid "Auto-Override"
 msgstr ""
 
-#: src/pentaxmn.cpp:402
-msgid "Cropped"
+#: src/olympusmn.cpp:1151
+msgid "Fast"
 msgstr ""
 
-#: src/pentaxmn.cpp:404
-msgid "Frame Synthesis?"
+#: src/olympusmn.cpp:1208
+msgid "3000 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
-msgid "MTF Program"
+#: src/olympusmn.cpp:1209
+msgid "3700 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:416
-msgid "Night Scene Portrait"
+#: src/olympusmn.cpp:1210
+msgid "4000 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:417
-msgid "No Flash"
+#: src/olympusmn.cpp:1211
+msgid "4500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:420
-msgid "Surf & Snow"
+#: src/olympusmn.cpp:1212
+msgid "5500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:423
-msgid "Kids"
+#: src/olympusmn.cpp:1213
+msgid "6500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:428
-msgid "Auto PICT (Standard)"
+#: src/olympusmn.cpp:1214
+msgid "7500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:429
-msgid "Auto PICT (Portrait)"
+#: src/olympusmn.cpp:1220
+msgid "One-touch"
 msgstr ""
 
-#: src/pentaxmn.cpp:430
-msgid "Auto PICT (Landscape)"
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:431
-msgid "Auto PICT (Macro)"
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:432
-msgid "Auto PICT (Sport)"
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
-msgid "Green Mode"
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
 msgstr ""
 
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
-msgid "Shutter Speed Priority"
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
 msgstr ""
 
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
-msgid "Aperture Priority"
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
 msgstr ""
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
-msgid "Bulb"
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:442
-msgid "Hi-speed Program"
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
 msgstr ""
 
-#: src/pentaxmn.cpp:443
-msgid "DOF Program"
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:448
-msgid "Program Tv Shift"
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
 msgstr ""
 
-#: src/pentaxmn.cpp:449
-msgid "Program Av Shift"
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:452
-msgid "Aperture Priority (Off-Auto-Aperture)"
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
 msgstr ""
 
-#: src/pentaxmn.cpp:453
-msgid "Manual (Off-Auto-Aperture)"
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:454
-msgid "Bulb (Off-Auto-Aperture)"
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
 msgstr ""
 
-#: src/pentaxmn.cpp:456
-msgid "Shutter Priority"
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
 msgstr ""
 
-#: src/pentaxmn.cpp:457
-msgid "Shutter & Aperture Priority AE"
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:458
-msgid "Shutter & Aperture Priority AE (1)"
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:459
-msgid "Sensitivity Priority AE"
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:460
-msgid "Sensitivity Priority AE (1)"
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:461
-msgid "Flash X-Sync Speed AE"
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
 msgstr ""
 
-#: src/pentaxmn.cpp:462
-msgid "Flash X-Sync Speed AE (1)"
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
 msgstr ""
 
-#: src/pentaxmn.cpp:471
-msgid "Continuous (Hi)"
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
 msgstr ""
 
-#: src/pentaxmn.cpp:472
-msgid "Burst"
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
 msgstr ""
 
-#: src/pentaxmn.cpp:473
-msgid "Self-timer (12 sec)"
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:474
-msgid "Self-timer (2 sec)"
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
 msgstr ""
 
-#: src/pentaxmn.cpp:475
-msgid "Remote Control (3 sec)"
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:476
-msgid "Remote Control"
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
 msgstr ""
 
-#: src/pentaxmn.cpp:477
-msgid "Multiple Exposure"
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
 msgstr ""
 
-#: src/pentaxmn.cpp:488
-msgid "M-42 or No Lens"
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:489
-msgid "K,M Lens"
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
 msgstr ""
 
-#: src/pentaxmn.cpp:490
-msgid "A Series Lens"
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
 msgstr ""
 
-#: src/pentaxmn.cpp:625
-msgid "Bright"
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
 msgstr ""
 
-#: src/pentaxmn.cpp:628
-msgid "Vibrant"
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
 msgstr ""
 
-#: src/pentaxmn.cpp:641
-msgid "Weakest"
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:642
-msgid "Weak"
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
 msgstr ""
 
-#: src/pentaxmn.cpp:643
-msgid "Strong"
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
 msgstr ""
 
-#: src/pentaxmn.cpp:752
-msgid "No extended bracketing"
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
 msgstr ""
 
-#: src/pentaxmn.cpp:758
-msgid "WB-BA"
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:761
-msgid "WB-GM"
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
 msgstr ""
 
-#: src/pentaxmn.cpp:773
-msgid "Unknown "
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:786
-msgid "Pentax Makernote version"
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
 msgstr ""
 
-#: src/pentaxmn.cpp:789
-msgid "Camera shooting mode"
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
-msgid "Resolution of a preview image"
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
 msgstr ""
 
-#: src/pentaxmn.cpp:794
-msgid "Length of a preview image"
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:795
-msgid "Size of an IFD containing a preview image"
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:800
-msgid "Model identification"
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:801
-msgid "Pentax model idenfication"
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
 msgstr ""
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
-msgid "Date"
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
 msgstr ""
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
-msgid "Time"
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
 msgstr ""
 
-#: src/pentaxmn.cpp:810
-msgid "Image quality settings"
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
 msgstr ""
 
-#: src/pentaxmn.cpp:813
-msgid "Image size settings"
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
 msgstr ""
 
-#: src/pentaxmn.cpp:817
-msgid "Flash mode settings"
+#: src/olympusmn.cpp:1386
+msgid "Imager AF"
 msgstr ""
 
-#: src/pentaxmn.cpp:820
-msgid "Focus mode settings"
+#: src/olympusmn.cpp:1387
+msgid "AF sensor"
 msgstr ""
 
-#: src/pentaxmn.cpp:823
-msgid "Selected AF point"
+#: src/olympusmn.cpp:1433
+msgid "Soft Focus"
 msgstr ""
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
-msgid "F-Number"
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
 msgstr ""
 
-#: src/pentaxmn.cpp:832
-msgid "ISO sensitivity"
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
 msgstr ""
 
-#: src/pentaxmn.cpp:833
-msgid "ISO sensitivity settings"
+#: src/olympusmn.cpp:1436
+msgid "Light Tone"
 msgstr ""
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
-msgid "MeteringMode"
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
 msgstr ""
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
-msgid "AutoBracketing"
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
 msgstr ""
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
-msgid "White ballance"
+#: src/olympusmn.cpp:1439
+msgid "Diorama"
 msgstr ""
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
-msgid "White ballance mode"
+#: src/olympusmn.cpp:1440
+msgid "Cross Process"
 msgstr ""
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
-msgid "FocalLength"
+#: src/olympusmn.cpp:1441
+msgid "Fish Eye"
 msgstr ""
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
-msgid "Location"
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
 msgstr ""
 
-#: src/pentaxmn.cpp:869
-msgid "Hometown"
+#: src/olympusmn.cpp:1489
+msgid "Left (or n/a)"
 msgstr ""
 
-#: src/pentaxmn.cpp:875
-msgid "Hometown DST"
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
+msgid "Center (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:876
-msgid "Whether day saving time is active in home town"
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
+msgid "Center (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:878
-msgid "Destination DST"
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:879
-msgid "Whether day saving time is active in destination"
+#: src/olympusmn.cpp:1504
+msgid "Top-center (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
-msgid "DSPFirmwareVersion"
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
-msgid "CPUFirmwareVersion"
+#: src/olympusmn.cpp:1506
+msgid "Left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:891
-msgid "Light value"
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:892
-msgid "Camera calculated light value, includes exposure compensation"
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
-msgid "Preview image borders"
+#: src/olympusmn.cpp:1510
+msgid "Right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
-msgid "Sensitivity adjust"
+#: src/olympusmn.cpp:1511
+msgid "Bottom-left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
-msgid "Digital filter"
+#: src/olympusmn.cpp:1512
+msgid "Bottom-center (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-msgid "Temperature"
+#: src/olympusmn.cpp:1513
+msgid "Bottom-right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:923
-msgid "Camera temperature"
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
-msgid "Image tone"
+#: src/olympusmn.cpp:1515
+msgid "Top-center (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
-msgid "Colort temperature"
+#: src/olympusmn.cpp:1516
+msgid "Top-right (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:943
-msgid "Shake reduction"
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:944
-msgid "Shake reduction information"
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
-msgid "Dynamic range expansion"
+#: src/olympusmn.cpp:1520
+msgid "Mid-right (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
-msgid "High ISO noise reduction"
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
-msgid "Black point"
+#: src/olympusmn.cpp:1522
+msgid "Bottom-left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
-msgid "White point"
+#: src/olympusmn.cpp:1523
+msgid "Bottom-center (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
-msgid "ShotInfo"
+#: src/olympusmn.cpp:1524
+msgid "Bottom-right (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
-msgid "AEInfo"
+#: src/olympusmn.cpp:1561
+msgid "Single Target"
 msgstr ""
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
-msgid "LensInfo"
+#: src/olympusmn.cpp:1562
+msgid "All Target"
 msgstr ""
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
-msgid "FlashInfo"
+#: src/olympusmn.cpp:1563
+msgid "Dynamic Single Target"
 msgstr ""
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
-msgid "AEMeteringSegments"
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
+msgid "Very High"
 msgstr ""
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
-msgid "FlashADump"
+#: src/panasonicmn.cpp:59
+msgid "Motion Picture"
 msgstr ""
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
-msgid "FlashBDump"
+#: src/panasonicmn.cpp:67
+msgid "Halogen"
 msgstr ""
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
-msgid "WB_RGGBLevelsDaylight"
+#: src/panasonicmn.cpp:79
+msgid "Auto, focus button"
 msgstr ""
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
-msgid "WB_RGGBLevelsShade"
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
+msgid "Auto, continuous"
 msgstr ""
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
-msgid "WB_RGGBLevelsCloudy"
+#: src/panasonicmn.cpp:95
+msgid "Tele-macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
-msgid "WB_RGGBLevelsTungsten"
+#: src/panasonicmn.cpp:103
+msgid "Scenery"
 msgstr ""
 
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
-msgid "WB_RGGBLevelsFluorescentD"
+#: src/panasonicmn.cpp:108
+msgid "Shutter-speed priority"
 msgstr ""
 
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
-msgid "WB_RGGBLevelsFluorescentN"
+#: src/panasonicmn.cpp:112
+msgid "Movie preview"
 msgstr ""
 
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
-msgid "WB_RGGBLevelsFluorescentW"
+#: src/panasonicmn.cpp:113
+msgid "Panning"
 msgstr ""
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
-msgid "WB_RGGBLevelsFlash"
+#: src/panasonicmn.cpp:114
+msgid "Simple"
 msgstr ""
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
-msgid "CameraInfo"
+#: src/panasonicmn.cpp:115
+msgid "Color effects"
 msgstr ""
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
-msgid "BatteryInfo"
+#: src/panasonicmn.cpp:119
+msgid "Night scenery"
 msgstr ""
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
-msgid "AFInfo"
+#: src/panasonicmn.cpp:121
+msgid "Baby"
 msgstr ""
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
-msgid "ColorInfo"
+#: src/panasonicmn.cpp:122
+msgid "Soft skin"
 msgstr ""
 
-#: src/pentaxmn.cpp:1023
-msgid "Unknown PentaxMakerNote tag"
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
+msgid "Candlelight"
 msgstr ""
 
-#: src/properties.cpp:92
-msgid "Dublin Core schema"
+#: src/panasonicmn.cpp:124
+msgid "Starry night"
 msgstr ""
 
-#: src/properties.cpp:93
-msgid "digiKam Photo Management schema"
+#: src/panasonicmn.cpp:125
+msgid "High sensitivity"
 msgstr ""
 
-#: src/properties.cpp:94
-msgid "XMP Basic schema"
+#: src/panasonicmn.cpp:126
+msgid "Panorama assist"
 msgstr ""
 
-#: src/properties.cpp:95
-msgid "XMP Rights Management schema"
+#: src/panasonicmn.cpp:129
+msgid "Aerial photo"
 msgstr ""
 
-#: src/properties.cpp:96
-msgid "XMP Media Management schema"
+#: src/panasonicmn.cpp:132
+msgid "Intelligent ISO"
 msgstr ""
 
-#: src/properties.cpp:97
-msgid "XMP Basic Job Ticket schema"
+#: src/panasonicmn.cpp:133
+msgid "High speed continuous shooting"
 msgstr ""
 
-#: src/properties.cpp:98
-msgid "XMP Paged-Text schema"
+#: src/panasonicmn.cpp:134
+msgid "Intelligent auto"
 msgstr ""
 
-#: src/properties.cpp:99
-msgid "XMP Dynamic Media schema"
+#: src/panasonicmn.cpp:146
+msgid "Warm"
 msgstr ""
 
-#: src/properties.cpp:100
-msgid "Microsoft Photo schema"
+#: src/panasonicmn.cpp:147
+msgid "Cool"
 msgstr ""
 
-#: src/properties.cpp:101
-msgid "Adobe PDF schema"
+#: src/panasonicmn.cpp:155
+msgid "Low/High quality"
 msgstr ""
 
-#: src/properties.cpp:102
-msgid "Adobe photoshop schema"
+#: src/panasonicmn.cpp:156
+msgid "Infinite"
 msgstr ""
 
-#: src/properties.cpp:103
-msgid "Camera Raw schema"
+#: src/panasonicmn.cpp:164
+msgid "Medium low"
 msgstr ""
 
-#: src/properties.cpp:104
-msgid "Exif Schema for TIFF Properties"
+#: src/panasonicmn.cpp:165
+msgid "Medium high"
 msgstr ""
 
-#: src/properties.cpp:105
-msgid "Exif schema for Exif-specific Properties"
+#: src/panasonicmn.cpp:175
+msgid "Low (-1)"
 msgstr ""
 
-#: src/properties.cpp:106
-msgid "Exif schema for Additional Exif Properties"
+#: src/panasonicmn.cpp:176
+msgid "High (+1)"
 msgstr ""
 
-#: src/properties.cpp:107
-msgid "IPTC Core schema"
+#: src/panasonicmn.cpp:177
+msgid "Lowest (-2)"
 msgstr ""
 
-#: src/properties.cpp:109
-msgid "IPTC Extension schema"
+#: src/panasonicmn.cpp:178
+msgid "Highest (+2)"
 msgstr ""
 
-#: src/properties.cpp:111
-msgid "PLUS License Data Format schema"
+#: src/panasonicmn.cpp:184
+msgid "10s"
 msgstr ""
 
-#: src/properties.cpp:114
-msgid "Colorant structure"
+#: src/panasonicmn.cpp:185
+msgid "2s"
 msgstr ""
 
-#: src/properties.cpp:115
-msgid "Dimensions structure"
+#: src/panasonicmn.cpp:205
+msgid "EX optics"
 msgstr ""
 
-#: src/properties.cpp:116
-msgid "Font structure"
+#: src/panasonicmn.cpp:212
+msgid "Telephoto"
 msgstr ""
 
-#: src/properties.cpp:117
-msgid "Thumbnail structure"
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
+msgid "Home"
 msgstr ""
 
-#: src/properties.cpp:118
-msgid "Resource Event structure"
+#: src/panasonicmn.cpp:225
+msgid "Standard (color)"
 msgstr ""
 
-#: src/properties.cpp:119
-msgid "ResourceRef structure"
+#: src/panasonicmn.cpp:226
+msgid "Dynamic (color)"
 msgstr ""
 
-#: src/properties.cpp:120
-msgid "Version structure"
+#: src/panasonicmn.cpp:227
+msgid "Nature (color)"
 msgstr ""
 
-#: src/properties.cpp:121
-msgid "Basic Job/Workflow structure"
+#: src/panasonicmn.cpp:228
+msgid "Smooth (color)"
 msgstr ""
 
-#: src/properties.cpp:124
-msgid "Qualifier for xmp:Identifier"
+#: src/panasonicmn.cpp:229
+msgid "Standard (B&W)"
 msgstr ""
 
-#: src/properties.cpp:128
-msgid "Contributor"
+#: src/panasonicmn.cpp:230
+msgid "Dynamic (B&W)"
 msgstr ""
 
-#: src/properties.cpp:128
-msgid "Contributors to the resource (other than the authors)."
+#: src/panasonicmn.cpp:231
+msgid "Smooth (B&W)"
 msgstr ""
 
-#: src/properties.cpp:129
-msgid "Coverage"
+#: src/panasonicmn.cpp:245
+msgid "Audio"
 msgstr ""
 
-#: src/properties.cpp:129
-msgid ""
-"The spatial or temporal topic of the resource, the spatial applicability of "
-"the resource, or the jurisdiction under which the resource is relevant."
+#: src/panasonicmn.cpp:248
+msgid "White balance adjustment"
 msgstr ""
 
-#: src/properties.cpp:131
-msgid "Creator"
+#: src/panasonicmn.cpp:249
+msgid "FlashBias"
 msgstr ""
 
-#: src/properties.cpp:131
-msgid ""
-"The authors of the resource (listed in order of precedence, if significant)."
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
+msgid "Exif version"
 msgstr ""
 
-#: src/properties.cpp:132
-msgid "Date(s) that something interesting happened to the resource."
+#: src/panasonicmn.cpp:253
+msgid "Color Effect"
+msgstr ""
+
+#: src/panasonicmn.cpp:253
+msgid "Color effect"
 msgstr ""
 
-#: src/properties.cpp:133
+#: src/panasonicmn.cpp:254
 msgid ""
-"A textual description of the content of the resource. Multiple values may be "
-"present for different languages."
+"Time in 1/100 s from when the camera was powered on to when the image is "
+"written to memory card"
 msgstr ""
 
-#: src/properties.cpp:135
-msgid "Format"
+#: src/panasonicmn.cpp:255
+msgid "Burst Mode"
 msgstr ""
 
-#: src/properties.cpp:135
-msgid ""
-"The file format used when saving the resource. Tools and applications should "
-"set this property to the save format of the data. It may include appropriate "
-"qualifiers."
+#: src/panasonicmn.cpp:255
+msgid "Burst mode"
 msgstr ""
 
-#: src/properties.cpp:137 src/properties.cpp:180
-msgid "Identifier"
+#: src/panasonicmn.cpp:258
+msgid "NoiseReduction"
 msgstr ""
 
-#: src/properties.cpp:137
-msgid ""
-"Unique identifier of the resource. Recommended best practice is to identify "
-"the resource by means of a string conforming to a formal identification "
-"system."
+#: src/panasonicmn.cpp:259
+msgid "Self Timer"
 msgstr ""
 
-#: src/properties.cpp:139
-msgid "An unordered array specifying the languages used in the resource."
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+msgid "Baby Age"
 msgstr ""
 
-#: src/properties.cpp:140
-msgid "Publisher"
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+msgid "Baby (or pet) age"
 msgstr ""
 
-#: src/properties.cpp:140
-msgid ""
-"An entity responsible for making the resource available. Examples of a "
-"Publisher include a person, an organization, or a service. Typically, the "
-"name of a Publisher should be used to indicate the entity."
+#: src/panasonicmn.cpp:265
+msgid "Optical Zoom Mode"
 msgstr ""
 
-#: src/properties.cpp:143
-msgid "Relation"
+#: src/panasonicmn.cpp:265
+msgid "Optical zoom mode"
 msgstr ""
 
-#: src/properties.cpp:143
-msgid ""
-"Relationships to other documents. Recommended best practice is to identify "
-"the related resource by means of a string conforming to a formal "
-"identification system."
+#: src/panasonicmn.cpp:266
+msgid "Conversion Lens"
 msgstr ""
 
-#: src/properties.cpp:145
-msgid "Rights"
+#: src/panasonicmn.cpp:266
+msgid "Conversion lens"
 msgstr ""
 
-#: src/properties.cpp:145
-msgid ""
-"Informal rights statement, selected by language. Typically, rights "
-"information includes a statement about various property rights associated "
-"with the resource, including intellectual property rights."
+#: src/panasonicmn.cpp:267
+msgid "Travel Day"
 msgstr ""
 
-#: src/properties.cpp:148
-msgid "Unique identifier of the work from which this resource was derived."
+#: src/panasonicmn.cpp:267
+msgid "Travel day"
 msgstr ""
 
-#: src/properties.cpp:149
-msgid ""
-"An unordered array of descriptive phrases or keywords that specify the topic "
-"of the content of the resource."
+#: src/panasonicmn.cpp:269
+msgid "World Time Location"
 msgstr ""
 
-#: src/properties.cpp:151
-msgid "Title"
+#: src/panasonicmn.cpp:269
+msgid "World time location"
 msgstr ""
 
-#: src/properties.cpp:151
-msgid ""
-"The title of the document, or the name given to the resource. Typically, it "
-"will be a name by which the resource is formally known."
+#: src/panasonicmn.cpp:270
+msgid "Program ISO"
 msgstr ""
 
-#: src/properties.cpp:153
-msgid "Type"
+#: src/panasonicmn.cpp:274
+msgid "WB Adjust AB"
 msgstr ""
 
-#: src/properties.cpp:153
-msgid "A document type; for example, novel, poem, or working paper."
+#: src/panasonicmn.cpp:274
+msgid "WB adjust AB. Positive is a shift toward blue."
 msgstr ""
 
-#: src/properties.cpp:159
-msgid "Tags List"
+#: src/panasonicmn.cpp:275
+msgid "WB Adjust GM"
 msgstr ""
 
-#: src/properties.cpp:159
-msgid ""
-"The list of complete tags path as string. The path hierarchy is separated by "
-"'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
+#: src/panasonicmn.cpp:275
+msgid "WBAdjustGM. Positive is a shift toward green."
 msgstr ""
 
-#: src/properties.cpp:160
-msgid "Captions Author Names"
+#: src/panasonicmn.cpp:278
+msgid "Accessory Type"
 msgstr ""
 
-#: src/properties.cpp:160
-msgid ""
-"The list of all captions author names for each language alternative captions "
-"set in standard XMP tags."
+#: src/panasonicmn.cpp:278
+msgid "Accessory type"
 msgstr ""
 
-#: src/properties.cpp:161
-msgid "Captions Date Time Stamps"
+#: src/panasonicmn.cpp:281
+msgid "MakerNote Version"
 msgstr ""
 
-#: src/properties.cpp:161
-msgid ""
-"The list of all captions date time stamps for each language alternative "
-"captions set in standard XMP tags."
+#: src/panasonicmn.cpp:281
+msgid "MakerNote version"
 msgstr ""
 
-#: src/properties.cpp:168
-msgid "Advisory"
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
+msgid "WB Red Level"
 msgstr ""
 
-#: src/properties.cpp:168
-msgid ""
-"An unordered array specifying properties that were edited outside the "
-"authoring application. Each item should contain a single namespace and XPath "
-"separated by one ASCII space (U+0020)."
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
+msgid "WB red level"
 msgstr ""
 
-#: src/properties.cpp:171
-msgid "Base URL"
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
+msgid "WB Green Level"
 msgstr ""
 
-#: src/properties.cpp:171
-msgid ""
-"The base URL for relative URLs in the document content. If this document "
-"contains Internet links, and those links are relative, they are relative to "
-"this base URL. This property provides a standard way for embedded relative "
-"URLs to be interpreted by tools. Web authoring tools should set the value "
-"based on their notion of where URLs will be interpreted."
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
+msgid "WB green level"
 msgstr ""
 
-#: src/properties.cpp:176
-msgid "Create Date"
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
+msgid "WB Blue Level"
 msgstr ""
 
-#: src/properties.cpp:176
-msgid "The date and time the resource was originally created."
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
+msgid "WB blue level"
 msgstr ""
 
-#: src/properties.cpp:177
-msgid "Creator Tool"
+#: src/panasonicmn.cpp:288
+msgid "Unknown PanasonicMakerNote tag"
 msgstr ""
 
-#: src/properties.cpp:177
-msgid ""
-"The name of the first known tool used to create the resource. If history is "
-"present in the metadata, this value should be equivalent to that of xmpMM:"
-"History's softwareAgent property."
+#: src/panasonicmn.cpp:305
+msgid "Spot mode on"
 msgstr ""
 
-#: src/properties.cpp:180
-msgid ""
-"An unordered array of text strings that unambiguously identify the resource "
-"within a given context. An array item may be qualified with xmpidq:Scheme to "
-"denote the formal identification system to which that identifier conforms. "
-"Note: The dc:identifier property is not used because it lacks a defined "
-"scheme qualifier and has been defined in the XMP Specification as a simple "
-"(single-valued) property."
+#: src/panasonicmn.cpp:306
+msgid "Spot mode off or 3-area (high speed)"
 msgstr ""
 
-#: src/properties.cpp:185
-msgid "Label"
+#: src/panasonicmn.cpp:307
+msgid "Spot focussing"
 msgstr ""
 
-#: src/properties.cpp:185
-msgid ""
-"A word or short phrase that identifies a document as a member of a user-"
-"defined collection. Used to organize documents in a file browser."
+#: src/panasonicmn.cpp:308
+msgid "5-area"
 msgstr ""
 
-#: src/properties.cpp:187
-msgid "Metadata Date"
+#: src/panasonicmn.cpp:309
+msgid "1-area"
 msgstr ""
 
-#: src/properties.cpp:187
-msgid ""
-"The date and time that any metadata for this resource was last changed. It "
-"should be the same as or more recent than xmp:ModifyDate."
+#: src/panasonicmn.cpp:310
+msgid "1-area (high speed)"
 msgstr ""
 
-#: src/properties.cpp:189
-msgid "Modify Date"
+#: src/panasonicmn.cpp:311
+msgid "3-area (auto)"
 msgstr ""
 
-#: src/properties.cpp:189
-msgid ""
-"The date and time the resource was last modified. Note: The value of this "
-"property is not necessarily the same as the file's system modification date "
-"because it is set before the file is saved."
+#: src/panasonicmn.cpp:312
+msgid "3-area (left)"
 msgstr ""
 
-#: src/properties.cpp:192
-msgid "Nickname"
+#: src/panasonicmn.cpp:313
+msgid "3-area (center)"
 msgstr ""
 
-#: src/properties.cpp:192
-msgid "A short informal name for the resource."
+#: src/panasonicmn.cpp:314
+msgid "3-area (right)"
 msgstr ""
 
-#: src/properties.cpp:193
-msgid "Rating"
+#: src/panasonicmn.cpp:326
+msgid " EV"
 msgstr ""
 
-#: src/properties.cpp:193
-msgid ""
-"A number that indicates a document's status relative to other documents, "
-"used to organize documents in a file browser. Values are user-defined within "
-"an application-defined range."
+#: src/panasonicmn.cpp:335
+msgid "Panasonic raw version"
 msgstr ""
 
-#: src/properties.cpp:196
-msgid "Thumbnails"
+#: src/panasonicmn.cpp:336
+msgid "Sensor Width"
 msgstr ""
 
-#: src/properties.cpp:196
-msgid ""
-"An alternative array of thumbnail images for a file, which can differ in "
-"characteristics such as size or image encoding."
+#: src/panasonicmn.cpp:336
+msgid "Sensor width"
 msgstr ""
 
-#: src/properties.cpp:203
-msgid "Certificate"
+#: src/panasonicmn.cpp:337
+msgid "Sensor Height"
 msgstr ""
 
-#: src/properties.cpp:203
-msgid "Online rights management certificate."
+#: src/panasonicmn.cpp:337
+msgid "Sensor height"
 msgstr ""
 
-#: src/properties.cpp:204
-msgid "Marked"
+#: src/panasonicmn.cpp:338
+msgid "Sensor Top Border"
 msgstr ""
 
-#: src/properties.cpp:204
-msgid "Indicates that this is a rights-managed resource."
+#: src/panasonicmn.cpp:338
+msgid "Sensor top border"
 msgstr ""
 
-#: src/properties.cpp:205
-msgid "Owner"
+#: src/panasonicmn.cpp:339
+msgid "Sensor Left Border"
 msgstr ""
 
-#: src/properties.cpp:205
-msgid "An unordered array specifying the legal owner(s) of a resource."
+#: src/panasonicmn.cpp:339
+msgid "Sensor left border"
 msgstr ""
 
-#: src/properties.cpp:206
-msgid "Usage Terms"
+#: src/panasonicmn.cpp:342
+msgid "Red balance (found in Digilux 2 RAW images)"
 msgstr ""
 
-#: src/properties.cpp:206
-msgid "Text instructions on how a resource can be legally used."
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
+msgid "Manufacturer"
 msgstr ""
 
-#: src/properties.cpp:207
-msgid "Web Statement"
+#: src/panasonicmn.cpp:349
+msgid "The manufacturer of the recording equipment"
 msgstr ""
 
-#: src/properties.cpp:207
-msgid ""
-"The location of a web page describing the owner and/or rights statement for "
-"this resource."
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
+msgid "Model"
 msgstr ""
 
-#: src/properties.cpp:213
-msgid "Derived From"
+#: src/panasonicmn.cpp:350
+msgid "The model name or model number of the equipment"
 msgstr ""
 
-#: src/properties.cpp:213
-msgid ""
-"A reference to the original document from which this one is derived. It is a "
-"minimal reference; missing components can be assumed to be unchanged. For "
-"example, a new version might only need to specify the instance ID and "
-"version number of the previous version, or a rendition might only need to "
-"specify the instance ID and rendition class of the original."
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
+msgid "Strip Offsets"
 msgstr ""
 
-#: src/properties.cpp:218
-msgid "Document ID"
+#: src/panasonicmn.cpp:351
+msgid "Strip offsets"
 msgstr ""
 
-#: src/properties.cpp:218
-msgid ""
-"The common identifier for all versions and renditions of a document. It "
-"should be based on a UUID; see Document and Instance IDs below."
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
+msgid "Orientation"
 msgstr ""
 
-#: src/properties.cpp:220
-msgid "History"
+#: src/panasonicmn.cpp:353
+msgid "Rows Per Strip"
 msgstr ""
 
-#: src/properties.cpp:220
-msgid ""
-"An ordered array of high-level user actions that resulted in this resource. "
-"It is intended to give human readers a general indication of the steps taken "
-"to make the changes from the previous version to this one. The list should "
-"be at an abstract level; it is not intended to be an exhaustive keystroke or "
-"other detailed history."
+#: src/panasonicmn.cpp:353
+msgid "The number of rows per strip"
 msgstr ""
 
-#: src/properties.cpp:224
-msgid "Instance ID"
+#: src/panasonicmn.cpp:354
+msgid "Strip Byte Counts"
 msgstr ""
 
-#: src/properties.cpp:224
-msgid ""
-"An identifier for a specific incarnation of a document, updated each time a "
-"file is saved. It should be based on a UUID; see Document and Instance IDs "
-"below."
+#: src/panasonicmn.cpp:354
+msgid "Strip byte counts"
 msgstr ""
 
-#: src/properties.cpp:226
-msgid "Managed From"
+#: src/panasonicmn.cpp:355
+msgid "Raw Data Offset"
 msgstr ""
 
-#: src/properties.cpp:226
-msgid ""
-"A reference to the document as it was prior to becoming managed. It is set "
-"when a managed document is introduced to an asset management system that "
-"does not currently own it. It may or may not include references to different "
-"management systems."
+#: src/panasonicmn.cpp:355
+msgid "Raw data offset"
 msgstr ""
 
-#: src/properties.cpp:229
-msgid "Manager"
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
+msgid "Exif IFD Pointer"
 msgstr ""
 
-#: src/properties.cpp:229
-msgid ""
-"The name of the asset management system that manages this resource. Along "
-"with xmpMM: ManagerVariant, it tells applications which asset management "
-"system to contact concerning this document."
+#: src/panasonicmn.cpp:356
+msgid "A pointer to the Exif IFD"
 msgstr ""
 
-#: src/properties.cpp:232
-msgid "Manage To"
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
+msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: src/properties.cpp:232
-msgid ""
-"A URI identifying the managed resource to the asset management system; the "
-"presence of this property is the formal indication that this resource is "
-"managed. The form and content of this URI is private to the asset management "
-"system."
+#: src/panasonicmn.cpp:357
+msgid "A pointer to the GPS Info IFD"
 msgstr ""
 
-#: src/properties.cpp:235
-msgid "Manage UI"
+#: src/panasonicmn.cpp:359
+msgid "Unknown PanasonicRaw tag"
 msgstr ""
 
-#: src/properties.cpp:235
-msgid ""
-"A URI that can be used to access information about the managed resource "
-"through a web browser. It might require a custom browser plug-in."
+#: src/pentaxmn.cpp:57
+msgid "Night-Scene"
 msgstr ""
 
-#: src/properties.cpp:237
-msgid "Manager Variant"
+#: src/pentaxmn.cpp:63
+msgid "Optio 330/430"
 msgstr ""
 
-#: src/properties.cpp:237
-msgid ""
-"Specifies a particular variant of the asset management system. The format of "
-"this property is private to the specific asset management system."
+#: src/pentaxmn.cpp:64
+msgid "Optio 230"
 msgstr ""
 
-#: src/properties.cpp:239
-msgid "Rendition Class"
+#: src/pentaxmn.cpp:65
+msgid "Optio 330GS"
 msgstr ""
 
-#: src/properties.cpp:239
-msgid ""
-"The rendition class name for this resource. This property should be absent "
-"or set to default for a document version that is not a derived rendition."
+#: src/pentaxmn.cpp:66
+msgid "Optio 450/550"
 msgstr ""
 
-#: src/properties.cpp:241
-msgid "Rendition Params"
+#: src/pentaxmn.cpp:67
+msgid "Optio S"
 msgstr ""
 
-#: src/properties.cpp:241
-msgid ""
-"Can be used to provide additional rendition parameters that are too complex "
-"or verbose to encode in xmpMM: RenditionClass."
+#: src/pentaxmn.cpp:68
+msgid "*ist D"
 msgstr ""
 
-#: src/properties.cpp:243
-msgid "Version ID"
+#: src/pentaxmn.cpp:69
+msgid "Optio 33L"
 msgstr ""
 
-#: src/properties.cpp:243
-msgid ""
-"The document version identifier for this resource. Each version of a "
-"document gets a new identifier, usually simply by incrementing integers 1, "
-"2, 3 . . . and so on. Media management systems can have other conventions or "
-"support branching which requires a more complex scheme."
+#: src/pentaxmn.cpp:70
+msgid "Optio 33LF"
 msgstr ""
 
-#: src/properties.cpp:247
-msgid "Versions"
+#: src/pentaxmn.cpp:71
+msgid "Optio 33WR/43WR/555"
 msgstr ""
 
-#: src/properties.cpp:247
-msgid ""
-"The version history associated with this resource. Entry [1] is the oldest "
-"known version for this document, entry [last()] is the most recent version. "
-"Typically, a media management system would fill in the version information "
-"in the metadata on check-in. It is not guaranteed that a complete history  "
-"versions from the first to this one will be present in the xmpMM:Versions "
-"property. Interior version information can be compressed or eliminated and "
-"the version history can be truncated at some point."
+#: src/pentaxmn.cpp:72
+msgid "Optio S4"
 msgstr ""
 
-#: src/properties.cpp:253
-msgid "Last URL"
+#: src/pentaxmn.cpp:73
+msgid "Optio MX"
 msgstr ""
 
-#: src/properties.cpp:253
-msgid "Deprecated for privacy protection."
+#: src/pentaxmn.cpp:74
+msgid "Optio S40"
 msgstr ""
 
-#: src/properties.cpp:254
-msgid "Rendition Of"
+#: src/pentaxmn.cpp:75
+msgid "Optio S4i"
 msgstr ""
 
-#: src/properties.cpp:254
-msgid ""
-"Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
-"which this is a rendition."
+#: src/pentaxmn.cpp:76
+msgid "Optio 30"
 msgstr ""
 
-#: src/properties.cpp:256
-msgid "Save ID"
+#: src/pentaxmn.cpp:77
+msgid "Optio S30"
 msgstr ""
 
-#: src/properties.cpp:256
-msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
+#: src/pentaxmn.cpp:78
+msgid "Optio 750Z"
 msgstr ""
 
-#: src/properties.cpp:262
-msgid "Job Reference"
+#: src/pentaxmn.cpp:79
+msgid "Optio SV"
 msgstr ""
 
-#: src/properties.cpp:262
-msgid ""
-"References an external job management file for a job process in which the "
-"document is being used. Use of job names is under user control. Typical use "
-"would be to identify all documents that are part of a particular job or "
-"contract. There are multiple values because there can be more than one job "
-"using a particular document at any time, and it can also be useful to keep "
-"historical information about what jobs a document was part of previously."
+#: src/pentaxmn.cpp:80
+msgid "Optio SVi"
 msgstr ""
 
-#: src/properties.cpp:271
-msgid "Maximum Page Size"
+#: src/pentaxmn.cpp:81
+msgid "Optio X"
 msgstr ""
 
-#: src/properties.cpp:271
-msgid ""
-"The size of the largest page in the document (including any in contained "
-"documents)."
+#: src/pentaxmn.cpp:82
+msgid "Optio S5i"
 msgstr ""
 
-#: src/properties.cpp:272
-msgid "Number of Pages"
+#: src/pentaxmn.cpp:83
+msgid "Optio S50"
 msgstr ""
 
-#: src/properties.cpp:272
-msgid ""
-"The number of pages in the document (including any in contained documents)."
+#: src/pentaxmn.cpp:84
+msgid "*ist DS"
 msgstr ""
 
-#: src/properties.cpp:273
-msgid "Fonts"
+#: src/pentaxmn.cpp:85
+msgid "Optio MX4"
 msgstr ""
 
-#: src/properties.cpp:273
-msgid ""
-"An unordered array of fonts that are used in the document (including any in "
-"contained documents)."
+#: src/pentaxmn.cpp:86
+msgid "Optio S5n"
 msgstr ""
 
-#: src/properties.cpp:274
-msgid "Colorants"
+#: src/pentaxmn.cpp:87
+msgid "Optio WP"
 msgstr ""
 
-#: src/properties.cpp:274
-msgid ""
-"An ordered array of colorants (swatches) that are used in the document "
-"(including any in contained documents)."
+#: src/pentaxmn.cpp:88
+msgid "Optio S55"
 msgstr ""
 
-#: src/properties.cpp:275
-msgid "Plate Names"
+#: src/pentaxmn.cpp:89
+msgid "Optio S5z"
 msgstr ""
 
-#: src/properties.cpp:275
-msgid ""
-"An ordered array of plate names that are needed to print the document "
-"(including any in contained documents)."
+#: src/pentaxmn.cpp:90
+msgid "*ist DL"
 msgstr ""
 
-#: src/properties.cpp:281
-msgid "Project Reference"
+#: src/pentaxmn.cpp:91
+msgid "Optio S60"
 msgstr ""
 
-#: src/properties.cpp:281
-msgid "A reference to the project that created this file."
+#: src/pentaxmn.cpp:92
+msgid "Optio S45"
 msgstr ""
 
-#: src/properties.cpp:282
-msgid "Video Frame Rate"
+#: src/pentaxmn.cpp:93
+msgid "Optio S6"
 msgstr ""
 
-#: src/properties.cpp:282
-msgid "The video frame rate. One of: 24, NTSC, PAL."
+#: src/pentaxmn.cpp:94
+msgid "Optio WPi"
 msgstr ""
 
-#: src/properties.cpp:283
-msgid "Video Frame Size"
+#: src/pentaxmn.cpp:95
+msgid "BenQ DC X600"
 msgstr ""
 
-#: src/properties.cpp:283
-msgid "The frame size. For example: w:720, h: 480, unit:pixels"
+#: src/pentaxmn.cpp:96
+msgid "*ist DS2"
 msgstr ""
 
-#: src/properties.cpp:284
-msgid "Video Pixel Aspect Ratio"
+#: src/pentaxmn.cpp:97
+msgid "Samsung GX-1S"
 msgstr ""
 
-#: src/properties.cpp:284
-msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
+#: src/pentaxmn.cpp:98
+msgid "Optio A10"
 msgstr ""
 
-#: src/properties.cpp:285
-msgid "Video Pixel Depth"
+#: src/pentaxmn.cpp:99
+msgid "*ist DL2"
 msgstr ""
 
-#: src/properties.cpp:285
-msgid ""
-"The size in bits of each color component of a pixel. Standard Windows 32-bit "
-"pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
+#: src/pentaxmn.cpp:100
+msgid "Samsung GX-1L"
 msgstr ""
 
-#: src/properties.cpp:287
-msgid "Video Color Space"
+#: src/pentaxmn.cpp:101
+msgid "K100D"
 msgstr ""
 
-#: src/properties.cpp:287
-msgid ""
-"The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
-"CCIR-709 (used for HD)."
+#: src/pentaxmn.cpp:102
+msgid "K110D"
 msgstr ""
 
-#: src/properties.cpp:289
-msgid "Video Alpha Mode"
+#: src/pentaxmn.cpp:103
+msgid "K100D Super"
 msgstr ""
 
-#: src/properties.cpp:289
-msgid "The alpha mode. One of: straight, pre-multiplied."
+#: src/pentaxmn.cpp:104
+msgid "Optio T10/T20"
 msgstr ""
 
-#: src/properties.cpp:290
-msgid "Video Alpha Premultiple Color"
+#: src/pentaxmn.cpp:105
+msgid "Optio W10"
 msgstr ""
 
-#: src/properties.cpp:290
-msgid ""
-"A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
-"is pre-multiplied."
+#: src/pentaxmn.cpp:106
+msgid "Optio M10"
 msgstr ""
 
-#: src/properties.cpp:292
-msgid "Video Alpha Unity Is Transparent"
+#: src/pentaxmn.cpp:107
+msgid "K10D"
 msgstr ""
 
-#: src/properties.cpp:292
-msgid "When true, unity is clear, when false, it is opaque."
+#: src/pentaxmn.cpp:108
+msgid "Samsung GX10"
 msgstr ""
 
-#: src/properties.cpp:293
-msgid "Video Compressor"
+#: src/pentaxmn.cpp:109
+msgid "Optio S7"
 msgstr ""
 
-#: src/properties.cpp:293
-msgid "Video compression used. For example, jpeg."
+#: src/pentaxmn.cpp:110
+msgid "Optio L20"
 msgstr ""
 
-#: src/properties.cpp:294
-msgid "Video Field Order"
+#: src/pentaxmn.cpp:111
+msgid "Optio M20"
 msgstr ""
 
-#: src/properties.cpp:294
-msgid "The field order for video. One of: Upper, Lower, Progressive."
+#: src/pentaxmn.cpp:112
+msgid "Optio W20"
 msgstr ""
 
-#: src/properties.cpp:295
-msgid "Pull Down"
+#: src/pentaxmn.cpp:113
+msgid "Optio A20"
 msgstr ""
 
-#: src/properties.cpp:295
-msgid ""
-"The sampling phase of film to be converted to video (pull-down). One of: "
-"WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
-"WWWSS_24p, WWSSW_24p."
+#: src/pentaxmn.cpp:114
+msgid "Optio M30"
 msgstr ""
 
-#: src/properties.cpp:297
-msgid "Audio Sample Rate"
+#: src/pentaxmn.cpp:115
+msgid "Optio E30"
 msgstr ""
 
-#: src/properties.cpp:297
-msgid ""
-"The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
+#: src/pentaxmn.cpp:116
+msgid "Optio E35"
 msgstr ""
 
-#: src/properties.cpp:298
-msgid "Audio Sample Type"
+#: src/pentaxmn.cpp:117
+msgid "Optio T30"
 msgstr ""
 
-#: src/properties.cpp:298
-msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
+#: src/pentaxmn.cpp:118
+msgid "Optio W30"
 msgstr ""
 
-#: src/properties.cpp:299
-msgid "Audio Channel Type"
+#: src/pentaxmn.cpp:119
+msgid "Optio A30"
 msgstr ""
 
-#: src/properties.cpp:299
-msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
+#: src/pentaxmn.cpp:120
+msgid "Optio E40"
 msgstr ""
 
-#: src/properties.cpp:300
-msgid "Audio Compressor"
+#: src/pentaxmn.cpp:121
+msgid "Optio M40"
 msgstr ""
 
-#: src/properties.cpp:300
-msgid "The audio compression used. For example, MP3."
+#: src/pentaxmn.cpp:122
+msgid "Optio Z10"
 msgstr ""
 
-#: src/properties.cpp:301
-msgid "Speaker Placement"
+#: src/pentaxmn.cpp:123
+msgid "K20D"
 msgstr ""
 
-#: src/properties.cpp:301
-msgid ""
-"A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+#: src/pentaxmn.cpp:124
+msgid "Samsung GX20"
 msgstr ""
 
-#: src/properties.cpp:303
-msgid "File Data Rate"
+#: src/pentaxmn.cpp:125
+msgid "Optio S10"
 msgstr ""
 
-#: src/properties.cpp:303
-msgid ""
-"The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
-"sec"
+#: src/pentaxmn.cpp:126
+msgid "Optio A40"
 msgstr ""
 
-#: src/properties.cpp:304
-msgid "Tape Name"
+#: src/pentaxmn.cpp:127
+msgid "Optio V10"
 msgstr ""
 
-#: src/properties.cpp:304
-msgid ""
-"The name of the tape from which the clip was captured, as set during the "
-"capture process."
+#: src/pentaxmn.cpp:128
+msgid "K200D"
 msgstr ""
 
-#: src/properties.cpp:305
-msgid "Alternative Tape Name"
+#: src/pentaxmn.cpp:129
+msgid "Optio S12"
 msgstr ""
 
-#: src/properties.cpp:305
-msgid ""
-"An alternative tape name, set via the project window or timecode dialog in "
-"Premiere. If an alternative name has been set and has not been reverted, "
-"that name is displayed."
+#: src/pentaxmn.cpp:130
+msgid "Optio E50"
 msgstr ""
 
-#: src/properties.cpp:307
-msgid "Start Time Code"
+#: src/pentaxmn.cpp:131
+msgid "Optio M50"
 msgstr ""
 
-#: src/properties.cpp:307
-msgid ""
-"The timecode of the first frame of video in the file, as obtained from the "
-"device control."
+#: src/pentaxmn.cpp:132
+msgid "Optio V20"
 msgstr ""
 
-#: src/properties.cpp:308
-msgid "Alternative Time code"
+#: src/pentaxmn.cpp:133
+msgid "Optio W60"
 msgstr ""
 
-#: src/properties.cpp:308
-msgid ""
-"A timecode set by the user. When specified, it is used instead of the "
-"startTimecode."
+#: src/pentaxmn.cpp:134
+msgid "Optio M60"
 msgstr ""
 
-#: src/properties.cpp:309
-msgid "Duration"
+#: src/pentaxmn.cpp:135
+msgid "Optio E60"
 msgstr ""
 
-#: src/properties.cpp:309
-msgid "The duration of the media file."
+#: src/pentaxmn.cpp:136
+msgid "K2000"
 msgstr ""
 
-#: src/properties.cpp:310
-msgid "Scene"
+#: src/pentaxmn.cpp:137
+msgid "K-m"
 msgstr ""
 
-#: src/properties.cpp:310
-msgid "The name of the scene."
+#: src/pentaxmn.cpp:138
+msgid "Optio P70"
 msgstr ""
 
-#: src/properties.cpp:311
-msgid "Shot Name"
+#: src/pentaxmn.cpp:139
+msgid "Optio E70"
 msgstr ""
 
-#: src/properties.cpp:311
-msgid "The name of the shot or take."
+#: src/pentaxmn.cpp:140
+msgid "X70"
 msgstr ""
 
-#: src/properties.cpp:312
-msgid "Shot Date"
+#: src/pentaxmn.cpp:141
+msgid "K-7"
 msgstr ""
 
-#: src/properties.cpp:312
-msgid "The date and time when the video was shot."
+#: src/pentaxmn.cpp:142
+msgid "Optio W80"
 msgstr ""
 
-#: src/properties.cpp:313
-msgid "Shot Location"
+#: src/pentaxmn.cpp:143
+msgid "Optio P80"
 msgstr ""
 
-#: src/properties.cpp:313
-msgid ""
-"The name of the location where the video was shot. For example: "
-"\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
-"GPS values."
+#: src/pentaxmn.cpp:144
+msgid "Optio WS80"
 msgstr ""
 
-#: src/properties.cpp:315
-msgid "Log Comment"
+#: src/pentaxmn.cpp:145
+msgid "K-x"
 msgstr ""
 
-#: src/properties.cpp:315
-msgid "User's log comments."
+#: src/pentaxmn.cpp:146
+msgid "645D"
 msgstr ""
 
-#: src/properties.cpp:316
-msgid "Markers"
+#: src/pentaxmn.cpp:147
+msgid "Optio I-10"
 msgstr ""
 
-#: src/properties.cpp:316
-msgid "An ordered list of markers"
+#: src/pentaxmn.cpp:152
+msgid "Good"
 msgstr ""
 
-#: src/properties.cpp:317
-msgid "Contributed Media"
+#: src/pentaxmn.cpp:153
+msgid "Better"
 msgstr ""
 
-#: src/properties.cpp:317
-msgid "An unordered list of all media used to create this media."
+#: src/pentaxmn.cpp:154
+msgid "Best"
 msgstr ""
 
-#: src/properties.cpp:318
-msgid "Absolute Peak Audio File Path"
+#: src/pentaxmn.cpp:155
+msgid "TIFF"
 msgstr ""
 
-#: src/properties.cpp:318
-msgid ""
-"The absolute path to the file's peak audio file. If empty, no peak file "
-"exists."
+#: src/pentaxmn.cpp:157
+msgid "Premium"
 msgstr ""
 
-#: src/properties.cpp:319
-msgid "Relative Peak Audio File Path"
+#: src/pentaxmn.cpp:162
+msgid "640x480"
 msgstr ""
 
-#: src/properties.cpp:319
-msgid ""
-"The relative path to the file's peak audio file. If empty, no peak file "
-"exists."
+#: src/pentaxmn.cpp:164
+msgid "1024x768"
 msgstr ""
 
-#: src/properties.cpp:320
-msgid "Video Modified Date"
+#: src/pentaxmn.cpp:165
+msgid "1280x960"
 msgstr ""
 
-#: src/properties.cpp:320
-msgid "The date and time when the video was last modified."
+#: src/pentaxmn.cpp:166
+msgid "1600x1200"
 msgstr ""
 
-#: src/properties.cpp:321
-msgid "Audio Modified Date"
+#: src/pentaxmn.cpp:167
+msgid "2048x1536"
 msgstr ""
 
-#: src/properties.cpp:321
-msgid "The date and time when the audio was last modified."
+#: src/pentaxmn.cpp:168
+msgid "2560x1920 or 2304x1728"
 msgstr ""
 
-#: src/properties.cpp:322
-msgid "Metadata Modified Date"
+#: src/pentaxmn.cpp:169
+msgid "3072x2304"
 msgstr ""
 
-#: src/properties.cpp:322
-msgid "The date and time when the metadata was last modified."
+#: src/pentaxmn.cpp:170
+msgid "3264x2448"
 msgstr ""
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
-msgid "Artist"
+#: src/pentaxmn.cpp:171
+msgid "320x240"
 msgstr ""
 
-#: src/properties.cpp:323
-msgid "The name of the artist or artists."
+#: src/pentaxmn.cpp:172
+msgid "2288x1712"
 msgstr ""
 
-#: src/properties.cpp:324
-msgid "Album"
+#: src/pentaxmn.cpp:173
+msgid "2592x1944"
 msgstr ""
 
-#: src/properties.cpp:324
-msgid "The name of the album."
+#: src/pentaxmn.cpp:174
+msgid "2304x1728 or 2592x1944"
 msgstr ""
 
-#: src/properties.cpp:325
-msgid "Track Number"
+#: src/pentaxmn.cpp:175
+msgid "3056x2296"
 msgstr ""
 
-#: src/properties.cpp:325
-msgid ""
-"A numeric value indicating the order of the audio file within its original "
-"recording."
+#: src/pentaxmn.cpp:176
+msgid "2816x2212 or 2816x2112"
 msgstr ""
 
-#: src/properties.cpp:326
-msgid "Genre"
+#: src/pentaxmn.cpp:177
+msgid "3648x2736"
 msgstr ""
 
-#: src/properties.cpp:326
-msgid "The name of the genre."
+#: src/pentaxmn.cpp:182
+msgid "Auto, Did not fire"
 msgstr ""
 
-#: src/properties.cpp:327
-msgid "The copyright information."
+#: src/pentaxmn.cpp:184
+msgid "Auto, Did not fire, Red-eye reduction"
 msgstr ""
 
-#: src/properties.cpp:328
-msgid "The date the title was released."
+#: src/pentaxmn.cpp:185
+msgid "Auto, Fired"
 msgstr ""
 
-#: src/properties.cpp:329
-msgid "Composer"
+#: src/pentaxmn.cpp:187
+msgid "Auto, Fired, Red-eye reduction"
 msgstr ""
 
-#: src/properties.cpp:329
-msgid "The composer's name."
+#: src/pentaxmn.cpp:188
+msgid "On, Red-eye reduction"
 msgstr ""
 
-#: src/properties.cpp:330
-msgid "Engineer"
+#: src/pentaxmn.cpp:189
+msgid "On, Wireless"
 msgstr ""
 
-#: src/properties.cpp:330
-msgid "The engineer's name."
+#: src/pentaxmn.cpp:190
+msgid "On, Soft"
 msgstr ""
 
-#: src/properties.cpp:331
-msgid "Tempo"
+#: src/pentaxmn.cpp:191
+msgid "On, Slow-sync"
 msgstr ""
 
-#: src/properties.cpp:331
-msgid "The audio's tempo."
+#: src/pentaxmn.cpp:192
+msgid "On, Slow-sync, Red-eye reduction"
 msgstr ""
 
-#: src/properties.cpp:332
-msgid "Instrument"
+#: src/pentaxmn.cpp:193
+msgid "On, Trailing-curtain Sync"
 msgstr ""
 
-#: src/properties.cpp:332
-msgid "The musical instrument."
+#: src/pentaxmn.cpp:203
+msgid "Pan Focus"
 msgstr ""
 
-#: src/properties.cpp:333
-msgid "Intro Time"
+#: src/pentaxmn.cpp:204
+msgid "AF-S"
 msgstr ""
 
-#: src/properties.cpp:333
-msgid "The duration of lead time for queuing music."
+#: src/pentaxmn.cpp:205
+msgid "AF-C"
 msgstr ""
 
-#: src/properties.cpp:334
-msgid "Out Cue"
+#: src/pentaxmn.cpp:206
+msgid "AF-A"
 msgstr ""
 
-#: src/properties.cpp:334
-msgid "The time at which to fade out."
+#: src/pentaxmn.cpp:212
+msgid "Fixed Center"
 msgstr ""
 
-#: src/properties.cpp:335
-msgid "Relative Timestamp"
+#: src/pentaxmn.cpp:213
+msgid "Automatic Tracking AF"
 msgstr ""
 
-#: src/properties.cpp:335
-msgid "The start time of the media inside the audio project."
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
 msgstr ""
 
-#: src/properties.cpp:336
-msgid "Loop"
+#: src/pentaxmn.cpp:231
+msgid "Fixed Center or multiple"
 msgstr ""
 
-#: src/properties.cpp:336
-msgid "When true, the clip can be looped seemlessly."
+#: src/pentaxmn.cpp:233
+msgid "Top-center"
 msgstr ""
 
-#: src/properties.cpp:337
-msgid "Number Of Beats"
+#: src/pentaxmn.cpp:239
+msgid "Bottom-center"
 msgstr ""
 
-#: src/properties.cpp:337
-msgid "The number of beats."
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
+msgid "50"
 msgstr ""
 
-#: src/properties.cpp:338
-msgid "Key"
+#: src/pentaxmn.cpp:246
+msgid "64"
 msgstr ""
 
-#: src/properties.cpp:338
-msgid ""
-"The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
+#: src/pentaxmn.cpp:247
+msgid "80"
 msgstr ""
 
-#: src/properties.cpp:339
-msgid "Stretch Mode"
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
+msgid "100"
 msgstr ""
 
-#: src/properties.cpp:339
-msgid ""
-"The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
-"Splice, Hybrid."
+#: src/pentaxmn.cpp:249
+msgid "125"
 msgstr ""
 
-#: src/properties.cpp:340
-msgid "Time Scale Parameters"
+#: src/pentaxmn.cpp:250
+msgid "160"
 msgstr ""
 
-#: src/properties.cpp:340
-msgid "Additional parameters for Time-Scale stretch mode."
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
+msgid "200"
 msgstr ""
 
-#: src/properties.cpp:341
-msgid "Resample Parameters"
+#: src/pentaxmn.cpp:252
+msgid "250"
 msgstr ""
 
-#: src/properties.cpp:341
-msgid "Additional parameters for Resample stretch mode."
+#: src/pentaxmn.cpp:253
+msgid "320"
 msgstr ""
 
-#: src/properties.cpp:342
-msgid "Beat Splice Parameters"
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
+msgid "400"
 msgstr ""
 
-#: src/properties.cpp:342
-msgid "Additional parameters for Beat Splice stretch mode."
+#: src/pentaxmn.cpp:255
+msgid "500"
 msgstr ""
 
-#: src/properties.cpp:343
-msgid "Time Signature"
+#: src/pentaxmn.cpp:256
+msgid "640"
 msgstr ""
 
-#: src/properties.cpp:343
-msgid ""
-"The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
-"12/8, other."
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
+msgid "800"
 msgstr ""
 
-#: src/properties.cpp:344
-msgid "Scale Type"
+#: src/pentaxmn.cpp:258
+msgid "1000"
 msgstr ""
 
-#: src/properties.cpp:344
-msgid ""
-"The musical scale used in the music. One of: Major, Minor, Both, Neither. "
-"Neither is most often used for instruments with no associated scale, such as "
-"drums."
+#: src/pentaxmn.cpp:259
+msgid "1250"
 msgstr ""
 
-#: src/properties.cpp:351 src/tags.cpp:889
-msgid "Camera Serial Number"
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
+msgid "1600"
 msgstr ""
 
-#: src/properties.cpp:351
-msgid "Camera Serial Number."
+#: src/pentaxmn.cpp:261
+msgid "2000"
 msgstr ""
 
-#: src/properties.cpp:352
-msgid "Date Acquired"
+#: src/pentaxmn.cpp:262
+msgid "2500"
 msgstr ""
 
-#: src/properties.cpp:352
-msgid "Date Acquired."
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
+msgid "3200"
 msgstr ""
 
-#: src/properties.cpp:353
-msgid "Flash Manufacturer"
+#: src/pentaxmn.cpp:264
+msgid "4000"
 msgstr ""
 
-#: src/properties.cpp:353
-msgid "Flash Manufacturer."
+#: src/pentaxmn.cpp:265
+msgid "5000"
 msgstr ""
 
-#: src/properties.cpp:354
-msgid "Flash Model."
+#: src/pentaxmn.cpp:266
+msgid "6400"
 msgstr ""
 
-#: src/properties.cpp:355
-msgid "Last Keyword IPTC"
+#: src/pentaxmn.cpp:276
+msgid "70"
 msgstr ""
 
-#: src/properties.cpp:355
-msgid "Last Keyword IPTC."
+#: src/pentaxmn.cpp:278
+msgid "140"
 msgstr ""
 
-#: src/properties.cpp:356
-msgid "Last Keyword XMP"
+#: src/pentaxmn.cpp:280
+msgid "280"
 msgstr ""
 
-#: src/properties.cpp:356
-msgid "Last Keyword XMP."
+#: src/pentaxmn.cpp:282
+msgid "560"
 msgstr ""
 
-#: src/properties.cpp:357
-msgid "Lens Manufacturer"
+#: src/pentaxmn.cpp:284
+msgid "1100"
 msgstr ""
 
-#: src/properties.cpp:357
-msgid "Lens Manufacturer."
+#: src/pentaxmn.cpp:286
+msgid "2200"
 msgstr ""
 
-#: src/properties.cpp:358
-msgid "Lens Model"
+#: src/pentaxmn.cpp:304
+msgid "Multi Segment"
 msgstr ""
 
-#: src/properties.cpp:358
-msgid "Lens Model."
+#: src/pentaxmn.cpp:305
+msgid "Center Weighted"
 msgstr ""
 
-#: src/properties.cpp:359
-msgid "Rating Percent"
+#: src/pentaxmn.cpp:317
+msgid "DaylightFluorescent"
 msgstr ""
 
-#: src/properties.cpp:359
-msgid "Rating Percent."
+#: src/pentaxmn.cpp:318
+msgid "DaywhiteFluorescent"
 msgstr ""
 
-#: src/properties.cpp:365
-msgid "Keywords."
+#: src/pentaxmn.cpp:319
+msgid "WhiteFluorescent"
 msgstr ""
 
-#: src/properties.cpp:366
-msgid "PDF Version"
+#: src/pentaxmn.cpp:324
+msgid "User Selected"
 msgstr ""
 
-#: src/properties.cpp:366
-msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
+#: src/pentaxmn.cpp:329
+msgid "Auto (Daylight)"
 msgstr ""
 
-#: src/properties.cpp:367
-msgid "Producer"
+#: src/pentaxmn.cpp:330
+msgid "Auto (Shade)"
 msgstr ""
 
-#: src/properties.cpp:367
-msgid "The name of the tool that created the PDF document."
+#: src/pentaxmn.cpp:331
+msgid "Auto (Flash)"
 msgstr ""
 
-#: src/properties.cpp:373
-msgid "Authors Position"
+#: src/pentaxmn.cpp:332
+msgid "Auto (Tungsten)"
 msgstr ""
 
-#: src/properties.cpp:373
-msgid "By-line title."
+#: src/pentaxmn.cpp:333
+msgid "Auto (DaywhiteFluorescent)"
 msgstr ""
 
-#: src/properties.cpp:374
-msgid "Caption Writer"
+#: src/pentaxmn.cpp:334
+msgid "Auto (WhiteFluorescent)"
 msgstr ""
 
-#: src/properties.cpp:374
-msgid "Writer/editor."
+#: src/pentaxmn.cpp:335
+msgid "Auto (Cloudy)"
 msgstr ""
 
-#: src/properties.cpp:375
-msgid "Category. Limited to 3 7-bit ASCII characters."
+#: src/pentaxmn.cpp:337
+msgid "Preset (Fireworks?)"
 msgstr ""
 
-#: src/properties.cpp:376
-msgid "City."
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
+msgid "Med Low"
 msgstr ""
 
-#: src/properties.cpp:377
-msgid "Country/primary location."
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
+msgid "Med High"
 msgstr ""
 
-#: src/properties.cpp:378
-msgid "Credit."
+#: src/pentaxmn.cpp:369
+msgid "Med Soft"
 msgstr ""
 
-#: src/properties.cpp:379
-msgid ""
-"The date the intellectual content of the document was created (rather than "
-"the creation date of the physical representation), following IIM "
-"conventions. For example, a photo taken during the American Civil War would "
-"have a creation date during that epoch (1861-1865) rather than the date the "
-"photo was digitized for archiving."
+#: src/pentaxmn.cpp:370
+msgid "Med Hard"
 msgstr ""
 
-#: src/properties.cpp:383
-msgid "Headline."
+#: src/pentaxmn.cpp:371
+msgid "Very Soft"
 msgstr ""
 
-#: src/properties.cpp:384
-msgid "Special instructions."
+#: src/pentaxmn.cpp:372
+msgid "Very Hard"
 msgstr ""
 
-#: src/properties.cpp:385
-msgid "Source."
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
+msgid "Home town"
 msgstr ""
 
-#: src/properties.cpp:386
-msgid "State"
+#: src/pentaxmn.cpp:383
+msgid "Pago Pago"
 msgstr ""
 
-#: src/properties.cpp:386
-msgid "Province/state."
+#: src/pentaxmn.cpp:384
+msgid "Honolulu"
 msgstr ""
 
-#: src/properties.cpp:387
-msgid "Supplemental category."
+#: src/pentaxmn.cpp:385
+msgid "Anchorage"
 msgstr ""
 
-#: src/properties.cpp:388
-msgid "Original transmission reference."
+#: src/pentaxmn.cpp:386
+msgid "Vancouver"
 msgstr ""
 
-#: src/properties.cpp:389
-msgid "Urgency. Valid range is 1-8."
+#: src/pentaxmn.cpp:387
+msgid "San Fransisco"
 msgstr ""
 
-#: src/properties.cpp:397
-msgid "inches"
+#: src/pentaxmn.cpp:388
+msgid "Los Angeles"
 msgstr ""
 
-#: src/properties.cpp:398 src/tags.cpp:227
-msgid "cm"
+#: src/pentaxmn.cpp:389
+msgid "Calgary"
 msgstr ""
 
-#: src/properties.cpp:402
-msgid "Auto Brightness"
+#: src/pentaxmn.cpp:390
+msgid "Denver"
 msgstr ""
 
-#: src/properties.cpp:402
-msgid "When true, \"Brightness\" is automatically adjusted."
+#: src/pentaxmn.cpp:391
+msgid "Mexico City"
 msgstr ""
 
-#: src/properties.cpp:403
-msgid "Auto Contrast"
+#: src/pentaxmn.cpp:392
+msgid "Chicago"
 msgstr ""
 
-#: src/properties.cpp:403
-msgid "When true, \"Contrast\" is automatically adjusted."
+#: src/pentaxmn.cpp:393
+msgid "Miami"
 msgstr ""
 
-#: src/properties.cpp:404
-msgid "Auto Exposure"
+#: src/pentaxmn.cpp:394
+msgid "Toronto"
 msgstr ""
 
-#: src/properties.cpp:404
-msgid "When true, \"Exposure\" is automatically adjusted."
+#: src/pentaxmn.cpp:395
+msgid "New York"
 msgstr ""
 
-#: src/properties.cpp:405
-msgid "Auto Shadows"
+#: src/pentaxmn.cpp:396
+msgid "Santiago"
 msgstr ""
 
-#: src/properties.cpp:405
-msgid "When true,\"Shadows\" is automatically adjusted."
+#: src/pentaxmn.cpp:397
+msgid "Caracus"
 msgstr ""
 
-#: src/properties.cpp:406
-msgid "Blue Hue"
+#: src/pentaxmn.cpp:398
+msgid "Halifax"
 msgstr ""
 
-#: src/properties.cpp:406
-msgid "\"Blue Hue\" setting. Range -100 to 100."
+#: src/pentaxmn.cpp:399
+msgid "Buenos Aires"
 msgstr ""
 
-#: src/properties.cpp:407
-msgid "Blue Saturation"
+#: src/pentaxmn.cpp:400
+msgid "Sao Paulo"
 msgstr ""
 
-#: src/properties.cpp:407
-msgid "\"Blue Saturation\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:401
+msgid "Rio de Janeiro"
 msgstr ""
 
-#: src/properties.cpp:408
-msgid "\"Brightness\" setting. Range 0 to +150."
+#: src/pentaxmn.cpp:402
+msgid "Madrid"
 msgstr ""
 
-#: src/properties.cpp:409
-msgid "Camera Profile"
+#: src/pentaxmn.cpp:403
+msgid "London"
 msgstr ""
 
-#: src/properties.cpp:409
-msgid "\"Camera Profile\" setting."
+#: src/pentaxmn.cpp:404
+msgid "Paris"
 msgstr ""
 
-#: src/properties.cpp:410
-msgid "Chromatic Aberration Blue"
+#: src/pentaxmn.cpp:405
+msgid "Milan"
 msgstr ""
 
-#: src/properties.cpp:410
-msgid ""
-"\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:406
+msgid "Rome"
 msgstr ""
 
-#: src/properties.cpp:411
-msgid "Chromatic Aberration Red"
+#: src/pentaxmn.cpp:407
+msgid "Berlin"
 msgstr ""
 
-#: src/properties.cpp:411
-msgid ""
-"\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:408
+msgid "Johannesburg"
 msgstr ""
 
-#: src/properties.cpp:412
-msgid "Color Noise Reduction"
+#: src/pentaxmn.cpp:409
+msgid "Istanbul"
 msgstr ""
 
-#: src/properties.cpp:412
-msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:410
+msgid "Cairo"
 msgstr ""
 
-#: src/properties.cpp:413
-msgid "\"Contrast\" setting. Range -50 to +100."
+#: src/pentaxmn.cpp:411
+msgid "Jerusalem"
 msgstr ""
 
-#: src/properties.cpp:414
-msgid "When \"Has Crop\" is true, top of crop rectangle"
+#: src/pentaxmn.cpp:412
+msgid "Moscow"
 msgstr ""
 
-#: src/properties.cpp:415
-msgid "When \"Has Crop\" is true, left of crop rectangle."
+#: src/pentaxmn.cpp:413
+msgid "Jeddah"
 msgstr ""
 
-#: src/properties.cpp:416
-msgid "Crop Bottom"
+#: src/pentaxmn.cpp:414
+msgid "Tehran"
 msgstr ""
 
-#: src/properties.cpp:416
-msgid "When \"Has Crop\" is true, bottom of crop rectangle."
+#: src/pentaxmn.cpp:415
+msgid "Dubai"
 msgstr ""
 
-#: src/properties.cpp:417
-msgid "Crop Right"
+#: src/pentaxmn.cpp:416
+msgid "Karachi"
 msgstr ""
 
-#: src/properties.cpp:417
-msgid "When \"Has Crop\" is true, right of crop rectangle."
+#: src/pentaxmn.cpp:417
+msgid "Kabul"
 msgstr ""
 
-#: src/properties.cpp:418
-msgid "Crop Angle"
+#: src/pentaxmn.cpp:418
+msgid "Male"
 msgstr ""
 
-#: src/properties.cpp:418
-msgid "When \"Has Crop\" is true, angle of crop rectangle."
+#: src/pentaxmn.cpp:419
+msgid "Delhi"
 msgstr ""
 
-#: src/properties.cpp:419
-msgid "Width of resulting cropped image in CropUnits units."
+#: src/pentaxmn.cpp:420
+msgid "Colombo"
 msgstr ""
 
-#: src/properties.cpp:420
-msgid "Height of resulting cropped image in CropUnits units."
+#: src/pentaxmn.cpp:421
+msgid "Kathmandu"
 msgstr ""
 
-#: src/properties.cpp:421
-msgid "Crop Units"
+#: src/pentaxmn.cpp:422
+msgid "Dacca"
 msgstr ""
 
-#: src/properties.cpp:421
-msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
+#: src/pentaxmn.cpp:423
+msgid "Yangon"
 msgstr ""
 
-#: src/properties.cpp:422
-msgid "\"Exposure\" setting. Range -4.0 to +4.0."
+#: src/pentaxmn.cpp:424
+msgid "Bangkok"
 msgstr ""
 
-#: src/properties.cpp:423
-msgid "GreenHue"
+#: src/pentaxmn.cpp:425
+msgid "Kuala Lumpur"
 msgstr ""
 
-#: src/properties.cpp:423
-msgid "\"Green Hue\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:426
+msgid "Vientiane"
 msgstr ""
 
-#: src/properties.cpp:424
-msgid "Green Saturation"
+#: src/pentaxmn.cpp:427
+msgid "Singapore"
 msgstr ""
 
-#: src/properties.cpp:424
-msgid "\"Green Saturation\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:428
+msgid "Phnom Penh"
 msgstr ""
 
-#: src/properties.cpp:425
-msgid "Has Crop"
+#: src/pentaxmn.cpp:429
+msgid "Ho Chi Minh"
 msgstr ""
 
-#: src/properties.cpp:425
-msgid "When true, image has a cropping rectangle."
+#: src/pentaxmn.cpp:430
+msgid "Jakarta"
 msgstr ""
 
-#: src/properties.cpp:426
-msgid "Has Settings"
+#: src/pentaxmn.cpp:431
+msgid "Hong Kong"
 msgstr ""
 
-#: src/properties.cpp:426
-msgid "When true, non-default camera raw settings."
+#: src/pentaxmn.cpp:432
+msgid "Perth"
 msgstr ""
 
-#: src/properties.cpp:427
-msgid "Luminance Smoothing"
+#: src/pentaxmn.cpp:433
+msgid "Beijing"
 msgstr ""
 
-#: src/properties.cpp:427
-msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:434
+msgid "Shanghai"
 msgstr ""
 
-#: src/properties.cpp:428
-msgid "Raw File Name"
+#: src/pentaxmn.cpp:435
+msgid "Manila"
 msgstr ""
 
-#: src/properties.cpp:428
-msgid "File name of raw file (not a complete path)."
+#: src/pentaxmn.cpp:436
+msgid "Taipei"
 msgstr ""
 
-#: src/properties.cpp:429
-msgid "Red Hue"
+#: src/pentaxmn.cpp:437
+msgid "Seoul"
 msgstr ""
 
-#: src/properties.cpp:429
-msgid "\"Red Hue\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:438
+msgid "Adelaide"
 msgstr ""
 
-#: src/properties.cpp:430
-msgid "Red Saturation"
+#: src/pentaxmn.cpp:439
+msgid "Tokyo"
 msgstr ""
 
-#: src/properties.cpp:430
-msgid "\"Red Saturation\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:440
+msgid "Guam"
 msgstr ""
 
-#: src/properties.cpp:431
-msgid "\"Saturation\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:441
+msgid "Sydney"
 msgstr ""
 
-#: src/properties.cpp:432
-msgid "Shadows"
+#: src/pentaxmn.cpp:442
+msgid "Noumea"
 msgstr ""
 
-#: src/properties.cpp:432
-msgid "\"Shadows\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:443
+msgid "Wellington"
 msgstr ""
 
-#: src/properties.cpp:433
-msgid "Shadow Tint"
+#: src/pentaxmn.cpp:444
+msgid "Auckland"
 msgstr ""
 
-#: src/properties.cpp:433
-msgid "\"Shadow Tint\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:445
+msgid "Lima"
 msgstr ""
 
-#: src/properties.cpp:434
-msgid "\"Sharpness\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:446
+msgid "Dakar"
 msgstr ""
 
-#: src/properties.cpp:435
-msgid "\"Temperature\" setting. Range 2000 to 50000."
+#: src/pentaxmn.cpp:447
+msgid "Algiers"
 msgstr ""
 
-#: src/properties.cpp:436
-msgid "Tint"
+#: src/pentaxmn.cpp:448
+msgid "Helsinki"
 msgstr ""
 
-#: src/properties.cpp:436
-msgid "\"Tint\" setting. Range -150 to +150."
+#: src/pentaxmn.cpp:449
+msgid "Athens"
 msgstr ""
 
-#: src/properties.cpp:437
-msgid "Tone Curve"
+#: src/pentaxmn.cpp:450
+msgid "Nairobi"
 msgstr ""
 
-#: src/properties.cpp:437
-msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
+#: src/pentaxmn.cpp:451
+msgid "Amsterdam"
 msgstr ""
 
-#: src/properties.cpp:438
-msgid "Tone Curve Name"
+#: src/pentaxmn.cpp:452
+msgid "Stockholm"
 msgstr ""
 
-#: src/properties.cpp:438
-msgid ""
-"The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
-"Contrast, Strong Contrast, Custom or a user-defined preset name."
+#: src/pentaxmn.cpp:453
+msgid "Lisbon"
 msgstr ""
 
-#: src/properties.cpp:440
-msgid "Version of Camera Raw plugin."
+#: src/pentaxmn.cpp:454
+msgid "Copenhagen"
 msgstr ""
 
-#: src/properties.cpp:441
-msgid "Vignette Amount"
+#: src/pentaxmn.cpp:459
+msgid "Unprocessed"
 msgstr ""
 
-#: src/properties.cpp:441
-msgid "\"Vignetting Amount\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:460
+msgid "Digital Filter"
 msgstr ""
 
-#: src/properties.cpp:442
-msgid "Vignette Midpoint"
+#: src/pentaxmn.cpp:461
+msgid "Cropped"
 msgstr ""
 
-#: src/properties.cpp:442
-msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:463
+msgid "Frame Synthesis?"
 msgstr ""
 
-#: src/properties.cpp:443
-msgid ""
-"\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
-"Tungsten, Fluorescent, Flash, Custom"
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
+msgid "MTF Program"
 msgstr ""
 
-#: src/properties.cpp:450
-msgid "TIFF tag 256, 0x100. Image width in pixels."
+#: src/pentaxmn.cpp:475
+msgid "Night Scene Portrait"
 msgstr ""
 
-#: src/properties.cpp:451 src/tags.cpp:354
-msgid "Image Length"
+#: src/pentaxmn.cpp:476
+msgid "No Flash"
 msgstr ""
 
-#: src/properties.cpp:451
-msgid "TIFF tag 257, 0x101. Image height in pixels."
+#: src/pentaxmn.cpp:479
+msgid "Surf & Snow"
 msgstr ""
 
-#: src/properties.cpp:452
-msgid "Bits Per Sample"
+#: src/pentaxmn.cpp:482
+msgid "Kids"
 msgstr ""
 
-#: src/properties.cpp:452
-msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
+#: src/pentaxmn.cpp:487
+msgid "Stage Lighting"
 msgstr ""
 
-#: src/properties.cpp:453 src/tags.cpp:364
-msgid "Compression"
+#: src/pentaxmn.cpp:488
+msgid "Night Snap"
 msgstr ""
 
-#: src/properties.cpp:453
-msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
+#: src/pentaxmn.cpp:490
+msgid "Auto PICT (Standard)"
 msgstr ""
 
-#: src/properties.cpp:454 src/tags.cpp:370
-msgid "Photometric Interpretation"
+#: src/pentaxmn.cpp:491
+msgid "Auto PICT (Portrait)"
 msgstr ""
 
-#: src/properties.cpp:454
-msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
+#: src/pentaxmn.cpp:492
+msgid "Auto PICT (Landscape)"
 msgstr ""
 
-#: src/properties.cpp:455
-msgid ""
-"TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
-"0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
-"right 4 = 0th row at bottom, 0th column at left 5 = 0th row at left, 0th "
-"column at top 6 = 0th row at right, 0th column at top 7 = 0th row at right, "
-"0th column at bottom 8 = 0th row at left, 0th column at bottom"
+#: src/pentaxmn.cpp:493
+msgid "Auto PICT (Macro)"
 msgstr ""
 
-#: src/properties.cpp:464
-msgid "Samples Per Pixel"
+#: src/pentaxmn.cpp:494
+msgid "Auto PICT (Sport)"
 msgstr ""
 
-#: src/properties.cpp:464
-msgid "TIFF tag 277, 0x115. Number of components per pixel."
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
+msgid "Green Mode"
 msgstr ""
 
-#: src/properties.cpp:465 src/tags.cpp:432
-msgid "Planar Configuration"
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
+msgid "Shutter Speed Priority"
 msgstr ""
 
-#: src/properties.cpp:465
-msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
+msgid "Aperture Priority"
 msgstr ""
 
-#: src/properties.cpp:466
-msgid "YCbCr Sub Sampling"
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
+msgid "Bulb"
 msgstr ""
 
-#: src/properties.cpp:466
-msgid ""
-"TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
-"YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
+#: src/pentaxmn.cpp:504
+msgid "Hi-speed Program"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
-msgid "YCbCr Positioning"
+#: src/pentaxmn.cpp:505
+msgid "DOF Program"
 msgstr ""
 
-#: src/properties.cpp:468
-msgid ""
-"TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
-"centered; 2 = co-sited."
+#: src/pentaxmn.cpp:510
+msgid "Program Tv Shift"
 msgstr ""
 
-#: src/properties.cpp:470
-msgid "X Resolution"
+#: src/pentaxmn.cpp:511
+msgid "Program Av Shift"
 msgstr ""
 
-#: src/properties.cpp:470
-msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
+#: src/pentaxmn.cpp:514
+msgid "Aperture Priority (Off-Auto-Aperture)"
 msgstr ""
 
-#: src/properties.cpp:471
-msgid "Y Resolution"
+#: src/pentaxmn.cpp:515
+msgid "Manual (Off-Auto-Aperture)"
 msgstr ""
 
-#: src/properties.cpp:471
-msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
+#: src/pentaxmn.cpp:516
+msgid "Bulb (Off-Auto-Aperture)"
 msgstr ""
 
-#: src/properties.cpp:472 src/tags.cpp:438
-msgid "Resolution Unit"
+#: src/pentaxmn.cpp:518
+msgid "Shutter Priority"
 msgstr ""
 
-#: src/properties.cpp:472
-msgid ""
-"TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
-"of: 2 = inches; 3 = centimeters."
+#: src/pentaxmn.cpp:519
+msgid "Shutter & Aperture Priority AE"
 msgstr ""
 
-#: src/properties.cpp:474 src/tags.cpp:443
-msgid "Transfer Function"
+#: src/pentaxmn.cpp:520
+msgid "Shutter & Aperture Priority AE (1)"
 msgstr ""
 
-#: src/properties.cpp:474
-msgid ""
-"TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
-"with 3 * 256 entries."
+#: src/pentaxmn.cpp:521
+msgid "Sensitivity Priority AE"
 msgstr ""
 
-#: src/properties.cpp:476 src/tags.cpp:471
-msgid "White Point"
+#: src/pentaxmn.cpp:522
+msgid "Sensitivity Priority AE (1)"
 msgstr ""
 
-#: src/properties.cpp:476
-msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
+#: src/pentaxmn.cpp:523
+msgid "Flash X-Sync Speed AE"
 msgstr ""
 
-#: src/properties.cpp:477 src/tags.cpp:476
-msgid "Primary Chromaticities"
+#: src/pentaxmn.cpp:524
+msgid "Flash X-Sync Speed AE (1)"
 msgstr ""
 
-#: src/properties.cpp:477
-msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
 msgstr ""
 
-#: src/properties.cpp:478
-msgid ""
-"TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
 msgstr ""
 
-#: src/properties.cpp:479
-msgid "Reference Black White"
+#: src/pentaxmn.cpp:535
+msgid "Continuous (Hi)"
 msgstr ""
 
-#: src/properties.cpp:479
-msgid "TIFF tag 532, 0x214. Reference black and white point values."
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
+msgid "Burst"
 msgstr ""
 
-#: src/properties.cpp:480 src/tags.cpp:455
-msgid "Date and Time"
+#: src/pentaxmn.cpp:538
+msgid "Self-timer (12 sec)"
 msgstr ""
 
-#: src/properties.cpp:480
-msgid ""
-"TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
-"and time of image creation (no time zone in EXIF), stored in ISO 8601 "
-"format, not the original EXIF format. This property includes the value for "
-"the EXIF SubSecTime attribute. NOTE: This property is stored in XMP as xmp:"
-"ModifyDate."
+#: src/pentaxmn.cpp:539
+msgid "Self-timer (2 sec)"
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
-msgid "Image Description"
+#: src/pentaxmn.cpp:540
+msgid "Remote Control (3 sec)"
 msgstr ""
 
-#: src/properties.cpp:486
-msgid ""
-"TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
-"in XMP as dc:description."
+#: src/pentaxmn.cpp:541
+msgid "Remote Control"
 msgstr ""
 
-#: src/properties.cpp:487
-msgid "Make"
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
+msgid "Video"
 msgstr ""
 
-#: src/properties.cpp:487
-msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
+#: src/pentaxmn.cpp:554
+msgid "M-42 or No Lens"
 msgstr ""
 
-#: src/properties.cpp:488
-msgid "TIFF tag 272, 0x110. Model name or number of equipment."
+#: src/pentaxmn.cpp:555
+msgid "K,M Lens"
 msgstr ""
 
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
+#: src/pentaxmn.cpp:556
+msgid "A Series Lens"
 msgstr ""
 
-#: src/properties.cpp:489
-msgid ""
-"TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
-"property is stored in XMP as xmp:CreatorTool. "
+#: src/pentaxmn.cpp:703
+msgid "Bright"
 msgstr ""
 
-#: src/properties.cpp:491
-msgid ""
-"TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
-"property is stored in XMP as the first item in the dc:creator array."
+#: src/pentaxmn.cpp:706
+msgid "Vibrant"
 msgstr ""
 
-#: src/properties.cpp:493
-msgid ""
-"TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
-"in XMP as dc:rights."
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
 msgstr ""
 
-#: src/properties.cpp:500 src/tags.cpp:1198
-msgid "Exif Version"
+#: src/pentaxmn.cpp:720
+msgid "Weakest"
 msgstr ""
 
-#: src/properties.cpp:500
-msgid "EXIF tag 36864, 0x9000. EXIF version number."
+#: src/pentaxmn.cpp:721
+msgid "Weak"
 msgstr ""
 
-#: src/properties.cpp:501
-msgid "Flashpix Version"
+#: src/pentaxmn.cpp:722
+msgid "Strong"
 msgstr ""
 
-#: src/properties.cpp:501
-msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
+#: src/pentaxmn.cpp:832
+msgid "No extended bracketing"
 msgstr ""
 
-#: src/properties.cpp:502
-msgid "EXIF tag 40961, 0xA001. Color space information"
+#: src/pentaxmn.cpp:838
+msgid "WB-BA"
 msgstr ""
 
-#: src/properties.cpp:503 src/tags.cpp:1209
-msgid "Components Configuration"
+#: src/pentaxmn.cpp:841
+msgid "WB-GM"
 msgstr ""
 
-#: src/properties.cpp:503
-msgid ""
-"EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
-"compressed data), 1 2 3 0 (other cases)."
+#: src/pentaxmn.cpp:853
+msgid "Unknown "
 msgstr ""
 
-#: src/properties.cpp:505 src/tags.cpp:636
-msgid "Compressed Bits Per Pixel"
+#: src/pentaxmn.cpp:866
+msgid "Pentax Makernote version"
 msgstr ""
 
-#: src/properties.cpp:505
-msgid ""
-"EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
-"indicated in unit bits per pixel."
+#: src/pentaxmn.cpp:869
+msgid "Camera shooting mode"
 msgstr ""
 
-#: src/properties.cpp:507 src/tags.cpp:1293
-msgid "Pixel X Dimension"
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
+msgid "Resolution of a preview image"
 msgstr ""
 
-#: src/properties.cpp:507
-msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
+#: src/pentaxmn.cpp:874
+msgid "Length of a preview image"
 msgstr ""
 
-#: src/properties.cpp:508 src/tags.cpp:1300
-msgid "Pixel Y Dimension"
+#: src/pentaxmn.cpp:875
+msgid "Size of an IFD containing a preview image"
 msgstr ""
 
-#: src/properties.cpp:508
-msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
+#: src/pentaxmn.cpp:880
+msgid "Model identification"
 msgstr ""
 
-#: src/properties.cpp:509 src/tags.cpp:1267
-msgid "User Comment"
+#: src/pentaxmn.cpp:881
+msgid "Pentax model idenfication"
 msgstr ""
 
-#: src/properties.cpp:509
-msgid "EXIF tag 37510, 0x9286. Comments from user."
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
+msgid "Date"
 msgstr ""
 
-#: src/properties.cpp:510 src/tags.cpp:1309
-msgid "Related Sound File"
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
+msgid "Time"
 msgstr ""
 
-#: src/properties.cpp:510
-msgid ""
-"EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
+#: src/pentaxmn.cpp:890
+msgid "Image quality settings"
 msgstr ""
 
-#: src/properties.cpp:511
-msgid "Date and Time Original"
+#: src/pentaxmn.cpp:893
+msgid "Image size settings"
 msgstr ""
 
-#: src/properties.cpp:511
-msgid ""
-"EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
-"time when original image was generated, in ISO 8601 format. Includes the "
-"EXIF SubSecTimeOriginal data."
+#: src/pentaxmn.cpp:897
+msgid "Flash mode settings"
 msgstr ""
 
-#: src/properties.cpp:514
-msgid "Date and Time Digitized"
+#: src/pentaxmn.cpp:900
+msgid "Focus mode settings"
 msgstr ""
 
-#: src/properties.cpp:514
-msgid ""
-"EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
-"time when image was stored as digital data, can be the same as "
-"DateTimeOriginal if originally stored in digital form. Stored in ISO 8601 "
-"format. Includes the EXIF SubSecTimeDigitized data."
+#: src/pentaxmn.cpp:903
+msgid "Selected AF point"
 msgstr ""
 
-#: src/properties.cpp:518
-msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+msgid "AF point in focus"
 msgstr ""
 
-#: src/properties.cpp:519
-msgid "F Number"
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+msgid "F-Number"
 msgstr ""
 
-#: src/properties.cpp:519
-msgid "EXIF tag 33437, 0x829D. F number."
+#: src/pentaxmn.cpp:915
+msgid "ISO sensitivity"
 msgstr ""
 
-#: src/properties.cpp:520
-msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
+#: src/pentaxmn.cpp:916
+msgid "ISO sensitivity settings"
 msgstr ""
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
-msgid "Spectral Sensitivity"
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
+msgid "MeteringMode"
 msgstr ""
 
-#: src/properties.cpp:521
-msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
+msgid "AutoBracketing"
 msgstr ""
 
-#: src/properties.cpp:522
-msgid "ISOSpeedRatings"
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
+msgid "White ballance"
 msgstr ""
 
-#: src/properties.cpp:522
-msgid ""
-"EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
-"specified in ISO 12232."
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
+msgid "White ballance mode"
 msgstr ""
 
-#: src/properties.cpp:524 src/tags.cpp:625
-msgid "OECF"
+#: src/pentaxmn.cpp:936
+msgid "Blue color balance"
 msgstr ""
 
-#: src/properties.cpp:524
-msgid ""
-"EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
-"ISO 14524."
+#: src/pentaxmn.cpp:939
+msgid "Red color balance"
 msgstr ""
 
-#: src/properties.cpp:525
-msgid ""
-"EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
-"specification."
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
+msgid "FocalLength"
 msgstr ""
 
-#: src/properties.cpp:526
-msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
+msgid "Location"
 msgstr ""
 
-#: src/properties.cpp:527 src/tags.cpp:639
-msgid "Brightness Value"
+#: src/pentaxmn.cpp:959
+msgid "Hometown"
 msgstr ""
 
-#: src/properties.cpp:527
-msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
+#: src/pentaxmn.cpp:965
+msgid "Hometown DST"
 msgstr ""
 
-#: src/properties.cpp:528
-msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
+#: src/pentaxmn.cpp:966
+msgid "Whether day saving time is active in home town"
 msgstr ""
 
-#: src/properties.cpp:529
-msgid "Maximum Aperture Value"
+#: src/pentaxmn.cpp:968
+msgid "Destination DST"
 msgstr ""
 
-#: src/properties.cpp:529
-msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
+#: src/pentaxmn.cpp:969
+msgid "Whether day saving time is active in destination"
 msgstr ""
 
-#: src/properties.cpp:530
-msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
+msgid "DSPFirmwareVersion"
 msgstr ""
 
-#: src/properties.cpp:531
-msgid "EXIF tag 37383, 0x9207. Metering mode."
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
+msgid "CPUFirmwareVersion"
 msgstr ""
 
-#: src/properties.cpp:532
-msgid "EXIF tag 37384, 0x9208. Light source."
+#: src/pentaxmn.cpp:981
+msgid "Light value"
 msgstr ""
 
-#: src/properties.cpp:533
-msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
+#: src/pentaxmn.cpp:982
+msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 
-#: src/properties.cpp:534
-msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+msgid "Image area offset"
 msgstr ""
 
-#: src/properties.cpp:535 src/tags.cpp:1259
-msgid "Subject Area"
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+msgid "Raw image size"
 msgstr ""
 
-#: src/properties.cpp:535
-msgid ""
-"EXIF tag 37396, 0x9214. The location and area of the main subject in the "
-"overall scene."
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
+msgid "Preview image borders"
 msgstr ""
 
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
-msgid "Flash Energy"
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
+msgid "Sensitivity adjust"
 msgstr ""
 
-#: src/properties.cpp:536
-msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
+msgid "Digital filter"
 msgstr ""
 
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
-msgid "Spatial Frequency Response"
+#: src/pentaxmn.cpp:1019
+msgid "Camera temperature"
 msgstr ""
 
-#: src/properties.cpp:537
-msgid ""
-"EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
-"as specified in ISO 12233."
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
+msgid "Image tone"
 msgstr ""
 
-#: src/properties.cpp:539 src/tags.cpp:650
-msgid "Focal Plane X Resolution"
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
+msgid "Colort temperature"
 msgstr ""
 
-#: src/properties.cpp:539
-msgid ""
-"EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
-"unit."
+#: src/pentaxmn.cpp:1039
+msgid "Shake reduction"
 msgstr ""
 
-#: src/properties.cpp:540 src/tags.cpp:651
-msgid "Focal Plane Y Resolution"
+#: src/pentaxmn.cpp:1040
+msgid "Shake reduction information"
 msgstr ""
 
-#: src/properties.cpp:540
-msgid ""
-"EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
-"unit."
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
+msgid "Dynamic range expansion"
 msgstr ""
 
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
-msgid "Focal Plane Resolution Unit"
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
+msgid "High ISO noise reduction"
 msgstr ""
 
-#: src/properties.cpp:541
-msgid ""
-"EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
-"FocalPlaneYResolution."
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+msgid "AF Adjustment"
 msgstr ""
 
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
-msgid "Subject Location"
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
+msgid "Black point"
 msgstr ""
 
-#: src/properties.cpp:542
-msgid ""
-"EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
-"value is the horizontal pixel and the second value is the vertical pixel at "
-"which the main subject appears."
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
+msgid "White point"
 msgstr ""
 
-#: src/properties.cpp:545 src/tags.cpp:657
-msgid "Exposure Index"
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
+msgid "ShotInfo"
 msgstr ""
 
-#: src/properties.cpp:545
-msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
+msgid "AEInfo"
 msgstr ""
 
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
-msgid "Sensing Method"
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
+msgid "LensInfo"
 msgstr ""
 
-#: src/properties.cpp:546
-msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
+msgid "FlashInfo"
 msgstr ""
 
-#: src/properties.cpp:547
-msgid "EXIF tag 41728, 0xA300. Indicates image source."
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
+msgid "AEMeteringSegments"
 msgstr ""
 
-#: src/properties.cpp:548 src/tags.cpp:1364
-msgid "Scene Type"
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
+msgid "FlashADump"
 msgstr ""
 
-#: src/properties.cpp:548
-msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
+msgid "FlashBDump"
 msgstr ""
 
-#: src/properties.cpp:549 src/tags.cpp:572
-msgid "CFA Pattern"
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
+msgid "WB_RGGBLevelsDaylight"
 msgstr ""
 
-#: src/properties.cpp:549
-msgid ""
-"EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
-"sense."
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
+msgid "WB_RGGBLevelsShade"
 msgstr ""
 
-#: src/properties.cpp:550 src/tags.cpp:1374
-msgid "Custom Rendered"
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
+msgid "WB_RGGBLevelsCloudy"
 msgstr ""
 
-#: src/properties.cpp:550
-msgid ""
-"EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
-"data."
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
+msgid "WB_RGGBLevelsTungsten"
 msgstr ""
 
-#: src/properties.cpp:551
-msgid ""
-"EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
-"shot."
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
+msgid "WB_RGGBLevelsFluorescentD"
 msgstr ""
 
-#: src/properties.cpp:552
-msgid ""
-"EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
-"was shot."
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
+msgid "WB_RGGBLevelsFluorescentN"
 msgstr ""
 
-#: src/properties.cpp:553 src/tags.cpp:1388
-msgid "Digital Zoom Ratio"
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
+msgid "WB_RGGBLevelsFluorescentW"
 msgstr ""
 
-#: src/properties.cpp:553
-msgid ""
-"EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
-"shot."
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
+msgid "WB_RGGBLevelsFlash"
 msgstr ""
 
-#: src/properties.cpp:554 src/tags.cpp:1393
-msgid "Focal Length In 35mm Film"
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
+msgid "CameraInfo"
 msgstr ""
 
-#: src/properties.cpp:554
-msgid ""
-"EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
-"35mm film camera, in mm. A value of 0 means the focal length is unknown. "
-"Note that this tag differs from the FocalLength tag."
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
+msgid "BatteryInfo"
 msgstr ""
 
-#: src/properties.cpp:557 src/tags.cpp:1399
-msgid "Scene Capture Type"
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
+msgid "AFInfo"
 msgstr ""
 
-#: src/properties.cpp:557
-msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
+msgid "ColorInfo"
 msgstr ""
 
-#: src/properties.cpp:558 src/tags.cpp:1404
-msgid "Gain Control"
+#: src/pentaxmn.cpp:1125
+msgid "Unknown PentaxMakerNote tag"
 msgstr ""
 
-#: src/properties.cpp:558
-msgid ""
-"EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
-"adjustment."
+#: src/properties.cpp:97
+msgid "Dublin Core schema"
 msgstr ""
 
-#: src/properties.cpp:559
-msgid ""
-"EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
-"applied by the camera."
+#: src/properties.cpp:98
+msgid "digiKam Photo Management schema"
 msgstr ""
 
-#: src/properties.cpp:560
-msgid ""
-"EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
-"applied by the camera."
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
 msgstr ""
 
-#: src/properties.cpp:561
-msgid ""
-"EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
-"applied by the camera."
+#: src/properties.cpp:100
+msgid "XMP Basic schema"
 msgstr ""
 
-#: src/properties.cpp:562 src/tags.cpp:1419
-msgid "Device Setting Description"
+#: src/properties.cpp:101
+msgid "XMP Rights Management schema"
 msgstr ""
 
-#: src/properties.cpp:562
-msgid ""
-"EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
-"conditions of a particular camera model."
+#: src/properties.cpp:102
+msgid "XMP Media Management schema"
 msgstr ""
 
-#: src/properties.cpp:563 src/tags.cpp:1424
-msgid "Subject Distance Range"
+#: src/properties.cpp:103
+msgid "XMP Basic Job Ticket schema"
 msgstr ""
 
-#: src/properties.cpp:563
-msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
+#: src/properties.cpp:104
+msgid "XMP Paged-Text schema"
 msgstr ""
 
-#: src/properties.cpp:564 src/tags.cpp:1427
-msgid "Image Unique ID"
+#: src/properties.cpp:105
+msgid "XMP Dynamic Media schema"
 msgstr ""
 
-#: src/properties.cpp:564
-msgid ""
-"EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
-"recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
-"and 128-bit fixed length."
+#: src/properties.cpp:106
+msgid "Microsoft Photo schema"
 msgstr ""
 
-#: src/properties.cpp:566 src/tags.cpp:1501
-msgid "GPS Version ID"
+#: src/properties.cpp:107
+msgid "Adobe PDF schema"
 msgstr ""
 
-#: src/properties.cpp:566
-msgid ""
-"GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
-"period separators. The current value is \"2.0.0.0\"."
+#: src/properties.cpp:108
+msgid "Adobe photoshop schema"
 msgstr ""
 
-#: src/properties.cpp:568 src/tags.cpp:1512
-msgid "GPS Latitude"
+#: src/properties.cpp:109
+msgid "Camera Raw schema"
 msgstr ""
 
-#: src/properties.cpp:568
-msgid ""
-"GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
+#: src/properties.cpp:110
+msgid "Exif Schema for TIFF Properties"
 msgstr ""
 
-#: src/properties.cpp:569 src/tags.cpp:1524
-msgid "GPS Longitude"
+#: src/properties.cpp:111
+msgid "Exif schema for Exif-specific Properties"
 msgstr ""
 
-#: src/properties.cpp:569
-msgid ""
-"GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
+#: src/properties.cpp:112
+msgid "Exif schema for Additional Exif Properties"
 msgstr ""
 
-#: src/properties.cpp:570 src/tags.cpp:1532
-msgid "GPS Altitude Reference"
+#: src/properties.cpp:113
+msgid "IPTC Core schema"
 msgstr ""
 
-#: src/properties.cpp:570
-msgid ""
-"GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
+#: src/properties.cpp:115
+msgid "IPTC Extension schema"
 msgstr ""
 
-#: src/properties.cpp:571 src/tags.cpp:1540
-msgid "GPS Altitude"
+#: src/properties.cpp:117
+msgid "PLUS License Data Format schema"
 msgstr ""
 
-#: src/properties.cpp:571
-msgid "GPS tag 6, 0x06. Indicates altitude in meters."
+#: src/properties.cpp:118
+msgid "iView Media Pro schema"
 msgstr ""
 
-#: src/properties.cpp:572 src/tags.cpp:1544
-msgid "GPS Time Stamp"
+#: src/properties.cpp:119
+msgid "Expression Media schema"
 msgstr ""
 
-#: src/properties.cpp:572
-msgid ""
-"GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
-"data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
-"EXIF 2.2. The GPS timestamp in EXIF 2.1 does not include a date. If not "
-"present, the date component for the XMP should be taken from exif:"
-"DateTimeOriginal, or if that is also lacking from exif:DateTimeDigitized. If "
-"no date is available, do not write exif:GPSTimeStamp to XMP."
+#: src/properties.cpp:122
+msgid "Colorant structure"
 msgstr ""
 
-#: src/properties.cpp:578 src/tags.cpp:1549
-msgid "GPS Satellites"
+#: src/properties.cpp:123
+msgid "Dimensions structure"
 msgstr ""
 
-#: src/properties.cpp:578
-msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
+#: src/properties.cpp:124
+msgid "Font structure"
 msgstr ""
 
-#: src/properties.cpp:579 src/tags.cpp:1556
-msgid "GPS Status"
+#: src/properties.cpp:125
+msgid "Thumbnail structure"
 msgstr ""
 
-#: src/properties.cpp:579
-msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
+#: src/properties.cpp:126
+msgid "Resource Event structure"
 msgstr ""
 
-#: src/properties.cpp:580 src/tags.cpp:1561
-msgid "GPS Measure Mode"
+#: src/properties.cpp:127
+msgid "ResourceRef structure"
 msgstr ""
 
-#: src/properties.cpp:580
-msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
+#: src/properties.cpp:128
+msgid "Version structure"
 msgstr ""
 
-#: src/properties.cpp:581
-msgid "GPS DOP"
+#: src/properties.cpp:129
+msgid "Basic Job/Workflow structure"
 msgstr ""
 
-#: src/properties.cpp:581
-msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
+#: src/properties.cpp:132
+msgid "Qualifier for xmp:Identifier"
 msgstr ""
 
-#: src/properties.cpp:582 src/tags.cpp:1569
-msgid "GPS Speed Reference"
+#: src/properties.cpp:136
+msgid "Contributor"
 msgstr ""
 
-#: src/properties.cpp:582
-msgid "GPS tag 12, 0x0C. Units used to speed measurement."
+#: src/properties.cpp:136
+msgid "Contributors to the resource (other than the authors)."
 msgstr ""
 
-#: src/properties.cpp:583 src/tags.cpp:1573
-msgid "GPS Speed"
+#: src/properties.cpp:137
+msgid "Coverage"
 msgstr ""
 
-#: src/properties.cpp:583
-msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
+#: src/properties.cpp:137
+msgid ""
+"The spatial or temporal topic of the resource, the spatial applicability of "
+"the resource, or the jurisdiction under which the resource is relevant."
 msgstr ""
 
-#: src/properties.cpp:584
-msgid "GPS Track Reference"
+#: src/properties.cpp:139
+msgid "Creator"
 msgstr ""
 
-#: src/properties.cpp:584
-msgid "GPS tag 14, 0x0E. Reference for movement direction."
+#: src/properties.cpp:139
+msgid ""
+"The authors of the resource (listed in order of precedence, if significant)."
 msgstr ""
 
-#: src/properties.cpp:585 src/tags.cpp:1580
-msgid "GPS Track"
+#: src/properties.cpp:140
+msgid "Date(s) that something interesting happened to the resource."
 msgstr ""
 
-#: src/properties.cpp:585
+#: src/properties.cpp:141
 msgid ""
-"GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
+"A textual description of the content of the resource. Multiple values may be "
+"present for different languages."
 msgstr ""
 
-#: src/properties.cpp:586 src/tags.cpp:1584
-msgid "GPS Image Direction Reference"
+#: src/properties.cpp:143
+msgid "Format"
 msgstr ""
 
-#: src/properties.cpp:586
-msgid "GPS tag 16, 0x10. Reference for image direction."
+#: src/properties.cpp:143
+msgid ""
+"The file format used when saving the resource. Tools and applications should "
+"set this property to the save format of the data. It may include appropriate "
+"qualifiers."
 msgstr ""
 
-#: src/properties.cpp:587 src/tags.cpp:1588
-msgid "GPS Image Direction"
+#: src/properties.cpp:145 src/properties.cpp:196
+msgid "Identifier"
 msgstr ""
 
-#: src/properties.cpp:587
+#: src/properties.cpp:145
 msgid ""
-"GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
-"359.99."
-msgstr ""
-
-#: src/properties.cpp:588 src/tags.cpp:1592
-msgid "GPS Map Datum"
+"Unique identifier of the resource. Recommended best practice is to identify "
+"the resource by means of a string conforming to a formal identification "
+"system."
 msgstr ""
 
-#: src/properties.cpp:588
-msgid "GPS tag 18, 0x12. Geodetic survey data."
+#: src/properties.cpp:147
+msgid "An unordered array specifying the languages used in the resource."
 msgstr ""
 
-#: src/properties.cpp:589 src/tags.cpp:1600
-msgid "GPS Destination Latitude"
+#: src/properties.cpp:148
+msgid "Publisher"
 msgstr ""
 
-#: src/properties.cpp:589
+#: src/properties.cpp:148
 msgid ""
-"GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
-"destination latitude."
+"An entity responsible for making the resource available. Examples of a "
+"Publisher include a person, an organization, or a service. Typically, the "
+"name of a Publisher should be used to indicate the entity."
 msgstr ""
 
-#: src/properties.cpp:590 src/tags.cpp:1612
-msgid "GPS Destination Longitude"
+#: src/properties.cpp:151
+msgid "Relation"
 msgstr ""
 
-#: src/properties.cpp:590
+#: src/properties.cpp:151
 msgid ""
-"GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
-"longitude."
+"Relationships to other documents. Recommended best practice is to identify "
+"the related resource by means of a string conforming to a formal "
+"identification system."
 msgstr ""
 
-#: src/properties.cpp:591 src/tags.cpp:1619
-msgid "GPS Destination Bearing Reference"
+#: src/properties.cpp:153
+msgid "Rights"
 msgstr ""
 
-#: src/properties.cpp:591
-msgid "GPS tag 23, 0x17. Reference for movement direction."
+#: src/properties.cpp:153
+msgid ""
+"Informal rights statement, selected by language. Typically, rights "
+"information includes a statement about various property rights associated "
+"with the resource, including intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:592 src/tags.cpp:1623
-msgid "GPS Destination Bearing"
+#: src/properties.cpp:156
+msgid "Unique identifier of the work from which this resource was derived."
 msgstr ""
 
-#: src/properties.cpp:592
-msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
+#: src/properties.cpp:157
+msgid ""
+"An unordered array of descriptive phrases or keywords that specify the topic "
+"of the content of the resource."
 msgstr ""
 
-#: src/properties.cpp:593
-msgid "GPS Destination Distance Refefrence"
+#: src/properties.cpp:159
+msgid "Title"
 msgstr ""
 
-#: src/properties.cpp:593
-msgid "GPS tag 25, 0x19. Units used for speed measurement."
+#: src/properties.cpp:159
+msgid ""
+"The title of the document, or the name given to the resource. Typically, it "
+"will be a name by which the resource is formally known."
 msgstr ""
 
-#: src/properties.cpp:594 src/tags.cpp:1631
-msgid "GPS Destination Distance"
+#: src/properties.cpp:161
+msgid "Type"
 msgstr ""
 
-#: src/properties.cpp:594
-msgid "GPS tag 26, 0x1A. Distance to destination."
+#: src/properties.cpp:161
+msgid "A document type; for example, novel, poem, or working paper."
 msgstr ""
 
-#: src/properties.cpp:595 src/tags.cpp:1634
-msgid "GPS Processing Method"
+#: src/properties.cpp:167
+msgid "Tags List"
 msgstr ""
 
-#: src/properties.cpp:595
+#: src/properties.cpp:167
 msgid ""
-"GPS tag 27, 0x1B. A character string recording the name of the method used "
-"for location finding."
+"The list of complete tags path as string. The path hierarchy is separated by "
+"'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
 msgstr ""
 
-#: src/properties.cpp:596 src/tags.cpp:1639
-msgid "GPS Area Information"
+#: src/properties.cpp:168
+msgid "Captions Author Names"
 msgstr ""
 
-#: src/properties.cpp:596
+#: src/properties.cpp:168
 msgid ""
-"GPS tag 28, 0x1C. A character string recording the name of the GPS area."
+"The list of all captions author names for each language alternative captions "
+"set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:597 src/tags.cpp:1647
-msgid "GPS Differential"
+#: src/properties.cpp:169
+msgid "Captions Date Time Stamps"
 msgstr ""
 
-#: src/properties.cpp:597
+#: src/properties.cpp:169
 msgid ""
-"GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
-"the GPS receiver."
+"The list of all captions date time stamps for each language alternative "
+"captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:603
+#: src/properties.cpp:170 src/tags.cpp:842
+msgid "Image History"
+msgstr ""
+
+#: src/properties.cpp:170
 msgid ""
-"A description of the lens used to take the photograph. For example, \"70-200 "
-"mm f/2.8-4.0\"."
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
 msgstr ""
 
-#: src/properties.cpp:604
-msgid "SerialNumber"
+#: src/properties.cpp:171
+msgid "Lens Correction Settings"
 msgstr ""
 
-#: src/properties.cpp:604
+#: src/properties.cpp:171
 msgid ""
-"The serial number of the camera or camera body used to take the photograph."
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
 msgstr ""
 
-#: src/properties.cpp:610
-msgid "Contact Info-City"
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
 msgstr ""
 
-#: src/properties.cpp:610
-msgid "The contact information city part."
+#: src/properties.cpp:177
+msgid ""
+"The list of files processed with Enfuse program through ExpoBlending tool."
 msgstr ""
 
-#: src/properties.cpp:611
-msgid "Contact Info-Country"
+#: src/properties.cpp:178
+msgid "Enfuse Settings"
 msgstr ""
 
-#: src/properties.cpp:611
-msgid "The contact information country part."
+#: src/properties.cpp:178
+msgid ""
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
 msgstr ""
 
-#: src/properties.cpp:612
-msgid "Contact Info-Address"
+#: src/properties.cpp:184
+msgid "Advisory"
 msgstr ""
 
-#: src/properties.cpp:612
+#: src/properties.cpp:184
 msgid ""
-"The contact information address part. Comprises an optional company name and "
-"all required information to locate the building or postbox to which mail "
-"should be sent."
+"An unordered array specifying properties that were edited outside the "
+"authoring application. Each item should contain a single namespace and XPath "
+"separated by one ASCII space (U+0020)."
 msgstr ""
 
-#: src/properties.cpp:614
-msgid "Contact Info-Postal Code"
+#: src/properties.cpp:187
+msgid "Base URL"
 msgstr ""
 
-#: src/properties.cpp:614
-msgid "The contact information part denoting the local postal code."
+#: src/properties.cpp:187
+msgid ""
+"The base URL for relative URLs in the document content. If this document "
+"contains Internet links, and those links are relative, they are relative to "
+"this base URL. This property provides a standard way for embedded relative "
+"URLs to be interpreted by tools. Web authoring tools should set the value "
+"based on their notion of where URLs will be interpreted."
 msgstr ""
 
-#: src/properties.cpp:615
-msgid "Contact Info-State/Province"
+#: src/properties.cpp:192
+msgid "Create Date"
 msgstr ""
 
-#: src/properties.cpp:615
-msgid ""
-"The contact information part denoting regional information like state or "
-"province."
+#: src/properties.cpp:192
+msgid "The date and time the resource was originally created."
 msgstr ""
 
-#: src/properties.cpp:616
-msgid "Contact Info-Email"
+#: src/properties.cpp:193
+msgid "Creator Tool"
 msgstr ""
 
-#: src/properties.cpp:616
-msgid "The contact information email address part."
+#: src/properties.cpp:193
+msgid ""
+"The name of the first known tool used to create the resource. If history is "
+"present in the metadata, this value should be equivalent to that of xmpMM:"
+"History's softwareAgent property."
 msgstr ""
 
-#: src/properties.cpp:617
-msgid "Contact Info-Phone"
+#: src/properties.cpp:196
+msgid ""
+"An unordered array of text strings that unambiguously identify the resource "
+"within a given context. An array item may be qualified with xmpidq:Scheme to "
+"denote the formal identification system to which that identifier conforms. "
+"Note: The dc:identifier property is not used because it lacks a defined "
+"scheme qualifier and has been defined in the XMP Specification as a simple "
+"(single-valued) property."
 msgstr ""
 
-#: src/properties.cpp:617
-msgid "The contact information phone number part."
+#: src/properties.cpp:201
+msgid "Label"
 msgstr ""
 
-#: src/properties.cpp:618
-msgid "Contact Info-Web URL"
+#: src/properties.cpp:201
+msgid ""
+"A word or short phrase that identifies a document as a member of a user-"
+"defined collection. Used to organize documents in a file browser."
 msgstr ""
 
-#: src/properties.cpp:618
-msgid "The contact information web address part."
+#: src/properties.cpp:203
+msgid "Metadata Date"
 msgstr ""
 
-#: src/properties.cpp:619
+#: src/properties.cpp:203
 msgid ""
-"Code of the country the content is focussing on -- either the country shown "
-"in visual media or referenced in text or audio media. This element is at the "
-"top/first level of a top-down geographical hierarchy. The code should be "
-"taken from ISO 3166 two or three letter code. The full name of a country "
-"should go to the \"Country\" element."
+"The date and time that any metadata for this resource was last changed. It "
+"should be the same as or more recent than xmp:ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:623
-msgid "Creator's Contact Info"
+#: src/properties.cpp:205
+msgid "Modify Date"
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:205
 msgid ""
-"The creator's contact information provides all necessary information to get "
-"in contact with the creator of this news object and comprises a set of sub-"
-"properties for proper addressing."
+"The date and time the resource was last modified. Note: The value of this "
+"property is not necessarily the same as the file's system modification date "
+"because it is set before the file is saved."
 msgstr ""
 
-#: src/properties.cpp:625
-msgid "Intellectual Genre"
+#: src/properties.cpp:208
+msgid "Nickname"
 msgstr ""
 
-#: src/properties.cpp:625
-msgid ""
-"Describes the nature, intellectual or journalistic characteristic of a news "
-"object, not specifically its content."
+#: src/properties.cpp:208
+msgid "A short informal name for the resource."
 msgstr ""
 
-#: src/properties.cpp:627
+#: src/properties.cpp:209
+msgid "Rating"
+msgstr ""
+
+#: src/properties.cpp:209
 msgid ""
-"Name of a location the content is focussing on -- either the location shown "
-"in visual media or referenced by text or audio media. This location name "
-"could either be the name of a sublocation to a city or the name of a well "
-"known location or (natural) monument outside a city. In the sense of a "
-"sublocation to a city this element is at the fourth level of a top-down "
-"geographical hierarchy."
+"A number that indicates a document's status relative to other documents, "
+"used to organize documents in a file browser. Values are user-defined within "
+"an application-defined range."
 msgstr ""
 
-#: src/properties.cpp:632
-msgid "IPTC Scene"
+#: src/properties.cpp:212
+msgid "Thumbnails"
 msgstr ""
 
-#: src/properties.cpp:632
+#: src/properties.cpp:212
 msgid ""
-"Describes the scene of a photo content. Specifies one or more terms from the "
-"IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
-"in an unordered list."
+"An alternative array of thumbnail images for a file, which can differ in "
+"characteristics such as size or image encoding."
 msgstr ""
 
-#: src/properties.cpp:634
-msgid "IPTC Subject Code"
+#: src/properties.cpp:219
+msgid "Certificate"
 msgstr ""
 
-#: src/properties.cpp:634
-msgid ""
-"Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
-"to categorize the content. Each Subject is represented as a string of 8 "
-"digits in an unordered list."
+#: src/properties.cpp:219
+msgid "Online rights management certificate."
 msgstr ""
 
-#: src/properties.cpp:641
-msgid "Additional model info"
+#: src/properties.cpp:220
+msgid "Marked"
 msgstr ""
 
-#: src/properties.cpp:641
-msgid ""
-"Information about the ethnicity and other facts of the model(s) in a model-"
-"released image."
+#: src/properties.cpp:220
+msgid "Indicates that this is a rights-managed resource."
 msgstr ""
 
-#: src/properties.cpp:642
-msgid "Code of featured Organisation"
+#: src/properties.cpp:221
+msgid "Owner"
 msgstr ""
 
-#: src/properties.cpp:642
-msgid ""
-"Code from controlled vocabulary for identyfing the organisation or company "
-"which is featured in the image."
+#: src/properties.cpp:221
+msgid "An unordered array specifying the legal owner(s) of a resource."
 msgstr ""
 
-#: src/properties.cpp:643
-msgid "Controlled Vocabulary Term"
+#: src/properties.cpp:222
+msgid "Usage Terms"
 msgstr ""
 
-#: src/properties.cpp:643
-msgid ""
-"A term to describe the content of the image by a value from a Controlled "
-"Vocabulary."
+#: src/properties.cpp:222
+msgid "Text instructions on how a resource can be legally used."
 msgstr ""
 
-#: src/properties.cpp:644
-msgid "Model age"
+#: src/properties.cpp:223
+msgid "Web Statement"
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:223
 msgid ""
-"Age of the human model(s) at the time this image was taken in a model "
-"released image."
+"The location of a web page describing the owner and/or rights statement for "
+"this resource."
 msgstr ""
 
-#: src/properties.cpp:645
-msgid "Name of featured Organisation"
+#: src/properties.cpp:229
+msgid "Derived From"
 msgstr ""
 
-#: src/properties.cpp:645
-msgid "Name of the organisation or company which is featured in the image."
+#: src/properties.cpp:229
+msgid ""
+"A reference to the original document from which this one is derived. It is a "
+"minimal reference; missing components can be assumed to be unchanged. For "
+"example, a new version might only need to specify the instance ID and "
+"version number of the previous version, or a rendition might only need to "
+"specify the instance ID and rendition class of the original."
 msgstr ""
 
-#: src/properties.cpp:646
-msgid "Person shown"
+#: src/properties.cpp:234
+msgid "Document ID"
 msgstr ""
 
-#: src/properties.cpp:646
-msgid "Name of a person shown in the image."
+#: src/properties.cpp:234
+msgid ""
+"The common identifier for all versions and renditions of a document. It "
+"should be based on a UUID; see Document and Instance IDs below."
 msgstr ""
 
-#: src/properties.cpp:647
-msgid "Digital Image Identifier"
+#: src/properties.cpp:236
+msgid "History"
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:236
 msgid ""
-"Globally unique identifier for this digital image. It is created and applied "
-"by the creator of the digital image at the time of its creation. this value "
-"shall not be changed after that time."
+"An ordered array of high-level user actions that resulted in this resource. "
+"It is intended to give human readers a general indication of the steps taken "
+"to make the changes from the previous version to this one. The list should "
+"be at an abstract level; it is not intended to be an exhaustive keystroke or "
+"other detailed history."
 msgstr ""
 
-#: src/properties.cpp:648
-msgid "Physical type of original photo"
+#: src/properties.cpp:240
+msgid "Instance ID"
 msgstr ""
 
-#: src/properties.cpp:648
-msgid "The type of the source digital file."
+#: src/properties.cpp:240
+msgid ""
+"An identifier for a specific incarnation of a document, updated each time a "
+"file is saved. It should be based on a UUID; see Document and Instance IDs "
+"below."
 msgstr ""
 
-#: src/properties.cpp:649
-msgid "Event"
+#: src/properties.cpp:242
+msgid "Managed From"
 msgstr ""
 
-#: src/properties.cpp:649
-msgid "Names or describes the specific event at which the photo was taken."
+#: src/properties.cpp:242
+msgid ""
+"A reference to the document as it was prior to becoming managed. It is set "
+"when a managed document is introduced to an asset management system that "
+"does not currently own it. It may or may not include references to different "
+"management systems."
 msgstr ""
 
-#: src/properties.cpp:650
-msgid "Maximum available height"
+#: src/properties.cpp:245
+msgid "Manager"
 msgstr ""
 
-#: src/properties.cpp:650
+#: src/properties.cpp:245
 msgid ""
-"The maximum available height in pixels of the original photo from which this "
-"photo has been derived by downsizing."
+"The name of the asset management system that manages this resource. Along "
+"with xmpMM: ManagerVariant, it tells applications which asset management "
+"system to contact concerning this document."
 msgstr ""
 
-#: src/properties.cpp:651
-msgid "Maximum available width"
+#: src/properties.cpp:248
+msgid "Manage To"
 msgstr ""
 
-#: src/properties.cpp:651
+#: src/properties.cpp:248
 msgid ""
-"The maximum available width in pixels of the original photo from which this "
-"photo has been derived by downsizing."
+"A URI identifying the managed resource to the asset management system; the "
+"presence of this property is the formal indication that this resource is "
+"managed. The form and content of this URI is private to the asset management "
+"system."
 msgstr ""
 
-#: src/properties.cpp:652
-msgid "Registry Entry"
+#: src/properties.cpp:251
+msgid "Manage UI"
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:251
 msgid ""
-"Both a Registry Item Id and a Registry Organisation Id to record any "
-"registration of this digital image with a registry."
+"A URI that can be used to access information about the managed resource "
+"through a web browser. It might require a custom browser plug-in."
 msgstr ""
 
-#: src/properties.cpp:653
-msgid "Registry Entry-Item Identifier"
+#: src/properties.cpp:253
+msgid "Manager Variant"
 msgstr ""
 
-#: src/properties.cpp:653
+#: src/properties.cpp:253
 msgid ""
-"A unique identifier created by a registry and applied by the creator of the "
-"digital image. This value shall not be changed after being applied. This "
-"identifier is linked to a corresponding Registry Organisation Identifier."
+"Specifies a particular variant of the asset management system. The format of "
+"this property is private to the specific asset management system."
 msgstr ""
 
-#: src/properties.cpp:654
-msgid "Registry Entry-Organisation Identifier"
+#: src/properties.cpp:255
+msgid "Rendition Class"
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:255
 msgid ""
-"An identifier for the registry which issued the corresponding Registry Image "
-"Id."
+"The rendition class name for this resource. This property should be absent "
+"or set to default for a document version that is not a derived rendition."
 msgstr ""
 
-#: src/properties.cpp:655
-msgid "IPTC Fields Last Edited"
+#: src/properties.cpp:257
+msgid "Rendition Params"
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:257
 msgid ""
-"The date and optionally time when any of the IPTC photo metadata fields has "
-"been last edited."
+"Can be used to provide additional rendition parameters that are too complex "
+"or verbose to encode in xmpMM: RenditionClass."
 msgstr ""
 
-#: src/properties.cpp:656
-msgid "Location shown"
+#: src/properties.cpp:259
+msgid "Version ID"
 msgstr ""
 
-#: src/properties.cpp:656
-msgid "A location shown in the image."
+#: src/properties.cpp:259
+msgid ""
+"The document version identifier for this resource. Each version of a "
+"document gets a new identifier, usually simply by incrementing integers 1, "
+"2, 3 . . . and so on. Media management systems can have other conventions or "
+"support branching which requires a more complex scheme."
 msgstr ""
 
-#: src/properties.cpp:657
-msgid "Location Created"
+#: src/properties.cpp:263
+msgid "Versions"
 msgstr ""
 
-#: src/properties.cpp:657
-msgid "The location the photo was taken."
+#: src/properties.cpp:263
+msgid ""
+"The version history associated with this resource. Entry [1] is the oldest "
+"known version for this document, entry [last()] is the most recent version. "
+"Typically, a media management system would fill in the version information "
+"in the metadata on check-in. It is not guaranteed that a complete history  "
+"versions from the first to this one will be present in the xmpMM:Versions "
+"property. Interior version information can be compressed or eliminated and "
+"the version history can be truncated at some point."
 msgstr ""
 
-#: src/properties.cpp:658
-msgid "Location-City"
+#: src/properties.cpp:269
+msgid "Last URL"
 msgstr ""
 
-#: src/properties.cpp:658
-msgid "Name of the city of a location."
+#: src/properties.cpp:269
+msgid "Deprecated for privacy protection."
 msgstr ""
 
-#: src/properties.cpp:659
-msgid "Location-Country ISO-Code"
+#: src/properties.cpp:270
+msgid "Rendition Of"
+msgstr ""
+
+#: src/properties.cpp:270
+msgid ""
+"Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
+"which this is a rendition."
+msgstr ""
+
+#: src/properties.cpp:272
+msgid "Save ID"
+msgstr ""
+
+#: src/properties.cpp:272
+msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
+msgstr ""
+
+#: src/properties.cpp:278
+msgid "Job Reference"
+msgstr ""
+
+#: src/properties.cpp:278
+msgid ""
+"References an external job management file for a job process in which the "
+"document is being used. Use of job names is under user control. Typical use "
+"would be to identify all documents that are part of a particular job or "
+"contract. There are multiple values because there can be more than one job "
+"using a particular document at any time, and it can also be useful to keep "
+"historical information about what jobs a document was part of previously."
+msgstr ""
+
+#: src/properties.cpp:287
+msgid "Maximum Page Size"
+msgstr ""
+
+#: src/properties.cpp:287
+msgid ""
+"The size of the largest page in the document (including any in contained "
+"documents)."
+msgstr ""
+
+#: src/properties.cpp:288
+msgid "Number of Pages"
+msgstr ""
+
+#: src/properties.cpp:288
+msgid ""
+"The number of pages in the document (including any in contained documents)."
+msgstr ""
+
+#: src/properties.cpp:289
+msgid "Fonts"
+msgstr ""
+
+#: src/properties.cpp:289
+msgid ""
+"An unordered array of fonts that are used in the document (including any in "
+"contained documents)."
+msgstr ""
+
+#: src/properties.cpp:290
+msgid "Colorants"
+msgstr ""
+
+#: src/properties.cpp:290
+msgid ""
+"An ordered array of colorants (swatches) that are used in the document "
+"(including any in contained documents)."
+msgstr ""
+
+#: src/properties.cpp:291
+msgid "Plate Names"
+msgstr ""
+
+#: src/properties.cpp:291
+msgid ""
+"An ordered array of plate names that are needed to print the document "
+"(including any in contained documents)."
+msgstr ""
+
+#: src/properties.cpp:297
+msgid "Project Reference"
+msgstr ""
+
+#: src/properties.cpp:297
+msgid "A reference to the project that created this file."
+msgstr ""
+
+#: src/properties.cpp:298
+msgid "Video Frame Rate"
+msgstr ""
+
+#: src/properties.cpp:298
+msgid "The video frame rate. One of: 24, NTSC, PAL."
+msgstr ""
+
+#: src/properties.cpp:299
+msgid "Video Frame Size"
+msgstr ""
+
+#: src/properties.cpp:299
+msgid "The frame size. For example: w:720, h: 480, unit:pixels"
+msgstr ""
+
+#: src/properties.cpp:300
+msgid "Video Pixel Aspect Ratio"
+msgstr ""
+
+#: src/properties.cpp:300
+msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
+msgstr ""
+
+#: src/properties.cpp:301
+msgid "Video Pixel Depth"
+msgstr ""
+
+#: src/properties.cpp:301
+msgid ""
+"The size in bits of each color component of a pixel. Standard Windows 32-bit "
+"pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
+msgstr ""
+
+#: src/properties.cpp:303
+msgid "Video Color Space"
+msgstr ""
+
+#: src/properties.cpp:303
+msgid ""
+"The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
+"CCIR-709 (used for HD)."
+msgstr ""
+
+#: src/properties.cpp:305
+msgid "Video Alpha Mode"
+msgstr ""
+
+#: src/properties.cpp:305
+msgid "The alpha mode. One of: straight, pre-multiplied."
+msgstr ""
+
+#: src/properties.cpp:306
+msgid "Video Alpha Premultiple Color"
+msgstr ""
+
+#: src/properties.cpp:306
+msgid ""
+"A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
+"is pre-multiplied."
+msgstr ""
+
+#: src/properties.cpp:308
+msgid "Video Alpha Unity Is Transparent"
+msgstr ""
+
+#: src/properties.cpp:308
+msgid "When true, unity is clear, when false, it is opaque."
+msgstr ""
+
+#: src/properties.cpp:309
+msgid "Video Compressor"
+msgstr ""
+
+#: src/properties.cpp:309
+msgid "Video compression used. For example, jpeg."
+msgstr ""
+
+#: src/properties.cpp:310
+msgid "Video Field Order"
+msgstr ""
+
+#: src/properties.cpp:310
+msgid "The field order for video. One of: Upper, Lower, Progressive."
+msgstr ""
+
+#: src/properties.cpp:311
+msgid "Pull Down"
+msgstr ""
+
+#: src/properties.cpp:311
+msgid ""
+"The sampling phase of film to be converted to video (pull-down). One of: "
+"WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
+"WWWSS_24p, WWSSW_24p."
+msgstr ""
+
+#: src/properties.cpp:313
+msgid "Audio Sample Rate"
+msgstr ""
+
+#: src/properties.cpp:313
+msgid ""
+"The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
+msgstr ""
+
+#: src/properties.cpp:314
+msgid "Audio Sample Type"
+msgstr ""
+
+#: src/properties.cpp:314
+msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
+msgstr ""
+
+#: src/properties.cpp:315
+msgid "Audio Channel Type"
+msgstr ""
+
+#: src/properties.cpp:315
+msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
+msgstr ""
+
+#: src/properties.cpp:316
+msgid "Audio Compressor"
+msgstr ""
+
+#: src/properties.cpp:316
+msgid "The audio compression used. For example, MP3."
+msgstr ""
+
+#: src/properties.cpp:317
+msgid "Speaker Placement"
+msgstr ""
+
+#: src/properties.cpp:317
+msgid ""
+"A description of the speaker angles from center front in degrees. For "
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
+msgstr ""
+
+#: src/properties.cpp:319
+msgid "File Data Rate"
+msgstr ""
+
+#: src/properties.cpp:319
+msgid ""
+"The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
+"sec"
+msgstr ""
+
+#: src/properties.cpp:320
+msgid "Tape Name"
+msgstr ""
+
+#: src/properties.cpp:320
+msgid ""
+"The name of the tape from which the clip was captured, as set during the "
+"capture process."
+msgstr ""
+
+#: src/properties.cpp:321
+msgid "Alternative Tape Name"
+msgstr ""
+
+#: src/properties.cpp:321
+msgid ""
+"An alternative tape name, set via the project window or timecode dialog in "
+"Premiere. If an alternative name has been set and has not been reverted, "
+"that name is displayed."
+msgstr ""
+
+#: src/properties.cpp:323
+msgid "Start Time Code"
+msgstr ""
+
+#: src/properties.cpp:323
+msgid ""
+"The timecode of the first frame of video in the file, as obtained from the "
+"device control."
+msgstr ""
+
+#: src/properties.cpp:324
+msgid "Alternative Time code"
+msgstr ""
+
+#: src/properties.cpp:324
+msgid ""
+"A timecode set by the user. When specified, it is used instead of the "
+"startTimecode."
+msgstr ""
+
+#: src/properties.cpp:325
+msgid "Duration"
+msgstr ""
+
+#: src/properties.cpp:325
+msgid "The duration of the media file."
+msgstr ""
+
+#: src/properties.cpp:326
+msgid "Scene"
+msgstr ""
+
+#: src/properties.cpp:326
+msgid "The name of the scene."
+msgstr ""
+
+#: src/properties.cpp:327
+msgid "Shot Name"
+msgstr ""
+
+#: src/properties.cpp:327
+msgid "The name of the shot or take."
+msgstr ""
+
+#: src/properties.cpp:328
+msgid "Shot Date"
+msgstr ""
+
+#: src/properties.cpp:328
+msgid "The date and time when the video was shot."
+msgstr ""
+
+#: src/properties.cpp:329
+msgid "Shot Location"
+msgstr ""
+
+#: src/properties.cpp:329
+msgid ""
+"The name of the location where the video was shot. For example: "
+"\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
+"GPS values."
+msgstr ""
+
+#: src/properties.cpp:331
+msgid "Log Comment"
+msgstr ""
+
+#: src/properties.cpp:331
+msgid "User's log comments."
+msgstr ""
+
+#: src/properties.cpp:332
+msgid "Markers"
+msgstr ""
+
+#: src/properties.cpp:332
+msgid "An ordered list of markers"
+msgstr ""
+
+#: src/properties.cpp:333
+msgid "Contributed Media"
+msgstr ""
+
+#: src/properties.cpp:333
+msgid "An unordered list of all media used to create this media."
+msgstr ""
+
+#: src/properties.cpp:334
+msgid "Absolute Peak Audio File Path"
+msgstr ""
+
+#: src/properties.cpp:334
+msgid ""
+"The absolute path to the file's peak audio file. If empty, no peak file "
+"exists."
+msgstr ""
+
+#: src/properties.cpp:335
+msgid "Relative Peak Audio File Path"
+msgstr ""
+
+#: src/properties.cpp:335
+msgid ""
+"The relative path to the file's peak audio file. If empty, no peak file "
+"exists."
+msgstr ""
+
+#: src/properties.cpp:336
+msgid "Video Modified Date"
+msgstr ""
+
+#: src/properties.cpp:336
+msgid "The date and time when the video was last modified."
+msgstr ""
+
+#: src/properties.cpp:337
+msgid "Audio Modified Date"
+msgstr ""
+
+#: src/properties.cpp:337
+msgid "The date and time when the audio was last modified."
+msgstr ""
+
+#: src/properties.cpp:338
+msgid "Metadata Modified Date"
+msgstr ""
+
+#: src/properties.cpp:338
+msgid "The date and time when the metadata was last modified."
+msgstr ""
+
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
+msgid "Artist"
+msgstr ""
+
+#: src/properties.cpp:339
+msgid "The name of the artist or artists."
+msgstr ""
+
+#: src/properties.cpp:340
+msgid "Album"
+msgstr ""
+
+#: src/properties.cpp:340
+msgid "The name of the album."
+msgstr ""
+
+#: src/properties.cpp:341
+msgid "Track Number"
+msgstr ""
+
+#: src/properties.cpp:341
+msgid ""
+"A numeric value indicating the order of the audio file within its original "
+"recording."
+msgstr ""
+
+#: src/properties.cpp:342
+msgid "Genre"
+msgstr ""
+
+#: src/properties.cpp:342
+msgid "The name of the genre."
+msgstr ""
+
+#: src/properties.cpp:343
+msgid "The copyright information."
+msgstr ""
+
+#: src/properties.cpp:344
+msgid "The date the title was released."
+msgstr ""
+
+#: src/properties.cpp:345
+msgid "Composer"
+msgstr ""
+
+#: src/properties.cpp:345
+msgid "The composer's name."
+msgstr ""
+
+#: src/properties.cpp:346
+msgid "Engineer"
+msgstr ""
+
+#: src/properties.cpp:346
+msgid "The engineer's name."
+msgstr ""
+
+#: src/properties.cpp:347
+msgid "Tempo"
+msgstr ""
+
+#: src/properties.cpp:347
+msgid "The audio's tempo."
+msgstr ""
+
+#: src/properties.cpp:348
+msgid "Instrument"
+msgstr ""
+
+#: src/properties.cpp:348
+msgid "The musical instrument."
+msgstr ""
+
+#: src/properties.cpp:349
+msgid "Intro Time"
+msgstr ""
+
+#: src/properties.cpp:349
+msgid "The duration of lead time for queuing music."
+msgstr ""
+
+#: src/properties.cpp:350
+msgid "Out Cue"
+msgstr ""
+
+#: src/properties.cpp:350
+msgid "The time at which to fade out."
+msgstr ""
+
+#: src/properties.cpp:351
+msgid "Relative Timestamp"
+msgstr ""
+
+#: src/properties.cpp:351
+msgid "The start time of the media inside the audio project."
+msgstr ""
+
+#: src/properties.cpp:352
+msgid "Loop"
+msgstr ""
+
+#: src/properties.cpp:352
+msgid "When true, the clip can be looped seemlessly."
+msgstr ""
+
+#: src/properties.cpp:353
+msgid "Number Of Beats"
+msgstr ""
+
+#: src/properties.cpp:353
+msgid "The number of beats."
+msgstr ""
+
+#: src/properties.cpp:354
+msgid "Key"
+msgstr ""
+
+#: src/properties.cpp:354
+msgid ""
+"The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
+msgstr ""
+
+#: src/properties.cpp:355
+msgid "Stretch Mode"
+msgstr ""
+
+#: src/properties.cpp:355
+msgid ""
+"The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
+"Splice, Hybrid."
+msgstr ""
+
+#: src/properties.cpp:356
+msgid "Time Scale Parameters"
+msgstr ""
+
+#: src/properties.cpp:356
+msgid "Additional parameters for Time-Scale stretch mode."
+msgstr ""
+
+#: src/properties.cpp:357
+msgid "Resample Parameters"
+msgstr ""
+
+#: src/properties.cpp:357
+msgid "Additional parameters for Resample stretch mode."
+msgstr ""
+
+#: src/properties.cpp:358
+msgid "Beat Splice Parameters"
+msgstr ""
+
+#: src/properties.cpp:358
+msgid "Additional parameters for Beat Splice stretch mode."
+msgstr ""
+
+#: src/properties.cpp:359
+msgid "Time Signature"
+msgstr ""
+
+#: src/properties.cpp:359
+msgid ""
+"The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
+"12/8, other."
+msgstr ""
+
+#: src/properties.cpp:360
+msgid "Scale Type"
+msgstr ""
+
+#: src/properties.cpp:360
+msgid ""
+"The musical scale used in the music. One of: Major, Minor, Both, Neither. "
+"Neither is most often used for instruments with no associated scale, such as "
+"drums."
+msgstr ""
+
+#: src/properties.cpp:367 src/tags.cpp:1076
+msgid "Camera Serial Number"
+msgstr ""
+
+#: src/properties.cpp:367
+msgid "Camera Serial Number."
+msgstr ""
+
+#: src/properties.cpp:368
+msgid "Date Acquired"
+msgstr ""
+
+#: src/properties.cpp:368
+msgid "Date Acquired."
+msgstr ""
+
+#: src/properties.cpp:369
+msgid "Flash Manufacturer"
+msgstr ""
+
+#: src/properties.cpp:369
+msgid "Flash Manufacturer."
+msgstr ""
+
+#: src/properties.cpp:370
+msgid "Flash Model."
+msgstr ""
+
+#: src/properties.cpp:371
+msgid "Last Keyword IPTC"
+msgstr ""
+
+#: src/properties.cpp:371
+msgid "Last Keyword IPTC."
+msgstr ""
+
+#: src/properties.cpp:372
+msgid "Last Keyword XMP"
+msgstr ""
+
+#: src/properties.cpp:372
+msgid "Last Keyword XMP."
+msgstr ""
+
+#: src/properties.cpp:373
+msgid "Lens Manufacturer"
+msgstr ""
+
+#: src/properties.cpp:373
+msgid "Lens Manufacturer."
+msgstr ""
+
+#: src/properties.cpp:374
+msgid "Lens Model."
+msgstr ""
+
+#: src/properties.cpp:375
+msgid "Rating Percent"
+msgstr ""
+
+#: src/properties.cpp:375
+msgid "Rating Percent."
+msgstr ""
+
+#: src/properties.cpp:381
+msgid "Keywords."
+msgstr ""
+
+#: src/properties.cpp:382
+msgid "PDF Version"
+msgstr ""
+
+#: src/properties.cpp:382
+msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
+msgstr ""
+
+#: src/properties.cpp:383
+msgid "Producer"
+msgstr ""
+
+#: src/properties.cpp:383
+msgid "The name of the tool that created the PDF document."
+msgstr ""
+
+#: src/properties.cpp:389
+msgid "Authors Position"
+msgstr ""
+
+#: src/properties.cpp:389
+msgid "By-line title."
+msgstr ""
+
+#: src/properties.cpp:390
+msgid "Caption Writer"
+msgstr ""
+
+#: src/properties.cpp:390
+msgid "Writer/editor."
+msgstr ""
+
+#: src/properties.cpp:391
+msgid "Category. Limited to 3 7-bit ASCII characters."
+msgstr ""
+
+#: src/properties.cpp:392
+msgid "City."
+msgstr ""
+
+#: src/properties.cpp:393
+msgid "Country/primary location."
+msgstr ""
+
+#: src/properties.cpp:394
+msgid "Credit."
+msgstr ""
+
+#: src/properties.cpp:395
+msgid ""
+"The date the intellectual content of the document was created (rather than "
+"the creation date of the physical representation), following IIM "
+"conventions. For example, a photo taken during the American Civil War would "
+"have a creation date during that epoch (1861-1865) rather than the date the "
+"photo was digitized for archiving."
+msgstr ""
+
+#: src/properties.cpp:399
+msgid "Headline."
+msgstr ""
+
+#: src/properties.cpp:400
+msgid "Special instructions."
+msgstr ""
+
+#: src/properties.cpp:401
+msgid "Source."
+msgstr ""
+
+#: src/properties.cpp:402
+msgid "State"
+msgstr ""
+
+#: src/properties.cpp:402
+msgid "Province/state."
+msgstr ""
+
+#: src/properties.cpp:403
+msgid "Supplemental category."
+msgstr ""
+
+#: src/properties.cpp:404
+msgid "Original transmission reference."
+msgstr ""
+
+#: src/properties.cpp:405
+msgid "Urgency. Valid range is 1-8."
+msgstr ""
+
+#: src/properties.cpp:413
+msgid "inches"
+msgstr ""
+
+#: src/properties.cpp:414 src/tags.cpp:247
+msgid "cm"
+msgstr ""
+
+#: src/properties.cpp:418
+msgid "Auto Brightness"
+msgstr ""
+
+#: src/properties.cpp:418
+msgid "When true, \"Brightness\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:419
+msgid "Auto Contrast"
+msgstr ""
+
+#: src/properties.cpp:419
+msgid "When true, \"Contrast\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:420
+msgid "Auto Exposure"
+msgstr ""
+
+#: src/properties.cpp:420
+msgid "When true, \"Exposure\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:421
+msgid "Auto Shadows"
+msgstr ""
+
+#: src/properties.cpp:421
+msgid "When true,\"Shadows\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:422
+msgid "Blue Hue"
+msgstr ""
+
+#: src/properties.cpp:422
+msgid "\"Blue Hue\" setting. Range -100 to 100."
+msgstr ""
+
+#: src/properties.cpp:423
+msgid "Blue Saturation"
+msgstr ""
+
+#: src/properties.cpp:423
+msgid "\"Blue Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:424
+msgid "\"Brightness\" setting. Range 0 to +150."
+msgstr ""
+
+#: src/properties.cpp:425
+msgid "Camera Profile"
+msgstr ""
+
+#: src/properties.cpp:425
+msgid "\"Camera Profile\" setting."
+msgstr ""
+
+#: src/properties.cpp:426
+msgid "Chromatic Aberration Blue"
+msgstr ""
+
+#: src/properties.cpp:426
+msgid ""
+"\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:427
+msgid "Chromatic Aberration Red"
+msgstr ""
+
+#: src/properties.cpp:427
+msgid ""
+"\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:428
+msgid "Color Noise Reduction"
+msgstr ""
+
+#: src/properties.cpp:428
+msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:429
+msgid "\"Contrast\" setting. Range -50 to +100."
+msgstr ""
+
+#: src/properties.cpp:430
+msgid "When \"Has Crop\" is true, top of crop rectangle"
+msgstr ""
+
+#: src/properties.cpp:431
+msgid "When \"Has Crop\" is true, left of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:432
+msgid "Crop Bottom"
+msgstr ""
+
+#: src/properties.cpp:432
+msgid "When \"Has Crop\" is true, bottom of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:433
+msgid "Crop Right"
+msgstr ""
+
+#: src/properties.cpp:433
+msgid "When \"Has Crop\" is true, right of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:434
+msgid "Crop Angle"
+msgstr ""
+
+#: src/properties.cpp:434
+msgid "When \"Has Crop\" is true, angle of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:435
+msgid "Width of resulting cropped image in CropUnits units."
+msgstr ""
+
+#: src/properties.cpp:436
+msgid "Height of resulting cropped image in CropUnits units."
+msgstr ""
+
+#: src/properties.cpp:437
+msgid "Crop Units"
+msgstr ""
+
+#: src/properties.cpp:437
+msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
+msgstr ""
+
+#: src/properties.cpp:438
+msgid "\"Exposure\" setting. Range -4.0 to +4.0."
+msgstr ""
+
+#: src/properties.cpp:439
+msgid "GreenHue"
+msgstr ""
+
+#: src/properties.cpp:439
+msgid "\"Green Hue\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:440
+msgid "Green Saturation"
+msgstr ""
+
+#: src/properties.cpp:440
+msgid "\"Green Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:441
+msgid "Has Crop"
+msgstr ""
+
+#: src/properties.cpp:441
+msgid "When true, image has a cropping rectangle."
+msgstr ""
+
+#: src/properties.cpp:442
+msgid "Has Settings"
+msgstr ""
+
+#: src/properties.cpp:442
+msgid "When true, non-default camera raw settings."
+msgstr ""
+
+#: src/properties.cpp:443
+msgid "Luminance Smoothing"
+msgstr ""
+
+#: src/properties.cpp:443
+msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:444
+msgid "Raw File Name"
+msgstr ""
+
+#: src/properties.cpp:444
+msgid "File name of raw file (not a complete path)."
+msgstr ""
+
+#: src/properties.cpp:445
+msgid "Red Hue"
+msgstr ""
+
+#: src/properties.cpp:445
+msgid "\"Red Hue\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:446
+msgid "Red Saturation"
+msgstr ""
+
+#: src/properties.cpp:446
+msgid "\"Red Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:447
+msgid "\"Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:448
+msgid "Shadows"
+msgstr ""
+
+#: src/properties.cpp:448
+msgid "\"Shadows\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:449
+msgid "Shadow Tint"
+msgstr ""
+
+#: src/properties.cpp:449
+msgid "\"Shadow Tint\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:450
+msgid "\"Sharpness\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:451
+msgid "\"Temperature\" setting. Range 2000 to 50000."
+msgstr ""
+
+#: src/properties.cpp:452
+msgid "Tint"
+msgstr ""
+
+#: src/properties.cpp:452
+msgid "\"Tint\" setting. Range -150 to +150."
+msgstr ""
+
+#: src/properties.cpp:453
+msgid "Tone Curve"
+msgstr ""
+
+#: src/properties.cpp:453
+msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
+msgstr ""
+
+#: src/properties.cpp:454
+msgid "Tone Curve Name"
+msgstr ""
+
+#: src/properties.cpp:454
+msgid ""
+"The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
+"Contrast, Strong Contrast, Custom or a user-defined preset name."
+msgstr ""
+
+#: src/properties.cpp:456
+msgid "Version of Camera Raw plugin."
+msgstr ""
+
+#: src/properties.cpp:457
+msgid "Vignette Amount"
+msgstr ""
+
+#: src/properties.cpp:457
+msgid "\"Vignetting Amount\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:458
+msgid "Vignette Midpoint"
+msgstr ""
+
+#: src/properties.cpp:458
+msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:459
+msgid ""
+"\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
+"Tungsten, Fluorescent, Flash, Custom"
+msgstr ""
+
+#: src/properties.cpp:466
+msgid "TIFF tag 256, 0x100. Image width in pixels."
+msgstr ""
+
+#: src/properties.cpp:467 src/tags.cpp:425
+msgid "Image Length"
+msgstr ""
+
+#: src/properties.cpp:467
+msgid "TIFF tag 257, 0x101. Image height in pixels."
+msgstr ""
+
+#: src/properties.cpp:468
+msgid "Bits Per Sample"
+msgstr ""
+
+#: src/properties.cpp:468
+msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
+msgstr ""
+
+#: src/properties.cpp:469 src/tags.cpp:435
+msgid "Compression"
+msgstr ""
+
+#: src/properties.cpp:469
+msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
+msgstr ""
+
+#: src/properties.cpp:470 src/tags.cpp:441
+msgid "Photometric Interpretation"
+msgstr ""
+
+#: src/properties.cpp:470
+msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
+msgstr ""
+
+#: src/properties.cpp:471
+msgid ""
+"TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
+"0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
+"right 4 = 0th row at bottom, 0th column at left 5 = 0th row at left, 0th "
+"column at top 6 = 0th row at right, 0th column at top 7 = 0th row at right, "
+"0th column at bottom 8 = 0th row at left, 0th column at bottom"
+msgstr ""
+
+#: src/properties.cpp:480
+msgid "Samples Per Pixel"
+msgstr ""
+
+#: src/properties.cpp:480
+msgid "TIFF tag 277, 0x115. Number of components per pixel."
+msgstr ""
+
+#: src/properties.cpp:481 src/tags.cpp:515
+msgid "Planar Configuration"
+msgstr ""
+
+#: src/properties.cpp:481
+msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
+msgstr ""
+
+#: src/properties.cpp:482
+msgid "YCbCr Sub Sampling"
+msgstr ""
+
+#: src/properties.cpp:482
+msgid ""
+"TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
+"YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
+msgstr ""
+
+#: src/properties.cpp:484 src/tags.cpp:718
+msgid "YCbCr Positioning"
+msgstr ""
+
+#: src/properties.cpp:484
+msgid ""
+"TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
+"centered; 2 = co-sited."
+msgstr ""
+
+#: src/properties.cpp:486
+msgid "X Resolution"
+msgstr ""
+
+#: src/properties.cpp:486
+msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
+msgstr ""
+
+#: src/properties.cpp:487
+msgid "Y Resolution"
+msgstr ""
+
+#: src/properties.cpp:487
+msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
+msgstr ""
+
+#: src/properties.cpp:488 src/tags.cpp:533
+msgid "Resolution Unit"
+msgstr ""
+
+#: src/properties.cpp:488
+msgid ""
+"TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
+"of: 2 = inches; 3 = centimeters."
+msgstr ""
+
+#: src/properties.cpp:490 src/tags.cpp:538
+msgid "Transfer Function"
+msgstr ""
+
+#: src/properties.cpp:490
+msgid ""
+"TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
+"with 3 * 256 entries."
+msgstr ""
+
+#: src/properties.cpp:492 src/tags.cpp:570
+msgid "White Point"
+msgstr ""
+
+#: src/properties.cpp:492
+msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
+msgstr ""
+
+#: src/properties.cpp:493 src/tags.cpp:575
+msgid "Primary Chromaticities"
+msgstr ""
+
+#: src/properties.cpp:493
+msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
+msgstr ""
+
+#: src/properties.cpp:494
+msgid ""
+"TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
+msgstr ""
+
+#: src/properties.cpp:495
+msgid "Reference Black White"
+msgstr ""
+
+#: src/properties.cpp:495
+msgid "TIFF tag 532, 0x214. Reference black and white point values."
+msgstr ""
+
+#: src/properties.cpp:496 src/tags.cpp:550
+msgid "Date and Time"
+msgstr ""
+
+#: src/properties.cpp:496
+msgid ""
+"TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
+"and time of image creation (no time zone in EXIF), stored in ISO 8601 "
+"format, not the original EXIF format. This property includes the value for "
+"the EXIF SubSecTime attribute. NOTE: This property is stored in XMP as xmp:"
+"ModifyDate."
+msgstr ""
+
+#: src/properties.cpp:502 src/tags.cpp:463
+msgid "Image Description"
+msgstr ""
+
+#: src/properties.cpp:502
+msgid ""
+"TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
+"in XMP as dc:description."
+msgstr ""
+
+#: src/properties.cpp:503
+msgid "Make"
+msgstr ""
+
+#: src/properties.cpp:503
+msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
+msgstr ""
+
+#: src/properties.cpp:504
+msgid "TIFF tag 272, 0x110. Model name or number of equipment."
+msgstr ""
+
+#: src/properties.cpp:505
+msgid ""
+"TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
+"property is stored in XMP as xmp:CreatorTool. "
+msgstr ""
+
+#: src/properties.cpp:507
+msgid ""
+"TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
+"property is stored in XMP as the first item in the dc:creator array."
+msgstr ""
+
+#: src/properties.cpp:509
+msgid ""
+"TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
+"in XMP as dc:rights."
+msgstr ""
+
+#: src/properties.cpp:516 src/tags.cpp:1388
+msgid "Exif Version"
+msgstr ""
+
+#: src/properties.cpp:516
+msgid "EXIF tag 36864, 0x9000. EXIF version number."
+msgstr ""
+
+#: src/properties.cpp:517
+msgid "Flashpix Version"
+msgstr ""
+
+#: src/properties.cpp:517
+msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
+msgstr ""
+
+#: src/properties.cpp:518
+msgid "EXIF tag 40961, 0xA001. Color space information"
+msgstr ""
+
+#: src/properties.cpp:519 src/tags.cpp:1399
+msgid "Components Configuration"
+msgstr ""
+
+#: src/properties.cpp:519
+msgid ""
+"EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
+"compressed data), 1 2 3 0 (other cases)."
+msgstr ""
+
+#: src/properties.cpp:521 src/tags.cpp:823
+msgid "Compressed Bits Per Pixel"
+msgstr ""
+
+#: src/properties.cpp:521
+msgid ""
+"EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
+"indicated in unit bits per pixel."
+msgstr ""
+
+#: src/properties.cpp:523 src/tags.cpp:1483
+msgid "Pixel X Dimension"
+msgstr ""
+
+#: src/properties.cpp:523
+msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
+msgstr ""
+
+#: src/properties.cpp:524 src/tags.cpp:1490
+msgid "Pixel Y Dimension"
+msgstr ""
+
+#: src/properties.cpp:524
+msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
+msgstr ""
+
+#: src/properties.cpp:525 src/tags.cpp:1457
+msgid "User Comment"
+msgstr ""
+
+#: src/properties.cpp:525
+msgid "EXIF tag 37510, 0x9286. Comments from user."
+msgstr ""
+
+#: src/properties.cpp:526 src/tags.cpp:1499
+msgid "Related Sound File"
+msgstr ""
+
+#: src/properties.cpp:526
+msgid ""
+"EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
+msgstr ""
+
+#: src/properties.cpp:527
+msgid "Date and Time Original"
+msgstr ""
+
+#: src/properties.cpp:527
+msgid ""
+"EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
+"time when original image was generated, in ISO 8601 format. Includes the "
+"EXIF SubSecTimeOriginal data."
+msgstr ""
+
+#: src/properties.cpp:530
+msgid "Date and Time Digitized"
+msgstr ""
+
+#: src/properties.cpp:530
+msgid ""
+"EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
+"time when image was stored as digital data, can be the same as "
+"DateTimeOriginal if originally stored in digital form. Stored in ISO 8601 "
+"format. Includes the EXIF SubSecTimeDigitized data."
+msgstr ""
+
+#: src/properties.cpp:534
+msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
+msgstr ""
+
+#: src/properties.cpp:535
+msgid "F Number"
+msgstr ""
+
+#: src/properties.cpp:535
+msgid "EXIF tag 33437, 0x829D. F number."
+msgstr ""
+
+#: src/properties.cpp:536
+msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
+msgstr ""
+
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
+msgid "Spectral Sensitivity"
+msgstr ""
+
+#: src/properties.cpp:537
+msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
+msgstr ""
+
+#: src/properties.cpp:538
+msgid "ISOSpeedRatings"
+msgstr ""
+
+#: src/properties.cpp:538
+msgid ""
+"EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
+"specified in ISO 12232."
+msgstr ""
+
+#: src/properties.cpp:540 src/tags.cpp:812
+msgid "OECF"
+msgstr ""
+
+#: src/properties.cpp:540
+msgid ""
+"EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
+"ISO 14524."
+msgstr ""
+
+#: src/properties.cpp:541
+msgid ""
+"EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
+"specification."
+msgstr ""
+
+#: src/properties.cpp:542
+msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
+msgstr ""
+
+#: src/properties.cpp:543 src/tags.cpp:826
+msgid "Brightness Value"
+msgstr ""
+
+#: src/properties.cpp:543
+msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
+msgstr ""
+
+#: src/properties.cpp:544
+msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
+msgstr ""
+
+#: src/properties.cpp:545
+msgid "Maximum Aperture Value"
+msgstr ""
+
+#: src/properties.cpp:545
+msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
+msgstr ""
+
+#: src/properties.cpp:546
+msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
+msgstr ""
+
+#: src/properties.cpp:547
+msgid "EXIF tag 37383, 0x9207. Metering mode."
+msgstr ""
+
+#: src/properties.cpp:548
+msgid "EXIF tag 37384, 0x9208. Light source."
+msgstr ""
+
+#: src/properties.cpp:549
+msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
+msgstr ""
+
+#: src/properties.cpp:550
+msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
+msgstr ""
+
+#: src/properties.cpp:551 src/tags.cpp:1449
+msgid "Subject Area"
+msgstr ""
+
+#: src/properties.cpp:551
+msgid ""
+"EXIF tag 37396, 0x9214. The location and area of the main subject in the "
+"overall scene."
+msgstr ""
+
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
+msgid "Flash Energy"
+msgstr ""
+
+#: src/properties.cpp:552
+msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
+msgstr ""
+
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
+msgid "Spatial Frequency Response"
+msgstr ""
+
+#: src/properties.cpp:553
+msgid ""
+"EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
+"as specified in ISO 12233."
+msgstr ""
+
+#: src/properties.cpp:555 src/tags.cpp:837
+msgid "Focal Plane X Resolution"
+msgstr ""
+
+#: src/properties.cpp:555
+msgid ""
+"EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
+"unit."
+msgstr ""
+
+#: src/properties.cpp:556 src/tags.cpp:838
+msgid "Focal Plane Y Resolution"
+msgstr ""
+
+#: src/properties.cpp:556
+msgid ""
+"EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
+"unit."
+msgstr ""
+
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
+msgid "Focal Plane Resolution Unit"
+msgstr ""
+
+#: src/properties.cpp:557
+msgid ""
+"EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
+"FocalPlaneYResolution."
+msgstr ""
+
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
+msgid "Subject Location"
+msgstr ""
+
+#: src/properties.cpp:558
+msgid ""
+"EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
+"value is the horizontal pixel and the second value is the vertical pixel at "
+"which the main subject appears."
+msgstr ""
+
+#: src/properties.cpp:561 src/tags.cpp:844
+msgid "Exposure Index"
+msgstr ""
+
+#: src/properties.cpp:561
+msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
+msgstr ""
+
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
+msgid "Sensing Method"
+msgstr ""
+
+#: src/properties.cpp:562
+msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
+msgstr ""
+
+#: src/properties.cpp:563
+msgid "EXIF tag 41728, 0xA300. Indicates image source."
+msgstr ""
+
+#: src/properties.cpp:564 src/tags.cpp:1554
+msgid "Scene Type"
+msgstr ""
+
+#: src/properties.cpp:564
+msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
+msgstr ""
+
+#: src/properties.cpp:565 src/tags.cpp:759
+msgid "CFA Pattern"
+msgstr ""
+
+#: src/properties.cpp:565
+msgid ""
+"EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
+"sense."
+msgstr ""
+
+#: src/properties.cpp:566 src/tags.cpp:1564
+msgid "Custom Rendered"
+msgstr ""
+
+#: src/properties.cpp:566
+msgid ""
+"EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
+"data."
+msgstr ""
+
+#: src/properties.cpp:567
+msgid ""
+"EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
+"shot."
+msgstr ""
+
+#: src/properties.cpp:568
+msgid ""
+"EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
+"was shot."
+msgstr ""
+
+#: src/properties.cpp:569 src/tags.cpp:1578
+msgid "Digital Zoom Ratio"
+msgstr ""
+
+#: src/properties.cpp:569
+msgid ""
+"EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
+"shot."
+msgstr ""
+
+#: src/properties.cpp:570 src/tags.cpp:1583
+msgid "Focal Length In 35mm Film"
+msgstr ""
+
+#: src/properties.cpp:570
+msgid ""
+"EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
+"35mm film camera, in mm. A value of 0 means the focal length is unknown. "
+"Note that this tag differs from the FocalLength tag."
+msgstr ""
+
+#: src/properties.cpp:573 src/tags.cpp:1589
+msgid "Scene Capture Type"
+msgstr ""
+
+#: src/properties.cpp:573
+msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
+msgstr ""
+
+#: src/properties.cpp:574 src/tags.cpp:1594
+msgid "Gain Control"
+msgstr ""
+
+#: src/properties.cpp:574
+msgid ""
+"EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
+"adjustment."
+msgstr ""
+
+#: src/properties.cpp:575
+msgid ""
+"EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
+"applied by the camera."
+msgstr ""
+
+#: src/properties.cpp:576
+msgid ""
+"EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
+"applied by the camera."
+msgstr ""
+
+#: src/properties.cpp:577
+msgid ""
+"EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
+"applied by the camera."
+msgstr ""
+
+#: src/properties.cpp:578 src/tags.cpp:1609
+msgid "Device Setting Description"
+msgstr ""
+
+#: src/properties.cpp:578
+msgid ""
+"EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
+"conditions of a particular camera model."
+msgstr ""
+
+#: src/properties.cpp:579 src/tags.cpp:1614
+msgid "Subject Distance Range"
+msgstr ""
+
+#: src/properties.cpp:579
+msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
+msgstr ""
+
+#: src/properties.cpp:580 src/tags.cpp:1617
+msgid "Image Unique ID"
+msgstr ""
+
+#: src/properties.cpp:580
+msgid ""
+"EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
+"recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
+"and 128-bit fixed length."
+msgstr ""
+
+#: src/properties.cpp:582 src/tags.cpp:1691
+msgid "GPS Version ID"
+msgstr ""
+
+#: src/properties.cpp:582
+msgid ""
+"GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
+"period separators. The current value is \"2.0.0.0\"."
+msgstr ""
+
+#: src/properties.cpp:584 src/tags.cpp:1702
+msgid "GPS Latitude"
+msgstr ""
+
+#: src/properties.cpp:584
+msgid ""
+"GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
+msgstr ""
+
+#: src/properties.cpp:585 src/tags.cpp:1714
+msgid "GPS Longitude"
+msgstr ""
+
+#: src/properties.cpp:585
+msgid ""
+"GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
+msgstr ""
+
+#: src/properties.cpp:586 src/tags.cpp:1722
+msgid "GPS Altitude Reference"
+msgstr ""
+
+#: src/properties.cpp:586
+msgid ""
+"GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
+msgstr ""
+
+#: src/properties.cpp:587 src/tags.cpp:1730
+msgid "GPS Altitude"
+msgstr ""
+
+#: src/properties.cpp:587
+msgid "GPS tag 6, 0x06. Indicates altitude in meters."
+msgstr ""
+
+#: src/properties.cpp:588 src/tags.cpp:1734
+msgid "GPS Time Stamp"
+msgstr ""
+
+#: src/properties.cpp:588
+msgid ""
+"GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
+"data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
+"EXIF 2.2. The GPS timestamp in EXIF 2.1 does not include a date. If not "
+"present, the date component for the XMP should be taken from exif:"
+"DateTimeOriginal, or if that is also lacking from exif:DateTimeDigitized. If "
+"no date is available, do not write exif:GPSTimeStamp to XMP."
+msgstr ""
+
+#: src/properties.cpp:594 src/tags.cpp:1739
+msgid "GPS Satellites"
+msgstr ""
+
+#: src/properties.cpp:594
+msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
+msgstr ""
+
+#: src/properties.cpp:595 src/tags.cpp:1746
+msgid "GPS Status"
+msgstr ""
+
+#: src/properties.cpp:595
+msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
+msgstr ""
+
+#: src/properties.cpp:596 src/tags.cpp:1751
+msgid "GPS Measure Mode"
+msgstr ""
+
+#: src/properties.cpp:596
+msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
+msgstr ""
+
+#: src/properties.cpp:597
+msgid "GPS DOP"
+msgstr ""
+
+#: src/properties.cpp:597
+msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
+msgstr ""
+
+#: src/properties.cpp:598 src/tags.cpp:1759
+msgid "GPS Speed Reference"
+msgstr ""
+
+#: src/properties.cpp:598
+msgid "GPS tag 12, 0x0C. Units used to speed measurement."
+msgstr ""
+
+#: src/properties.cpp:599 src/tags.cpp:1763
+msgid "GPS Speed"
+msgstr ""
+
+#: src/properties.cpp:599
+msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
+msgstr ""
+
+#: src/properties.cpp:600
+msgid "GPS Track Reference"
+msgstr ""
+
+#: src/properties.cpp:600
+msgid "GPS tag 14, 0x0E. Reference for movement direction."
+msgstr ""
+
+#: src/properties.cpp:601 src/tags.cpp:1770
+msgid "GPS Track"
+msgstr ""
+
+#: src/properties.cpp:601
+msgid ""
+"GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
+msgstr ""
+
+#: src/properties.cpp:602 src/tags.cpp:1774
+msgid "GPS Image Direction Reference"
+msgstr ""
+
+#: src/properties.cpp:602
+msgid "GPS tag 16, 0x10. Reference for image direction."
+msgstr ""
+
+#: src/properties.cpp:603 src/tags.cpp:1778
+msgid "GPS Image Direction"
+msgstr ""
+
+#: src/properties.cpp:603
+msgid ""
+"GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
+"359.99."
+msgstr ""
+
+#: src/properties.cpp:604 src/tags.cpp:1782
+msgid "GPS Map Datum"
+msgstr ""
+
+#: src/properties.cpp:604
+msgid "GPS tag 18, 0x12. Geodetic survey data."
+msgstr ""
+
+#: src/properties.cpp:605 src/tags.cpp:1790
+msgid "GPS Destination Latitude"
+msgstr ""
+
+#: src/properties.cpp:605
+msgid ""
+"GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
+"destination latitude."
+msgstr ""
+
+#: src/properties.cpp:606 src/tags.cpp:1802
+msgid "GPS Destination Longitude"
+msgstr ""
+
+#: src/properties.cpp:606
+msgid ""
+"GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
+"longitude."
+msgstr ""
+
+#: src/properties.cpp:607 src/tags.cpp:1809
+msgid "GPS Destination Bearing Reference"
+msgstr ""
+
+#: src/properties.cpp:607
+msgid "GPS tag 23, 0x17. Reference for movement direction."
+msgstr ""
+
+#: src/properties.cpp:608 src/tags.cpp:1813
+msgid "GPS Destination Bearing"
+msgstr ""
+
+#: src/properties.cpp:608
+msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
+msgstr ""
+
+#: src/properties.cpp:609
+msgid "GPS Destination Distance Refefrence"
+msgstr ""
+
+#: src/properties.cpp:609
+msgid "GPS tag 25, 0x19. Units used for speed measurement."
+msgstr ""
+
+#: src/properties.cpp:610 src/tags.cpp:1821
+msgid "GPS Destination Distance"
+msgstr ""
+
+#: src/properties.cpp:610
+msgid "GPS tag 26, 0x1A. Distance to destination."
+msgstr ""
+
+#: src/properties.cpp:611 src/tags.cpp:1824
+msgid "GPS Processing Method"
+msgstr ""
+
+#: src/properties.cpp:611
+msgid ""
+"GPS tag 27, 0x1B. A character string recording the name of the method used "
+"for location finding."
+msgstr ""
+
+#: src/properties.cpp:612 src/tags.cpp:1829
+msgid "GPS Area Information"
+msgstr ""
+
+#: src/properties.cpp:612
+msgid ""
+"GPS tag 28, 0x1C. A character string recording the name of the GPS area."
+msgstr ""
+
+#: src/properties.cpp:613 src/tags.cpp:1837
+msgid "GPS Differential"
+msgstr ""
+
+#: src/properties.cpp:613
+msgid ""
+"GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
+"the GPS receiver."
+msgstr ""
+
+#: src/properties.cpp:619
+msgid ""
+"A description of the lens used to take the photograph. For example, \"70-200 "
+"mm f/2.8-4.0\"."
+msgstr ""
+
+#: src/properties.cpp:620
+msgid "SerialNumber"
+msgstr ""
+
+#: src/properties.cpp:620
+msgid ""
+"The serial number of the camera or camera body used to take the photograph."
+msgstr ""
+
+#: src/properties.cpp:626
+msgid "Contact Info-City"
+msgstr ""
+
+#: src/properties.cpp:626
+msgid "The contact information city part."
+msgstr ""
+
+#: src/properties.cpp:627
+msgid "Contact Info-Country"
+msgstr ""
+
+#: src/properties.cpp:627
+msgid "The contact information country part."
+msgstr ""
+
+#: src/properties.cpp:628
+msgid "Contact Info-Address"
+msgstr ""
+
+#: src/properties.cpp:628
+msgid ""
+"The contact information address part. Comprises an optional company name and "
+"all required information to locate the building or postbox to which mail "
+"should be sent."
+msgstr ""
+
+#: src/properties.cpp:630
+msgid "Contact Info-Postal Code"
+msgstr ""
+
+#: src/properties.cpp:630
+msgid "The contact information part denoting the local postal code."
+msgstr ""
+
+#: src/properties.cpp:631
+msgid "Contact Info-State/Province"
+msgstr ""
+
+#: src/properties.cpp:631
+msgid ""
+"The contact information part denoting regional information like state or "
+"province."
+msgstr ""
+
+#: src/properties.cpp:632
+msgid "Contact Info-Email"
+msgstr ""
+
+#: src/properties.cpp:632
+msgid "The contact information email address part."
+msgstr ""
+
+#: src/properties.cpp:633
+msgid "Contact Info-Phone"
+msgstr ""
+
+#: src/properties.cpp:633
+msgid "The contact information phone number part."
+msgstr ""
+
+#: src/properties.cpp:634
+msgid "Contact Info-Web URL"
+msgstr ""
+
+#: src/properties.cpp:634
+msgid "The contact information web address part."
+msgstr ""
+
+#: src/properties.cpp:635
+msgid ""
+"Code of the country the content is focussing on -- either the country shown "
+"in visual media or referenced in text or audio media. This element is at the "
+"top/first level of a top-down geographical hierarchy. The code should be "
+"taken from ISO 3166 two or three letter code. The full name of a country "
+"should go to the \"Country\" element."
+msgstr ""
+
+#: src/properties.cpp:639
+msgid "Creator's Contact Info"
+msgstr ""
+
+#: src/properties.cpp:639
+msgid ""
+"The creator's contact information provides all necessary information to get "
+"in contact with the creator of this news object and comprises a set of sub-"
+"properties for proper addressing."
+msgstr ""
+
+#: src/properties.cpp:641
+msgid "Intellectual Genre"
+msgstr ""
+
+#: src/properties.cpp:641
+msgid ""
+"Describes the nature, intellectual or journalistic characteristic of a news "
+"object, not specifically its content."
+msgstr ""
+
+#: src/properties.cpp:643
+msgid ""
+"Name of a location the content is focussing on -- either the location shown "
+"in visual media or referenced by text or audio media. This location name "
+"could either be the name of a sublocation to a city or the name of a well "
+"known location or (natural) monument outside a city. In the sense of a "
+"sublocation to a city this element is at the fourth level of a top-down "
+"geographical hierarchy."
+msgstr ""
+
+#: src/properties.cpp:648
+msgid "IPTC Scene"
+msgstr ""
+
+#: src/properties.cpp:648
+msgid ""
+"Describes the scene of a photo content. Specifies one or more terms from the "
+"IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
+"in an unordered list."
+msgstr ""
+
+#: src/properties.cpp:650
+msgid "IPTC Subject Code"
+msgstr ""
+
+#: src/properties.cpp:650
+msgid ""
+"Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
+"to categorize the content. Each Subject is represented as a string of 8 "
+"digits in an unordered list."
+msgstr ""
+
+#: src/properties.cpp:657
+msgid "Additional model info"
+msgstr ""
+
+#: src/properties.cpp:657
+msgid ""
+"Information about the ethnicity and other facts of the model(s) in a model-"
+"released image."
+msgstr ""
+
+#: src/properties.cpp:658
+msgid "Code of featured Organisation"
+msgstr ""
+
+#: src/properties.cpp:658
+msgid ""
+"Code from controlled vocabulary for identyfing the organisation or company "
+"which is featured in the image."
+msgstr ""
+
+#: src/properties.cpp:659
+msgid "Controlled Vocabulary Term"
+msgstr ""
+
+#: src/properties.cpp:659
+msgid ""
+"A term to describe the content of the image by a value from a Controlled "
+"Vocabulary."
+msgstr ""
+
+#: src/properties.cpp:660
+msgid "Model age"
+msgstr ""
+
+#: src/properties.cpp:660
+msgid ""
+"Age of the human model(s) at the time this image was taken in a model "
+"released image."
+msgstr ""
+
+#: src/properties.cpp:661
+msgid "Name of featured Organisation"
+msgstr ""
+
+#: src/properties.cpp:661
+msgid "Name of the organisation or company which is featured in the image."
+msgstr ""
+
+#: src/properties.cpp:662
+msgid "Person shown"
+msgstr ""
+
+#: src/properties.cpp:662
+msgid "Name of a person shown in the image."
+msgstr ""
+
+#: src/properties.cpp:663
+msgid "Digital Image Identifier"
+msgstr ""
+
+#: src/properties.cpp:663
+msgid ""
+"Globally unique identifier for this digital image. It is created and applied "
+"by the creator of the digital image at the time of its creation. this value "
+"shall not be changed after that time."
+msgstr ""
+
+#: src/properties.cpp:664
+msgid "Physical type of original photo"
+msgstr ""
+
+#: src/properties.cpp:664
+msgid "The type of the source digital file."
+msgstr ""
+
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
+msgid "Event"
+msgstr ""
+
+#: src/properties.cpp:665
+msgid "Names or describes the specific event at which the photo was taken."
+msgstr ""
+
+#: src/properties.cpp:666
+msgid "Maximum available height"
+msgstr ""
+
+#: src/properties.cpp:666
+msgid ""
+"The maximum available height in pixels of the original photo from which this "
+"photo has been derived by downsizing."
+msgstr ""
+
+#: src/properties.cpp:667
+msgid "Maximum available width"
+msgstr ""
+
+#: src/properties.cpp:667
+msgid ""
+"The maximum available width in pixels of the original photo from which this "
+"photo has been derived by downsizing."
+msgstr ""
+
+#: src/properties.cpp:668
+msgid "Registry Entry"
+msgstr ""
+
+#: src/properties.cpp:668
+msgid ""
+"Both a Registry Item Id and a Registry Organisation Id to record any "
+"registration of this digital image with a registry."
+msgstr ""
+
+#: src/properties.cpp:669
+msgid "Registry Entry-Item Identifier"
+msgstr ""
+
+#: src/properties.cpp:669
+msgid ""
+"A unique identifier created by a registry and applied by the creator of the "
+"digital image. This value shall not be changed after being applied. This "
+"identifier is linked to a corresponding Registry Organisation Identifier."
+msgstr ""
+
+#: src/properties.cpp:670
+msgid "Registry Entry-Organisation Identifier"
+msgstr ""
+
+#: src/properties.cpp:670
+msgid ""
+"An identifier for the registry which issued the corresponding Registry Image "
+"Id."
+msgstr ""
+
+#: src/properties.cpp:671
+msgid "IPTC Fields Last Edited"
+msgstr ""
+
+#: src/properties.cpp:671
+msgid ""
+"The date and optionally time when any of the IPTC photo metadata fields has "
+"been last edited."
+msgstr ""
+
+#: src/properties.cpp:672
+msgid "Location shown"
+msgstr ""
+
+#: src/properties.cpp:672
+msgid "A location shown in the image."
+msgstr ""
+
+#: src/properties.cpp:673
+msgid "Location Created"
+msgstr ""
+
+#: src/properties.cpp:673
+msgid "The location the photo was taken."
+msgstr ""
+
+#: src/properties.cpp:674
+msgid "Location-City"
+msgstr ""
+
+#: src/properties.cpp:674
+msgid "Name of the city of a location."
+msgstr ""
+
+#: src/properties.cpp:675
+msgid "Location-Country ISO-Code"
+msgstr ""
+
+#: src/properties.cpp:675
+msgid "The ISO code of a country of a location."
+msgstr ""
+
+#: src/properties.cpp:676
+msgid "Location-Country Name"
+msgstr ""
+
+#: src/properties.cpp:676
+msgid "The name of a country of a location."
+msgstr ""
+
+#: src/properties.cpp:677
+msgid "Location-Province/State"
+msgstr ""
+
+#: src/properties.cpp:677
+msgid ""
+"The name of a subregion of a country - a province or state - of a location."
+msgstr ""
+
+#: src/properties.cpp:678
+msgid "Location-Sublocation"
+msgstr ""
+
+#: src/properties.cpp:678
+msgid ""
+"Name of a sublocation. This sublocation name could either be the name of a "
+"sublocation to a city or the name of a well known location or (natural) "
+"monument outside a city."
+msgstr ""
+
+#: src/properties.cpp:679
+msgid "Location-World Region"
+msgstr ""
+
+#: src/properties.cpp:679
+msgid "The name of a world region of a location."
+msgstr ""
+
+#: src/properties.cpp:680
+msgid "Artwork or object in the image"
+msgstr ""
+
+#: src/properties.cpp:680
+msgid "A set of metadata about artwork or an object in the image."
+msgstr ""
+
+#: src/properties.cpp:681
+msgid "Artwork or object-Copyright notice"
+msgstr ""
+
+#: src/properties.cpp:681
+msgid ""
+"Contains any necessary copyright notice for claiming the intellectual "
+"property for artwork or an object in the image and should identify the "
+"current owner of the copyright of this work with associated intellectual "
+"property rights."
+msgstr ""
+
+#: src/properties.cpp:682
+msgid "Artwork or object-Creator"
+msgstr ""
+
+#: src/properties.cpp:682
+msgid ""
+"Contains the name of the artist who has created artwork or an object in the "
+"image. In cases where the artist could or should not be identified the name "
+"of a company or organisation may be appropriate."
+msgstr ""
+
+#: src/properties.cpp:683
+msgid "Artwork or object-Date Created"
+msgstr ""
+
+#: src/properties.cpp:683
+msgid ""
+"Designates the date and optionally the time the artwork or object in the "
+"image was created. This relates to artwork or objects with associated "
+"intellectual property rights."
+msgstr ""
+
+#: src/properties.cpp:684
+msgid "Artwork or object-Source"
+msgstr ""
+
+#: src/properties.cpp:684
+msgid ""
+"The organisation or body holding and registering the artwork or object in "
+"the image for inventory purposes."
+msgstr ""
+
+#: src/properties.cpp:685
+msgid "Artwork or object-Source inventory number"
+msgstr ""
+
+#: src/properties.cpp:685
+msgid ""
+"The inventory number issued by the organisation or body holding and "
+"registering the artwork or object in the image."
+msgstr ""
+
+#: src/properties.cpp:686
+msgid "Artwork or object-Title"
+msgstr ""
+
+#: src/properties.cpp:686
+msgid "A reference for the artwork or object in the image."
+msgstr ""
+
+#: src/properties.cpp:693
+msgid "Scan from film"
+msgstr ""
+
+#: src/properties.cpp:694
+msgid "Scan from transparency (including slide)"
+msgstr ""
+
+#: src/properties.cpp:695
+msgid "Scan from print"
+msgstr ""
+
+#: src/properties.cpp:696
+msgid "Camera RAW"
+msgstr ""
+
+#: src/properties.cpp:697
+msgid "Camera TIFF"
+msgstr ""
+
+#: src/properties.cpp:698
+msgid "Camera JPEG"
+msgstr ""
+
+#: src/properties.cpp:703
+msgid "PLUS Version"
+msgstr ""
+
+#: src/properties.cpp:703
+msgid ""
+"The version number of the PLUS standards in place at the time of the "
+"transaction."
+msgstr ""
+
+#: src/properties.cpp:704
+msgid "Licensee"
+msgstr ""
+
+#: src/properties.cpp:704
+msgid ""
+"Party or parties to whom the license is granted by the Licensor/s under the "
+"license transaction."
+msgstr ""
+
+#: src/properties.cpp:705
+msgid "Licensee ID"
+msgstr ""
+
+#: src/properties.cpp:705
+msgid "Optional PLUS-ID identifying each Licensee."
+msgstr ""
+
+#: src/properties.cpp:706
+msgid "Licensee Name"
+msgstr ""
+
+#: src/properties.cpp:706
+msgid "Name of each Licensee."
+msgstr ""
+
+#: src/properties.cpp:707
+msgid "End User"
+msgstr ""
+
+#: src/properties.cpp:707
+msgid "Party or parties ultimately making use of the image under the license."
+msgstr ""
+
+#: src/properties.cpp:708
+msgid "End User ID"
+msgstr ""
+
+#: src/properties.cpp:708
+msgid "Optional PLUS-ID identifying each End User."
+msgstr ""
+
+#: src/properties.cpp:709
+msgid "End User Name"
+msgstr ""
+
+#: src/properties.cpp:709
+msgid "Name of each End User."
+msgstr ""
+
+#: src/properties.cpp:710
+msgid "Licensor"
+msgstr ""
+
+#: src/properties.cpp:710
+msgid "Party or parties granting the license to the Licensee."
+msgstr ""
+
+#: src/properties.cpp:711
+msgid "Licensor ID"
+msgstr ""
+
+#: src/properties.cpp:711
+msgid "Optional PLUS-ID identifying each Licensor."
+msgstr ""
+
+#: src/properties.cpp:712
+msgid "Licensor Name"
+msgstr ""
+
+#: src/properties.cpp:712
+msgid "Name of each Licensor."
+msgstr ""
+
+#: src/properties.cpp:713
+msgid "Licensor Address"
+msgstr ""
+
+#: src/properties.cpp:713
+msgid "Licensor street address."
+msgstr ""
+
+#: src/properties.cpp:714
+msgid "Licensor Address Detail"
+msgstr ""
+
+#: src/properties.cpp:714
+msgid "Additional Licensor mailing address details."
+msgstr ""
+
+#: src/properties.cpp:715
+msgid "Licensor City"
+msgstr ""
+
+#: src/properties.cpp:715
+msgid "Licensor City name."
+msgstr ""
+
+#: src/properties.cpp:716
+msgid "Licensor State or Province"
+msgstr ""
+
+#: src/properties.cpp:716
+msgid "Licensor State or Province name."
+msgstr ""
+
+#: src/properties.cpp:717
+msgid "Licensor Postal Code"
+msgstr ""
+
+#: src/properties.cpp:717
+msgid "Licensor Postal Code or Zip Code."
+msgstr ""
+
+#: src/properties.cpp:718
+msgid "Licensor Country"
+msgstr ""
+
+#: src/properties.cpp:718
+msgid "Licensor Country name."
+msgstr ""
+
+#: src/properties.cpp:719
+msgid "Licensor Telephone Type 1"
+msgstr ""
+
+#: src/properties.cpp:719
+msgid "Licensor Telephone Type 1."
+msgstr ""
+
+#: src/properties.cpp:720
+msgid "Licensor Telephone 1"
+msgstr ""
+
+#: src/properties.cpp:720
+msgid "Licensor Telephone number 1."
+msgstr ""
+
+#: src/properties.cpp:721
+msgid "Licensor Telephone Type 2"
+msgstr ""
+
+#: src/properties.cpp:721
+msgid "Licensor Telephone Type 2."
+msgstr ""
+
+#: src/properties.cpp:722
+msgid "Licensor Telephone 2"
+msgstr ""
+
+#: src/properties.cpp:722
+msgid "Licensor Telephone number 2."
+msgstr ""
+
+#: src/properties.cpp:723
+msgid "Licensor Email"
 msgstr ""
 
-#: src/properties.cpp:659
-msgid "The ISO code of a country of a location."
+#: src/properties.cpp:723
+msgid "Licensor Email address."
 msgstr ""
 
-#: src/properties.cpp:660
-msgid "Location-Country Name"
+#: src/properties.cpp:724
+msgid "Licensor URL"
 msgstr ""
 
-#: src/properties.cpp:660
-msgid "The name of a country of a location."
+#: src/properties.cpp:724
+msgid "Licensor world wide web address."
 msgstr ""
 
-#: src/properties.cpp:661
-msgid "Location-Province/State"
+#: src/properties.cpp:725
+msgid "Licensor Notes"
 msgstr ""
 
-#: src/properties.cpp:661
+#: src/properties.cpp:725
 msgid ""
-"The name of a subregion of a country - a province or state - of a location."
+"Supplemental information for use in identifying and contacting the Licensor/"
+"s."
 msgstr ""
 
-#: src/properties.cpp:662
-msgid "Location-Sublocation"
+#: src/properties.cpp:726
+msgid "PLUS Media Summary Code"
 msgstr ""
 
-#: src/properties.cpp:662
+#: src/properties.cpp:726
 msgid ""
-"Name of a sublocation. This sublocation name could either be the name of a "
-"sublocation to a city or the name of a well known location or (natural) "
-"monument outside a city."
+"A PLUS-standardized alphanumeric code string summarizing the media usages "
+"included in the license."
 msgstr ""
 
-#: src/properties.cpp:663
-msgid "Location-World Region"
+#: src/properties.cpp:727
+msgid "License Start Date"
 msgstr ""
 
-#: src/properties.cpp:663
-msgid "The name of a world region of a location."
+#: src/properties.cpp:727
+msgid "The date on which the license takes effect."
 msgstr ""
 
-#: src/properties.cpp:664
-msgid "Artwork or object in the image"
+#: src/properties.cpp:728
+msgid "License End Date"
 msgstr ""
 
-#: src/properties.cpp:664
-msgid "A set of metadata about artwork or an object in the image."
+#: src/properties.cpp:728
+msgid "The date on which the license expires."
 msgstr ""
 
-#: src/properties.cpp:665
-msgid "Artwork or object-Copyright notice"
+#: src/properties.cpp:729
+msgid "Media Constraints"
 msgstr ""
 
-#: src/properties.cpp:665
+#: src/properties.cpp:729
 msgid ""
-"Contains any necessary copyright notice for claiming the intellectual "
-"property for artwork or an object in the image and should identify the "
-"current owner of the copyright of this work with associated intellectual "
-"property rights."
+"Constraints limiting the scope of PLUS Media Usage/s included in the license "
+"to particular named media or to media not yet specifically defined in the "
+"PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:666
-msgid "Artwork or object-Creator"
+#: src/properties.cpp:730
+msgid "Region Constraints"
 msgstr ""
 
-#: src/properties.cpp:666
+#: src/properties.cpp:730
 msgid ""
-"Contains the name of the artist who has created artwork or an object in the "
-"image. In cases where the artist could or should not be identified the name "
-"of a company or organisation may be appropriate."
+"Constraints limiting the scope of geographic distribution to specific "
+"cities, states, provinces or other areas to be included in or excluded from "
+"the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:667
-msgid "Artwork or object-Date Created"
+#: src/properties.cpp:731
+msgid "Product or Service Constraints"
 msgstr ""
 
-#: src/properties.cpp:667
+#: src/properties.cpp:731
 msgid ""
-"Designates the date and optionally the time the artwork or object in the "
-"image was created. This relates to artwork or objects with associated "
-"intellectual property rights."
+"Constraints limiting usage of the image to promotion of/association with a "
+"named product or service."
 msgstr ""
 
-#: src/properties.cpp:668
-msgid "Artwork or object-Source"
+#: src/properties.cpp:732
+msgid "Image File Constraints"
 msgstr ""
 
-#: src/properties.cpp:668
+#: src/properties.cpp:732
 msgid ""
-"The organisation or body holding and registering the artwork or object in "
-"the image for inventory purposes."
+"Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:669
-msgid "Artwork or object-Source inventory number"
+#: src/properties.cpp:733
+msgid "Image Alteration Constraints"
 msgstr ""
 
-#: src/properties.cpp:669
+#: src/properties.cpp:733
 msgid ""
-"The inventory number issued by the organisation or body holding and "
-"registering the artwork or object in the image."
+"Constraints on alteration of the image by cropping, flipping, retouching, "
+"colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:670
-msgid "Artwork or object-Title"
+#: src/properties.cpp:734
+msgid "Image Duplication Constraints"
 msgstr ""
 
-#: src/properties.cpp:670
-msgid "A reference for the artwork or object in the image."
+#: src/properties.cpp:734
+msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:677
-msgid "Scan from film"
+#: src/properties.cpp:735
+msgid "Model Release Status"
 msgstr ""
 
-#: src/properties.cpp:678
-msgid "Scan from transparency (including slide)"
+#: src/properties.cpp:735
+msgid ""
+"Summarizes the availability and scope of model releases authorizing usage of "
+"the likenesses of persons appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:679
-msgid "Scan from print"
+#: src/properties.cpp:736
+msgid "Model Release ID"
 msgstr ""
 
-#: src/properties.cpp:680
-msgid "Camera RAW"
+#: src/properties.cpp:736
+msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:681
-msgid "Camera TIFF"
+#: src/properties.cpp:737
+msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:682
-msgid "Camera JPEG"
+#: src/properties.cpp:737
+msgid ""
+"Age of the youngest model pictured in the image, at the time that the image "
+"was made."
 msgstr ""
 
-#: src/properties.cpp:687
-msgid "PLUS Version"
+#: src/properties.cpp:738
+msgid "Property Release Status"
 msgstr ""
 
-#: src/properties.cpp:687
+#: src/properties.cpp:738
 msgid ""
-"The version number of the PLUS standards in place at the time of the "
-"transaction."
+"Summarizes the availability and scope of property releases authorizing usage "
+"of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:688
-msgid "Licensee"
+#: src/properties.cpp:739
+msgid "Property Release ID"
 msgstr ""
 
-#: src/properties.cpp:688
-msgid ""
-"Party or parties to whom the license is granted by the Licensor/s under the "
-"license transaction."
+#: src/properties.cpp:739
+msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:689
-msgid "Licensee ID"
+#: src/properties.cpp:740
+msgid "Other Constraints"
 msgstr ""
 
-#: src/properties.cpp:689
-msgid "Optional PLUS-ID identifying each Licensee."
+#: src/properties.cpp:740
+msgid "Additional constraints on the license."
 msgstr ""
 
-#: src/properties.cpp:690
-msgid "Licensee Name"
+#: src/properties.cpp:741
+msgid "Credit Line Required"
 msgstr ""
 
-#: src/properties.cpp:690
-msgid "Name of each Licensee."
+#: src/properties.cpp:741
+msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:691
-msgid "End User"
+#: src/properties.cpp:742
+msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:691
-msgid "Party or parties ultimately making use of the image under the license."
+#: src/properties.cpp:742
+msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:692
-msgid "End User ID"
+#: src/properties.cpp:743
+msgid "Other License Requirements"
 msgstr ""
 
-#: src/properties.cpp:692
-msgid "Optional PLUS-ID identifying each End User."
+#: src/properties.cpp:743
+msgid "Additional license requirements."
 msgstr ""
 
-#: src/properties.cpp:693
-msgid "End User Name"
+#: src/properties.cpp:744
+msgid "Terms and Conditions Text"
 msgstr ""
 
-#: src/properties.cpp:693
-msgid "Name of each End User."
+#: src/properties.cpp:744
+msgid "Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:694
-msgid "Licensor"
+#: src/properties.cpp:745
+msgid "Terms and Conditions URL"
 msgstr ""
 
-#: src/properties.cpp:694
-msgid "Party or parties granting the license to the Licensee."
+#: src/properties.cpp:745
+msgid "URL for Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:695
-msgid "Licensor ID"
+#: src/properties.cpp:746
+msgid "Other License Conditions"
 msgstr ""
 
-#: src/properties.cpp:695
-msgid "Optional PLUS-ID identifying each Licensor."
+#: src/properties.cpp:746
+msgid "Additional license conditions."
 msgstr ""
 
-#: src/properties.cpp:696
-msgid "Licensor Name"
+#: src/properties.cpp:747
+msgid "Identifies the type of image delivered."
 msgstr ""
 
-#: src/properties.cpp:696
-msgid "Name of each Licensor."
+#: src/properties.cpp:748
+msgid "Licensor Image ID"
 msgstr ""
 
-#: src/properties.cpp:697
-msgid "Licensor Address"
+#: src/properties.cpp:748
+msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:697
-msgid "Licensor street address."
+#: src/properties.cpp:749
+msgid "Image File Name As Delivered"
 msgstr ""
 
-#: src/properties.cpp:698
-msgid "Licensor Address Detail"
+#: src/properties.cpp:749
+msgid ""
+"Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:698
-msgid "Additional Licensor mailing address details."
+#: src/properties.cpp:750
+msgid "Image File Format As Delivered"
 msgstr ""
 
-#: src/properties.cpp:699
-msgid "Licensor City"
+#: src/properties.cpp:750
+msgid ""
+"File format of the image file delivered to the Licensee for use under the "
+"license."
 msgstr ""
 
-#: src/properties.cpp:699
-msgid "Licensor City name."
+#: src/properties.cpp:751
+msgid "Image File Size As Delivered"
+msgstr ""
+
+#: src/properties.cpp:751
+msgid "Size of the image file delivered to the Licensee."
+msgstr ""
+
+#: src/properties.cpp:752
+msgid "Copyright Status"
+msgstr ""
+
+#: src/properties.cpp:752
+msgid "Copyright status of the image."
+msgstr ""
+
+#: src/properties.cpp:753
+msgid "Copyright Registration Number"
+msgstr ""
+
+#: src/properties.cpp:753
+msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:700
-msgid "Licensor State or Province"
+#: src/properties.cpp:754
+msgid "First Publication Date"
 msgstr ""
 
-#: src/properties.cpp:700
-msgid "Licensor State or Province name."
+#: src/properties.cpp:754
+msgid "The date on which the image was first published."
 msgstr ""
 
-#: src/properties.cpp:701
-msgid "Licensor Postal Code"
+#: src/properties.cpp:755
+msgid "Copyright Owner"
 msgstr ""
 
-#: src/properties.cpp:701
-msgid "Licensor Postal Code or Zip Code."
+#: src/properties.cpp:755
+msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:702
-msgid "Licensor Country"
+#: src/properties.cpp:756
+msgid "Copyright Owner ID"
 msgstr ""
 
-#: src/properties.cpp:702
-msgid "Licensor Country name."
+#: src/properties.cpp:756
+msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:703
-msgid "Licensor Telephone Type 1"
+#: src/properties.cpp:757
+msgid "Copyright Owner Name"
 msgstr ""
 
-#: src/properties.cpp:703
-msgid "Licensor Telephone Type 1."
+#: src/properties.cpp:757
+msgid "Name of Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:704
-msgid "Licensor Telephone 1"
+#: src/properties.cpp:758
+msgid "Copyright Owner Image ID"
 msgstr ""
 
-#: src/properties.cpp:704
-msgid "Licensor Telephone number 1."
+#: src/properties.cpp:758
+msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:705
-msgid "Licensor Telephone Type 2"
+#: src/properties.cpp:759
+msgid "Image Creator"
 msgstr ""
 
-#: src/properties.cpp:705
-msgid "Licensor Telephone Type 2."
+#: src/properties.cpp:759
+msgid "Creator/s of the image."
 msgstr ""
 
-#: src/properties.cpp:706
-msgid "Licensor Telephone 2"
+#: src/properties.cpp:760
+msgid "Image Creator ID"
 msgstr ""
 
-#: src/properties.cpp:706
-msgid "Licensor Telephone number 2."
+#: src/properties.cpp:760
+msgid "Optional PLUS-ID identifying each Image Creator."
 msgstr ""
 
-#: src/properties.cpp:707
-msgid "Licensor Email"
+#: src/properties.cpp:761
+msgid "Image Creator Name"
 msgstr ""
 
-#: src/properties.cpp:707
-msgid "Licensor Email address."
+#: src/properties.cpp:761
+msgid "Name of Image Creator."
 msgstr ""
 
-#: src/properties.cpp:708
-msgid "Licensor URL"
+#: src/properties.cpp:762
+msgid "Image Creator Image ID"
 msgstr ""
 
-#: src/properties.cpp:708
-msgid "Licensor world wide web address."
+#: src/properties.cpp:762
+msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:709
-msgid "Licensor Notes"
+#: src/properties.cpp:763
+msgid "Image Supplier ID"
 msgstr ""
 
-#: src/properties.cpp:709
-msgid ""
-"Supplemental information for use in identifying and contacting the Licensor/"
-"s."
+#: src/properties.cpp:763
+msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:710
-msgid "PLUS Media Summary Code"
+#: src/properties.cpp:764
+msgid "Image Supplier Name"
 msgstr ""
 
-#: src/properties.cpp:710
-msgid ""
-"A PLUS-standardized alphanumeric code string summarizing the media usages "
-"included in the license."
+#: src/properties.cpp:764
+msgid "Name of Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:711
-msgid "License Start Date"
+#: src/properties.cpp:765
+msgid "Image Supplier Image ID"
 msgstr ""
 
-#: src/properties.cpp:711
-msgid "The date on which the license takes effect."
+#: src/properties.cpp:765
+msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:712
-msgid "License End Date"
+#: src/properties.cpp:766
+msgid "Licensee Image ID"
 msgstr ""
 
-#: src/properties.cpp:712
-msgid "The date on which the license expires."
+#: src/properties.cpp:766
+msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:713
-msgid "Media Constraints"
+#: src/properties.cpp:767
+msgid "Licensee Image Notes"
 msgstr ""
 
-#: src/properties.cpp:713
-msgid ""
-"Constraints limiting the scope of PLUS Media Usage/s included in the license "
-"to particular named media or to media not yet specifically defined in the "
-"PLUS Media Matrix."
+#: src/properties.cpp:767
+msgid "Notes added by Licensee."
 msgstr ""
 
-#: src/properties.cpp:714
-msgid "Region Constraints"
+#: src/properties.cpp:768
+msgid "Other Image Info"
 msgstr ""
 
-#: src/properties.cpp:714
-msgid ""
-"Constraints limiting the scope of geographic distribution to specific "
-"cities, states, provinces or other areas to be included in or excluded from "
-"the PLUS Regions specified in the Media Usages specified in the license."
+#: src/properties.cpp:768
+msgid "Additional image information."
 msgstr ""
 
-#: src/properties.cpp:715
-msgid "Product or Service Constraints"
+#: src/properties.cpp:769
+msgid "License ID"
 msgstr ""
 
-#: src/properties.cpp:715
-msgid ""
-"Constraints limiting usage of the image to promotion of/association with a "
-"named product or service."
+#: src/properties.cpp:769
+msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:716
-msgid "Image File Constraints"
+#: src/properties.cpp:770
+msgid "Licensor Transaction ID"
 msgstr ""
 
-#: src/properties.cpp:716
+#: src/properties.cpp:770
 msgid ""
-"Constraints on the changing of the image file name, metadata or file type."
+"Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:717
-msgid "Image Alteration Constraints"
+#: src/properties.cpp:771
+msgid "Licensee Transaction ID"
 msgstr ""
 
-#: src/properties.cpp:717
+#: src/properties.cpp:771
 msgid ""
-"Constraints on alteration of the image by cropping, flipping, retouching, "
-"colorization, de-colorization or merging."
+"Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:718
-msgid "Image Duplication Constraints"
+#: src/properties.cpp:772
+msgid "Licensee Project Reference"
 msgstr ""
 
-#: src/properties.cpp:718
-msgid "Constraints on the creation of duplicates of the image."
+#: src/properties.cpp:772
+msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:719
-msgid "Model Release Status"
+#: src/properties.cpp:773
+msgid "License Transaction Date"
 msgstr ""
 
-#: src/properties.cpp:719
-msgid ""
-"Summarizes the availability and scope of model releases authorizing usage of "
-"the likenesses of persons appearing in the photograph."
+#: src/properties.cpp:773
+msgid "The date of the License Transaction."
 msgstr ""
 
-#: src/properties.cpp:720
-msgid "Model Release ID"
+#: src/properties.cpp:774
+msgid "Reuse"
 msgstr ""
 
-#: src/properties.cpp:720
-msgid "Optional identifier associated with each Model Release."
+#: src/properties.cpp:774
+msgid ""
+"Indicates whether a license is a repeat or an initial license.  Reuse may "
+"require that licenses stored in files previously delivered to the customer "
+"be updated."
 msgstr ""
 
-#: src/properties.cpp:721
-msgid "Minor Model Age Disclosure"
+#: src/properties.cpp:775
+msgid "Other License Documents"
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:775
 msgid ""
-"Age of the youngest model pictured in the image, at the time that the image "
-"was made."
+"Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:722
-msgid "Property Release Status"
+#: src/properties.cpp:776
+msgid "Other License Info"
 msgstr ""
 
-#: src/properties.cpp:722
-msgid ""
-"Summarizes the availability and scope of property releases authorizing usage "
-"of the properties appearing in the photograph."
+#: src/properties.cpp:776
+msgid "Additional license information."
 msgstr ""
 
-#: src/properties.cpp:723
-msgid "Property Release ID"
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
+msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:723
-msgid "Optional identifier associated with each Property Release."
+#: src/properties.cpp:780
+msgid "Custom 4"
 msgstr ""
 
-#: src/properties.cpp:724
-msgid "Other Constraints"
+#: src/properties.cpp:781
+msgid "Custom 5"
 msgstr ""
 
-#: src/properties.cpp:724
-msgid "Additional constraints on the license."
+#: src/properties.cpp:782
+msgid "Custom 6"
 msgstr ""
 
-#: src/properties.cpp:725
-msgid "Credit Line Required"
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
+msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:725
-msgid "Attribution requirements, if any."
+#: src/properties.cpp:783
+msgid "Custom 7"
 msgstr ""
 
-#: src/properties.cpp:726
-msgid "Adult Content Warning"
+#: src/properties.cpp:784
+msgid "Custom 8"
 msgstr ""
 
-#: src/properties.cpp:726
-msgid "Warning indicating the presence of content not suitable for minors."
+#: src/properties.cpp:785
+msgid "Custom 9"
 msgstr ""
 
-#: src/properties.cpp:727
-msgid "Other License Requirements"
+#: src/properties.cpp:786
+msgid "Custom 10"
 msgstr ""
 
-#: src/properties.cpp:727
-msgid "Additional license requirements."
+#: src/properties.cpp:793
+msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:728
-msgid "Terms and Conditions Text"
+#: src/properties.cpp:794
+msgid "Not Required"
 msgstr ""
 
-#: src/properties.cpp:728
-msgid "Terms and Conditions applying to the license."
+#: src/properties.cpp:800
+msgid "Protected"
 msgstr ""
 
-#: src/properties.cpp:729
-msgid "Terms and Conditions URL"
+#: src/properties.cpp:801
+msgid "Public Domain"
 msgstr ""
 
-#: src/properties.cpp:729
-msgid "URL for Terms and Conditions applying to the license."
+#: src/properties.cpp:807
+msgid "Credit Adjacent To Image"
 msgstr ""
 
-#: src/properties.cpp:730
-msgid "Other License Conditions"
+#: src/properties.cpp:808
+msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:730
-msgid "Additional license conditions."
+#: src/properties.cpp:809
+msgid "Credit on Image"
 msgstr ""
 
-#: src/properties.cpp:731
-msgid "Identifies the type of image delivered."
+#: src/properties.cpp:810
+msgid "Not Require"
 msgstr ""
 
-#: src/properties.cpp:732
-msgid "Licensor Image ID"
+#: src/properties.cpp:815
+msgid "No Colorization"
 msgstr ""
 
-#: src/properties.cpp:732
-msgid "Optional identifier assigned by the Licensor to the image."
+#: src/properties.cpp:816
+msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:733
-msgid "Image File Name As Delivered"
+#: src/properties.cpp:817
+msgid "No De-Colorization"
 msgstr ""
 
-#: src/properties.cpp:733
-msgid ""
-"Name of the image file delivered to the Licensee for use under the license."
+#: src/properties.cpp:818
+msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:734
-msgid "Image File Format As Delivered"
+#: src/properties.cpp:819
+msgid "No Merging"
 msgstr ""
 
-#: src/properties.cpp:734
-msgid ""
-"File format of the image file delivered to the Licensee for use under the "
-"license."
+#: src/properties.cpp:820
+msgid "No Retouching"
 msgstr ""
 
-#: src/properties.cpp:735
-msgid "Image File Size As Delivered"
+#: src/properties.cpp:825
+msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:735
-msgid "Size of the image file delivered to the Licensee."
+#: src/properties.cpp:826
+msgid "No Duplication Constraints"
 msgstr ""
 
-#: src/properties.cpp:736
-msgid "Copyright Status"
+#: src/properties.cpp:827
+msgid "No Duplication"
 msgstr ""
 
-#: src/properties.cpp:736
-msgid "Copyright status of the image."
+#: src/properties.cpp:832
+msgid "Maintain File Name"
 msgstr ""
 
-#: src/properties.cpp:737
-msgid "Copyright Registration Number"
+#: src/properties.cpp:833
+msgid "Maintain File Type"
 msgstr ""
 
-#: src/properties.cpp:737
-msgid "Copyright Registration Number, if any, applying to the licensed image."
+#: src/properties.cpp:834
+msgid "Maintain ID in File Name"
 msgstr ""
 
-#: src/properties.cpp:738
-msgid "First Publication Date"
+#: src/properties.cpp:835
+msgid "Maintain Metadata"
 msgstr ""
 
-#: src/properties.cpp:738
-msgid "The date on which the image was first published."
+#: src/properties.cpp:840
+msgid "Windows Bitmap (BMP)"
 msgstr ""
 
-#: src/properties.cpp:739
-msgid "Copyright Owner"
+#: src/properties.cpp:841
+msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:739
-msgid "Owner or owners of the copyright in the licensed image."
+#: src/properties.cpp:842
+msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
-#: src/properties.cpp:740
-msgid "Copyright Owner ID"
+#: src/properties.cpp:843
+msgid "Graphics Interchange Format (GIF)"
 msgstr ""
 
-#: src/properties.cpp:740
-msgid "Optional PLUS-ID identifying each Copyright Owner."
+#: src/properties.cpp:844
+msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
 msgstr ""
 
-#: src/properties.cpp:741
-msgid "Copyright Owner Name"
+#: src/properties.cpp:846
+msgid "Macintosh Picture (PICT)"
 msgstr ""
 
-#: src/properties.cpp:741
-msgid "Name of Copyright Owner."
+#: src/properties.cpp:847
+msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:742
-msgid "Copyright Owner Image ID"
+#: src/properties.cpp:848
+msgid "Photoshop Document (PSD)"
 msgstr ""
 
-#: src/properties.cpp:742
-msgid "Optional identifier assigned by the Copyright Owner to the image."
+#: src/properties.cpp:849
+msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:743
-msgid "Image Creator"
+#: src/properties.cpp:850
+msgid "Tagged Image File Format (TIFF)"
 msgstr ""
 
-#: src/properties.cpp:743
-msgid "Creator/s of the image."
+#: src/properties.cpp:851
+msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:744
-msgid "Image Creator ID"
+#: src/properties.cpp:856
+msgid "Greater than 50 MB"
 msgstr ""
 
-#: src/properties.cpp:744
-msgid "Optional PLUS-ID identifying each Image Creator."
+#: src/properties.cpp:857
+msgid "Up to 1 MB"
 msgstr ""
 
-#: src/properties.cpp:745
-msgid "Image Creator Name"
+#: src/properties.cpp:858
+msgid "Up to 10 MB"
 msgstr ""
 
-#: src/properties.cpp:745
-msgid "Name of Image Creator."
+#: src/properties.cpp:859
+msgid "Up to 30 MB"
 msgstr ""
 
-#: src/properties.cpp:746
-msgid "Image Creator Image ID"
+#: src/properties.cpp:860
+msgid "Up to 50 MB"
 msgstr ""
 
-#: src/properties.cpp:746
-msgid "Optional identifier assigned by the Image Creator to the image."
+#: src/properties.cpp:865
+msgid "Illustrated Image"
 msgstr ""
 
-#: src/properties.cpp:747
-msgid "Image Supplier ID"
+#: src/properties.cpp:866
+msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:747
-msgid "Optional PLUS-ID identifying the Image Supplier."
+#: src/properties.cpp:868
+msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:748
-msgid "Image Supplier Name"
+#: src/properties.cpp:874
+msgid "Cell"
 msgstr ""
 
-#: src/properties.cpp:748
-msgid "Name of Image Supplier."
+#: src/properties.cpp:875
+msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:749
-msgid "Image Supplier Image ID"
+#: src/properties.cpp:877
+msgid "Pager"
 msgstr ""
 
-#: src/properties.cpp:749
-msgid "Optional identifier assigned by the Image Supplier to the image."
+#: src/properties.cpp:878
+msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:750
-msgid "Licensee Image ID"
+#: src/properties.cpp:883
+msgid "Age Unknown"
 msgstr ""
 
-#: src/properties.cpp:750
-msgid "Optional identifier assigned by the Licensee to the image."
+#: src/properties.cpp:884
+msgid "Age 25 or Over"
 msgstr ""
 
-#: src/properties.cpp:751
-msgid "Licensee Image Notes"
+#: src/properties.cpp:885
+msgid "Age 24"
 msgstr ""
 
-#: src/properties.cpp:751
-msgid "Notes added by Licensee."
+#: src/properties.cpp:886
+msgid "Age 23"
 msgstr ""
 
-#: src/properties.cpp:752
-msgid "Other Image Info"
+#: src/properties.cpp:887
+msgid "Age 22"
 msgstr ""
 
-#: src/properties.cpp:752
-msgid "Additional image information."
+#: src/properties.cpp:888
+msgid "Age 21"
 msgstr ""
 
-#: src/properties.cpp:753
-msgid "License ID"
+#: src/properties.cpp:889
+msgid "Age 20"
 msgstr ""
 
-#: src/properties.cpp:753
-msgid "Optional PLUS-ID assigned by the Licensor to the License."
+#: src/properties.cpp:890
+msgid "Age 19"
 msgstr ""
 
-#: src/properties.cpp:754
-msgid "Licensor Transaction ID"
+#: src/properties.cpp:891
+msgid "Age 18"
 msgstr ""
 
-#: src/properties.cpp:754
-msgid ""
-"Identifier assigned by Licensor for Licensor's reference and internal use."
+#: src/properties.cpp:892
+msgid "Age 17"
 msgstr ""
 
-#: src/properties.cpp:755
-msgid "Licensee Transaction ID"
+#: src/properties.cpp:893
+msgid "Age 16"
 msgstr ""
 
-#: src/properties.cpp:755
-msgid ""
-"Identifier assigned by Licensee for Licensee's reference and internal use."
+#: src/properties.cpp:894
+msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:756
-msgid "Licensee Project Reference"
+#: src/properties.cpp:895
+msgid "Age 14 or Under"
 msgstr ""
 
-#: src/properties.cpp:756
-msgid "Project reference name or description assigned by Licensee."
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
+msgid "Not Applicable"
 msgstr ""
 
-#: src/properties.cpp:757
-msgid "License Transaction Date"
+#: src/properties.cpp:902
+msgid "Unlimited Model Releases"
 msgstr ""
 
-#: src/properties.cpp:757
-msgid "The date of the License Transaction."
+#: src/properties.cpp:903
+msgid "Limited or Incomplete Model Releases"
 msgstr ""
 
-#: src/properties.cpp:758
-msgid "Reuse"
+#: src/properties.cpp:910
+msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:758
-msgid ""
-"Indicates whether a license is a repeat or an initial license.  Reuse may "
-"require that licenses stored in files previously delivered to the customer "
-"be updated."
+#: src/properties.cpp:911
+msgid "Limited or Incomplete Property Releases"
 msgstr ""
 
-#: src/properties.cpp:759
-msgid "Other License Documents"
+#: src/properties.cpp:917
+msgid "Repeat Use"
 msgstr ""
 
-#: src/properties.cpp:759
-msgid ""
-"Reference information for additional documents associated with the license."
+#: src/properties.cpp:921 src/properties.cpp:930
+msgid "Fixture Identification"
 msgstr ""
 
-#: src/properties.cpp:760
-msgid "Other License Info"
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "Status"
 msgstr ""
 
-#: src/properties.cpp:760
-msgid "Additional license information."
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
 msgstr ""
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
-msgid "Optional field for use at Licensor's discretion."
+#: src/properties.cpp:923 src/properties.cpp:932
+msgid "People"
 msgstr ""
 
-#: src/properties.cpp:764
-msgid "Custom 4"
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
 msgstr ""
 
-#: src/properties.cpp:765
-msgid "Custom 5"
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
 msgstr ""
 
-#: src/properties.cpp:766
-msgid "Custom 6"
+#: src/sigmamn.cpp:62
+msgid "Resolution Mode"
 msgstr ""
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
-msgid "Optional field for use at Licensee's discretion."
+#: src/sigmamn.cpp:63
+msgid "Resolution mode"
 msgstr ""
 
-#: src/properties.cpp:767
-msgid "Custom 7"
+#: src/sigmamn.cpp:65
+msgid "Autofocus Mode"
 msgstr ""
 
-#: src/properties.cpp:768
-msgid "Custom 8"
+#: src/sigmamn.cpp:66
+msgid "Autofocus mode"
 msgstr ""
 
-#: src/properties.cpp:769
-msgid "Custom 9"
+#: src/sigmamn.cpp:68
+msgid "Focus Setting"
 msgstr ""
 
-#: src/properties.cpp:770
-msgid "Custom 10"
+#: src/sigmamn.cpp:69
+msgid "Focus setting"
 msgstr ""
 
-#: src/properties.cpp:777
-msgid "Adult Content Warning Required"
+#: src/sigmamn.cpp:80
+msgid "Lens Range"
 msgstr ""
 
-#: src/properties.cpp:778
-msgid "Not Required"
+#: src/sigmamn.cpp:81
+msgid "Lens focal length range"
 msgstr ""
 
-#: src/properties.cpp:784
-msgid "Protected"
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+msgid "Shadow"
 msgstr ""
 
-#: src/properties.cpp:785
-msgid "Public Domain"
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
+msgid "Highlight"
 msgstr ""
 
-#: src/properties.cpp:791
-msgid "Credit Adjacent To Image"
+#: src/sigmamn.cpp:104
+msgid "Fill Light"
 msgstr ""
 
-#: src/properties.cpp:792
-msgid "Credit in Credits Area"
+#: src/sigmamn.cpp:105
+msgid "X3 Fill light"
 msgstr ""
 
-#: src/properties.cpp:793
-msgid "Credit on Image"
+#: src/sigmamn.cpp:107
+msgid "Color Adjustment"
 msgstr ""
 
-#: src/properties.cpp:794
-msgid "Not Require"
+#: src/sigmamn.cpp:108
+msgid "Color adjustment"
 msgstr ""
 
-#: src/properties.cpp:799
-msgid "No Colorization"
+#: src/sigmamn.cpp:110
+msgid "Adjustment Mode"
 msgstr ""
 
-#: src/properties.cpp:800
-msgid "No Cropping"
+#: src/sigmamn.cpp:111
+msgid "Adjustment mode"
 msgstr ""
 
-#: src/properties.cpp:801
-msgid "No De-Colorization"
+#: src/sigmamn.cpp:122
+msgid "Auto Bracket"
 msgstr ""
 
-#: src/properties.cpp:802
-msgid "No Flipping"
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
+msgid "Auto bracket"
 msgstr ""
 
-#: src/properties.cpp:803
-msgid "No Merging"
+#: src/sigmamn.cpp:127
+msgid "Unknown SigmaMakerNote tag"
 msgstr ""
 
-#: src/properties.cpp:804
-msgid "No Retouching"
+#: src/sigmamn.cpp:170
+msgid "8-Segment"
 msgstr ""
 
-#: src/properties.cpp:809
-msgid "Duplication Only as Necessary Under License"
+#: src/sonymn.cpp:88
+msgid "Standard "
 msgstr ""
 
-#: src/properties.cpp:810
-msgid "No Duplication Constraints"
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
 msgstr ""
 
-#: src/properties.cpp:811
-msgid "No Duplication"
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
 msgstr ""
 
-#: src/properties.cpp:816
-msgid "Maintain File Name"
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
 msgstr ""
 
-#: src/properties.cpp:817
-msgid "Maintain File Type"
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
 msgstr ""
 
-#: src/properties.cpp:818
-msgid "Maintain ID in File Name"
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
 msgstr ""
 
-#: src/properties.cpp:819
-msgid "Maintain Metadata"
+#: src/sonymn.cpp:109
+msgid "Landscape "
 msgstr ""
 
-#: src/properties.cpp:824
-msgid "Windows Bitmap (BMP)"
+#: src/sonymn.cpp:113
+msgid "Night Scene / Twilight"
 msgstr ""
 
-#: src/properties.cpp:825
-msgid "Digital Negative (DNG)"
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
 msgstr ""
 
-#: src/properties.cpp:826
-msgid "Encapsulated PostScript (EPS)"
+#: src/sonymn.cpp:115
+msgid "Twilight Portrait"
 msgstr ""
 
-#: src/properties.cpp:827
-msgid "Graphics Interchange Format (GIF)"
+#: src/sonymn.cpp:116
+msgid "Soft Snap"
 msgstr ""
 
-#: src/properties.cpp:828
-msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
+#: src/sonymn.cpp:118
+msgid "Smile Shutter"
 msgstr ""
 
-#: src/properties.cpp:830
-msgid "Macintosh Picture (PICT)"
+#: src/sonymn.cpp:120
+msgid "High Sensitivity"
 msgstr ""
 
-#: src/properties.cpp:831
-msgid "Portable Network Graphics (PNG)"
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
 msgstr ""
 
-#: src/properties.cpp:832
-msgid "Photoshop Document (PSD)"
+#: src/sonymn.cpp:123
+msgid "Gourmet"
 msgstr ""
 
-#: src/properties.cpp:833
-msgid "Proprietary RAW Image Format"
+#: src/sonymn.cpp:125
+msgid "Handheld Twilight"
 msgstr ""
 
-#: src/properties.cpp:834
-msgid "Tagged Image File Format (TIFF)"
+#: src/sonymn.cpp:126
+msgid "Anti Motion Blur"
 msgstr ""
 
-#: src/properties.cpp:835
-msgid "Windows Media Photo (HD Photo)"
+#: src/sonymn.cpp:128
+msgid "Backlight Correction HDR"
 msgstr ""
 
-#: src/properties.cpp:840
-msgid "Greater than 50 MB"
+#: src/sonymn.cpp:142
+msgid "On (Continuous)"
 msgstr ""
 
-#: src/properties.cpp:841
-msgid "Up to 1 MB"
+#: src/sonymn.cpp:143
+msgid "On (Shooting)"
 msgstr ""
 
-#: src/properties.cpp:842
-msgid "Up to 10 MB"
+#: src/sonymn.cpp:151
+msgid "Plus"
 msgstr ""
 
-#: src/properties.cpp:843
-msgid "Up to 30 MB"
+#: src/sonymn.cpp:167
+msgid "White Flourescent"
 msgstr ""
 
-#: src/properties.cpp:844
-msgid "Up to 50 MB"
+#: src/sonymn.cpp:168
+msgid "Cool White Flourescent"
 msgstr ""
 
-#: src/properties.cpp:849
-msgid "Illustrated Image"
+#: src/sonymn.cpp:169
+msgid "Day White Flourescent"
 msgstr ""
 
-#: src/properties.cpp:850
-msgid "Multimedia or Composited Image"
+#: src/sonymn.cpp:172
+msgid "Underwater 1 (Blue Water)"
 msgstr ""
 
-#: src/properties.cpp:852
-msgid "Photographic Image"
+#: src/sonymn.cpp:173
+msgid "Underwater 2 (Green Water)"
 msgstr ""
 
-#: src/properties.cpp:853
-msgid "Video"
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
 msgstr ""
 
-#: src/properties.cpp:858
-msgid "Cell"
+#: src/sonymn.cpp:188
+msgid "Center AF"
 msgstr ""
 
-#: src/properties.cpp:859
-msgid "FAX"
+#: src/sonymn.cpp:189
+msgid "Spot AF"
 msgstr ""
 
-#: src/properties.cpp:861
-msgid "Pager"
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
 msgstr ""
 
-#: src/properties.cpp:862
-msgid "Work"
+#: src/sonymn.cpp:191
+msgid "Touch AF"
 msgstr ""
 
-#: src/properties.cpp:867
-msgid "Age Unknown"
+#: src/sonymn.cpp:192
+msgid "Manual Focus"
 msgstr ""
 
-#: src/properties.cpp:868
-msgid "Age 25 or Over"
+#: src/sonymn.cpp:193
+msgid "Face Detected"
 msgstr ""
 
-#: src/properties.cpp:869
-msgid "Age 24"
+#: src/sonymn.cpp:208
+msgid "Close Focus"
 msgstr ""
 
-#: src/properties.cpp:870
-msgid "Age 23"
+#: src/sonymn.cpp:224
+msgid "Exposure Bracketing"
 msgstr ""
 
-#: src/properties.cpp:871
-msgid "Age 22"
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+msgid "Multi Burst Mode"
 msgstr ""
 
-#: src/properties.cpp:872
-msgid "Age 21"
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+msgid "Multi Burst Image Width"
 msgstr ""
 
-#: src/properties.cpp:873
-msgid "Age 20"
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+msgid "Multi Burst Image Height"
 msgstr ""
 
-#: src/properties.cpp:874
-msgid "Age 19"
+#: src/sonymn.cpp:315
+msgid "JPEG preview image"
 msgstr ""
 
-#: src/properties.cpp:875
-msgid "Age 18"
+#: src/sonymn.cpp:341
+msgid "Auto HDR"
 msgstr ""
 
-#: src/properties.cpp:876
-msgid "Age 17"
+#: src/sonymn.cpp:342
+msgid "High Definition Range Mode"
 msgstr ""
 
-#: src/properties.cpp:877
-msgid "Age 16"
+#: src/sonymn.cpp:346
+msgid "Shot Information"
 msgstr ""
 
-#: src/properties.cpp:878
-msgid "Age 15"
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+msgid "Sony Model ID"
 msgstr ""
 
-#: src/properties.cpp:879
-msgid "Age 14 or Under"
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+msgid "Color Reproduction"
 msgstr ""
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
-msgid "Not Applicable"
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+msgid "Dynamic Range Optimizer"
 msgstr ""
 
-#: src/properties.cpp:886
-msgid "Unlimited Model Releases"
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+msgid "Minolta MakerNote"
 msgstr ""
 
-#: src/properties.cpp:887
-msgid "Limited or Incomplete Model Releases"
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+msgid "Full Image Size"
 msgstr ""
 
-#: src/properties.cpp:894
-msgid "Unlimited Property Releases"
+#: src/sonymn.cpp:387
+msgid "Preview Image Size"
 msgstr ""
 
-#: src/properties.cpp:895
-msgid "Limited or Incomplete Property Releases"
+#: src/sonymn.cpp:388
+msgid "Preview image size"
 msgstr ""
 
-#: src/properties.cpp:901
-msgid "Repeat Use"
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
 msgstr ""
 
-#: src/sigmamn.cpp:60
-msgid "Resolution Mode"
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
+msgid "JPEG Quality"
 msgstr ""
 
-#: src/sigmamn.cpp:61
-msgid "Resolution mode"
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
+msgid "Release Mode"
 msgstr ""
 
-#: src/sigmamn.cpp:62
-msgid "Autofocus Mode"
+#: src/sonymn.cpp:415
+msgid "Shot number in continous burst mode"
 msgstr ""
 
-#: src/sigmamn.cpp:63
-msgid "Autofocus mode"
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+msgid "Anti-Blur"
 msgstr ""
 
-#: src/sigmamn.cpp:65
-msgid "Focus Setting"
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
+msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: src/sigmamn.cpp:66
-msgid "Focus setting"
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
+msgid "Intelligent Auto"
 msgstr ""
 
-#: src/sigmamn.cpp:77
-msgid "Lens Range"
+#: src/sonymn.cpp:434
+msgid "Unknown Sony1MakerNote tag"
 msgstr ""
 
-#: src/sigmamn.cpp:78
-msgid "Lens focal length range"
+#: src/sonymn.cpp:448
+msgid "Continuous High"
 msgstr ""
 
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
-msgid "Shadow"
+#: src/sonymn.cpp:452
+msgid "Continuous Low"
 msgstr ""
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
-msgid "Highlight"
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
+msgid "D-Range Optimizer Bracketing Low"
 msgstr ""
 
-#: src/sigmamn.cpp:101
-msgid "Fill Light"
+#: src/sonymn.cpp:487
+msgid "Autumn"
 msgstr ""
 
-#: src/sigmamn.cpp:102
-msgid "X3 Fill light"
+#: src/sonymn.cpp:493
+msgid "ADI"
 msgstr ""
 
-#: src/sigmamn.cpp:104
-msgid "Color Adjustment"
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
 msgstr ""
 
-#: src/sigmamn.cpp:105
-msgid "Color adjustment"
+#: src/sonymn.cpp:529
+msgid "Auto No Flash"
 msgstr ""
 
-#: src/sigmamn.cpp:107
-msgid "Adjustment Mode"
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
+msgid "Dynamic Range Optimizer Level"
 msgstr ""
 
-#: src/sigmamn.cpp:108
-msgid "Adjustment mode"
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
+msgid "Creative Style"
 msgstr ""
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
+msgid "Zone Matching Value"
 msgstr ""
 
-#: src/sigmamn.cpp:119
-msgid "Auto Bracket"
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
+msgid "AF With Shutter"
 msgstr ""
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
-msgid "Auto bracket"
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+msgid "High ISO NoiseReduction"
 msgstr ""
 
-#: src/sigmamn.cpp:124
-msgid "Unknown SigmaMakerNote tag"
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
+msgid "Image Style"
 msgstr ""
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
+#: src/sonymn.cpp:655
+msgid "Unknown Sony1 Camera Settings tag"
 msgstr ""
 
-#: src/sonymn.cpp:80
-msgid "Unknown SonyMakerNote tag"
+#: src/sonymn.cpp:719
+msgid "Unknown Sony1 Camera Settings 2 tag"
 msgstr ""
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
 msgid "Unknown section"
 msgstr ""
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
 msgid "Image data structure"
 msgstr ""
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
 msgid "Recording offset"
 msgstr ""
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
 msgid "Image data characteristics"
 msgstr ""
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 msgid "Other data"
 msgstr ""
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
 msgid "Exif data structure"
 msgstr ""
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
 msgid "Image configuration"
 msgstr ""
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
 msgid "User information"
 msgstr ""
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
 msgid "Related file"
 msgstr ""
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 msgid "Date and time"
 msgstr ""
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
 msgid "Picture taking conditions"
 msgstr ""
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
 msgid "GPS information"
 msgstr ""
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
 msgid "Interoperability information"
 msgstr ""
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
 msgid "Vendor specific information"
 msgstr ""
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 msgid "Adobe DNG tags"
 msgstr ""
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
 msgid "Panasonic RAW tags"
 msgstr ""
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 msgid "TIFF/EP tags"
 msgstr ""
 
-#: src/tags.cpp:193
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
+msgstr ""
+
+#: src/tags.cpp:208
+msgid "Adobe OPI tags"
+msgstr ""
+
+#: src/tags.cpp:209
 msgid "Last section"
 msgstr ""
 
-#: src/tags.cpp:213
+#: src/tags.cpp:225
 msgid "Primary image"
 msgstr ""
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
 msgid "Thumbnail/Preview image"
 msgstr ""
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
 msgid "Primary image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
 msgid "Thumbnail/Preview image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
 msgid "Primary image, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
 msgid "Thumbnail/Preview image, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+msgid "Full-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr ""
+
+#: src/tags.cpp:246
 msgid "inch"
 msgstr ""
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr ""
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr ""
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr ""
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
 msgstr ""
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
 msgstr ""
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr ""
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
 msgid "Adobe Deflate"
 msgstr ""
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
 msgstr ""
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 msgid "JBIG Color"
 msgstr ""
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr ""
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 msgid "Epson ERF Compressed"
 msgstr ""
 
-#: src/tags.cpp:244
+#: src/tags.cpp:264
+msgid "Samsung SRW Compressed"
+msgstr ""
+
+#: src/tags.cpp:265
 msgid "CCITT RLE 1-word"
 msgstr ""
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr ""
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr ""
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr ""
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr ""
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
 msgid "IT8 Monochrome Picture"
 msgstr ""
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr ""
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr ""
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr ""
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
 msgid "Pixar Deflate"
 msgstr ""
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr ""
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
 msgid "ISO JBIG"
 msgstr ""
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr ""
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr ""
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr ""
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 msgid "Nikon NEF Compressed"
 msgstr ""
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
 msgid "Kodak DCR Compressed"
 msgstr ""
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 msgid "Pentax PEF Compressed"
 msgstr ""
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
 msgid "White Is Zero"
 msgstr ""
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
 msgid "Black Is Zero"
 msgstr ""
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr ""
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
 msgstr ""
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
 msgstr ""
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
 msgstr ""
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr ""
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr ""
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr ""
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr ""
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
 msgid "Color Filter Array"
 msgstr ""
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr ""
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr ""
 
-#: src/tags.cpp:279
+#: src/tags.cpp:300
 msgid "Linear Raw"
 msgstr ""
 
-#: src/tags.cpp:284
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
+msgstr ""
+
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+msgid "Randomized process"
+msgstr ""
+
+#: src/tags.cpp:312
 msgid "top, left"
 msgstr ""
 
-#: src/tags.cpp:285
+#: src/tags.cpp:313
 msgid "top, right"
 msgstr ""
 
-#: src/tags.cpp:286
+#: src/tags.cpp:314
 msgid "bottom, right"
 msgstr ""
 
-#: src/tags.cpp:287
-msgid "bottom, left"
+#: src/tags.cpp:315
+msgid "bottom, left"
+msgstr ""
+
+#: src/tags.cpp:316
+msgid "left, top"
+msgstr ""
+
+#: src/tags.cpp:317
+msgid "right, top"
+msgstr ""
+
+#: src/tags.cpp:318
+msgid "right, bottom"
+msgstr ""
+
+#: src/tags.cpp:319 src/tags.cpp:320
+msgid "left, bottom"
+msgstr ""
+
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
+msgstr ""
+
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+msgid "not CMYK"
+msgstr ""
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr ""
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
+msgstr ""
+
+#: src/tags.cpp:340 src/tags.cpp:341
+msgid "Undefined data format"
+msgstr ""
+
+#: src/tags.cpp:346
+msgid "Not indexed"
+msgstr ""
+
+#: src/tags.cpp:347 src/tags.cpp:653
+msgid "Indexed"
+msgstr ""
+
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
+
+#: src/tags.cpp:353
+msgid "B"
+msgstr ""
+
+#: src/tags.cpp:354
+msgid "C"
 msgstr ""
 
-#: src/tags.cpp:288
-msgid "left, top"
+#: src/tags.cpp:355
+msgid "A+B-C"
 msgstr ""
 
-#: src/tags.cpp:289
-msgid "right, top"
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
 msgstr ""
 
-#: src/tags.cpp:290
-msgid "right, bottom"
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
 msgstr ""
 
-#: src/tags.cpp:291
-msgid "left, bottom"
+#: src/tags.cpp:358
+msgid "(A+B)/2"
 msgstr ""
 
-#: src/tags.cpp:296
+#: src/tags.cpp:363
 msgid "Centered"
 msgstr ""
 
-#: src/tags.cpp:297
+#: src/tags.cpp:364
 msgid "Co-sited"
 msgstr ""
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
 msgid "No flash"
 msgstr ""
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 msgid "Fired, strobe return light not detected"
 msgstr ""
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 msgid "Fired, strobe return light detected"
 msgstr ""
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
 msgid "Yes, did not fire"
 msgstr ""
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
 msgid "Yes, compulsory"
 msgstr ""
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 msgid "Yes, compulsory, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 msgid "Yes, compulsory, return light detected"
 msgstr ""
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
 msgstr ""
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 msgid "No, did not fire, return not detected"
 msgstr ""
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 msgid "No, auto"
 msgstr ""
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 msgid "Yes, auto"
 msgstr ""
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 msgid "Yes, auto, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 msgid "Yes, auto, return light detected"
 msgstr ""
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 msgid "No flash function"
 msgstr ""
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 msgid "No, no flash function"
 msgstr ""
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
 msgid "Yes, red-eye reduction"
 msgstr ""
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 msgid "Yes, red-eye reduction, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 msgid "Yes, red-eye reduction, return light detected"
 msgstr ""
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
 msgid "Yes, compulsory, red-eye reduction"
 msgstr ""
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr ""
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
 msgid "No, red-eye reduction"
 msgstr ""
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
 msgid "No, auto, red-eye reduction"
 msgstr ""
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
 msgid "Yes, auto, red-eye reduction"
 msgstr ""
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr ""
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
 msgstr ""
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 msgid "Processing Software"
 msgstr ""
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
 msgstr ""
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
 msgid "New Subfile Type"
 msgstr ""
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: src/tags.cpp:350
+#: src/tags.cpp:416
+msgid "Subfile Type"
+msgstr ""
+
+#: src/tags.cpp:417
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
+msgstr ""
+
+#: src/tags.cpp:421
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr ""
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 msgid ""
 "The number of bits per image component. In this standard each component of "
 "the image is 8 bits, so the value for this tag is 8. See also "
@@ -14669,36 +17719,66 @@
 "this tag."
 msgstr ""
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
 msgid ""
 "The compression scheme used for the image data. When a primary image is JPEG "
 "compressed, this designation is not necessary and is omitted. When "
 "thumbnails use JPEG compression, this tag value is set to 6."
 msgstr ""
 
-#: src/tags.cpp:371
+#: src/tags.cpp:442
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: src/tags.cpp:374
+#: src/tags.cpp:445
+msgid "Threshholding"
+msgstr ""
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+
+#: src/tags.cpp:449
+msgid "Cell Width"
+msgstr ""
+
+#: src/tags.cpp:450
+msgid ""
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:453
+msgid "Cell Length"
+msgstr ""
+
+#: src/tags.cpp:454
+msgid ""
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr ""
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
 msgstr ""
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
 msgid "Document Name"
 msgstr ""
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
 msgid "The name of the document from which this image was scanned"
 msgstr ""
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -14706,21 +17786,21 @@
 "is to be used."
 msgstr ""
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
 "generated the image. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -14728,26 +17808,26 @@
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr ""
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
 "JPEG marker is used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr ""
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
 "strip when an image is divided into strips. With JPEG compressed data this "
@@ -14755,58 +17835,90 @@
 "<StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:420
+#: src/tags.cpp:503
 msgid "Strip Byte Count"
 msgstr ""
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: src/tags.cpp:424
+#: src/tags.cpp:507
 msgid "X-Resolution"
 msgstr ""
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: src/tags.cpp:428
+#: src/tags.cpp:511
 msgid "Y-Resolution"
 msgstr ""
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
 "If this field does not exist, the TIFF default of 1 (chunky) is assumed."
 msgstr ""
 
-#: src/tags.cpp:439
+#: src/tags.cpp:521
+msgid "Gray Response Unit"
+msgstr ""
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr ""
+
+#: src/tags.cpp:524
+msgid "Gray Response Curve"
+msgstr ""
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+
+#: src/tags.cpp:527
+msgid "T4 Options"
+msgstr ""
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+msgid "T6 Options"
+msgstr ""
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
 "unknown, 2 (inches) is designated."
 msgstr ""
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -14814,13 +17926,13 @@
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
 "time the file was changed."
 msgstr ""
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
 "creator. The detailed format is not specified, but it is recommended that "
@@ -14830,127 +17942,346 @@
 "Ken James\""
 msgstr ""
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+msgid "Host Computer"
 msgstr ""
 
-#: src/tags.cpp:468
+#: src/tags.cpp:563
 msgid ""
 "This tag records information about the host computer used to generate the "
 "image."
 msgstr ""
 
-#: src/tags.cpp:472
+#: src/tags.cpp:566
+msgid "Predictor"
+msgstr ""
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+
+#: src/tags.cpp:571
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the colorspace information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: src/tags.cpp:477
+#: src/tags.cpp:576
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since colorspace is specified in the colorspace "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: src/tags.cpp:481
+#: src/tags.cpp:580
+msgid "Color Map"
+msgstr ""
+
+#: src/tags.cpp:581
+msgid ""
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
+msgstr ""
+
+#: src/tags.cpp:586
+msgid "Halftone Hints"
+msgstr ""
+
+#: src/tags.cpp:587
+msgid ""
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
+msgstr ""
+
+#: src/tags.cpp:591
 msgid "Tile Width"
 msgstr ""
 
-#: src/tags.cpp:482
+#: src/tags.cpp:592
 msgid "The tile width in pixels. This is the number of columns in each tile."
 msgstr ""
 
-#: src/tags.cpp:484
+#: src/tags.cpp:594
 msgid "Tile Length"
 msgstr ""
 
-#: src/tags.cpp:485
+#: src/tags.cpp:595
 msgid ""
 "The tile length (height) in pixels. This is the number of rows in each tile."
 msgstr ""
 
-#: src/tags.cpp:487
-msgid "Tile Offsets"
+#: src/tags.cpp:597
+msgid "Tile Offsets"
+msgstr ""
+
+#: src/tags.cpp:598
+msgid ""
+"For each tile, the byte offset of that tile, as compressed and stored on "
+"disk. The offset is specified with respect to the beginning of the TIFF "
+"file. Note that this implies that each tile has a location independent of "
+"the locations of other tiles."
+msgstr ""
+
+#: src/tags.cpp:603
+msgid "Tile Byte Counts"
+msgstr ""
+
+#: src/tags.cpp:604
+msgid ""
+"For each tile, the number of (compressed) bytes in that tile. See "
+"TileOffsets for a description of how the byte counts are ordered."
+msgstr ""
+
+#: src/tags.cpp:607
+msgid "SubIFD Offsets"
+msgstr ""
+
+#: src/tags.cpp:608
+msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
+msgstr ""
+
+#: src/tags.cpp:610
+msgid "Ink Set"
+msgstr ""
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:613
+msgid "Ink Names"
+msgstr ""
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+msgid "Number Of Inks"
+msgstr ""
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+msgid "Dot Range"
+msgstr ""
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
+
+#: src/tags.cpp:622
+msgid "Target Printer"
+msgstr ""
+
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
+msgstr ""
+
+#: src/tags.cpp:625
+msgid "Extra Samples"
+msgstr ""
+
+#: src/tags.cpp:626
+msgid ""
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
+msgstr ""
+
+#: src/tags.cpp:629
+msgid "Sample Format"
+msgstr ""
+
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr ""
+
+#: src/tags.cpp:632
+msgid "SMin Sample Value"
+msgstr ""
+
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr ""
+
+#: src/tags.cpp:635
+msgid "SMax Sample Value"
+msgstr ""
+
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr ""
+
+#: src/tags.cpp:638
+msgid "Transfer Range"
+msgstr ""
+
+#: src/tags.cpp:639
+msgid "Expands the range of the TransferFunction"
+msgstr ""
+
+#: src/tags.cpp:641
+msgid "Clip Path"
+msgstr ""
+
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
+msgid "JPEG tables"
+msgstr ""
+
+#: src/tags.cpp:659
+msgid ""
+"This optional tag may be used to encode the JPEG quantization andHuffman "
+"tables for subsequent use by the JPEG decompression process."
+msgstr ""
+
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
+msgid "JPEG Process"
+msgstr ""
+
+#: src/tags.cpp:667
+msgid "This field indicates the process used to produce the compressed data"
+msgstr ""
+
+#: src/tags.cpp:669
+msgid "JPEG Interchange Format"
 msgstr ""
 
-#: src/tags.cpp:488
+#: src/tags.cpp:670
 msgid ""
-"For each tile, the byte offset of that tile, as compressed and stored on "
-"disk. The offset is specified with respect to the beginning of the TIFF "
-"file. Note that this implies that each tile has a location independent of "
-"the locations of other tiles."
+"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
+"is not used for primary image JPEG data."
 msgstr ""
 
-#: src/tags.cpp:493
-msgid "Tile Byte Counts"
+#: src/tags.cpp:673
+msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: src/tags.cpp:494
+#: src/tags.cpp:674
 msgid ""
-"For each tile, the number of (compressed) bytes in that tile. See "
-"TileOffsets for a description of how the byte counts are ordered."
+"The number of bytes of JPEG compressed thumbnail data. This is not used for "
+"primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
+"a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not "
+"be recorded. Compressed thumbnails must be recorded in no more than 64 "
+"Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: src/tags.cpp:497
-msgid "SubIFD Offsets"
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
 msgstr ""
 
-#: src/tags.cpp:498
-msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
+#: src/tags.cpp:682
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
 msgstr ""
 
-#: src/tags.cpp:500
-msgid "Transfer Range"
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
 msgstr ""
 
-#: src/tags.cpp:501
-msgid "Expands the range of the TransferFunction"
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
 msgstr ""
 
-#: src/tags.cpp:503
-msgid "JPEG tables"
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
 msgstr ""
 
-#: src/tags.cpp:504
+#: src/tags.cpp:690
 msgid ""
-"This optional tag may be used to encode the JPEG quantization andHuffman "
-"tables for subsequent use by the JPEG decompression process."
+"This Field points to a list of point transform values, one per component."
 msgstr ""
 
-#: src/tags.cpp:507
-msgid "JPEG Process"
+#: src/tags.cpp:692
+msgid "JPEG Q-Tables"
 msgstr ""
 
-#: src/tags.cpp:508
-msgid "This field indicates the process used to produce the compressed data"
+#: src/tags.cpp:693
+msgid ""
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
 msgstr ""
 
-#: src/tags.cpp:510
-msgid "JPEG Interchange Format"
+#: src/tags.cpp:696
+msgid "JPEG DC-Tables"
 msgstr ""
 
-#: src/tags.cpp:511
+#: src/tags.cpp:697
 msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
 msgstr ""
 
-#: src/tags.cpp:514
-msgid "JPEG Interchange Format Length"
+#: src/tags.cpp:700
+msgid "JPEG AC-Tables"
 msgstr ""
 
-#: src/tags.cpp:515
+#: src/tags.cpp:701
 msgid ""
-"The number of bytes of JPEG compressed thumbnail data. This is not used for "
-"primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
-"a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not "
-"be recorded. Compressed thumbnails must be recorded in no more than 64 "
-"Kbytes, including all other data to be recorded in APP1."
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
 msgstr ""
 
-#: src/tags.cpp:523
+#: src/tags.cpp:705
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in Appendix E, \"Color "
@@ -14959,17 +18290,17 @@
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
 "component. In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -14984,11 +18315,11 @@
 "both centered and co-sited positioning."
 msgstr ""
 
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr ""
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -14997,52 +18328,59 @@
 "Interoperability these conditions."
 msgstr ""
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr ""
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr ""
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 msgid "Windows Rating"
 msgstr ""
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr ""
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
 msgid "Windows Rating Percent"
 msgstr ""
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr ""
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+msgid "Image ID"
+msgstr ""
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr ""
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods"
 msgstr ""
 
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr ""
-
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
 "photographer and editor copyrights. It is the copyright notice of the person "
@@ -15061,92 +18399,92 @@
 "it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 msgid "Exposure time, given in seconds."
 msgstr ""
 
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
 msgid "The F number."
 msgstr ""
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr ""
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr ""
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr ""
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr ""
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
 "contain image data as in the case of TIFF."
 msgstr ""
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
 msgid "Inter Color Profile"
 msgstr ""
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
 msgstr ""
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
 msgstr ""
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
 msgstr ""
 
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
 "14524."
 msgstr ""
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 msgid "Interlace"
 msgstr ""
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 msgid "Indicates the field number of multifield images."
 msgstr ""
 
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 msgid "Time Zone Offset"
 msgstr ""
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -15154,211 +18492,207 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Self Timer Mode"
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 msgid "Date Time Original"
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 msgid "The date and time when the original image data was generated."
 msgstr ""
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
 
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 msgid "Shutter speed."
 msgstr ""
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
 msgid "The lens aperture."
 msgstr ""
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 msgid "The value of brightness."
 msgstr ""
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 msgid "The exposure bias."
 msgstr ""
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
 msgid "Max Aperture Value"
 msgstr ""
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 msgid "The smallest F number of the lens."
 msgstr ""
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr ""
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
 msgid "The metering mode."
 msgstr ""
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr ""
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 msgid "Indicates the status of flash when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 msgid "The actual focal length of the lens, in mm."
 msgstr ""
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 msgid "Amount of flash energy (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise"
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr ""
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
 "direction for main image."
 msgstr ""
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
 "direction for main image."
 msgstr ""
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
 "FocalPlaneYResolution(37391)."
 msgstr ""
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security Classification"
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security classification assigned to the image."
 msgstr ""
 
-#: src/tags.cpp:655
-msgid "Image History"
-msgstr ""
-
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
 msgstr ""
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
 msgstr ""
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
 msgid "Type of image sensor."
 msgstr ""
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
 msgid "Windows Title"
 msgstr ""
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
 msgid "Windows Comment"
 msgstr ""
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 msgid "Windows Author"
 msgstr ""
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
 msgid "Windows Keywords"
 msgstr ""
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 msgid "Windows Subject"
 msgstr ""
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
 msgid "Subject tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
 msgid "Print Image Matching"
 msgstr ""
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
+#: src/tags.cpp:866
+msgid "Print Image Matching, description needed."
 msgstr ""
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
 msgid "DNG version"
 msgstr ""
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
 "1, 1, 0, 0."
 msgstr ""
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
 msgid "DNG backward version"
 msgstr ""
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -15368,11 +18702,11 @@
 "values, to verify it is able to correctly read the file."
 msgstr ""
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
 msgid "Unique Camera Model"
 msgstr ""
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -15382,35 +18716,35 @@
 "replacement profiles."
 msgstr ""
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
 msgid "Localized Camera Model"
 msgstr ""
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
 msgstr ""
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
 msgid "CFA Plane Color"
 msgstr ""
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr ""
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr ""
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -15419,15 +18753,15 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
 msgid "Black Level Repeat Dim"
 msgstr ""
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -15435,11 +18769,11 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 msgid "Black Level Delta H"
 msgstr ""
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -15448,11 +18782,11 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 msgid "Black Level Delta V"
 msgstr ""
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -15460,22 +18794,22 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
 msgid "White Level"
 msgstr ""
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
 msgid "Default Scale"
 msgstr ""
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -15485,11 +18819,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr ""
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -15498,11 +18832,11 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
 msgid "Default Crop Size"
 msgstr ""
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -15510,11 +18844,11 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 msgid "Color Matrix 1"
 msgstr ""
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -15522,22 +18856,22 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 msgid "Color Matrix 2"
 msgstr ""
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 msgid "Camera Calibration 1"
 msgstr ""
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -15548,11 +18882,11 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
 msgid "Camera Calibration 2"
 msgstr ""
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -15563,11 +18897,11 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
 msgid "Reduction Matrix 1"
 msgstr ""
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -15575,11 +18909,11 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
 msgid "Reduction Matrix 2"
 msgstr ""
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -15587,11 +18921,11 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
 msgid "Analog Balance"
 msgstr ""
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -15602,33 +18936,33 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
 msgid "As Shot Neutral"
 msgstr ""
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 msgid "As Shot White XY"
 msgstr ""
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
 msgid "Baseline Exposure"
 msgstr ""
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -15643,11 +18977,11 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
 msgid "Baseline Noise"
 msgstr ""
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -15656,11 +18990,11 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
 msgid "Baseline Sharpness"
 msgstr ""
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -15668,11 +19002,11 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 msgid "Bayer Green Split"
 msgstr ""
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -15682,11 +19016,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr ""
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -15696,27 +19030,27 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
 "that captured the image."
 msgstr ""
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
 msgid "Lens Info"
 msgstr ""
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
 "f-stops are unknown, they should be encoded as 0/0."
 msgstr ""
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr ""
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -15727,11 +19061,11 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
 msgid "Anti Alias Strength"
 msgstr ""
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -15740,32 +19074,32 @@
 "artifacts)."
 msgstr ""
 
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 msgid "Shadow Scale"
 msgstr ""
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
 msgstr ""
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 msgid "DNG Private Data"
 msgstr ""
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
 "programs that edit DNG files."
 msgstr ""
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
 msgid "MakerNote Safety"
 msgstr ""
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -15774,22 +19108,22 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr ""
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
 msgid "Calibration Illuminant 2"
 msgstr ""
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -15798,11 +19132,11 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
 msgid "Best Quality Scale"
 msgstr ""
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -15811,11 +19145,11 @@
 "need to be multiplied to achieve the best quality image size."
 msgstr ""
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 msgid "Raw Data Unique ID"
 msgstr ""
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -15825,21 +19159,21 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 msgid "Original Raw File Name"
 msgstr ""
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
 msgid "Original Raw File Data"
 msgstr ""
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -15852,21 +19186,21 @@
 "data blocks."
 msgstr ""
 
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 msgid "Active Area"
 msgstr ""
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
 msgstr ""
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 msgid "Masked Areas"
 msgstr ""
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -15876,11 +19210,11 @@
 "masked pixels are no longer useful."
 msgstr ""
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
 msgid "As-Shot ICC Profile"
 msgstr ""
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -15893,11 +19227,11 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
 msgid "As-Shot Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -15909,11 +19243,11 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 msgid "Current ICC Profile"
 msgstr ""
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -15921,11 +19255,11 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
 msgid "Current Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -15933,225 +19267,221 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
 msgid "Unknown IFD tag"
 msgstr ""
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr ""
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 msgid "Creative program"
 msgstr ""
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 msgid "Action program"
 msgstr ""
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
 msgid "Portrait mode"
 msgstr ""
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
 msgid "Landscape mode"
 msgstr ""
 
-#: src/tags.cpp:1051
-msgid "Center weighted average"
-msgstr ""
-
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 msgid "Multi-spot"
 msgstr ""
 
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 msgid "Tungsten (incandescent light)"
 msgstr ""
 
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
 msgstr ""
 
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
 msgid "Cloudy weather"
 msgstr ""
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 msgid "Daylight fluorescent (D 5700 - 7100K)"
 msgstr ""
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
 msgid "Day white fluorescent (N 4600 - 5400K)"
 msgstr ""
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
 msgid "Cool white fluorescent (W 3900 - 4500K)"
 msgstr ""
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
 msgid "White fluorescent (WW 3200 - 3700K)"
 msgstr ""
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr ""
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr ""
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr ""
 
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr ""
 
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr ""
 
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr ""
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 msgid "D50"
 msgstr ""
 
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
 msgid "ISO studio tungsten"
 msgstr ""
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 msgid "Other light source"
 msgstr ""
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr ""
 
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 msgid "One-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 msgid "Two-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 msgid "Three-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 msgid "Color sequential area"
 msgstr ""
 
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr ""
 
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 msgid "Color sequential linear"
 msgstr ""
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
 msgid "Film scanner"
 msgstr ""
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr ""
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
 msgid "Digital still camera"
 msgstr ""
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr ""
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
 msgid "Normal process"
 msgstr ""
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
 msgid "Custom process"
 msgstr ""
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr ""
 
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr ""
 
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
 msgid "Low gain down"
 msgstr ""
 
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr ""
 
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr ""
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr ""
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
 "tag value is an ASCII string compatible with the standard developed by the "
 "ASTM Technical Committee."
 msgstr ""
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr ""
 
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
 msgid "Date and Time (original)"
 msgstr ""
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
 msgstr ""
 
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
 msgid "Date and Time (digitized)"
 msgstr ""
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -16161,117 +19491,117 @@
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
 msgstr ""
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr ""
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
 msgstr ""
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
 msgstr ""
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
 msgid "Maker Note"
 msgstr ""
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
 msgid "Sub-seconds Time"
 msgstr ""
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 msgid "Sub-seconds Time Original"
 msgstr ""
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 msgid "Sub-seconds Time Digitized"
 msgstr ""
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
 msgid "FlashPix Version"
 msgstr ""
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB is used to define the color space based on the PC "
@@ -16280,7 +19610,7 @@
 "treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -16288,7 +19618,7 @@
 "not exist in an uncompressed file."
 msgstr ""
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
@@ -16298,7 +19628,7 @@
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
@@ -16306,11 +19636,11 @@
 "characters). The path is not recorded."
 msgstr ""
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -16319,46 +19649,46 @@
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 msgstr ""
 
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -16366,207 +19696,207 @@
 "value indicates the X column number and second indicates the Y row number."
 msgstr ""
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
 msgid "Exposure index"
 msgstr ""
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
 msgstr ""
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
 msgid "Color Filter Array Pattern"
 msgstr ""
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods."
 msgstr ""
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
 "is expected to disable or minimize any further processing."
 msgstr ""
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
 "different exposure settings."
 msgstr ""
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
 "not used."
 msgstr ""
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
 "differs from the <FocalLength> tag."
 msgstr ""
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
 "record the mode in which the image was shot. Note that this differs from the "
 "<SceneType> tag."
 msgstr ""
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
 "conditions in the reader."
 msgstr ""
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
 "fixed length."
 msgstr ""
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
 msgid "Unknown Exif tag"
 msgstr ""
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
 msgid "North"
 msgstr ""
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
 msgid "South"
 msgstr ""
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
 msgid "East"
 msgstr ""
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
 msgid "West"
 msgstr ""
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr ""
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
 msgid "Below sea level"
 msgstr ""
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
 msgid "Measurement in progress"
 msgstr ""
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
 msgid "Measurement Interoperability"
 msgstr ""
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr ""
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr ""
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
 msgid "knots"
 msgstr ""
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 msgid "True direction"
 msgstr ""
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 msgid "Magnetic direction"
 msgstr ""
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 msgid "Kilometers"
 msgstr ""
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 msgid "Miles"
 msgstr ""
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 msgid "Knots"
 msgstr ""
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
 msgid "Without correction"
 msgstr ""
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 msgid "Correction applied"
 msgstr ""
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
 "tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
@@ -16574,17 +19904,17 @@
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
 msgid "GPS Latitude Reference"
 msgstr ""
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -16593,17 +19923,17 @@
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
 msgid "GPS Longitude Reference"
 msgstr ""
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -16612,7 +19942,7 @@
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -16621,20 +19951,20 @@
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
 "(atomic clock)."
 msgstr ""
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -16643,87 +19973,87 @@
 "the tag is set to NULL."
 msgstr ""
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
 "Interoperability."
 msgstr ""
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
 msgstr ""
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 msgid "GPS Data Degree of Precision"
 msgstr ""
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 msgstr ""
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
 msgid "GPS Track Ref"
 msgstr ""
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
 msgid "GPS Destination Latitude Refeference"
 msgstr ""
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
 "latitude. The ASCII value \"N\" indicates north latitude, and \"S\" is south "
 "latitude."
 msgstr ""
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -16733,17 +20063,17 @@
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
 msgid "GPS Destination Longitude Reference"
 msgstr ""
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII \"E\" indicates east longitude, and \"W\" is west longitude."
 msgstr ""
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -16753,70 +20083,70 @@
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
 msgid "GPS Destination Distance Reference"
 msgstr ""
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
 msgstr ""
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
 "followed by the name of the method."
 msgstr ""
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
 "GPS area."
 msgstr ""
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
 msgid "GPS Date Stamp"
 msgstr ""
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
 msgstr ""
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 msgid "Unknown GPSInfo tag"
 msgstr ""
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
 msgid "Interoperability Index"
 msgstr ""
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -16824,72 +20154,72 @@
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
 msgid "Interoperability Version"
 msgstr ""
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr ""
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
 msgid "Related Image File Format"
 msgstr ""
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
 msgid "File format of image file"
 msgstr ""
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 msgid "Related Image Width"
 msgstr ""
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 msgid "Related Image Length"
 msgstr ""
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 msgid "Unknown Exif Interoperability tag"
 msgstr ""
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
 msgid "Offset"
 msgstr ""
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr ""
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 msgid "Byte Order"
 msgstr ""
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
 msgstr ""
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr ""
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
 msgid "Unknown tag"
 msgstr ""
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 msgid "Digital zoom not used"
 msgstr ""
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 msgid "TIFF header, offset"
 msgstr ""
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr ""
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr ""
Binary files /tmp/TId3M1M1Ks/exiv2-0.19/po/fi.gmo and /tmp/B4Gg93MYI9/exiv2-0.21/po/fi.gmo differ
diff -Nru exiv2-0.19/po/fi.po exiv2-0.21/po/fi.po
--- exiv2-0.19/po/fi.po	2009-12-29 10:51:25.000000000 +0000
+++ exiv2-0.21/po/fi.po	2010-11-22 15:13:38.000000000 +0000
@@ -4,2319 +4,3007 @@
 # This file is distributed under the same license as the Exiv2 package.
 #
 # , 2009.
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 msgid ""
 msgstr ""
 "Project-Id-Version: Exiv2\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\n"
 "PO-Revision-Date: 2009-04-12 16:06+0000\n"
 "Last-Translator: Mikael Lammentausta\n"
 "Language-Team:  <fi@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
 msgstr "Tiedoston avaus epäonnistui\n"
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 msgid "File size"
 msgstr "Tiedoston koko"
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 msgid "Bytes"
 msgstr "tavua"
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 msgid "MIME type"
 msgstr "Mime-tyyppi"
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 msgid "Image size"
 msgstr "Kuvan koko"
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
 msgstr "Kuvasta ei löytynyt exif-tietoja\n"
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 msgid "Camera make"
 msgstr "Kameran merkki"
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 msgid "Camera model"
 msgstr "Kameran malli"
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 msgid "Image timestamp"
 msgstr "Kuvan aikaleima"
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 msgid "Image number"
 msgstr "Kuvan numero"
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 msgid "Exposure time"
 msgstr "Valotusaika"
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr "Aukko"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 msgid "Exposure bias"
 msgstr "Valotuksen korjaus"
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr "Salama"
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 msgid "Flash bias"
 msgstr "Salamavalotuksen korjaus"
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 msgid "Focal length"
 msgstr "Polttoväli"
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 msgid "35 mm equivalent"
 msgstr ""
 
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 msgid "Subject distance"
 msgstr "Kohteen etäisyys"
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 msgid "ISO speed"
 msgstr "ISO-herkkyys"
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 msgid "Exposure mode"
 msgstr "Valotustila"
 
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 msgid "Metering mode"
 msgstr "Mittaustapa"
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 msgid "Macro mode"
 msgstr "Makrotila"
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 msgid "Image quality"
 msgstr "Kuvan laatu"
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 msgid "Exif Resolution"
 msgstr ""
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 msgid "White balance"
 msgstr "Valkotasapaino"
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
 msgstr "Näytekuva"
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr "Ei käytössä"
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr "Omistusoikeus"
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
 msgstr "Exif-kommentti"
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 msgid "No IPTC data found in the file\n"
 msgstr "Kuvasta ei löytynyt iptc-tietoja\n"
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 msgid "No XMP data found in the file\n"
 msgstr "Kuvasta ei löytynyt xmp-tietoja\n"
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
 msgstr ""
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 msgid "JPEG comment"
 msgstr "Jpeg-kommentti"
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
 msgstr "pikseliä"
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 msgid "bytes"
 msgstr "tavua"
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 msgid "Neither tag"
 msgstr ""
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 msgid "nor"
 msgstr ""
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 msgid "found in the file"
 msgstr ""
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
 msgstr "Kuvan luontipäiväystä ei ole asetettu"
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
 msgstr "Aikaleiman lukeminen epäonnistui"
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 msgid "in the file"
 msgstr "tiedostossa"
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
 msgstr "Päivitetään aikaleima:"
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 msgid "Erasing thumbnail data"
 msgstr "Poistetaan näytekuva"
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
 msgstr "Poistetaan exif-tiedot"
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
 msgstr "Poistetaan iptc-tiedot"
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
 msgstr "Poistetaan jpef-kommentti"
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
 msgstr "Poistetaan xmp-tiedot"
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
 msgstr ""
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 msgid "Writing thumbnail"
 msgstr "Tallennetaan näytekuvaa"
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 msgid "to file"
 msgstr "tiedostoon"
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
 msgstr ""
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
 msgstr ""
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 msgid "Writing preview"
 msgstr ""
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 msgid "Setting JPEG comment"
 msgstr "Talletetaan jpeg-kommenttia"
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
 msgstr "Lisää"
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 msgid "Warning"
 msgstr "Varoitus"
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 msgid "Failed to read"
 msgstr "Lukuvirhe"
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 msgid "value"
 msgstr "arvo"
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 msgid "Set"
 msgstr "Aseta"
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr "Poista"
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr ""
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
 msgstr ""
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
 msgstr ""
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
 msgstr ""
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
 msgstr ""
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 msgid "years"
 msgstr "vuotta"
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
 msgstr "vuosi"
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 msgid "months"
 msgstr "kuukautta"
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 msgid "month"
 msgstr "kuukausi"
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
 msgstr "päivää"
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
 msgstr "päivä"
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
 msgstr ""
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 msgid "Can't adjust timestamp by"
 msgstr ""
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 msgid "to"
 msgstr ""
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr ""
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
 msgstr ""
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1671
+#, fuzzy
+msgid "No Exif user comment found"
+msgstr "Exif-kommentti"
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:1692
+#, fuzzy
+msgid "Setting Exif UNICODE user comment to"
+msgstr "Talletetaan jpeg-kommenttia"
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
 msgstr ""
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
 msgstr ""
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
 msgstr ""
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
 msgstr ""
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
 msgstr ""
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr ""
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
 msgstr ""
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 msgid "File"
 msgstr ""
 
-#: src/actions.cpp:1909
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
 msgstr ""
 
-#: src/actions.cpp:1937
+#: src/actions.cpp:1970
 msgid "Renaming file to"
 msgstr ""
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
 msgstr ""
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
 msgstr ""
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
 msgstr ""
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr "Pois"
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr "Päällä"
+
+#: src/canonmn.cpp:69
 msgid "PowerShot A30"
 msgstr "PowerShot A30"
 
-#: src/canonmn.cpp:61
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
 msgid "PowerShot A20"
 msgstr "PowerShot A20"
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
 msgid "PowerShot A10"
 msgstr "PowerShot A10"
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 msgid "PowerShot G2"
 msgstr "PowerShot G2"
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
 msgid "PowerShot S40"
 msgstr "PowerShot S40"
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
 msgid "PowerShot S30"
 msgstr "PowerShot S30"
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
 msgid "PowerShot A40"
 msgstr "PowerShot A40"
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr "EOS D30"
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
 msgid "PowerShot A100"
 msgstr "PowerShot A100"
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
 msgid "PowerShot A200"
 msgstr "PowerShot A200"
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 msgid "PowerShot G3"
 msgstr "PowerShot G3"
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
 msgid "PowerShot S45"
 msgstr "PowerShot S45"
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
 msgid "PowerShot A70"
 msgstr "PowerShot A70"
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
 msgid "PowerShot A60"
 msgstr "PowerShot A60"
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 msgid "PowerShot G5"
 msgstr "PowerShot G5"
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
 msgid "PowerShot A300"
 msgstr "PowerShot A300"
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
 msgid "PowerShot S50"
 msgstr "PowerShot S50"
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
 msgid "PowerShot A80"
 msgstr "PowerShot A80"
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
 msgid "PowerShot S1 IS"
 msgstr "PowerShot S1 IS"
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
 msgid "PowerShot Pro1"
 msgstr "PowerShot Pro1"
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
 msgid "PowerShot S70"
 msgstr "PowerShot S70"
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
 msgid "PowerShot S60"
 msgstr "PowerShot S60"
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 msgid "PowerShot G6"
 msgstr "PowerShot G6"
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
 msgid "PowerShot A75"
 msgstr "PowerShot A75"
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
 msgid "PowerShot A400"
 msgstr "PowerShot A400"
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
 msgid "PowerShot A310"
 msgstr "PowerShot A310"
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
 msgid "PowerShot A85"
 msgstr "PowerShot A85"
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
 msgid "PowerShot A95"
 msgstr "PowerShot A95"
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
 msgid "PowerShot A520"
 msgstr "PowerShot A520"
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
 msgid "PowerShot A510"
 msgstr "PowerShot A510"
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
 msgid "PowerShot S2 IS"
 msgstr "PowerShot S2 IS"
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr "EOS D60"
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
 msgid "PowerShot A430"
 msgstr "PowerShot A430"
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
 msgid "PowerShot A410"
 msgstr "PowerShot A410"
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
 msgid "PowerShot S80"
 msgstr "PowerShot S80"
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
 msgid "PowerShot A620"
 msgstr "PowerShot A620"
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
 msgid "PowerShot A610"
 msgstr "PowerShot A610"
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
 msgid "PowerShot TX1"
 msgstr "PowerShot TX1"
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
 msgid "PowerShot A420"
 msgstr "PowerShot A420"
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
 msgid "PowerShot A700"
 msgstr "PowerShot A700"
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
 msgid "PowerShot S3 IS"
 msgstr "PowerShot S3 IS"
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
 msgid "PowerShot A540"
 msgstr "PowerShot A540"
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 msgid "PowerShot G7"
 msgstr "PowerShot G7"
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
 msgid "PowerShot A530"
 msgstr "PowerShot A530"
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
 msgid "PowerShot A710 IS"
 msgstr "PowerShot A710 IS"
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
 msgid "PowerShot A640"
 msgstr "PowerShot A640"
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
 msgid "PowerShot A630"
 msgstr "PowerShot A630"
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
 msgid "PowerShot S5 IS"
 msgstr "PowerShot S5 IS"
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
 msgid "PowerShot A460"
 msgstr "PowerShot A460"
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr "PowerShot SD850 IS / Digital IXUS 950 IS"
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
 msgid "PowerShot A570 IS"
 msgstr "PowerShot A570 IS"
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
 msgid "PowerShot A560"
 msgstr "PowerShot A560"
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
 msgid "PowerShot A550"
 msgstr "PowerShot A550"
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
 msgid "PowerShot A450"
 msgstr "PowerShot A450"
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
 msgid "PowerShot Pro90 IS"
 msgstr "PowerShot Pro90 IS"
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 msgid "PowerShot G1"
 msgstr "PowerShot G1"
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr "PowerShot S100 / Digital IXUS / IXY Digital"
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr "HV10"
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr "iVIS DC50"
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr "iVIS HV20"
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr "EOS-1D"
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr "EOS-1DS"
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr "EOS 10D"
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr "EOS-1D Mark III"
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr "EOS Digital Rebel / 300D / Kiss Digital"
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr "EOS-1D Mark II"
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr "EOS 20D"
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr "EOS-1Ds Mark II"
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr "EOS Digital Rebel XT / 350D / Kiss Digital N"
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr "EOS 5D"
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr "EOS-1D Mark II N"
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr "EOS 30D"
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
-msgid "Camera Settings"
-msgstr "Kameran asetukset"
+#: src/canonmn.cpp:170
+#, fuzzy
+msgid "EOS 7D"
+msgstr "EOS 5D"
 
-#: src/canonmn.cpp:166
-msgid "Various camera settings"
-msgstr ""
+#: src/canonmn.cpp:171
+#, fuzzy
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
-msgid "Focal Length"
-msgstr "Polttoväli"
+#: src/canonmn.cpp:172
+#, fuzzy
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr "EOS Digital Rebel / 300D / Kiss Digital"
 
-#: src/canonmn.cpp:169
-msgid "Shot Info"
-msgstr ""
+#: src/canonmn.cpp:173
+#, fuzzy
+msgid "EOS 50D"
+msgstr "EOS 5D"
 
-#: src/canonmn.cpp:169
-msgid "Shot information"
-msgstr ""
+#: src/canonmn.cpp:174
+#, fuzzy
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
-msgid "Panorama"
-msgstr "Panoraama"
+#: src/canonmn.cpp:175
+#, fuzzy
+msgid "EOS-1D Mark IV"
+msgstr "EOS-1D Mark II"
 
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
-msgid "Image Type"
-msgstr "Kuvan tyyppi"
+#: src/canonmn.cpp:180
+#, fuzzy
+msgid "Format 1"
+msgstr "Normaali"
 
-#: src/canonmn.cpp:171
-msgid "Image type"
-msgstr "Kuvan tyyppi"
+#: src/canonmn.cpp:181
+#, fuzzy
+msgid "Format 2"
+msgstr "Normaali"
 
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+#, fuzzy
+msgid "On (1)"
+msgstr "Päällä"
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+#, fuzzy
+msgid "On (2)"
+msgstr "Päällä"
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr ""
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr ""
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
+msgid "Camera Settings"
+msgstr "Kameran asetukset"
+
+#: src/canonmn.cpp:200
+#, fuzzy
+msgid "Various camera settings"
+msgstr "Kameran asetukset"
+
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
+msgid "Focal Length"
+msgstr "Polttoväli"
+
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
+msgid "Shot Info"
+msgstr ""
+
+#: src/canonmn.cpp:203
+#, fuzzy
+msgid "Shot information"
+msgstr "Värikylläisyys"
+
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
+msgid "Panorama"
+msgstr "Panoraama"
+
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
+msgid "Image Type"
+msgstr "Kuvan tyyppi"
+
+#: src/canonmn.cpp:205
+msgid "Image type"
+msgstr "Kuvan tyyppi"
+
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware Version"
 msgstr "Firmwaren versio"
 
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware version"
 msgstr "Firmwaren versio"
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File Number"
 msgstr "F-luku"
 
-#: src/canonmn.cpp:173
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File number"
 msgstr "Tiedostonimi"
 
-#: src/canonmn.cpp:174
+#: src/canonmn.cpp:208
 msgid "Owner Name"
 msgstr "Omistajan nimi"
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 msgid "Camera serial number"
 msgstr "Kameran sarjanumero"
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera Info"
+msgstr "Kameran tyyppi"
+
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera info"
+msgstr "Kameran tyyppi"
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 msgid "Custom Functions"
 msgstr ""
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
+#, fuzzy
 msgid "ModelID"
-msgstr ""
+msgstr "Mallin ID"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "Model ID"
 msgstr "Mallin ID"
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
 msgid "Picture Info"
 msgstr "Kuvan tiedot"
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 msgid "Picture info"
 msgstr "Kuvan tiedot"
 
-#: src/canonmn.cpp:180
-msgid "White Balance Table"
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail Image Valid Area"
+msgstr "Näytekuva"
+
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail image valid area"
+msgstr "Näytekuva"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial Number Format"
+msgstr "Sarjanumero"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial number format"
+msgstr "Sarjanumero"
+
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+#, fuzzy
+msgid "Super Macro"
+msgstr "Makro"
+
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+msgid "Super macro"
 msgstr ""
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+msgid "AF Info"
+msgstr ""
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF info"
+msgstr "AF-piste"
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
+#, fuzzy
+msgid "White Balance Table"
+msgstr " "
+
+#: src/canonmn.cpp:219
 msgid "White balance table"
 msgstr " "
 
-#: src/canonmn.cpp:185
-msgid "Unknown CanonMakerNote tag"
+#: src/canonmn.cpp:220
+#, fuzzy
+msgid "LensModel"
+msgstr "Linssin malli"
+
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+#, fuzzy
+msgid "Internal Serial Number"
+msgstr "Linssin sarjanumero"
+
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+#, fuzzy
+msgid "Internal serial number"
+msgstr "Kameran sarjanumero"
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
 msgstr ""
 
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
-msgstr "Päällä"
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
+#: src/canonmn.cpp:223
+#, fuzzy
+msgid "Custom functions"
+msgstr "Värikylläisyys"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing Info"
+msgstr "Kuvan koko"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing info"
+msgstr "Ohjelman versio"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured Color"
+msgstr "Väriavaruus"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured color"
+msgstr "Valotustila"
+
+#: src/canonmn.cpp:226
+#, fuzzy
+msgid "ColorSpace"
+msgstr "Väriavaruus"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD Offset"
+msgstr "Pois"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD offset"
 msgstr "Pois"
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor Info"
+msgstr "Linssin malli"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor info"
+msgstr "Linssin tyyppi"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color Data"
+msgstr "Väriavaruus"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color data"
+msgstr "Väriavaruus"
+
+#: src/canonmn.cpp:234
+msgid "Unknown CanonMakerNote tag"
+msgstr ""
+
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
 msgid "Economy"
 msgstr ""
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
+#, fuzzy
 msgid "Fine"
-msgstr ""
+msgstr "Välähti"
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
 msgid "RAW"
 msgstr ""
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:254
 msgid "Superfine"
 msgstr ""
 
-#: src/canonmn.cpp:206
+#: src/canonmn.cpp:255
 #, fuzzy
 msgid "Normal Movie"
 msgstr "Normaali"
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 msgid "Auto"
 msgstr ""
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
 msgid "Red-eye"
 msgstr ""
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 msgid "Slow sync"
 msgstr ""
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
+#, fuzzy
 msgid "Auto + red-eye"
-msgstr ""
+msgstr "Auto, välähti"
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
 msgid "On + red-eye"
 msgstr ""
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
 msgid "External"
 msgstr "Ulkoinen"
 
-#: src/canonmn.cpp:223
+#: src/canonmn.cpp:273
 msgid "Single / timer"
 msgstr ""
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
 msgid "Continuous"
 msgstr ""
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
+#, fuzzy
 msgid "Movie"
-msgstr ""
+msgstr "Pieni"
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 msgid "Continuous, speed priority"
 msgstr ""
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
 msgid "Continuous, low"
 msgstr ""
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
 msgid "Continuous, high"
 msgstr ""
 
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 msgid "One shot AF"
 msgstr "Kertatarkennus, AF"
 
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
 msgid "AI servo AF"
 msgstr "Jatkuva tarkennus, AF"
 
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
 msgid "AI focus AF"
 msgstr "Vaihtuva tarkennus, AF"
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 msgid "Manual focus"
 msgstr "Käsintarkennus, MF"
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
 msgid "Single"
 msgstr ""
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
+#, fuzzy
 msgid "Pan focus"
-msgstr ""
+msgstr "Käsintarkennus, MF"
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
 msgid "Large"
 msgstr "Suuri"
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
 msgid "Medium"
 msgstr "Keskikokoinen"
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
 msgid "Small"
 msgstr "Pieni"
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
+#, fuzzy
 msgid "Medium 1"
-msgstr ""
+msgstr "Keskikokoinen"
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
+#, fuzzy
 msgid "Medium 2"
-msgstr ""
+msgstr "Keskikokoinen"
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
+#, fuzzy
 msgid "Medium 3"
-msgstr ""
+msgstr "Keskikokoinen"
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
 msgid "Full auto"
 msgstr "Täysautomatiikka"
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr "Manuaalinen"
 
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr "Maisemakuva"
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
 msgid "Fast shutter"
 msgstr ""
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 msgid "Slow shutter"
 msgstr ""
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 msgid "Night Scene"
 msgstr ""
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
 msgid "Gray scale"
 msgstr ""
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
 msgstr "Seepia"
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr "Muotokuva"
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 msgid "Sports"
 msgstr "Urheilukuva"
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 msgid "Macro / close-up"
 msgstr "Lähikuva"
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 msgid "Black & white"
 msgstr "Mustavalko"
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 msgid "Vivid"
 msgstr ""
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 msgid "Neutral"
 msgstr "Neutraali"
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
+#, fuzzy
 msgid "Flash off"
-msgstr ""
+msgstr "Salaman tila"
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 msgid "Long shutter"
 msgstr ""
 
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr ""
-
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
+#, fuzzy
 msgid "Foliage"
-msgstr ""
+msgstr "Malli"
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
 msgid "Indoor"
 msgstr ""
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
 msgstr ""
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
 msgstr ""
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 msgid "Underwater"
 msgstr ""
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
 msgid "Snow"
 msgstr ""
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
 msgstr ""
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 msgid "Night SnapShot"
 msgstr ""
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 msgid "Digital macro"
 msgstr "Digitaalinen makro"
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
+#, fuzzy
 msgid "My Colors"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
+#, fuzzy
 msgid "Still image"
-msgstr ""
+msgstr "Näytekuva"
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
 msgid "Other"
 msgstr ""
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
 msgstr ""
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 msgid "High"
 msgstr ""
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr "–"
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
+#, fuzzy
 msgid "Auto High"
-msgstr ""
+msgstr "Auto, välähti"
 
-#: src/canonmn.cpp:322
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
 msgid "Default"
 msgstr "Oletus"
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
 msgid "Spot"
 msgstr "Piste"
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr ""
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
 msgid "Evaluative"
 msgstr "Arvioiva"
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
 msgid "Partial"
 msgstr "Osa-alue"
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 msgid "Center weighted"
 msgstr "Keskustaa painottava"
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 msgid "Not known"
 msgstr "Ei tiedossa"
 
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr "Makro"
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 msgid "Very close"
 msgstr ""
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
+#, fuzzy
 msgid "Close"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
+#, fuzzy
 msgid "Middle range"
-msgstr ""
+msgstr "Malli"
 
-#: src/canonmn.cpp:339
+#: src/canonmn.cpp:391
 msgid "Far range"
 msgstr ""
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 msgid "Infinity"
 msgstr ""
 
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
+#, fuzzy
 msgid "Manual AF point selection"
-msgstr ""
+msgstr "Automaattinen AF-pisteen valinta"
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 msgid "None (MF)"
 msgstr "Ei mitään (MF)"
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 msgid "Auto-selected"
 msgstr "Automaattinen"
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 msgid "Right"
 msgstr ""
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 msgid "Center"
 msgstr ""
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
+#, fuzzy
 msgid "Left"
-msgstr ""
+msgstr "Polttoväli"
 
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
 msgid "Auto AF point selection"
 msgstr "Automaattinen AF-pisteen valinta"
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
 msgid "Easy shooting (Auto)"
 msgstr "Täysautomaatti"
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 msgid "Program (P)"
 msgstr "Ohjelmoitu AE (P)"
 
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 msgid "Shutter priority (Tv)"
 msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 msgid "Aperture priority (Av)"
 msgstr "Aukon esivalinta (Av)"
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 msgid "Manual (M)"
 msgstr "Käsisäätöinen valotus (M)"
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr "Syväterävyysohjelma AE"
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
+#, fuzzy
 msgid "M-DEP"
-msgstr ""
+msgstr "Syväterävyysohjelma AE"
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 msgid "Did not fire"
 msgstr "Ei välähtänyt"
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
 msgid "Fired"
 msgstr "Välähti"
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 msgid "External flash"
 msgstr "Ulkoinen salama"
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
 msgid "Internal flash"
 msgstr "Sisäinen salama"
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
 msgstr ""
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr ""
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr ""
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr ""
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr ""
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
+#, fuzzy
 msgid "FP sync used"
-msgstr ""
+msgstr "Käytetty AF-piste"
 
-#: src/canonmn.cpp:625
+#: src/canonmn.cpp:707
+#, fuzzy
 msgid "Normal AE"
-msgstr ""
+msgstr "Normaali"
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
+#, fuzzy
 msgid "Exposure compensation"
-msgstr ""
+msgstr "Valotustila"
 
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
 msgstr "Valotuksen lukitus"
 
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 msgid "AE lock + exposure compensation"
 msgstr ""
 
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
 msgid "No AE"
 msgstr ""
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
+#, fuzzy
 msgid "On, shot only"
-msgstr ""
+msgstr "Kertatarkennus, AF"
+
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+msgid "AF Point"
+msgstr "AF-piste"
 
-#: src/canonmn.cpp:644
+#: src/canonmn.cpp:732
+#, fuzzy
 msgid "Smooth"
-msgstr ""
+msgstr "kuukausi"
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
 msgstr ""
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 msgid "Custom"
 msgstr ""
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
 msgid "My color data"
 msgstr ""
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+#, fuzzy
+msgid "Full"
+msgstr "Täysautomatiikka"
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:759
 msgid "Selftimer"
 msgstr ""
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
+#, fuzzy
 msgid "Self timer"
-msgstr ""
+msgstr "Sarjanumero"
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 msgid "Quality"
 msgstr "Kuvanlaatu"
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 msgid "Flash Mode"
 msgstr "Salaman tila"
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
+#, fuzzy
 msgid "Flash mode setting"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
+#, fuzzy
 msgid "Drive Mode"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/canonmn.cpp:657
+#: src/canonmn.cpp:762
 msgid "Drive mode setting"
 msgstr ""
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 msgid "Focus Mode"
 msgstr "Tarkennustapa"
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
+#, fuzzy
 msgid "Focus mode setting"
-msgstr ""
+msgstr "Tarkennustapa"
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 msgid "Image Size"
 msgstr "Kuvan koko"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
+#, fuzzy
 msgid "Easy Mode"
-msgstr ""
+msgstr "Salaman tila"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
+#, fuzzy
 msgid "Easy shooting mode"
-msgstr ""
+msgstr "Täysautomaatti"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 msgid "Digital Zoom"
 msgstr "Digitaalinen zoom"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 msgid "Digital zoom"
 msgstr "Digitaalinen zoom"
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
+#, fuzzy
 msgid "Contrast setting"
-msgstr ""
+msgstr "Kontrasti"
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr "Värikylläisyys"
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
+#, fuzzy
 msgid "Saturation setting"
-msgstr ""
+msgstr "Värikylläisyys"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr "Terävyys"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
+#, fuzzy
 msgid "Sharpness setting"
-msgstr ""
+msgstr "Terävyys"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 msgid "ISO Speed Mode"
 msgstr "ISO-herkkyys"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
+#, fuzzy
 msgid "ISO speed setting"
-msgstr ""
+msgstr "ISO-herkkyys"
 
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
 msgstr "Mittaustapa"
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
+#, fuzzy
 msgid "Metering mode setting"
-msgstr ""
+msgstr "Mittaustapa"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
+#, fuzzy
 msgid "Focus Type"
-msgstr ""
+msgstr "Tarkennustapa"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus type setting"
 msgstr ""
 
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-msgid "AF Point"
-msgstr "AF-piste"
-
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 msgid "AF point selected"
 msgstr "Valittu AF-piste"
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 msgid "Exposure Program"
 msgstr "Kuvaustapa"
 
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
+#, fuzzy
 msgid "Exposure mode setting"
-msgstr ""
+msgstr "Valotustila"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 msgid "Lens Type"
 msgstr "Linssin tyyppi"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 msgid "Lens type"
 msgstr "Linssin tyyppi"
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 msgid "Lens"
 msgstr "Linssi"
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
 msgstr ""
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
-msgid "Max Aperture"
+#: src/canonmn.cpp:781
+msgid "Short Focal"
 msgstr ""
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:781
+#, fuzzy
+msgid "Short focal"
+msgstr "Käytetty AF-piste"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal Units"
+msgstr "Polttoväli"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal units"
+msgstr "Polttoväli"
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
+#, fuzzy
+msgid "Max Aperture"
+msgstr "Aukko"
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
+#, fuzzy
 msgid "Max aperture"
-msgstr ""
+msgstr "Aukko"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
+#, fuzzy
 msgid "Min Aperture"
-msgstr ""
+msgstr "Aukko"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
+#, fuzzy
 msgid "Min aperture"
-msgstr ""
+msgstr "Aukko"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
+#, fuzzy
 msgid "Flash Activity"
-msgstr ""
+msgstr "Salaman tyyppi"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
+#, fuzzy
 msgid "Flash activity"
-msgstr ""
+msgstr "Salaman tyyppi"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
+#, fuzzy
 msgid "Flash Details"
-msgstr ""
+msgstr "Salamavalotuksen korjaus"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
+#, fuzzy
 msgid "Flash details"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus Continuous"
 msgstr ""
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus continuous setting"
 msgstr ""
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
+#, fuzzy
 msgid "AESetting"
-msgstr ""
+msgstr "Asetukset"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
+#, fuzzy
 msgid "AE setting"
-msgstr ""
+msgstr "Asetukset"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 msgid "Image Stabilization"
 msgstr "Kuvan vakautus"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 msgid "Image stabilization"
 msgstr "Kuvan vakautus"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
+#, fuzzy
 msgid "Display Aperture"
-msgstr ""
+msgstr "Aukko"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
+#, fuzzy
 msgid "Display aperture"
-msgstr ""
+msgstr "Aukko"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom Source Width"
 msgstr ""
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom source width"
 msgstr ""
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom Target Width"
 msgstr ""
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom target width"
 msgstr ""
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot Metering Mode"
+msgstr "Mittaustapa"
+
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot metering mode"
+msgstr "Mittaustapa"
+
+#: src/canonmn.cpp:797
 msgid "Photo Effect"
 msgstr ""
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 msgid "Photo effect"
 msgstr ""
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual Flash Output"
+msgstr "Manuaalinen"
+
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual flash output"
+msgstr "Käsintarkennus, MF"
+
+#: src/canonmn.cpp:799
+#, fuzzy
 msgid "Color Tone"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
+#, fuzzy
 msgid "Color tone"
+msgstr "Väriavaruus"
+
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
 msgstr ""
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+#, fuzzy
+msgid "SRAW quality"
+msgstr "Kuvan laatu"
+
+#: src/canonmn.cpp:802
+#, fuzzy
 msgid "Unknown Canon Camera Settings 1 tag"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 msgid "Sunny"
 msgstr "Päivänvalo"
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 msgid "Cloudy"
 msgstr "Pilvinen"
 
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 msgid "Tungsten"
 msgstr "Keinovalo"
 
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
 msgstr "Valkoinen loisteputki"
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
 msgid "Black & White"
 msgstr "Mustavalkoinen"
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr "Varjo"
 
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 msgid "Manual Temperature (Kelvin)"
 msgstr "Oma asetus (Kelvin)"
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
 msgstr ""
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
 msgstr ""
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
 msgstr ""
 
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
+#, fuzzy
 msgid "Daylight Fluorescent"
-msgstr ""
+msgstr "Valkoinen loisteputki"
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 msgid "Custom 1"
 msgstr ""
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 msgid "Custom 2"
 msgstr ""
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+msgid "Custom 3"
+msgstr ""
+
+#: src/canonmn.cpp:831
+msgid "PC Set 4"
+msgstr ""
+
+#: src/canonmn.cpp:832
+msgid "PC Set 5"
+msgstr ""
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 msgid "left"
 msgstr ""
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 msgid "center"
 msgstr ""
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
+#, fuzzy
 msgid "right"
-msgstr ""
+msgstr "Omistusoikeus"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO Speed Used"
 msgstr "ISO-herkkyys"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO speed used"
 msgstr "ISO-herkkyys"
 
-#: src/canonmn.cpp:758
-msgid "Target Aperture"
+#: src/canonmn.cpp:867
+msgid "Measured EV"
 msgstr ""
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:868
+#, fuzzy
+msgid "Target Aperture"
+msgstr "Aukko"
+
+#: src/canonmn.cpp:869
+#, fuzzy
 msgid "Target Shutter Speed"
-msgstr ""
+msgstr "Valotusaika"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
+#, fuzzy
 msgid "Target shutter speed"
-msgstr ""
+msgstr "Valotusaika"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr "Valkotasapaino"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
+#, fuzzy
 msgid "White balance setting"
-msgstr ""
+msgstr "Valkotasapaino"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence"
 msgstr ""
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
 msgstr ""
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF Point Used"
 msgstr "Käytetty AF-piste"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF point used"
 msgstr "Käytetty AF-piste"
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 msgid "Flash Bias"
 msgstr "Salamavalotuksen korjaus"
 
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
 msgstr "Kohteen etäisyys"
 
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 msgid "Subject distance (units are not clear)"
 msgstr ""
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 msgid "Aperture Value"
 msgstr "Aukko"
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 msgid "Shutter Speed Value"
 msgstr "Valotusaika"
 
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr "Valotusaika"
 
-#: src/canonmn.cpp:782
-msgid "Unknown Canon Camera Settings 2 tag"
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
 msgstr ""
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+#: src/canonmn.cpp:892
+#, fuzzy
+msgid "Unknown Canon Camera Settings 2 tag"
+msgstr "Kameran asetukset"
+
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 msgid "Left to right"
 msgstr ""
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 msgid "Right to left"
 msgstr ""
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 msgid "Bottom to top"
 msgstr ""
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 msgid "Top to bottom"
 msgstr ""
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
 msgstr ""
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
+#, fuzzy
 msgid "Panorama Frame"
-msgstr ""
+msgstr "Panoraama"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
+#, fuzzy
 msgid "Panorama frame number"
-msgstr ""
+msgstr "Kameran sarjanumero"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
+#, fuzzy
 msgid "Panorama Direction"
-msgstr ""
+msgstr "Panoraama"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
+#, fuzzy
 msgid "Panorama direction"
-msgstr ""
+msgstr "Panoraama"
 
-#: src/canonmn.cpp:804
+#: src/canonmn.cpp:914
 msgid "Unknown Canon Panorama tag"
 msgstr ""
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 msgid "Noise Reduction"
 msgstr ""
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
+#, fuzzy
 msgid "Long exposure noise reduction"
-msgstr ""
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
+#, fuzzy
 msgid "Shutter Ae Lock"
-msgstr ""
+msgstr "Valotusaika"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 msgid "Shutter/AE lock buttons"
 msgstr ""
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr ""
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr ""
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
 msgid "Exposure Level Increments"
 msgstr ""
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
 msgid "AF Assist"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
 msgstr ""
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
+#, fuzzy
 msgid "Flash Sync Speed Av"
-msgstr ""
+msgstr "Salaman tyyppi"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
+#, fuzzy
 msgid "Shutter speed in Av mode"
-msgstr ""
+msgstr "Valotusaika"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB Sequence"
 msgstr ""
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB sequence/auto cancellation"
 msgstr ""
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
+#, fuzzy
 msgid "Shutter Curtain Sync"
-msgstr ""
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
+#, fuzzy
 msgid "Shutter curtain sync"
-msgstr ""
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
+#, fuzzy
 msgid "Lens AF Stop Button"
-msgstr ""
+msgstr "Linssin tyyppi"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF stop button Fn. Switch"
 msgstr ""
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Fill Flash Auto Reduction"
 msgstr ""
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu button return position"
 msgstr ""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "Set Button Function"
 msgstr ""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor Cleaning"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor cleaning"
 msgstr ""
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
 msgstr ""
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
 msgid "Unknown Canon Custom Function tag"
 msgstr ""
 
-#: src/canonmn.cpp:841
+#: src/canonmn.cpp:951
 msgid "mid-right"
 msgstr ""
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 msgid "bottom"
 msgstr ""
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 msgid "top"
 msgstr ""
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
 msgid "mid-left"
 msgstr ""
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
 msgid "upper-left"
 msgstr ""
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
+#, fuzzy
 msgid "upper-right"
-msgstr ""
+msgstr "Omistusoikeus"
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
 msgid "lower-left"
 msgstr ""
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
+#, fuzzy
 msgid "lower-right"
-msgstr ""
+msgstr "Omistusoikeus"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
+#, fuzzy
 msgid "Image Width"
-msgstr ""
+msgstr "Kuvan laatu"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
+#, fuzzy
 msgid "Image width"
-msgstr ""
+msgstr "Kuvan laatu"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
+#, fuzzy
 msgid "Image Height"
-msgstr ""
+msgstr "Kuvan tyyppi"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
+#, fuzzy
 msgid "Image height"
-msgstr ""
+msgstr "Kuvan laatu"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image Width As Shot"
 msgstr ""
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image width (as shot)"
 msgstr ""
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
+#, fuzzy
 msgid "Image Height As Shot"
-msgstr ""
+msgstr "Kuvan tyyppi"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image height (as shot)"
 msgstr ""
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
+#, fuzzy
 msgid "AF Points Used"
-msgstr ""
+msgstr "Käytetty AF-piste"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
+#, fuzzy
 msgid "AF points used"
-msgstr ""
+msgstr "Käytetty AF-piste"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
+#, fuzzy
 msgid "AF Points Used 20D"
-msgstr ""
+msgstr "Käytetty AF-piste"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
+#, fuzzy
 msgid "AF points used (20D)"
-msgstr ""
+msgstr "Käytetty AF-piste"
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 msgid "Unknown Canon Picture Info tag"
 msgstr ""
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
 msgid "ISO"
 msgstr ""
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 msgid "WB"
 msgstr ""
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
 msgstr ""
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
 msgstr ""
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 #, fuzzy
 msgid "Medium Movie"
 msgstr "Keskikokoinen"
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 #, fuzzy
 msgid "Small Movie"
 msgstr "Pieni"
 
-#: src/canonmn.cpp:905
+#: src/canonmn.cpp:1015
 #, fuzzy
 msgid "On 1"
 msgstr "Päällä"
 
-#: src/canonmn.cpp:906
+#: src/canonmn.cpp:1016
 #, fuzzy
 msgid "On 2"
 msgstr "Päällä"
 
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 #, fuzzy
 msgid "On (shift AB)"
 msgstr "Kertatarkennus, AF"
 
-#: src/canonmn.cpp:915
+#: src/canonmn.cpp:1025
+#, fuzzy
 msgid "On (shift GM)"
-msgstr ""
+msgstr "Kertatarkennus, AF"
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
 msgstr ""
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 msgid "Orange"
 msgstr ""
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 msgid "Red"
 msgstr ""
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 msgid "Green"
 msgstr ""
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
+#, fuzzy
 msgid "Blue"
-msgstr ""
+msgstr "arvo"
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
 msgstr ""
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Makrotila"
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
+#, fuzzy
 msgid "Bracket Value"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
+#, fuzzy
 msgid "Bracket Shot Number"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 #, fuzzy
 msgid "Raw Jpg Quality"
 msgstr "Kuvan laatu"
 
-#: src/canonmn.cpp:943
+#: src/canonmn.cpp:1053
 #, fuzzy
 msgid "Raw Jpg Size"
 msgstr "Kuvan koko"
 
-#: src/canonmn.cpp:945
+#: src/canonmn.cpp:1055
+#, fuzzy
 msgid "WB Bracket Mode"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/canonmn.cpp:946
+#: src/canonmn.cpp:1056
 msgid "WB Bracket Value AB"
 msgstr ""
 
-#: src/canonmn.cpp:947
+#: src/canonmn.cpp:1057
 msgid "WB Bracket Value GM"
 msgstr ""
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 msgid "Filter Effect"
 msgstr ""
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 msgid "Toning Effect"
 msgstr ""
 
-#: src/canonmn.cpp:951
+#: src/canonmn.cpp:1060
+msgid "Macro Magnification"
+msgstr ""
+
+#: src/canonmn.cpp:1060
+msgid "Macro magnification"
+msgstr ""
+
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
+msgstr ""
+
+#: src/canonmn.cpp:1061
+msgid "Live view shooting"
+msgstr ""
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash Exposure Lock"
+msgstr "Valotuksen korjaus"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash exposure lock"
+msgstr "Automaattivalotus"
+
+#: src/canonmn.cpp:1064
 msgid "Unknown Canon File Info tag"
 msgstr ""
 
-#: src/crwimage.cpp:663
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
+msgstr ""
+
+#: src/canonmn.cpp:1082
+msgid "Lowest"
+msgstr ""
+
+#: src/canonmn.cpp:1086
+msgid "Highest"
+msgstr ""
+
+#: src/canonmn.cpp:1094
+#, fuzzy
+msgid "High Saturation"
+msgstr "Värikylläisyys"
+
+#: src/canonmn.cpp:1096
+#, fuzzy
+msgid "Low Saturation"
+msgstr "Värikylläisyys"
+
+#: src/canonmn.cpp:1097
+msgid "CM Set 1"
+msgstr ""
+
+#: src/canonmn.cpp:1098
+msgid "CM Set 2"
+msgstr ""
+
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
+msgstr ""
+
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
+msgstr ""
+
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
+msgstr ""
+
+#: src/canonmn.cpp:1102
+msgid "PC 1"
+msgstr ""
+
+#: src/canonmn.cpp:1103
+msgid "PC 2"
+msgstr ""
+
+#: src/canonmn.cpp:1104
+msgid "PC 3"
+msgstr ""
+
+#: src/canonmn.cpp:1109
+msgid "Faithful"
+msgstr ""
+
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+#, fuzzy
+msgid "Monochrome"
+msgstr "Makrotila"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "ToneCurve"
+msgstr "Kontrasti"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "Tone curve"
+msgstr "Kontrasti"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "SharpnessFrequency"
+msgstr "Terävyys"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "Sharpness frequency"
+msgstr "Terävyys"
+
+#: src/canonmn.cpp:1118
+msgid "SensorRedLevel"
+msgstr ""
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "Sensor red level"
+msgstr "Salaman malli"
+
+#: src/canonmn.cpp:1119
+msgid "SensorBlueLevel"
+msgstr ""
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "Sensor blue level"
+msgstr "Salaman malli"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "WhiteBalanceRed"
+msgstr "Valkotasapaino"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "White balance red"
+msgstr "Valkotasapaino"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "WhiteBalanceBlue"
+msgstr " "
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "White balance blue"
+msgstr " "
+
+#: src/canonmn.cpp:1122
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Valkotasapaino"
+
+#: src/canonmn.cpp:1123
+#, fuzzy
+msgid "ColorTemperature"
+msgstr "Väriavaruus"
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+#, fuzzy
+msgid "Color Temperature"
+msgstr "Väriavaruus"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "PictureStyle"
+msgstr "Kuvan tiedot"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "Picture style"
+msgstr "Kuvan tiedot"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "DigitalGain"
+msgstr "Digitaalinen makro"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "Digital gain"
+msgstr "Digitaalinen makro"
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+#, fuzzy
+msgid "WBShift AB"
+msgstr "Kertatarkennus, AF"
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+#, fuzzy
+msgid "WB Shift GM"
+msgstr "Kertatarkennus, AF"
+
+#: src/canonmn.cpp:1128
+#, fuzzy
+msgid "Unknown Canon Processing Info tag"
+msgstr "Kameran asetukset"
+
+#: src/crwimage.cpp:664
 msgid "Header, offset"
 msgstr ""
 
-#: src/crwimage.cpp:680
+#: src/crwimage.cpp:681
 msgid "tag"
 msgstr ""
 
-#: src/crwimage.cpp:682
+#: src/crwimage.cpp:683
 msgid "dir"
 msgstr ""
 
-#: src/crwimage.cpp:684
+#: src/crwimage.cpp:685
 msgid "type"
 msgstr ""
 
-#: src/crwimage.cpp:685
+#: src/crwimage.cpp:686
 msgid "size"
 msgstr ""
 
-#: src/crwimage.cpp:686
+#: src/crwimage.cpp:687
 msgid "offset"
 msgstr ""
 
@@ -2333,8 +3021,9 @@
 msgstr ""
 
 #: src/datasets.cpp:85
+#, fuzzy
 msgid "Model Version"
-msgstr ""
+msgstr "Ohjelman versio"
 
 #: src/datasets.cpp:86
 msgid ""
@@ -2343,10 +3032,11 @@
 "IPTC and NAA organizations."
 msgstr ""
 
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
+#, fuzzy
 msgid "Destination"
-msgstr ""
+msgstr "Kuvan vakautus"
 
 #: src/datasets.cpp:91
 msgid ""
@@ -2354,9 +3044,10 @@
 "information above the appropriate OSI layers."
 msgstr ""
 
-#: src/datasets.cpp:94
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
+#, fuzzy
 msgid "File Format"
-msgstr ""
+msgstr "Lukuvirhe"
 
 #: src/datasets.cpp:95
 msgid ""
@@ -2367,8 +3058,9 @@
 msgstr ""
 
 #: src/datasets.cpp:101
+#, fuzzy
 msgid "File Version"
-msgstr ""
+msgstr "Firmwaren versio"
 
 #: src/datasets.cpp:102
 msgid ""
@@ -2385,8 +3077,9 @@
 msgstr ""
 
 #: src/datasets.cpp:108
+#, fuzzy
 msgid "Envelope Number"
-msgstr ""
+msgstr "F-luku"
 
 #: src/datasets.cpp:109
 msgid ""
@@ -2422,8 +3115,9 @@
 msgstr ""
 
 #: src/datasets.cpp:129
+#, fuzzy
 msgid "Date Sent"
-msgstr ""
+msgstr "Päiväys ja aika"
 
 #: src/datasets.cpp:130
 msgid ""
@@ -2478,8 +3172,9 @@
 msgstr ""
 
 #: src/datasets.cpp:156
+#, fuzzy
 msgid "ARM Version"
-msgstr ""
+msgstr "Ohjelman versio"
 
 #: src/datasets.cpp:157
 msgid ""
@@ -2488,8 +3183,9 @@
 msgstr ""
 
 #: src/datasets.cpp:170
+#, fuzzy
 msgid "Record Version"
-msgstr ""
+msgstr "Ohjelman versio"
 
 #: src/datasets.cpp:171
 msgid ""
@@ -2499,8 +3195,9 @@
 msgstr ""
 
 #: src/datasets.cpp:175
+#, fuzzy
 msgid "Object Type"
-msgstr ""
+msgstr "Linssin tyyppi"
 
 #: src/datasets.cpp:176
 msgid ""
@@ -2528,8 +3225,9 @@
 msgstr ""
 
 #: src/datasets.cpp:193
+#, fuzzy
 msgid "Object Name"
-msgstr ""
+msgstr "Omistajan nimi"
 
 #: src/datasets.cpp:194
 msgid ""
@@ -2542,9 +3240,10 @@
 msgid "Document Title"
 msgstr ""
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
+#, fuzzy
 msgid "Edit Status"
-msgstr ""
+msgstr "Omistusoikeus"
 
 #: src/datasets.cpp:200
 msgid "Status of the object data, according to the practice of the provider."
@@ -2561,26 +3260,27 @@
 "<ARMVersion>, according to the practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
 msgstr ""
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
+#, fuzzy
 msgid "Subject"
-msgstr ""
+msgstr "Kohteen etäisyys"
 
 #: src/datasets.cpp:214
 msgid "The Subject Reference is a structured definition of the subject matter."
 msgstr ""
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
 msgid "Category"
 msgstr ""
 
@@ -2603,13 +3303,14 @@
 "to the provider."
 msgstr ""
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
 msgstr ""
 
 #: src/datasets.cpp:229
+#, fuzzy
 msgid "Fixture Id"
-msgstr ""
+msgstr "Välähti"
 
 #: src/datasets.cpp:230
 msgid ""
@@ -2617,7 +3318,7 @@
 "immediately find or recall such an object."
 msgstr ""
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -2644,8 +3345,9 @@
 msgstr ""
 
 #: src/datasets.cpp:248
+#, fuzzy
 msgid "Location Name"
-msgstr ""
+msgstr "Omistajan nimi"
 
 #: src/datasets.cpp:249
 msgid ""
@@ -2654,9 +3356,10 @@
 "provider."
 msgstr ""
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
+#, fuzzy
 msgid "Release Date"
-msgstr ""
+msgstr "Mallin ID"
 
 #: src/datasets.cpp:254
 msgid ""
@@ -2704,7 +3407,7 @@
 "embargoes and warnings."
 msgstr ""
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 msgid "Instructions"
 msgstr ""
 
@@ -2739,8 +3442,9 @@
 msgstr ""
 
 #: src/datasets.cpp:286
+#, fuzzy
 msgid "Reference Number"
-msgstr ""
+msgstr "Sarjanumero"
 
 #: src/datasets.cpp:287
 msgid ""
@@ -2748,9 +3452,10 @@
 "object refers."
 msgstr ""
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
+#, fuzzy
 msgid "Date Created"
-msgstr ""
+msgstr "Kuvan numero"
 
 #: src/datasets.cpp:290
 msgid ""
@@ -2760,8 +3465,9 @@
 msgstr ""
 
 #: src/datasets.cpp:295
+#, fuzzy
 msgid "Time Created"
-msgstr ""
+msgstr "Kuvan numero"
 
 #: src/datasets.cpp:296
 msgid ""
@@ -2781,8 +3487,9 @@
 msgstr ""
 
 #: src/datasets.cpp:305
+#, fuzzy
 msgid "Digitization Time"
-msgstr ""
+msgstr "Päiväys ja aika"
 
 #: src/datasets.cpp:306
 msgid ""
@@ -2790,9 +3497,10 @@
 "representation of the object data was created. Follows ISO 8601 standard."
 msgstr ""
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 msgid "Program"
 msgstr "Ohjelma"
 
@@ -2840,7 +3548,7 @@
 "Where used, a by-line title should follow the by-line it modifies."
 msgstr ""
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr ""
 
@@ -2851,8 +3559,9 @@
 msgstr ""
 
 #: src/datasets.cpp:333
+#, fuzzy
 msgid "Sub Location"
-msgstr ""
+msgstr "Värikylläisyys"
 
 #: src/datasets.cpp:334
 msgid ""
@@ -2874,9 +3583,10 @@
 msgid "State/Province"
 msgstr ""
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
+#, fuzzy
 msgid "Country Code"
-msgstr ""
+msgstr "Kontrasti"
 
 #: src/datasets.cpp:343
 msgid ""
@@ -2890,8 +3600,9 @@
 msgstr ""
 
 #: src/datasets.cpp:352
+#, fuzzy
 msgid "Country Name"
-msgstr ""
+msgstr "Omistajan nimi"
 
 #: src/datasets.cpp:353
 msgid ""
@@ -2900,11 +3611,12 @@
 "guidelines of the provider."
 msgstr ""
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
+#, fuzzy
 msgid "Country"
-msgstr ""
+msgstr "Kontrasti"
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
 msgid "Transmission Reference"
 msgstr ""
 
@@ -2914,7 +3626,7 @@
 "practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
 msgid "Headline"
 msgstr ""
 
@@ -2923,7 +3635,7 @@
 "A publishable entry providing a synopsis of the contents of the object data."
 msgstr ""
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
 msgid "Credit"
 msgstr ""
 
@@ -2933,10 +3645,11 @@
 "creator."
 msgstr ""
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
+#, fuzzy
 msgid "Source"
-msgstr ""
+msgstr "Kuvalähde"
 
 #: src/datasets.cpp:372
 msgid ""
@@ -2949,12 +3662,14 @@
 msgstr ""
 
 #: src/datasets.cpp:379
+#, fuzzy
 msgid "Copyright Notice"
-msgstr ""
+msgstr "Omistusoikeus"
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
+#, fuzzy
 msgid "Contact"
-msgstr ""
+msgstr "Kontrasti"
 
 #: src/datasets.cpp:381
 msgid ""
@@ -2970,7 +3685,7 @@
 msgid "A textual description of the object data."
 msgstr ""
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 msgid "Description"
 msgstr ""
 
@@ -2999,16 +3714,18 @@
 msgstr ""
 
 #: src/datasets.cpp:399
+#, fuzzy
 msgid "Image Orientation"
-msgstr ""
+msgstr "Kuvan numero"
 
 #: src/datasets.cpp:400
 msgid "Indicates the layout of an image."
 msgstr ""
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
+#, fuzzy
 msgid "Language"
-msgstr ""
+msgstr "Suuri"
 
 #: src/datasets.cpp:403
 msgid ""
@@ -3034,8 +3751,9 @@
 msgstr ""
 
 #: src/datasets.cpp:414
+#, fuzzy
 msgid "Audio Resolution"
-msgstr ""
+msgstr "Resoluutioyksikkö"
 
 #: src/datasets.cpp:415
 msgid "Indicates the sampling resolution of an audio content."
@@ -3060,8 +3778,9 @@
 msgstr ""
 
 #: src/datasets.cpp:424
+#, fuzzy
 msgid "Preview Format"
-msgstr ""
+msgstr "Esikatselu"
 
 #: src/datasets.cpp:425
 msgid ""
@@ -3071,8 +3790,9 @@
 msgstr ""
 
 #: src/datasets.cpp:429
+#, fuzzy
 msgid "Preview Version"
-msgstr ""
+msgstr "Ohjelman versio"
 
 #: src/datasets.cpp:430
 msgid ""
@@ -3081,8 +3801,9 @@
 msgstr ""
 
 #: src/datasets.cpp:433
+#, fuzzy
 msgid "Preview Data"
-msgstr ""
+msgstr "Esikatselu"
 
 #: src/datasets.cpp:434
 msgid "Binary image preview data."
@@ -3093,220 +3814,227 @@
 msgstr ""
 
 #: src/datasets.cpp:446 src/datasets.cpp:447 src/datasets.cpp:450
+#, fuzzy
 msgid "Unknown dataset"
-msgstr ""
+msgstr "Tuntematon"
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr ""
 
-#: src/error.cpp:50
+#: src/error.cpp:56
 msgid "Success"
 msgstr ""
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr ""
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr ""
 
-#: src/error.cpp:55
+#: src/error.cpp:61
 msgid "Invalid record name `%1'"
 msgstr ""
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr ""
 
-#: src/error.cpp:57
+#: src/error.cpp:63
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
 msgstr ""
 
-#: src/error.cpp:58
+#: src/error.cpp:64
 msgid "Value not set"
 msgstr ""
 
-#: src/error.cpp:59
+#: src/error.cpp:65
+#, fuzzy
 msgid "%1: Failed to open the data source: %2"
-msgstr ""
+msgstr "Tiedoston avaus epäonnistui\n"
 
-#: src/error.cpp:60
+#: src/error.cpp:66
+#, fuzzy
 msgid "%1: Failed to open file (%2): %3"
-msgstr ""
+msgstr "Tiedoston avaus epäonnistui\n"
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr ""
 
-#: src/error.cpp:64
+#: src/error.cpp:70
+#, fuzzy
 msgid "Failed to read image data"
-msgstr ""
+msgstr "Aikaleiman lukeminen epäonnistui"
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr ""
 
-#: src/error.cpp:67
-msgid "%1: Failed to rename file to %2: %3"
+#: src/error.cpp:72
+msgid "%1: Failed to map file for reading and writing: %2"
 msgstr ""
 
-#: src/error.cpp:68
+#: src/error.cpp:73
+#, fuzzy
+msgid "%1: Failed to rename file to %2: %3"
+msgstr "Tiedoston avaus epäonnistui\n"
+
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr ""
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr ""
 
-#: src/error.cpp:70
+#: src/error.cpp:76
+#, fuzzy
 msgid "Failed to read input data"
-msgstr ""
+msgstr "Lukuvirhe"
 
-#: src/error.cpp:71
+#: src/error.cpp:77
+#, fuzzy
 msgid "Failed to write image"
-msgstr ""
+msgstr "Lukuvirhe"
 
-#: src/error.cpp:72
+#: src/error.cpp:78
 msgid "Input data does not contain a valid image"
 msgstr ""
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 msgid "Invalid ifdId %1"
 msgstr ""
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr ""
 
-#: src/error.cpp:77
+#: src/error.cpp:83
 msgid "Unsupported data area offset type"
 msgstr ""
 
-#: src/error.cpp:78
+#: src/error.cpp:84
 msgid "Invalid charset: `%1'"
 msgstr ""
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr ""
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr ""
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 msgid "Writing to %1 images is not supported"
 msgstr ""
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr ""
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr ""
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr ""
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr ""
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr ""
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr ""
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr ""
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr ""
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr ""
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 
-#: src/error.cpp:98
+#: src/error.cpp:104
 msgid "Invalid XmpText type `%1'"
 msgstr ""
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr ""
 
-#: src/error.cpp:100
+#: src/error.cpp:106
 msgid "Multiple TIFF array element tags %1 in one directory"
 msgstr ""
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr ""
 
-#: src/error.cpp:103
-msgid "(Unknown Error)"
-msgstr ""
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
 msgstr ""
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3314,7 +4042,7 @@
 "of the License, or (at your option) any later version.\n"
 msgstr ""
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3322,7 +4050,7 @@
 "GNU General Public License for more details.\n"
 msgstr ""
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3330,266 +4058,286 @@
 "Boston, MA 02110-1301 USA\n"
 msgstr ""
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr ""
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
 msgstr ""
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr ""
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
 msgstr ""
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
 msgstr ""
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr ""
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
 "                -r format, timestamp options are controlled with -t and -T.\n"
 msgstr ""
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
 "                Requires option -c, -m or -M.\n"
 msgstr ""
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
 msgstr ""
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr ""
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr ""
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr ""
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr ""
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr ""
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 msgid "   -u      Show unknown tags.\n"
 msgstr ""
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr ""
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr ""
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr ""
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr ""
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr ""
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr ""
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr ""
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr ""
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr ""
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 msgid "             p : list available previews\n"
 msgstr ""
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
 msgstr ""
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 msgid "             E : include Exif tags in the list\n"
 msgstr ""
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 msgid "             I : IPTC datasets\n"
 msgstr ""
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 msgid "             X : XMP properties\n"
 msgstr ""
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 msgid "             x : print a column with the tag number\n"
 msgstr ""
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr ""
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr ""
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr ""
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr ""
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr ""
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr ""
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr ""
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr ""
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr ""
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr ""
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr ""
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr ""
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr ""
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr ""
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr ""
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr ""
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
 "           the same as those for the -d option, plus a modifier:\n"
@@ -3598,7 +4346,7 @@
 "           <file>-thumb.jpg\n"
 msgstr ""
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
 "           are the same as those for the -d option, plus a target to "
@@ -3608,614 +4356,655 @@
 "             X : Extract metadata to an XMP sidecar file <file>.xmp\n"
 msgstr ""
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
 msgstr ""
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr ""
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr ""
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr ""
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr ""
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
 msgstr ""
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
 msgstr ""
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
 msgstr ""
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
 msgstr ""
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 msgid "Option"
 msgstr ""
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr ""
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr ""
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr ""
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr ""
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr ""
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr ""
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 msgid "Error parsing"
 msgstr ""
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 msgid "option argument"
 msgstr ""
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr ""
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr ""
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr ""
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr ""
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr ""
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr ""
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr ""
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr ""
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr ""
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr ""
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr ""
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 msgid "target"
 msgstr ""
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 msgid "Invalid preview number"
 msgstr ""
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr ""
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 msgid "line"
 msgstr ""
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 msgid "-M option"
 msgstr ""
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr ""
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr ""
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
 msgstr ""
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
 msgid "Soft mode 1"
 msgstr ""
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
 msgid "Soft mode 2"
 msgstr ""
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
+#, fuzzy
 msgid "Hard mode 1"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
+#, fuzzy
 msgid "Hard mode 2"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr ""
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
+#, fuzzy
 msgid "Fluorescent (daylight)"
-msgstr ""
+msgstr "Valkoinen loisteputki"
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
+#, fuzzy
 msgid "Fluorescent (warm white)"
-msgstr ""
+msgstr "Valkoinen loisteputki"
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
+#, fuzzy
 msgid "Fluorescent (cool white)"
-msgstr ""
+msgstr "Valkoinen loisteputki"
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
 msgid "Incandescent"
 msgstr ""
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
+#, fuzzy
 msgid "None (black & white)"
-msgstr ""
+msgstr "Mustavalko"
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
+#, fuzzy
 msgid "Red-eye reduction"
-msgstr ""
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr ""
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
+#, fuzzy
 msgid "Program AE"
-msgstr ""
+msgstr "Ohjelma"
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 msgid "Natural light"
 msgstr ""
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
 msgid "Anti-blur"
 msgstr ""
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
+#, fuzzy
 msgid "Sunset"
-msgstr ""
+msgstr "Aseta"
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
+#, fuzzy
 msgid "Museum"
-msgstr ""
+msgstr "Keskikokoinen"
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
+#, fuzzy
 msgid "Party"
-msgstr ""
+msgstr "Osa-alue"
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 msgid "Flower"
 msgstr ""
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
 msgstr ""
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
 msgid "Natural light & flash"
 msgstr ""
 
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
+#, fuzzy
 msgid "Aperture-priority AE"
-msgstr ""
+msgstr "Aukon esivalinta (Av)"
 
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
+#, fuzzy
 msgid "Shutter speed priority AE"
-msgstr ""
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
 msgid "No flash & flash"
 msgstr ""
 
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr ""
-
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
 msgid "Chrome"
 msgstr ""
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
 msgid "Wide"
 msgstr ""
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
 msgid "F0/Standard"
 msgstr ""
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 msgid "F1/Studio portrait"
 msgstr ""
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
 msgstr ""
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
 msgid "F3/Studio portrait Ex"
 msgstr ""
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr ""
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr ""
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr ""
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
 msgid "Standard (100%)"
 msgstr ""
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
 msgstr ""
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
 msgstr ""
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
 msgid "Film simulation mode"
 msgstr ""
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
+#, fuzzy
 msgid "Version"
-msgstr ""
+msgstr "Ohjelman versio"
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
+#, fuzzy
 msgid "Fujifilm Makernote version"
-msgstr ""
+msgstr "Firmwaren versio"
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
 msgstr ""
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
+#, fuzzy
 msgid "Image quality setting"
-msgstr ""
+msgstr "Kuvan laatu"
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
+#, fuzzy
 msgid "Color"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 msgid "Chroma saturation setting"
 msgstr ""
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
+#, fuzzy
 msgid "Tone"
-msgstr ""
+msgstr "Ei käytössä"
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
 msgid "Flash firing mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
+#, fuzzy
 msgid "Flash Strength"
-msgstr ""
+msgstr "Salaman tyyppi"
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
 msgid "Flash firing strength compensation setting"
 msgstr ""
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
+#, fuzzy
 msgid "Macro mode setting"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 msgid "Focusing mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
 msgstr ""
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
 msgid "Slow synchro mode setting"
 msgstr ""
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
+#, fuzzy
 msgid "Picture Mode"
-msgstr ""
+msgstr "Kuvan tiedot"
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
+#, fuzzy
 msgid "Picture mode setting"
-msgstr ""
+msgstr "Kuvan tiedot"
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr ""
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
+#, fuzzy
 msgid "Sequence Number"
-msgstr ""
+msgstr "Sarjanumero"
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 msgid "Sequence number"
 msgstr ""
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
 msgid "FinePix Color"
 msgstr ""
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
 msgstr ""
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
+#, fuzzy
 msgid "Blur Warning"
-msgstr ""
+msgstr "Varoitus"
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
 msgid "Blur warning status"
 msgstr ""
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
+#, fuzzy
 msgid "Focus Warning"
-msgstr ""
+msgstr "Varoitus"
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
 msgid "Auto Focus warning status"
 msgstr ""
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
+#, fuzzy
 msgid "Exposure Warning"
-msgstr ""
+msgstr "Valotuksen korjaus"
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
 msgid "Auto exposure warning status"
 msgstr ""
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
 msgid "Dynamic Range"
 msgstr ""
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
 msgid "Dynamic range"
 msgstr ""
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
+#, fuzzy
 msgid "Film Mode"
-msgstr ""
+msgstr "Salaman tila"
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
+#, fuzzy
 msgid "Film mode"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
+#, fuzzy
 msgid "Dynamic Range Setting"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
+#, fuzzy
 msgid "Dynamic range settings"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
 msgid "Development Dynamic Range"
 msgstr ""
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
 msgid "Development dynamic range"
 msgstr ""
 
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
+#, fuzzy
 msgid "Minimum Focal Length"
-msgstr ""
+msgstr "Polttoväli"
 
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
+#, fuzzy
 msgid "Minimum focal length"
-msgstr ""
+msgstr "Polttoväli"
 
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
+#, fuzzy
 msgid "Maximum Focal Length"
-msgstr ""
+msgstr "Polttoväli"
 
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
+#, fuzzy
 msgid "Maximum focal length"
-msgstr ""
+msgstr "Polttoväli"
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
 msgid "Maximum Aperture at Mininimum Focal"
 msgstr ""
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
 msgid "Maximum aperture at mininimum focal"
 msgstr ""
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
 msgid "Maximum Aperture at Maxinimum Focal"
 msgstr ""
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
 msgid "Maximum aperture at maxinimum focal"
 msgstr ""
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr "Kuvalähde"
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 msgid "File source"
 msgstr "Kuvalähde"
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
+#, fuzzy
 msgid "Order Number"
-msgstr ""
+msgstr "Sarjanumero"
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
+#, fuzzy
 msgid "Order number"
-msgstr ""
+msgstr "Tiedostonimi"
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
+#, fuzzy
 msgid "Frame Number"
-msgstr ""
+msgstr "F-luku"
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
+#, fuzzy
 msgid "Frame number"
-msgstr ""
+msgstr "Tiedostonimi"
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
 msgid "Unknown FujiMakerNote tag"
 msgstr ""
 
@@ -4223,22 +5012,24 @@
 msgid "Natural Color"
 msgstr ""
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
 msgid "Vivid Color"
 msgstr ""
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
+#, fuzzy
 msgid "Solarization"
-msgstr ""
+msgstr "Värikylläisyys"
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr ""
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
+#, fuzzy
 msgid "Natural"
-msgstr ""
+msgstr "Neutraali"
 
 #: src/minoltamn.cpp:64
 msgid "Natural sRGB"
@@ -4252,10486 +5043,13789 @@
 msgid "Evening"
 msgstr ""
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
+#, fuzzy
 msgid "Night Portrait"
-msgstr ""
+msgstr "Muotokuva"
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
 msgid "Super Fine"
 msgstr ""
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
 msgid "Extra Fine"
 msgstr ""
 
-#: src/minoltamn.cpp:84
-msgid "ISO Setting Used"
-msgstr ""
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr ""
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr ""
-
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
+#, fuzzy
 msgid "Makernote Version"
-msgstr ""
+msgstr "Firmwaren versio"
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr ""
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
+#, fuzzy
 msgid "Camera Settings (Std Old)"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
+#, fuzzy
 msgid "Camera Settings (Std New)"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
+#, fuzzy
 msgid "Camera Settings (7D)"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
 msgid "Camera Settings (for Dynax 7D model)"
 msgstr ""
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
+#, fuzzy
 msgid "Image Stabilization Data"
-msgstr ""
+msgstr "Kuvan vakautus"
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
+#, fuzzy
 msgid "Image stabilization data"
+msgstr "Kuvan vakautus"
+
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
 msgstr ""
 
-#: src/minoltamn.cpp:247
-msgid "Compressed Image Size"
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
 msgstr ""
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:111
+#, fuzzy
+msgid "Compressed Image Size"
+msgstr "Kuvan koko"
+
+#: src/minoltamn.cpp:112
 msgid "Compressed image size"
 msgstr ""
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
 msgstr ""
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
+#, fuzzy
 msgid "Thumbnail Offset"
-msgstr ""
+msgstr "Näytekuvat"
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr ""
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
+#, fuzzy
 msgid "Thumbnail Length"
-msgstr ""
+msgstr "Näytekuva"
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
+#, fuzzy
 msgid "Size of the thumbnail"
-msgstr ""
+msgstr "Tallennetaan näytekuvaa"
+
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+#, fuzzy
+msgid "Scene Mode"
+msgstr "Linssin malli"
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
+#, fuzzy
 msgid "Color Mode"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#, fuzzy
 msgid "Color mode"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
+#, fuzzy
 msgid "Image Quality"
+msgstr "Kuvan laatu"
+
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
 msgstr ""
 
-#: src/minoltamn.cpp:271
-msgid "Zone Matching"
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+msgid "Flash Exposure Compensation"
 msgstr ""
 
-#: src/minoltamn.cpp:272
-msgid "Zone matching"
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+msgid "Flash exposure compensation in EV"
 msgstr ""
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
-msgid "Color Temperature"
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+msgid "Teleconverter Model"
 msgstr ""
 
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
-msgid "Color temperature"
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
 msgstr ""
 
-#: src/minoltamn.cpp:277
-msgid "Lens ID"
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
+msgstr ""
+
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
+msgid "Zone Matching"
 msgstr ""
 
-#: src/minoltamn.cpp:278
+#: src/minoltamn.cpp:154
+msgid "Zone matching"
+msgstr ""
+
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
+#, fuzzy
+msgid "Color temperature"
+msgstr "Väriavaruus"
+
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
+#, fuzzy
+msgid "Lens ID"
+msgstr "Linssi"
+
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
+#, fuzzy
 msgid "Lens identifier"
+msgstr "Linssin ominaisuudet"
+
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+msgid "Color Compensation Filter"
 msgstr ""
 
-#: src/minoltamn.cpp:280
-msgid "Camera Settings (5D)"
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
 msgstr ""
 
-#: src/minoltamn.cpp:281
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+#, fuzzy
+msgid "White Balance Fine Tune"
+msgstr "Valkotasapaino"
+
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+#, fuzzy
+msgid "White Balance Fine Tune Value"
+msgstr " "
+
+#: src/minoltamn.cpp:168
+#, fuzzy
+msgid "Image Stabilization A100"
+msgstr "Kuvan vakautus"
+
+#: src/minoltamn.cpp:169
+#, fuzzy
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr "Kuvan vakautus"
+
+#: src/minoltamn.cpp:173
+#, fuzzy
+msgid "Camera Settings (5D)"
+msgstr "Kameran asetukset"
+
+#: src/minoltamn.cpp:174
 msgid "Camera Settings (for Dynax 5D model)"
 msgstr ""
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
 msgid "Print IM"
 msgstr ""
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
 msgid "PrintIM information"
 msgstr ""
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:183
+#, fuzzy
 msgid "Camera Settings (Z1)"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr ""
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
 msgid "Unknown Minolta MakerNote tag"
 msgstr ""
 
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr ""
 
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr ""
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
+#, fuzzy
 msgid "Fill flash"
-msgstr ""
+msgstr "Salama"
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
 msgid "Rear flash sync"
 msgstr ""
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
+#, fuzzy
 msgid "Wireless"
-msgstr ""
+msgstr "Päällä, langaton"
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
+#, fuzzy
 msgid "Fluorescent 2"
-msgstr ""
-
-#: src/minoltamn.cpp:329 src/properties.cpp:763
-msgid "Custom 3"
-msgstr ""
+msgstr "Valkoinen loisteputki"
 
-#: src/minoltamn.cpp:334
+#: src/minoltamn.cpp:231
+#, fuzzy
 msgid "Full size"
-msgstr ""
+msgstr "Tiedoston koko"
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
 msgid "Super fine"
 msgstr ""
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr ""
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+#, fuzzy
+msgid "Single Frame"
+msgstr "Tiedostonimi"
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
 msgid "Self-timer"
 msgstr ""
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
+#, fuzzy
 msgid "Bracketing"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
+#, fuzzy
 msgid "Interval"
-msgstr ""
+msgstr "Sisäinen salama"
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
 msgid "UHS continuous"
 msgstr ""
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
 msgid "HS continuous"
 msgstr ""
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
 msgid "Multi-segment"
 msgstr ""
 
-#: src/minoltamn.cpp:380
-msgid "Electronic magnification"
-msgstr ""
-
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
-msgid "Top"
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+#, fuzzy
+msgid "Center weighted average"
+msgstr "Keskustaa painottava"
+
+#: src/minoltamn.cpp:271
+msgid "Electronic magnification"
 msgstr ""
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
-msgid "Top-right"
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
+msgid "Top"
 msgstr ""
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
+#, fuzzy
+msgid "Top-right"
+msgstr "Omistusoikeus"
+
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 msgid "Bottom-right"
 msgstr ""
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
 msgid "Bottom"
 msgstr ""
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
 msgid "Bottom-left"
 msgstr ""
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
 msgid "Top-left"
 msgstr ""
 
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
 msgid "Hard"
 msgstr ""
 
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
+#, fuzzy
 msgid "Soft"
-msgstr ""
+msgstr "Piste"
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
+#, fuzzy
 msgid "Night portrait"
-msgstr ""
+msgstr "Muotokuva"
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
+#, fuzzy
 msgid "Sports action"
-msgstr ""
+msgstr "Urheilukuva"
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr ""
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 msgid "Standard form"
 msgstr ""
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
 msgid "Data form"
 msgstr ""
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
 msgid "Natural color"
 msgstr ""
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
+#, fuzzy
 msgid "Black and white"
-msgstr ""
+msgstr "Mustavalko"
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
 msgid "Vivid color"
 msgstr ""
 
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr ""
-
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
+#, fuzzy
 msgid "No zone"
-msgstr ""
+msgstr "Ei käytössä"
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
 msgid "Left zone"
 msgstr ""
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 msgid "Right zone"
 msgstr ""
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
+#, fuzzy
 msgid "Auto focus"
-msgstr ""
+msgstr "Vaihtuva tarkennus, AF"
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
 msgid "Wide focus (normal)"
 msgstr ""
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
+#, fuzzy
 msgid "Spot focus"
-msgstr ""
+msgstr "Käytetty AF-piste"
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
+#, fuzzy
 msgid "Exposure"
-msgstr ""
+msgstr "Valotuksen korjaus"
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 msgid "Filter"
 msgstr ""
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 msgid "Not embedded"
 msgstr ""
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
 msgid "Embedded"
 msgstr ""
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr ""
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr ""
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr ""
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
+#, fuzzy
 msgid "Manual flash control"
-msgstr ""
+msgstr "Täysautomatiikka"
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr "Valotustila"
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
+#, fuzzy
 msgid "Flash mode"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
+#, fuzzy
 msgid "Drive mode"
-msgstr ""
-
-#: src/minoltamn.cpp:631
-msgid "Exposure Speed"
-msgstr ""
+msgstr "Kameran malli"
 
-#: src/minoltamn.cpp:632
-msgid "Exposure speed"
-msgstr ""
+#: src/minoltamn.cpp:512
+#, fuzzy
+msgid "ISO Value"
+msgstr "ISO-herkkyys"
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr "Valotusaika"
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 msgid "FNumber"
 msgstr "F-luku"
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 msgid "The F-Number"
 msgstr "F-luku"
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 msgid "Macro Mode"
 msgstr "Makrotila"
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
+#, fuzzy
 msgid "Exposure Compensation"
-msgstr ""
+msgstr "Valotustila"
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
+#, fuzzy
 msgid "Bracket Step"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
+#, fuzzy
 msgid "Bracket step"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
+#, fuzzy
 msgid "Interval Length"
-msgstr ""
+msgstr "Polttoväli"
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
+#, fuzzy
 msgid "Interval length"
-msgstr ""
+msgstr "Sisäinen salama"
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
+#, fuzzy
 msgid "Interval Number"
-msgstr ""
+msgstr "Sarjanumero"
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
+#, fuzzy
 msgid "Interval number"
-msgstr ""
+msgstr "Linssin sarjanumero"
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
+#, fuzzy
 msgid "Focus Distance"
-msgstr ""
+msgstr "Kohteen etäisyys"
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
+#, fuzzy
 msgid "Focus distance"
-msgstr ""
+msgstr "Kohteen etäisyys"
+
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+#, fuzzy
+msgid "Flash Fired"
+msgstr "Salamavalotuksen korjaus"
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+#, fuzzy
+msgid "Flash fired"
+msgstr "Salamavalotuksen korjaus"
+
+#: src/minoltamn.cpp:547
 msgid "Minolta Date"
 msgstr ""
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
 msgid "Minolta date"
 msgstr ""
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
 msgid "Minolta Time"
 msgstr ""
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
 msgid "Minolta time"
 msgstr ""
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
+#, fuzzy
 msgid "File Number Memory"
-msgstr ""
+msgstr "F-luku"
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
+#, fuzzy
 msgid "File number memory"
-msgstr ""
+msgstr "Tiedostonimi"
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
-msgid "Image Number"
+#: src/minoltamn.cpp:559
+#, fuzzy
+msgid "Last Image Number"
+msgstr "Kuvan numero"
+
+#: src/minoltamn.cpp:560
+#, fuzzy
+msgid "Last image number"
 msgstr "Kuvan numero"
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:562
+#, fuzzy
 msgid "Color Balance Red"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
+#, fuzzy
 msgid "Color balance red"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
+#, fuzzy
 msgid "Color Balance Green"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
+#, fuzzy
 msgid "Color balance green"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
+#, fuzzy
 msgid "Color Balance Blue"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
+#, fuzzy
 msgid "Color balance blue"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
+#, fuzzy
 msgid "Subject Program"
-msgstr ""
+msgstr "Kuvaustapa"
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
 msgid "Subject program"
 msgstr ""
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
-msgid "Flash Exposure Compensation"
-msgstr ""
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
+#, fuzzy
+msgid "ISO Settings"
+msgstr "Asetukset"
 
-#: src/minoltamn.cpp:704
-msgid "Flash exposure compensation in EV"
-msgstr ""
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
+#, fuzzy
+msgid "ISO setting"
+msgstr "Asetukset"
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
+#, fuzzy
 msgid "Minolta Model"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
+#, fuzzy
 msgid "Minolta model"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
+#, fuzzy
 msgid "Interval Mode"
-msgstr ""
+msgstr "Sisäinen salama"
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
+#, fuzzy
 msgid "Interval mode"
-msgstr ""
+msgstr "Kameran malli"
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
+#, fuzzy
 msgid "Folder Name"
-msgstr ""
+msgstr "Tiedostonimi"
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
+#, fuzzy
 msgid "Folder name"
-msgstr ""
+msgstr "Tiedostonimi"
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
+#, fuzzy
 msgid "ColorMode"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
+#, fuzzy
 msgid "Color Filter"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
+#, fuzzy
 msgid "Color filter"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
+#, fuzzy
 msgid "Black and White Filter"
-msgstr ""
+msgstr "Mustavalkoinen"
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
+#, fuzzy
 msgid "Black and white filter"
-msgstr ""
+msgstr "Mustavalko"
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
+#, fuzzy
 msgid "Internal Flash"
-msgstr ""
+msgstr "Sisäinen salama"
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr ""
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
 msgid "Spot Focus Point X"
 msgstr ""
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
 msgid "Spot focus point X"
 msgstr ""
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
 msgid "Spot Focus Point Y"
 msgstr ""
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
 msgid "Spot focus point Y"
 msgstr ""
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
+#, fuzzy
 msgid "Wide Focus Zone"
-msgstr ""
+msgstr "Tarkennustapa"
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
 msgid "Wide focus zone"
 msgstr ""
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
+#, fuzzy
 msgid "Focus mode"
-msgstr ""
+msgstr "Tarkennustapa"
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
+#, fuzzy
 msgid "Focus area"
-msgstr ""
+msgstr "Tarkennustapa"
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
 msgid "DEC Switch Position"
 msgstr ""
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
 msgid "DEC switch position"
 msgstr ""
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
+#, fuzzy
 msgid "Color Profile"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
+#, fuzzy
 msgid "Color profile"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
 msgid "Data Imprint"
 msgstr ""
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
+#, fuzzy
 msgid "Flash Metering"
-msgstr ""
+msgstr "Salaman tila"
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
+#, fuzzy
 msgid "Flash metering"
-msgstr ""
+msgstr "Salaman tyyppi"
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
+#, fuzzy
 msgid "Unknown Minolta Camera Settings tag"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
+#, fuzzy
 msgid "Program-shift A"
-msgstr ""
+msgstr "Ohjelma"
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
+#, fuzzy
 msgid "Program-shift S"
-msgstr ""
+msgstr "Ohjelma"
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
+#, fuzzy
 msgid "Raw+Jpeg"
-msgstr ""
+msgstr "Kuvan koko"
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
 msgid "Kelvin"
 msgstr ""
 
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
+#, fuzzy
 msgid "Single-shot AF"
-msgstr ""
+msgstr "Kertatarkennus, AF"
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
 msgid "Continuous AF"
 msgstr ""
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
 msgid "Automatic AF"
 msgstr ""
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
 msgid "sRGB (Natural)"
 msgstr ""
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
 msgid "sRGB (Natural+)"
 msgstr ""
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr ""
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
+#, fuzzy
 msgid "AF Points"
-msgstr ""
+msgstr "AF-piste"
 
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
+#, fuzzy
 msgid "AF points"
-msgstr ""
+msgstr "AF-piste"
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 msgid "Color space"
 msgstr "Väriavaruus"
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 msgid "Free Memory Card Images"
 msgstr ""
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 msgid "Free memory card images"
 msgstr ""
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
 msgid "Hue"
 msgstr ""
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
+#, fuzzy
 msgid "Rotation"
-msgstr ""
+msgstr "Värikylläisyys"
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+msgid "Image Number"
+msgstr "Kuvan numero"
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
+#, fuzzy
 msgid "Noise reduction"
-msgstr ""
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
 msgid "Zone Matching On"
 msgstr ""
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
 msgid "Zone matching on"
 msgstr ""
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
 msgid "Unknown Minolta Camera Settings 7D tag"
 msgstr ""
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+#, fuzzy
+msgid "Program Shift A"
+msgstr "Ohjelma"
+
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+#, fuzzy
+msgid "Program Shift S"
+msgstr "Ohjelma"
+
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+msgid "Night View/Portrait"
 msgstr ""
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:895
 msgid "200 (Zone Matching High)"
 msgstr ""
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
 msgid "80 (Zone Matching Low)"
 msgstr ""
 
-#: src/minoltamn.cpp:1065
-msgid "Central"
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+msgid "Adobe RGB (ICC)"
 msgstr ""
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:918
+#, fuzzy
+msgid "Central"
+msgstr "Neutraali"
+
+#: src/minoltamn.cpp:919
 msgid "Up"
 msgstr ""
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
+#, fuzzy
 msgid "Up right"
-msgstr ""
+msgstr "Omistusoikeus"
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
+#, fuzzy
 msgid "Down right"
-msgstr ""
+msgstr "Omistusoikeus"
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
 msgid "Down"
 msgstr ""
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
 msgid "Down left"
 msgstr ""
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
 msgid "Up left"
 msgstr ""
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 msgid "Selection"
 msgstr ""
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+#, fuzzy
+msgid "Natural+"
+msgstr "Neutraali"
+
+#: src/minoltamn.cpp:949
+#, fuzzy
+msgid "Wind Scene"
+msgstr "Linssi"
+
+#: src/minoltamn.cpp:950
+msgid "Evening Scene"
+msgstr ""
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus Position"
 msgstr ""
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus position"
 msgstr ""
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
+#, fuzzy
 msgid "Focus Area"
-msgstr ""
+msgstr "Tarkennustapa"
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
+#, fuzzy
 msgid "Exposure Revision"
-msgstr ""
+msgstr "Valotuksen korjaus"
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
+#, fuzzy
 msgid "Exposure revision"
-msgstr ""
+msgstr "Valotuksen korjaus"
+
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+#, fuzzy
+msgid "Rotation2"
+msgstr "Värikylläisyys"
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+#, fuzzy
+msgid "Picture Finish"
+msgstr "Kuvan tiedot"
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1059
+#, fuzzy
 msgid "Exposure Manual Bias"
-msgstr ""
+msgstr "Valotuksen korjaus"
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
+#, fuzzy
 msgid "Exposure manual bias"
-msgstr ""
+msgstr "Valotuksen korjaus"
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
+#, fuzzy
 msgid "AF Mode"
-msgstr ""
+msgstr "Salaman tila"
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
+#, fuzzy
 msgid "AF mode"
-msgstr ""
+msgstr "Kameran malli"
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
 msgid "Unknown Minolta Camera Settings 5D tag"
 msgstr ""
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
-msgid "Single area"
-msgstr ""
-
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
-msgid "Dynamic area"
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
+msgid "Self-timer 10 sec"
 msgstr ""
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
+msgid "Self-timer 2 sec"
 msgstr ""
 
-#: src/nikonmn.cpp:77
-msgid "Group dynamic"
-msgstr ""
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+#, fuzzy
+msgid "White Balance Bracketing Low"
+msgstr " "
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr ""
+#: src/minoltamn.cpp:1101
+#, fuzzy
+msgid "White Balance Bracketing High"
+msgstr " "
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
+#: src/minoltamn.cpp:1102
+msgid "Single-frame Bracketing Low"
 msgstr ""
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
-msgid "Upper-left"
+#: src/minoltamn.cpp:1103
+msgid "Continous Bracketing Low"
 msgstr ""
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
-msgid "Upper-right"
+#: src/minoltamn.cpp:1104
+msgid "Single-frame Bracketing High"
 msgstr ""
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
-msgid "Lower-left"
+#: src/minoltamn.cpp:1105
+msgid "Continous Bracketing High"
 msgstr ""
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
-msgid "Lower-right"
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
 msgstr ""
 
-#: src/nikonmn.cpp:96
-msgid "Left-most"
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
+msgid "Continuous Bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:97
-msgid "Right-most"
+#: src/minoltamn.cpp:1152
+msgid "Single-Frame Bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
-msgstr ""
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
+#, fuzzy
+msgid "White Balance Bracketing"
+msgstr "Valkotasapaino"
 
-#: src/nikonmn.cpp:131
-msgid "Fire, manual"
-msgstr ""
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
+#, fuzzy
+msgid "Preset"
+msgstr "Esikatselu"
 
-#: src/nikonmn.cpp:132
-msgid "Fire, external"
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
+msgid "Color Temperature/Color Filter"
 msgstr ""
 
-#: src/nikonmn.cpp:133
-msgid "Fire, commander mode"
-msgstr ""
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
+#, fuzzy
+msgid "Temperature"
+msgstr "Aukko"
 
-#: src/nikonmn.cpp:134
-msgid "Fire, TTL mode"
-msgstr ""
+#: src/minoltamn.cpp:1209
+#, fuzzy
+msgid "Setup"
+msgstr "Aseta"
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
+#: src/minoltamn.cpp:1210
+msgid "Recall"
 msgstr ""
 
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
-msgid "PC control"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
 msgstr ""
 
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
-msgid "Exposure bracketing"
+#: src/minoltamn.cpp:1216
+msgid "Error"
 msgstr ""
 
-#: src/nikonmn.cpp:143
-msgid "Auto ISO"
-msgstr ""
+#: src/minoltamn.cpp:1228
+#, fuzzy
+msgid "Image and Information"
+msgstr "Kuvan vakautus"
 
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
-msgid "White balance bracketing"
-msgstr ""
+#: src/minoltamn.cpp:1229
+#, fuzzy
+msgid "Image Only"
+msgstr "Kuvan tyyppi"
 
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
-msgid "IR control"
-msgstr ""
+#: src/minoltamn.cpp:1230
+#, fuzzy
+msgid "Image and Histogram"
+msgstr "Kuvan tyyppi"
 
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
-msgstr ""
+#: src/minoltamn.cpp:1236
+#, fuzzy
+msgid "Fill Flash"
+msgstr "Salama"
 
-#: src/nikonmn.cpp:162
-msgid "Auto release"
-msgstr ""
+#: src/minoltamn.cpp:1247
+#, fuzzy
+msgid "Focus Hold"
+msgstr "Tarkennustapa"
 
-#: src/nikonmn.cpp:163
-msgid "Manual release"
-msgstr ""
+#: src/minoltamn.cpp:1248
+#, fuzzy
+msgid "DOF Preview"
+msgstr "Esikatselu"
 
-#: src/nikonmn.cpp:168
-msgid "Lossy (type 1)"
+#: src/minoltamn.cpp:1253
+msgid "Hold"
 msgstr ""
 
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
+#: src/minoltamn.cpp:1254
+msgid "Toggle"
 msgstr ""
 
-#: src/nikonmn.cpp:170
-msgid "Lossless"
-msgstr ""
+#: src/minoltamn.cpp:1255
+#, fuzzy
+msgid "Spot Hold"
+msgstr "Piste"
 
-#: src/nikonmn.cpp:171
-msgid "Lossy (type 2)"
+#: src/minoltamn.cpp:1256
+msgid "Spot Toggle"
 msgstr ""
 
-#: src/nikonmn.cpp:177
-msgid "B & W"
-msgstr ""
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+msgid "Shutter Speed"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:179
-msgid "Trim"
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
 msgstr ""
 
-#: src/nikonmn.cpp:181
-msgid "D-Lighting"
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
 msgstr ""
 
-#: src/nikonmn.cpp:182
-msgid "Red eye"
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
 msgstr ""
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
-msgid "Cyanotype"
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
+msgid "Automatic"
 msgstr ""
 
-#: src/nikonmn.cpp:184
-msgid "Sky light"
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
+msgid "Auto-rotate"
 msgstr ""
 
-#: src/nikonmn.cpp:185
-msgid "Warm tone"
+#: src/minoltamn.cpp:1287
+msgid "Horizontal"
 msgstr ""
 
-#: src/nikonmn.cpp:186
-msgid "Color custom"
-msgstr ""
+#: src/minoltamn.cpp:1293
+#, fuzzy
+msgid "Manual Rotate"
+msgstr "Käsintarkennus, MF"
 
-#: src/nikonmn.cpp:187
-msgid "Image overlay"
+#: src/minoltamn.cpp:1298
+msgid "Within Range"
 msgstr ""
 
-#: src/nikonmn.cpp:193
-msgid "Minimal"
+#: src/minoltamn.cpp:1299
+msgid "Under/Over Range"
 msgstr ""
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
-msgid "Nikon Makernote version"
+#: src/minoltamn.cpp:1300
+msgid "Out of Range"
 msgstr ""
 
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
-msgid "ISO Speed"
-msgstr "ISO-herkkyys"
-
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
-msgid "Sharpening"
+#: src/minoltamn.cpp:1305
+msgid "Not Indicated"
 msgstr ""
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
-msgid "Image sharpening setting"
+#: src/minoltamn.cpp:1306
+msgid "Under Scale"
 msgstr ""
 
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
-msgid "Focus"
+#: src/minoltamn.cpp:1307
+msgid "Bottom of Scale"
 msgstr ""
 
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
-msgid "Flash Setting"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
 msgstr ""
 
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
-msgid "Flash setting"
-msgstr ""
+#: src/minoltamn.cpp:1326
+#, fuzzy
+msgid "Over Scale"
+msgstr "Omistajan nimi"
 
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
-msgid "ISO Selection"
+#: src/minoltamn.cpp:1331
+msgid "AM"
 msgstr ""
 
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
-msgid "ISO selection"
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
 msgstr ""
 
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data Dump"
+#: src/minoltamn.cpp:1338
+msgid "Built-in"
 msgstr ""
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data dump"
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
+msgid "Very Low"
 msgstr ""
 
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
-msgid "Image Adjustment"
+#: src/minoltamn.cpp:1346
+msgid "Half Full"
 msgstr ""
 
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
-msgid "Image adjustment setting"
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
 msgstr ""
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
-msgid "Auxiliary Lens"
+#: src/minoltamn.cpp:1355
+msgid "Exposure Compensation Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
+#: src/minoltamn.cpp:1356
+msgid "Exposure compensation setting"
 msgstr ""
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
-msgid "Manual focus distance"
+#: src/minoltamn.cpp:1358
+msgid "High Speed Sync"
 msgstr ""
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
-msgid "Digital zoom setting"
+#: src/minoltamn.cpp:1359
+msgid "High speed sync"
 msgstr ""
 
-#: src/nikonmn.cpp:246
-msgid "AF Focus Position"
-msgstr ""
+#: src/minoltamn.cpp:1361
+#, fuzzy
+msgid "Manual Exposure Time"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:247
-msgid "AF focus position information"
-msgstr ""
+#: src/minoltamn.cpp:1362
+#, fuzzy
+msgid "Manual exposure time"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:252
-msgid "Unknown Nikon1MakerNote tag"
-msgstr ""
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
+#, fuzzy
+msgid "Manual FNumber"
+msgstr "Sarjanumero"
 
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
+#: src/minoltamn.cpp:1373
+msgid "Drive Mode 2"
 msgstr ""
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
+#: src/minoltamn.cpp:1374
+msgid "Drive mode 2"
 msgstr ""
 
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
-msgid "Not used"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
 msgstr ""
 
-#: src/nikonmn.cpp:353
-msgid "guess"
-msgstr ""
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
+#, fuzzy
+msgid "AF Area Mode"
+msgstr "Salaman tila"
 
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
-msgstr ""
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
+#, fuzzy
+msgid "FlashMode"
+msgstr "Salaman tila"
 
-#: src/nikonmn.cpp:401
-msgid "VGA Normal"
+#: src/minoltamn.cpp:1391
+msgid "Flash Exposure Comp Setting"
 msgstr ""
 
-#: src/nikonmn.cpp:402
-msgid "VGA Fine"
+#: src/minoltamn.cpp:1392
+msgid "Flash exposure compensation setting"
 msgstr ""
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
-msgstr ""
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
+#, fuzzy
+msgid "ISO Setting"
+msgstr "Asetukset"
 
-#: src/nikonmn.cpp:404
-msgid "SXGA Normal"
-msgstr ""
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
+#, fuzzy
+msgid "Zone Matching Mode"
+msgstr "Mittaustapa"
 
-#: src/nikonmn.cpp:405
-msgid "SXGA Fine"
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
+msgid "Dynamic Range Optimizer Mode"
 msgstr ""
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
-msgid "Monochrome"
+#: src/minoltamn.cpp:1404
+msgid "Dynamic range optimizer mode"
 msgstr ""
 
-#: src/nikonmn.cpp:417
-msgid "Bright+"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
 msgstr ""
 
-#: src/nikonmn.cpp:418
-msgid "Bright-"
+#: src/minoltamn.cpp:1430
+msgid "Self Timer Time"
 msgstr ""
 
-#: src/nikonmn.cpp:419
-msgid "Contrast+"
+#: src/minoltamn.cpp:1431
+msgid "Self timer time"
 msgstr ""
 
-#: src/nikonmn.cpp:420
-msgid "Contrast-"
+#: src/minoltamn.cpp:1434
+msgid "Continuous bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
+#: src/minoltamn.cpp:1436
+msgid "Single Frame Bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
+#: src/minoltamn.cpp:1437
+msgid "Single frame bracketing"
 msgstr ""
 
-#: src/nikonmn.cpp:479
-msgid "Unknown Nikon2MakerNote tag"
-msgstr ""
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
+#, fuzzy
+msgid "White balance bracketing"
+msgstr " "
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
-msgid "Flash Device"
-msgstr ""
+#: src/minoltamn.cpp:1442
+#, fuzzy
+msgid "White Balance Setting"
+msgstr "Valkotasapaino"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
-msgid "Flash device"
-msgstr ""
+#: src/minoltamn.cpp:1445
+#, fuzzy
+msgid "Preset White Balance"
+msgstr "Valkotasapaino"
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
-msgid "White Balance Bias"
-msgstr ""
+#: src/minoltamn.cpp:1446
+#, fuzzy
+msgid "Preset white balance"
+msgstr "Valkotasapaino"
 
-#: src/nikonmn.cpp:522
-msgid "White balance bias"
-msgstr ""
+#: src/minoltamn.cpp:1448
+#, fuzzy
+msgid "Color Temperature Setting"
+msgstr "Oma asetus (Kelvin)"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB Levels"
-msgstr ""
+#: src/minoltamn.cpp:1449
+#, fuzzy
+msgid "Color temperature setting"
+msgstr "Oma asetus (Kelvin)"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB levels"
-msgstr ""
+#: src/minoltamn.cpp:1451
+#, fuzzy
+msgid "Custom WB Setting"
+msgstr "Kameran asetukset"
 
-#: src/nikonmn.cpp:524
-msgid "Program Shift"
+#: src/minoltamn.cpp:1452
+msgid "Custom WB setting"
 msgstr ""
 
-#: src/nikonmn.cpp:524
-msgid "Program shift"
-msgstr ""
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
+#, fuzzy
+msgid "Dynamic Range Optimizer Settings"
+msgstr "Kameran asetukset"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure Difference"
+#: src/minoltamn.cpp:1460
+msgid "Custom WB Red Level"
 msgstr ""
 
-#: src/nikonmn.cpp:525
-msgid "Exposure difference"
+#: src/minoltamn.cpp:1461
+msgid "Custom WB red level"
 msgstr ""
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
+#: src/minoltamn.cpp:1463
+msgid "Custom WB Green Level"
 msgstr ""
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
+#: src/minoltamn.cpp:1464
+msgid "Custom WB green level"
 msgstr ""
 
-#: src/nikonmn.cpp:529
-msgid "Flash Comp"
+#: src/minoltamn.cpp:1466
+msgid "Custom WB Blue Level"
 msgstr ""
 
-#: src/nikonmn.cpp:529
-msgid "Flash compensation setting"
+#: src/minoltamn.cpp:1467
+msgid "CustomWB blue level"
 msgstr ""
 
-#: src/nikonmn.cpp:530
-msgid "ISO Settings"
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
+msgid "Custom WB Error"
 msgstr ""
 
-#: src/nikonmn.cpp:530
-msgid "ISO setting"
-msgstr ""
+#: src/minoltamn.cpp:1473
+#, fuzzy
+msgid "White balance fine tune"
+msgstr " "
 
-#: src/nikonmn.cpp:531
-msgid "Image Boundary"
+#: src/minoltamn.cpp:1479
+msgid "Color compensation filter"
 msgstr ""
 
-#: src/nikonmn.cpp:531
-msgid "Image boundary"
-msgstr ""
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
+#, fuzzy
+msgid "Sony Image Size"
+msgstr "Kuvan koko"
 
-#: src/nikonmn.cpp:533
-msgid "Flash Bracket Comp"
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
 msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash bracket compensation applied"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "Exposure Bracket Comp"
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "AE bracket compensation applied"
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
 msgstr ""
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
-msgid "Image Processing"
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
 msgstr ""
 
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
-msgid "Image processing"
-msgstr ""
+#: src/minoltamn.cpp:1497
+#, fuzzy
+msgid "Eye start AF"
+msgstr "Kertatarkennus, AF"
 
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
-msgstr ""
+#: src/minoltamn.cpp:1499
+#, fuzzy
+msgid "Red Eye Reduction"
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
-msgstr ""
+#: src/minoltamn.cpp:1500
+#, fuzzy
+msgid "Red eye reduction"
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/nikonmn.cpp:539
-msgid "VR Info"
-msgstr ""
+#: src/minoltamn.cpp:1502
+#, fuzzy
+msgid "Flash Default"
+msgstr "Oletus"
 
-#: src/nikonmn.cpp:539
-msgid "VR info"
-msgstr ""
+#: src/minoltamn.cpp:1503
+#, fuzzy
+msgid "Flash default"
+msgstr "Salaman malli"
 
-#: src/nikonmn.cpp:540
-msgid "Image Authentication"
-msgstr ""
+#: src/minoltamn.cpp:1505
+#, fuzzy
+msgid "Auto Bracket Order"
+msgstr "Makrotila"
 
-#: src/nikonmn.cpp:540
-msgid "Image authentication"
-msgstr ""
+#: src/minoltamn.cpp:1506
+#, fuzzy
+msgid "Auto bracket order"
+msgstr "Makrotila"
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
+#: src/minoltamn.cpp:1508
+msgid "Focus Hold Button"
 msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
+#: src/minoltamn.cpp:1509
+msgid "Focus hold button"
 msgstr ""
 
-#: src/nikonmn.cpp:542
-msgid "Picture Control"
+#: src/minoltamn.cpp:1511
+msgid "AEL Button"
 msgstr ""
 
-#: src/nikonmn.cpp:542
-msgid " Picture control"
+#: src/minoltamn.cpp:1512
+msgid "AEL button"
 msgstr ""
 
-#: src/nikonmn.cpp:543
-msgid "World Time"
+#: src/minoltamn.cpp:1514
+msgid "Control Dial Set"
 msgstr ""
 
-#: src/nikonmn.cpp:543
-msgid "World time"
-msgstr ""
+#: src/minoltamn.cpp:1515
+#, fuzzy
+msgid "Control dial set"
+msgstr "Kontrasti"
 
-#: src/nikonmn.cpp:544
-msgid "ISO Info"
-msgstr ""
+#: src/minoltamn.cpp:1517
+#, fuzzy
+msgid "Exposure Compensation Mode"
+msgstr "Valotustila"
 
-#: src/nikonmn.cpp:544
-msgid "ISO info"
-msgstr ""
+#: src/minoltamn.cpp:1518
+#, fuzzy
+msgid "Exposure compensation mode"
+msgstr "Valotustila"
 
-#: src/nikonmn.cpp:545
-msgid "Vignette Control"
+#: src/minoltamn.cpp:1521
+msgid "AF assist"
 msgstr ""
 
-#: src/nikonmn.cpp:545
-msgid "Vignette control"
+#: src/minoltamn.cpp:1523
+msgid "Card Shutter Lock"
 msgstr ""
 
-#: src/nikonmn.cpp:547
-msgid "Tone Compensation"
+#: src/minoltamn.cpp:1524
+msgid "Card shutter lock"
 msgstr ""
 
-#: src/nikonmn.cpp:547
-msgid "Tone compensation"
+#: src/minoltamn.cpp:1526
+msgid "Lens Shutter Lock"
 msgstr ""
 
-#: src/nikonmn.cpp:553
-msgid "Mode of flash used"
+#: src/minoltamn.cpp:1527
+msgid "Lens shutter lock"
 msgstr ""
 
-#: src/nikonmn.cpp:554
-msgid "AF Info"
+#: src/minoltamn.cpp:1529
+msgid "AF Area Illumination"
 msgstr ""
 
-#: src/nikonmn.cpp:554
-msgid "AF info"
-msgstr ""
+#: src/minoltamn.cpp:1530
+#, fuzzy
+msgid "AF area illumination"
+msgstr "Kameran malli"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
-msgid "Shooting Mode"
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
 msgstr ""
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
-msgid "Shooting mode"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
 msgstr ""
 
-#: src/nikonmn.cpp:556
-msgid "Auto Bracket Release"
+#: src/minoltamn.cpp:1535
+msgid "Record Display"
 msgstr ""
 
-#: src/nikonmn.cpp:556
-msgid "Auto bracket release"
+#: src/minoltamn.cpp:1536
+msgid "Record display"
 msgstr ""
 
-#: src/nikonmn.cpp:557
-msgid "Lens FStops"
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
 msgstr ""
 
-#: src/nikonmn.cpp:558
-#, fuzzy
-msgid "Contrast Curve"
-msgstr "Kontrasti"
+#: src/minoltamn.cpp:1539
+msgid "Play display"
+msgstr ""
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1541
 #, fuzzy
-msgid "Contrast curve"
-msgstr "Kontrasti"
+msgid "Exposure Indicator"
+msgstr "Valotuksen korjaus"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1542
 #, fuzzy
-msgid "Color Hue"
-msgstr "Väriavaruus"
+msgid "Exposure indicator"
+msgstr "Valotuksen korjaus"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1544
 #, fuzzy
-msgid "Color hue"
-msgstr "Väriavaruus"
+msgid "AEL Exposure Indicator"
+msgstr "Valotuksen korjaus"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene Mode"
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene mode"
+#: src/minoltamn.cpp:1547
+msgid "Exposure Bracketing Indicator Last"
 msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
-msgid "Light source"
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:562
-msgid "Shot info"
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
 msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue Adjustment"
+#: src/minoltamn.cpp:1553
+msgid "Flash Exposure Indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue adjustment"
-msgstr ""
+#: src/minoltamn.cpp:1554
+#, fuzzy
+msgid "Flash exposure indicator"
+msgstr "Valotuksen korjaus"
 
-#: src/nikonmn.cpp:564
-msgid "NEF Compression"
+#: src/minoltamn.cpp:1556
+msgid "Flash Exposure Indicator Next"
 msgstr ""
 
-#: src/nikonmn.cpp:564
-msgid "NEF compression"
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
-msgid "Linearization Table"
+#: src/minoltamn.cpp:1559
+msgid "Flash Exposure Indicator Last"
 msgstr ""
 
-#: src/nikonmn.cpp:567
-msgid "Linearization table"
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1565
 #, fuzzy
-msgid "Color Balance"
-msgstr "Väriavaruus"
+msgid "Focus Mode Switch"
+msgstr "Tarkennustapa"
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1566
 #, fuzzy
-msgid "Color balance"
-msgstr "Väriavaruus"
+msgid "Focus mode switch"
+msgstr "Tarkennustapa"
 
-#: src/nikonmn.cpp:569
-msgid "Lens Data"
-msgstr ""
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
+msgid "Flash Type"
+msgstr "Salaman tyyppi"
 
-#: src/nikonmn.cpp:569
-msgid "Lens data settings"
-msgstr ""
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
+msgid "Flash type"
+msgstr "Salaman tyyppi"
 
-#: src/nikonmn.cpp:570
-msgid "Raw Image Center"
-msgstr ""
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
+#, fuzzy
+msgid "AE Lock"
+msgstr "Valotuksen lukitus"
 
-#: src/nikonmn.cpp:570
-msgid "Raw image center"
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
 msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
 msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
+#: src/minoltamn.cpp:1584
+msgid "Battery level"
 msgstr ""
 
-#: src/nikonmn.cpp:573
-msgid "Scene Assist"
+#: src/minoltamn.cpp:1588
+msgid "Unknown Sony Camera Settings A100 tag"
 msgstr ""
 
-#: src/nikonmn.cpp:573
-msgid "Scene assist"
-msgstr ""
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
+#, fuzzy
+msgid "Clear"
+msgstr "vuosi"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch History"
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
+msgid "Deep"
 msgstr ""
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
+msgid "Light"
 msgstr ""
 
-#: src/nikonmn.cpp:576
-msgid "Serial NO"
+#: src/minoltamn.cpp:1897
+msgid "Night View"
 msgstr ""
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
 msgstr ""
 
-#: src/nikonmn.cpp:577
-msgid "Image Data Size"
+#: src/minoltamn.cpp:1937
+msgid "Local"
 msgstr ""
 
-#: src/nikonmn.cpp:577
-msgid "Image data size"
-msgstr ""
+#: src/minoltamn.cpp:1952
+#, fuzzy
+msgid "Top-Right"
+msgstr "Omistusoikeus"
 
-#: src/nikonmn.cpp:579
-msgid "Image Count"
+#: src/minoltamn.cpp:1954
+msgid "Bottom-Right"
 msgstr ""
 
-#: src/nikonmn.cpp:579
-msgid "Image count"
+#: src/minoltamn.cpp:1956
+msgid "Bottom-Left"
 msgstr ""
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
-msgid "Deleted Image Count"
+#: src/minoltamn.cpp:1958
+msgid "Top-Left"
 msgstr ""
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
-msgid "Deleted image count"
+#: src/minoltamn.cpp:1959
+msgid "Far-Right"
 msgstr ""
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
-msgid "Shutter Count"
-msgstr ""
+#: src/minoltamn.cpp:1960
+#, fuzzy
+msgid "Far-Left"
+msgstr "Polttoväli"
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
+msgid "Advanced Auto"
 msgstr ""
 
-#: src/nikonmn.cpp:582
-msgid "Flash info"
+#: src/minoltamn.cpp:1975
+msgid "Advanced Level"
 msgstr ""
 
-#: src/nikonmn.cpp:583
-msgid "Image Optimization"
+#: src/minoltamn.cpp:1988
+msgid "AF"
 msgstr ""
 
-#: src/nikonmn.cpp:583
-msgid "Image optimization"
-msgstr ""
+#: src/minoltamn.cpp:1989
+#, fuzzy
+msgid "Release"
+msgstr "Mallin ID"
 
-#: src/nikonmn.cpp:585
-msgid "Program Variation"
+#: src/minoltamn.cpp:2001
+msgid "RAW "
 msgstr ""
 
-#: src/nikonmn.cpp:585
-msgid "Program variation"
+#: src/minoltamn.cpp:2002
+msgid "CRAW "
 msgstr ""
 
-#: src/nikonmn.cpp:587
-msgid "AF Response"
-msgstr ""
+#: src/minoltamn.cpp:2005
+#, fuzzy
+msgid "RAW+JPEG"
+msgstr "Jpeg"
 
-#: src/nikonmn.cpp:587
-msgid "AF response"
-msgstr ""
+#: src/minoltamn.cpp:2006
+#, fuzzy
+msgid "CRAW+JPEG"
+msgstr "Jpeg"
 
-#: src/nikonmn.cpp:588
-msgid "Multi exposure"
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:589
-msgid "High ISO Noise Reduction"
-msgstr ""
+#: src/minoltamn.cpp:2063
+#, fuzzy
+msgid "Compressed Raw"
+msgstr "Pakkaus"
 
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
-msgid "Toning effect"
+#: src/minoltamn.cpp:2064
+msgid "Compressed Raw + JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:591
-msgid "AF info 2"
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:592
-msgid "File info"
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:595
-msgid "Capture Data"
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:595
-msgid "Capture data"
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture Version"
-msgstr ""
+#: src/minoltamn.cpp:2110
+#, fuzzy
+msgid "ISO Setting Used"
+msgstr "ISO-herkkyys"
 
-#: src/nikonmn.cpp:596
-msgid "Capture version"
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
+msgid "High Key"
 msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture Offsets"
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
 msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture offsets"
+#: src/nikonmn.cpp:80
+msgid "Extra High"
 msgstr ""
 
-#: src/nikonmn.cpp:599
-msgid "Scan IFD"
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
+msgid "Single area"
 msgstr ""
 
-#: src/nikonmn.cpp:600
-msgid "ICC profile"
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
+msgid "Dynamic area"
 msgstr ""
 
-#: src/nikonmn.cpp:601
-msgid "Capture output"
+#: src/nikonmn.cpp:88
+msgid "Dynamic area, closest subject"
 msgstr ""
 
-#: src/nikonmn.cpp:603
-msgid "Unknown Nikon3MakerNote tag"
+#: src/nikonmn.cpp:89
+msgid "Group dynamic"
 msgstr ""
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
 msgstr ""
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
-msgid "Yes"
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
+msgid "Dynamic area (wide)"
 msgstr ""
 
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
+msgid "Upper-left"
 msgstr ""
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
-msgstr ""
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
+#, fuzzy
+msgid "Upper-right"
+msgstr "Omistusoikeus"
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
+msgid "Lower-left"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-msgid "Vibration Reduction"
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
+#, fuzzy
+msgid "Lower-right"
+msgstr "Omistusoikeus"
+
+#: src/nikonmn.cpp:108
+msgid "Left-most"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-msgid "Vibration reduction"
+#: src/nikonmn.cpp:109
+msgid "Right-most"
 msgstr ""
 
-#: src/nikonmn.cpp:635
-msgid "Unknown Nikon Vibration Reduction Tag"
+#: src/nikonmn.cpp:143
+msgid "Fire, manual"
 msgstr ""
 
-#: src/nikonmn.cpp:645
+#: src/nikonmn.cpp:144
 #, fuzzy
-msgid "Default Settings"
-msgstr "Kameran asetukset"
+msgid "Fire, external"
+msgstr "Ulkoinen"
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
-msgid "Quick Adjust"
+#: src/nikonmn.cpp:145
+msgid "Fire, commander mode"
 msgstr ""
 
-#: src/nikonmn.cpp:647
+#: src/nikonmn.cpp:146
 #, fuzzy
-msgid "Full Control"
-msgstr "Täysautomatiikka"
-
-#: src/nikonmn.cpp:668
-msgid "Blue-green"
-msgstr ""
+msgid "Fire, TTL mode"
+msgstr "Kameran malli"
 
-#: src/nikonmn.cpp:670
-msgid "Purple-blue"
-msgstr ""
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
+#, fuzzy
+msgid "Delay"
+msgstr "Poista"
 
-#: src/nikonmn.cpp:671
-msgid "Red-purple"
-msgstr ""
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
+#, fuzzy
+msgid "PC control"
+msgstr "Täysautomatiikka"
 
-#: src/nikonmn.cpp:678
-msgid "Name"
-msgstr ""
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
+#, fuzzy
+msgid "Exposure bracketing"
+msgstr "Valotuksen korjaus"
 
-#: src/nikonmn.cpp:679
-msgid "Base"
+#: src/nikonmn.cpp:155
+msgid "Auto ISO"
 msgstr ""
 
-#: src/nikonmn.cpp:680
-msgid "Adjust"
-msgstr ""
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
+#, fuzzy
+msgid "IR control"
+msgstr "Täysautomatiikka"
 
-#: src/nikonmn.cpp:681
-msgid "Quick adjust"
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
 msgstr ""
 
-#: src/nikonmn.cpp:687
-msgid "Filter effect"
-msgstr ""
+#: src/nikonmn.cpp:174
+#, fuzzy
+msgid "Auto release"
+msgstr "Automaattinen"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:175
 #, fuzzy
-msgid "Toning Saturation"
-msgstr "Värikylläisyys"
+msgid "Manual release"
+msgstr "Käsintarkennus, MF"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:180
 #, fuzzy
-msgid "Toning saturation"
-msgstr "Värikylläisyys"
+msgid "Lossy (type 1)"
+msgstr "Linssin tyyppi"
 
-#: src/nikonmn.cpp:691
-msgid "Unknown Nikon Picture Control Tag"
-msgstr ""
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+#, fuzzy
+msgid "Uncompressed"
+msgstr "Pakkaus"
 
-#: src/nikonmn.cpp:701
-msgid "Timezone"
+#: src/nikonmn.cpp:182
+msgid "Lossless"
 msgstr ""
 
-#: src/nikonmn.cpp:702
-msgid "Daylight Savings"
-msgstr ""
+#: src/nikonmn.cpp:183
+#, fuzzy
+msgid "Lossy (type 2)"
+msgstr "Linssin tyyppi"
 
-#: src/nikonmn.cpp:702
-msgid "Daylight savings"
+#: src/nikonmn.cpp:189
+msgid "B & W"
 msgstr ""
 
-#: src/nikonmn.cpp:703
-msgid "Date Display Format"
+#: src/nikonmn.cpp:191
+msgid "Trim"
 msgstr ""
 
-#: src/nikonmn.cpp:703
-msgid "Date display format"
-msgstr ""
+#: src/nikonmn.cpp:192
+#, fuzzy
+msgid "Small picture"
+msgstr "Pieni"
 
-#: src/nikonmn.cpp:705
-msgid "Unknown Nikon World Time Tag"
+#: src/nikonmn.cpp:193
+msgid "D-Lighting"
 msgstr ""
 
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
+#: src/nikonmn.cpp:194
+msgid "Red eye"
 msgstr ""
 
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
+#, fuzzy
+msgid "Cyanotype"
+msgstr "Kameran tyyppi"
+
+#: src/nikonmn.cpp:196
+msgid "Sky light"
 msgstr ""
 
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
+#: src/nikonmn.cpp:197
+msgid "Warm tone"
 msgstr ""
 
-#: src/nikonmn.cpp:719
+#: src/nikonmn.cpp:198
 #, fuzzy
-msgid "Hi 1.0"
-msgstr "HV10"
+msgid "Color custom"
+msgstr "Väriavaruus"
 
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
-msgstr ""
+#: src/nikonmn.cpp:199
+#, fuzzy
+msgid "Image overlay"
+msgstr "Kuvan tyyppi"
 
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
-msgstr ""
+#: src/nikonmn.cpp:205
+#, fuzzy
+msgid "Minimal"
+msgstr "Manuaalinen"
 
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
-msgstr ""
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
+#, fuzzy
+msgid "Nikon Makernote version"
+msgstr "Firmwaren versio"
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
-msgstr ""
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
+msgid "ISO Speed"
+msgstr "ISO-herkkyys"
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
-msgstr ""
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
+#, fuzzy
+msgid "Sharpening"
+msgstr "Varoitus"
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
+msgid "Image sharpening setting"
 msgstr ""
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
-msgstr ""
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
+#, fuzzy
+msgid "Focus"
+msgstr "Tarkennustapa"
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
-msgstr ""
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
+#, fuzzy
+msgid "Flash Setting"
+msgstr "Asetukset"
 
-#: src/nikonmn.cpp:733
-msgid "ISO Expansion"
-msgstr ""
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
+#, fuzzy
+msgid "Flash setting"
+msgstr "Salamavalotuksen korjaus"
 
-#: src/nikonmn.cpp:733
-msgid "ISO expansion"
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
+#, fuzzy
+msgid "ISO Selection"
+msgstr "ISO-herkkyys"
+
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
+#, fuzzy
+msgid "ISO selection"
+msgstr "ISO-herkkyys"
+
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data Dump"
 msgstr ""
 
-#: src/nikonmn.cpp:734
-msgid "ISO 2"
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data dump"
 msgstr ""
 
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+#, fuzzy
+msgid "Image Adjustment"
+msgstr "Kuvan aikaleima"
+
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+msgid "Image adjustment setting"
 msgstr ""
 
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+msgid "Auxiliary Lens"
 msgstr ""
 
-#: src/nikonmn.cpp:737
-msgid "Unknown Nikon Iso Info Tag"
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+msgid "Auxiliary lens (adapter)"
 msgstr ""
 
-#: src/nikonmn.cpp:747
-msgid "Single Area"
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
+#, fuzzy
+msgid "Manual focus distance"
+msgstr "Käsintarkennus, MF"
+
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
+#, fuzzy
+msgid "Digital zoom setting"
+msgstr "Digitaalinen zoom"
+
+#: src/nikonmn.cpp:258
+msgid "AF Focus Position"
 msgstr ""
 
-#: src/nikonmn.cpp:748
-msgid "Dynamic Area"
+#: src/nikonmn.cpp:259
+msgid "AF focus position information"
 msgstr ""
 
-#: src/nikonmn.cpp:749
-msgid "Dynamic Area, Closest Subject"
+#: src/nikonmn.cpp:263
+msgid "Unknown Nikon1MakerNote tag"
 msgstr ""
 
-#: src/nikonmn.cpp:750
-msgid "Group Dynamic"
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+msgid "Continuous autofocus"
 msgstr ""
 
-#: src/nikonmn.cpp:751
-msgid "Single Area (wide)"
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
+msgid "Single autofocus"
 msgstr ""
 
-#: src/nikonmn.cpp:752
-msgid "Dynamic Area (wide)"
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
+msgid "Not used"
 msgstr ""
 
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
-msgid "Mid-left"
+#: src/nikonmn.cpp:365
+msgid "guess"
 msgstr ""
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
-msgid "Mid-right"
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
 msgstr ""
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
+#: src/nikonmn.cpp:413
 #, fuzzy
-msgid "Far Left"
-msgstr "Polttoväli"
+msgid "VGA Normal"
+msgstr "Normaali"
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
-msgid "Far Right"
+#: src/nikonmn.cpp:414
+msgid "VGA Fine"
 msgstr ""
 
-#: src/nikonmn.cpp:787
-#, fuzzy
-msgid "AF Area Mode"
-msgstr "Salaman tila"
+#: src/nikonmn.cpp:415
+msgid "SXGA Basic"
+msgstr ""
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:416
 #, fuzzy
-msgid "AF area mode"
-msgstr "Kameran malli"
+msgid "SXGA Normal"
+msgstr "Normaali"
 
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
-msgid "AF point"
+#: src/nikonmn.cpp:417
+msgid "SXGA Fine"
 msgstr ""
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:429
 #, fuzzy
-msgid "AF Points In Focus"
-msgstr "Käytetty AF-piste"
+msgid "Bright+"
+msgstr "Omistusoikeus"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:430
 #, fuzzy
-msgid "AF points in focus"
-msgstr "Käytetty AF-piste"
+msgid "Bright-"
+msgstr "Omistusoikeus"
 
-#: src/nikonmn.cpp:791
-msgid "Unknown Nikon Auto Focus Tag"
-msgstr ""
+#: src/nikonmn.cpp:431
+#, fuzzy
+msgid "Contrast+"
+msgstr "Kontrasti"
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
-msgid "Shutter count"
+#: src/nikonmn.cpp:432
+#, fuzzy
+msgid "Contrast-"
+msgstr "Kontrasti"
+
+#: src/nikonmn.cpp:451
+msgid "Speedlight"
 msgstr ""
 
-#: src/nikonmn.cpp:804
-msgid "Unknown Nikon Shot Info D80 Tag"
+#: src/nikonmn.cpp:491
+msgid "Unknown Nikon2MakerNote tag"
 msgstr ""
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
 #, fuzzy
-msgid "Flash Level"
+msgid "Flash Device"
 msgstr "Salaman malli"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
 #, fuzzy
-msgid "Flash level"
+msgid "Flash device"
 msgstr "Salaman malli"
 
-#: src/nikonmn.cpp:818
-msgid "Unknown Nikon Shot Info D40 Tag"
-msgstr ""
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
+#, fuzzy
+msgid "White Balance Bias"
+msgstr "Valkotasapaino"
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
-msgid "0"
-msgstr ""
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
+#, fuzzy
+msgid "White balance bias"
+msgstr "Valkotasapaino"
 
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
-msgid "+1"
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+msgid "WB RB Levels"
 msgstr ""
 
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
-msgid "+2"
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+msgid "WB RB levels"
 msgstr ""
 
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
-msgid "+4"
-msgstr ""
+#: src/nikonmn.cpp:536
+#, fuzzy
+msgid "Program Shift"
+msgstr "Ohjelma"
 
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
-msgid "+8"
-msgstr ""
+#: src/nikonmn.cpp:536
+#, fuzzy
+msgid "Program shift"
+msgstr "Ohjelman versio"
 
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
-msgid "+16"
-msgstr ""
+#: src/nikonmn.cpp:537
+#, fuzzy
+msgid "Exposure Difference"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
-msgid "-16"
-msgstr ""
+#: src/nikonmn.cpp:537
+#, fuzzy
+msgid "Exposure difference"
+msgstr "Valotustila"
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
-msgid "-8"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+msgid "Pointer to a preview image"
 msgstr ""
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
-msgid "-4"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+msgid "Offset to an IFD containing a preview image"
 msgstr ""
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
-msgid "-2"
-msgstr ""
+#: src/nikonmn.cpp:541
+#, fuzzy
+msgid "Flash Comp"
+msgstr "Salaman tila"
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
-msgid "-1"
+#: src/nikonmn.cpp:541
+msgid "Flash compensation setting"
 msgstr ""
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
-msgid "+17"
-msgstr ""
+#: src/nikonmn.cpp:543
+#, fuzzy
+msgid "Image Boundary"
+msgstr "Kuvan laatu"
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
-msgid "-17"
-msgstr ""
+#: src/nikonmn.cpp:543
+#, fuzzy
+msgid "Image boundary"
+msgstr "Kuvan laatu"
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
-msgid "+9"
+#: src/nikonmn.cpp:544
+msgid "Flash exposure comp"
 msgstr ""
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
-msgid "+18"
-msgstr ""
+#: src/nikonmn.cpp:545
+#, fuzzy
+msgid "Flash Bracket Comp"
+msgstr "Makrotila"
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
-msgid "-18"
+#: src/nikonmn.cpp:545
+msgid "Flash bracket compensation applied"
 msgstr ""
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
-msgid "-9"
-msgstr ""
+#: src/nikonmn.cpp:546
+#, fuzzy
+msgid "Exposure Bracket Comp"
+msgstr "Kuvaustapa"
 
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
-msgid "+19"
+#: src/nikonmn.cpp:546
+msgid "AE bracket compensation applied"
 msgstr ""
 
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
-msgid "-19"
-msgstr ""
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
+#, fuzzy
+msgid "Image Processing"
+msgstr "Kuvan koko"
 
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
-msgid "+5"
-msgstr ""
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+#, fuzzy
+msgid "Image processing"
+msgstr "Kuvan koko"
 
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
-msgid "+10"
+#: src/nikonmn.cpp:548
+msgid "Crop High Speed"
 msgstr ""
 
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
-msgid "+20"
+#: src/nikonmn.cpp:548
+msgid "Crop high speed"
 msgstr ""
 
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
-msgid "-20"
-msgstr ""
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure Tuning"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
-msgid "-10"
-msgstr ""
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure tuning"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
-msgid "-5"
+#: src/nikonmn.cpp:552
+msgid "VR Info"
 msgstr ""
 
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
-msgid "+11"
+#: src/nikonmn.cpp:552
+msgid "VR info"
 msgstr ""
 
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
-msgid "-11"
-msgstr ""
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image Authentication"
+msgstr "Kuvan vakautus"
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
-msgid "+3"
-msgstr ""
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image authentication"
+msgstr "Kuvan vakautus"
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
-msgid "+6"
+#: src/nikonmn.cpp:554
+msgid "ActiveD-Lighting"
 msgstr ""
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
-msgid "+12"
+#: src/nikonmn.cpp:554
+msgid "ActiveD-lighting"
 msgstr ""
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
-msgid "-12"
-msgstr ""
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid "Picture Control"
+msgstr "Kuvan tiedot"
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
-msgid "-6"
-msgstr ""
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid " Picture control"
+msgstr "Kuvan tiedot"
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
-msgid "-3"
-msgstr ""
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World Time"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
-msgid "+13"
-msgstr ""
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World time"
+msgstr "Valotusaika"
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
-msgid "-13"
+#: src/nikonmn.cpp:557
+msgid "ISO Info"
 msgstr ""
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
-msgid "+7"
+#: src/nikonmn.cpp:557
+msgid "ISO info"
 msgstr ""
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
-msgid "+14"
+#: src/nikonmn.cpp:558
+msgid "Vignette Control"
 msgstr ""
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
-msgid "-14"
+#: src/nikonmn.cpp:558
+msgid "Vignette control"
 msgstr ""
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
-msgid "-7"
-msgstr ""
+#: src/nikonmn.cpp:560
+#, fuzzy
+msgid "Tone Compensation"
+msgstr "Pakkaus"
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
-msgid "+15"
+#: src/nikonmn.cpp:560
+msgid "Tone compensation"
 msgstr ""
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
-msgid "-15"
+#: src/nikonmn.cpp:566
+msgid "Mode of flash used"
 msgstr ""
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
 #, fuzzy
-msgid "AF Fine Tune Adj"
-msgstr "Käytetty AF-piste"
+msgid "Shooting Mode"
+msgstr "Mittaustapa"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
 #, fuzzy
-msgid "AF fine tune adj"
-msgstr "Käytetty AF-piste"
+msgid "Shooting mode"
+msgstr "Mittaustapa"
 
-#: src/nikonmn.cpp:878
-msgid "Unknown Nikon Shot Info D300 (a) Tag"
+#: src/nikonmn.cpp:569
+msgid "Auto Bracket Release"
 msgstr ""
 
-#: src/nikonmn.cpp:938
-msgid "Unknown Nikon Shot Info D300 (b) Tag"
+#: src/nikonmn.cpp:569
+msgid "Auto bracket release"
 msgstr ""
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
-msgstr ""
+#: src/nikonmn.cpp:570
+#, fuzzy
+msgid "Lens FStops"
+msgstr "Linssin tyyppi"
 
-#: src/nikonmn.cpp:950
-msgid "On (2)"
-msgstr ""
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast Curve"
+msgstr "Kontrasti"
 
-#: src/nikonmn.cpp:951
-msgid "On (3)"
-msgstr ""
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast curve"
+msgstr "Kontrasti"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:572
 #, fuzzy
-msgid "Shutter Count 1"
-msgstr "Valotusajan esivalinta (Tv)"
+msgid "Color Hue"
+msgstr "Väriavaruus"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:572
 #, fuzzy
-msgid "Shutter count 1"
-msgstr "Valotusajan esivalinta (Tv)"
+msgid "Color hue"
+msgstr "Väriavaruus"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
 #, fuzzy
-msgid "Shutter Count 2"
-msgstr "Valotusajan esivalinta (Tv)"
+msgid "Scene mode"
+msgstr "Mittaustapa"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
 #, fuzzy
-msgid "Shutter count 2"
-msgstr "Valotusajan esivalinta (Tv)"
+msgid "Light Source"
+msgstr "Kuvalähde"
 
-#: src/nikonmn.cpp:969
-msgid "Vibration Reduction 2"
-msgstr ""
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
+#, fuzzy
+msgid "Light source"
+msgstr "Kuvalähde"
 
-#: src/nikonmn.cpp:969
-msgid "Vibration reduction 2"
+#: src/nikonmn.cpp:575
+msgid "Shot info"
 msgstr ""
 
-#: src/nikonmn.cpp:973
-msgid "Unknown Nikon Shot Info Tag"
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue Adjustment"
 msgstr ""
 
-#: src/nikonmn.cpp:984
-msgid "WB RBGG Levels"
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue adjustment"
 msgstr ""
 
-#: src/nikonmn.cpp:984
-msgid "WB RBGG levels"
-msgstr ""
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF Compression"
+msgstr "Pakkaus"
 
-#: src/nikonmn.cpp:986
-msgid "Unknown Nikon Color Balance 1 Tag"
-msgstr ""
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF compression"
+msgstr "Pakkaus"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
-msgid "WB RGGB Levels"
+#: src/nikonmn.cpp:580 src/tags.cpp:903
+msgid "Linearization Table"
 msgstr ""
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
-msgid "WB RGGB levels"
+#: src/nikonmn.cpp:580
+msgid "Linearization table"
 msgstr ""
 
-#: src/nikonmn.cpp:999
-msgid "Unknown Nikon Color Balance 2 Tag"
-msgstr ""
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color Balance"
+msgstr "Väriavaruus"
 
-#: src/nikonmn.cpp:1012
-msgid "Unknown Nikon Color Balance 2a Tag"
-msgstr ""
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color balance"
+msgstr "Väriavaruus"
 
-#: src/nikonmn.cpp:1025
-msgid "Unknown Nikon Color Balance 2b Tag"
-msgstr ""
+#: src/nikonmn.cpp:582
+#, fuzzy
+msgid "Lens Data"
+msgstr "Linssin tyyppi"
 
-#: src/nikonmn.cpp:1036
-msgid "WB RGBG Levels"
-msgstr ""
+#: src/nikonmn.cpp:582
+#, fuzzy
+msgid "Lens data settings"
+msgstr "Kameran asetukset"
 
-#: src/nikonmn.cpp:1036
-msgid "WB RGBG levels"
+#: src/nikonmn.cpp:583
+#, fuzzy
+msgid "Raw Image Center"
+msgstr "Kuvan numero"
+
+#: src/nikonmn.cpp:583
+msgid "Raw image center"
 msgstr ""
 
-#: src/nikonmn.cpp:1038
-msgid "Unknown Nikon Color Balance 3 Tag"
+#: src/nikonmn.cpp:584
+msgid "Sensor Pixel Size"
 msgstr ""
 
-#: src/nikonmn.cpp:1049
-msgid "WB GRBG Levels"
+#: src/nikonmn.cpp:584
+msgid "Sensor pixel size"
 msgstr ""
 
-#: src/nikonmn.cpp:1049
-msgid "WB GRBG levels"
+#: src/nikonmn.cpp:586
+msgid "Scene Assist"
 msgstr ""
 
-#: src/nikonmn.cpp:1051
-msgid "Unknown Nikon Color Balance 4 Tag"
+#: src/nikonmn.cpp:586
+msgid "Scene assist"
 msgstr ""
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
-#, fuzzy
-msgid "Lens ID Number"
-msgstr "Linssin sarjanumero"
-
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:587
 #, fuzzy
-msgid "Lens ID number"
-msgstr "Linssin sarjanumero"
+msgid "Retouch History"
+msgstr "Kuvan tyyppi"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
-#, fuzzy
-msgid "Lens F-Stops"
-msgstr "Linssin tyyppi"
+#: src/nikonmn.cpp:587
+msgid "Retouch history"
+msgstr ""
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:589
 #, fuzzy
-msgid "Lens F-stops"
-msgstr "Linssin tyyppi"
-
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
-msgid "Min Focal Length"
-msgstr ""
+msgid "Serial NO"
+msgstr "Sarjanumero"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
-msgid "Min focal length"
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
 msgstr ""
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
-msgid "Max Focal Length"
-msgstr ""
+#: src/nikonmn.cpp:590
+#, fuzzy
+msgid "Image Data Size"
+msgstr "Kuvan koko"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
-msgid "Max focal length"
-msgstr ""
+#: src/nikonmn.cpp:590
+#, fuzzy
+msgid "Image data size"
+msgstr "Kuvan koko"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
-msgid "Max Aperture At Min Focal"
-msgstr ""
+#: src/nikonmn.cpp:592
+#, fuzzy
+msgid "Image Count"
+msgstr "Kuvan laatu"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
-msgid "Max aperture at min focal"
-msgstr ""
+#: src/nikonmn.cpp:592
+#, fuzzy
+msgid "Image count"
+msgstr "Kuvan laatu"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
-msgid "Max Aperture At Max Focal"
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+msgid "Deleted Image Count"
 msgstr ""
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
-msgid "Max aperture at max focal"
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+msgid "Deleted image count"
 msgstr ""
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
 #, fuzzy
-msgid "MCU Version"
-msgstr "Ohjelman versio"
+msgid "Shutter Count"
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
-msgid "MCU version"
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
 msgstr ""
 
-#: src/nikonmn.cpp:1070
-msgid "Unknown Nikon Lens Data 1 Tag"
-msgstr ""
+#: src/nikonmn.cpp:595
+#, fuzzy
+msgid "Flash info"
+msgstr "Salamavalotuksen korjaus"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-msgid "Exit Pupil Position"
-msgstr ""
+#: src/nikonmn.cpp:596
+#, fuzzy
+msgid "Image Optimization"
+msgstr "Kuvan vakautus"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-msgid "Exit pupil position"
-msgstr ""
+#: src/nikonmn.cpp:596
+#, fuzzy
+msgid "Image optimization"
+msgstr "Kuvan vakautus"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:598
 #, fuzzy
-msgid "AF Aperture"
-msgstr "Aukko"
+msgid "Program Variation"
+msgstr "Ohjelman versio"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:598
 #, fuzzy
-msgid "AF aperture"
-msgstr "Aukko"
+msgid "Program variation"
+msgstr "Ohjelman versio"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
-msgid "Effective Max Aperture"
-msgstr ""
+#: src/nikonmn.cpp:600
+#, fuzzy
+msgid "AF Response"
+msgstr "Käytetty AF-piste"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
-msgid "Effective max aperture"
-msgstr ""
+#: src/nikonmn.cpp:600
+#, fuzzy
+msgid "AF response"
+msgstr "Käytetty AF-piste"
 
-#: src/nikonmn.cpp:1095
-msgid "Unknown Nikon Lens Data 2 Tag"
-msgstr ""
+#: src/nikonmn.cpp:601
+#, fuzzy
+msgid "Multi exposure"
+msgstr "Automaattivalotus"
 
-#: src/nikonmn.cpp:1115
-msgid "Max aperture at min focal length"
+#: src/nikonmn.cpp:602
+msgid "High ISO Noise Reduction"
 msgstr ""
 
-#: src/nikonmn.cpp:1116
-msgid "Max aperture at max focal length"
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
+msgid "Toning effect"
 msgstr ""
 
-#: src/nikonmn.cpp:1120
-msgid "Unknown Nikon Lens Data 3 Tag"
+#: src/nikonmn.cpp:604
+msgid "AF info 2"
 msgstr ""
 
-#: src/nikonmn.cpp:1299
-msgid "Closest subject"
-msgstr ""
+#: src/nikonmn.cpp:605
+#, fuzzy
+msgid "File info"
+msgstr "Tiedostonimi"
 
-#: src/nikonmn.cpp:1300
-msgid "Group dynamic-AF"
+#: src/nikonmn.cpp:608
+msgid "Capture Data"
 msgstr ""
 
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
-msgid "none"
+#: src/nikonmn.cpp:608
+msgid "Capture data"
 msgstr ""
 
-#: src/nikonmn.cpp:1333
-msgid "used"
-msgstr ""
+#: src/nikonmn.cpp:609
+#, fuzzy
+msgid "Capture Version"
+msgstr "Firmwaren versio"
 
-#: src/nikonmn.cpp:1359
+#: src/nikonmn.cpp:609
 #, fuzzy
-msgid "All 11 Points"
-msgstr "AF-piste"
+msgid "Capture version"
+msgstr "Firmwaren versio"
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
-msgid "Single-frame"
+#: src/nikonmn.cpp:611
+msgid "Capture Offsets"
 msgstr ""
 
-#: src/olympusmn.cpp:68
-msgid "Standard Quality (SQ)"
+#: src/nikonmn.cpp:611
+msgid "Capture offsets"
 msgstr ""
 
-#: src/olympusmn.cpp:69
-msgid "High Quality (HQ)"
+#: src/nikonmn.cpp:612
+msgid "Scan IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:70
-msgid "Super High Quality (SHQ)"
+#: src/nikonmn.cpp:613
+msgid "ICC profile"
 msgstr ""
 
-#: src/olympusmn.cpp:85
-msgid "On (preset)"
+#: src/nikonmn.cpp:614
+msgid "Capture output"
 msgstr ""
 
-#: src/olympusmn.cpp:91
-msgid "Internal"
+#: src/nikonmn.cpp:616
+msgid "Unknown Nikon3MakerNote tag"
 msgstr ""
 
-#: src/olympusmn.cpp:93
-msgid "Internal + External"
-msgstr ""
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+#, fuzzy
+msgid "No"
+msgstr "Ei käytössä"
 
-#: src/olympusmn.cpp:118
-msgid "Interlaced"
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
+msgid "Yes"
 msgstr ""
 
-#: src/olympusmn.cpp:119
-msgid "Progressive"
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
 msgstr ""
 
-#: src/olympusmn.cpp:127
-msgid "Thumbnail Image"
-msgstr "Näytekuva"
-
-#: src/olympusmn.cpp:128
-msgid "Thumbnail image"
-msgstr "Näytekuva"
-
-#: src/olympusmn.cpp:131
-msgid "Special Mode"
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
 msgstr ""
 
-#: src/olympusmn.cpp:132
-msgid "Picture taking mode"
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
 msgstr ""
 
-#: src/olympusmn.cpp:140
-msgid "Black & White Mode"
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+msgid "Vibration Reduction"
 msgstr ""
 
-#: src/olympusmn.cpp:141
-msgid "Black and white mode"
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+msgid "Vibration reduction"
 msgstr ""
 
-#: src/olympusmn.cpp:144
-msgid "Digital zoom ratio"
+#: src/nikonmn.cpp:648
+msgid "Unknown Nikon Vibration Reduction Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
-msgid "Focal Plane Diagonal"
-msgstr ""
+#: src/nikonmn.cpp:658
+#, fuzzy
+msgid "Default Settings"
+msgstr "Kameran asetukset"
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
-msgid "Focal plane diagonal"
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
+msgid "Quick Adjust"
 msgstr ""
 
-#: src/olympusmn.cpp:149
-msgid "Lens Distortion Parameters"
-msgstr ""
+#: src/nikonmn.cpp:660
+#, fuzzy
+msgid "Full Control"
+msgstr "Täysautomatiikka"
 
-#: src/olympusmn.cpp:150
-msgid "Lens distortion parameters"
+#: src/nikonmn.cpp:681
+msgid "Blue-green"
 msgstr ""
 
-#: src/olympusmn.cpp:153
-msgid "Software firmware version"
+#: src/nikonmn.cpp:683
+msgid "Purple-blue"
 msgstr ""
 
-#: src/olympusmn.cpp:156
-msgid "ASCII format data such as [PictureInfo]"
+#: src/nikonmn.cpp:684
+msgid "Red-purple"
 msgstr ""
 
-#: src/olympusmn.cpp:158
-msgid "Camera ID"
+#: src/nikonmn.cpp:691
+msgid "Name"
 msgstr ""
 
-#: src/olympusmn.cpp:159
-msgid "Camera ID data"
+#: src/nikonmn.cpp:692
+msgid "Base"
 msgstr ""
 
-#: src/olympusmn.cpp:178
-msgid "Pre Capture Frames"
+#: src/nikonmn.cpp:693
+msgid "Adjust"
 msgstr ""
 
-#: src/olympusmn.cpp:179
-msgid "Pre-capture frames"
+#: src/nikonmn.cpp:694
+msgid "Quick adjust"
 msgstr ""
 
-#: src/olympusmn.cpp:184
-msgid "One Touch WB"
+#: src/nikonmn.cpp:700
+msgid "Filter effect"
 msgstr ""
 
-#: src/olympusmn.cpp:185
-msgid "One touch white balance"
-msgstr ""
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning Saturation"
+msgstr "Värikylläisyys"
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
-msgid "Serial number"
-msgstr ""
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning saturation"
+msgstr "Värikylläisyys"
 
-#: src/olympusmn.cpp:199
-msgid "Data Dump 1"
+#: src/nikonmn.cpp:704
+msgid "Unknown Nikon Picture Control Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:200
-msgid "Various camera settings 1"
+#: src/nikonmn.cpp:714
+msgid "Timezone"
 msgstr ""
 
-#: src/olympusmn.cpp:202
-msgid "Data Dump 2"
-msgstr ""
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight Savings"
+msgstr "Kameran asetukset"
 
-#: src/olympusmn.cpp:203
-msgid "Various camera settings 2"
+#: src/nikonmn.cpp:715
+msgid "Daylight savings"
 msgstr ""
 
-#: src/olympusmn.cpp:205
-msgid "Shutter Speed"
-msgstr "Valotusaika"
-
-#: src/olympusmn.cpp:206
-msgid "Shutter speed value"
+#: src/nikonmn.cpp:716
+msgid "Date Display Format"
 msgstr ""
 
-#: src/olympusmn.cpp:209
-msgid "ISO speed value"
-msgstr "ISO-herkkyys"
-
-#: src/olympusmn.cpp:212
-msgid "Aperture value"
-msgstr "Aukko"
-
-#: src/olympusmn.cpp:215
-msgid "Brightness value"
+#: src/nikonmn.cpp:716
+msgid "Date display format"
 msgstr ""
 
-#: src/olympusmn.cpp:223
-msgid "Bracket"
+#: src/nikonmn.cpp:718
+msgid "Unknown Nikon World Time Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:224
-msgid "Exposure compensation value"
-msgstr ""
+#: src/nikonmn.cpp:729
+#, fuzzy
+msgid "Hi 0.3"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
-msgid "Sensor Temperature"
-msgstr ""
+#: src/nikonmn.cpp:730
+#, fuzzy
+msgid "Hi 0.5"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
-msgid "Sensor temperature"
-msgstr ""
+#: src/nikonmn.cpp:731
+#, fuzzy
+msgid "Hi 0.7"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:229
-msgid "Lens Temperature"
-msgstr ""
+#: src/nikonmn.cpp:732
+#, fuzzy
+msgid "Hi 1.0"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:230
-msgid "Lens temperature"
-msgstr ""
+#: src/nikonmn.cpp:733
+#, fuzzy
+msgid "Hi 1.3"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:244
-msgid "Zoom"
-msgstr ""
+#: src/nikonmn.cpp:734
+#, fuzzy
+msgid "Hi 1.5"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
-msgid "Zoom step count"
-msgstr ""
+#: src/nikonmn.cpp:735
+#, fuzzy
+msgid "Hi 1.7"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:247
-msgid "Macro Focus"
-msgstr ""
+#: src/nikonmn.cpp:736
+#, fuzzy
+msgid "Hi 2.0"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:248
-msgid "Macro focus step count"
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
 msgstr ""
 
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
-msgid "Sharpness Factor"
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
 msgstr ""
 
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
-msgid "Sharpness factor"
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
 msgstr ""
 
-#: src/olympusmn.cpp:253
-msgid "Flash Charge Level"
-msgstr ""
+#: src/nikonmn.cpp:740
+#, fuzzy
+msgid "Lo 1.0"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:254
-msgid "Flash charge level"
+#: src/nikonmn.cpp:746
+msgid "ISO Expansion"
 msgstr ""
 
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
-msgid "Color Matrix"
+#: src/nikonmn.cpp:746
+msgid "ISO expansion"
 msgstr ""
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
-msgid "Color matrix"
-msgstr ""
+#: src/nikonmn.cpp:747
+#, fuzzy
+msgid "ISO 2"
+msgstr "Päällä"
 
-#: src/olympusmn.cpp:259
-msgid "BlackLevel"
+#: src/nikonmn.cpp:748
+msgid "ISO Expansion 2"
 msgstr ""
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
-msgid "Black level"
+#: src/nikonmn.cpp:748
+msgid "ISO expansion 2"
 msgstr ""
 
-#: src/olympusmn.cpp:269
-msgid "White balance mode"
+#: src/nikonmn.cpp:750
+msgid "Unknown Nikon Iso Info Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
-msgid "Red Balance"
+#: src/nikonmn.cpp:760
+msgid "Single Area"
 msgstr ""
 
-#: src/olympusmn.cpp:275
-msgid "Red balance"
+#: src/nikonmn.cpp:761
+msgid "Dynamic Area"
 msgstr ""
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
-msgid "Blue Balance"
+#: src/nikonmn.cpp:762
+msgid "Dynamic Area, Closest Subject"
 msgstr ""
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
-msgid "Blue balance"
+#: src/nikonmn.cpp:763
+msgid "Group Dynamic"
 msgstr ""
 
-#: src/olympusmn.cpp:283
-msgid "Serial Number 2"
+#: src/nikonmn.cpp:764
+msgid "Single Area (wide)"
 msgstr ""
 
-#: src/olympusmn.cpp:284
-msgid "Serial number 2"
+#: src/nikonmn.cpp:765
+msgid "Dynamic Area (wide)"
 msgstr ""
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
-msgid "Flash exposure compensation"
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
+msgid "Mid-left"
 msgstr ""
 
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
-msgid "External Flash Bounce"
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
+msgid "Mid-right"
 msgstr ""
 
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
-msgid "External flash bounce"
-msgstr ""
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
+#, fuzzy
+msgid "Far Left"
+msgstr "Polttoväli"
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
-msgid "External Flash Zoom"
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
+msgid "Far Right"
 msgstr ""
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
-msgid "External flash zoom"
-msgstr ""
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
+#, fuzzy
+msgid "AF area mode"
+msgstr "Kameran malli"
 
-#: src/olympusmn.cpp:325
-msgid "External Flash Mode"
-msgstr ""
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
+#, fuzzy
+msgid "AF point"
+msgstr "AF-piste"
 
-#: src/olympusmn.cpp:326
-msgid "External flash mode"
-msgstr ""
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF Points In Focus"
+msgstr "Käytetty AF-piste"
 
-#: src/olympusmn.cpp:334
-msgid "Color Control"
-msgstr ""
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF points in focus"
+msgstr "Käytetty AF-piste"
 
-#: src/olympusmn.cpp:335
-msgid "Color control"
+#: src/nikonmn.cpp:804
+msgid "Unknown Nikon Auto Focus Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:337
-msgid "ValidBits"
+#: src/nikonmn.cpp:815
+msgid "On (51-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
-msgid "Valid bits"
+#: src/nikonmn.cpp:816
+msgid "On (11-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:340
-msgid "CoringFilter"
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast Detect AF"
+msgstr "Kontrasti"
+
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast detect AF"
+msgstr "Kontrasti"
+
+#: src/nikonmn.cpp:824
+msgid "Phase Detect AF"
 msgstr ""
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
-msgid "Coring filter"
+#: src/nikonmn.cpp:824
+msgid "Phase detect AF"
 msgstr ""
 
-#: src/olympusmn.cpp:361
-msgid "Compression Ratio"
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF Point"
+msgstr "AF-piste"
+
+#: src/nikonmn.cpp:825
+msgid "Primary AF point"
 msgstr ""
 
-#: src/olympusmn.cpp:362
-msgid "Compression ratio"
+#: src/nikonmn.cpp:827
+msgid "AF Image Width"
 msgstr ""
 
-#: src/olympusmn.cpp:365
-msgid "Preview image embedded"
+#: src/nikonmn.cpp:827
+msgid "AF image width"
 msgstr ""
 
-#: src/olympusmn.cpp:368
-msgid "Offset of the preview image"
+#: src/nikonmn.cpp:828
+#, fuzzy
+msgid "AF Image Height"
+msgstr "Kuvan tyyppi"
+
+#: src/nikonmn.cpp:828
+msgid "AF image height"
 msgstr ""
 
-#: src/olympusmn.cpp:371
-msgid "Size of the preview image"
+#: src/nikonmn.cpp:829
+#, fuzzy
+msgid "AF Area X Position"
+msgstr "Salaman tila"
+
+#: src/nikonmn.cpp:829
+#, fuzzy
+msgid "AF area x position"
+msgstr "Kameran malli"
+
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF Area Y Position"
+msgstr "Salaman tila"
+
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF area y position"
+msgstr "Kameran malli"
+
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF Area Width"
+msgstr "Salaman tila"
+
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF area width"
+msgstr "Kameran malli"
+
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF Area Height"
+msgstr "Salaman tila"
+
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF area height"
+msgstr "Kameran malli"
+
+#: src/nikonmn.cpp:833
+msgid "Contrast Detect AF In Focus"
 msgstr ""
 
-#: src/olympusmn.cpp:373
-msgid "CCD Scan Mode"
+#: src/nikonmn.cpp:833
+msgid "Contrast detect AF in focus"
 msgstr ""
 
-#: src/olympusmn.cpp:374
-msgid "CCD scan mode"
+#: src/nikonmn.cpp:835
+msgid "Unknown Nikon Auto Focus 2 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:379
-msgid "Infinity Lens Step"
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory Number"
+msgstr "F-luku"
+
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory number"
+msgstr "Tiedostonimi"
+
+#: src/nikonmn.cpp:849
+msgid "Unknown Nikon File Info Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:380
-msgid "Infinity lens step"
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
+#, fuzzy
+msgid "Multiple Exposure"
+msgstr "Automaattivalotus"
+
+#: src/nikonmn.cpp:861
+#, fuzzy
+msgid "Image Overlay"
+msgstr "Kuvan numero"
+
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi Exposure Mode"
+msgstr "Valotustila"
+
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi exposure mode"
+msgstr "Valotustila"
+
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi Exposure Shots"
+msgstr "Automaattivalotus"
+
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi exposure shots"
+msgstr "Automaattivalotus"
+
+#: src/nikonmn.cpp:869
+msgid "Multi Exposure Auto Gain"
 msgstr ""
 
-#: src/olympusmn.cpp:382
-msgid "Near Lens Step"
+#: src/nikonmn.cpp:869
+msgid "Multi exposure auto gain"
 msgstr ""
 
-#: src/olympusmn.cpp:383
-msgid "Near lens step"
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
+msgid "Unknown Nikon Multi Exposure Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:385
-msgid "Equipment Info"
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
+#, fuzzy
+msgid "Internal"
+msgstr "Ulkoinen"
+
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
 msgstr ""
 
-#: src/olympusmn.cpp:386
-msgid "Camera equipment sub-IFD"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
 msgstr ""
 
-#: src/olympusmn.cpp:389
-msgid "Camera Settings sub-IFD"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
 msgstr ""
 
-#: src/olympusmn.cpp:391
-msgid "Raw Development"
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
 msgstr ""
 
-#: src/olympusmn.cpp:392
-msgid "Raw development sub-IFD"
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
 msgstr ""
 
-#: src/olympusmn.cpp:394
-msgid "Raw Development 2"
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
 msgstr ""
 
-#: src/olympusmn.cpp:395
-msgid "Raw development 2 sub-IFD"
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:398
-msgid "Image processing sub-IFD"
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:400
-msgid "Focus Info"
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:401
-msgid "Focus sub-IFD"
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
 msgstr ""
 
-#: src/olympusmn.cpp:403
-msgid "Raw Info"
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
 msgstr ""
 
-#: src/olympusmn.cpp:404
-msgid "Raw sub-IFD"
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:409
-msgid "Unknown OlympusMakerNote tag"
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
 msgstr ""
 
-#: src/olympusmn.cpp:424
-msgid "Program-shift"
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
 msgstr ""
 
-#: src/olympusmn.cpp:429
-msgid "Center-weighted average"
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
 msgstr ""
 
-#: src/olympusmn.cpp:431
-msgid "ESP"
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:432
-msgid "Pattern+AF"
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:433
-msgid "Spot+Highlight control"
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
 msgstr ""
 
-#: src/olympusmn.cpp:434
-msgid "Spot+Shadow control"
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
-msgid "Super Macro"
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
 msgstr ""
 
-#: src/olympusmn.cpp:446
-msgid "Single AF"
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:447
-msgid "Sequential shooting AF"
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:449
-msgid "Multi AF"
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
 msgstr ""
 
-#: src/olympusmn.cpp:450
-msgid "MF"
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
 msgstr ""
 
-#: src/olympusmn.cpp:455
-msgid "AF Not Used"
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:456
-msgid "AF Used"
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:461
-msgid "Not Ready"
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:462
-msgid "Ready"
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
 msgstr ""
 
-#: src/olympusmn.cpp:469
-msgid "Fill-in"
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:471
-msgid "Slow-sync"
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:472
-msgid "Forced On"
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
 msgstr ""
 
-#: src/olympusmn.cpp:473
-msgid "2nd Curtain"
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:480
-msgid "6000K (Cloudy)"
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:481
-msgid "5300K (Fine Weather)"
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:482
-msgid "3000K (Tungsten light)"
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
-msgid "3600K (Tungsten light-like)"
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
 msgstr ""
 
-#: src/olympusmn.cpp:484
-msgid "6600K (Daylight fluorescent)"
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:485
-msgid "4500K (Neutral white fluorescent)"
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:486
-msgid "4000K (Cool white fluorescent)"
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:488
-msgid "Custom WB 1"
+#: src/nikonmn.cpp:934
+msgid "10.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:489
-msgid "Custom WB 2"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:490
-msgid "Custom WB 3"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:491
-msgid "Custom WB 4"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:492
-msgid "Custom WB 5400K"
+#: src/nikonmn.cpp:938
+msgid "16.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:493
-msgid "Custom WB 2900K"
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:494
-msgid "Custom WB 8000K"
+#: src/nikonmn.cpp:940
+msgid "20.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:500
-msgid "CM1 (Red Enhance)"
+#: src/nikonmn.cpp:947
+msgid "iTTL-BL"
 msgstr ""
 
-#: src/olympusmn.cpp:501
-msgid "CM2 (Green Enhance)"
+#: src/nikonmn.cpp:948
+msgid "iTTL"
 msgstr ""
 
-#: src/olympusmn.cpp:502
-msgid "CM3 (Blue Enhance)"
-msgstr ""
+#: src/nikonmn.cpp:949
+#, fuzzy
+msgid "Auto Aperture"
+msgstr "Aukko"
 
-#: src/olympusmn.cpp:503
-msgid "CM4 (Skin Tones)"
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
 msgstr ""
 
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
-msgid "Pro Photo RGB"
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
+msgid "Repeating Flash"
 msgstr ""
 
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
-msgid "Sport"
-msgstr ""
+#: src/nikonmn.cpp:960
+#, fuzzy
+msgid "Bounce Flash"
+msgstr "Ei salamaa"
 
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
-msgid "Landscape+Portrait"
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
 msgstr ""
 
-#: src/olympusmn.cpp:522
-msgid "Self Portrait"
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
 msgstr ""
 
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
 msgstr ""
 
-#: src/olympusmn.cpp:527
-msgid "Night+Portrait"
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
 msgstr ""
 
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
 msgstr ""
 
-#: src/olympusmn.cpp:534
-msgid "Documents"
-msgstr ""
+#: src/nikonmn.cpp:974
+#, fuzzy
+msgid "Amber"
+msgstr "F-luku"
 
-#: src/olympusmn.cpp:536
-msgid "Shoot & Select"
-msgstr ""
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
+#, fuzzy
+msgid "Flash Source"
+msgstr "Kuvalähde"
 
-#: src/olympusmn.cpp:537
-msgid "Beach & Snow"
-msgstr ""
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
+#, fuzzy
+msgid "Flash source"
+msgstr "Kuvalähde"
 
-#: src/olympusmn.cpp:538
-msgid "Self Portrait+Timer"
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
+msgid "0x0005"
 msgstr ""
 
-#: src/olympusmn.cpp:539
-msgid "Candle"
-msgstr ""
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
+#, fuzzy
+msgid "External Flash Firmware"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:540
-msgid "Available Light"
-msgstr ""
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
+#, fuzzy
+msgid "External flash firmware"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
-msgstr ""
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External Flash Flags"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:542
-msgid "My Mode"
-msgstr ""
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External flash flags"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-msgid "Pet"
-msgstr ""
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
+#, fuzzy
+msgid "Flash Focal Length"
+msgstr "Polttoväli"
 
-#: src/olympusmn.cpp:544
-msgid "Underwater Wide1"
-msgstr ""
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
+#, fuzzy
+msgid "Flash focal length"
+msgstr "Polttoväli"
 
-#: src/olympusmn.cpp:545
-msgid "Underwater Macro"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
 msgstr ""
 
-#: src/olympusmn.cpp:546
-msgid "Shoot & Select1"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating flash rate"
 msgstr ""
 
-#: src/olympusmn.cpp:547
-msgid "Shoot & Select2"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
 msgstr ""
 
-#: src/olympusmn.cpp:549
-msgid "Digital Image Stabilization"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating flash count"
 msgstr ""
 
-#: src/olympusmn.cpp:550
-msgid "Auction"
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
+msgid "Flash GN Distance"
 msgstr ""
 
-#: src/olympusmn.cpp:553
-msgid "Underwater Wide2"
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
+msgid "Flash GN distance"
 msgstr ""
 
-#: src/olympusmn.cpp:555
-msgid "Children"
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:557
-msgid "Nature Macro"
+#: src/nikonmn.cpp:988
+msgid "Flash group a control mode"
 msgstr ""
 
-#: src/olympusmn.cpp:558
-msgid "Underwater Snapshot"
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:559
-msgid "Shooting Guide"
+#: src/nikonmn.cpp:989
+msgid "Flash group b control mode"
 msgstr ""
 
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
-msgid "Noise Filter"
+#: src/nikonmn.cpp:1029
+msgid "Flash Color Filter"
 msgstr ""
 
-#: src/olympusmn.cpp:566
-msgid "Noise Filter (ISO Boost)"
+#: src/nikonmn.cpp:1029
+msgid "Flash color filter"
 msgstr ""
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
-msgid "Muted"
-msgstr ""
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
+#, fuzzy
+msgid "Shutter count"
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
-msgid "Monotone"
+#: src/nikonmn.cpp:1044
+msgid "Unknown Nikon Shot Info D80 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:601
-msgid "SQ"
-msgstr ""
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
+#, fuzzy
+msgid "Flash Level"
+msgstr "Salaman malli"
 
-#: src/olympusmn.cpp:602
-msgid "HQ"
-msgstr ""
+#: src/nikonmn.cpp:1056
+#, fuzzy
+msgid "Flash level"
+msgstr "Salaman malli"
 
-#: src/olympusmn.cpp:603
-msgid "SHQ"
+#: src/nikonmn.cpp:1058
+msgid "Unknown Nikon Shot Info D40 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:608
-msgid "Camera Settings Version"
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
+msgid "0"
 msgstr ""
 
-#: src/olympusmn.cpp:608
-msgid "Camera settings version"
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
+msgid "+1"
 msgstr ""
 
-#: src/olympusmn.cpp:609
-msgid "PreviewImage Valid"
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
+msgid "+2"
 msgstr ""
 
-#: src/olympusmn.cpp:609
-msgid "Preview image valid"
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
+msgid "+4"
 msgstr ""
 
-#: src/olympusmn.cpp:610
-msgid "PreviewImage Start"
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
+msgid "+8"
 msgstr ""
 
-#: src/olympusmn.cpp:610
-msgid "Preview image start"
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
+msgid "+16"
 msgstr ""
 
-#: src/olympusmn.cpp:611
-msgid "PreviewImage Length"
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
+msgid "-16"
 msgstr ""
 
-#: src/olympusmn.cpp:611
-msgid "Preview image length"
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
+msgid "-8"
 msgstr ""
 
-#: src/olympusmn.cpp:613
-msgid "AE Lock"
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
+msgid "-4"
 msgstr ""
 
-#: src/olympusmn.cpp:613
-msgid "Auto exposure lock"
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
+msgid "-2"
 msgstr ""
 
-#: src/olympusmn.cpp:617
-msgid "Focus Process"
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
+msgid "-1"
 msgstr ""
 
-#: src/olympusmn.cpp:617
-msgid "Focus process"
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
+msgid "+17"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF Search"
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
+msgid "-17"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF search"
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
+msgid "+9"
 msgstr ""
 
-#: src/olympusmn.cpp:619
-msgid "AF Areas"
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
+msgid "+18"
 msgstr ""
 
-#: src/olympusmn.cpp:619
-msgid "AF areas"
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
+msgid "-18"
 msgstr ""
 
-#: src/olympusmn.cpp:622
-msgid "White Balance 2"
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
+msgid "-9"
 msgstr ""
 
-#: src/olympusmn.cpp:622
-msgid "White balance 2"
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
+msgid "+19"
 msgstr ""
 
-#: src/olympusmn.cpp:623
-msgid "White Balance Temperature"
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
+msgid "-19"
 msgstr ""
 
-#: src/olympusmn.cpp:623
-msgid "White balance temperature"
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
+msgid "+5"
 msgstr ""
 
-#: src/olympusmn.cpp:624
-msgid "White Balance Bracket"
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
+msgid "+10"
 msgstr ""
 
-#: src/olympusmn.cpp:624
-msgid "White balance bracket"
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
+msgid "+20"
 msgstr ""
 
-#: src/olympusmn.cpp:625
-msgid "Custom Saturation"
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
+msgid "-20"
 msgstr ""
 
-#: src/olympusmn.cpp:625
-msgid "Custom saturation"
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
+msgid "-10"
 msgstr ""
 
-#: src/olympusmn.cpp:626
-msgid "Modified Saturation"
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
+msgid "-5"
 msgstr ""
 
-#: src/olympusmn.cpp:626
-msgid "Modified saturation"
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
+msgid "+11"
 msgstr ""
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
-msgid "Contrast Setting"
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
+msgid "-11"
 msgstr ""
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
-msgid "Sharpness Setting"
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
+msgid "+3"
 msgstr ""
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion Correction"
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
+msgid "+6"
 msgstr ""
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion correction"
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
+msgid "+12"
 msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-msgid "Shading Compensation"
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
+msgid "-12"
 msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-msgid "Shading compensation"
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
+msgid "-6"
 msgstr ""
 
-#: src/olympusmn.cpp:634
-msgid "Compression Factor"
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
+msgid "-3"
 msgstr ""
 
-#: src/olympusmn.cpp:634
-msgid "Compression factor"
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
+msgid "+13"
 msgstr ""
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
-msgid "Gradation"
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
+msgid "-13"
 msgstr ""
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
-msgid "Picture mode"
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
+msgid "+7"
 msgstr ""
 
-#: src/olympusmn.cpp:637
-msgid "Picture Mode Saturation"
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
+msgid "+14"
 msgstr ""
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
-msgid "Picture mode saturation"
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
+msgid "-14"
 msgstr ""
 
-#: src/olympusmn.cpp:638
-msgid "Picture Mode Hue"
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
+msgid "-7"
 msgstr ""
 
-#: src/olympusmn.cpp:638
-msgid "Picture mode hue"
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
+msgid "+15"
 msgstr ""
 
-#: src/olympusmn.cpp:639
-msgid "Picture Mode Contrast"
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
+msgid "-15"
 msgstr ""
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
-msgid "Picture mode contrast"
-msgstr ""
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
+#, fuzzy
+msgid "AF Fine Tune Adj"
+msgstr "Käytetty AF-piste"
 
-#: src/olympusmn.cpp:640
-msgid "Picture Mode Sharpness"
-msgstr ""
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
+#, fuzzy
+msgid "AF fine tune adj"
+msgstr "Käytetty AF-piste"
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
-msgid "Picture mode sharpness"
+#: src/nikonmn.cpp:1118
+msgid "Unknown Nikon Shot Info D300 (a) Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:641
-msgid "Picture Mode BW Filter"
+#: src/nikonmn.cpp:1178
+msgid "Unknown Nikon Shot Info D300 (b) Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:641
-msgid "Picture mode BW filter"
+#: src/nikonmn.cpp:1191
+#, fuzzy
+msgid "On (3)"
+msgstr "Päällä"
+
+#: src/nikonmn.cpp:1204
+#, fuzzy
+msgid "Shutter Count 1"
+msgstr "Valotusajan esivalinta (Tv)"
+
+#: src/nikonmn.cpp:1204
+#, fuzzy
+msgid "Shutter count 1"
+msgstr "Valotusajan esivalinta (Tv)"
+
+#: src/nikonmn.cpp:1208
+#, fuzzy
+msgid "Shutter Count 2"
+msgstr "Valotusajan esivalinta (Tv)"
+
+#: src/nikonmn.cpp:1208
+#, fuzzy
+msgid "Shutter count 2"
+msgstr "Valotusajan esivalinta (Tv)"
+
+#: src/nikonmn.cpp:1209
+msgid "Vibration Reduction 2"
 msgstr ""
 
-#: src/olympusmn.cpp:642
-msgid "Picture Mode Tone"
+#: src/nikonmn.cpp:1209
+msgid "Vibration reduction 2"
 msgstr ""
 
-#: src/olympusmn.cpp:642
-msgid "Picture mode tone"
+#: src/nikonmn.cpp:1213
+msgid "Unknown Nikon Shot Info Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:643
-msgid "Noise filter"
+#: src/nikonmn.cpp:1224
+msgid "WB RBGG Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:645
-msgid "Panorama Mode"
+#: src/nikonmn.cpp:1224
+msgid "WB RBGG levels"
 msgstr ""
 
-#: src/olympusmn.cpp:645
-msgid "Panorama mode"
+#: src/nikonmn.cpp:1226
+msgid "Unknown Nikon Color Balance 1 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:646
-msgid "Image Quality 2"
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
+msgid "WB RGGB Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:646
-msgid "Image quality 2"
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
+msgid "WB RGGB levels"
 msgstr ""
 
-#: src/olympusmn.cpp:647
-msgid "Manometer Pressure"
+#: src/nikonmn.cpp:1239
+msgid "Unknown Nikon Color Balance 2 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:647
-msgid "Manometer pressure"
+#: src/nikonmn.cpp:1252
+msgid "Unknown Nikon Color Balance 2a Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:648
-msgid "Manometer Reading"
+#: src/nikonmn.cpp:1265
+msgid "Unknown Nikon Color Balance 2b Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:648
-msgid "Manometer reading"
+#: src/nikonmn.cpp:1276
+msgid "WB RGBG Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB Detect"
+#: src/nikonmn.cpp:1276
+msgid "WB RGBG levels"
 msgstr ""
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB detect"
+#: src/nikonmn.cpp:1278
+msgid "Unknown Nikon Color Balance 3 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:651
-msgid "Unknown OlympusCs tag"
+#: src/nikonmn.cpp:1289
+msgid "WB GRBG Levels"
 msgstr ""
 
-#: src/olympusmn.cpp:662
-msgid "Simple E-System"
+#: src/nikonmn.cpp:1289
+msgid "WB GRBG levels"
 msgstr ""
 
-#: src/olympusmn.cpp:663
-msgid "E-System"
+#: src/nikonmn.cpp:1291
+msgid "Unknown Nikon Color Balance 4 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:679
-msgid "Equipment Version"
-msgstr ""
-
-#: src/olympusmn.cpp:679
-msgid "Equipment version"
-msgstr ""
-
-#: src/olympusmn.cpp:680
-msgid "Camera Type"
-msgstr "Kameran tyyppi"
-
-#: src/olympusmn.cpp:680
-msgid "Camera type"
-msgstr "Kameran tyyppi"
-
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
-msgid "Internal Serial Number"
-msgstr ""
-
-#: src/olympusmn.cpp:682
-msgid "Internal serial number"
-msgstr ""
-
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-msgid "Body Firmware Version"
-msgstr ""
-
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-msgid "Body firmware version"
-msgstr ""
-
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
-msgid "Lens Serial Number"
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
+#, fuzzy
+msgid "Lens ID Number"
 msgstr "Linssin sarjanumero"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
-msgid "Lens serial number"
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
+#, fuzzy
+msgid "Lens ID number"
 msgstr "Linssin sarjanumero"
 
-#: src/olympusmn.cpp:687
-msgid "Lens Firmware Version"
-msgstr ""
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
+#, fuzzy
+msgid "Lens F-Stops"
+msgstr "Linssin tyyppi"
 
-#: src/olympusmn.cpp:687
-msgid "Lens firmware version"
-msgstr ""
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
+#, fuzzy
+msgid "Lens F-stops"
+msgstr "Linssin tyyppi"
 
-#: src/olympusmn.cpp:692
-msgid "Max Aperture At Current Focal"
-msgstr ""
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+#, fuzzy
+msgid "Min Focal Length"
+msgstr "Polttoväli"
 
-#: src/olympusmn.cpp:692
-msgid "Max aperture at current focal"
-msgstr ""
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+#, fuzzy
+msgid "Min focal length"
+msgstr "Polttoväli"
 
-#: src/olympusmn.cpp:693
-msgid "Lens Properties"
-msgstr "Linssin ominaisuudet"
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+#, fuzzy
+msgid "Max Focal Length"
+msgstr "Polttoväli"
 
-#: src/olympusmn.cpp:693
-msgid "Lens properties"
-msgstr "Linssin ominaisuudet"
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+#, fuzzy
+msgid "Max focal length"
+msgstr "Polttoväli"
 
-#: src/olympusmn.cpp:694
-msgid "Extender"
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
+msgid "Max Aperture At Min Focal"
 msgstr ""
 
-#: src/olympusmn.cpp:695
-msgid "Extender Serial Number"
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
+msgid "Max aperture at min focal"
 msgstr ""
 
-#: src/olympusmn.cpp:695
-msgid "Extender serial number"
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
+msgid "Max Aperture At Max Focal"
 msgstr ""
 
-#: src/olympusmn.cpp:696
-msgid "Extender Model"
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
+msgid "Max aperture at max focal"
 msgstr ""
 
-#: src/olympusmn.cpp:696
-msgid "Extender model"
-msgstr ""
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+#, fuzzy
+msgid "MCU Version"
+msgstr "Ohjelman versio"
 
-#: src/olympusmn.cpp:697
-msgid "Extender Firmware Version"
-msgstr ""
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+#, fuzzy
+msgid "MCU version"
+msgstr "Ohjelman versio"
 
-#: src/olympusmn.cpp:697
-msgid "Extender firmwareversion"
+#: src/nikonmn.cpp:1310
+msgid "Unknown Nikon Lens Data 1 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:698
-msgid "Flash Type"
-msgstr "Salaman tyyppi"
-
-#: src/olympusmn.cpp:698
-msgid "Flash type"
-msgstr "Salaman tyyppi"
-
-#: src/olympusmn.cpp:699 src/properties.cpp:354
-msgid "Flash Model"
-msgstr "Salaman malli"
-
-#: src/olympusmn.cpp:699
-msgid "Flash model"
-msgstr "Salaman malli"
-
-#: src/olympusmn.cpp:700
-msgid "Flash Firmware Version"
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+msgid "Exit Pupil Position"
 msgstr ""
 
-#: src/olympusmn.cpp:700
-msgid "Flash firmware version"
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+msgid "Exit pupil position"
 msgstr ""
 
-#: src/olympusmn.cpp:701
-msgid "FlashSerialNumber"
-msgstr "Salaman sarjanumero"
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+#, fuzzy
+msgid "AF Aperture"
+msgstr "Aukko"
 
-#: src/olympusmn.cpp:703
-msgid "Unknown OlympusEq tag"
-msgstr ""
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+#, fuzzy
+msgid "AF aperture"
+msgstr "Aukko"
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
-msgid "High Speed"
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+msgid "Effective Max Aperture"
 msgstr ""
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
-msgid "High Function"
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+msgid "Effective max aperture"
 msgstr ""
 
-#: src/olympusmn.cpp:722
-msgid "Advanced High Speed"
+#: src/nikonmn.cpp:1335
+msgid "Unknown Nikon Lens Data 2 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:723
-msgid "Advanced High Function"
+#: src/nikonmn.cpp:1355
+msgid "Max aperture at min focal length"
 msgstr ""
 
-#: src/olympusmn.cpp:728
-msgid "Original"
+#: src/nikonmn.cpp:1356
+msgid "Max aperture at max focal length"
 msgstr ""
 
-#: src/olympusmn.cpp:729
-msgid "Edited (Landscape)"
+#: src/nikonmn.cpp:1360
+msgid "Unknown Nikon Lens Data 3 Tag"
 msgstr ""
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
-msgid "Edited (Portrait)"
+#: src/nikonmn.cpp:1540
+msgid "Closest subject"
 msgstr ""
 
-#: src/olympusmn.cpp:736
-msgid "WB Color Temp"
+#: src/nikonmn.cpp:1541
+msgid "Group dynamic-AF"
 msgstr ""
 
-#: src/olympusmn.cpp:737
-msgid "WB Gray Point"
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
+msgid "none"
 msgstr ""
 
-#: src/olympusmn.cpp:747
-msgid "Raw Development Version"
+#: src/nikonmn.cpp:1574
+msgid "used"
 msgstr ""
 
-#: src/olympusmn.cpp:747
-msgid "Raw development version"
-msgstr ""
+#: src/nikonmn.cpp:1600
+#, fuzzy
+msgid "All 11 Points"
+msgstr "AF-piste"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
-msgid "Exposure Bias Value"
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
+msgid "Single-frame"
 msgstr ""
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
-msgid "Exposure bias value"
+#: src/olympusmn.cpp:71
+msgid "Standard Quality (SQ)"
 msgstr ""
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
-msgid "White Balance Value"
+#: src/olympusmn.cpp:72
+msgid "High Quality (HQ)"
 msgstr ""
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
-msgid "White balance value"
+#: src/olympusmn.cpp:73
+msgid "Super High Quality (SHQ)"
 msgstr ""
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
-msgid "WB Fine Adjustment"
+#: src/olympusmn.cpp:88
+msgid "On (preset)"
 msgstr ""
 
-#: src/olympusmn.cpp:750
-msgid "WB fine adjustment"
-msgstr ""
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
+#, fuzzy
+msgid "Sport"
+msgstr "Urheilukuva"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
-msgid "Gray Point"
-msgstr ""
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
+#, fuzzy
+msgid "Landscape+Portrait"
+msgstr "Maisemakuva"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
-msgid "Gray point"
-msgstr ""
+#: src/olympusmn.cpp:100
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Muotokuva"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
-msgid "Saturation Emphasis"
-msgstr ""
+#: src/olympusmn.cpp:102
+#, fuzzy
+msgid "2 in 1"
+msgstr "Päällä"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
-msgid "Saturation emphasis"
-msgstr ""
+#: src/olympusmn.cpp:105
+#, fuzzy
+msgid "Night+Portrait"
+msgstr "Muotokuva"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory Color Emphasis"
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
 msgstr ""
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory color emphasis"
+#: src/olympusmn.cpp:112
+msgid "Documents"
 msgstr ""
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
-msgid "Contrast Value"
+#: src/olympusmn.cpp:114
+msgid "Shoot & Select"
 msgstr ""
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
-msgid "Contrast value"
+#: src/olympusmn.cpp:115
+msgid "Beach & Snow"
 msgstr ""
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
-msgid "Sharpness Value"
+#: src/olympusmn.cpp:116
+msgid "Self Portrait+Timer"
 msgstr ""
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
-msgid "Sharpness value"
+#: src/olympusmn.cpp:117
+msgid "Candle"
 msgstr ""
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
-msgid "Engine"
+#: src/olympusmn.cpp:118
+msgid "Available Light"
 msgstr ""
 
-#: src/olympusmn.cpp:759
-msgid "Edit status"
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
 msgstr ""
 
-#: src/olympusmn.cpp:760
-msgid "Settings"
-msgstr "Asetukset"
+#: src/olympusmn.cpp:120
+#, fuzzy
+msgid "My Mode"
+msgstr "Makrotila"
 
-#: src/olympusmn.cpp:762
-msgid "Unknown OlympusRd tag"
-msgstr ""
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
+#, fuzzy
+msgid "Pet"
+msgstr "Aseta"
 
-#: src/olympusmn.cpp:817
-msgid "Raw Development 2 Version"
+#: src/olympusmn.cpp:122
+msgid "Underwater Wide1"
 msgstr ""
 
-#: src/olympusmn.cpp:817
-msgid "Raw development 2 version"
+#: src/olympusmn.cpp:123
+msgid "Underwater Macro"
 msgstr ""
 
-#: src/olympusmn.cpp:821
-msgid "White balance fine adjustment"
+#: src/olympusmn.cpp:124
+msgid "Shoot & Select1"
 msgstr ""
 
-#: src/olympusmn.cpp:831
-msgid "PM Saturation"
+#: src/olympusmn.cpp:125
+msgid "Shoot & Select2"
 msgstr ""
 
-#: src/olympusmn.cpp:832
-msgid "PM Contrast"
-msgstr ""
+#: src/olympusmn.cpp:127
+#, fuzzy
+msgid "Digital Image Stabilization"
+msgstr "Kuvan vakautus"
 
-#: src/olympusmn.cpp:833
-msgid "PM Sharpness"
+#: src/olympusmn.cpp:128
+msgid "Auction"
 msgstr ""
 
-#: src/olympusmn.cpp:834
-msgid "PM BW Filter"
+#: src/olympusmn.cpp:131
+msgid "Underwater Wide2"
 msgstr ""
 
-#: src/olympusmn.cpp:834
-msgid "PM BW filter"
+#: src/olympusmn.cpp:133
+msgid "Children"
 msgstr ""
 
-#: src/olympusmn.cpp:835
-msgid "PM Picture Tone"
+#: src/olympusmn.cpp:135
+msgid "Nature Macro"
 msgstr ""
 
-#: src/olympusmn.cpp:835
-msgid "PM picture tone"
+#: src/olympusmn.cpp:136
+msgid "Underwater Snapshot"
 msgstr ""
 
-#: src/olympusmn.cpp:838
-msgid "Auto Gradation"
+#: src/olympusmn.cpp:137
+msgid "Shooting Guide"
 msgstr ""
 
-#: src/olympusmn.cpp:838
-msgid "Auto gradation"
-msgstr ""
+#: src/olympusmn.cpp:145
+#, fuzzy
+msgid "Internal + External"
+msgstr "Sisäinen salama"
 
-#: src/olympusmn.cpp:839
-msgid "PM Noise Filter"
-msgstr ""
+#: src/olympusmn.cpp:176
+#, fuzzy
+msgid "Interlaced"
+msgstr "Sisäinen salama"
 
-#: src/olympusmn.cpp:839
-msgid "Picture mode noise filter"
-msgstr ""
+#: src/olympusmn.cpp:177
+#, fuzzy
+msgid "Progressive"
+msgstr "Ohjelman versio"
 
-#: src/olympusmn.cpp:841
-msgid "Unknown OlympusRd2 tag"
-msgstr ""
+#: src/olympusmn.cpp:188
+msgid "Thumbnail Image"
+msgstr "Näytekuva"
 
-#: src/olympusmn.cpp:850
-msgid "Image Processing Version"
-msgstr ""
+#: src/olympusmn.cpp:189
+msgid "Thumbnail image"
+msgstr "Näytekuva"
 
-#: src/olympusmn.cpp:850
-msgid "Image processing version"
-msgstr ""
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body Firmware Version"
+msgstr "Firmwaren versio"
 
-#: src/olympusmn.cpp:852
-msgid "WB RB Levels 3000K"
-msgstr ""
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body firmware version"
+msgstr "Firmwaren versio"
 
-#: src/olympusmn.cpp:852
-msgid "WB RB levels 3000K"
-msgstr ""
+#: src/olympusmn.cpp:195
+#, fuzzy
+msgid "Special Mode"
+msgstr "ISO-herkkyys"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB Levels 3300K"
-msgstr ""
+#: src/olympusmn.cpp:196
+#, fuzzy
+msgid "Picture taking mode"
+msgstr "Kuvan tiedot"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB levels 3300K"
-msgstr ""
+#: src/olympusmn.cpp:204
+#, fuzzy
+msgid "Black & White Mode"
+msgstr "Mustavalkoinen"
 
-#: src/olympusmn.cpp:854
-msgid "WB RB Levels 3600K"
-msgstr ""
+#: src/olympusmn.cpp:205
+#, fuzzy
+msgid "Black and white mode"
+msgstr "Mustavalko"
 
-#: src/olympusmn.cpp:854
-msgid "WB RB levels 3600K"
-msgstr ""
+#: src/olympusmn.cpp:208
+#, fuzzy
+msgid "Digital zoom ratio"
+msgstr "Digitaalinen zoom"
 
-#: src/olympusmn.cpp:855
-msgid "WB RB Levels 3900K"
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
+msgid "Focal Plane Diagonal"
 msgstr ""
 
-#: src/olympusmn.cpp:855
-msgid "WB RB levels 3900K"
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
+msgid "Focal plane diagonal"
 msgstr ""
 
-#: src/olympusmn.cpp:856
-msgid "WB RB Levels 4000K"
+#: src/olympusmn.cpp:213
+msgid "Lens Distortion Parameters"
 msgstr ""
 
-#: src/olympusmn.cpp:856
-msgid "WB RB levels 4000K"
+#: src/olympusmn.cpp:214
+msgid "Lens distortion parameters"
 msgstr ""
 
-#: src/olympusmn.cpp:857
-msgid "WB RB Levels 4300K"
-msgstr ""
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
+msgid "Camera Type"
+msgstr "Kameran tyyppi"
 
-#: src/olympusmn.cpp:857
-msgid "WB RB levels 4300K"
-msgstr ""
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
+msgid "Camera type"
+msgstr "Kameran tyyppi"
 
-#: src/olympusmn.cpp:858
-msgid "WB RB Levels 4500K"
+#: src/olympusmn.cpp:220
+msgid "ASCII format data such as [PictureInfo]"
 msgstr ""
 
-#: src/olympusmn.cpp:858
-msgid "WB RB levels 4500K"
-msgstr ""
+#: src/olympusmn.cpp:222
+#, fuzzy
+msgid "Camera ID"
+msgstr "Kameran tyyppi"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB Levels 4800K"
-msgstr ""
+#: src/olympusmn.cpp:223
+#, fuzzy
+msgid "Camera ID data"
+msgstr "Kameran merkki"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB levels 4800K"
-msgstr ""
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
+msgstr "Ohjelmisto"
 
-#: src/olympusmn.cpp:860
-msgid "WB RB Levels 5300K"
-msgstr ""
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
+#, fuzzy
+msgid "Preview Image"
+msgstr "Esikatselu"
 
-#: src/olympusmn.cpp:860
-msgid "WB RB levels 5300K"
-msgstr ""
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
+#, fuzzy
+msgid "Preview image"
+msgstr "Esikatselu"
 
-#: src/olympusmn.cpp:861
-msgid "WB RB Levels 6000K"
+#: src/olympusmn.cpp:237
+msgid "Pre Capture Frames"
 msgstr ""
 
-#: src/olympusmn.cpp:861
-msgid "WB RB levels 6000K"
+#: src/olympusmn.cpp:238
+msgid "Pre-capture frames"
 msgstr ""
 
-#: src/olympusmn.cpp:862
-msgid "WB RB Levels 6600K"
-msgstr ""
+#: src/olympusmn.cpp:240
+#, fuzzy
+msgid "White Board"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:862
-msgid "WB RB levels 6600K"
-msgstr ""
+#: src/olympusmn.cpp:241
+#, fuzzy
+msgid "White board"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:863
-msgid "WB RB Levels 7500K"
+#: src/olympusmn.cpp:243
+msgid "One Touch WB"
 msgstr ""
 
-#: src/olympusmn.cpp:863
-msgid "WB RB levels 7500K"
-msgstr ""
+#: src/olympusmn.cpp:244
+#, fuzzy
+msgid "One touch white balance"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:864
-msgid "WB RB Levels CWB1"
-msgstr ""
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White Balance Bracket"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:864
-msgid "WB RB levels CWB1"
-msgstr ""
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White balance bracket"
+msgstr " "
 
-#: src/olympusmn.cpp:865
-msgid "WB RB Levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+#, fuzzy
+msgid "Firmware"
+msgstr "Firmwaren versio"
 
-#: src/olympusmn.cpp:865
-msgid "WB RB levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:256
+#, fuzzy
+msgid "Firmwarer"
+msgstr "Firmwaren versio"
 
-#: src/olympusmn.cpp:866
-msgid "WB RB Levels CWB3"
+#: src/olympusmn.cpp:261
+msgid "Data Dump 1"
 msgstr ""
 
-#: src/olympusmn.cpp:866
-msgid "WB RB levels CWB3"
-msgstr ""
+#: src/olympusmn.cpp:262
+#, fuzzy
+msgid "Various camera settings 1"
+msgstr "Kameran asetukset"
 
-#: src/olympusmn.cpp:867
-msgid "WB RB Levels CWB4"
+#: src/olympusmn.cpp:264
+msgid "Data Dump 2"
 msgstr ""
 
-#: src/olympusmn.cpp:867
-msgid "WB RB levels CWB4"
-msgstr ""
+#: src/olympusmn.cpp:265
+#, fuzzy
+msgid "Various camera settings 2"
+msgstr "Kameran asetukset"
 
-#: src/olympusmn.cpp:868
-msgid "WB G Level 3000K"
-msgstr ""
+#: src/olympusmn.cpp:268
+#, fuzzy
+msgid "Shutter speed value"
+msgstr "Valotusaika"
 
-#: src/olympusmn.cpp:868
-msgid "WB G level 3000K"
-msgstr ""
+#: src/olympusmn.cpp:271
+msgid "ISO speed value"
+msgstr "ISO-herkkyys"
 
-#: src/olympusmn.cpp:869
-msgid "WB G Level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:274
+msgid "Aperture value"
+msgstr "Aukko"
 
-#: src/olympusmn.cpp:869
-msgid "WB G level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:277
+#, fuzzy
+msgid "Brightness value"
+msgstr "Aukko"
 
-#: src/olympusmn.cpp:870
-msgid "WB G Level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:285
+#, fuzzy
+msgid "Bracket"
+msgstr "Makrotila"
 
-#: src/olympusmn.cpp:870
-msgid "WB G level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:286
+#, fuzzy
+msgid "Exposure compensation value"
+msgstr "Valotustila"
 
-#: src/olympusmn.cpp:871
-msgid "WB G Level 3900K"
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
+msgid "Sensor Temperature"
 msgstr ""
 
-#: src/olympusmn.cpp:871
-msgid "WB G level 3900K"
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
+msgid "Sensor temperature"
 msgstr ""
 
-#: src/olympusmn.cpp:872
-msgid "WB G Level 4000K"
-msgstr ""
+#: src/olympusmn.cpp:291
+#, fuzzy
+msgid "Lens Temperature"
+msgstr "Linssin ominaisuudet"
 
-#: src/olympusmn.cpp:872
-msgid "WB G level 4000K"
-msgstr ""
+#: src/olympusmn.cpp:292
+#, fuzzy
+msgid "Lens temperature"
+msgstr "Linssin ominaisuudet"
 
-#: src/olympusmn.cpp:873
-msgid "WB G Level 4300K"
+#: src/olympusmn.cpp:294
+msgid "Light Condition"
 msgstr ""
 
-#: src/olympusmn.cpp:873
-msgid "WB G level 4300K"
+#: src/olympusmn.cpp:295
+msgid "Light condition"
 msgstr ""
 
-#: src/olympusmn.cpp:874
-msgid "WB G Level 4500K"
-msgstr ""
+#: src/olympusmn.cpp:297
+#, fuzzy
+msgid "Focus Range"
+msgstr "Tarkennustapa"
 
-#: src/olympusmn.cpp:874
-msgid "WB G level 4500K"
-msgstr ""
+#: src/olympusmn.cpp:298
+#, fuzzy
+msgid "Focus range"
+msgstr "Tarkennustapa"
 
-#: src/olympusmn.cpp:875
-msgid "WB G Level 4800K"
+#: src/olympusmn.cpp:306
+msgid "Zoom"
 msgstr ""
 
-#: src/olympusmn.cpp:875
-msgid "WB G level 4800K"
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
+msgid "Zoom step count"
 msgstr ""
 
-#: src/olympusmn.cpp:876
-msgid "WB G Level 5300K"
-msgstr ""
+#: src/olympusmn.cpp:309
+#, fuzzy
+msgid "Macro Focus"
+msgstr "Makrotila"
 
-#: src/olympusmn.cpp:876
-msgid "WB G level 5300K"
+#: src/olympusmn.cpp:310
+msgid "Macro focus step count"
 msgstr ""
 
-#: src/olympusmn.cpp:877
-msgid "WB G Level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
+#, fuzzy
+msgid "Sharpness Factor"
+msgstr "Terävyys"
 
-#: src/olympusmn.cpp:877
-msgid "WB G level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
+#, fuzzy
+msgid "Sharpness factor"
+msgstr "Terävyys"
 
-#: src/olympusmn.cpp:878
-msgid "WB G Level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:315
+#, fuzzy
+msgid "Flash Charge Level"
+msgstr "Salaman malli"
 
-#: src/olympusmn.cpp:878
-msgid "WB G level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:316
+#, fuzzy
+msgid "Flash charge level"
+msgstr "Salaman malli"
 
-#: src/olympusmn.cpp:879
-msgid "WB G Level 7500K"
-msgstr ""
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
+#, fuzzy
+msgid "Color Matrix"
+msgstr "Väriavaruus"
 
-#: src/olympusmn.cpp:879
-msgid "WB G level 7500K"
-msgstr ""
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
+#, fuzzy
+msgid "Color matrix"
+msgstr "Väriavaruus"
 
-#: src/olympusmn.cpp:880
-msgid "WB G Level"
-msgstr ""
+#: src/olympusmn.cpp:321
+#, fuzzy
+msgid "BlackLevel"
+msgstr "Salaman malli"
 
-#: src/olympusmn.cpp:880
-msgid "WB G level"
-msgstr ""
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
+#, fuzzy
+msgid "Black level"
+msgstr "Salaman malli"
 
-#: src/olympusmn.cpp:882
-msgid "Enhancer"
-msgstr ""
+#: src/olympusmn.cpp:331
+#, fuzzy
+msgid "White balance mode"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer Values"
-msgstr ""
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
+#, fuzzy
+msgid "Red Balance"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer values"
-msgstr ""
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
+#, fuzzy
+msgid "Red balance"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
-msgid "Coring Filter"
-msgstr ""
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
+#, fuzzy
+msgid "Blue Balance"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
-msgid "Coring Values"
-msgstr ""
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
+#, fuzzy
+msgid "Blue balance"
+msgstr "Valkotasapaino"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
-msgid "Coring values"
-msgstr ""
+#: src/olympusmn.cpp:342
+#, fuzzy
+msgid "Color Matrix Number"
+msgstr "Väriavaruus"
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
-msgid "Black Level"
-msgstr ""
+#: src/olympusmn.cpp:343
+#, fuzzy
+msgid "Color matrix mumber"
+msgstr "Väriavaruus"
 
-#: src/olympusmn.cpp:887
-msgid "Gain Base"
-msgstr ""
+#: src/olympusmn.cpp:345
+#, fuzzy
+msgid "Serial Number 2"
+msgstr "Sarjanumero"
 
-#: src/olympusmn.cpp:887
-msgid "Gain base"
-msgstr ""
+#: src/olympusmn.cpp:346
+#, fuzzy
+msgid "Serial number 2"
+msgstr "Sarjanumero"
 
-#: src/olympusmn.cpp:888
-msgid "Valid Bits"
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
+msgid "Flash exposure compensation"
 msgstr ""
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
-msgid "Crop Left"
-msgstr ""
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
+#, fuzzy
+msgid "External Flash Bounce"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
-msgid "Crop left"
-msgstr ""
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
+#, fuzzy
+msgid "External flash bounce"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
-msgid "Crop Top"
-msgstr ""
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
+#, fuzzy
+msgid "External Flash Zoom"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
-msgid "Crop top"
-msgstr ""
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
+#, fuzzy
+msgid "External flash zoom"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
-msgid "Crop Width"
-msgstr ""
+#: src/olympusmn.cpp:387
+#, fuzzy
+msgid "External Flash Mode"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
-msgid "Crop width"
-msgstr ""
+#: src/olympusmn.cpp:388
+#, fuzzy
+msgid "External flash mode"
+msgstr "Ulkoinen salama"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
-msgid "Crop Height"
-msgstr ""
+#: src/olympusmn.cpp:396
+#, fuzzy
+msgid "Color Control"
+msgstr "Täysautomatiikka"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
-msgid "Crop height"
-msgstr ""
+#: src/olympusmn.cpp:397
+#, fuzzy
+msgid "Color control"
+msgstr "Täysautomatiikka"
 
-#: src/olympusmn.cpp:896
-msgid "Face Detect"
+#: src/olympusmn.cpp:399
+msgid "ValidBits"
 msgstr ""
 
-#: src/olympusmn.cpp:896
-msgid "Face detect"
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
+msgid "Valid bits"
 msgstr ""
 
-#: src/olympusmn.cpp:897
-msgid "Face Detect Area"
+#: src/olympusmn.cpp:402
+msgid "CoringFilter"
 msgstr ""
 
-#: src/olympusmn.cpp:897
-msgid "Face detect area"
-msgstr ""
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
+msgid "Coring filter"
+msgstr "tiedostoon"
 
-#: src/olympusmn.cpp:899
-msgid "Unknown OlympusIp tag"
-msgstr ""
+#: src/olympusmn.cpp:423
+#, fuzzy
+msgid "Compression Ratio"
+msgstr "Pakkaus"
 
-#: src/olympusmn.cpp:909
-msgid "Bounce or Off"
-msgstr ""
+#: src/olympusmn.cpp:424
+#, fuzzy
+msgid "Compression ratio"
+msgstr "Pakkaus"
 
-#: src/olympusmn.cpp:910
-msgid "Direct"
+#: src/olympusmn.cpp:427
+msgid "Preview image embedded"
 msgstr ""
 
-#: src/olympusmn.cpp:914
-msgid "Focus Info Version"
+#: src/olympusmn.cpp:430
+msgid "Offset of the preview image"
 msgstr ""
 
-#: src/olympusmn.cpp:914
-msgid "Focus info version"
+#: src/olympusmn.cpp:433
+msgid "Size of the preview image"
 msgstr ""
 
-#: src/olympusmn.cpp:915
-msgid "Auto Focus"
+#: src/olympusmn.cpp:435
+msgid "CCD Scan Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:916
-msgid "Scene Detect"
+#: src/olympusmn.cpp:436
+msgid "CCD scan mode"
 msgstr ""
 
-#: src/olympusmn.cpp:916
-msgid "Scene detect"
+#: src/olympusmn.cpp:441
+msgid "Infinity Lens Step"
 msgstr ""
 
-#: src/olympusmn.cpp:917
-msgid "Scene Area"
+#: src/olympusmn.cpp:442
+msgid "Infinity lens step"
 msgstr ""
 
-#: src/olympusmn.cpp:917
-msgid "Scene area"
+#: src/olympusmn.cpp:444
+#, fuzzy
+msgid "Near Lens Step"
+msgstr "Linssin tyyppi"
+
+#: src/olympusmn.cpp:445
+msgid "Near lens step"
 msgstr ""
 
-#: src/olympusmn.cpp:918
-msgid "Scene Detect Data"
+#: src/olympusmn.cpp:447
+msgid "Equipment Info"
 msgstr ""
 
-#: src/olympusmn.cpp:918
-msgid "Scene detect data"
+#: src/olympusmn.cpp:448
+msgid "Camera equipment sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:919
-msgid "Zoom Step Count"
+#: src/olympusmn.cpp:451
+#, fuzzy
+msgid "Camera Settings sub-IFD"
+msgstr "Kameran asetukset"
+
+#: src/olympusmn.cpp:453
+msgid "Raw Development"
 msgstr ""
 
-#: src/olympusmn.cpp:920
-msgid "Focus Step Count"
+#: src/olympusmn.cpp:454
+msgid "Raw development sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:920
-msgid "Focus step count"
+#: src/olympusmn.cpp:456
+msgid "Raw Development 2"
 msgstr ""
 
-#: src/olympusmn.cpp:921
-msgid "Focus Step Infinity"
+#: src/olympusmn.cpp:457
+msgid "Raw development 2 sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:921
-msgid "Focus step infinity"
+#: src/olympusmn.cpp:460
+msgid "Image processing sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:922
-msgid "Focus Step Near"
+#: src/olympusmn.cpp:462
+#, fuzzy
+msgid "Focus Info"
+msgstr "Tarkennustapa"
+
+#: src/olympusmn.cpp:463
+msgid "Focus sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:922
-msgid "Focus step near"
+#: src/olympusmn.cpp:465
+msgid "Raw Info"
 msgstr ""
 
-#: src/olympusmn.cpp:925
-msgid "External Flash"
+#: src/olympusmn.cpp:466
+msgid "Raw sub-IFD"
 msgstr ""
 
-#: src/olympusmn.cpp:926
-msgid "External Flash Guide Number"
+#: src/olympusmn.cpp:470
+msgid "Unknown OlympusMakerNote tag"
 msgstr ""
 
-#: src/olympusmn.cpp:926
-msgid "External flash guide number"
+#: src/olympusmn.cpp:486
+#, fuzzy
+msgid "Program-shift"
+msgstr "Ohjelma"
+
+#: src/olympusmn.cpp:491
+#, fuzzy
+msgid "Center-weighted average"
+msgstr "Keskustaa painottava"
+
+#: src/olympusmn.cpp:493
+msgid "ESP"
 msgstr ""
 
-#: src/olympusmn.cpp:930
-msgid "Manual Flash"
+#: src/olympusmn.cpp:494
+msgid "Pattern+AF"
 msgstr ""
 
-#: src/olympusmn.cpp:930
-msgid "Manual flash"
+#: src/olympusmn.cpp:495
+msgid "Spot+Highlight control"
 msgstr ""
 
-#: src/olympusmn.cpp:934
-msgid "Unknown OlympusFi tag"
+#: src/olympusmn.cpp:496
+msgid "Spot+Shadow control"
 msgstr ""
 
-#: src/olympusmn.cpp:945
-msgid "Unknown OlympusFe tag"
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
+msgid "Single AF"
 msgstr ""
 
-#: src/olympusmn.cpp:958
-msgid "Fine Weather"
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
+msgid "Sequential shooting AF"
 msgstr ""
 
-#: src/olympusmn.cpp:959
-msgid "Tungsten (incandescent)"
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
+msgid "Multi AF"
 msgstr ""
 
-#: src/olympusmn.cpp:960
-msgid "Evening Sunlight"
+#: src/olympusmn.cpp:517
+#, fuzzy
+msgid "AF Not Used"
+msgstr "Käytetty AF-piste"
+
+#: src/olympusmn.cpp:518
+#, fuzzy
+msgid "AF Used"
+msgstr "Käytetty AF-piste"
+
+#: src/olympusmn.cpp:523
+msgid "Not Ready"
 msgstr ""
 
-#: src/olympusmn.cpp:961
-msgid "Daylight Fluorescent (D 5700 - 7100K)"
+#: src/olympusmn.cpp:524
+msgid "Ready"
 msgstr ""
 
-#: src/olympusmn.cpp:962
-msgid "Day White Fluorescent (N 4600 - 5400K)"
+#: src/olympusmn.cpp:531
+msgid "Fill-in"
 msgstr ""
 
-#: src/olympusmn.cpp:963
-msgid "Cool White Fluorescent (W 3900 - 4500K)"
+#: src/olympusmn.cpp:533
+msgid "Slow-sync"
 msgstr ""
 
-#: src/olympusmn.cpp:964
-msgid "White Fluorescent (WW 3200 - 3700K)"
+#: src/olympusmn.cpp:534
+#, fuzzy
+msgid "Forced On"
+msgstr "Valkoinen loisteputki"
+
+#: src/olympusmn.cpp:535
+msgid "2nd Curtain"
 msgstr ""
 
-#: src/olympusmn.cpp:965
-msgid "One Touch White Balance"
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:966
-msgid "Custom 1-4"
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:970
-msgid "Raw Info Version"
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:970
-msgid "Raw info version"
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
 msgstr ""
 
-#: src/olympusmn.cpp:971
-msgid "WB_RB Levels Used"
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:971
-msgid "WB_RB levels used"
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:972
-msgid "WB_RB Levels Auto"
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:972
-msgid "WB_RB levels auto"
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:973
-msgid "WB_RB Levels Shade"
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
 msgstr ""
 
-#: src/olympusmn.cpp:973
-msgid "WB_RB levels shade"
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
 msgstr ""
 
-#: src/olympusmn.cpp:974
-msgid "WB_RB Levels Cloudy"
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
 msgstr ""
 
-#: src/olympusmn.cpp:974
-msgid "WB_RB levels cloudy"
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
 msgstr ""
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB Levels Fine Weather"
+#: src/olympusmn.cpp:566
+msgid "7500K (Fine Weather with Shade)"
 msgstr ""
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB levels fine weather"
-msgstr ""
+#: src/olympusmn.cpp:567
+#, fuzzy
+msgid "6000K (Cloudy)"
+msgstr "Pilvinen"
 
-#: src/olympusmn.cpp:976
-msgid "WB_RB Levels Tungsten"
+#: src/olympusmn.cpp:568
+msgid "5300K (Fine Weather)"
 msgstr ""
 
-#: src/olympusmn.cpp:976
-msgid "WB_RB levels tungsten"
+#: src/olympusmn.cpp:569
+msgid "3000K (Tungsten light)"
 msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB Levels Evening Sunlight"
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
+msgid "3600K (Tungsten light-like)"
 msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB levels evening sunlight"
+#: src/olympusmn.cpp:571
+msgid "6600K (Daylight fluorescent)"
 msgstr ""
 
-#: src/olympusmn.cpp:978
-msgid "WB_RB Levels Daylight Fluor"
+#: src/olympusmn.cpp:572
+msgid "4500K (Neutral white fluorescent)"
 msgstr ""
 
-#: src/olympusmn.cpp:978
-msgid "WB_RB levels daylight fluor"
+#: src/olympusmn.cpp:573
+msgid "4000K (Cool white fluorescent)"
 msgstr ""
 
-#: src/olympusmn.cpp:979
-msgid "WB_RB Levels Day White Fluor"
+#: src/olympusmn.cpp:575
+msgid "Custom WB 1"
 msgstr ""
 
-#: src/olympusmn.cpp:979
-msgid "WB_RB levels day white fluor"
+#: src/olympusmn.cpp:576
+msgid "Custom WB 2"
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB Levels Cool White Fluor"
+#: src/olympusmn.cpp:577
+msgid "Custom WB 3"
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB levels cool white fluor"
+#: src/olympusmn.cpp:578
+msgid "Custom WB 4"
 msgstr ""
 
-#: src/olympusmn.cpp:981
-msgid "WB_RB Levels White Fluorescent"
+#: src/olympusmn.cpp:579
+msgid "Custom WB 5400K"
 msgstr ""
 
-#: src/olympusmn.cpp:981
-msgid "WB_RB levels white fluorescent"
+#: src/olympusmn.cpp:580
+msgid "Custom WB 2900K"
 msgstr ""
 
-#: src/olympusmn.cpp:982
-msgid "Color Matrix2"
+#: src/olympusmn.cpp:581
+msgid "Custom WB 8000K"
 msgstr ""
 
-#: src/olympusmn.cpp:982
-msgid "Color matrix 2"
+#: src/olympusmn.cpp:587
+msgid "CM1 (Red Enhance)"
 msgstr ""
 
-#: src/olympusmn.cpp:985
-msgid "Black Level 2"
+#: src/olympusmn.cpp:588
+msgid "CM2 (Green Enhance)"
 msgstr ""
 
-#: src/olympusmn.cpp:985
-msgid "Black level 2"
+#: src/olympusmn.cpp:589
+msgid "CM3 (Blue Enhance)"
 msgstr ""
 
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
-msgid "YCbCr Coefficients"
+#: src/olympusmn.cpp:590
+msgid "CM4 (Skin Tones)"
 msgstr ""
 
-#: src/olympusmn.cpp:986
-msgid "YCbCr coefficients"
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
+msgid "Pro Photo RGB"
 msgstr ""
 
-#: src/olympusmn.cpp:987
-msgid "Valid Pixel Depth"
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
+msgid "Noise Filter"
 msgstr ""
 
-#: src/olympusmn.cpp:987
-msgid "Valid pixel depth"
+#: src/olympusmn.cpp:604
+msgid "Noise Filter (ISO Boost)"
 msgstr ""
 
-#: src/olympusmn.cpp:993
-msgid "White Balance Comp"
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
+msgid "Muted"
 msgstr ""
 
-#: src/olympusmn.cpp:993
-msgid "White balance comp"
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
+msgid "Monotone"
 msgstr ""
 
-#: src/olympusmn.cpp:994
-msgid "Saturation Setting"
+#: src/olympusmn.cpp:640
+msgid "SQ"
 msgstr ""
 
-#: src/olympusmn.cpp:995
-msgid "Hue Setting"
+#: src/olympusmn.cpp:641
+msgid "HQ"
 msgstr ""
 
-#: src/olympusmn.cpp:995
-msgid "Hue setting"
+#: src/olympusmn.cpp:642
+msgid "SHQ"
 msgstr ""
 
-#: src/olympusmn.cpp:998
-msgid "CM Exposure Compensation"
-msgstr ""
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
+#, fuzzy
+msgid "On, Mode 1"
+msgstr "Linssin malli"
 
-#: src/olympusmn.cpp:998
-msgid "CM exposure compensation"
-msgstr ""
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
+#, fuzzy
+msgid "On, Mode 2"
+msgstr "Linssin malli"
 
-#: src/olympusmn.cpp:999
-msgid "CM White Balance"
-msgstr ""
+#: src/olympusmn.cpp:651
+#, fuzzy
+msgid "On, Mode 3"
+msgstr "Linssin malli"
 
-#: src/olympusmn.cpp:999
-msgid "CM white balance"
-msgstr ""
+#: src/olympusmn.cpp:655
+#, fuzzy
+msgid "Camera Settings Version"
+msgstr "Kameran asetukset"
 
-#: src/olympusmn.cpp:1000
-msgid "CM White Balance Comp"
-msgstr ""
+#: src/olympusmn.cpp:655
+#, fuzzy
+msgid "Camera settings version"
+msgstr "Kameran asetukset"
 
-#: src/olympusmn.cpp:1000
-msgid "CM white balance comp"
+#: src/olympusmn.cpp:656
+msgid "PreviewImage Valid"
 msgstr ""
 
-#: src/olympusmn.cpp:1001
-msgid "CM White Balance Gray Point"
+#: src/olympusmn.cpp:656
+msgid "Preview image valid"
 msgstr ""
 
-#: src/olympusmn.cpp:1001
-msgid "CM white balance gray point"
+#: src/olympusmn.cpp:657
+msgid "PreviewImage Start"
 msgstr ""
 
-#: src/olympusmn.cpp:1002
-msgid "CM Saturation"
+#: src/olympusmn.cpp:657
+msgid "Preview image start"
 msgstr ""
 
-#: src/olympusmn.cpp:1002
-msgid "CM saturation"
+#: src/olympusmn.cpp:658
+msgid "PreviewImage Length"
 msgstr ""
 
-#: src/olympusmn.cpp:1003
-msgid "CM Hue"
+#: src/olympusmn.cpp:658
+msgid "Preview image length"
 msgstr ""
 
-#: src/olympusmn.cpp:1003
-msgid "CM hue"
-msgstr ""
+#: src/olympusmn.cpp:660
+#, fuzzy
+msgid "Auto exposure lock"
+msgstr "Automaattivalotus"
 
-#: src/olympusmn.cpp:1004
-msgid "CM Contrast"
-msgstr ""
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure Shift"
+msgstr "Valotusaika"
 
-#: src/olympusmn.cpp:1004
-msgid "CM contrast"
-msgstr ""
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure shift"
+msgstr "Valotusaika"
 
-#: src/olympusmn.cpp:1005
-msgid "CM Sharpness"
-msgstr ""
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus Process"
+msgstr "Tarkennustapa"
 
-#: src/olympusmn.cpp:1005
-msgid "CM sharpness"
-msgstr ""
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus process"
+msgstr "Tarkennustapa"
 
-#: src/olympusmn.cpp:1007
-msgid "Unknown OlympusRi tag"
+#: src/olympusmn.cpp:666
+msgid "AF Search"
 msgstr ""
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
-msgid "User-Selected"
+#: src/olympusmn.cpp:666
+msgid "AF search"
 msgstr ""
 
-#: src/olympusmn.cpp:1031
-msgid "Auto-Override"
-msgstr ""
+#: src/olympusmn.cpp:667
+#, fuzzy
+msgid "AF Areas"
+msgstr "Salaman tila"
 
-#: src/olympusmn.cpp:1067
-msgid "Fast"
-msgstr ""
+#: src/olympusmn.cpp:667
+#, fuzzy
+msgid "AF areas"
+msgstr "Kameran malli"
 
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:668
+#, fuzzy
+msgid "AFPointSelected"
+msgstr "Valittu AF-piste"
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF Fine Tune Adjust"
+msgstr "Käytetty AF-piste"
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF fine tune adjust"
+msgstr "Käytetty AF-piste"
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash Remote Control"
+msgstr "Täysautomatiikka"
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash remote control"
+msgstr "Täysautomatiikka"
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash Control Mode"
+msgstr "Salaman tila"
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
-msgstr ""
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash control mode"
+msgstr "Salaman malli"
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
-msgstr ""
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash Intensity"
+msgstr "Salaman tyyppi"
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
-msgid "Very High"
-msgstr ""
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash intensity"
+msgstr "Salaman tyyppi"
 
-#: src/panasonicmn.cpp:57
-msgid "Motion Picture"
-msgstr ""
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual Flash Strength"
+msgstr "Salaman tyyppi"
 
-#: src/panasonicmn.cpp:65
-msgid "Halogen"
-msgstr ""
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual flash strength"
+msgstr "Täysautomatiikka"
 
-#: src/panasonicmn.cpp:76
-msgid "Auto, focus button"
-msgstr ""
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
+#, fuzzy
+msgid "White Balance 2"
+msgstr "Valkotasapaino"
 
-#: src/panasonicmn.cpp:77
-msgid "Auto, continuous"
-msgstr ""
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
+#, fuzzy
+msgid "White balance 2"
+msgstr "Valkotasapaino"
 
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
-msgstr ""
+#: src/olympusmn.cpp:677
+#, fuzzy
+msgid "White Balance Temperature"
+msgstr "Valkotasapaino"
 
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
-msgstr ""
+#: src/olympusmn.cpp:677
+#, fuzzy
+msgid "White balance temperature"
+msgstr " "
 
-#: src/panasonicmn.cpp:91
-msgid "Tele-macro"
-msgstr ""
+#: src/olympusmn.cpp:679
+#, fuzzy
+msgid "Custom Saturation"
+msgstr "Värikylläisyys"
 
-#: src/panasonicmn.cpp:99
-msgid "Scenery"
-msgstr ""
+#: src/olympusmn.cpp:679
+#, fuzzy
+msgid "Custom saturation"
+msgstr "Värikylläisyys"
 
-#: src/panasonicmn.cpp:104
-msgid "Shutter-speed priority"
-msgstr ""
+#: src/olympusmn.cpp:680
+#, fuzzy
+msgid "Modified Saturation"
+msgstr "Värikylläisyys"
 
-#: src/panasonicmn.cpp:108
-msgid "Movie preview"
-msgstr ""
+#: src/olympusmn.cpp:680
+#, fuzzy
+msgid "Modified saturation"
+msgstr "Värikylläisyys"
 
-#: src/panasonicmn.cpp:109
-msgid "Panning"
-msgstr ""
-
-#: src/panasonicmn.cpp:110
-msgid "Simple"
-msgstr ""
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
+#, fuzzy
+msgid "Contrast Setting"
+msgstr "Kameran asetukset"
 
-#: src/panasonicmn.cpp:111
-msgid "Color effects"
-msgstr ""
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
+#, fuzzy
+msgid "Sharpness Setting"
+msgstr "Terävyys"
 
-#: src/panasonicmn.cpp:115
-msgid "Night scenery"
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+msgid "Distortion Correction"
 msgstr ""
 
-#: src/panasonicmn.cpp:117
-msgid "Baby"
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+msgid "Distortion correction"
 msgstr ""
 
-#: src/panasonicmn.cpp:118
-msgid "Soft skin"
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+msgid "Shading Compensation"
 msgstr ""
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
-msgid "Candlelight"
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+msgid "Shading compensation"
 msgstr ""
 
-#: src/panasonicmn.cpp:120
-msgid "Starry night"
-msgstr ""
+#: src/olympusmn.cpp:688
+#, fuzzy
+msgid "Compression Factor"
+msgstr "Pakkaus"
 
-#: src/panasonicmn.cpp:121
-msgid "High sensitivity"
-msgstr ""
+#: src/olympusmn.cpp:688
+#, fuzzy
+msgid "Compression factor"
+msgstr "Pakkaus"
 
-#: src/panasonicmn.cpp:122
-msgid "Panorama assist"
-msgstr ""
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
+#, fuzzy
+msgid "Gradation"
+msgstr "Värikylläisyys"
 
-#: src/panasonicmn.cpp:125
-msgid "Aerial photo"
-msgstr ""
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
+#, fuzzy
+msgid "Picture mode"
+msgstr "Kuvan tiedot"
 
-#: src/panasonicmn.cpp:128
-msgid "Intelligent ISO"
-msgstr ""
+#: src/olympusmn.cpp:691
+#, fuzzy
+msgid "Picture Mode Saturation"
+msgstr "Värikylläisyys"
 
-#: src/panasonicmn.cpp:129
-msgid "High speed continuous shooting"
-msgstr ""
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
+#, fuzzy
+msgid "Picture mode saturation"
+msgstr "Värikylläisyys"
 
-#: src/panasonicmn.cpp:130
-msgid "Intelligent auto"
-msgstr ""
+#: src/olympusmn.cpp:692
+#, fuzzy
+msgid "Picture Mode Hue"
+msgstr "Kuvan tiedot"
 
-#: src/panasonicmn.cpp:142
-msgid "Warm"
-msgstr ""
+#: src/olympusmn.cpp:692
+#, fuzzy
+msgid "Picture mode hue"
+msgstr "Kuvan tiedot"
 
-#: src/panasonicmn.cpp:143
-msgid "Cool"
+#: src/olympusmn.cpp:693
+msgid "Picture Mode Contrast"
 msgstr ""
 
-#: src/panasonicmn.cpp:151
-msgid "Low/High quality"
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
+msgid "Picture mode contrast"
 msgstr ""
 
-#: src/panasonicmn.cpp:152
-msgid "Infinite"
+#: src/olympusmn.cpp:694
+msgid "Picture Mode Sharpness"
 msgstr ""
 
-#: src/panasonicmn.cpp:160
-msgid "Medium low"
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
+msgid "Picture mode sharpness"
 msgstr ""
 
-#: src/panasonicmn.cpp:161
-msgid "Medium high"
+#: src/olympusmn.cpp:695
+msgid "Picture Mode BW Filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:170
-msgid "Low (-1)"
+#: src/olympusmn.cpp:695
+msgid "Picture mode BW filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
-msgid "High (+1)"
-msgstr ""
+#: src/olympusmn.cpp:696
+#, fuzzy
+msgid "Picture Mode Tone"
+msgstr "Kuvan tiedot"
 
-#: src/panasonicmn.cpp:172
-msgid "Lowest (-2)"
-msgstr ""
+#: src/olympusmn.cpp:696
+#, fuzzy
+msgid "Picture mode tone"
+msgstr "Kuvan tiedot"
 
-#: src/panasonicmn.cpp:173
-msgid "Highest (+2)"
-msgstr ""
+#: src/olympusmn.cpp:697
+#, fuzzy
+msgid "Noise filter"
+msgstr "tiedostoon"
 
-#: src/panasonicmn.cpp:179
-msgid "10s"
-msgstr ""
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art Filter"
+msgstr "Väriavaruus"
 
-#: src/panasonicmn.cpp:180
-msgid "2s"
-msgstr ""
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art filter"
+msgstr "Väriavaruus"
 
-#: src/panasonicmn.cpp:200
-msgid "EX optics"
-msgstr ""
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic Filter"
+msgstr "Digitaalinen makro"
 
-#: src/panasonicmn.cpp:207
-msgid "Telephoto"
-msgstr ""
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic filter"
+msgstr "Digitaalinen makro"
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
-msgid "Home"
-msgstr ""
+#: src/olympusmn.cpp:701
+#, fuzzy
+msgid "Panorama Mode"
+msgstr "Panoraama"
 
-#: src/panasonicmn.cpp:219
-msgid "Standard (color)"
-msgstr ""
+#: src/olympusmn.cpp:701
+#, fuzzy
+msgid "Panorama mode"
+msgstr "Panoraama"
 
-#: src/panasonicmn.cpp:220
-msgid "Dynamic (color)"
-msgstr ""
+#: src/olympusmn.cpp:702
+#, fuzzy
+msgid "Image Quality 2"
+msgstr "Kuvan laatu"
 
-#: src/panasonicmn.cpp:221
-msgid "Nature (color)"
-msgstr ""
+#: src/olympusmn.cpp:702
+#, fuzzy
+msgid "Image quality 2"
+msgstr "Kuvan laatu"
 
-#: src/panasonicmn.cpp:222
-msgid "Smooth (color)"
+#: src/olympusmn.cpp:704
+msgid "Manometer Pressure"
 msgstr ""
 
-#: src/panasonicmn.cpp:223
-msgid "Standard (B&W)"
+#: src/olympusmn.cpp:704
+msgid "Manometer pressure"
 msgstr ""
 
-#: src/panasonicmn.cpp:224
-msgid "Dynamic (B&W)"
+#: src/olympusmn.cpp:705
+msgid "Manometer Reading"
 msgstr ""
 
-#: src/panasonicmn.cpp:225
-msgid "Smooth (B&W)"
+#: src/olympusmn.cpp:705
+msgid "Manometer reading"
 msgstr ""
 
-#: src/panasonicmn.cpp:239
-msgid "Audio"
+#: src/olympusmn.cpp:706
+msgid "Extended WB Detect"
 msgstr ""
 
-#: src/panasonicmn.cpp:242
-msgid "White balance adjustment"
+#: src/olympusmn.cpp:706
+msgid "Extended WB detect"
 msgstr ""
 
-#: src/panasonicmn.cpp:243
-msgid "FlashBias"
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
 msgstr ""
 
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
-msgid "Exif version"
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
 msgstr ""
 
-#: src/panasonicmn.cpp:247
-msgid "Color Effect"
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
 msgstr ""
 
-#: src/panasonicmn.cpp:247
-msgid "Color effect"
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
 msgstr ""
 
-#: src/panasonicmn.cpp:248
-msgid ""
-"Time in 1/100 s from when the camera was powered on to when the image is "
-"written to memory card"
+#: src/olympusmn.cpp:710
+msgid "Unknown OlympusCs tag"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
-msgid "Burst Mode"
+#: src/olympusmn.cpp:721
+msgid "Simple E-System"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
-msgid "Burst mode"
+#: src/olympusmn.cpp:722
+msgid "E-System"
 msgstr ""
 
-#: src/panasonicmn.cpp:252
-msgid "NoiseReduction"
-msgstr ""
+#: src/olympusmn.cpp:739
+#, fuzzy
+msgid "Equipment Version"
+msgstr "Firmwaren versio"
 
-#: src/panasonicmn.cpp:253
-msgid "Self Timer"
-msgstr ""
+#: src/olympusmn.cpp:739
+#, fuzzy
+msgid "Equipment version"
+msgstr "Firmwaren versio"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
-msgid "Baby Age"
-msgstr ""
+#: src/olympusmn.cpp:741
+#, fuzzy
+msgid "Serial number"
+msgstr "Sarjanumero"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
-msgid "Baby (or pet) age"
-msgstr ""
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+msgid "Lens Serial Number"
+msgstr "Linssin sarjanumero"
 
-#: src/panasonicmn.cpp:259
-msgid "Optical Zoom Mode"
-msgstr ""
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+msgid "Lens serial number"
+msgstr "Linssin sarjanumero"
 
-#: src/panasonicmn.cpp:259
-msgid "Optical zoom mode"
-msgstr ""
+#: src/olympusmn.cpp:747 src/properties.cpp:374
+msgid "Lens Model"
+msgstr "Linssin malli"
 
-#: src/panasonicmn.cpp:260
-msgid "Conversion Lens"
-msgstr ""
+#: src/olympusmn.cpp:747
+#, fuzzy
+msgid "Lens model"
+msgstr "Linssin malli"
 
-#: src/panasonicmn.cpp:260
-msgid "Conversion lens"
-msgstr ""
+#: src/olympusmn.cpp:748
+#, fuzzy
+msgid "Lens Firmware Version"
+msgstr "Firmwaren versio"
 
-#: src/panasonicmn.cpp:261
-msgid "Travel Day"
-msgstr ""
+#: src/olympusmn.cpp:748
+#, fuzzy
+msgid "Lens firmware version"
+msgstr "Firmwaren versio"
 
-#: src/panasonicmn.cpp:261
-msgid "Travel day"
+#: src/olympusmn.cpp:753
+msgid "Max Aperture At Current Focal"
 msgstr ""
 
-#: src/panasonicmn.cpp:263
-msgid "World Time Location"
+#: src/olympusmn.cpp:753
+msgid "Max aperture at current focal"
 msgstr ""
 
-#: src/panasonicmn.cpp:263
-msgid "World time location"
-msgstr ""
+#: src/olympusmn.cpp:754
+msgid "Lens Properties"
+msgstr "Linssin ominaisuudet"
 
-#: src/panasonicmn.cpp:264
-msgid "Program ISO"
-msgstr ""
+#: src/olympusmn.cpp:754
+msgid "Lens properties"
+msgstr "Linssin ominaisuudet"
 
-#: src/panasonicmn.cpp:268
-msgid "WB Adjust AB"
-msgstr ""
+#: src/olympusmn.cpp:755
+#, fuzzy
+msgid "Extender"
+msgstr "Ulkoinen"
 
-#: src/panasonicmn.cpp:268
-msgid "WB adjust AB. Positive is a shift toward blue."
-msgstr ""
+#: src/olympusmn.cpp:756
+#, fuzzy
+msgid "Extender Serial Number"
+msgstr "Linssin sarjanumero"
 
-#: src/panasonicmn.cpp:269
-msgid "WB Adjust GM"
-msgstr ""
+#: src/olympusmn.cpp:756
+#, fuzzy
+msgid "Extender serial number"
+msgstr "Linssin sarjanumero"
 
-#: src/panasonicmn.cpp:269
-msgid "WBAdjustGM. Positive is a shift toward green."
-msgstr ""
+#: src/olympusmn.cpp:757
+#, fuzzy
+msgid "Extender Model"
+msgstr "Linssin malli"
 
-#: src/panasonicmn.cpp:272
-msgid "Accessory Type"
+#: src/olympusmn.cpp:757
+#, fuzzy
+msgid "Extender model"
+msgstr "Kameran malli"
+
+#: src/olympusmn.cpp:758
+#, fuzzy
+msgid "Extender Firmware Version"
+msgstr "Firmwaren versio"
+
+#: src/olympusmn.cpp:758
+#, fuzzy
+msgid "Extender firmwareversion"
+msgstr "Firmwaren versio"
+
+#: src/olympusmn.cpp:760 src/properties.cpp:370
+msgid "Flash Model"
+msgstr "Salaman malli"
+
+#: src/olympusmn.cpp:760
+msgid "Flash model"
+msgstr "Salaman malli"
+
+#: src/olympusmn.cpp:761
+#, fuzzy
+msgid "Flash Firmware Version"
+msgstr "Firmwaren versio"
+
+#: src/olympusmn.cpp:761
+#, fuzzy
+msgid "Flash firmware version"
+msgstr "Firmwaren versio"
+
+#: src/olympusmn.cpp:762
+msgid "FlashSerialNumber"
+msgstr "Salaman sarjanumero"
+
+#: src/olympusmn.cpp:764
+msgid "Unknown OlympusEq tag"
 msgstr ""
 
-#: src/panasonicmn.cpp:272
-msgid "Accessory type"
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
+#, fuzzy
+msgid "High Speed"
+msgstr "ISO-herkkyys"
+
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
+msgid "High Function"
 msgstr ""
 
-#: src/panasonicmn.cpp:275
-msgid "MakerNote Version"
+#: src/olympusmn.cpp:783
+msgid "Advanced High Speed"
 msgstr ""
 
-#: src/panasonicmn.cpp:275
-msgid "MakerNote version"
+#: src/olympusmn.cpp:784
+msgid "Advanced High Function"
 msgstr ""
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
-msgid "WB Red Level"
+#: src/olympusmn.cpp:789
+msgid "Original"
 msgstr ""
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
-msgid "WB red level"
+#: src/olympusmn.cpp:790
+#, fuzzy
+msgid "Edited (Landscape)"
+msgstr "Maisemakuva"
+
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
+#, fuzzy
+msgid "Edited (Portrait)"
+msgstr "Muotokuva"
+
+#: src/olympusmn.cpp:797
+#, fuzzy
+msgid "WB Color Temp"
+msgstr "Väriavaruus"
+
+#: src/olympusmn.cpp:798
+msgid "WB Gray Point"
 msgstr ""
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
-msgid "WB Green Level"
+#: src/olympusmn.cpp:808
+msgid "Raw Development Version"
 msgstr ""
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
-msgid "WB green level"
+#: src/olympusmn.cpp:808
+msgid "Raw development version"
 msgstr ""
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
-msgid "WB Blue Level"
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
+#, fuzzy
+msgid "Exposure Bias Value"
+msgstr "Valotuksen korjaus"
+
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
+#, fuzzy
+msgid "Exposure bias value"
+msgstr "Valotuksen korjaus"
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+#, fuzzy
+msgid "White Balance Value"
+msgstr " "
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+#, fuzzy
+msgid "White balance value"
+msgstr " "
+
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
+msgid "WB Fine Adjustment"
 msgstr ""
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
-msgid "WB blue level"
+#: src/olympusmn.cpp:811
+msgid "WB fine adjustment"
 msgstr ""
 
-#: src/panasonicmn.cpp:282
-msgid "Unknown PanasonicMakerNote tag"
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
+#, fuzzy
+msgid "Gray Point"
+msgstr "AF-piste"
+
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
+msgid "Gray point"
 msgstr ""
 
-#: src/panasonicmn.cpp:299
-msgid "Spot mode on"
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+#, fuzzy
+msgid "Saturation Emphasis"
+msgstr "Värikylläisyys"
+
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+#, fuzzy
+msgid "Saturation emphasis"
+msgstr "Värikylläisyys"
+
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+msgid "Memory Color Emphasis"
 msgstr ""
 
-#: src/panasonicmn.cpp:300
-msgid "Spot mode off or 3-area (high speed)"
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+msgid "Memory color emphasis"
 msgstr ""
 
-#: src/panasonicmn.cpp:301
-msgid "Spot focussing"
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+#, fuzzy
+msgid "Contrast Value"
+msgstr "Kontrasti"
+
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+#, fuzzy
+msgid "Contrast value"
+msgstr "Kontrasti"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+#, fuzzy
+msgid "Sharpness Value"
+msgstr "Terävyys"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+#, fuzzy
+msgid "Sharpness value"
+msgstr "Terävyys"
+
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
+msgid "Engine"
 msgstr ""
 
-#: src/panasonicmn.cpp:302
-msgid "5-area"
+#: src/olympusmn.cpp:820
+msgid "Edit status"
 msgstr ""
 
-#: src/panasonicmn.cpp:303
-msgid "1-area"
+#: src/olympusmn.cpp:821
+msgid "Settings"
+msgstr "Asetukset"
+
+#: src/olympusmn.cpp:823
+msgid "Unknown OlympusRd tag"
 msgstr ""
 
-#: src/panasonicmn.cpp:304
-msgid "1-area (high speed)"
+#: src/olympusmn.cpp:878
+msgid "Raw Development 2 Version"
 msgstr ""
 
-#: src/panasonicmn.cpp:305
-msgid "3-area (auto)"
+#: src/olympusmn.cpp:878
+msgid "Raw development 2 version"
 msgstr ""
 
-#: src/panasonicmn.cpp:306
-msgid "3-area (left)"
+#: src/olympusmn.cpp:882
+#, fuzzy
+msgid "White balance fine adjustment"
+msgstr " "
+
+#: src/olympusmn.cpp:892
+#, fuzzy
+msgid "PM Saturation"
+msgstr "Värikylläisyys"
+
+#: src/olympusmn.cpp:893
+#, fuzzy
+msgid "PM Contrast"
+msgstr "Kontrasti"
+
+#: src/olympusmn.cpp:894
+#, fuzzy
+msgid "PM Sharpness"
+msgstr "Terävyys"
+
+#: src/olympusmn.cpp:895
+msgid "PM BW Filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:307
-msgid "3-area (center)"
+#: src/olympusmn.cpp:895
+msgid "PM BW filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:308
-msgid "3-area (right)"
+#: src/olympusmn.cpp:896
+#, fuzzy
+msgid "PM Picture Tone"
+msgstr "Kuvan tiedot"
+
+#: src/olympusmn.cpp:896
+#, fuzzy
+msgid "PM picture tone"
+msgstr "Kuvan tiedot"
+
+#: src/olympusmn.cpp:899
+msgid "Auto Gradation"
 msgstr ""
 
-#: src/panasonicmn.cpp:320
-msgid " EV"
+#: src/olympusmn.cpp:899
+msgid "Auto gradation"
 msgstr ""
 
-#: src/panasonicmn.cpp:329
-msgid "Panasonic raw version"
+#: src/olympusmn.cpp:900
+msgid "PM Noise Filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:330
-msgid "Sensor Width"
+#: src/olympusmn.cpp:900
+msgid "Picture mode noise filter"
 msgstr ""
 
-#: src/panasonicmn.cpp:330
-msgid "Sensor width"
+#: src/olympusmn.cpp:902
+msgid "Unknown OlympusRd2 tag"
 msgstr ""
 
-#: src/panasonicmn.cpp:331
-msgid "Sensor Height"
+#: src/olympusmn.cpp:913
+#, fuzzy
+msgid "On (2 frames)"
+msgstr "Päällä"
+
+#: src/olympusmn.cpp:914
+#, fuzzy
+msgid "On (3 frames)"
+msgstr "Päällä"
+
+#: src/olympusmn.cpp:919
+msgid "4:3"
 msgstr ""
 
-#: src/panasonicmn.cpp:331
-msgid "Sensor height"
+#: src/olympusmn.cpp:920
+msgid "3:2"
 msgstr ""
 
-#: src/panasonicmn.cpp:332
-msgid "Sensor Top Border"
+#: src/olympusmn.cpp:921
+msgid "16:9"
 msgstr ""
 
-#: src/panasonicmn.cpp:332
-msgid "Sensor top border"
+#: src/olympusmn.cpp:922
+msgid "6:6"
 msgstr ""
 
-#: src/panasonicmn.cpp:333
-msgid "Sensor Left Border"
+#: src/olympusmn.cpp:923
+msgid "5:4"
 msgstr ""
 
-#: src/panasonicmn.cpp:333
-msgid "Sensor left border"
+#: src/olympusmn.cpp:924
+msgid "7:6"
 msgstr ""
 
-#: src/panasonicmn.cpp:336
-msgid "Red balance (found in Digilux 2 RAW images)"
+#: src/olympusmn.cpp:925
+msgid "6:5"
 msgstr ""
 
-#: src/panasonicmn.cpp:342
-msgid "Preview Image"
+#: src/olympusmn.cpp:926
+msgid "7:5"
 msgstr ""
 
-#: src/panasonicmn.cpp:342
-msgid "Preview image"
+#: src/olympusmn.cpp:927
+msgid "3:4"
 msgstr ""
 
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
-msgid "Manufacturer"
-msgstr "Valmistaja"
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image Processing Version"
+msgstr "Ohjelman versio"
 
-#: src/panasonicmn.cpp:343
-msgid "The manufacturer of the recording equipment"
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image processing version"
+msgstr "Firmwaren versio"
+
+#: src/olympusmn.cpp:933
+msgid "WB RB Levels 3000K"
 msgstr ""
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
-msgid "Model"
-msgstr "Malli"
+#: src/olympusmn.cpp:933
+msgid "WB RB levels 3000K"
+msgstr ""
 
-#: src/panasonicmn.cpp:344
-msgid "The model name or model number of the equipment"
+#: src/olympusmn.cpp:934
+msgid "WB RB Levels 3300K"
 msgstr ""
 
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
-msgid "Strip Offsets"
+#: src/olympusmn.cpp:934
+msgid "WB RB levels 3300K"
 msgstr ""
 
-#: src/panasonicmn.cpp:345
-msgid "Strip offsets"
+#: src/olympusmn.cpp:935
+msgid "WB RB Levels 3600K"
 msgstr ""
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
-msgid "Orientation"
+#: src/olympusmn.cpp:935
+msgid "WB RB levels 3600K"
 msgstr ""
 
-#: src/panasonicmn.cpp:347
-msgid "Rows Per Strip"
+#: src/olympusmn.cpp:936
+msgid "WB RB Levels 3900K"
 msgstr ""
 
-#: src/panasonicmn.cpp:347
-msgid "The number of rows per strip"
+#: src/olympusmn.cpp:936
+msgid "WB RB levels 3900K"
 msgstr ""
 
-#: src/panasonicmn.cpp:348
-msgid "Strip Byte Counts"
+#: src/olympusmn.cpp:937
+msgid "WB RB Levels 4000K"
 msgstr ""
 
-#: src/panasonicmn.cpp:348
-msgid "Strip byte counts"
+#: src/olympusmn.cpp:937
+msgid "WB RB levels 4000K"
 msgstr ""
 
-#: src/panasonicmn.cpp:349
-msgid "Raw Data Offset"
+#: src/olympusmn.cpp:938
+msgid "WB RB Levels 4300K"
 msgstr ""
 
-#: src/panasonicmn.cpp:349
-msgid "Raw data offset"
+#: src/olympusmn.cpp:938
+msgid "WB RB levels 4300K"
 msgstr ""
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
-msgid "Exif IFD Pointer"
+#: src/olympusmn.cpp:939
+msgid "WB RB Levels 4500K"
 msgstr ""
 
-#: src/panasonicmn.cpp:350
-msgid "A pointer to the Exif IFD"
+#: src/olympusmn.cpp:939
+msgid "WB RB levels 4500K"
 msgstr ""
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
-msgid "GPS Info IFD Pointer"
+#: src/olympusmn.cpp:940
+msgid "WB RB Levels 4800K"
 msgstr ""
 
-#: src/panasonicmn.cpp:351
-msgid "A pointer to the GPS Info IFD"
-msgstr ""
-
-#: src/panasonicmn.cpp:353
-msgid "Unknown PanasonicRaw tag"
+#: src/olympusmn.cpp:940
+msgid "WB RB levels 4800K"
 msgstr ""
 
-#: src/pentaxmn.cpp:56
-msgid "Night-Scene"
+#: src/olympusmn.cpp:941
+msgid "WB RB Levels 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:62
-msgid "Optio 330/430"
+#: src/olympusmn.cpp:941
+msgid "WB RB levels 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:63
-msgid "Optio 230"
+#: src/olympusmn.cpp:942
+msgid "WB RB Levels 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:64
-msgid "Optio 330GS"
+#: src/olympusmn.cpp:942
+msgid "WB RB levels 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:65
-msgid "Optio 450/550"
+#: src/olympusmn.cpp:943
+msgid "WB RB Levels 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:66
-msgid "Optio S"
+#: src/olympusmn.cpp:943
+msgid "WB RB levels 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:67
-msgid "*ist D"
+#: src/olympusmn.cpp:944
+msgid "WB RB Levels 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:68
-msgid "Optio 33L"
+#: src/olympusmn.cpp:944
+msgid "WB RB levels 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:69
-msgid "Optio 33LF"
+#: src/olympusmn.cpp:945
+msgid "WB RB Levels CWB1"
 msgstr ""
 
-#: src/pentaxmn.cpp:70
-msgid "Optio 33WR/43WR/555"
+#: src/olympusmn.cpp:945
+msgid "WB RB levels CWB1"
 msgstr ""
 
-#: src/pentaxmn.cpp:71
-msgid "Optio S4"
+#: src/olympusmn.cpp:946
+msgid "WB RB Levels CWB2"
 msgstr ""
 
-#: src/pentaxmn.cpp:72
-msgid "Optio MX"
+#: src/olympusmn.cpp:946
+msgid "WB RB levels CWB2"
 msgstr ""
 
-#: src/pentaxmn.cpp:73
-msgid "Optio S40"
+#: src/olympusmn.cpp:947
+msgid "WB RB Levels CWB3"
 msgstr ""
 
-#: src/pentaxmn.cpp:74
-msgid "Optio S4i"
+#: src/olympusmn.cpp:947
+msgid "WB RB levels CWB3"
 msgstr ""
 
-#: src/pentaxmn.cpp:75
-msgid "Optio 30"
+#: src/olympusmn.cpp:948
+msgid "WB RB Levels CWB4"
 msgstr ""
 
-#: src/pentaxmn.cpp:76
-msgid "Optio S30"
+#: src/olympusmn.cpp:948
+msgid "WB RB levels CWB4"
 msgstr ""
 
-#: src/pentaxmn.cpp:77
-msgid "Optio 750Z"
+#: src/olympusmn.cpp:949
+msgid "WB G Level 3000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:78
-msgid "Optio SV"
+#: src/olympusmn.cpp:949
+msgid "WB G level 3000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:79
-msgid "Optio SVi"
+#: src/olympusmn.cpp:950
+msgid "WB G Level 3300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:80
-msgid "Optio X"
+#: src/olympusmn.cpp:950
+msgid "WB G level 3300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:81
-msgid "Optio S5i"
+#: src/olympusmn.cpp:951
+msgid "WB G Level 3600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:82
-msgid "Optio S50"
+#: src/olympusmn.cpp:951
+msgid "WB G level 3600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:83
-msgid "*ist DS"
+#: src/olympusmn.cpp:952
+msgid "WB G Level 3900K"
 msgstr ""
 
-#: src/pentaxmn.cpp:84
-msgid "Optio MX4"
+#: src/olympusmn.cpp:952
+msgid "WB G level 3900K"
 msgstr ""
 
-#: src/pentaxmn.cpp:85
-msgid "Optio S5n"
+#: src/olympusmn.cpp:953
+msgid "WB G Level 4000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:86
-msgid "Optio WP"
+#: src/olympusmn.cpp:953
+msgid "WB G level 4000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:87
-msgid "Optio S55"
+#: src/olympusmn.cpp:954
+msgid "WB G Level 4300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:88
-msgid "Optio S5z"
+#: src/olympusmn.cpp:954
+msgid "WB G level 4300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:89
-msgid "*ist DL"
+#: src/olympusmn.cpp:955
+msgid "WB G Level 4500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:90
-msgid "Optio S60"
+#: src/olympusmn.cpp:955
+msgid "WB G level 4500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:91
-msgid "Optio S45"
+#: src/olympusmn.cpp:956
+msgid "WB G Level 4800K"
 msgstr ""
 
-#: src/pentaxmn.cpp:92
-msgid "Optio S6"
+#: src/olympusmn.cpp:956
+msgid "WB G level 4800K"
 msgstr ""
 
-#: src/pentaxmn.cpp:93
-msgid "Optio WPi"
+#: src/olympusmn.cpp:957
+msgid "WB G Level 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:94
-msgid "BenQ DC X600"
+#: src/olympusmn.cpp:957
+msgid "WB G level 5300K"
 msgstr ""
 
-#: src/pentaxmn.cpp:95
-msgid "*ist DS2"
+#: src/olympusmn.cpp:958
+msgid "WB G Level 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:96
-msgid "Samsung GX-1S"
+#: src/olympusmn.cpp:958
+msgid "WB G level 6000K"
 msgstr ""
 
-#: src/pentaxmn.cpp:97
-msgid "Optio A10"
+#: src/olympusmn.cpp:959
+msgid "WB G Level 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:98
-msgid "*ist DL2"
+#: src/olympusmn.cpp:959
+msgid "WB G level 6600K"
 msgstr ""
 
-#: src/pentaxmn.cpp:99
-msgid "Samsung GX-1L"
+#: src/olympusmn.cpp:960
+msgid "WB G Level 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:100
-msgid "K100D"
+#: src/olympusmn.cpp:960
+msgid "WB G level 7500K"
 msgstr ""
 
-#: src/pentaxmn.cpp:101
-msgid "K110D"
+#: src/olympusmn.cpp:961
+msgid "WB G Level"
 msgstr ""
 
-#: src/pentaxmn.cpp:102
-msgid "K100D Super"
+#: src/olympusmn.cpp:961
+msgid "WB G level"
 msgstr ""
 
-#: src/pentaxmn.cpp:103
-msgid "Optio T10"
+#: src/olympusmn.cpp:963
+msgid "Enhancer"
 msgstr ""
 
-#: src/pentaxmn.cpp:104
-msgid "Optio W10"
+#: src/olympusmn.cpp:964
+msgid "Enhancer Values"
 msgstr ""
 
-#: src/pentaxmn.cpp:105
-msgid "Optio M10"
+#: src/olympusmn.cpp:964
+msgid "Enhancer values"
 msgstr ""
 
-#: src/pentaxmn.cpp:106
-msgid "K10D"
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+msgid "Coring Filter"
 msgstr ""
 
-#: src/pentaxmn.cpp:107
-msgid "Samsung GX10"
-msgstr ""
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring Values"
+msgstr "Omistusoikeus"
 
-#: src/pentaxmn.cpp:108
-msgid "Optio S7"
-msgstr ""
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring values"
+msgstr "Omistusoikeus"
 
-#: src/pentaxmn.cpp:109
-msgid "Optio M20"
-msgstr ""
+#: src/olympusmn.cpp:967 src/tags.cpp:913
+#, fuzzy
+msgid "Black Level"
+msgstr "Salaman malli"
 
-#: src/pentaxmn.cpp:110
-msgid "Optio W20"
+#: src/olympusmn.cpp:968
+msgid "Gain Base"
 msgstr ""
 
-#: src/pentaxmn.cpp:111
-msgid "Optio A20"
+#: src/olympusmn.cpp:968
+msgid "Gain base"
 msgstr ""
 
-#: src/pentaxmn.cpp:112
-msgid "Optio M30"
+#: src/olympusmn.cpp:969
+msgid "Valid Bits"
 msgstr ""
 
-#: src/pentaxmn.cpp:113
-msgid "Optio E30"
-msgstr ""
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
+#, fuzzy
+msgid "Crop Left"
+msgstr "Polttoväli"
 
-#: src/pentaxmn.cpp:114
-msgid "Optio T30"
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
+msgid "Crop left"
 msgstr ""
 
-#: src/pentaxmn.cpp:115
-msgid "Optio W30"
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
+msgid "Crop Top"
 msgstr ""
 
-#: src/pentaxmn.cpp:116
-msgid "Optio A30"
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
+msgid "Crop top"
 msgstr ""
 
-#: src/pentaxmn.cpp:117
-msgid "Optio E40"
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
+msgid "Crop Width"
 msgstr ""
 
-#: src/pentaxmn.cpp:118
-msgid "Optio M40"
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
+msgid "Crop width"
 msgstr ""
 
-#: src/pentaxmn.cpp:119
-msgid "Optio Z10"
-msgstr ""
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
+#, fuzzy
+msgid "Crop Height"
+msgstr "Omistusoikeus"
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
-msgid "Optio S10"
-msgstr ""
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
+#, fuzzy
+msgid "Crop height"
+msgstr "Omistusoikeus"
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
-msgid "Optio A40"
-msgstr ""
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple Exposure Mode"
+msgstr "Valotustila"
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
-msgid "Optio V10"
-msgstr ""
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple exposure mode"
+msgstr "Valotustila"
 
-#: src/pentaxmn.cpp:123
-msgid "K20D"
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+msgid "Aspect Ratio"
 msgstr ""
 
-#: src/pentaxmn.cpp:127
-msgid "K200D"
+#: src/olympusmn.cpp:978
+msgid "Aspect ratio"
 msgstr ""
 
-#: src/pentaxmn.cpp:128
-msgid "Optio E50"
-msgstr ""
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect Frame"
+msgstr "Omistajan nimi"
 
-#: src/pentaxmn.cpp:129
-msgid "Optio M50"
-msgstr ""
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect frame"
+msgstr "Omistajan nimi"
 
-#: src/pentaxmn.cpp:134
-msgid "Good"
+#: src/olympusmn.cpp:980
+msgid "Face Detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:135
-msgid "Better"
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+msgid "Face detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:136
-msgid "Best"
-msgstr ""
+#: src/olympusmn.cpp:981
+#, fuzzy
+msgid "Face Detect Area"
+msgstr "Lukuvirhe"
 
-#: src/pentaxmn.cpp:137
-msgid "TIFF"
-msgstr ""
+#: src/olympusmn.cpp:981
+#, fuzzy
+msgid "Face detect area"
+msgstr "Lukuvirhe"
 
-#: src/pentaxmn.cpp:139
-msgid "Premium"
+#: src/olympusmn.cpp:983
+msgid "Unknown OlympusIp tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:144
-msgid "640x480"
+#: src/olympusmn.cpp:993
+msgid "Bounce or Off"
 msgstr ""
 
-#: src/pentaxmn.cpp:145
-msgid "Full"
+#: src/olympusmn.cpp:994
+msgid "Direct"
 msgstr ""
 
-#: src/pentaxmn.cpp:146
-msgid "1024x768"
+#: src/olympusmn.cpp:998
+msgid "Focus Info Version"
 msgstr ""
 
-#: src/pentaxmn.cpp:147
-msgid "1280x960"
+#: src/olympusmn.cpp:998
+msgid "Focus info version"
 msgstr ""
 
-#: src/pentaxmn.cpp:148
-msgid "1600x1200"
-msgstr ""
+#: src/olympusmn.cpp:999
+#, fuzzy
+msgid "Auto Focus"
+msgstr "Automaattivalotus"
 
-#: src/pentaxmn.cpp:149
-msgid "2048x1536"
+#: src/olympusmn.cpp:1000
+msgid "Scene Detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:150
-msgid "2560x1920 or 2304x1728"
+#: src/olympusmn.cpp:1000
+msgid "Scene detect"
 msgstr ""
 
-#: src/pentaxmn.cpp:151
-msgid "3072x2304"
+#: src/olympusmn.cpp:1001
+msgid "Scene Area"
 msgstr ""
 
-#: src/pentaxmn.cpp:152
-msgid "3264x2448"
-msgstr ""
+#: src/olympusmn.cpp:1001
+#, fuzzy
+msgid "Scene area"
+msgstr "Omistajan nimi"
 
-#: src/pentaxmn.cpp:153
-msgid "320x240"
+#: src/olympusmn.cpp:1002
+msgid "Scene Detect Data"
 msgstr ""
 
-#: src/pentaxmn.cpp:154
-msgid "2288x1712"
+#: src/olympusmn.cpp:1002
+msgid "Scene detect data"
 msgstr ""
 
-#: src/pentaxmn.cpp:155
-msgid "2592x1944"
-msgstr ""
+#: src/olympusmn.cpp:1003
+#, fuzzy
+msgid "Zoom Step Count"
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/pentaxmn.cpp:156
-msgid "2304x1728 or 2592x1944"
+#: src/olympusmn.cpp:1004
+msgid "Focus Step Count"
 msgstr ""
 
-#: src/pentaxmn.cpp:157
-msgid "3056x2296"
+#: src/olympusmn.cpp:1004
+msgid "Focus step count"
 msgstr ""
 
-#: src/pentaxmn.cpp:158
-msgid "2816x2212 or 2816x2112"
+#: src/olympusmn.cpp:1005
+msgid "Focus Step Infinity"
 msgstr ""
 
-#: src/pentaxmn.cpp:159
-msgid "3648x2736"
+#: src/olympusmn.cpp:1005
+msgid "Focus step infinity"
 msgstr ""
 
-#: src/pentaxmn.cpp:164
-msgid "Auto, Did not fire"
-msgstr "Auto, ei välähtänyt"
+#: src/olympusmn.cpp:1006
+msgid "Focus Step Near"
+msgstr ""
 
-#: src/pentaxmn.cpp:166
-msgid "Auto, Did not fire, Red-eye reduction"
-msgstr "Auto, ei välähtänyt, punasilmäisyyden esto"
+#: src/olympusmn.cpp:1006
+msgid "Focus step near"
+msgstr ""
 
-#: src/pentaxmn.cpp:167
-msgid "Auto, Fired"
-msgstr "Auto, välähti"
+#: src/olympusmn.cpp:1009
+#, fuzzy
+msgid "External Flash"
+msgstr "Ulkoinen salama"
 
-#: src/pentaxmn.cpp:169
-msgid "Auto, Fired, Red-eye reduction"
-msgstr "Auto, välähti, punasilmäisyyden esto"
+#: src/olympusmn.cpp:1010
+#, fuzzy
+msgid "External Flash Guide Number"
+msgstr "Ulkoinen salama"
 
-#: src/pentaxmn.cpp:170
-msgid "On, Red-eye reduction"
-msgstr "Päällä, punasilmäisyyden esto"
+#: src/olympusmn.cpp:1010
+#, fuzzy
+msgid "External flash guide number"
+msgstr "Ulkoinen salama"
 
-#: src/pentaxmn.cpp:171
-msgid "On, Wireless"
-msgstr "Päällä, langaton"
+#: src/olympusmn.cpp:1014
+#, fuzzy
+msgid "Manual Flash"
+msgstr "Manuaalinen"
 
-#: src/pentaxmn.cpp:172
-msgid "On, Soft"
-msgstr ""
+#: src/olympusmn.cpp:1014
+#, fuzzy
+msgid "Manual flash"
+msgstr "Käsintarkennus, MF"
 
-#: src/pentaxmn.cpp:173
-msgid "On, Slow-sync"
+#: src/olympusmn.cpp:1018
+msgid "Unknown OlympusFi tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:174
-msgid "On, Slow-sync, Red-eye reduction"
+#: src/olympusmn.cpp:1029
+msgid "Unknown OlympusFe tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:175
-msgid "On, Trailing-curtain Sync"
+#: src/olympusmn.cpp:1042
+msgid "Fine Weather"
 msgstr ""
 
-#: src/pentaxmn.cpp:184
-msgid "Pan Focus"
+#: src/olympusmn.cpp:1043
+msgid "Tungsten (incandescent)"
 msgstr ""
 
-#: src/pentaxmn.cpp:185
-msgid "AF-S"
+#: src/olympusmn.cpp:1044
+msgid "Evening Sunlight"
 msgstr ""
 
-#: src/pentaxmn.cpp:186
-msgid "AF-C"
+#: src/olympusmn.cpp:1045
+msgid "Daylight Fluorescent (D 5700 - 7100K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:192
-msgid "Fixed Center"
+#: src/olympusmn.cpp:1046
+msgid "Day White Fluorescent (N 4600 - 5400K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
-msgid "50"
+#: src/olympusmn.cpp:1047
+msgid "Cool White Fluorescent (W 3900 - 4500K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:209
-msgid "64"
+#: src/olympusmn.cpp:1048
+msgid "White Fluorescent (WW 3200 - 3700K)"
 msgstr ""
 
-#: src/pentaxmn.cpp:210
-msgid "80"
-msgstr ""
+#: src/olympusmn.cpp:1049
+#, fuzzy
+msgid "One Touch White Balance"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
-msgid "100"
+#: src/olympusmn.cpp:1050
+msgid "Custom 1-4"
 msgstr ""
 
-#: src/pentaxmn.cpp:212
-msgid "125"
+#: src/olympusmn.cpp:1054
+msgid "Raw Info Version"
 msgstr ""
 
-#: src/pentaxmn.cpp:213
-msgid "160"
+#: src/olympusmn.cpp:1054
+msgid "Raw info version"
 msgstr ""
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
-msgid "200"
+#: src/olympusmn.cpp:1055
+msgid "WB_RB Levels Used"
 msgstr ""
 
-#: src/pentaxmn.cpp:215
-msgid "250"
+#: src/olympusmn.cpp:1055
+msgid "WB_RB levels used"
 msgstr ""
 
-#: src/pentaxmn.cpp:216
-msgid "320"
+#: src/olympusmn.cpp:1056
+msgid "WB_RB Levels Auto"
 msgstr ""
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
-msgid "400"
+#: src/olympusmn.cpp:1056
+msgid "WB_RB levels auto"
 msgstr ""
 
-#: src/pentaxmn.cpp:218
-msgid "500"
+#: src/olympusmn.cpp:1057
+msgid "WB_RB Levels Shade"
 msgstr ""
 
-#: src/pentaxmn.cpp:219
-msgid "640"
+#: src/olympusmn.cpp:1057
+msgid "WB_RB levels shade"
 msgstr ""
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
-msgid "800"
+#: src/olympusmn.cpp:1058
+msgid "WB_RB Levels Cloudy"
 msgstr ""
 
-#: src/pentaxmn.cpp:221
-msgid "1000"
+#: src/olympusmn.cpp:1058
+msgid "WB_RB levels cloudy"
 msgstr ""
 
-#: src/pentaxmn.cpp:222
-msgid "1250"
+#: src/olympusmn.cpp:1059
+msgid "WB_RB Levels Fine Weather"
 msgstr ""
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
-msgid "1600"
+#: src/olympusmn.cpp:1059
+msgid "WB_RB levels fine weather"
 msgstr ""
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
-msgid "3200"
+#: src/olympusmn.cpp:1060
+msgid "WB_RB Levels Tungsten"
 msgstr ""
 
-#: src/pentaxmn.cpp:249
-msgid "Multi Segment"
+#: src/olympusmn.cpp:1060
+msgid "WB_RB levels tungsten"
 msgstr ""
 
-#: src/pentaxmn.cpp:250
-msgid "Center Weighted"
+#: src/olympusmn.cpp:1061
+msgid "WB_RB Levels Evening Sunlight"
 msgstr ""
 
-#: src/pentaxmn.cpp:262
-msgid "DaylightFluorescent"
+#: src/olympusmn.cpp:1061
+msgid "WB_RB levels evening sunlight"
 msgstr ""
 
-#: src/pentaxmn.cpp:263
-msgid "DaywhiteFluorescent"
+#: src/olympusmn.cpp:1062
+msgid "WB_RB Levels Daylight Fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:264
-msgid "WhiteFluorescent"
+#: src/olympusmn.cpp:1062
+msgid "WB_RB levels daylight fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:268
-msgid "User Selected"
+#: src/olympusmn.cpp:1063
+msgid "WB_RB Levels Day White Fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:273
-msgid "Auto (Daylight)"
+#: src/olympusmn.cpp:1063
+msgid "WB_RB levels day white fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:274
-msgid "Auto (Shade)"
+#: src/olympusmn.cpp:1064
+msgid "WB_RB Levels Cool White Fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:275
-msgid "Auto (Flash)"
+#: src/olympusmn.cpp:1064
+msgid "WB_RB levels cool white fluor"
 msgstr ""
 
-#: src/pentaxmn.cpp:276
-msgid "Auto (Tungsten)"
+#: src/olympusmn.cpp:1065
+msgid "WB_RB Levels White Fluorescent"
 msgstr ""
 
-#: src/pentaxmn.cpp:277
-msgid "Auto (DaywhiteFluorescent)"
+#: src/olympusmn.cpp:1065
+msgid "WB_RB levels white fluorescent"
 msgstr ""
 
-#: src/pentaxmn.cpp:278
-msgid "Auto (WhiteFluorescent)"
+#: src/olympusmn.cpp:1066
+msgid "Color Matrix2"
 msgstr ""
 
-#: src/pentaxmn.cpp:279
-msgid "Auto (Cloudy)"
+#: src/olympusmn.cpp:1066
+msgid "Color matrix 2"
 msgstr ""
 
-#: src/pentaxmn.cpp:281
-msgid "Preset (Fireworks?)"
-msgstr ""
+#: src/olympusmn.cpp:1069
+#, fuzzy
+msgid "Black Level 2"
+msgstr "Salaman malli"
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
-msgid "Med Low"
-msgstr ""
+#: src/olympusmn.cpp:1069
+#, fuzzy
+msgid "Black level 2"
+msgstr "Salaman malli"
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
-msgid "Med High"
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
+msgid "YCbCr Coefficients"
 msgstr ""
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-msgid "Very Low"
+#: src/olympusmn.cpp:1070
+msgid "YCbCr coefficients"
 msgstr ""
 
-#: src/pentaxmn.cpp:311
-msgid "Med Soft"
+#: src/olympusmn.cpp:1071
+msgid "Valid Pixel Depth"
 msgstr ""
 
-#: src/pentaxmn.cpp:312
-msgid "Med Hard"
+#: src/olympusmn.cpp:1071
+msgid "Valid pixel depth"
 msgstr ""
 
-#: src/pentaxmn.cpp:313
-msgid "Very Soft"
-msgstr ""
+#: src/olympusmn.cpp:1077
+#, fuzzy
+msgid "White Balance Comp"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:314
-msgid "Very Hard"
-msgstr ""
+#: src/olympusmn.cpp:1077
+#, fuzzy
+msgid "White balance comp"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
-msgid "Home town"
-msgstr ""
+#: src/olympusmn.cpp:1078
+#, fuzzy
+msgid "Saturation Setting"
+msgstr "Värikylläisyys"
 
-#: src/pentaxmn.cpp:325
-msgid "Pago Pago"
-msgstr ""
+#: src/olympusmn.cpp:1079
+#, fuzzy
+msgid "Hue Setting"
+msgstr "Asetukset"
 
-#: src/pentaxmn.cpp:326
-msgid "Honolulu"
-msgstr ""
+#: src/olympusmn.cpp:1079
+#, fuzzy
+msgid "Hue setting"
+msgstr "Asetukset"
 
-#: src/pentaxmn.cpp:327
-msgid "Anchorage"
+#: src/olympusmn.cpp:1082
+msgid "CM Exposure Compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:328
-msgid "Vancouver"
+#: src/olympusmn.cpp:1082
+msgid "CM exposure compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:329
-msgid "San Fransisco"
-msgstr ""
+#: src/olympusmn.cpp:1083
+#, fuzzy
+msgid "CM White Balance"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:330
-msgid "Los Angeles"
-msgstr ""
+#: src/olympusmn.cpp:1083
+#, fuzzy
+msgid "CM white balance"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:331
-msgid "Calgary"
-msgstr ""
+#: src/olympusmn.cpp:1084
+#, fuzzy
+msgid "CM White Balance Comp"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:332
-msgid "Denver"
-msgstr ""
+#: src/olympusmn.cpp:1084
+#, fuzzy
+msgid "CM white balance comp"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:333
-msgid "Mexico City"
-msgstr ""
+#: src/olympusmn.cpp:1085
+#, fuzzy
+msgid "CM White Balance Gray Point"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:334
-msgid "Chicago"
-msgstr ""
+#: src/olympusmn.cpp:1085
+#, fuzzy
+msgid "CM white balance gray point"
+msgstr "Valkotasapaino"
 
-#: src/pentaxmn.cpp:335
-msgid "Miami"
-msgstr ""
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM Saturation"
+msgstr "Värikylläisyys"
 
-#: src/pentaxmn.cpp:336
-msgid "Toronto"
-msgstr ""
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM saturation"
+msgstr "Värikylläisyys"
 
-#: src/pentaxmn.cpp:337
-msgid "New York"
-msgstr ""
+#: src/olympusmn.cpp:1087
+#, fuzzy
+msgid "CM Hue"
+msgstr "Väriavaruus"
 
-#: src/pentaxmn.cpp:338
-msgid "Santiago"
-msgstr ""
+#: src/olympusmn.cpp:1087
+#, fuzzy
+msgid "CM hue"
+msgstr "Väriavaruus"
 
-#: src/pentaxmn.cpp:339
-msgid "Caracus"
-msgstr ""
+#: src/olympusmn.cpp:1088
+#, fuzzy
+msgid "CM Contrast"
+msgstr "Kontrasti"
 
-#: src/pentaxmn.cpp:340
-msgid "Halifax"
-msgstr ""
+#: src/olympusmn.cpp:1088
+#, fuzzy
+msgid "CM contrast"
+msgstr "Kontrasti"
 
-#: src/pentaxmn.cpp:341
-msgid "Buenos Aires"
-msgstr ""
+#: src/olympusmn.cpp:1089
+#, fuzzy
+msgid "CM Sharpness"
+msgstr "Terävyys"
 
-#: src/pentaxmn.cpp:342
-msgid "Sao Paulo"
-msgstr ""
+#: src/olympusmn.cpp:1089
+#, fuzzy
+msgid "CM sharpness"
+msgstr "Terävyys"
 
-#: src/pentaxmn.cpp:343
-msgid "Rio de Janeiro"
+#: src/olympusmn.cpp:1091
+msgid "Unknown OlympusRi tag"
 msgstr ""
 
-#: src/pentaxmn.cpp:344
-msgid "Madrid"
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
+msgid "User-Selected"
 msgstr ""
 
-#: src/pentaxmn.cpp:345
-msgid "London"
+#: src/olympusmn.cpp:1115
+msgid "Auto-Override"
 msgstr ""
 
-#: src/pentaxmn.cpp:346
-msgid "Paris"
+#: src/olympusmn.cpp:1151
+msgid "Fast"
 msgstr ""
 
-#: src/pentaxmn.cpp:347
-msgid "Milan"
+#: src/olympusmn.cpp:1208
+msgid "3000 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:348
-msgid "Rome"
+#: src/olympusmn.cpp:1209
+msgid "3700 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:349
-msgid "Berlin"
+#: src/olympusmn.cpp:1210
+msgid "4000 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:350
-msgid "Johannesburg"
+#: src/olympusmn.cpp:1211
+msgid "4500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:351
-msgid "Istanbul"
+#: src/olympusmn.cpp:1212
+msgid "5500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:352
-msgid "Cairo"
+#: src/olympusmn.cpp:1213
+msgid "6500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:353
-msgid "Jerusalem"
+#: src/olympusmn.cpp:1214
+msgid "7500 Kelvin"
 msgstr ""
 
-#: src/pentaxmn.cpp:354
-msgid "Moscow"
+#: src/olympusmn.cpp:1220
+msgid "One-touch"
 msgstr ""
 
-#: src/pentaxmn.cpp:355
-msgid "Jeddah"
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:356
-msgid "Tehran"
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:357
-msgid "Dubai"
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:358
-msgid "Karachi"
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
 msgstr ""
 
-#: src/pentaxmn.cpp:359
-msgid "Kabul"
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
 msgstr ""
 
-#: src/pentaxmn.cpp:360
-msgid "Male"
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
 msgstr ""
 
-#: src/pentaxmn.cpp:361
-msgid "Delhi"
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:362
-msgid "Colombo"
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
 msgstr ""
 
-#: src/pentaxmn.cpp:363
-msgid "Kathmandu"
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:364
-msgid "Dacca"
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
 msgstr ""
 
-#: src/pentaxmn.cpp:365
-msgid "Yangon"
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
 msgstr ""
 
-#: src/pentaxmn.cpp:366
-msgid "Bangkok"
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
 msgstr ""
 
-#: src/pentaxmn.cpp:367
-msgid "Kuala Lumpur"
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:368
-msgid "Vientiane"
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
 msgstr ""
 
-#: src/pentaxmn.cpp:369
-msgid "Singapore"
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
 msgstr ""
 
-#: src/pentaxmn.cpp:370
-msgid "Phnom Penh"
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:371
-msgid "Ho Chi Minh"
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:372
-msgid "Jakarta"
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:373
-msgid "Hong Kong"
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:374
-msgid "Perth"
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
 msgstr ""
 
-#: src/pentaxmn.cpp:375
-msgid "Beijing"
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
 msgstr ""
 
-#: src/pentaxmn.cpp:376
-msgid "Shanghai"
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
 msgstr ""
 
-#: src/pentaxmn.cpp:377
-msgid "Manila"
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
 msgstr ""
 
-#: src/pentaxmn.cpp:378
-msgid "Taipei"
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:379
-msgid "Seoul"
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
 msgstr ""
 
-#: src/pentaxmn.cpp:380
-msgid "Adelaide"
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:381
-msgid "Tokyo"
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
 msgstr ""
 
-#: src/pentaxmn.cpp:382
-msgid "Guam"
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
 msgstr ""
 
-#: src/pentaxmn.cpp:383
-msgid "Sydney"
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:384
-msgid "Noumea"
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
 msgstr ""
 
-#: src/pentaxmn.cpp:385
-msgid "Wellington"
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
 msgstr ""
 
-#: src/pentaxmn.cpp:386
-msgid "Auckland"
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
 msgstr ""
 
-#: src/pentaxmn.cpp:387
-msgid "Lima"
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
 msgstr ""
 
-#: src/pentaxmn.cpp:388
-msgid "Dakar"
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:389
-msgid "Algiers"
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
 msgstr ""
 
-#: src/pentaxmn.cpp:390
-msgid "Helsinki"
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
 msgstr ""
 
-#: src/pentaxmn.cpp:391
-msgid "Athens"
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
 msgstr ""
 
-#: src/pentaxmn.cpp:392
-msgid "Nairobi"
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:393
-msgid "Amsterdam"
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
 msgstr ""
 
-#: src/pentaxmn.cpp:394
-msgid "Stockholm"
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:395
-msgid "Lisbon"
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
 msgstr ""
 
-#: src/pentaxmn.cpp:400
-msgid "Unprocessed"
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:401
-msgid "Digital Filter"
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
 msgstr ""
 
-#: src/pentaxmn.cpp:402
-msgid "Cropped"
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
 msgstr ""
 
-#: src/pentaxmn.cpp:404
-msgid "Frame Synthesis?"
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
-msgid "MTF Program"
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
 msgstr ""
 
-#: src/pentaxmn.cpp:416
-msgid "Night Scene Portrait"
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
 msgstr ""
 
-#: src/pentaxmn.cpp:417
-msgid "No Flash"
-msgstr "Ei salamaa"
-
-#: src/pentaxmn.cpp:420
-msgid "Surf & Snow"
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
 msgstr ""
 
-#: src/pentaxmn.cpp:423
-msgid "Kids"
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
 msgstr ""
 
-#: src/pentaxmn.cpp:428
-msgid "Auto PICT (Standard)"
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
 msgstr ""
 
-#: src/pentaxmn.cpp:429
-msgid "Auto PICT (Portrait)"
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
 msgstr ""
 
-#: src/pentaxmn.cpp:430
-msgid "Auto PICT (Landscape)"
-msgstr ""
+#: src/olympusmn.cpp:1386
+#, fuzzy
+msgid "Imager AF"
+msgstr "Kuvan koko"
 
-#: src/pentaxmn.cpp:431
-msgid "Auto PICT (Macro)"
+#: src/olympusmn.cpp:1387
+msgid "AF sensor"
 msgstr ""
 
-#: src/pentaxmn.cpp:432
-msgid "Auto PICT (Sport)"
-msgstr ""
+#: src/olympusmn.cpp:1433
+#, fuzzy
+msgid "Soft Focus"
+msgstr "Käytetty AF-piste"
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
-msgid "Green Mode"
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
 msgstr ""
 
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
-msgid "Shutter Speed Priority"
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
 msgstr ""
 
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
-msgid "Aperture Priority"
-msgstr ""
+#: src/olympusmn.cpp:1436
+#, fuzzy
+msgid "Light Tone"
+msgstr "Kuvalähde"
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
-msgid "Bulb"
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
 msgstr ""
 
-#: src/pentaxmn.cpp:442
-msgid "Hi-speed Program"
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
 msgstr ""
 
-#: src/pentaxmn.cpp:443
-msgid "DOF Program"
-msgstr ""
+#: src/olympusmn.cpp:1439
+#, fuzzy
+msgid "Diorama"
+msgstr "Panoraama"
 
-#: src/pentaxmn.cpp:448
-msgid "Program Tv Shift"
-msgstr ""
+#: src/olympusmn.cpp:1440
+#, fuzzy
+msgid "Cross Process"
+msgstr "Tarkennustapa"
 
-#: src/pentaxmn.cpp:449
-msgid "Program Av Shift"
-msgstr ""
+#: src/olympusmn.cpp:1441
+#, fuzzy
+msgid "Fish Eye"
+msgstr "Salaman tila"
 
-#: src/pentaxmn.cpp:452
-msgid "Aperture Priority (Off-Auto-Aperture)"
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
 msgstr ""
 
-#: src/pentaxmn.cpp:453
-msgid "Manual (Off-Auto-Aperture)"
+#: src/olympusmn.cpp:1489
+msgid "Left (or n/a)"
 msgstr ""
 
-#: src/pentaxmn.cpp:454
-msgid "Bulb (Off-Auto-Aperture)"
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
+msgid "Center (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:456
-msgid "Shutter Priority"
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
+msgid "Center (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:457
-msgid "Shutter & Aperture Priority AE"
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:458
-msgid "Shutter & Aperture Priority AE (1)"
+#: src/olympusmn.cpp:1504
+msgid "Top-center (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:459
-msgid "Sensitivity Priority AE"
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:460
-msgid "Sensitivity Priority AE (1)"
+#: src/olympusmn.cpp:1506
+msgid "Left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:461
-msgid "Flash X-Sync Speed AE"
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:462
-msgid "Flash X-Sync Speed AE (1)"
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:471
-msgid "Continuous (Hi)"
+#: src/olympusmn.cpp:1510
+msgid "Right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:472
-msgid "Burst"
+#: src/olympusmn.cpp:1511
+msgid "Bottom-left (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:473
-msgid "Self-timer (12 sec)"
+#: src/olympusmn.cpp:1512
+msgid "Bottom-center (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:474
-msgid "Self-timer (2 sec)"
+#: src/olympusmn.cpp:1513
+msgid "Bottom-right (horizontal)"
 msgstr ""
 
-#: src/pentaxmn.cpp:475
-msgid "Remote Control (3 sec)"
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:476
-msgid "Remote Control"
+#: src/olympusmn.cpp:1515
+msgid "Top-center (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:477
-msgid "Multiple Exposure"
-msgstr ""
+#: src/olympusmn.cpp:1516
+#, fuzzy
+msgid "Top-right (vertical)"
+msgstr "Omistusoikeus"
 
-#: src/pentaxmn.cpp:488
-msgid "M-42 or No Lens"
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:489
-msgid "K,M Lens"
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:490
-msgid "A Series Lens"
+#: src/olympusmn.cpp:1520
+msgid "Mid-right (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:625
-msgid "Bright"
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:628
-msgid "Vibrant"
+#: src/olympusmn.cpp:1522
+msgid "Bottom-left (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:641
-msgid "Weakest"
+#: src/olympusmn.cpp:1523
+msgid "Bottom-center (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:642
-msgid "Weak"
+#: src/olympusmn.cpp:1524
+msgid "Bottom-right (vertical)"
 msgstr ""
 
-#: src/pentaxmn.cpp:643
-msgid "Strong"
-msgstr ""
+#: src/olympusmn.cpp:1561
+#, fuzzy
+msgid "Single Target"
+msgstr "Tiedostonimi"
 
-#: src/pentaxmn.cpp:752
-msgid "No extended bracketing"
+#: src/olympusmn.cpp:1562
+msgid "All Target"
 msgstr ""
 
-#: src/pentaxmn.cpp:758
-msgid "WB-BA"
-msgstr ""
+#: src/olympusmn.cpp:1563
+#, fuzzy
+msgid "Dynamic Single Target"
+msgstr "Kameran asetukset"
 
-#: src/pentaxmn.cpp:761
-msgid "WB-GM"
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
+msgid "Very High"
 msgstr ""
 
-#: src/pentaxmn.cpp:773
-msgid "Unknown "
+#: src/panasonicmn.cpp:59
+msgid "Motion Picture"
 msgstr ""
 
-#: src/pentaxmn.cpp:786
-msgid "Pentax Makernote version"
+#: src/panasonicmn.cpp:67
+msgid "Halogen"
 msgstr ""
 
-#: src/pentaxmn.cpp:789
-msgid "Camera shooting mode"
+#: src/panasonicmn.cpp:79
+msgid "Auto, focus button"
 msgstr ""
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
-msgid "Resolution of a preview image"
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
+msgid "Auto, continuous"
 msgstr ""
 
-#: src/pentaxmn.cpp:794
-msgid "Length of a preview image"
+#: src/panasonicmn.cpp:95
+msgid "Tele-macro"
 msgstr ""
 
-#: src/pentaxmn.cpp:795
-msgid "Size of an IFD containing a preview image"
+#: src/panasonicmn.cpp:103
+msgid "Scenery"
 msgstr ""
 
-#: src/pentaxmn.cpp:800
-msgid "Model identification"
-msgstr ""
+#: src/panasonicmn.cpp:108
+#, fuzzy
+msgid "Shutter-speed priority"
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/pentaxmn.cpp:801
-msgid "Pentax model idenfication"
-msgstr ""
+#: src/panasonicmn.cpp:112
+#, fuzzy
+msgid "Movie preview"
+msgstr "Esikatselu"
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
-msgid "Date"
-msgstr ""
+#: src/panasonicmn.cpp:113
+#, fuzzy
+msgid "Panning"
+msgstr "Varoitus"
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
-msgid "Time"
+#: src/panasonicmn.cpp:114
+msgid "Simple"
 msgstr ""
 
-#: src/pentaxmn.cpp:810
-msgid "Image quality settings"
+#: src/panasonicmn.cpp:115
+#, fuzzy
+msgid "Color effects"
+msgstr "Väriavaruus"
+
+#: src/panasonicmn.cpp:119
+msgid "Night scenery"
 msgstr ""
 
-#: src/pentaxmn.cpp:813
-msgid "Image size settings"
+#: src/panasonicmn.cpp:121
+msgid "Baby"
 msgstr ""
 
-#: src/pentaxmn.cpp:817
-msgid "Flash mode settings"
+#: src/panasonicmn.cpp:122
+msgid "Soft skin"
 msgstr ""
 
-#: src/pentaxmn.cpp:820
-msgid "Focus mode settings"
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
+msgid "Candlelight"
 msgstr ""
 
-#: src/pentaxmn.cpp:823
-msgid "Selected AF point"
+#: src/panasonicmn.cpp:124
+msgid "Starry night"
 msgstr ""
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
-msgid "F-Number"
+#: src/panasonicmn.cpp:125
+msgid "High sensitivity"
 msgstr ""
 
-#: src/pentaxmn.cpp:832
-msgid "ISO sensitivity"
+#: src/panasonicmn.cpp:126
+#, fuzzy
+msgid "Panorama assist"
+msgstr "Panoraama"
+
+#: src/panasonicmn.cpp:129
+msgid "Aerial photo"
 msgstr ""
 
-#: src/pentaxmn.cpp:833
-msgid "ISO sensitivity settings"
+#: src/panasonicmn.cpp:132
+msgid "Intelligent ISO"
 msgstr ""
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
-msgid "MeteringMode"
+#: src/panasonicmn.cpp:133
+msgid "High speed continuous shooting"
 msgstr ""
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
-msgid "AutoBracketing"
+#: src/panasonicmn.cpp:134
+msgid "Intelligent auto"
 msgstr ""
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
-msgid "White ballance"
+#: src/panasonicmn.cpp:146
+msgid "Warm"
 msgstr ""
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
-msgid "White ballance mode"
+#: src/panasonicmn.cpp:147
+msgid "Cool"
 msgstr ""
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
-msgid "FocalLength"
-msgstr "Polttoväli"
+#: src/panasonicmn.cpp:155
+#, fuzzy
+msgid "Low/High quality"
+msgstr "Kuvan laatu"
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
-msgid "Location"
+#: src/panasonicmn.cpp:156
+msgid "Infinite"
 msgstr ""
 
-#: src/pentaxmn.cpp:869
-msgid "Hometown"
-msgstr ""
+#: src/panasonicmn.cpp:164
+#, fuzzy
+msgid "Medium low"
+msgstr "Keskikokoinen"
 
-#: src/pentaxmn.cpp:875
-msgid "Hometown DST"
-msgstr ""
+#: src/panasonicmn.cpp:165
+#, fuzzy
+msgid "Medium high"
+msgstr "Keskikokoinen"
 
-#: src/pentaxmn.cpp:876
-msgid "Whether day saving time is active in home town"
+#: src/panasonicmn.cpp:175
+msgid "Low (-1)"
 msgstr ""
 
-#: src/pentaxmn.cpp:878
-msgid "Destination DST"
+#: src/panasonicmn.cpp:176
+msgid "High (+1)"
 msgstr ""
 
-#: src/pentaxmn.cpp:879
-msgid "Whether day saving time is active in destination"
+#: src/panasonicmn.cpp:177
+msgid "Lowest (-2)"
 msgstr ""
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
-msgid "DSPFirmwareVersion"
+#: src/panasonicmn.cpp:178
+msgid "Highest (+2)"
 msgstr ""
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
-msgid "CPUFirmwareVersion"
+#: src/panasonicmn.cpp:184
+msgid "10s"
 msgstr ""
 
-#: src/pentaxmn.cpp:891
-msgid "Light value"
+#: src/panasonicmn.cpp:185
+msgid "2s"
 msgstr ""
 
-#: src/pentaxmn.cpp:892
-msgid "Camera calculated light value, includes exposure compensation"
+#: src/panasonicmn.cpp:205
+msgid "EX optics"
 msgstr ""
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
-msgid "Preview image borders"
+#: src/panasonicmn.cpp:212
+msgid "Telephoto"
 msgstr ""
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
-msgid "Sensitivity adjust"
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
+msgid "Home"
 msgstr ""
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
-msgid "Digital filter"
+#: src/panasonicmn.cpp:225
+msgid "Standard (color)"
 msgstr ""
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-msgid "Temperature"
+#: src/panasonicmn.cpp:226
+msgid "Dynamic (color)"
 msgstr ""
 
-#: src/pentaxmn.cpp:923
-msgid "Camera temperature"
+#: src/panasonicmn.cpp:227
+msgid "Nature (color)"
 msgstr ""
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
-msgid "Image tone"
+#: src/panasonicmn.cpp:228
+msgid "Smooth (color)"
 msgstr ""
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
-msgid "Colort temperature"
+#: src/panasonicmn.cpp:229
+msgid "Standard (B&W)"
 msgstr ""
 
-#: src/pentaxmn.cpp:943
-msgid "Shake reduction"
+#: src/panasonicmn.cpp:230
+msgid "Dynamic (B&W)"
 msgstr ""
 
-#: src/pentaxmn.cpp:944
-msgid "Shake reduction information"
+#: src/panasonicmn.cpp:231
+msgid "Smooth (B&W)"
 msgstr ""
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
-msgid "Dynamic range expansion"
+#: src/panasonicmn.cpp:245
+msgid "Audio"
 msgstr ""
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
-msgid "High ISO noise reduction"
-msgstr ""
+#: src/panasonicmn.cpp:248
+#, fuzzy
+msgid "White balance adjustment"
+msgstr " "
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
-msgid "Black point"
-msgstr ""
+#: src/panasonicmn.cpp:249
+#, fuzzy
+msgid "FlashBias"
+msgstr "Salamavalotuksen korjaus"
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
-msgid "White point"
-msgstr ""
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
+#, fuzzy
+msgid "Exif version"
+msgstr "Firmwaren versio"
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
-msgid "ShotInfo"
-msgstr ""
+#: src/panasonicmn.cpp:253
+#, fuzzy
+msgid "Color Effect"
+msgstr "Väriavaruus"
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
-msgid "AEInfo"
-msgstr ""
+#: src/panasonicmn.cpp:253
+#, fuzzy
+msgid "Color effect"
+msgstr "Väriavaruus"
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
-msgid "LensInfo"
+#: src/panasonicmn.cpp:254
+msgid ""
+"Time in 1/100 s from when the camera was powered on to when the image is "
+"written to memory card"
 msgstr ""
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
-msgid "FlashInfo"
-msgstr ""
+#: src/panasonicmn.cpp:255
+#, fuzzy
+msgid "Burst Mode"
+msgstr "Makrotila"
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
-msgid "AEMeteringSegments"
-msgstr ""
+#: src/panasonicmn.cpp:255
+#, fuzzy
+msgid "Burst mode"
+msgstr "Makrotila"
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
-msgid "FlashADump"
+#: src/panasonicmn.cpp:258
+msgid "NoiseReduction"
 msgstr ""
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
-msgid "FlashBDump"
-msgstr ""
+#: src/panasonicmn.cpp:259
+#, fuzzy
+msgid "Self Timer"
+msgstr "Sarjanumero"
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
-msgid "WB_RGGBLevelsDaylight"
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+msgid "Baby Age"
 msgstr ""
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
-msgid "WB_RGGBLevelsShade"
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+msgid "Baby (or pet) age"
 msgstr ""
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
-msgid "WB_RGGBLevelsCloudy"
+#: src/panasonicmn.cpp:265
+msgid "Optical Zoom Mode"
 msgstr ""
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
-msgid "WB_RGGBLevelsTungsten"
+#: src/panasonicmn.cpp:265
+msgid "Optical zoom mode"
 msgstr ""
 
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
-msgid "WB_RGGBLevelsFluorescentD"
+#: src/panasonicmn.cpp:266
+msgid "Conversion Lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
-msgid "WB_RGGBLevelsFluorescentN"
+#: src/panasonicmn.cpp:266
+msgid "Conversion lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
-msgid "WB_RGGBLevelsFluorescentW"
+#: src/panasonicmn.cpp:267
+msgid "Travel Day"
 msgstr ""
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
-msgid "WB_RGGBLevelsFlash"
+#: src/panasonicmn.cpp:267
+msgid "Travel day"
 msgstr ""
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
-msgid "CameraInfo"
+#: src/panasonicmn.cpp:269
+msgid "World Time Location"
 msgstr ""
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
-msgid "BatteryInfo"
+#: src/panasonicmn.cpp:269
+msgid "World time location"
 msgstr ""
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
-msgid "AFInfo"
-msgstr ""
+#: src/panasonicmn.cpp:270
+#, fuzzy
+msgid "Program ISO"
+msgstr "Ohjelma"
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
-msgid "ColorInfo"
+#: src/panasonicmn.cpp:274
+msgid "WB Adjust AB"
 msgstr ""
 
-#: src/pentaxmn.cpp:1023
-msgid "Unknown PentaxMakerNote tag"
+#: src/panasonicmn.cpp:274
+msgid "WB adjust AB. Positive is a shift toward blue."
 msgstr ""
 
-#: src/properties.cpp:92
-msgid "Dublin Core schema"
+#: src/panasonicmn.cpp:275
+msgid "WB Adjust GM"
 msgstr ""
 
-#: src/properties.cpp:93
-msgid "digiKam Photo Management schema"
+#: src/panasonicmn.cpp:275
+msgid "WBAdjustGM. Positive is a shift toward green."
 msgstr ""
 
-#: src/properties.cpp:94
-msgid "XMP Basic schema"
+#: src/panasonicmn.cpp:278
+#, fuzzy
+msgid "Accessory Type"
+msgstr "Linssin tyyppi"
+
+#: src/panasonicmn.cpp:278
+#, fuzzy
+msgid "Accessory type"
+msgstr "Linssin tyyppi"
+
+#: src/panasonicmn.cpp:281
+#, fuzzy
+msgid "MakerNote Version"
+msgstr "Firmwaren versio"
+
+#: src/panasonicmn.cpp:281
+#, fuzzy
+msgid "MakerNote version"
+msgstr "Firmwaren versio"
+
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
+msgid "WB Red Level"
 msgstr ""
 
-#: src/properties.cpp:95
-msgid "XMP Rights Management schema"
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
+msgid "WB red level"
 msgstr ""
 
-#: src/properties.cpp:96
-msgid "XMP Media Management schema"
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
+msgid "WB Green Level"
 msgstr ""
 
-#: src/properties.cpp:97
-msgid "XMP Basic Job Ticket schema"
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
+msgid "WB green level"
 msgstr ""
 
-#: src/properties.cpp:98
-msgid "XMP Paged-Text schema"
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
+msgid "WB Blue Level"
 msgstr ""
 
-#: src/properties.cpp:99
-msgid "XMP Dynamic Media schema"
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
+msgid "WB blue level"
 msgstr ""
 
-#: src/properties.cpp:100
-msgid "Microsoft Photo schema"
+#: src/panasonicmn.cpp:288
+msgid "Unknown PanasonicMakerNote tag"
 msgstr ""
 
-#: src/properties.cpp:101
-msgid "Adobe PDF schema"
+#: src/panasonicmn.cpp:305
+msgid "Spot mode on"
 msgstr ""
 
-#: src/properties.cpp:102
-msgid "Adobe photoshop schema"
+#: src/panasonicmn.cpp:306
+msgid "Spot mode off or 3-area (high speed)"
 msgstr ""
 
-#: src/properties.cpp:103
-msgid "Camera Raw schema"
+#: src/panasonicmn.cpp:307
+msgid "Spot focussing"
 msgstr ""
 
-#: src/properties.cpp:104
-msgid "Exif Schema for TIFF Properties"
+#: src/panasonicmn.cpp:308
+msgid "5-area"
 msgstr ""
 
-#: src/properties.cpp:105
-msgid "Exif schema for Exif-specific Properties"
+#: src/panasonicmn.cpp:309
+msgid "1-area"
 msgstr ""
 
-#: src/properties.cpp:106
-msgid "Exif schema for Additional Exif Properties"
+#: src/panasonicmn.cpp:310
+msgid "1-area (high speed)"
 msgstr ""
 
-#: src/properties.cpp:107
-msgid "IPTC Core schema"
+#: src/panasonicmn.cpp:311
+msgid "3-area (auto)"
 msgstr ""
 
-#: src/properties.cpp:109
-msgid "IPTC Extension schema"
+#: src/panasonicmn.cpp:312
+msgid "3-area (left)"
 msgstr ""
 
-#: src/properties.cpp:111
-msgid "PLUS License Data Format schema"
+#: src/panasonicmn.cpp:313
+msgid "3-area (center)"
 msgstr ""
 
-#: src/properties.cpp:114
-msgid "Colorant structure"
+#: src/panasonicmn.cpp:314
+msgid "3-area (right)"
 msgstr ""
 
-#: src/properties.cpp:115
-msgid "Dimensions structure"
+#: src/panasonicmn.cpp:326
+msgid " EV"
 msgstr ""
 
-#: src/properties.cpp:116
-msgid "Font structure"
-msgstr ""
+#: src/panasonicmn.cpp:335
+#, fuzzy
+msgid "Panasonic raw version"
+msgstr "Ohjelman versio"
 
-#: src/properties.cpp:117
-msgid "Thumbnail structure"
-msgstr ""
+#: src/panasonicmn.cpp:336
+#, fuzzy
+msgid "Sensor Width"
+msgstr "Linssin tyyppi"
 
-#: src/properties.cpp:118
-msgid "Resource Event structure"
-msgstr ""
+#: src/panasonicmn.cpp:336
+#, fuzzy
+msgid "Sensor width"
+msgstr "Linssin tyyppi"
 
-#: src/properties.cpp:119
-msgid "ResourceRef structure"
-msgstr ""
+#: src/panasonicmn.cpp:337
+#, fuzzy
+msgid "Sensor Height"
+msgstr "Keskustaa painottava"
 
-#: src/properties.cpp:120
-msgid "Version structure"
-msgstr ""
+#: src/panasonicmn.cpp:337
+#, fuzzy
+msgid "Sensor height"
+msgstr "Keskustaa painottava"
 
-#: src/properties.cpp:121
-msgid "Basic Job/Workflow structure"
+#: src/panasonicmn.cpp:338
+msgid "Sensor Top Border"
 msgstr ""
 
-#: src/properties.cpp:124
-msgid "Qualifier for xmp:Identifier"
+#: src/panasonicmn.cpp:338
+msgid "Sensor top border"
 msgstr ""
 
-#: src/properties.cpp:128
-msgid "Contributor"
+#: src/panasonicmn.cpp:339
+msgid "Sensor Left Border"
 msgstr ""
 
-#: src/properties.cpp:128
-msgid "Contributors to the resource (other than the authors)."
+#: src/panasonicmn.cpp:339
+msgid "Sensor left border"
 msgstr ""
 
-#: src/properties.cpp:129
-msgid "Coverage"
+#: src/panasonicmn.cpp:342
+msgid "Red balance (found in Digilux 2 RAW images)"
 msgstr ""
 
-#: src/properties.cpp:129
-msgid ""
-"The spatial or temporal topic of the resource, the spatial applicability of "
-"the resource, or the jurisdiction under which the resource is relevant."
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
+msgid "Manufacturer"
+msgstr "Valmistaja"
+
+#: src/panasonicmn.cpp:349
+msgid "The manufacturer of the recording equipment"
 msgstr ""
 
-#: src/properties.cpp:131
-msgid "Creator"
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
+msgid "Model"
+msgstr "Malli"
+
+#: src/panasonicmn.cpp:350
+msgid "The model name or model number of the equipment"
 msgstr ""
 
-#: src/properties.cpp:131
-msgid ""
-"The authors of the resource (listed in order of precedence, if significant)."
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
+msgid "Strip Offsets"
 msgstr ""
 
-#: src/properties.cpp:132
-msgid "Date(s) that something interesting happened to the resource."
+#: src/panasonicmn.cpp:351
+msgid "Strip offsets"
 msgstr ""
 
-#: src/properties.cpp:133
-msgid ""
-"A textual description of the content of the resource. Multiple values may be "
-"present for different languages."
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
+msgid "Orientation"
 msgstr ""
 
-#: src/properties.cpp:135
-msgid "Format"
+#: src/panasonicmn.cpp:353
+msgid "Rows Per Strip"
 msgstr ""
 
-#: src/properties.cpp:135
-msgid ""
-"The file format used when saving the resource. Tools and applications should "
-"set this property to the save format of the data. It may include appropriate "
-"qualifiers."
+#: src/panasonicmn.cpp:353
+msgid "The number of rows per strip"
 msgstr ""
 
-#: src/properties.cpp:137 src/properties.cpp:180
-msgid "Identifier"
+#: src/panasonicmn.cpp:354
+#, fuzzy
+msgid "Strip Byte Counts"
+msgstr "Valotusajan esivalinta (Tv)"
+
+#: src/panasonicmn.cpp:354
+#, fuzzy
+msgid "Strip byte counts"
+msgstr "Valotusajan esivalinta (Tv)"
+
+#: src/panasonicmn.cpp:355
+msgid "Raw Data Offset"
 msgstr ""
 
-#: src/properties.cpp:137
-msgid ""
-"Unique identifier of the resource. Recommended best practice is to identify "
-"the resource by means of a string conforming to a formal identification "
-"system."
+#: src/panasonicmn.cpp:355
+msgid "Raw data offset"
 msgstr ""
 
-#: src/properties.cpp:139
-msgid "An unordered array specifying the languages used in the resource."
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
+msgid "Exif IFD Pointer"
 msgstr ""
 
-#: src/properties.cpp:140
-msgid "Publisher"
+#: src/panasonicmn.cpp:356
+msgid "A pointer to the Exif IFD"
 msgstr ""
 
-#: src/properties.cpp:140
-msgid ""
-"An entity responsible for making the resource available. Examples of a "
-"Publisher include a person, an organization, or a service. Typically, the "
-"name of a Publisher should be used to indicate the entity."
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
+msgid "GPS Info IFD Pointer"
 msgstr ""
 
-#: src/properties.cpp:143
-msgid "Relation"
+#: src/panasonicmn.cpp:357
+msgid "A pointer to the GPS Info IFD"
 msgstr ""
 
-#: src/properties.cpp:143
-msgid ""
-"Relationships to other documents. Recommended best practice is to identify "
-"the related resource by means of a string conforming to a formal "
-"identification system."
+#: src/panasonicmn.cpp:359
+msgid "Unknown PanasonicRaw tag"
 msgstr ""
 
-#: src/properties.cpp:145
-msgid "Rights"
+#: src/pentaxmn.cpp:57
+msgid "Night-Scene"
 msgstr ""
 
-#: src/properties.cpp:145
-msgid ""
-"Informal rights statement, selected by language. Typically, rights "
-"information includes a statement about various property rights associated "
-"with the resource, including intellectual property rights."
+#: src/pentaxmn.cpp:63
+msgid "Optio 330/430"
 msgstr ""
 
-#: src/properties.cpp:148
-msgid "Unique identifier of the work from which this resource was derived."
+#: src/pentaxmn.cpp:64
+msgid "Optio 230"
 msgstr ""
 
-#: src/properties.cpp:149
-msgid ""
-"An unordered array of descriptive phrases or keywords that specify the topic "
-"of the content of the resource."
+#: src/pentaxmn.cpp:65
+msgid "Optio 330GS"
 msgstr ""
 
-#: src/properties.cpp:151
-msgid "Title"
+#: src/pentaxmn.cpp:66
+msgid "Optio 450/550"
 msgstr ""
 
-#: src/properties.cpp:151
-msgid ""
-"The title of the document, or the name given to the resource. Typically, it "
-"will be a name by which the resource is formally known."
+#: src/pentaxmn.cpp:67
+msgid "Optio S"
 msgstr ""
 
-#: src/properties.cpp:153
-msgid "Type"
+#: src/pentaxmn.cpp:68
+msgid "*ist D"
 msgstr ""
 
-#: src/properties.cpp:153
-msgid "A document type; for example, novel, poem, or working paper."
+#: src/pentaxmn.cpp:69
+msgid "Optio 33L"
 msgstr ""
 
-#: src/properties.cpp:159
-msgid "Tags List"
+#: src/pentaxmn.cpp:70
+msgid "Optio 33LF"
 msgstr ""
 
-#: src/properties.cpp:159
-msgid ""
-"The list of complete tags path as string. The path hierarchy is separated by "
-"'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
+#: src/pentaxmn.cpp:71
+msgid "Optio 33WR/43WR/555"
 msgstr ""
 
-#: src/properties.cpp:160
-msgid "Captions Author Names"
+#: src/pentaxmn.cpp:72
+msgid "Optio S4"
 msgstr ""
 
-#: src/properties.cpp:160
-msgid ""
-"The list of all captions author names for each language alternative captions "
-"set in standard XMP tags."
+#: src/pentaxmn.cpp:73
+msgid "Optio MX"
 msgstr ""
 
-#: src/properties.cpp:161
-msgid "Captions Date Time Stamps"
+#: src/pentaxmn.cpp:74
+msgid "Optio S40"
 msgstr ""
 
-#: src/properties.cpp:161
-msgid ""
-"The list of all captions date time stamps for each language alternative "
-"captions set in standard XMP tags."
+#: src/pentaxmn.cpp:75
+msgid "Optio S4i"
 msgstr ""
 
-#: src/properties.cpp:168
-msgid "Advisory"
+#: src/pentaxmn.cpp:76
+msgid "Optio 30"
 msgstr ""
 
-#: src/properties.cpp:168
-msgid ""
-"An unordered array specifying properties that were edited outside the "
-"authoring application. Each item should contain a single namespace and XPath "
-"separated by one ASCII space (U+0020)."
+#: src/pentaxmn.cpp:77
+msgid "Optio S30"
 msgstr ""
 
-#: src/properties.cpp:171
-msgid "Base URL"
+#: src/pentaxmn.cpp:78
+msgid "Optio 750Z"
 msgstr ""
 
-#: src/properties.cpp:171
-msgid ""
-"The base URL for relative URLs in the document content. If this document "
-"contains Internet links, and those links are relative, they are relative to "
-"this base URL. This property provides a standard way for embedded relative "
-"URLs to be interpreted by tools. Web authoring tools should set the value "
-"based on their notion of where URLs will be interpreted."
+#: src/pentaxmn.cpp:79
+msgid "Optio SV"
 msgstr ""
 
-#: src/properties.cpp:176
-msgid "Create Date"
+#: src/pentaxmn.cpp:80
+msgid "Optio SVi"
 msgstr ""
 
-#: src/properties.cpp:176
-msgid "The date and time the resource was originally created."
+#: src/pentaxmn.cpp:81
+msgid "Optio X"
 msgstr ""
 
-#: src/properties.cpp:177
-msgid "Creator Tool"
+#: src/pentaxmn.cpp:82
+msgid "Optio S5i"
 msgstr ""
 
-#: src/properties.cpp:177
-msgid ""
-"The name of the first known tool used to create the resource. If history is "
-"present in the metadata, this value should be equivalent to that of xmpMM:"
-"History's softwareAgent property."
+#: src/pentaxmn.cpp:83
+msgid "Optio S50"
 msgstr ""
 
-#: src/properties.cpp:180
-msgid ""
-"An unordered array of text strings that unambiguously identify the resource "
-"within a given context. An array item may be qualified with xmpidq:Scheme to "
-"denote the formal identification system to which that identifier conforms. "
-"Note: The dc:identifier property is not used because it lacks a defined "
-"scheme qualifier and has been defined in the XMP Specification as a simple "
-"(single-valued) property."
+#: src/pentaxmn.cpp:84
+msgid "*ist DS"
 msgstr ""
 
-#: src/properties.cpp:185
-msgid "Label"
+#: src/pentaxmn.cpp:85
+msgid "Optio MX4"
 msgstr ""
 
-#: src/properties.cpp:185
-msgid ""
-"A word or short phrase that identifies a document as a member of a user-"
-"defined collection. Used to organize documents in a file browser."
+#: src/pentaxmn.cpp:86
+msgid "Optio S5n"
 msgstr ""
 
-#: src/properties.cpp:187
-msgid "Metadata Date"
+#: src/pentaxmn.cpp:87
+msgid "Optio WP"
 msgstr ""
 
-#: src/properties.cpp:187
-msgid ""
-"The date and time that any metadata for this resource was last changed. It "
-"should be the same as or more recent than xmp:ModifyDate."
+#: src/pentaxmn.cpp:88
+msgid "Optio S55"
 msgstr ""
 
-#: src/properties.cpp:189
-msgid "Modify Date"
+#: src/pentaxmn.cpp:89
+msgid "Optio S5z"
 msgstr ""
 
-#: src/properties.cpp:189
-msgid ""
-"The date and time the resource was last modified. Note: The value of this "
-"property is not necessarily the same as the file's system modification date "
-"because it is set before the file is saved."
+#: src/pentaxmn.cpp:90
+msgid "*ist DL"
 msgstr ""
 
-#: src/properties.cpp:192
-msgid "Nickname"
+#: src/pentaxmn.cpp:91
+msgid "Optio S60"
 msgstr ""
 
-#: src/properties.cpp:192
-msgid "A short informal name for the resource."
+#: src/pentaxmn.cpp:92
+msgid "Optio S45"
 msgstr ""
 
-#: src/properties.cpp:193
-msgid "Rating"
+#: src/pentaxmn.cpp:93
+msgid "Optio S6"
 msgstr ""
 
-#: src/properties.cpp:193
-msgid ""
-"A number that indicates a document's status relative to other documents, "
-"used to organize documents in a file browser. Values are user-defined within "
-"an application-defined range."
+#: src/pentaxmn.cpp:94
+msgid "Optio WPi"
 msgstr ""
 
-#: src/properties.cpp:196
-msgid "Thumbnails"
-msgstr "Näytekuvat"
+#: src/pentaxmn.cpp:95
+msgid "BenQ DC X600"
+msgstr ""
 
-#: src/properties.cpp:196
-msgid ""
-"An alternative array of thumbnail images for a file, which can differ in "
-"characteristics such as size or image encoding."
+#: src/pentaxmn.cpp:96
+msgid "*ist DS2"
 msgstr ""
 
-#: src/properties.cpp:203
-msgid "Certificate"
+#: src/pentaxmn.cpp:97
+msgid "Samsung GX-1S"
 msgstr ""
 
-#: src/properties.cpp:203
-msgid "Online rights management certificate."
+#: src/pentaxmn.cpp:98
+msgid "Optio A10"
 msgstr ""
 
-#: src/properties.cpp:204
-msgid "Marked"
+#: src/pentaxmn.cpp:99
+msgid "*ist DL2"
 msgstr ""
 
-#: src/properties.cpp:204
-msgid "Indicates that this is a rights-managed resource."
+#: src/pentaxmn.cpp:100
+msgid "Samsung GX-1L"
 msgstr ""
 
-#: src/properties.cpp:205
-msgid "Owner"
+#: src/pentaxmn.cpp:101
+msgid "K100D"
 msgstr ""
 
-#: src/properties.cpp:205
-msgid "An unordered array specifying the legal owner(s) of a resource."
+#: src/pentaxmn.cpp:102
+msgid "K110D"
 msgstr ""
 
-#: src/properties.cpp:206
-msgid "Usage Terms"
+#: src/pentaxmn.cpp:103
+msgid "K100D Super"
 msgstr ""
 
-#: src/properties.cpp:206
-msgid "Text instructions on how a resource can be legally used."
+#: src/pentaxmn.cpp:104
+msgid "Optio T10/T20"
 msgstr ""
 
-#: src/properties.cpp:207
-msgid "Web Statement"
+#: src/pentaxmn.cpp:105
+msgid "Optio W10"
 msgstr ""
 
-#: src/properties.cpp:207
-msgid ""
-"The location of a web page describing the owner and/or rights statement for "
-"this resource."
+#: src/pentaxmn.cpp:106
+msgid "Optio M10"
 msgstr ""
 
-#: src/properties.cpp:213
-msgid "Derived From"
+#: src/pentaxmn.cpp:107
+msgid "K10D"
 msgstr ""
 
-#: src/properties.cpp:213
-msgid ""
-"A reference to the original document from which this one is derived. It is a "
-"minimal reference; missing components can be assumed to be unchanged. For "
-"example, a new version might only need to specify the instance ID and "
-"version number of the previous version, or a rendition might only need to "
-"specify the instance ID and rendition class of the original."
+#: src/pentaxmn.cpp:108
+msgid "Samsung GX10"
 msgstr ""
 
-#: src/properties.cpp:218
-msgid "Document ID"
+#: src/pentaxmn.cpp:109
+msgid "Optio S7"
 msgstr ""
 
-#: src/properties.cpp:218
-msgid ""
-"The common identifier for all versions and renditions of a document. It "
-"should be based on a UUID; see Document and Instance IDs below."
+#: src/pentaxmn.cpp:110
+msgid "Optio L20"
 msgstr ""
 
-#: src/properties.cpp:220
-msgid "History"
+#: src/pentaxmn.cpp:111
+msgid "Optio M20"
 msgstr ""
 
-#: src/properties.cpp:220
-msgid ""
-"An ordered array of high-level user actions that resulted in this resource. "
-"It is intended to give human readers a general indication of the steps taken "
-"to make the changes from the previous version to this one. The list should "
-"be at an abstract level; it is not intended to be an exhaustive keystroke or "
-"other detailed history."
+#: src/pentaxmn.cpp:112
+msgid "Optio W20"
 msgstr ""
 
-#: src/properties.cpp:224
-msgid "Instance ID"
+#: src/pentaxmn.cpp:113
+msgid "Optio A20"
 msgstr ""
 
-#: src/properties.cpp:224
-msgid ""
-"An identifier for a specific incarnation of a document, updated each time a "
-"file is saved. It should be based on a UUID; see Document and Instance IDs "
-"below."
+#: src/pentaxmn.cpp:114
+msgid "Optio M30"
 msgstr ""
 
-#: src/properties.cpp:226
-msgid "Managed From"
+#: src/pentaxmn.cpp:115
+msgid "Optio E30"
 msgstr ""
 
-#: src/properties.cpp:226
-msgid ""
-"A reference to the document as it was prior to becoming managed. It is set "
-"when a managed document is introduced to an asset management system that "
-"does not currently own it. It may or may not include references to different "
-"management systems."
+#: src/pentaxmn.cpp:116
+msgid "Optio E35"
 msgstr ""
 
-#: src/properties.cpp:229
-msgid "Manager"
+#: src/pentaxmn.cpp:117
+msgid "Optio T30"
 msgstr ""
 
-#: src/properties.cpp:229
-msgid ""
-"The name of the asset management system that manages this resource. Along "
-"with xmpMM: ManagerVariant, it tells applications which asset management "
-"system to contact concerning this document."
+#: src/pentaxmn.cpp:118
+msgid "Optio W30"
 msgstr ""
 
-#: src/properties.cpp:232
-msgid "Manage To"
+#: src/pentaxmn.cpp:119
+msgid "Optio A30"
 msgstr ""
 
-#: src/properties.cpp:232
-msgid ""
-"A URI identifying the managed resource to the asset management system; the "
-"presence of this property is the formal indication that this resource is "
-"managed. The form and content of this URI is private to the asset management "
-"system."
+#: src/pentaxmn.cpp:120
+msgid "Optio E40"
 msgstr ""
 
-#: src/properties.cpp:235
-msgid "Manage UI"
+#: src/pentaxmn.cpp:121
+msgid "Optio M40"
 msgstr ""
 
-#: src/properties.cpp:235
-msgid ""
-"A URI that can be used to access information about the managed resource "
-"through a web browser. It might require a custom browser plug-in."
+#: src/pentaxmn.cpp:122
+msgid "Optio Z10"
 msgstr ""
 
-#: src/properties.cpp:237
-msgid "Manager Variant"
+#: src/pentaxmn.cpp:123
+msgid "K20D"
 msgstr ""
 
-#: src/properties.cpp:237
-msgid ""
-"Specifies a particular variant of the asset management system. The format of "
-"this property is private to the specific asset management system."
+#: src/pentaxmn.cpp:124
+msgid "Samsung GX20"
 msgstr ""
 
-#: src/properties.cpp:239
-msgid "Rendition Class"
+#: src/pentaxmn.cpp:125
+msgid "Optio S10"
 msgstr ""
 
-#: src/properties.cpp:239
-msgid ""
-"The rendition class name for this resource. This property should be absent "
-"or set to default for a document version that is not a derived rendition."
+#: src/pentaxmn.cpp:126
+msgid "Optio A40"
 msgstr ""
 
-#: src/properties.cpp:241
-msgid "Rendition Params"
+#: src/pentaxmn.cpp:127
+msgid "Optio V10"
 msgstr ""
 
-#: src/properties.cpp:241
-msgid ""
-"Can be used to provide additional rendition parameters that are too complex "
-"or verbose to encode in xmpMM: RenditionClass."
+#: src/pentaxmn.cpp:128
+msgid "K200D"
 msgstr ""
 
-#: src/properties.cpp:243
-msgid "Version ID"
+#: src/pentaxmn.cpp:129
+msgid "Optio S12"
 msgstr ""
 
-#: src/properties.cpp:243
-msgid ""
-"The document version identifier for this resource. Each version of a "
-"document gets a new identifier, usually simply by incrementing integers 1, "
-"2, 3 . . . and so on. Media management systems can have other conventions or "
-"support branching which requires a more complex scheme."
+#: src/pentaxmn.cpp:130
+msgid "Optio E50"
 msgstr ""
 
-#: src/properties.cpp:247
-msgid "Versions"
+#: src/pentaxmn.cpp:131
+msgid "Optio M50"
 msgstr ""
 
-#: src/properties.cpp:247
-msgid ""
-"The version history associated with this resource. Entry [1] is the oldest "
-"known version for this document, entry [last()] is the most recent version. "
-"Typically, a media management system would fill in the version information "
-"in the metadata on check-in. It is not guaranteed that a complete history  "
-"versions from the first to this one will be present in the xmpMM:Versions "
-"property. Interior version information can be compressed or eliminated and "
-"the version history can be truncated at some point."
+#: src/pentaxmn.cpp:132
+msgid "Optio V20"
 msgstr ""
 
-#: src/properties.cpp:253
-msgid "Last URL"
+#: src/pentaxmn.cpp:133
+msgid "Optio W60"
 msgstr ""
 
-#: src/properties.cpp:253
-msgid "Deprecated for privacy protection."
+#: src/pentaxmn.cpp:134
+msgid "Optio M60"
 msgstr ""
 
-#: src/properties.cpp:254
-msgid "Rendition Of"
+#: src/pentaxmn.cpp:135
+msgid "Optio E60"
 msgstr ""
 
-#: src/properties.cpp:254
-msgid ""
-"Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
-"which this is a rendition."
+#: src/pentaxmn.cpp:136
+msgid "K2000"
 msgstr ""
 
-#: src/properties.cpp:256
-msgid "Save ID"
+#: src/pentaxmn.cpp:137
+msgid "K-m"
 msgstr ""
 
-#: src/properties.cpp:256
-msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
+#: src/pentaxmn.cpp:138
+msgid "Optio P70"
 msgstr ""
 
-#: src/properties.cpp:262
-msgid "Job Reference"
+#: src/pentaxmn.cpp:139
+msgid "Optio E70"
 msgstr ""
 
-#: src/properties.cpp:262
-msgid ""
-"References an external job management file for a job process in which the "
-"document is being used. Use of job names is under user control. Typical use "
-"would be to identify all documents that are part of a particular job or "
-"contract. There are multiple values because there can be more than one job "
-"using a particular document at any time, and it can also be useful to keep "
-"historical information about what jobs a document was part of previously."
+#: src/pentaxmn.cpp:140
+msgid "X70"
 msgstr ""
 
-#: src/properties.cpp:271
-msgid "Maximum Page Size"
+#: src/pentaxmn.cpp:141
+msgid "K-7"
 msgstr ""
 
-#: src/properties.cpp:271
-msgid ""
-"The size of the largest page in the document (including any in contained "
-"documents)."
+#: src/pentaxmn.cpp:142
+msgid "Optio W80"
 msgstr ""
 
-#: src/properties.cpp:272
-msgid "Number of Pages"
+#: src/pentaxmn.cpp:143
+msgid "Optio P80"
 msgstr ""
 
-#: src/properties.cpp:272
-msgid ""
-"The number of pages in the document (including any in contained documents)."
+#: src/pentaxmn.cpp:144
+msgid "Optio WS80"
 msgstr ""
 
-#: src/properties.cpp:273
-msgid "Fonts"
+#: src/pentaxmn.cpp:145
+msgid "K-x"
 msgstr ""
 
-#: src/properties.cpp:273
-msgid ""
-"An unordered array of fonts that are used in the document (including any in "
-"contained documents)."
+#: src/pentaxmn.cpp:146
+msgid "645D"
 msgstr ""
 
-#: src/properties.cpp:274
-msgid "Colorants"
+#: src/pentaxmn.cpp:147
+msgid "Optio I-10"
 msgstr ""
 
-#: src/properties.cpp:274
-msgid ""
-"An ordered array of colorants (swatches) that are used in the document "
-"(including any in contained documents)."
+#: src/pentaxmn.cpp:152
+msgid "Good"
 msgstr ""
 
-#: src/properties.cpp:275
-msgid "Plate Names"
+#: src/pentaxmn.cpp:153
+msgid "Better"
 msgstr ""
 
-#: src/properties.cpp:275
-msgid ""
-"An ordered array of plate names that are needed to print the document "
-"(including any in contained documents)."
-msgstr ""
+#: src/pentaxmn.cpp:154
+#, fuzzy
+msgid "Best"
+msgstr "tavua"
 
-#: src/properties.cpp:281
-msgid "Project Reference"
+#: src/pentaxmn.cpp:155
+msgid "TIFF"
 msgstr ""
 
-#: src/properties.cpp:281
-msgid "A reference to the project that created this file."
-msgstr ""
+#: src/pentaxmn.cpp:157
+#, fuzzy
+msgid "Premium"
+msgstr "Keskikokoinen"
 
-#: src/properties.cpp:282
-msgid "Video Frame Rate"
+#: src/pentaxmn.cpp:162
+msgid "640x480"
 msgstr ""
 
-#: src/properties.cpp:282
-msgid "The video frame rate. One of: 24, NTSC, PAL."
+#: src/pentaxmn.cpp:164
+msgid "1024x768"
 msgstr ""
 
-#: src/properties.cpp:283
-msgid "Video Frame Size"
+#: src/pentaxmn.cpp:165
+msgid "1280x960"
 msgstr ""
 
-#: src/properties.cpp:283
-msgid "The frame size. For example: w:720, h: 480, unit:pixels"
+#: src/pentaxmn.cpp:166
+msgid "1600x1200"
 msgstr ""
 
-#: src/properties.cpp:284
-msgid "Video Pixel Aspect Ratio"
+#: src/pentaxmn.cpp:167
+msgid "2048x1536"
 msgstr ""
 
-#: src/properties.cpp:284
-msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
+#: src/pentaxmn.cpp:168
+msgid "2560x1920 or 2304x1728"
 msgstr ""
 
-#: src/properties.cpp:285
-msgid "Video Pixel Depth"
+#: src/pentaxmn.cpp:169
+msgid "3072x2304"
 msgstr ""
 
-#: src/properties.cpp:285
-msgid ""
-"The size in bits of each color component of a pixel. Standard Windows 32-bit "
-"pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
+#: src/pentaxmn.cpp:170
+msgid "3264x2448"
 msgstr ""
 
-#: src/properties.cpp:287
-msgid "Video Color Space"
+#: src/pentaxmn.cpp:171
+msgid "320x240"
 msgstr ""
 
-#: src/properties.cpp:287
-msgid ""
-"The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
-"CCIR-709 (used for HD)."
+#: src/pentaxmn.cpp:172
+msgid "2288x1712"
 msgstr ""
 
-#: src/properties.cpp:289
-msgid "Video Alpha Mode"
+#: src/pentaxmn.cpp:173
+msgid "2592x1944"
 msgstr ""
 
-#: src/properties.cpp:289
-msgid "The alpha mode. One of: straight, pre-multiplied."
+#: src/pentaxmn.cpp:174
+msgid "2304x1728 or 2592x1944"
 msgstr ""
 
-#: src/properties.cpp:290
-msgid "Video Alpha Premultiple Color"
+#: src/pentaxmn.cpp:175
+msgid "3056x2296"
 msgstr ""
 
-#: src/properties.cpp:290
-msgid ""
-"A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
-"is pre-multiplied."
+#: src/pentaxmn.cpp:176
+msgid "2816x2212 or 2816x2112"
 msgstr ""
 
-#: src/properties.cpp:292
-msgid "Video Alpha Unity Is Transparent"
+#: src/pentaxmn.cpp:177
+msgid "3648x2736"
 msgstr ""
 
-#: src/properties.cpp:292
-msgid "When true, unity is clear, when false, it is opaque."
-msgstr ""
+#: src/pentaxmn.cpp:182
+msgid "Auto, Did not fire"
+msgstr "Auto, ei välähtänyt"
 
-#: src/properties.cpp:293
-msgid "Video Compressor"
-msgstr ""
+#: src/pentaxmn.cpp:184
+msgid "Auto, Did not fire, Red-eye reduction"
+msgstr "Auto, ei välähtänyt, punasilmäisyyden esto"
 
-#: src/properties.cpp:293
-msgid "Video compression used. For example, jpeg."
-msgstr ""
+#: src/pentaxmn.cpp:185
+msgid "Auto, Fired"
+msgstr "Auto, välähti"
 
-#: src/properties.cpp:294
-msgid "Video Field Order"
-msgstr ""
+#: src/pentaxmn.cpp:187
+msgid "Auto, Fired, Red-eye reduction"
+msgstr "Auto, välähti, punasilmäisyyden esto"
 
-#: src/properties.cpp:294
-msgid "The field order for video. One of: Upper, Lower, Progressive."
-msgstr ""
+#: src/pentaxmn.cpp:188
+msgid "On, Red-eye reduction"
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/properties.cpp:295
-msgid "Pull Down"
-msgstr ""
+#: src/pentaxmn.cpp:189
+msgid "On, Wireless"
+msgstr "Päällä, langaton"
 
-#: src/properties.cpp:295
-msgid ""
-"The sampling phase of film to be converted to video (pull-down). One of: "
-"WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
-"WWWSS_24p, WWSSW_24p."
+#: src/pentaxmn.cpp:190
+msgid "On, Soft"
 msgstr ""
 
-#: src/properties.cpp:297
-msgid "Audio Sample Rate"
+#: src/pentaxmn.cpp:191
+msgid "On, Slow-sync"
 msgstr ""
 
-#: src/properties.cpp:297
-msgid ""
-"The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
-msgstr ""
+#: src/pentaxmn.cpp:192
+#, fuzzy
+msgid "On, Slow-sync, Red-eye reduction"
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/properties.cpp:298
-msgid "Audio Sample Type"
+#: src/pentaxmn.cpp:193
+msgid "On, Trailing-curtain Sync"
 msgstr ""
 
-#: src/properties.cpp:298
-msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
-msgstr ""
+#: src/pentaxmn.cpp:203
+#, fuzzy
+msgid "Pan Focus"
+msgstr "Käsintarkennus, MF"
 
-#: src/properties.cpp:299
-msgid "Audio Channel Type"
+#: src/pentaxmn.cpp:204
+msgid "AF-S"
 msgstr ""
 
-#: src/properties.cpp:299
-msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
+#: src/pentaxmn.cpp:205
+msgid "AF-C"
 msgstr ""
 
-#: src/properties.cpp:300
-msgid "Audio Compressor"
+#: src/pentaxmn.cpp:206
+msgid "AF-A"
 msgstr ""
 
-#: src/properties.cpp:300
-msgid "The audio compression used. For example, MP3."
-msgstr ""
+#: src/pentaxmn.cpp:212
+#, fuzzy
+msgid "Fixed Center"
+msgstr "Tiedostonimi"
 
-#: src/properties.cpp:301
-msgid "Speaker Placement"
+#: src/pentaxmn.cpp:213
+msgid "Automatic Tracking AF"
 msgstr ""
 
-#: src/properties.cpp:301
-msgid ""
-"A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
 msgstr ""
 
-#: src/properties.cpp:303
-msgid "File Data Rate"
+#: src/pentaxmn.cpp:231
+msgid "Fixed Center or multiple"
 msgstr ""
 
-#: src/properties.cpp:303
-msgid ""
-"The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
-"sec"
+#: src/pentaxmn.cpp:233
+msgid "Top-center"
 msgstr ""
 
-#: src/properties.cpp:304
-msgid "Tape Name"
+#: src/pentaxmn.cpp:239
+msgid "Bottom-center"
 msgstr ""
 
-#: src/properties.cpp:304
-msgid ""
-"The name of the tape from which the clip was captured, as set during the "
-"capture process."
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
+msgid "50"
 msgstr ""
 
-#: src/properties.cpp:305
-msgid "Alternative Tape Name"
+#: src/pentaxmn.cpp:246
+msgid "64"
 msgstr ""
 
-#: src/properties.cpp:305
-msgid ""
-"An alternative tape name, set via the project window or timecode dialog in "
-"Premiere. If an alternative name has been set and has not been reverted, "
-"that name is displayed."
+#: src/pentaxmn.cpp:247
+msgid "80"
 msgstr ""
 
-#: src/properties.cpp:307
-msgid "Start Time Code"
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
+msgid "100"
 msgstr ""
 
-#: src/properties.cpp:307
-msgid ""
-"The timecode of the first frame of video in the file, as obtained from the "
-"device control."
+#: src/pentaxmn.cpp:249
+msgid "125"
 msgstr ""
 
-#: src/properties.cpp:308
-msgid "Alternative Time code"
+#: src/pentaxmn.cpp:250
+msgid "160"
 msgstr ""
 
-#: src/properties.cpp:308
-msgid ""
-"A timecode set by the user. When specified, it is used instead of the "
-"startTimecode."
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
+msgid "200"
 msgstr ""
 
-#: src/properties.cpp:309
-msgid "Duration"
+#: src/pentaxmn.cpp:252
+msgid "250"
 msgstr ""
 
-#: src/properties.cpp:309
-msgid "The duration of the media file."
+#: src/pentaxmn.cpp:253
+msgid "320"
 msgstr ""
 
-#: src/properties.cpp:310
-msgid "Scene"
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
+msgid "400"
 msgstr ""
 
-#: src/properties.cpp:310
-msgid "The name of the scene."
+#: src/pentaxmn.cpp:255
+msgid "500"
 msgstr ""
 
-#: src/properties.cpp:311
-msgid "Shot Name"
+#: src/pentaxmn.cpp:256
+msgid "640"
 msgstr ""
 
-#: src/properties.cpp:311
-msgid "The name of the shot or take."
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
+msgid "800"
 msgstr ""
 
-#: src/properties.cpp:312
-msgid "Shot Date"
+#: src/pentaxmn.cpp:258
+msgid "1000"
 msgstr ""
 
-#: src/properties.cpp:312
-msgid "The date and time when the video was shot."
+#: src/pentaxmn.cpp:259
+msgid "1250"
 msgstr ""
 
-#: src/properties.cpp:313
-msgid "Shot Location"
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
+msgid "1600"
 msgstr ""
 
-#: src/properties.cpp:313
-msgid ""
-"The name of the location where the video was shot. For example: "
-"\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
-"GPS values."
+#: src/pentaxmn.cpp:261
+msgid "2000"
 msgstr ""
 
-#: src/properties.cpp:315
-msgid "Log Comment"
+#: src/pentaxmn.cpp:262
+msgid "2500"
 msgstr ""
 
-#: src/properties.cpp:315
-msgid "User's log comments."
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
+msgid "3200"
 msgstr ""
 
-#: src/properties.cpp:316
-msgid "Markers"
+#: src/pentaxmn.cpp:264
+msgid "4000"
 msgstr ""
 
-#: src/properties.cpp:316
-msgid "An ordered list of markers"
+#: src/pentaxmn.cpp:265
+msgid "5000"
 msgstr ""
 
-#: src/properties.cpp:317
-msgid "Contributed Media"
+#: src/pentaxmn.cpp:266
+msgid "6400"
 msgstr ""
 
-#: src/properties.cpp:317
-msgid "An unordered list of all media used to create this media."
+#: src/pentaxmn.cpp:276
+msgid "70"
 msgstr ""
 
-#: src/properties.cpp:318
-msgid "Absolute Peak Audio File Path"
+#: src/pentaxmn.cpp:278
+msgid "140"
 msgstr ""
 
-#: src/properties.cpp:318
-msgid ""
-"The absolute path to the file's peak audio file. If empty, no peak file "
-"exists."
+#: src/pentaxmn.cpp:280
+msgid "280"
 msgstr ""
 
-#: src/properties.cpp:319
-msgid "Relative Peak Audio File Path"
+#: src/pentaxmn.cpp:282
+msgid "560"
 msgstr ""
 
-#: src/properties.cpp:319
-msgid ""
-"The relative path to the file's peak audio file. If empty, no peak file "
-"exists."
+#: src/pentaxmn.cpp:284
+msgid "1100"
 msgstr ""
 
-#: src/properties.cpp:320
-msgid "Video Modified Date"
+#: src/pentaxmn.cpp:286
+msgid "2200"
 msgstr ""
 
-#: src/properties.cpp:320
-msgid "The date and time when the video was last modified."
+#: src/pentaxmn.cpp:304
+msgid "Multi Segment"
 msgstr ""
 
-#: src/properties.cpp:321
-msgid "Audio Modified Date"
-msgstr ""
+#: src/pentaxmn.cpp:305
+#, fuzzy
+msgid "Center Weighted"
+msgstr "Keskustaa painottava"
 
-#: src/properties.cpp:321
-msgid "The date and time when the audio was last modified."
-msgstr ""
+#: src/pentaxmn.cpp:317
+#, fuzzy
+msgid "DaylightFluorescent"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:322
-msgid "Metadata Modified Date"
-msgstr ""
+#: src/pentaxmn.cpp:318
+#, fuzzy
+msgid "DaywhiteFluorescent"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:322
-msgid "The date and time when the metadata was last modified."
-msgstr ""
+#: src/pentaxmn.cpp:319
+#, fuzzy
+msgid "WhiteFluorescent"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
-msgid "Artist"
+#: src/pentaxmn.cpp:324
+#, fuzzy
+msgid "User Selected"
+msgstr "Automaattinen"
+
+#: src/pentaxmn.cpp:329
+msgid "Auto (Daylight)"
 msgstr ""
 
-#: src/properties.cpp:323
-msgid "The name of the artist or artists."
+#: src/pentaxmn.cpp:330
+msgid "Auto (Shade)"
 msgstr ""
 
-#: src/properties.cpp:324
-msgid "Album"
+#: src/pentaxmn.cpp:331
+#, fuzzy
+msgid "Auto (Flash)"
+msgstr "Ei salamaa"
+
+#: src/pentaxmn.cpp:332
+#, fuzzy
+msgid "Auto (Tungsten)"
+msgstr "Keinovalo"
+
+#: src/pentaxmn.cpp:333
+msgid "Auto (DaywhiteFluorescent)"
 msgstr ""
 
-#: src/properties.cpp:324
-msgid "The name of the album."
+#: src/pentaxmn.cpp:334
+#, fuzzy
+msgid "Auto (WhiteFluorescent)"
+msgstr "Valkoinen loisteputki"
+
+#: src/pentaxmn.cpp:335
+#, fuzzy
+msgid "Auto (Cloudy)"
+msgstr "Pilvinen"
+
+#: src/pentaxmn.cpp:337
+msgid "Preset (Fireworks?)"
 msgstr ""
 
-#: src/properties.cpp:325
-msgid "Track Number"
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
+msgid "Med Low"
 msgstr ""
 
-#: src/properties.cpp:325
-msgid ""
-"A numeric value indicating the order of the audio file within its original "
-"recording."
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
+msgid "Med High"
 msgstr ""
 
-#: src/properties.cpp:326
-msgid "Genre"
+#: src/pentaxmn.cpp:369
+msgid "Med Soft"
 msgstr ""
 
-#: src/properties.cpp:326
-msgid "The name of the genre."
+#: src/pentaxmn.cpp:370
+msgid "Med Hard"
 msgstr ""
 
-#: src/properties.cpp:327
-msgid "The copyright information."
+#: src/pentaxmn.cpp:371
+msgid "Very Soft"
 msgstr ""
 
-#: src/properties.cpp:328
-msgid "The date the title was released."
+#: src/pentaxmn.cpp:372
+msgid "Very Hard"
 msgstr ""
 
-#: src/properties.cpp:329
-msgid "Composer"
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
+msgid "Home town"
 msgstr ""
 
-#: src/properties.cpp:329
-msgid "The composer's name."
+#: src/pentaxmn.cpp:383
+msgid "Pago Pago"
 msgstr ""
 
-#: src/properties.cpp:330
-msgid "Engineer"
+#: src/pentaxmn.cpp:384
+msgid "Honolulu"
 msgstr ""
 
-#: src/properties.cpp:330
-msgid "The engineer's name."
+#: src/pentaxmn.cpp:385
+msgid "Anchorage"
 msgstr ""
 
-#: src/properties.cpp:331
-msgid "Tempo"
+#: src/pentaxmn.cpp:386
+msgid "Vancouver"
 msgstr ""
 
-#: src/properties.cpp:331
-msgid "The audio's tempo."
+#: src/pentaxmn.cpp:387
+msgid "San Fransisco"
 msgstr ""
 
-#: src/properties.cpp:332
-msgid "Instrument"
+#: src/pentaxmn.cpp:388
+msgid "Los Angeles"
 msgstr ""
 
-#: src/properties.cpp:332
-msgid "The musical instrument."
+#: src/pentaxmn.cpp:389
+msgid "Calgary"
 msgstr ""
 
-#: src/properties.cpp:333
-msgid "Intro Time"
+#: src/pentaxmn.cpp:390
+msgid "Denver"
 msgstr ""
 
-#: src/properties.cpp:333
-msgid "The duration of lead time for queuing music."
+#: src/pentaxmn.cpp:391
+#, fuzzy
+msgid "Mexico City"
+msgstr "Linssin tyyppi"
+
+#: src/pentaxmn.cpp:392
+msgid "Chicago"
 msgstr ""
 
-#: src/properties.cpp:334
-msgid "Out Cue"
+#: src/pentaxmn.cpp:393
+msgid "Miami"
 msgstr ""
 
-#: src/properties.cpp:334
-msgid "The time at which to fade out."
+#: src/pentaxmn.cpp:394
+msgid "Toronto"
 msgstr ""
 
-#: src/properties.cpp:335
-msgid "Relative Timestamp"
+#: src/pentaxmn.cpp:395
+msgid "New York"
 msgstr ""
 
-#: src/properties.cpp:335
-msgid "The start time of the media inside the audio project."
+#: src/pentaxmn.cpp:396
+msgid "Santiago"
 msgstr ""
 
-#: src/properties.cpp:336
-msgid "Loop"
+#: src/pentaxmn.cpp:397
+msgid "Caracus"
 msgstr ""
 
-#: src/properties.cpp:336
-msgid "When true, the clip can be looped seemlessly."
+#: src/pentaxmn.cpp:398
+msgid "Halifax"
 msgstr ""
 
-#: src/properties.cpp:337
-msgid "Number Of Beats"
+#: src/pentaxmn.cpp:399
+msgid "Buenos Aires"
 msgstr ""
 
-#: src/properties.cpp:337
-msgid "The number of beats."
+#: src/pentaxmn.cpp:400
+msgid "Sao Paulo"
 msgstr ""
 
-#: src/properties.cpp:338
-msgid "Key"
+#: src/pentaxmn.cpp:401
+msgid "Rio de Janeiro"
 msgstr ""
 
-#: src/properties.cpp:338
-msgid ""
-"The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
+#: src/pentaxmn.cpp:402
+msgid "Madrid"
 msgstr ""
 
-#: src/properties.cpp:339
-msgid "Stretch Mode"
+#: src/pentaxmn.cpp:403
+msgid "London"
 msgstr ""
 
-#: src/properties.cpp:339
-msgid ""
-"The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
-"Splice, Hybrid."
+#: src/pentaxmn.cpp:404
+#, fuzzy
+msgid "Paris"
+msgstr "Osa-alue"
+
+#: src/pentaxmn.cpp:405
+msgid "Milan"
 msgstr ""
 
-#: src/properties.cpp:340
-msgid "Time Scale Parameters"
+#: src/pentaxmn.cpp:406
+msgid "Rome"
 msgstr ""
 
-#: src/properties.cpp:340
-msgid "Additional parameters for Time-Scale stretch mode."
+#: src/pentaxmn.cpp:407
+msgid "Berlin"
 msgstr ""
 
-#: src/properties.cpp:341
-msgid "Resample Parameters"
+#: src/pentaxmn.cpp:408
+msgid "Johannesburg"
 msgstr ""
 
-#: src/properties.cpp:341
-msgid "Additional parameters for Resample stretch mode."
+#: src/pentaxmn.cpp:409
+msgid "Istanbul"
 msgstr ""
 
-#: src/properties.cpp:342
-msgid "Beat Splice Parameters"
+#: src/pentaxmn.cpp:410
+#, fuzzy
+msgid "Cairo"
+msgstr "Makro"
+
+#: src/pentaxmn.cpp:411
+msgid "Jerusalem"
 msgstr ""
 
-#: src/properties.cpp:342
-msgid "Additional parameters for Beat Splice stretch mode."
+#: src/pentaxmn.cpp:412
+msgid "Moscow"
 msgstr ""
 
-#: src/properties.cpp:343
-msgid "Time Signature"
+#: src/pentaxmn.cpp:413
+msgid "Jeddah"
 msgstr ""
 
-#: src/properties.cpp:343
-msgid ""
-"The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
-"12/8, other."
+#: src/pentaxmn.cpp:414
+msgid "Tehran"
 msgstr ""
 
-#: src/properties.cpp:344
-msgid "Scale Type"
+#: src/pentaxmn.cpp:415
+msgid "Dubai"
 msgstr ""
 
-#: src/properties.cpp:344
-msgid ""
-"The musical scale used in the music. One of: Major, Minor, Both, Neither. "
-"Neither is most often used for instruments with no associated scale, such as "
-"drums."
+#: src/pentaxmn.cpp:416
+msgid "Karachi"
 msgstr ""
 
-#: src/properties.cpp:351 src/tags.cpp:889
-msgid "Camera Serial Number"
+#: src/pentaxmn.cpp:417
+msgid "Kabul"
 msgstr ""
 
-#: src/properties.cpp:351
-msgid "Camera Serial Number."
+#: src/pentaxmn.cpp:418
+#, fuzzy
+msgid "Male"
+msgstr "arvo"
+
+#: src/pentaxmn.cpp:419
+#, fuzzy
+msgid "Delhi"
+msgstr "Poista"
+
+#: src/pentaxmn.cpp:420
+msgid "Colombo"
 msgstr ""
 
-#: src/properties.cpp:352
-msgid "Date Acquired"
+#: src/pentaxmn.cpp:421
+msgid "Kathmandu"
 msgstr ""
 
-#: src/properties.cpp:352
-msgid "Date Acquired."
+#: src/pentaxmn.cpp:422
+msgid "Dacca"
 msgstr ""
 
-#: src/properties.cpp:353
-msgid "Flash Manufacturer"
+#: src/pentaxmn.cpp:423
+msgid "Yangon"
 msgstr ""
 
-#: src/properties.cpp:353
-msgid "Flash Manufacturer."
+#: src/pentaxmn.cpp:424
+msgid "Bangkok"
 msgstr ""
 
-#: src/properties.cpp:354
-msgid "Flash Model."
+#: src/pentaxmn.cpp:425
+msgid "Kuala Lumpur"
 msgstr ""
 
-#: src/properties.cpp:355
-msgid "Last Keyword IPTC"
+#: src/pentaxmn.cpp:426
+msgid "Vientiane"
 msgstr ""
 
-#: src/properties.cpp:355
-msgid "Last Keyword IPTC."
+#: src/pentaxmn.cpp:427
+msgid "Singapore"
 msgstr ""
 
-#: src/properties.cpp:356
-msgid "Last Keyword XMP"
+#: src/pentaxmn.cpp:428
+msgid "Phnom Penh"
 msgstr ""
 
-#: src/properties.cpp:356
-msgid "Last Keyword XMP."
+#: src/pentaxmn.cpp:429
+msgid "Ho Chi Minh"
 msgstr ""
 
-#: src/properties.cpp:357
-msgid "Lens Manufacturer"
-msgstr "Linssin valmistaja"
-
-#: src/properties.cpp:357
-msgid "Lens Manufacturer."
-msgstr "Linssin valmistaja"
-
-#: src/properties.cpp:358
-msgid "Lens Model"
-msgstr "Linssin malli"
-
-#: src/properties.cpp:358
-msgid "Lens Model."
-msgstr "Linssin malli"
-
-#: src/properties.cpp:359
-msgid "Rating Percent"
+#: src/pentaxmn.cpp:430
+msgid "Jakarta"
 msgstr ""
 
-#: src/properties.cpp:359
-msgid "Rating Percent."
+#: src/pentaxmn.cpp:431
+msgid "Hong Kong"
 msgstr ""
 
-#: src/properties.cpp:365
-msgid "Keywords."
-msgstr "Asiasanat"
+#: src/pentaxmn.cpp:432
+#, fuzzy
+msgid "Perth"
+msgstr "Suuri"
 
-#: src/properties.cpp:366
-msgid "PDF Version"
+#: src/pentaxmn.cpp:433
+msgid "Beijing"
 msgstr ""
 
-#: src/properties.cpp:366
-msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
+#: src/pentaxmn.cpp:434
+msgid "Shanghai"
 msgstr ""
 
-#: src/properties.cpp:367
-msgid "Producer"
-msgstr ""
+#: src/pentaxmn.cpp:435
+#, fuzzy
+msgid "Manila"
+msgstr "Manuaalinen"
 
-#: src/properties.cpp:367
-msgid "The name of the tool that created the PDF document."
+#: src/pentaxmn.cpp:436
+msgid "Taipei"
 msgstr ""
 
-#: src/properties.cpp:373
-msgid "Authors Position"
+#: src/pentaxmn.cpp:437
+msgid "Seoul"
 msgstr ""
 
-#: src/properties.cpp:373
-msgid "By-line title."
+#: src/pentaxmn.cpp:438
+msgid "Adelaide"
 msgstr ""
 
-#: src/properties.cpp:374
-msgid "Caption Writer"
+#: src/pentaxmn.cpp:439
+msgid "Tokyo"
 msgstr ""
 
-#: src/properties.cpp:374
-msgid "Writer/editor."
+#: src/pentaxmn.cpp:440
+msgid "Guam"
 msgstr ""
 
-#: src/properties.cpp:375
-msgid "Category. Limited to 3 7-bit ASCII characters."
+#: src/pentaxmn.cpp:441
+msgid "Sydney"
 msgstr ""
 
-#: src/properties.cpp:376
-msgid "City."
-msgstr ""
+#: src/pentaxmn.cpp:442
+#, fuzzy
+msgid "Noumea"
+msgstr "Normaali"
 
-#: src/properties.cpp:377
-msgid "Country/primary location."
+#: src/pentaxmn.cpp:443
+msgid "Wellington"
 msgstr ""
 
-#: src/properties.cpp:378
-msgid "Credit."
+#: src/pentaxmn.cpp:444
+msgid "Auckland"
 msgstr ""
 
-#: src/properties.cpp:379
-msgid ""
-"The date the intellectual content of the document was created (rather than "
-"the creation date of the physical representation), following IIM "
-"conventions. For example, a photo taken during the American Civil War would "
-"have a creation date during that epoch (1861-1865) rather than the date the "
-"photo was digitized for archiving."
+#: src/pentaxmn.cpp:445
+msgid "Lima"
 msgstr ""
 
-#: src/properties.cpp:383
-msgid "Headline."
+#: src/pentaxmn.cpp:446
+msgid "Dakar"
 msgstr ""
 
-#: src/properties.cpp:384
-msgid "Special instructions."
+#: src/pentaxmn.cpp:447
+msgid "Algiers"
 msgstr ""
 
-#: src/properties.cpp:385
-msgid "Source."
+#: src/pentaxmn.cpp:448
+msgid "Helsinki"
 msgstr ""
 
-#: src/properties.cpp:386
-msgid "State"
+#: src/pentaxmn.cpp:449
+#, fuzzy
+msgid "Athens"
+msgstr "Linssi"
+
+#: src/pentaxmn.cpp:450
+msgid "Nairobi"
 msgstr ""
 
-#: src/properties.cpp:386
-msgid "Province/state."
+#: src/pentaxmn.cpp:451
+msgid "Amsterdam"
 msgstr ""
 
-#: src/properties.cpp:387
-msgid "Supplemental category."
+#: src/pentaxmn.cpp:452
+msgid "Stockholm"
 msgstr ""
 
-#: src/properties.cpp:388
-msgid "Original transmission reference."
+#: src/pentaxmn.cpp:453
+msgid "Lisbon"
 msgstr ""
 
-#: src/properties.cpp:389
-msgid "Urgency. Valid range is 1-8."
+#: src/pentaxmn.cpp:454
+msgid "Copenhagen"
 msgstr ""
 
-#: src/properties.cpp:397
-msgid "inches"
-msgstr "tuumaa"
+#: src/pentaxmn.cpp:459
+msgid "Unprocessed"
+msgstr ""
 
-#: src/properties.cpp:398 src/tags.cpp:227
-msgid "cm"
-msgstr "cm"
+#: src/pentaxmn.cpp:460
+#, fuzzy
+msgid "Digital Filter"
+msgstr "Digitaalinen makro"
 
-#: src/properties.cpp:402
-msgid "Auto Brightness"
+#: src/pentaxmn.cpp:461
+msgid "Cropped"
 msgstr ""
 
-#: src/properties.cpp:402
-msgid "When true, \"Brightness\" is automatically adjusted."
+#: src/pentaxmn.cpp:463
+msgid "Frame Synthesis?"
 msgstr ""
 
-#: src/properties.cpp:403
-msgid "Auto Contrast"
-msgstr ""
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
+#, fuzzy
+msgid "MTF Program"
+msgstr "Ohjelma"
 
-#: src/properties.cpp:403
-msgid "When true, \"Contrast\" is automatically adjusted."
+#: src/pentaxmn.cpp:475
+msgid "Night Scene Portrait"
 msgstr ""
 
-#: src/properties.cpp:404
-msgid "Auto Exposure"
-msgstr "Automaattivalotus"
+#: src/pentaxmn.cpp:476
+msgid "No Flash"
+msgstr "Ei salamaa"
 
-#: src/properties.cpp:404
-msgid "When true, \"Exposure\" is automatically adjusted."
+#: src/pentaxmn.cpp:479
+msgid "Surf & Snow"
 msgstr ""
 
-#: src/properties.cpp:405
-msgid "Auto Shadows"
+#: src/pentaxmn.cpp:482
+msgid "Kids"
 msgstr ""
 
-#: src/properties.cpp:405
-msgid "When true,\"Shadows\" is automatically adjusted."
+#: src/pentaxmn.cpp:487
+msgid "Stage Lighting"
 msgstr ""
 
-#: src/properties.cpp:406
-msgid "Blue Hue"
+#: src/pentaxmn.cpp:488
+msgid "Night Snap"
 msgstr ""
 
-#: src/properties.cpp:406
-msgid "\"Blue Hue\" setting. Range -100 to 100."
+#: src/pentaxmn.cpp:490
+msgid "Auto PICT (Standard)"
 msgstr ""
 
-#: src/properties.cpp:407
-msgid "Blue Saturation"
+#: src/pentaxmn.cpp:491
+msgid "Auto PICT (Portrait)"
 msgstr ""
 
-#: src/properties.cpp:407
-msgid "\"Blue Saturation\" setting. Range -100 to +100."
-msgstr ""
+#: src/pentaxmn.cpp:492
+#, fuzzy
+msgid "Auto PICT (Landscape)"
+msgstr "Maisemakuva"
 
-#: src/properties.cpp:408
-msgid "\"Brightness\" setting. Range 0 to +150."
+#: src/pentaxmn.cpp:493
+msgid "Auto PICT (Macro)"
 msgstr ""
 
-#: src/properties.cpp:409
-msgid "Camera Profile"
+#: src/pentaxmn.cpp:494
+msgid "Auto PICT (Sport)"
 msgstr ""
 
-#: src/properties.cpp:409
-msgid "\"Camera Profile\" setting."
-msgstr ""
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
+#, fuzzy
+msgid "Green Mode"
+msgstr "Linssin malli"
 
-#: src/properties.cpp:410
-msgid "Chromatic Aberration Blue"
-msgstr ""
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
+#, fuzzy
+msgid "Shutter Speed Priority"
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/properties.cpp:410
-msgid ""
-"\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
-msgstr ""
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
+#, fuzzy
+msgid "Aperture Priority"
+msgstr "Aukon esivalinta (Av)"
 
-#: src/properties.cpp:411
-msgid "Chromatic Aberration Red"
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
+msgid "Bulb"
 msgstr ""
 
-#: src/properties.cpp:411
-msgid ""
-"\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
-msgstr ""
+#: src/pentaxmn.cpp:504
+#, fuzzy
+msgid "Hi-speed Program"
+msgstr "Kuvaustapa"
 
-#: src/properties.cpp:412
-msgid "Color Noise Reduction"
-msgstr ""
+#: src/pentaxmn.cpp:505
+#, fuzzy
+msgid "DOF Program"
+msgstr "Ohjelma"
 
-#: src/properties.cpp:412
-msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
-msgstr ""
+#: src/pentaxmn.cpp:510
+#, fuzzy
+msgid "Program Tv Shift"
+msgstr "Ohjelma"
 
-#: src/properties.cpp:413
-msgid "\"Contrast\" setting. Range -50 to +100."
-msgstr ""
+#: src/pentaxmn.cpp:511
+#, fuzzy
+msgid "Program Av Shift"
+msgstr "Ohjelma"
 
-#: src/properties.cpp:414
-msgid "When \"Has Crop\" is true, top of crop rectangle"
-msgstr ""
+#: src/pentaxmn.cpp:514
+#, fuzzy
+msgid "Aperture Priority (Off-Auto-Aperture)"
+msgstr "Aukon esivalinta (Av)"
 
-#: src/properties.cpp:415
-msgid "When \"Has Crop\" is true, left of crop rectangle."
+#: src/pentaxmn.cpp:515
+msgid "Manual (Off-Auto-Aperture)"
 msgstr ""
 
-#: src/properties.cpp:416
-msgid "Crop Bottom"
+#: src/pentaxmn.cpp:516
+msgid "Bulb (Off-Auto-Aperture)"
 msgstr ""
 
-#: src/properties.cpp:416
-msgid "When \"Has Crop\" is true, bottom of crop rectangle."
-msgstr ""
+#: src/pentaxmn.cpp:518
+#, fuzzy
+msgid "Shutter Priority"
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/properties.cpp:417
-msgid "Crop Right"
+#: src/pentaxmn.cpp:519
+#, fuzzy
+msgid "Shutter & Aperture Priority AE"
+msgstr "Aukon esivalinta (Av)"
+
+#: src/pentaxmn.cpp:520
+#, fuzzy
+msgid "Shutter & Aperture Priority AE (1)"
+msgstr "Valotusajan esivalinta (Tv)"
+
+#: src/pentaxmn.cpp:521
+msgid "Sensitivity Priority AE"
 msgstr ""
 
-#: src/properties.cpp:417
-msgid "When \"Has Crop\" is true, right of crop rectangle."
+#: src/pentaxmn.cpp:522
+msgid "Sensitivity Priority AE (1)"
 msgstr ""
 
-#: src/properties.cpp:418
-msgid "Crop Angle"
+#: src/pentaxmn.cpp:523
+msgid "Flash X-Sync Speed AE"
 msgstr ""
 
-#: src/properties.cpp:418
-msgid "When \"Has Crop\" is true, angle of crop rectangle."
+#: src/pentaxmn.cpp:524
+msgid "Flash X-Sync Speed AE (1)"
 msgstr ""
 
-#: src/properties.cpp:419
-msgid "Width of resulting cropped image in CropUnits units."
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
 msgstr ""
 
-#: src/properties.cpp:420
-msgid "Height of resulting cropped image in CropUnits units."
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
 msgstr ""
 
-#: src/properties.cpp:421
-msgid "Crop Units"
+#: src/pentaxmn.cpp:535
+msgid "Continuous (Hi)"
 msgstr ""
 
-#: src/properties.cpp:421
-msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
+msgid "Burst"
 msgstr ""
 
-#: src/properties.cpp:422
-msgid "\"Exposure\" setting. Range -4.0 to +4.0."
+#: src/pentaxmn.cpp:538
+msgid "Self-timer (12 sec)"
 msgstr ""
 
-#: src/properties.cpp:423
-msgid "GreenHue"
+#: src/pentaxmn.cpp:539
+msgid "Self-timer (2 sec)"
 msgstr ""
 
-#: src/properties.cpp:423
-msgid "\"Green Hue\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:540
+msgid "Remote Control (3 sec)"
 msgstr ""
 
-#: src/properties.cpp:424
-msgid "Green Saturation"
-msgstr ""
+#: src/pentaxmn.cpp:541
+#, fuzzy
+msgid "Remote Control"
+msgstr "Täysautomatiikka"
 
-#: src/properties.cpp:424
-msgid "\"Green Saturation\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
+msgid "Video"
 msgstr ""
 
-#: src/properties.cpp:425
-msgid "Has Crop"
+#: src/pentaxmn.cpp:554
+msgid "M-42 or No Lens"
 msgstr ""
 
-#: src/properties.cpp:425
-msgid "When true, image has a cropping rectangle."
-msgstr ""
+#: src/pentaxmn.cpp:555
+#, fuzzy
+msgid "K,M Lens"
+msgstr "Linssi"
 
-#: src/properties.cpp:426
-msgid "Has Settings"
+#: src/pentaxmn.cpp:556
+msgid "A Series Lens"
 msgstr ""
 
-#: src/properties.cpp:426
-msgid "When true, non-default camera raw settings."
-msgstr ""
+#: src/pentaxmn.cpp:703
+#, fuzzy
+msgid "Bright"
+msgstr "Omistusoikeus"
 
-#: src/properties.cpp:427
-msgid "Luminance Smoothing"
+#: src/pentaxmn.cpp:706
+msgid "Vibrant"
 msgstr ""
 
-#: src/properties.cpp:427
-msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
 msgstr ""
 
-#: src/properties.cpp:428
-msgid "Raw File Name"
+#: src/pentaxmn.cpp:720
+msgid "Weakest"
 msgstr ""
 
-#: src/properties.cpp:428
-msgid "File name of raw file (not a complete path)."
+#: src/pentaxmn.cpp:721
+msgid "Weak"
 msgstr ""
 
-#: src/properties.cpp:429
-msgid "Red Hue"
-msgstr ""
+#: src/pentaxmn.cpp:722
+#, fuzzy
+msgid "Strong"
+msgstr "Värikylläisyys"
 
-#: src/properties.cpp:429
-msgid "\"Red Hue\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:832
+msgid "No extended bracketing"
 msgstr ""
 
-#: src/properties.cpp:430
-msgid "Red Saturation"
+#: src/pentaxmn.cpp:838
+msgid "WB-BA"
 msgstr ""
 
-#: src/properties.cpp:430
-msgid "\"Red Saturation\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:841
+msgid "WB-GM"
 msgstr ""
 
-#: src/properties.cpp:431
-msgid "\"Saturation\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:853
+msgid "Unknown "
 msgstr ""
 
-#: src/properties.cpp:432
-msgid "Shadows"
+#: src/pentaxmn.cpp:866
+msgid "Pentax Makernote version"
 msgstr ""
 
-#: src/properties.cpp:432
-msgid "\"Shadows\" setting. Range 0 to +100."
-msgstr ""
+#: src/pentaxmn.cpp:869
+#, fuzzy
+msgid "Camera shooting mode"
+msgstr "Kameran malli"
 
-#: src/properties.cpp:433
-msgid "Shadow Tint"
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
+msgid "Resolution of a preview image"
 msgstr ""
 
-#: src/properties.cpp:433
-msgid "\"Shadow Tint\" setting. Range -100 to +100."
+#: src/pentaxmn.cpp:874
+msgid "Length of a preview image"
 msgstr ""
 
-#: src/properties.cpp:434
-msgid "\"Sharpness\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:875
+msgid "Size of an IFD containing a preview image"
 msgstr ""
 
-#: src/properties.cpp:435
-msgid "\"Temperature\" setting. Range 2000 to 50000."
+#: src/pentaxmn.cpp:880
+msgid "Model identification"
 msgstr ""
 
-#: src/properties.cpp:436
-msgid "Tint"
+#: src/pentaxmn.cpp:881
+msgid "Pentax model idenfication"
 msgstr ""
 
-#: src/properties.cpp:436
-msgid "\"Tint\" setting. Range -150 to +150."
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
+msgid "Date"
 msgstr ""
 
-#: src/properties.cpp:437
-msgid "Tone Curve"
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
+msgid "Time"
 msgstr ""
 
-#: src/properties.cpp:437
-msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
-msgstr ""
+#: src/pentaxmn.cpp:890
+#, fuzzy
+msgid "Image quality settings"
+msgstr "Kuvan laatu"
 
-#: src/properties.cpp:438
-msgid "Tone Curve Name"
-msgstr ""
+#: src/pentaxmn.cpp:893
+#, fuzzy
+msgid "Image size settings"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:438
-msgid ""
-"The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
-"Contrast, Strong Contrast, Custom or a user-defined preset name."
-msgstr ""
+#: src/pentaxmn.cpp:897
+#, fuzzy
+msgid "Flash mode settings"
+msgstr "Salaman malli"
 
-#: src/properties.cpp:440
-msgid "Version of Camera Raw plugin."
-msgstr ""
+#: src/pentaxmn.cpp:900
+#, fuzzy
+msgid "Focus mode settings"
+msgstr "Tarkennustapa"
 
-#: src/properties.cpp:441
-msgid "Vignette Amount"
+#: src/pentaxmn.cpp:903
+msgid "Selected AF point"
 msgstr ""
 
-#: src/properties.cpp:441
-msgid "\"Vignetting Amount\" setting. Range -100 to +100."
-msgstr ""
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+#, fuzzy
+msgid "AF point in focus"
+msgstr "Käytetty AF-piste"
 
-#: src/properties.cpp:442
-msgid "Vignette Midpoint"
-msgstr ""
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#, fuzzy
+msgid "F-Number"
+msgstr "F-luku"
 
-#: src/properties.cpp:442
-msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
+#: src/pentaxmn.cpp:915
+msgid "ISO sensitivity"
 msgstr ""
 
-#: src/properties.cpp:443
-msgid ""
-"\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
-"Tungsten, Fluorescent, Flash, Custom"
+#: src/pentaxmn.cpp:916
+msgid "ISO sensitivity settings"
 msgstr ""
 
-#: src/properties.cpp:450
-msgid "TIFF tag 256, 0x100. Image width in pixels."
-msgstr ""
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
+#, fuzzy
+msgid "MeteringMode"
+msgstr "Mittaustapa"
 
-#: src/properties.cpp:451 src/tags.cpp:354
-msgid "Image Length"
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
+msgid "AutoBracketing"
 msgstr ""
 
-#: src/properties.cpp:451
-msgid "TIFF tag 257, 0x101. Image height in pixels."
-msgstr ""
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
+#, fuzzy
+msgid "White ballance"
+msgstr "Valkotasapaino"
 
-#: src/properties.cpp:452
-msgid "Bits Per Sample"
-msgstr ""
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
+#, fuzzy
+msgid "White ballance mode"
+msgstr "Valkotasapaino"
 
-#: src/properties.cpp:452
-msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
-msgstr ""
+#: src/pentaxmn.cpp:936
+#, fuzzy
+msgid "Blue color balance"
+msgstr "Väriavaruus"
 
-#: src/properties.cpp:453 src/tags.cpp:364
-msgid "Compression"
-msgstr "Pakkaus"
+#: src/pentaxmn.cpp:939
+#, fuzzy
+msgid "Red color balance"
+msgstr "Väriavaruus"
 
-#: src/properties.cpp:453
-msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
-msgstr ""
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
+msgid "FocalLength"
+msgstr "Polttoväli"
 
-#: src/properties.cpp:454 src/tags.cpp:370
-msgid "Photometric Interpretation"
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
+msgid "Location"
 msgstr ""
 
-#: src/properties.cpp:454
-msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
+#: src/pentaxmn.cpp:959
+msgid "Hometown"
 msgstr ""
 
-#: src/properties.cpp:455
-msgid ""
-"TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
-"0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
-"right 4 = 0th row at bottom, 0th column at left 5 = 0th row at left, 0th "
-"column at top 6 = 0th row at right, 0th column at top 7 = 0th row at right, "
-"0th column at bottom 8 = 0th row at left, 0th column at bottom"
+#: src/pentaxmn.cpp:965
+msgid "Hometown DST"
 msgstr ""
 
-#: src/properties.cpp:464
-msgid "Samples Per Pixel"
+#: src/pentaxmn.cpp:966
+msgid "Whether day saving time is active in home town"
 msgstr ""
 
-#: src/properties.cpp:464
-msgid "TIFF tag 277, 0x115. Number of components per pixel."
+#: src/pentaxmn.cpp:968
+msgid "Destination DST"
 msgstr ""
 
-#: src/properties.cpp:465 src/tags.cpp:432
-msgid "Planar Configuration"
+#: src/pentaxmn.cpp:969
+msgid "Whether day saving time is active in destination"
 msgstr ""
 
-#: src/properties.cpp:465
-msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
-msgstr ""
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
+#, fuzzy
+msgid "DSPFirmwareVersion"
+msgstr "Firmwaren versio"
 
-#: src/properties.cpp:466
-msgid "YCbCr Sub Sampling"
-msgstr ""
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
+#, fuzzy
+msgid "CPUFirmwareVersion"
+msgstr "Firmwaren versio"
 
-#: src/properties.cpp:466
-msgid ""
-"TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
-"YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
+#: src/pentaxmn.cpp:981
+#, fuzzy
+msgid "Light value"
+msgstr "arvo"
+
+#: src/pentaxmn.cpp:982
+msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
-msgid "YCbCr Positioning"
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+#, fuzzy
+msgid "Image area offset"
+msgstr "Kuvan numero"
+
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+#, fuzzy
+msgid "Raw image size"
+msgstr "Kuvan koko"
+
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
+msgid "Preview image borders"
 msgstr ""
 
-#: src/properties.cpp:468
-msgid ""
-"TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
-"centered; 2 = co-sited."
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
+msgid "Sensitivity adjust"
 msgstr ""
 
-#: src/properties.cpp:470
-msgid "X Resolution"
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
+#, fuzzy
+msgid "Digital filter"
+msgstr "Digitaalinen makro"
+
+#: src/pentaxmn.cpp:1019
+#, fuzzy
+msgid "Camera temperature"
+msgstr "Kameran merkki"
+
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
+#, fuzzy
+msgid "Image tone"
+msgstr "Kuvan tyyppi"
+
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
+#, fuzzy
+msgid "Colort temperature"
+msgstr "Väriavaruus"
+
+#: src/pentaxmn.cpp:1039
+#, fuzzy
+msgid "Shake reduction"
+msgstr "Päällä, punasilmäisyyden esto"
+
+#: src/pentaxmn.cpp:1040
+msgid "Shake reduction information"
 msgstr ""
 
-#: src/properties.cpp:470
-msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
+msgid "Dynamic range expansion"
 msgstr ""
 
-#: src/properties.cpp:471
-msgid "Y Resolution"
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
+msgid "High ISO noise reduction"
 msgstr ""
 
-#: src/properties.cpp:471
-msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+msgid "AF Adjustment"
 msgstr ""
 
-#: src/properties.cpp:472 src/tags.cpp:438
-msgid "Resolution Unit"
-msgstr "Resoluutioyksikkö"
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
+#, fuzzy
+msgid "Black point"
+msgstr "Mustavalko"
 
-#: src/properties.cpp:472
-msgid ""
-"TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
-"of: 2 = inches; 3 = centimeters."
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
+msgid "White point"
 msgstr ""
 
-#: src/properties.cpp:474 src/tags.cpp:443
-msgid "Transfer Function"
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
+msgid "ShotInfo"
 msgstr ""
 
-#: src/properties.cpp:474
-msgid ""
-"TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
-"with 3 * 256 entries."
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
+msgid "AEInfo"
 msgstr ""
 
-#: src/properties.cpp:476 src/tags.cpp:471
-msgid "White Point"
-msgstr ""
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
+#, fuzzy
+msgid "LensInfo"
+msgstr "Linssi"
 
-#: src/properties.cpp:476
-msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
-msgstr ""
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
+#, fuzzy
+msgid "FlashInfo"
+msgstr "Salama"
 
-#: src/properties.cpp:477 src/tags.cpp:476
-msgid "Primary Chromaticities"
-msgstr ""
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
+#, fuzzy
+msgid "AEMeteringSegments"
+msgstr "Mittaustapa"
 
-#: src/properties.cpp:477
-msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
-msgstr ""
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
+#, fuzzy
+msgid "FlashADump"
+msgstr "Salama"
 
-#: src/properties.cpp:478
-msgid ""
-"TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
-msgstr ""
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
+#, fuzzy
+msgid "FlashBDump"
+msgstr "Salama"
 
-#: src/properties.cpp:479
-msgid "Reference Black White"
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
+msgid "WB_RGGBLevelsDaylight"
 msgstr ""
 
-#: src/properties.cpp:479
-msgid "TIFF tag 532, 0x214. Reference black and white point values."
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
+msgid "WB_RGGBLevelsShade"
 msgstr ""
 
-#: src/properties.cpp:480 src/tags.cpp:455
-msgid "Date and Time"
-msgstr "Päiväys ja aika"
-
-#: src/properties.cpp:480
-msgid ""
-"TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
-"and time of image creation (no time zone in EXIF), stored in ISO 8601 "
-"format, not the original EXIF format. This property includes the value for "
-"the EXIF SubSecTime attribute. NOTE: This property is stored in XMP as xmp:"
-"ModifyDate."
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
+msgid "WB_RGGBLevelsCloudy"
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
-msgid "Image Description"
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
+msgid "WB_RGGBLevelsTungsten"
 msgstr ""
 
-#: src/properties.cpp:486
-msgid ""
-"TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
-"in XMP as dc:description."
-msgstr ""
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
+#, fuzzy
+msgid "WB_RGGBLevelsFluorescentD"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:487
-msgid "Make"
-msgstr ""
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
+#, fuzzy
+msgid "WB_RGGBLevelsFluorescentN"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:487
-msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
-msgstr ""
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
+#, fuzzy
+msgid "WB_RGGBLevelsFluorescentW"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:488
-msgid "TIFF tag 272, 0x110. Model name or number of equipment."
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
+msgid "WB_RGGBLevelsFlash"
 msgstr ""
 
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
-msgstr "Ohjelmisto"
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
+#, fuzzy
+msgid "CameraInfo"
+msgstr "Kameran tyyppi"
 
-#: src/properties.cpp:489
-msgid ""
-"TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
-"property is stored in XMP as xmp:CreatorTool. "
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
+msgid "BatteryInfo"
 msgstr ""
 
-#: src/properties.cpp:491
-msgid ""
-"TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
-"property is stored in XMP as the first item in the dc:creator array."
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
+msgid "AFInfo"
 msgstr ""
 
-#: src/properties.cpp:493
-msgid ""
-"TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
-"in XMP as dc:rights."
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
+msgid "ColorInfo"
 msgstr ""
 
-#: src/properties.cpp:500 src/tags.cpp:1198
-msgid "Exif Version"
+#: src/pentaxmn.cpp:1125
+msgid "Unknown PentaxMakerNote tag"
 msgstr ""
 
-#: src/properties.cpp:500
-msgid "EXIF tag 36864, 0x9000. EXIF version number."
+#: src/properties.cpp:97
+msgid "Dublin Core schema"
 msgstr ""
 
-#: src/properties.cpp:501
-msgid "Flashpix Version"
+#: src/properties.cpp:98
+msgid "digiKam Photo Management schema"
 msgstr ""
 
-#: src/properties.cpp:501
-msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
 msgstr ""
 
-#: src/properties.cpp:502
-msgid "EXIF tag 40961, 0xA001. Color space information"
+#: src/properties.cpp:100
+msgid "XMP Basic schema"
 msgstr ""
 
-#: src/properties.cpp:503 src/tags.cpp:1209
-msgid "Components Configuration"
+#: src/properties.cpp:101
+msgid "XMP Rights Management schema"
 msgstr ""
 
-#: src/properties.cpp:503
-msgid ""
-"EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
-"compressed data), 1 2 3 0 (other cases)."
+#: src/properties.cpp:102
+msgid "XMP Media Management schema"
 msgstr ""
 
-#: src/properties.cpp:505 src/tags.cpp:636
-msgid "Compressed Bits Per Pixel"
+#: src/properties.cpp:103
+msgid "XMP Basic Job Ticket schema"
 msgstr ""
 
-#: src/properties.cpp:505
-msgid ""
-"EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
-"indicated in unit bits per pixel."
+#: src/properties.cpp:104
+msgid "XMP Paged-Text schema"
 msgstr ""
 
-#: src/properties.cpp:507 src/tags.cpp:1293
-msgid "Pixel X Dimension"
+#: src/properties.cpp:105
+msgid "XMP Dynamic Media schema"
 msgstr ""
 
-#: src/properties.cpp:507
-msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
+#: src/properties.cpp:106
+msgid "Microsoft Photo schema"
 msgstr ""
 
-#: src/properties.cpp:508 src/tags.cpp:1300
-msgid "Pixel Y Dimension"
+#: src/properties.cpp:107
+msgid "Adobe PDF schema"
 msgstr ""
 
-#: src/properties.cpp:508
-msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
+#: src/properties.cpp:108
+msgid "Adobe photoshop schema"
 msgstr ""
 
-#: src/properties.cpp:509 src/tags.cpp:1267
-msgid "User Comment"
-msgstr "Oma kommentti"
+#: src/properties.cpp:109
+#, fuzzy
+msgid "Camera Raw schema"
+msgstr "Kameran merkki"
 
-#: src/properties.cpp:509
-msgid "EXIF tag 37510, 0x9286. Comments from user."
+#: src/properties.cpp:110
+msgid "Exif Schema for TIFF Properties"
 msgstr ""
 
-#: src/properties.cpp:510 src/tags.cpp:1309
-msgid "Related Sound File"
+#: src/properties.cpp:111
+msgid "Exif schema for Exif-specific Properties"
 msgstr ""
 
-#: src/properties.cpp:510
-msgid ""
-"EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
+#: src/properties.cpp:112
+msgid "Exif schema for Additional Exif Properties"
 msgstr ""
 
-#: src/properties.cpp:511
-msgid "Date and Time Original"
+#: src/properties.cpp:113
+msgid "IPTC Core schema"
 msgstr ""
 
-#: src/properties.cpp:511
-msgid ""
-"EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
-"time when original image was generated, in ISO 8601 format. Includes the "
-"EXIF SubSecTimeOriginal data."
+#: src/properties.cpp:115
+msgid "IPTC Extension schema"
 msgstr ""
 
-#: src/properties.cpp:514
-msgid "Date and Time Digitized"
+#: src/properties.cpp:117
+msgid "PLUS License Data Format schema"
 msgstr ""
 
-#: src/properties.cpp:514
-msgid ""
-"EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
-"time when image was stored as digital data, can be the same as "
-"DateTimeOriginal if originally stored in digital form. Stored in ISO 8601 "
-"format. Includes the EXIF SubSecTimeDigitized data."
+#: src/properties.cpp:118
+msgid "iView Media Pro schema"
 msgstr ""
 
-#: src/properties.cpp:518
-msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
+#: src/properties.cpp:119
+msgid "Expression Media schema"
 msgstr ""
 
-#: src/properties.cpp:519
-msgid "F Number"
-msgstr ""
+#: src/properties.cpp:122
+#, fuzzy
+msgid "Colorant structure"
+msgstr "Kontrasti"
 
-#: src/properties.cpp:519
-msgid "EXIF tag 33437, 0x829D. F number."
+#: src/properties.cpp:123
+msgid "Dimensions structure"
 msgstr ""
 
-#: src/properties.cpp:520
-msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
-msgstr ""
+#: src/properties.cpp:124
+#, fuzzy
+msgid "Font structure"
+msgstr "Kontrasti"
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
-msgid "Spectral Sensitivity"
-msgstr ""
+#: src/properties.cpp:125
+#, fuzzy
+msgid "Thumbnail structure"
+msgstr "Näytekuvat"
 
-#: src/properties.cpp:521
-msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
+#: src/properties.cpp:126
+msgid "Resource Event structure"
 msgstr ""
 
-#: src/properties.cpp:522
-msgid "ISOSpeedRatings"
+#: src/properties.cpp:127
+msgid "ResourceRef structure"
 msgstr ""
 
-#: src/properties.cpp:522
-msgid ""
-"EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
-"specified in ISO 12232."
+#: src/properties.cpp:128
+msgid "Version structure"
 msgstr ""
 
-#: src/properties.cpp:524 src/tags.cpp:625
-msgid "OECF"
+#: src/properties.cpp:129
+msgid "Basic Job/Workflow structure"
 msgstr ""
 
-#: src/properties.cpp:524
-msgid ""
-"EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
-"ISO 14524."
+#: src/properties.cpp:132
+msgid "Qualifier for xmp:Identifier"
 msgstr ""
 
-#: src/properties.cpp:525
-msgid ""
-"EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
-"specification."
-msgstr ""
+#: src/properties.cpp:136
+#, fuzzy
+msgid "Contributor"
+msgstr "Kontrasti"
 
-#: src/properties.cpp:526
-msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
+#: src/properties.cpp:136
+msgid "Contributors to the resource (other than the authors)."
 msgstr ""
 
-#: src/properties.cpp:527 src/tags.cpp:639
-msgid "Brightness Value"
+#: src/properties.cpp:137
+msgid "Coverage"
 msgstr ""
 
-#: src/properties.cpp:527
-msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
+#: src/properties.cpp:137
+msgid ""
+"The spatial or temporal topic of the resource, the spatial applicability of "
+"the resource, or the jurisdiction under which the resource is relevant."
 msgstr ""
 
-#: src/properties.cpp:528
-msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
-msgstr ""
+#: src/properties.cpp:139
+#, fuzzy
+msgid "Creator"
+msgstr "Kuvan numero"
 
-#: src/properties.cpp:529
-msgid "Maximum Aperture Value"
+#: src/properties.cpp:139
+msgid ""
+"The authors of the resource (listed in order of precedence, if significant)."
 msgstr ""
 
-#: src/properties.cpp:529
-msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
+#: src/properties.cpp:140
+msgid "Date(s) that something interesting happened to the resource."
 msgstr ""
 
-#: src/properties.cpp:530
-msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
+#: src/properties.cpp:141
+msgid ""
+"A textual description of the content of the resource. Multiple values may be "
+"present for different languages."
 msgstr ""
 
-#: src/properties.cpp:531
-msgid "EXIF tag 37383, 0x9207. Metering mode."
+#: src/properties.cpp:143
+#, fuzzy
+msgid "Format"
+msgstr "Normaali"
+
+#: src/properties.cpp:143
+msgid ""
+"The file format used when saving the resource. Tools and applications should "
+"set this property to the save format of the data. It may include appropriate "
+"qualifiers."
 msgstr ""
 
-#: src/properties.cpp:532
-msgid "EXIF tag 37384, 0x9208. Light source."
+#: src/properties.cpp:145 src/properties.cpp:196
+msgid "Identifier"
 msgstr ""
 
-#: src/properties.cpp:533
-msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
+#: src/properties.cpp:145
+msgid ""
+"Unique identifier of the resource. Recommended best practice is to identify "
+"the resource by means of a string conforming to a formal identification "
+"system."
 msgstr ""
 
-#: src/properties.cpp:534
-msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
+#: src/properties.cpp:147
+msgid "An unordered array specifying the languages used in the resource."
 msgstr ""
 
-#: src/properties.cpp:535 src/tags.cpp:1259
-msgid "Subject Area"
+#: src/properties.cpp:148
+msgid "Publisher"
 msgstr ""
 
-#: src/properties.cpp:535
+#: src/properties.cpp:148
 msgid ""
-"EXIF tag 37396, 0x9214. The location and area of the main subject in the "
-"overall scene."
+"An entity responsible for making the resource available. Examples of a "
+"Publisher include a person, an organization, or a service. Typically, the "
+"name of a Publisher should be used to indicate the entity."
 msgstr ""
 
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
-msgid "Flash Energy"
-msgstr ""
+#: src/properties.cpp:151
+#, fuzzy
+msgid "Relation"
+msgstr "Resoluutioyksikkö"
 
-#: src/properties.cpp:536
-msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
+#: src/properties.cpp:151
+msgid ""
+"Relationships to other documents. Recommended best practice is to identify "
+"the related resource by means of a string conforming to a formal "
+"identification system."
 msgstr ""
 
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
-msgid "Spatial Frequency Response"
+#: src/properties.cpp:153
+msgid "Rights"
 msgstr ""
 
-#: src/properties.cpp:537
+#: src/properties.cpp:153
 msgid ""
-"EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
-"as specified in ISO 12233."
+"Informal rights statement, selected by language. Typically, rights "
+"information includes a statement about various property rights associated "
+"with the resource, including intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:539 src/tags.cpp:650
-msgid "Focal Plane X Resolution"
+#: src/properties.cpp:156
+msgid "Unique identifier of the work from which this resource was derived."
 msgstr ""
 
-#: src/properties.cpp:539
+#: src/properties.cpp:157
 msgid ""
-"EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
-"unit."
+"An unordered array of descriptive phrases or keywords that specify the topic "
+"of the content of the resource."
 msgstr ""
 
-#: src/properties.cpp:540 src/tags.cpp:651
-msgid "Focal Plane Y Resolution"
+#: src/properties.cpp:159
+msgid "Title"
 msgstr ""
 
-#: src/properties.cpp:540
+#: src/properties.cpp:159
 msgid ""
-"EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
-"unit."
+"The title of the document, or the name given to the resource. Typically, it "
+"will be a name by which the resource is formally known."
 msgstr ""
 
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
-msgid "Focal Plane Resolution Unit"
-msgstr ""
+#: src/properties.cpp:161
+#, fuzzy
+msgid "Type"
+msgstr "Linssin tyyppi"
 
-#: src/properties.cpp:541
-msgid ""
-"EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
-"FocalPlaneYResolution."
+#: src/properties.cpp:161
+msgid "A document type; for example, novel, poem, or working paper."
 msgstr ""
 
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
-msgid "Subject Location"
+#: src/properties.cpp:167
+msgid "Tags List"
 msgstr ""
 
-#: src/properties.cpp:542
+#: src/properties.cpp:167
 msgid ""
-"EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
-"value is the horizontal pixel and the second value is the vertical pixel at "
-"which the main subject appears."
-msgstr ""
-
-#: src/properties.cpp:545 src/tags.cpp:657
-msgid "Exposure Index"
+"The list of complete tags path as string. The path hierarchy is separated by "
+"'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
 msgstr ""
 
-#: src/properties.cpp:545
-msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
+#: src/properties.cpp:168
+msgid "Captions Author Names"
 msgstr ""
 
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
-msgid "Sensing Method"
+#: src/properties.cpp:168
+msgid ""
+"The list of all captions author names for each language alternative captions "
+"set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:546
-msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
+#: src/properties.cpp:169
+msgid "Captions Date Time Stamps"
 msgstr ""
 
-#: src/properties.cpp:547
-msgid "EXIF tag 41728, 0xA300. Indicates image source."
+#: src/properties.cpp:169
+msgid ""
+"The list of all captions date time stamps for each language alternative "
+"captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:548 src/tags.cpp:1364
-msgid "Scene Type"
-msgstr ""
+#: src/properties.cpp:170 src/tags.cpp:842
+#, fuzzy
+msgid "Image History"
+msgstr "Kuvan tyyppi"
 
-#: src/properties.cpp:548
-msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
+#: src/properties.cpp:170
+msgid ""
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
 msgstr ""
 
-#: src/properties.cpp:549 src/tags.cpp:572
-msgid "CFA Pattern"
-msgstr ""
+#: src/properties.cpp:171
+#, fuzzy
+msgid "Lens Correction Settings"
+msgstr "Kameran asetukset"
 
-#: src/properties.cpp:549
+#: src/properties.cpp:171
 msgid ""
-"EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
-"sense."
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
 msgstr ""
 
-#: src/properties.cpp:550 src/tags.cpp:1374
-msgid "Custom Rendered"
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
 msgstr ""
 
-#: src/properties.cpp:550
+#: src/properties.cpp:177
 msgid ""
-"EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
-"data."
+"The list of files processed with Enfuse program through ExpoBlending tool."
 msgstr ""
 
-#: src/properties.cpp:551
-msgid ""
-"EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
-"shot."
-msgstr ""
+#: src/properties.cpp:178
+#, fuzzy
+msgid "Enfuse Settings"
+msgstr "Kameran asetukset"
 
-#: src/properties.cpp:552
+#: src/properties.cpp:178
 msgid ""
-"EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
-"was shot."
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
 msgstr ""
 
-#: src/properties.cpp:553 src/tags.cpp:1388
-msgid "Digital Zoom Ratio"
+#: src/properties.cpp:184
+msgid "Advisory"
 msgstr ""
 
-#: src/properties.cpp:553
+#: src/properties.cpp:184
 msgid ""
-"EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
-"shot."
+"An unordered array specifying properties that were edited outside the "
+"authoring application. Each item should contain a single namespace and XPath "
+"separated by one ASCII space (U+0020)."
 msgstr ""
 
-#: src/properties.cpp:554 src/tags.cpp:1393
-msgid "Focal Length In 35mm Film"
+#: src/properties.cpp:187
+msgid "Base URL"
 msgstr ""
 
-#: src/properties.cpp:554
+#: src/properties.cpp:187
 msgid ""
-"EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
-"35mm film camera, in mm. A value of 0 means the focal length is unknown. "
-"Note that this tag differs from the FocalLength tag."
+"The base URL for relative URLs in the document content. If this document "
+"contains Internet links, and those links are relative, they are relative to "
+"this base URL. This property provides a standard way for embedded relative "
+"URLs to be interpreted by tools. Web authoring tools should set the value "
+"based on their notion of where URLs will be interpreted."
 msgstr ""
 
-#: src/properties.cpp:557 src/tags.cpp:1399
-msgid "Scene Capture Type"
+#: src/properties.cpp:192
+msgid "Create Date"
 msgstr ""
 
-#: src/properties.cpp:557
-msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
+#: src/properties.cpp:192
+msgid "The date and time the resource was originally created."
 msgstr ""
 
-#: src/properties.cpp:558 src/tags.cpp:1404
-msgid "Gain Control"
+#: src/properties.cpp:193
+msgid "Creator Tool"
 msgstr ""
 
-#: src/properties.cpp:558
+#: src/properties.cpp:193
 msgid ""
-"EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
-"adjustment."
+"The name of the first known tool used to create the resource. If history is "
+"present in the metadata, this value should be equivalent to that of xmpMM:"
+"History's softwareAgent property."
 msgstr ""
 
-#: src/properties.cpp:559
+#: src/properties.cpp:196
 msgid ""
-"EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
-"applied by the camera."
+"An unordered array of text strings that unambiguously identify the resource "
+"within a given context. An array item may be qualified with xmpidq:Scheme to "
+"denote the formal identification system to which that identifier conforms. "
+"Note: The dc:identifier property is not used because it lacks a defined "
+"scheme qualifier and has been defined in the XMP Specification as a simple "
+"(single-valued) property."
 msgstr ""
 
-#: src/properties.cpp:560
-msgid ""
-"EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
-"applied by the camera."
-msgstr ""
+#: src/properties.cpp:201
+#, fuzzy
+msgid "Label"
+msgstr "Suuri"
 
-#: src/properties.cpp:561
+#: src/properties.cpp:201
 msgid ""
-"EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
-"applied by the camera."
+"A word or short phrase that identifies a document as a member of a user-"
+"defined collection. Used to organize documents in a file browser."
 msgstr ""
 
-#: src/properties.cpp:562 src/tags.cpp:1419
-msgid "Device Setting Description"
+#: src/properties.cpp:203
+msgid "Metadata Date"
 msgstr ""
 
-#: src/properties.cpp:562
+#: src/properties.cpp:203
 msgid ""
-"EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
-"conditions of a particular camera model."
+"The date and time that any metadata for this resource was last changed. It "
+"should be the same as or more recent than xmp:ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:563 src/tags.cpp:1424
-msgid "Subject Distance Range"
-msgstr ""
+#: src/properties.cpp:205
+#, fuzzy
+msgid "Modify Date"
+msgstr "Malli"
 
-#: src/properties.cpp:563
-msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
+#: src/properties.cpp:205
+msgid ""
+"The date and time the resource was last modified. Note: The value of this "
+"property is not necessarily the same as the file's system modification date "
+"because it is set before the file is saved."
 msgstr ""
 
-#: src/properties.cpp:564 src/tags.cpp:1427
-msgid "Image Unique ID"
+#: src/properties.cpp:208
+msgid "Nickname"
 msgstr ""
 
-#: src/properties.cpp:564
-msgid ""
-"EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
-"recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
-"and 128-bit fixed length."
+#: src/properties.cpp:208
+msgid "A short informal name for the resource."
 msgstr ""
 
-#: src/properties.cpp:566 src/tags.cpp:1501
-msgid "GPS Version ID"
-msgstr ""
+#: src/properties.cpp:209
+#, fuzzy
+msgid "Rating"
+msgstr "Varoitus"
 
-#: src/properties.cpp:566
+#: src/properties.cpp:209
 msgid ""
-"GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
-"period separators. The current value is \"2.0.0.0\"."
+"A number that indicates a document's status relative to other documents, "
+"used to organize documents in a file browser. Values are user-defined within "
+"an application-defined range."
 msgstr ""
 
-#: src/properties.cpp:568 src/tags.cpp:1512
-msgid "GPS Latitude"
-msgstr ""
+#: src/properties.cpp:212
+msgid "Thumbnails"
+msgstr "Näytekuvat"
 
-#: src/properties.cpp:568
+#: src/properties.cpp:212
 msgid ""
-"GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
+"An alternative array of thumbnail images for a file, which can differ in "
+"characteristics such as size or image encoding."
 msgstr ""
 
-#: src/properties.cpp:569 src/tags.cpp:1524
-msgid "GPS Longitude"
+#: src/properties.cpp:219
+msgid "Certificate"
 msgstr ""
 
-#: src/properties.cpp:569
-msgid ""
-"GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
+#: src/properties.cpp:219
+msgid "Online rights management certificate."
 msgstr ""
 
-#: src/properties.cpp:570 src/tags.cpp:1532
-msgid "GPS Altitude Reference"
+#: src/properties.cpp:220
+msgid "Marked"
 msgstr ""
 
-#: src/properties.cpp:570
-msgid ""
-"GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
+#: src/properties.cpp:220
+msgid "Indicates that this is a rights-managed resource."
 msgstr ""
 
-#: src/properties.cpp:571 src/tags.cpp:1540
-msgid "GPS Altitude"
-msgstr ""
+#: src/properties.cpp:221
+#, fuzzy
+msgid "Owner"
+msgstr "Omistajan nimi"
 
-#: src/properties.cpp:571
-msgid "GPS tag 6, 0x06. Indicates altitude in meters."
+#: src/properties.cpp:221
+msgid "An unordered array specifying the legal owner(s) of a resource."
 msgstr ""
 
-#: src/properties.cpp:572 src/tags.cpp:1544
-msgid "GPS Time Stamp"
+#: src/properties.cpp:222
+msgid "Usage Terms"
 msgstr ""
 
-#: src/properties.cpp:572
-msgid ""
-"GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
-"data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
-"EXIF 2.2. The GPS timestamp in EXIF 2.1 does not include a date. If not "
-"present, the date component for the XMP should be taken from exif:"
-"DateTimeOriginal, or if that is also lacking from exif:DateTimeDigitized. If "
-"no date is available, do not write exif:GPSTimeStamp to XMP."
+#: src/properties.cpp:222
+msgid "Text instructions on how a resource can be legally used."
 msgstr ""
 
-#: src/properties.cpp:578 src/tags.cpp:1549
-msgid "GPS Satellites"
+#: src/properties.cpp:223
+msgid "Web Statement"
 msgstr ""
 
-#: src/properties.cpp:578
-msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
+#: src/properties.cpp:223
+msgid ""
+"The location of a web page describing the owner and/or rights statement for "
+"this resource."
 msgstr ""
 
-#: src/properties.cpp:579 src/tags.cpp:1556
-msgid "GPS Status"
+#: src/properties.cpp:229
+msgid "Derived From"
 msgstr ""
 
-#: src/properties.cpp:579
-msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
+#: src/properties.cpp:229
+msgid ""
+"A reference to the original document from which this one is derived. It is a "
+"minimal reference; missing components can be assumed to be unchanged. For "
+"example, a new version might only need to specify the instance ID and "
+"version number of the previous version, or a rendition might only need to "
+"specify the instance ID and rendition class of the original."
 msgstr ""
 
-#: src/properties.cpp:580 src/tags.cpp:1561
-msgid "GPS Measure Mode"
+#: src/properties.cpp:234
+msgid "Document ID"
 msgstr ""
 
-#: src/properties.cpp:580
-msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
+#: src/properties.cpp:234
+msgid ""
+"The common identifier for all versions and renditions of a document. It "
+"should be based on a UUID; see Document and Instance IDs below."
 msgstr ""
 
-#: src/properties.cpp:581
-msgid "GPS DOP"
-msgstr ""
+#: src/properties.cpp:236
+#, fuzzy
+msgid "History"
+msgstr "Kuvan tyyppi"
 
-#: src/properties.cpp:581
-msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
+#: src/properties.cpp:236
+msgid ""
+"An ordered array of high-level user actions that resulted in this resource. "
+"It is intended to give human readers a general indication of the steps taken "
+"to make the changes from the previous version to this one. The list should "
+"be at an abstract level; it is not intended to be an exhaustive keystroke or "
+"other detailed history."
 msgstr ""
 
-#: src/properties.cpp:582 src/tags.cpp:1569
-msgid "GPS Speed Reference"
-msgstr ""
+#: src/properties.cpp:240
+#, fuzzy
+msgid "Instance ID"
+msgstr "Sisäinen salama"
 
-#: src/properties.cpp:582
-msgid "GPS tag 12, 0x0C. Units used to speed measurement."
+#: src/properties.cpp:240
+msgid ""
+"An identifier for a specific incarnation of a document, updated each time a "
+"file is saved. It should be based on a UUID; see Document and Instance IDs "
+"below."
 msgstr ""
 
-#: src/properties.cpp:583 src/tags.cpp:1573
-msgid "GPS Speed"
+#: src/properties.cpp:242
+msgid "Managed From"
 msgstr ""
 
-#: src/properties.cpp:583
-msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
+#: src/properties.cpp:242
+msgid ""
+"A reference to the document as it was prior to becoming managed. It is set "
+"when a managed document is introduced to an asset management system that "
+"does not currently own it. It may or may not include references to different "
+"management systems."
 msgstr ""
 
-#: src/properties.cpp:584
-msgid "GPS Track Reference"
-msgstr ""
+#: src/properties.cpp:245
+#, fuzzy
+msgid "Manager"
+msgstr "Suuri"
 
-#: src/properties.cpp:584
-msgid "GPS tag 14, 0x0E. Reference for movement direction."
+#: src/properties.cpp:245
+msgid ""
+"The name of the asset management system that manages this resource. Along "
+"with xmpMM: ManagerVariant, it tells applications which asset management "
+"system to contact concerning this document."
 msgstr ""
 
-#: src/properties.cpp:585 src/tags.cpp:1580
-msgid "GPS Track"
+#: src/properties.cpp:248
+msgid "Manage To"
 msgstr ""
 
-#: src/properties.cpp:585
+#: src/properties.cpp:248
 msgid ""
-"GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
+"A URI identifying the managed resource to the asset management system; the "
+"presence of this property is the formal indication that this resource is "
+"managed. The form and content of this URI is private to the asset management "
+"system."
 msgstr ""
 
-#: src/properties.cpp:586 src/tags.cpp:1584
-msgid "GPS Image Direction Reference"
+#: src/properties.cpp:251
+msgid "Manage UI"
 msgstr ""
 
-#: src/properties.cpp:586
-msgid "GPS tag 16, 0x10. Reference for image direction."
+#: src/properties.cpp:251
+msgid ""
+"A URI that can be used to access information about the managed resource "
+"through a web browser. It might require a custom browser plug-in."
 msgstr ""
 
-#: src/properties.cpp:587 src/tags.cpp:1588
-msgid "GPS Image Direction"
+#: src/properties.cpp:253
+msgid "Manager Variant"
 msgstr ""
 
-#: src/properties.cpp:587
+#: src/properties.cpp:253
 msgid ""
-"GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
-"359.99."
+"Specifies a particular variant of the asset management system. The format of "
+"this property is private to the specific asset management system."
 msgstr ""
 
-#: src/properties.cpp:588 src/tags.cpp:1592
-msgid "GPS Map Datum"
+#: src/properties.cpp:255
+msgid "Rendition Class"
 msgstr ""
 
-#: src/properties.cpp:588
-msgid "GPS tag 18, 0x12. Geodetic survey data."
+#: src/properties.cpp:255
+msgid ""
+"The rendition class name for this resource. This property should be absent "
+"or set to default for a document version that is not a derived rendition."
 msgstr ""
 
-#: src/properties.cpp:589 src/tags.cpp:1600
-msgid "GPS Destination Latitude"
+#: src/properties.cpp:257
+msgid "Rendition Params"
 msgstr ""
 
-#: src/properties.cpp:589
+#: src/properties.cpp:257
 msgid ""
-"GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
-"destination latitude."
+"Can be used to provide additional rendition parameters that are too complex "
+"or verbose to encode in xmpMM: RenditionClass."
 msgstr ""
 
-#: src/properties.cpp:590 src/tags.cpp:1612
-msgid "GPS Destination Longitude"
-msgstr ""
+#: src/properties.cpp:259
+#, fuzzy
+msgid "Version ID"
+msgstr "Ohjelman versio"
 
-#: src/properties.cpp:590
+#: src/properties.cpp:259
 msgid ""
-"GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
-"longitude."
+"The document version identifier for this resource. Each version of a "
+"document gets a new identifier, usually simply by incrementing integers 1, "
+"2, 3 . . . and so on. Media management systems can have other conventions or "
+"support branching which requires a more complex scheme."
 msgstr ""
 
-#: src/properties.cpp:591 src/tags.cpp:1619
-msgid "GPS Destination Bearing Reference"
-msgstr ""
+#: src/properties.cpp:263
+#, fuzzy
+msgid "Versions"
+msgstr "Ohjelman versio"
 
-#: src/properties.cpp:591
-msgid "GPS tag 23, 0x17. Reference for movement direction."
+#: src/properties.cpp:263
+msgid ""
+"The version history associated with this resource. Entry [1] is the oldest "
+"known version for this document, entry [last()] is the most recent version. "
+"Typically, a media management system would fill in the version information "
+"in the metadata on check-in. It is not guaranteed that a complete history  "
+"versions from the first to this one will be present in the xmpMM:Versions "
+"property. Interior version information can be compressed or eliminated and "
+"the version history can be truncated at some point."
 msgstr ""
 
-#: src/properties.cpp:592 src/tags.cpp:1623
-msgid "GPS Destination Bearing"
+#: src/properties.cpp:269
+msgid "Last URL"
 msgstr ""
 
-#: src/properties.cpp:592
-msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
+#: src/properties.cpp:269
+msgid "Deprecated for privacy protection."
 msgstr ""
 
-#: src/properties.cpp:593
-msgid "GPS Destination Distance Refefrence"
+#: src/properties.cpp:270
+msgid "Rendition Of"
 msgstr ""
 
-#: src/properties.cpp:593
-msgid "GPS tag 25, 0x19. Units used for speed measurement."
+#: src/properties.cpp:270
+msgid ""
+"Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
+"which this is a rendition."
 msgstr ""
 
-#: src/properties.cpp:594 src/tags.cpp:1631
-msgid "GPS Destination Distance"
+#: src/properties.cpp:272
+msgid "Save ID"
 msgstr ""
 
-#: src/properties.cpp:594
-msgid "GPS tag 26, 0x1A. Distance to destination."
+#: src/properties.cpp:272
+msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
 msgstr ""
 
-#: src/properties.cpp:595 src/tags.cpp:1634
-msgid "GPS Processing Method"
+#: src/properties.cpp:278
+msgid "Job Reference"
 msgstr ""
 
-#: src/properties.cpp:595
+#: src/properties.cpp:278
 msgid ""
-"GPS tag 27, 0x1B. A character string recording the name of the method used "
-"for location finding."
+"References an external job management file for a job process in which the "
+"document is being used. Use of job names is under user control. Typical use "
+"would be to identify all documents that are part of a particular job or "
+"contract. There are multiple values because there can be more than one job "
+"using a particular document at any time, and it can also be useful to keep "
+"historical information about what jobs a document was part of previously."
 msgstr ""
 
-#: src/properties.cpp:596 src/tags.cpp:1639
-msgid "GPS Area Information"
-msgstr ""
+#: src/properties.cpp:287
+#, fuzzy
+msgid "Maximum Page Size"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:596
+#: src/properties.cpp:287
 msgid ""
-"GPS tag 28, 0x1C. A character string recording the name of the GPS area."
+"The size of the largest page in the document (including any in contained "
+"documents)."
 msgstr ""
 
-#: src/properties.cpp:597 src/tags.cpp:1647
-msgid "GPS Differential"
+#: src/properties.cpp:288
+msgid "Number of Pages"
 msgstr ""
 
-#: src/properties.cpp:597
+#: src/properties.cpp:288
 msgid ""
-"GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
-"the GPS receiver."
+"The number of pages in the document (including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:603
+#: src/properties.cpp:289
+#, fuzzy
+msgid "Fonts"
+msgstr "kuukautta"
+
+#: src/properties.cpp:289
 msgid ""
-"A description of the lens used to take the photograph. For example, \"70-200 "
-"mm f/2.8-4.0\"."
+"An unordered array of fonts that are used in the document (including any in "
+"contained documents)."
 msgstr ""
 
-#: src/properties.cpp:604
-msgid "SerialNumber"
-msgstr ""
+#: src/properties.cpp:290
+#, fuzzy
+msgid "Colorants"
+msgstr "Väriavaruus"
 
-#: src/properties.cpp:604
+#: src/properties.cpp:290
 msgid ""
-"The serial number of the camera or camera body used to take the photograph."
+"An ordered array of colorants (swatches) that are used in the document "
+"(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:610
-msgid "Contact Info-City"
-msgstr ""
+#: src/properties.cpp:291
+#, fuzzy
+msgid "Plate Names"
+msgstr "Tiedostonimi"
 
-#: src/properties.cpp:610
-msgid "The contact information city part."
+#: src/properties.cpp:291
+msgid ""
+"An ordered array of plate names that are needed to print the document "
+"(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:611
-msgid "Contact Info-Country"
+#: src/properties.cpp:297
+msgid "Project Reference"
 msgstr ""
 
-#: src/properties.cpp:611
-msgid "The contact information country part."
+#: src/properties.cpp:297
+msgid "A reference to the project that created this file."
 msgstr ""
 
-#: src/properties.cpp:612
-msgid "Contact Info-Address"
+#: src/properties.cpp:298
+msgid "Video Frame Rate"
 msgstr ""
 
-#: src/properties.cpp:612
-msgid ""
-"The contact information address part. Comprises an optional company name and "
-"all required information to locate the building or postbox to which mail "
-"should be sent."
+#: src/properties.cpp:298
+msgid "The video frame rate. One of: 24, NTSC, PAL."
 msgstr ""
 
-#: src/properties.cpp:614
-msgid "Contact Info-Postal Code"
+#: src/properties.cpp:299
+msgid "Video Frame Size"
 msgstr ""
 
-#: src/properties.cpp:614
-msgid "The contact information part denoting the local postal code."
+#: src/properties.cpp:299
+msgid "The frame size. For example: w:720, h: 480, unit:pixels"
 msgstr ""
 
-#: src/properties.cpp:615
-msgid "Contact Info-State/Province"
+#: src/properties.cpp:300
+msgid "Video Pixel Aspect Ratio"
 msgstr ""
 
-#: src/properties.cpp:615
-msgid ""
-"The contact information part denoting regional information like state or "
-"province."
+#: src/properties.cpp:300
+msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
 msgstr ""
 
-#: src/properties.cpp:616
-msgid "Contact Info-Email"
+#: src/properties.cpp:301
+msgid "Video Pixel Depth"
 msgstr ""
 
-#: src/properties.cpp:616
-msgid "The contact information email address part."
+#: src/properties.cpp:301
+msgid ""
+"The size in bits of each color component of a pixel. Standard Windows 32-bit "
+"pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:617
-msgid "Contact Info-Phone"
+#: src/properties.cpp:303
+#, fuzzy
+msgid "Video Color Space"
+msgstr "Väriavaruus"
+
+#: src/properties.cpp:303
+msgid ""
+"The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
+"CCIR-709 (used for HD)."
 msgstr ""
 
-#: src/properties.cpp:617
-msgid "The contact information phone number part."
+#: src/properties.cpp:305
+msgid "Video Alpha Mode"
 msgstr ""
 
-#: src/properties.cpp:618
-msgid "Contact Info-Web URL"
+#: src/properties.cpp:305
+msgid "The alpha mode. One of: straight, pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:618
-msgid "The contact information web address part."
+#: src/properties.cpp:306
+msgid "Video Alpha Premultiple Color"
 msgstr ""
 
-#: src/properties.cpp:619
+#: src/properties.cpp:306
 msgid ""
-"Code of the country the content is focussing on -- either the country shown "
-"in visual media or referenced in text or audio media. This element is at the "
-"top/first level of a top-down geographical hierarchy. The code should be "
-"taken from ISO 3166 two or three letter code. The full name of a country "
-"should go to the \"Country\" element."
+"A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
+"is pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:623
-msgid "Creator's Contact Info"
+#: src/properties.cpp:308
+msgid "Video Alpha Unity Is Transparent"
 msgstr ""
 
-#: src/properties.cpp:623
-msgid ""
-"The creator's contact information provides all necessary information to get "
-"in contact with the creator of this news object and comprises a set of sub-"
-"properties for proper addressing."
+#: src/properties.cpp:308
+msgid "When true, unity is clear, when false, it is opaque."
 msgstr ""
 
-#: src/properties.cpp:625
-msgid "Intellectual Genre"
+#: src/properties.cpp:309
+#, fuzzy
+msgid "Video Compressor"
+msgstr "Pakkaus"
+
+#: src/properties.cpp:309
+msgid "Video compression used. For example, jpeg."
 msgstr ""
 
-#: src/properties.cpp:625
-msgid ""
-"Describes the nature, intellectual or journalistic characteristic of a news "
-"object, not specifically its content."
+#: src/properties.cpp:310
+msgid "Video Field Order"
 msgstr ""
 
-#: src/properties.cpp:627
-msgid ""
-"Name of a location the content is focussing on -- either the location shown "
-"in visual media or referenced by text or audio media. This location name "
-"could either be the name of a sublocation to a city or the name of a well "
-"known location or (natural) monument outside a city. In the sense of a "
-"sublocation to a city this element is at the fourth level of a top-down "
-"geographical hierarchy."
+#: src/properties.cpp:310
+msgid "The field order for video. One of: Upper, Lower, Progressive."
 msgstr ""
 
-#: src/properties.cpp:632
-msgid "IPTC Scene"
+#: src/properties.cpp:311
+msgid "Pull Down"
 msgstr ""
 
-#: src/properties.cpp:632
+#: src/properties.cpp:311
 msgid ""
-"Describes the scene of a photo content. Specifies one or more terms from the "
-"IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
-"in an unordered list."
+"The sampling phase of film to be converted to video (pull-down). One of: "
+"WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
+"WWWSS_24p, WWSSW_24p."
 msgstr ""
 
-#: src/properties.cpp:634
-msgid "IPTC Subject Code"
+#: src/properties.cpp:313
+msgid "Audio Sample Rate"
 msgstr ""
 
-#: src/properties.cpp:634
+#: src/properties.cpp:313
 msgid ""
-"Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
-"to categorize the content. Each Subject is represented as a string of 8 "
-"digits in an unordered list."
+"The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
 msgstr ""
 
-#: src/properties.cpp:641
-msgid "Additional model info"
+#: src/properties.cpp:314
+msgid "Audio Sample Type"
 msgstr ""
 
-#: src/properties.cpp:641
-msgid ""
-"Information about the ethnicity and other facts of the model(s) in a model-"
-"released image."
+#: src/properties.cpp:314
+msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:642
-msgid "Code of featured Organisation"
+#: src/properties.cpp:315
+msgid "Audio Channel Type"
 msgstr ""
 
-#: src/properties.cpp:642
-msgid ""
-"Code from controlled vocabulary for identyfing the organisation or company "
-"which is featured in the image."
+#: src/properties.cpp:315
+msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
 msgstr ""
 
-#: src/properties.cpp:643
-msgid "Controlled Vocabulary Term"
+#: src/properties.cpp:316
+#, fuzzy
+msgid "Audio Compressor"
+msgstr "Pakkaus"
+
+#: src/properties.cpp:316
+msgid "The audio compression used. For example, MP3."
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:317
+msgid "Speaker Placement"
+msgstr ""
+
+#: src/properties.cpp:317
 msgid ""
-"A term to describe the content of the image by a value from a Controlled "
-"Vocabulary."
+"A description of the speaker angles from center front in degrees. For "
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:319
 #, fuzzy
-msgid "Model age"
-msgstr "Malli"
+msgid "File Data Rate"
+msgstr "Tiedostonimi"
 
-#: src/properties.cpp:644
+#: src/properties.cpp:319
 msgid ""
-"Age of the human model(s) at the time this image was taken in a model "
-"released image."
+"The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
+"sec"
 msgstr ""
 
-#: src/properties.cpp:645
-msgid "Name of featured Organisation"
-msgstr ""
+#: src/properties.cpp:320
+#, fuzzy
+msgid "Tape Name"
+msgstr "Omistajan nimi"
 
-#: src/properties.cpp:645
-msgid "Name of the organisation or company which is featured in the image."
+#: src/properties.cpp:320
+msgid ""
+"The name of the tape from which the clip was captured, as set during the "
+"capture process."
 msgstr ""
 
-#: src/properties.cpp:646
-msgid "Person shown"
+#: src/properties.cpp:321
+msgid "Alternative Tape Name"
 msgstr ""
 
-#: src/properties.cpp:646
-msgid "Name of a person shown in the image."
+#: src/properties.cpp:321
+msgid ""
+"An alternative tape name, set via the project window or timecode dialog in "
+"Premiere. If an alternative name has been set and has not been reverted, "
+"that name is displayed."
 msgstr ""
 
-#: src/properties.cpp:647
-msgid "Digital Image Identifier"
+#: src/properties.cpp:323
+msgid "Start Time Code"
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:323
 msgid ""
-"Globally unique identifier for this digital image. It is created and applied "
-"by the creator of the digital image at the time of its creation. this value "
-"shall not be changed after that time."
+"The timecode of the first frame of video in the file, as obtained from the "
+"device control."
 msgstr ""
 
-#: src/properties.cpp:648
-msgid "Physical type of original photo"
+#: src/properties.cpp:324
+msgid "Alternative Time code"
 msgstr ""
 
-#: src/properties.cpp:648
-msgid "The type of the source digital file."
+#: src/properties.cpp:324
+msgid ""
+"A timecode set by the user. When specified, it is used instead of the "
+"startTimecode."
 msgstr ""
 
-#: src/properties.cpp:649
-msgid "Event"
-msgstr ""
+#: src/properties.cpp:325
+#, fuzzy
+msgid "Duration"
+msgstr "Värikylläisyys"
 
-#: src/properties.cpp:649
-msgid "Names or describes the specific event at which the photo was taken."
+#: src/properties.cpp:325
+msgid "The duration of the media file."
 msgstr ""
 
-#: src/properties.cpp:650
-msgid "Maximum available height"
+#: src/properties.cpp:326
+#, fuzzy
+msgid "Scene"
+msgstr "Linssi"
+
+#: src/properties.cpp:326
+msgid "The name of the scene."
 msgstr ""
 
-#: src/properties.cpp:650
-msgid ""
-"The maximum available height in pixels of the original photo from which this "
-"photo has been derived by downsizing."
+#: src/properties.cpp:327
+msgid "Shot Name"
 msgstr ""
 
-#: src/properties.cpp:651
-msgid "Maximum available width"
+#: src/properties.cpp:327
+msgid "The name of the shot or take."
 msgstr ""
 
-#: src/properties.cpp:651
-msgid ""
-"The maximum available width in pixels of the original photo from which this "
-"photo has been derived by downsizing."
+#: src/properties.cpp:328
+msgid "Shot Date"
 msgstr ""
 
-#: src/properties.cpp:652
-msgid "Registry Entry"
+#: src/properties.cpp:328
+msgid "The date and time when the video was shot."
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:329
+#, fuzzy
+msgid "Shot Location"
+msgstr "Värikylläisyys"
+
+#: src/properties.cpp:329
 msgid ""
-"Both a Registry Item Id and a Registry Organisation Id to record any "
-"registration of this digital image with a registry."
+"The name of the location where the video was shot. For example: "
+"\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
+"GPS values."
 msgstr ""
 
-#: src/properties.cpp:653
-msgid "Registry Entry-Item Identifier"
-msgstr ""
+#: src/properties.cpp:331
+#, fuzzy
+msgid "Log Comment"
+msgstr "Oma kommentti"
 
-#: src/properties.cpp:653
-msgid ""
-"A unique identifier created by a registry and applied by the creator of the "
-"digital image. This value shall not be changed after being applied. This "
-"identifier is linked to a corresponding Registry Organisation Identifier."
+#: src/properties.cpp:331
+#, fuzzy
+msgid "User's log comments."
+msgstr "Oma kommentti"
+
+#: src/properties.cpp:332
+msgid "Markers"
 msgstr ""
 
-#: src/properties.cpp:654
-msgid "Registry Entry-Organisation Identifier"
+#: src/properties.cpp:332
+msgid "An ordered list of markers"
 msgstr ""
 
-#: src/properties.cpp:654
-msgid ""
-"An identifier for the registry which issued the corresponding Registry Image "
-"Id."
+#: src/properties.cpp:333
+msgid "Contributed Media"
 msgstr ""
 
-#: src/properties.cpp:655
-msgid "IPTC Fields Last Edited"
+#: src/properties.cpp:333
+msgid "An unordered list of all media used to create this media."
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:334
+msgid "Absolute Peak Audio File Path"
+msgstr ""
+
+#: src/properties.cpp:334
+msgid ""
+"The absolute path to the file's peak audio file. If empty, no peak file "
+"exists."
+msgstr ""
+
+#: src/properties.cpp:335
+msgid "Relative Peak Audio File Path"
+msgstr ""
+
+#: src/properties.cpp:335
+msgid ""
+"The relative path to the file's peak audio file. If empty, no peak file "
+"exists."
+msgstr ""
+
+#: src/properties.cpp:336
+msgid "Video Modified Date"
+msgstr ""
+
+#: src/properties.cpp:336
+msgid "The date and time when the video was last modified."
+msgstr ""
+
+#: src/properties.cpp:337
+msgid "Audio Modified Date"
+msgstr ""
+
+#: src/properties.cpp:337
+msgid "The date and time when the audio was last modified."
+msgstr ""
+
+#: src/properties.cpp:338
+msgid "Metadata Modified Date"
+msgstr ""
+
+#: src/properties.cpp:338
+msgid "The date and time when the metadata was last modified."
+msgstr ""
+
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
+msgid "Artist"
+msgstr ""
+
+#: src/properties.cpp:339
+msgid "The name of the artist or artists."
+msgstr ""
+
+#: src/properties.cpp:340
+msgid "Album"
+msgstr ""
+
+#: src/properties.cpp:340
+msgid "The name of the album."
+msgstr ""
+
+#: src/properties.cpp:341
+#, fuzzy
+msgid "Track Number"
+msgstr "Sarjanumero"
+
+#: src/properties.cpp:341
+msgid ""
+"A numeric value indicating the order of the audio file within its original "
+"recording."
+msgstr ""
+
+#: src/properties.cpp:342
+msgid "Genre"
+msgstr ""
+
+#: src/properties.cpp:342
+msgid "The name of the genre."
+msgstr ""
+
+#: src/properties.cpp:343
+msgid "The copyright information."
+msgstr ""
+
+#: src/properties.cpp:344
+msgid "The date the title was released."
+msgstr ""
+
+#: src/properties.cpp:345
+msgid "Composer"
+msgstr ""
+
+#: src/properties.cpp:345
+msgid "The composer's name."
+msgstr ""
+
+#: src/properties.cpp:346
+msgid "Engineer"
+msgstr ""
+
+#: src/properties.cpp:346
+msgid "The engineer's name."
+msgstr ""
+
+#: src/properties.cpp:347
+msgid "Tempo"
+msgstr ""
+
+#: src/properties.cpp:347
+msgid "The audio's tempo."
+msgstr ""
+
+#: src/properties.cpp:348
+msgid "Instrument"
+msgstr ""
+
+#: src/properties.cpp:348
+msgid "The musical instrument."
+msgstr ""
+
+#: src/properties.cpp:349
+msgid "Intro Time"
+msgstr ""
+
+#: src/properties.cpp:349
+msgid "The duration of lead time for queuing music."
+msgstr ""
+
+#: src/properties.cpp:350
+msgid "Out Cue"
+msgstr ""
+
+#: src/properties.cpp:350
+msgid "The time at which to fade out."
+msgstr ""
+
+#: src/properties.cpp:351
+#, fuzzy
+msgid "Relative Timestamp"
+msgstr "Kuvan aikaleima"
+
+#: src/properties.cpp:351
+msgid "The start time of the media inside the audio project."
+msgstr ""
+
+#: src/properties.cpp:352
+msgid "Loop"
+msgstr ""
+
+#: src/properties.cpp:352
+msgid "When true, the clip can be looped seemlessly."
+msgstr ""
+
+#: src/properties.cpp:353
+msgid "Number Of Beats"
+msgstr ""
+
+#: src/properties.cpp:353
+msgid "The number of beats."
+msgstr ""
+
+#: src/properties.cpp:354
+msgid "Key"
+msgstr ""
+
+#: src/properties.cpp:354
+msgid ""
+"The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
+msgstr ""
+
+#: src/properties.cpp:355
+#, fuzzy
+msgid "Stretch Mode"
+msgstr "Makrotila"
+
+#: src/properties.cpp:355
+msgid ""
+"The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
+"Splice, Hybrid."
+msgstr ""
+
+#: src/properties.cpp:356
+msgid "Time Scale Parameters"
+msgstr ""
+
+#: src/properties.cpp:356
+msgid "Additional parameters for Time-Scale stretch mode."
+msgstr ""
+
+#: src/properties.cpp:357
+msgid "Resample Parameters"
+msgstr ""
+
+#: src/properties.cpp:357
+msgid "Additional parameters for Resample stretch mode."
+msgstr ""
+
+#: src/properties.cpp:358
+msgid "Beat Splice Parameters"
+msgstr ""
+
+#: src/properties.cpp:358
+msgid "Additional parameters for Beat Splice stretch mode."
+msgstr ""
+
+#: src/properties.cpp:359
+msgid "Time Signature"
+msgstr ""
+
+#: src/properties.cpp:359
+msgid ""
+"The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
+"12/8, other."
+msgstr ""
+
+#: src/properties.cpp:360
+#, fuzzy
+msgid "Scale Type"
+msgstr "Kuvan tyyppi"
+
+#: src/properties.cpp:360
+msgid ""
+"The musical scale used in the music. One of: Major, Minor, Both, Neither. "
+"Neither is most often used for instruments with no associated scale, such as "
+"drums."
+msgstr ""
+
+#: src/properties.cpp:367 src/tags.cpp:1076
+#, fuzzy
+msgid "Camera Serial Number"
+msgstr "Kameran sarjanumero"
+
+#: src/properties.cpp:367
+#, fuzzy
+msgid "Camera Serial Number."
+msgstr "Kameran sarjanumero"
+
+#: src/properties.cpp:368
+msgid "Date Acquired"
+msgstr ""
+
+#: src/properties.cpp:368
+msgid "Date Acquired."
+msgstr ""
+
+#: src/properties.cpp:369
+#, fuzzy
+msgid "Flash Manufacturer"
+msgstr "Valmistaja"
+
+#: src/properties.cpp:369
+#, fuzzy
+msgid "Flash Manufacturer."
+msgstr "Linssin valmistaja"
+
+#: src/properties.cpp:370
+#, fuzzy
+msgid "Flash Model."
+msgstr "Salaman malli"
+
+#: src/properties.cpp:371
+msgid "Last Keyword IPTC"
+msgstr ""
+
+#: src/properties.cpp:371
+msgid "Last Keyword IPTC."
+msgstr ""
+
+#: src/properties.cpp:372
+msgid "Last Keyword XMP"
+msgstr ""
+
+#: src/properties.cpp:372
+#, fuzzy
+msgid "Last Keyword XMP."
+msgstr "Asiasanat"
+
+#: src/properties.cpp:373
+msgid "Lens Manufacturer"
+msgstr "Linssin valmistaja"
+
+#: src/properties.cpp:373
+msgid "Lens Manufacturer."
+msgstr "Linssin valmistaja"
+
+#: src/properties.cpp:374
+msgid "Lens Model."
+msgstr "Linssin malli"
+
+#: src/properties.cpp:375
+msgid "Rating Percent"
+msgstr ""
+
+#: src/properties.cpp:375
+msgid "Rating Percent."
+msgstr ""
+
+#: src/properties.cpp:381
+msgid "Keywords."
+msgstr "Asiasanat"
+
+#: src/properties.cpp:382
+#, fuzzy
+msgid "PDF Version"
+msgstr "Ohjelman versio"
+
+#: src/properties.cpp:382
+msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
+msgstr ""
+
+#: src/properties.cpp:383
+msgid "Producer"
+msgstr ""
+
+#: src/properties.cpp:383
+msgid "The name of the tool that created the PDF document."
+msgstr ""
+
+#: src/properties.cpp:389
+msgid "Authors Position"
+msgstr ""
+
+#: src/properties.cpp:389
+msgid "By-line title."
+msgstr ""
+
+#: src/properties.cpp:390
+msgid "Caption Writer"
+msgstr ""
+
+#: src/properties.cpp:390
+msgid "Writer/editor."
+msgstr ""
+
+#: src/properties.cpp:391
+msgid "Category. Limited to 3 7-bit ASCII characters."
+msgstr ""
+
+#: src/properties.cpp:392
+msgid "City."
+msgstr ""
+
+#: src/properties.cpp:393
+msgid "Country/primary location."
+msgstr ""
+
+#: src/properties.cpp:394
+msgid "Credit."
+msgstr ""
+
+#: src/properties.cpp:395
+msgid ""
+"The date the intellectual content of the document was created (rather than "
+"the creation date of the physical representation), following IIM "
+"conventions. For example, a photo taken during the American Civil War would "
+"have a creation date during that epoch (1861-1865) rather than the date the "
+"photo was digitized for archiving."
+msgstr ""
+
+#: src/properties.cpp:399
+msgid "Headline."
+msgstr ""
+
+#: src/properties.cpp:400
+msgid "Special instructions."
+msgstr ""
+
+#: src/properties.cpp:401
+#, fuzzy
+msgid "Source."
+msgstr "Kuvalähde"
+
+#: src/properties.cpp:402
+#, fuzzy
+msgid "State"
+msgstr "Ohjelmisto"
+
+#: src/properties.cpp:402
+msgid "Province/state."
+msgstr ""
+
+#: src/properties.cpp:403
+msgid "Supplemental category."
+msgstr ""
+
+#: src/properties.cpp:404
+msgid "Original transmission reference."
+msgstr ""
+
+#: src/properties.cpp:405
+msgid "Urgency. Valid range is 1-8."
+msgstr ""
+
+#: src/properties.cpp:413
+msgid "inches"
+msgstr "tuumaa"
+
+#: src/properties.cpp:414 src/tags.cpp:247
+msgid "cm"
+msgstr "cm"
+
+#: src/properties.cpp:418
+msgid "Auto Brightness"
+msgstr ""
+
+#: src/properties.cpp:418
+msgid "When true, \"Brightness\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:419
+#, fuzzy
+msgid "Auto Contrast"
+msgstr "Kontrasti"
+
+#: src/properties.cpp:419
+msgid "When true, \"Contrast\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:420
+msgid "Auto Exposure"
+msgstr "Automaattivalotus"
+
+#: src/properties.cpp:420
+msgid "When true, \"Exposure\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:421
+msgid "Auto Shadows"
+msgstr ""
+
+#: src/properties.cpp:421
+msgid "When true,\"Shadows\" is automatically adjusted."
+msgstr ""
+
+#: src/properties.cpp:422
+msgid "Blue Hue"
+msgstr ""
+
+#: src/properties.cpp:422
+msgid "\"Blue Hue\" setting. Range -100 to 100."
+msgstr ""
+
+#: src/properties.cpp:423
+#, fuzzy
+msgid "Blue Saturation"
+msgstr "Värikylläisyys"
+
+#: src/properties.cpp:423
+msgid "\"Blue Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:424
+msgid "\"Brightness\" setting. Range 0 to +150."
+msgstr ""
+
+#: src/properties.cpp:425
+#, fuzzy
+msgid "Camera Profile"
+msgstr "Kameran malli"
+
+#: src/properties.cpp:425
+#, fuzzy
+msgid "\"Camera Profile\" setting."
+msgstr "Kameran asetukset"
+
+#: src/properties.cpp:426
+msgid "Chromatic Aberration Blue"
+msgstr ""
+
+#: src/properties.cpp:426
+msgid ""
+"\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:427
+msgid "Chromatic Aberration Red"
+msgstr ""
+
+#: src/properties.cpp:427
+msgid ""
+"\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:428
+msgid "Color Noise Reduction"
+msgstr ""
+
+#: src/properties.cpp:428
+msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:429
+msgid "\"Contrast\" setting. Range -50 to +100."
+msgstr ""
+
+#: src/properties.cpp:430
+msgid "When \"Has Crop\" is true, top of crop rectangle"
+msgstr ""
+
+#: src/properties.cpp:431
+msgid "When \"Has Crop\" is true, left of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:432
+msgid "Crop Bottom"
+msgstr ""
+
+#: src/properties.cpp:432
+msgid "When \"Has Crop\" is true, bottom of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:433
+#, fuzzy
+msgid "Crop Right"
+msgstr "Omistusoikeus"
+
+#: src/properties.cpp:433
+msgid "When \"Has Crop\" is true, right of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:434
+msgid "Crop Angle"
+msgstr ""
+
+#: src/properties.cpp:434
+msgid "When \"Has Crop\" is true, angle of crop rectangle."
+msgstr ""
+
+#: src/properties.cpp:435
+msgid "Width of resulting cropped image in CropUnits units."
+msgstr ""
+
+#: src/properties.cpp:436
+msgid "Height of resulting cropped image in CropUnits units."
+msgstr ""
+
+#: src/properties.cpp:437
+msgid "Crop Units"
+msgstr ""
+
+#: src/properties.cpp:437
+msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
+msgstr ""
+
+#: src/properties.cpp:438
+msgid "\"Exposure\" setting. Range -4.0 to +4.0."
+msgstr ""
+
+#: src/properties.cpp:439
+msgid "GreenHue"
+msgstr ""
+
+#: src/properties.cpp:439
+msgid "\"Green Hue\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:440
+#, fuzzy
+msgid "Green Saturation"
+msgstr "Värikylläisyys"
+
+#: src/properties.cpp:440
+msgid "\"Green Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:441
+msgid "Has Crop"
+msgstr ""
+
+#: src/properties.cpp:441
+msgid "When true, image has a cropping rectangle."
+msgstr ""
+
+#: src/properties.cpp:442
+#, fuzzy
+msgid "Has Settings"
+msgstr "Asetukset"
+
+#: src/properties.cpp:442
+msgid "When true, non-default camera raw settings."
+msgstr ""
+
+#: src/properties.cpp:443
+msgid "Luminance Smoothing"
+msgstr ""
+
+#: src/properties.cpp:443
+msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:444
+#, fuzzy
+msgid "Raw File Name"
+msgstr "Tiedostonimi"
+
+#: src/properties.cpp:444
+msgid "File name of raw file (not a complete path)."
+msgstr ""
+
+#: src/properties.cpp:445
+msgid "Red Hue"
+msgstr ""
+
+#: src/properties.cpp:445
+msgid "\"Red Hue\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:446
+#, fuzzy
+msgid "Red Saturation"
+msgstr "Värikylläisyys"
+
+#: src/properties.cpp:446
+msgid "\"Red Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:447
+msgid "\"Saturation\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:448
+#, fuzzy
+msgid "Shadows"
+msgstr "Varjo"
+
+#: src/properties.cpp:448
+msgid "\"Shadows\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:449
+msgid "Shadow Tint"
+msgstr ""
+
+#: src/properties.cpp:449
+msgid "\"Shadow Tint\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:450
+msgid "\"Sharpness\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:451
+msgid "\"Temperature\" setting. Range 2000 to 50000."
+msgstr ""
+
+#: src/properties.cpp:452
+msgid "Tint"
+msgstr ""
+
+#: src/properties.cpp:452
+msgid "\"Tint\" setting. Range -150 to +150."
+msgstr ""
+
+#: src/properties.cpp:453
+#, fuzzy
+msgid "Tone Curve"
+msgstr "Kontrasti"
+
+#: src/properties.cpp:453
+msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
+msgstr ""
+
+#: src/properties.cpp:454
+#, fuzzy
+msgid "Tone Curve Name"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:454
+msgid ""
+"The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
+"Contrast, Strong Contrast, Custom or a user-defined preset name."
+msgstr ""
+
+#: src/properties.cpp:456
+msgid "Version of Camera Raw plugin."
+msgstr ""
+
+#: src/properties.cpp:457
+msgid "Vignette Amount"
+msgstr ""
+
+#: src/properties.cpp:457
+msgid "\"Vignetting Amount\" setting. Range -100 to +100."
+msgstr ""
+
+#: src/properties.cpp:458
+msgid "Vignette Midpoint"
+msgstr ""
+
+#: src/properties.cpp:458
+msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
+msgstr ""
+
+#: src/properties.cpp:459
+msgid ""
+"\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
+"Tungsten, Fluorescent, Flash, Custom"
+msgstr ""
+
+#: src/properties.cpp:466
+msgid "TIFF tag 256, 0x100. Image width in pixels."
+msgstr ""
+
+#: src/properties.cpp:467 src/tags.cpp:425
+#, fuzzy
+msgid "Image Length"
+msgstr "Polttoväli"
+
+#: src/properties.cpp:467
+msgid "TIFF tag 257, 0x101. Image height in pixels."
+msgstr ""
+
+#: src/properties.cpp:468
+msgid "Bits Per Sample"
+msgstr ""
+
+#: src/properties.cpp:468
+msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
+msgstr ""
+
+#: src/properties.cpp:469 src/tags.cpp:435
+msgid "Compression"
+msgstr "Pakkaus"
+
+#: src/properties.cpp:469
+msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
+msgstr ""
+
+#: src/properties.cpp:470 src/tags.cpp:441
+msgid "Photometric Interpretation"
+msgstr ""
+
+#: src/properties.cpp:470
+msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
+msgstr ""
+
+#: src/properties.cpp:471
+msgid ""
+"TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
+"0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
+"right 4 = 0th row at bottom, 0th column at left 5 = 0th row at left, 0th "
+"column at top 6 = 0th row at right, 0th column at top 7 = 0th row at right, "
+"0th column at bottom 8 = 0th row at left, 0th column at bottom"
+msgstr ""
+
+#: src/properties.cpp:480
+msgid "Samples Per Pixel"
+msgstr ""
+
+#: src/properties.cpp:480
+msgid "TIFF tag 277, 0x115. Number of components per pixel."
+msgstr ""
+
+#: src/properties.cpp:481 src/tags.cpp:515
+msgid "Planar Configuration"
+msgstr ""
+
+#: src/properties.cpp:481
+msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
+msgstr ""
+
+#: src/properties.cpp:482
+msgid "YCbCr Sub Sampling"
+msgstr ""
+
+#: src/properties.cpp:482
+msgid ""
+"TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
+"YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
+msgstr ""
+
+#: src/properties.cpp:484 src/tags.cpp:718
+msgid "YCbCr Positioning"
+msgstr ""
+
+#: src/properties.cpp:484
+msgid ""
+"TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
+"centered; 2 = co-sited."
+msgstr ""
+
+#: src/properties.cpp:486
+#, fuzzy
+msgid "X Resolution"
+msgstr "Resoluutioyksikkö"
+
+#: src/properties.cpp:486
+msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
+msgstr ""
+
+#: src/properties.cpp:487
+#, fuzzy
+msgid "Y Resolution"
+msgstr "Resoluutioyksikkö"
+
+#: src/properties.cpp:487
+msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
+msgstr ""
+
+#: src/properties.cpp:488 src/tags.cpp:533
+msgid "Resolution Unit"
+msgstr "Resoluutioyksikkö"
+
+#: src/properties.cpp:488
+msgid ""
+"TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
+"of: 2 = inches; 3 = centimeters."
+msgstr ""
+
+#: src/properties.cpp:490 src/tags.cpp:538
+msgid "Transfer Function"
+msgstr ""
+
+#: src/properties.cpp:490
+msgid ""
+"TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
+"with 3 * 256 entries."
+msgstr ""
+
+#: src/properties.cpp:492 src/tags.cpp:570
+#, fuzzy
+msgid "White Point"
+msgstr "AF-piste"
+
+#: src/properties.cpp:492
+msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
+msgstr ""
+
+#: src/properties.cpp:493 src/tags.cpp:575
+msgid "Primary Chromaticities"
+msgstr ""
+
+#: src/properties.cpp:493
+msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
+msgstr ""
+
+#: src/properties.cpp:494
+msgid ""
+"TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
+msgstr ""
+
+#: src/properties.cpp:495
+#, fuzzy
+msgid "Reference Black White"
+msgstr "Mustavalkoinen"
+
+#: src/properties.cpp:495
+msgid "TIFF tag 532, 0x214. Reference black and white point values."
+msgstr ""
+
+#: src/properties.cpp:496 src/tags.cpp:550
+msgid "Date and Time"
+msgstr "Päiväys ja aika"
+
+#: src/properties.cpp:496
+msgid ""
+"TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
+"and time of image creation (no time zone in EXIF), stored in ISO 8601 "
+"format, not the original EXIF format. This property includes the value for "
+"the EXIF SubSecTime attribute. NOTE: This property is stored in XMP as xmp:"
+"ModifyDate."
+msgstr ""
+
+#: src/properties.cpp:502 src/tags.cpp:463
+#, fuzzy
+msgid "Image Description"
+msgstr "Kuvan vakautus"
+
+#: src/properties.cpp:502
+msgid ""
+"TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
+"in XMP as dc:description."
+msgstr ""
+
+#: src/properties.cpp:503
+msgid "Make"
+msgstr ""
+
+#: src/properties.cpp:503
+msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
+msgstr ""
+
+#: src/properties.cpp:504
+msgid "TIFF tag 272, 0x110. Model name or number of equipment."
+msgstr ""
+
+#: src/properties.cpp:505
+msgid ""
+"TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
+"property is stored in XMP as xmp:CreatorTool. "
+msgstr ""
+
+#: src/properties.cpp:507
+msgid ""
+"TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
+"property is stored in XMP as the first item in the dc:creator array."
+msgstr ""
+
+#: src/properties.cpp:509
+msgid ""
+"TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
+"in XMP as dc:rights."
+msgstr ""
+
+#: src/properties.cpp:516 src/tags.cpp:1388
+#, fuzzy
+msgid "Exif Version"
+msgstr "Ohjelman versio"
+
+#: src/properties.cpp:516
+msgid "EXIF tag 36864, 0x9000. EXIF version number."
+msgstr ""
+
+#: src/properties.cpp:517
+#, fuzzy
+msgid "Flashpix Version"
+msgstr "Firmwaren versio"
+
+#: src/properties.cpp:517
+msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
+msgstr ""
+
+#: src/properties.cpp:518
+msgid "EXIF tag 40961, 0xA001. Color space information"
+msgstr ""
+
+#: src/properties.cpp:519 src/tags.cpp:1399
+msgid "Components Configuration"
+msgstr ""
+
+#: src/properties.cpp:519
+msgid ""
+"EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
+"compressed data), 1 2 3 0 (other cases)."
+msgstr ""
+
+#: src/properties.cpp:521 src/tags.cpp:823
+msgid "Compressed Bits Per Pixel"
+msgstr ""
+
+#: src/properties.cpp:521
+msgid ""
+"EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
+"indicated in unit bits per pixel."
+msgstr ""
+
+#: src/properties.cpp:523 src/tags.cpp:1483
+msgid "Pixel X Dimension"
+msgstr ""
+
+#: src/properties.cpp:523
+msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
+msgstr ""
+
+#: src/properties.cpp:524 src/tags.cpp:1490
+msgid "Pixel Y Dimension"
+msgstr ""
+
+#: src/properties.cpp:524
+msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
+msgstr ""
+
+#: src/properties.cpp:525 src/tags.cpp:1457
+msgid "User Comment"
+msgstr "Oma kommentti"
+
+#: src/properties.cpp:525
+msgid "EXIF tag 37510, 0x9286. Comments from user."
+msgstr ""
+
+#: src/properties.cpp:526 src/tags.cpp:1499
+msgid "Related Sound File"
+msgstr ""
+
+#: src/properties.cpp:526
+msgid ""
+"EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
+msgstr ""
+
+#: src/properties.cpp:527
+#, fuzzy
+msgid "Date and Time Original"
+msgstr "Päiväys ja aika"
+
+#: src/properties.cpp:527
+msgid ""
+"EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
+"time when original image was generated, in ISO 8601 format. Includes the "
+"EXIF SubSecTimeOriginal data."
+msgstr ""
+
+#: src/properties.cpp:530
+#, fuzzy
+msgid "Date and Time Digitized"
+msgstr "Päiväys ja aika"
+
+#: src/properties.cpp:530
+msgid ""
+"EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
+"time when image was stored as digital data, can be the same as "
+"DateTimeOriginal if originally stored in digital form. Stored in ISO 8601 "
+"format. Includes the EXIF SubSecTimeDigitized data."
+msgstr ""
+
+#: src/properties.cpp:534
+msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
+msgstr ""
+
+#: src/properties.cpp:535
+#, fuzzy
+msgid "F Number"
+msgstr "F-luku"
+
+#: src/properties.cpp:535
+msgid "EXIF tag 33437, 0x829D. F number."
+msgstr ""
+
+#: src/properties.cpp:536
+msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
+msgstr ""
+
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
+msgid "Spectral Sensitivity"
+msgstr ""
+
+#: src/properties.cpp:537
+msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
+msgstr ""
+
+#: src/properties.cpp:538
+#, fuzzy
+msgid "ISOSpeedRatings"
+msgstr "ISO-herkkyys"
+
+#: src/properties.cpp:538
+msgid ""
+"EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
+"specified in ISO 12232."
+msgstr ""
+
+#: src/properties.cpp:540 src/tags.cpp:812
+msgid "OECF"
+msgstr ""
+
+#: src/properties.cpp:540
+msgid ""
+"EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
+"ISO 14524."
+msgstr ""
+
+#: src/properties.cpp:541
+msgid ""
+"EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
+"specification."
+msgstr ""
+
+#: src/properties.cpp:542
+msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
+msgstr ""
+
+#: src/properties.cpp:543 src/tags.cpp:826
+#, fuzzy
+msgid "Brightness Value"
+msgstr "Aukko"
+
+#: src/properties.cpp:543
+msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
+msgstr ""
+
+#: src/properties.cpp:544
+msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
+msgstr ""
+
+#: src/properties.cpp:545
+#, fuzzy
+msgid "Maximum Aperture Value"
+msgstr "Aukko"
+
+#: src/properties.cpp:545
+msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
+msgstr ""
+
+#: src/properties.cpp:546
+msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
+msgstr ""
+
+#: src/properties.cpp:547
+msgid "EXIF tag 37383, 0x9207. Metering mode."
+msgstr ""
+
+#: src/properties.cpp:548
+msgid "EXIF tag 37384, 0x9208. Light source."
+msgstr ""
+
+#: src/properties.cpp:549
+msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
+msgstr ""
+
+#: src/properties.cpp:550
+msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
+msgstr ""
+
+#: src/properties.cpp:551 src/tags.cpp:1449
+#, fuzzy
+msgid "Subject Area"
+msgstr "Kohteen etäisyys"
+
+#: src/properties.cpp:551
+msgid ""
+"EXIF tag 37396, 0x9214. The location and area of the main subject in the "
+"overall scene."
+msgstr ""
+
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
+#, fuzzy
+msgid "Flash Energy"
+msgstr "Salaman tila"
+
+#: src/properties.cpp:552
+msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
+msgstr ""
+
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
+msgid "Spatial Frequency Response"
+msgstr ""
+
+#: src/properties.cpp:553
+msgid ""
+"EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
+"as specified in ISO 12233."
+msgstr ""
+
+#: src/properties.cpp:555 src/tags.cpp:837
+msgid "Focal Plane X Resolution"
+msgstr ""
+
+#: src/properties.cpp:555
+msgid ""
+"EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
+"unit."
+msgstr ""
+
+#: src/properties.cpp:556 src/tags.cpp:838
+msgid "Focal Plane Y Resolution"
+msgstr ""
+
+#: src/properties.cpp:556
+msgid ""
+"EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
+"unit."
+msgstr ""
+
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
+#, fuzzy
+msgid "Focal Plane Resolution Unit"
+msgstr "Resoluutioyksikkö"
+
+#: src/properties.cpp:557
+msgid ""
+"EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
+"FocalPlaneYResolution."
+msgstr ""
+
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
+#, fuzzy
+msgid "Subject Location"
+msgstr "Kohteen etäisyys"
+
+#: src/properties.cpp:558
+msgid ""
+"EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
+"value is the horizontal pixel and the second value is the vertical pixel at "
+"which the main subject appears."
+msgstr ""
+
+#: src/properties.cpp:561 src/tags.cpp:844
+#, fuzzy
+msgid "Exposure Index"
+msgstr "Valotustila"
+
+#: src/properties.cpp:561
+msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
+msgstr ""
+
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
+msgid "Sensing Method"
+msgstr ""
+
+#: src/properties.cpp:562
+msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
+msgstr ""
+
+#: src/properties.cpp:563
+msgid "EXIF tag 41728, 0xA300. Indicates image source."
+msgstr ""
+
+#: src/properties.cpp:564 src/tags.cpp:1554
+#, fuzzy
+msgid "Scene Type"
+msgstr "Linssin tyyppi"
+
+#: src/properties.cpp:564
+msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
+msgstr ""
+
+#: src/properties.cpp:565 src/tags.cpp:759
+msgid "CFA Pattern"
+msgstr ""
+
+#: src/properties.cpp:565
+msgid ""
+"EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
+"sense."
+msgstr ""
+
+#: src/properties.cpp:566 src/tags.cpp:1564
+msgid "Custom Rendered"
+msgstr ""
+
+#: src/properties.cpp:566
+msgid ""
+"EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
+"data."
+msgstr ""
+
+#: src/properties.cpp:567
+msgid ""
+"EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
+"shot."
+msgstr ""
+
+#: src/properties.cpp:568
+msgid ""
+"EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
+"was shot."
+msgstr ""
+
+#: src/properties.cpp:569 src/tags.cpp:1578
+#, fuzzy
+msgid "Digital Zoom Ratio"
+msgstr "Digitaalinen zoom"
+
+#: src/properties.cpp:569
+msgid ""
+"EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
+"shot."
+msgstr ""
+
+#: src/properties.cpp:570 src/tags.cpp:1583
+#, fuzzy
+msgid "Focal Length In 35mm Film"
+msgstr "Polttoväli"
+
+#: src/properties.cpp:570
+msgid ""
+"EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
+"35mm film camera, in mm. A value of 0 means the focal length is unknown. "
+"Note that this tag differs from the FocalLength tag."
+msgstr ""
+
+#: src/properties.cpp:573 src/tags.cpp:1589
+msgid "Scene Capture Type"
+msgstr ""
+
+#: src/properties.cpp:573
+msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
+msgstr ""
+
+#: src/properties.cpp:574 src/tags.cpp:1594
+#, fuzzy
+msgid "Gain Control"
+msgstr "Täysautomatiikka"
+
+#: src/properties.cpp:574
+msgid ""
+"EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
+"adjustment."
+msgstr ""
+
+#: src/properties.cpp:575
+msgid ""
+"EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
+"applied by the camera."
+msgstr ""
+
+#: src/properties.cpp:576
+msgid ""
+"EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
+"applied by the camera."
+msgstr ""
+
+#: src/properties.cpp:577
+msgid ""
+"EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
+"applied by the camera."
+msgstr ""
+
+#: src/properties.cpp:578 src/tags.cpp:1609
+msgid "Device Setting Description"
+msgstr ""
+
+#: src/properties.cpp:578
+msgid ""
+"EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
+"conditions of a particular camera model."
+msgstr ""
+
+#: src/properties.cpp:579 src/tags.cpp:1614
+#, fuzzy
+msgid "Subject Distance Range"
+msgstr "Kohteen etäisyys"
+
+#: src/properties.cpp:579
+msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
+msgstr ""
+
+#: src/properties.cpp:580 src/tags.cpp:1617
+#, fuzzy
+msgid "Image Unique ID"
+msgstr "Kuvan koko"
+
+#: src/properties.cpp:580
+msgid ""
+"EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
+"recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
+"and 128-bit fixed length."
+msgstr ""
+
+#: src/properties.cpp:582 src/tags.cpp:1691
+#, fuzzy
+msgid "GPS Version ID"
+msgstr "Ohjelman versio"
+
+#: src/properties.cpp:582
+msgid ""
+"GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
+"period separators. The current value is \"2.0.0.0\"."
+msgstr ""
+
+#: src/properties.cpp:584 src/tags.cpp:1702
+msgid "GPS Latitude"
+msgstr ""
+
+#: src/properties.cpp:584
+msgid ""
+"GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
+msgstr ""
+
+#: src/properties.cpp:585 src/tags.cpp:1714
+msgid "GPS Longitude"
+msgstr ""
+
+#: src/properties.cpp:585
+msgid ""
+"GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
+msgstr ""
+
+#: src/properties.cpp:586 src/tags.cpp:1722
+msgid "GPS Altitude Reference"
+msgstr ""
+
+#: src/properties.cpp:586
+msgid ""
+"GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
+msgstr ""
+
+#: src/properties.cpp:587 src/tags.cpp:1730
+msgid "GPS Altitude"
+msgstr ""
+
+#: src/properties.cpp:587
+msgid "GPS tag 6, 0x06. Indicates altitude in meters."
+msgstr ""
+
+#: src/properties.cpp:588 src/tags.cpp:1734
+msgid "GPS Time Stamp"
+msgstr ""
+
+#: src/properties.cpp:588
+msgid ""
+"GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
+"data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
+"EXIF 2.2. The GPS timestamp in EXIF 2.1 does not include a date. If not "
+"present, the date component for the XMP should be taken from exif:"
+"DateTimeOriginal, or if that is also lacking from exif:DateTimeDigitized. If "
+"no date is available, do not write exif:GPSTimeStamp to XMP."
+msgstr ""
+
+#: src/properties.cpp:594 src/tags.cpp:1739
+msgid "GPS Satellites"
+msgstr ""
+
+#: src/properties.cpp:594
+msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
+msgstr ""
+
+#: src/properties.cpp:595 src/tags.cpp:1746
+msgid "GPS Status"
+msgstr ""
+
+#: src/properties.cpp:595
+msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
+msgstr ""
+
+#: src/properties.cpp:596 src/tags.cpp:1751
+#, fuzzy
+msgid "GPS Measure Mode"
+msgstr "Valotustila"
+
+#: src/properties.cpp:596
+msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
+msgstr ""
+
+#: src/properties.cpp:597
+msgid "GPS DOP"
+msgstr ""
+
+#: src/properties.cpp:597
+msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
+msgstr ""
+
+#: src/properties.cpp:598 src/tags.cpp:1759
+msgid "GPS Speed Reference"
+msgstr ""
+
+#: src/properties.cpp:598
+msgid "GPS tag 12, 0x0C. Units used to speed measurement."
+msgstr ""
+
+#: src/properties.cpp:599 src/tags.cpp:1763
+#, fuzzy
+msgid "GPS Speed"
+msgstr "ISO-herkkyys"
+
+#: src/properties.cpp:599
+msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
+msgstr ""
+
+#: src/properties.cpp:600
+msgid "GPS Track Reference"
+msgstr ""
+
+#: src/properties.cpp:600
+msgid "GPS tag 14, 0x0E. Reference for movement direction."
+msgstr ""
+
+#: src/properties.cpp:601 src/tags.cpp:1770
+msgid "GPS Track"
+msgstr ""
+
+#: src/properties.cpp:601
+msgid ""
+"GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
+msgstr ""
+
+#: src/properties.cpp:602 src/tags.cpp:1774
+msgid "GPS Image Direction Reference"
+msgstr ""
+
+#: src/properties.cpp:602
+msgid "GPS tag 16, 0x10. Reference for image direction."
+msgstr ""
+
+#: src/properties.cpp:603 src/tags.cpp:1778
+#, fuzzy
+msgid "GPS Image Direction"
+msgstr "Kuvan numero"
+
+#: src/properties.cpp:603
+msgid ""
+"GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
+"359.99."
+msgstr ""
+
+#: src/properties.cpp:604 src/tags.cpp:1782
+msgid "GPS Map Datum"
+msgstr ""
+
+#: src/properties.cpp:604
+msgid "GPS tag 18, 0x12. Geodetic survey data."
+msgstr ""
+
+#: src/properties.cpp:605 src/tags.cpp:1790
+msgid "GPS Destination Latitude"
+msgstr ""
+
+#: src/properties.cpp:605
+msgid ""
+"GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
+"destination latitude."
+msgstr ""
+
+#: src/properties.cpp:606 src/tags.cpp:1802
+msgid "GPS Destination Longitude"
+msgstr ""
+
+#: src/properties.cpp:606
+msgid ""
+"GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
+"longitude."
+msgstr ""
+
+#: src/properties.cpp:607 src/tags.cpp:1809
+msgid "GPS Destination Bearing Reference"
+msgstr ""
+
+#: src/properties.cpp:607
+msgid "GPS tag 23, 0x17. Reference for movement direction."
+msgstr ""
+
+#: src/properties.cpp:608 src/tags.cpp:1813
+msgid "GPS Destination Bearing"
+msgstr ""
+
+#: src/properties.cpp:608
+msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
+msgstr ""
+
+#: src/properties.cpp:609
+msgid "GPS Destination Distance Refefrence"
+msgstr ""
+
+#: src/properties.cpp:609
+msgid "GPS tag 25, 0x19. Units used for speed measurement."
+msgstr ""
+
+#: src/properties.cpp:610 src/tags.cpp:1821
+#, fuzzy
+msgid "GPS Destination Distance"
+msgstr "Kohteen etäisyys"
+
+#: src/properties.cpp:610
+msgid "GPS tag 26, 0x1A. Distance to destination."
+msgstr ""
+
+#: src/properties.cpp:611 src/tags.cpp:1824
+msgid "GPS Processing Method"
+msgstr ""
+
+#: src/properties.cpp:611
+msgid ""
+"GPS tag 27, 0x1B. A character string recording the name of the method used "
+"for location finding."
+msgstr ""
+
+#: src/properties.cpp:612 src/tags.cpp:1829
+msgid "GPS Area Information"
+msgstr ""
+
+#: src/properties.cpp:612
+msgid ""
+"GPS tag 28, 0x1C. A character string recording the name of the GPS area."
+msgstr ""
+
+#: src/properties.cpp:613 src/tags.cpp:1837
+msgid "GPS Differential"
+msgstr ""
+
+#: src/properties.cpp:613
+msgid ""
+"GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
+"the GPS receiver."
+msgstr ""
+
+#: src/properties.cpp:619
+msgid ""
+"A description of the lens used to take the photograph. For example, \"70-200 "
+"mm f/2.8-4.0\"."
+msgstr ""
+
+#: src/properties.cpp:620
+#, fuzzy
+msgid "SerialNumber"
+msgstr "Sarjanumero"
+
+#: src/properties.cpp:620
+msgid ""
+"The serial number of the camera or camera body used to take the photograph."
+msgstr ""
+
+#: src/properties.cpp:626
+msgid "Contact Info-City"
+msgstr ""
+
+#: src/properties.cpp:626
+msgid "The contact information city part."
+msgstr ""
+
+#: src/properties.cpp:627
+msgid "Contact Info-Country"
+msgstr ""
+
+#: src/properties.cpp:627
+msgid "The contact information country part."
+msgstr ""
+
+#: src/properties.cpp:628
+msgid "Contact Info-Address"
+msgstr ""
+
+#: src/properties.cpp:628
+msgid ""
+"The contact information address part. Comprises an optional company name and "
+"all required information to locate the building or postbox to which mail "
+"should be sent."
+msgstr ""
+
+#: src/properties.cpp:630
+msgid "Contact Info-Postal Code"
+msgstr ""
+
+#: src/properties.cpp:630
+msgid "The contact information part denoting the local postal code."
+msgstr ""
+
+#: src/properties.cpp:631
+msgid "Contact Info-State/Province"
+msgstr ""
+
+#: src/properties.cpp:631
+msgid ""
+"The contact information part denoting regional information like state or "
+"province."
+msgstr ""
+
+#: src/properties.cpp:632
+msgid "Contact Info-Email"
+msgstr ""
+
+#: src/properties.cpp:632
+msgid "The contact information email address part."
+msgstr ""
+
+#: src/properties.cpp:633
+msgid "Contact Info-Phone"
+msgstr ""
+
+#: src/properties.cpp:633
+msgid "The contact information phone number part."
+msgstr ""
+
+#: src/properties.cpp:634
+msgid "Contact Info-Web URL"
+msgstr ""
+
+#: src/properties.cpp:634
+msgid "The contact information web address part."
+msgstr ""
+
+#: src/properties.cpp:635
+msgid ""
+"Code of the country the content is focussing on -- either the country shown "
+"in visual media or referenced in text or audio media. This element is at the "
+"top/first level of a top-down geographical hierarchy. The code should be "
+"taken from ISO 3166 two or three letter code. The full name of a country "
+"should go to the \"Country\" element."
+msgstr ""
+
+#: src/properties.cpp:639
+msgid "Creator's Contact Info"
+msgstr ""
+
+#: src/properties.cpp:639
+msgid ""
+"The creator's contact information provides all necessary information to get "
+"in contact with the creator of this news object and comprises a set of sub-"
+"properties for proper addressing."
+msgstr ""
+
+#: src/properties.cpp:641
+msgid "Intellectual Genre"
+msgstr ""
+
+#: src/properties.cpp:641
+msgid ""
+"Describes the nature, intellectual or journalistic characteristic of a news "
+"object, not specifically its content."
+msgstr ""
+
+#: src/properties.cpp:643
+msgid ""
+"Name of a location the content is focussing on -- either the location shown "
+"in visual media or referenced by text or audio media. This location name "
+"could either be the name of a sublocation to a city or the name of a well "
+"known location or (natural) monument outside a city. In the sense of a "
+"sublocation to a city this element is at the fourth level of a top-down "
+"geographical hierarchy."
+msgstr ""
+
+#: src/properties.cpp:648
+msgid "IPTC Scene"
+msgstr ""
+
+#: src/properties.cpp:648
+msgid ""
+"Describes the scene of a photo content. Specifies one or more terms from the "
+"IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
+"in an unordered list."
+msgstr ""
+
+#: src/properties.cpp:650
+#, fuzzy
+msgid "IPTC Subject Code"
+msgstr "Kohteen etäisyys"
+
+#: src/properties.cpp:650
+msgid ""
+"Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
+"to categorize the content. Each Subject is represented as a string of 8 "
+"digits in an unordered list."
+msgstr ""
+
+#: src/properties.cpp:657
+msgid "Additional model info"
+msgstr ""
+
+#: src/properties.cpp:657
+msgid ""
+"Information about the ethnicity and other facts of the model(s) in a model-"
+"released image."
+msgstr ""
+
+#: src/properties.cpp:658
+msgid "Code of featured Organisation"
+msgstr ""
+
+#: src/properties.cpp:658
+msgid ""
+"Code from controlled vocabulary for identyfing the organisation or company "
+"which is featured in the image."
+msgstr ""
+
+#: src/properties.cpp:659
+msgid "Controlled Vocabulary Term"
+msgstr ""
+
+#: src/properties.cpp:659
+msgid ""
+"A term to describe the content of the image by a value from a Controlled "
+"Vocabulary."
+msgstr ""
+
+#: src/properties.cpp:660
+#, fuzzy
+msgid "Model age"
+msgstr "Malli"
+
+#: src/properties.cpp:660
+msgid ""
+"Age of the human model(s) at the time this image was taken in a model "
+"released image."
+msgstr ""
+
+#: src/properties.cpp:661
+msgid "Name of featured Organisation"
+msgstr ""
+
+#: src/properties.cpp:661
+msgid "Name of the organisation or company which is featured in the image."
+msgstr ""
+
+#: src/properties.cpp:662
+msgid "Person shown"
+msgstr ""
+
+#: src/properties.cpp:662
+msgid "Name of a person shown in the image."
+msgstr ""
+
+#: src/properties.cpp:663
+msgid "Digital Image Identifier"
+msgstr ""
+
+#: src/properties.cpp:663
+msgid ""
+"Globally unique identifier for this digital image. It is created and applied "
+"by the creator of the digital image at the time of its creation. this value "
+"shall not be changed after that time."
+msgstr ""
+
+#: src/properties.cpp:664
+msgid "Physical type of original photo"
+msgstr ""
+
+#: src/properties.cpp:664
+msgid "The type of the source digital file."
+msgstr ""
+
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
+msgid "Event"
+msgstr ""
+
+#: src/properties.cpp:665
+msgid "Names or describes the specific event at which the photo was taken."
+msgstr ""
+
+#: src/properties.cpp:666
+msgid "Maximum available height"
+msgstr ""
+
+#: src/properties.cpp:666
+msgid ""
+"The maximum available height in pixels of the original photo from which this "
+"photo has been derived by downsizing."
+msgstr ""
+
+#: src/properties.cpp:667
+msgid "Maximum available width"
+msgstr ""
+
+#: src/properties.cpp:667
+msgid ""
+"The maximum available width in pixels of the original photo from which this "
+"photo has been derived by downsizing."
+msgstr ""
+
+#: src/properties.cpp:668
+msgid "Registry Entry"
+msgstr ""
+
+#: src/properties.cpp:668
+msgid ""
+"Both a Registry Item Id and a Registry Organisation Id to record any "
+"registration of this digital image with a registry."
+msgstr ""
+
+#: src/properties.cpp:669
+msgid "Registry Entry-Item Identifier"
+msgstr ""
+
+#: src/properties.cpp:669
+msgid ""
+"A unique identifier created by a registry and applied by the creator of the "
+"digital image. This value shall not be changed after being applied. This "
+"identifier is linked to a corresponding Registry Organisation Identifier."
+msgstr ""
+
+#: src/properties.cpp:670
+msgid "Registry Entry-Organisation Identifier"
+msgstr ""
+
+#: src/properties.cpp:670
+msgid ""
+"An identifier for the registry which issued the corresponding Registry Image "
+"Id."
+msgstr ""
+
+#: src/properties.cpp:671
+msgid "IPTC Fields Last Edited"
+msgstr ""
+
+#: src/properties.cpp:671
+msgid ""
+"The date and optionally time when any of the IPTC photo metadata fields has "
+"been last edited."
+msgstr ""
+
+#: src/properties.cpp:672
+msgid "Location shown"
+msgstr ""
+
+#: src/properties.cpp:672
+msgid "A location shown in the image."
+msgstr ""
+
+#: src/properties.cpp:673
+msgid "Location Created"
+msgstr ""
+
+#: src/properties.cpp:673
+msgid "The location the photo was taken."
+msgstr ""
+
+#: src/properties.cpp:674
+msgid "Location-City"
+msgstr ""
+
+#: src/properties.cpp:674
+msgid "Name of the city of a location."
+msgstr ""
+
+#: src/properties.cpp:675
+msgid "Location-Country ISO-Code"
+msgstr ""
+
+#: src/properties.cpp:675
+msgid "The ISO code of a country of a location."
+msgstr ""
+
+#: src/properties.cpp:676
+msgid "Location-Country Name"
+msgstr ""
+
+#: src/properties.cpp:676
+msgid "The name of a country of a location."
+msgstr ""
+
+#: src/properties.cpp:677
+msgid "Location-Province/State"
+msgstr ""
+
+#: src/properties.cpp:677
+msgid ""
+"The name of a subregion of a country - a province or state - of a location."
+msgstr ""
+
+#: src/properties.cpp:678
+msgid "Location-Sublocation"
+msgstr ""
+
+#: src/properties.cpp:678
+msgid ""
+"Name of a sublocation. This sublocation name could either be the name of a "
+"sublocation to a city or the name of a well known location or (natural) "
+"monument outside a city."
+msgstr ""
+
+#: src/properties.cpp:679
+msgid "Location-World Region"
+msgstr ""
+
+#: src/properties.cpp:679
+msgid "The name of a world region of a location."
+msgstr ""
+
+#: src/properties.cpp:680
+msgid "Artwork or object in the image"
+msgstr ""
+
+#: src/properties.cpp:680
+msgid "A set of metadata about artwork or an object in the image."
+msgstr ""
+
+#: src/properties.cpp:681
+msgid "Artwork or object-Copyright notice"
+msgstr ""
+
+#: src/properties.cpp:681
+msgid ""
+"Contains any necessary copyright notice for claiming the intellectual "
+"property for artwork or an object in the image and should identify the "
+"current owner of the copyright of this work with associated intellectual "
+"property rights."
+msgstr ""
+
+#: src/properties.cpp:682
+msgid "Artwork or object-Creator"
+msgstr ""
+
+#: src/properties.cpp:682
+msgid ""
+"Contains the name of the artist who has created artwork or an object in the "
+"image. In cases where the artist could or should not be identified the name "
+"of a company or organisation may be appropriate."
+msgstr ""
+
+#: src/properties.cpp:683
+msgid "Artwork or object-Date Created"
+msgstr ""
+
+#: src/properties.cpp:683
+msgid ""
+"Designates the date and optionally the time the artwork or object in the "
+"image was created. This relates to artwork or objects with associated "
+"intellectual property rights."
+msgstr ""
+
+#: src/properties.cpp:684
+msgid "Artwork or object-Source"
+msgstr ""
+
+#: src/properties.cpp:684
+msgid ""
+"The organisation or body holding and registering the artwork or object in "
+"the image for inventory purposes."
+msgstr ""
+
+#: src/properties.cpp:685
+msgid "Artwork or object-Source inventory number"
+msgstr ""
+
+#: src/properties.cpp:685
+msgid ""
+"The inventory number issued by the organisation or body holding and "
+"registering the artwork or object in the image."
+msgstr ""
+
+#: src/properties.cpp:686
+msgid "Artwork or object-Title"
+msgstr ""
+
+#: src/properties.cpp:686
+msgid "A reference for the artwork or object in the image."
+msgstr ""
+
+#: src/properties.cpp:693
+msgid "Scan from film"
+msgstr ""
+
+#: src/properties.cpp:694
+msgid "Scan from transparency (including slide)"
+msgstr ""
+
+#: src/properties.cpp:695
+msgid "Scan from print"
+msgstr ""
+
+#: src/properties.cpp:696
+#, fuzzy
+msgid "Camera RAW"
+msgstr "Kameran merkki"
+
+#: src/properties.cpp:697
+#, fuzzy
+msgid "Camera TIFF"
+msgstr "Kameran tyyppi"
+
+#: src/properties.cpp:698
+#, fuzzy
+msgid "Camera JPEG"
+msgstr "Kameran merkki"
+
+#: src/properties.cpp:703
+#, fuzzy
+msgid "PLUS Version"
+msgstr "Ohjelman versio"
+
+#: src/properties.cpp:703
+msgid ""
+"The version number of the PLUS standards in place at the time of the "
+"transaction."
+msgstr ""
+
+#: src/properties.cpp:704
+#, fuzzy
+msgid "Licensee"
+msgstr "Linssi"
+
+#: src/properties.cpp:704
+msgid ""
+"Party or parties to whom the license is granted by the Licensor/s under the "
+"license transaction."
+msgstr ""
+
+#: src/properties.cpp:705
+#, fuzzy
+msgid "Licensee ID"
+msgstr "Linssi"
+
+#: src/properties.cpp:705
+msgid "Optional PLUS-ID identifying each Licensee."
+msgstr ""
+
+#: src/properties.cpp:706
+#, fuzzy
+msgid "Licensee Name"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:706
+msgid "Name of each Licensee."
+msgstr ""
+
+#: src/properties.cpp:707
+#, fuzzy
+msgid "End User"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:707
+msgid "Party or parties ultimately making use of the image under the license."
+msgstr ""
+
+#: src/properties.cpp:708
+#, fuzzy
+msgid "End User ID"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:708
+msgid "Optional PLUS-ID identifying each End User."
+msgstr ""
+
+#: src/properties.cpp:709
+#, fuzzy
+msgid "End User Name"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:709
+msgid "Name of each End User."
+msgstr ""
+
+#: src/properties.cpp:710
+#, fuzzy
+msgid "Licensor"
+msgstr "Linssi"
+
+#: src/properties.cpp:710
+msgid "Party or parties granting the license to the Licensee."
+msgstr ""
+
+#: src/properties.cpp:711
+#, fuzzy
+msgid "Licensor ID"
+msgstr "Linssi"
+
+#: src/properties.cpp:711
+msgid "Optional PLUS-ID identifying each Licensor."
+msgstr ""
+
+#: src/properties.cpp:712
+#, fuzzy
+msgid "Licensor Name"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:712
+msgid "Name of each Licensor."
+msgstr ""
+
+#: src/properties.cpp:713
+#, fuzzy
+msgid "Licensor Address"
+msgstr "Linssin ominaisuudet"
+
+#: src/properties.cpp:713
+#, fuzzy
+msgid "Licensor street address."
+msgstr "Linssin ominaisuudet"
+
+#: src/properties.cpp:714
+msgid "Licensor Address Detail"
+msgstr ""
+
+#: src/properties.cpp:714
+msgid "Additional Licensor mailing address details."
+msgstr ""
+
+#: src/properties.cpp:715
+#, fuzzy
+msgid "Licensor City"
+msgstr "Linssin tyyppi"
+
+#: src/properties.cpp:715
+#, fuzzy
+msgid "Licensor City name."
+msgstr "Linssin tyyppi"
+
+#: src/properties.cpp:716
+msgid "Licensor State or Province"
+msgstr ""
+
+#: src/properties.cpp:716
+#, fuzzy
+msgid "Licensor State or Province name."
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:717
+#, fuzzy
+msgid "Licensor Postal Code"
+msgstr "Linssin ominaisuudet"
+
+#: src/properties.cpp:717
+msgid "Licensor Postal Code or Zip Code."
+msgstr ""
+
+#: src/properties.cpp:718
+#, fuzzy
+msgid "Licensor Country"
+msgstr "Linssin tyyppi"
+
+#: src/properties.cpp:718
+#, fuzzy
+msgid "Licensor Country name."
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:719
+#, fuzzy
+msgid "Licensor Telephone Type 1"
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:719
+#, fuzzy
+msgid "Licensor Telephone Type 1."
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:720
+#, fuzzy
+msgid "Licensor Telephone 1"
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:720
+#, fuzzy
+msgid "Licensor Telephone number 1."
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:721
+#, fuzzy
+msgid "Licensor Telephone Type 2"
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:721
+#, fuzzy
+msgid "Licensor Telephone Type 2."
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:722
+#, fuzzy
+msgid "Licensor Telephone 2"
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:722
+#, fuzzy
+msgid "Licensor Telephone number 2."
+msgstr "Linssin sarjanumero"
+
+#: src/properties.cpp:723
+#, fuzzy
+msgid "Licensor Email"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:723
+#, fuzzy
+msgid "Licensor Email address."
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:724
+#, fuzzy
+msgid "Licensor URL"
+msgstr "Linssi"
+
+#: src/properties.cpp:724
+msgid "Licensor world wide web address."
+msgstr ""
+
+#: src/properties.cpp:725
+#, fuzzy
+msgid "Licensor Notes"
+msgstr "Linssin ominaisuudet"
+
+#: src/properties.cpp:725
 msgid ""
-"The date and optionally time when any of the IPTC photo metadata fields has "
-"been last edited."
+"Supplemental information for use in identifying and contacting the Licensor/"
+"s."
 msgstr ""
 
-#: src/properties.cpp:656
-msgid "Location shown"
+#: src/properties.cpp:726
+msgid "PLUS Media Summary Code"
 msgstr ""
 
-#: src/properties.cpp:656
-msgid "A location shown in the image."
+#: src/properties.cpp:726
+msgid ""
+"A PLUS-standardized alphanumeric code string summarizing the media usages "
+"included in the license."
 msgstr ""
 
-#: src/properties.cpp:657
-msgid "Location Created"
+#: src/properties.cpp:727
+#, fuzzy
+msgid "License Start Date"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:727
+msgid "The date on which the license takes effect."
 msgstr ""
 
-#: src/properties.cpp:657
-msgid "The location the photo was taken."
+#: src/properties.cpp:728
+#, fuzzy
+msgid "License End Date"
+msgstr "Omistajan nimi"
+
+#: src/properties.cpp:728
+msgid "The date on which the license expires."
 msgstr ""
 
-#: src/properties.cpp:658
-msgid "Location-City"
+#: src/properties.cpp:729
+msgid "Media Constraints"
 msgstr ""
 
-#: src/properties.cpp:658
-msgid "Name of the city of a location."
+#: src/properties.cpp:729
+msgid ""
+"Constraints limiting the scope of PLUS Media Usage/s included in the license "
+"to particular named media or to media not yet specifically defined in the "
+"PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:659
-msgid "Location-Country ISO-Code"
+#: src/properties.cpp:730
+msgid "Region Constraints"
 msgstr ""
 
-#: src/properties.cpp:659
-msgid "The ISO code of a country of a location."
+#: src/properties.cpp:730
+msgid ""
+"Constraints limiting the scope of geographic distribution to specific "
+"cities, states, provinces or other areas to be included in or excluded from "
+"the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:660
-msgid "Location-Country Name"
+#: src/properties.cpp:731
+msgid "Product or Service Constraints"
 msgstr ""
 
-#: src/properties.cpp:660
-msgid "The name of a country of a location."
+#: src/properties.cpp:731
+msgid ""
+"Constraints limiting usage of the image to promotion of/association with a "
+"named product or service."
 msgstr ""
 
-#: src/properties.cpp:661
-msgid "Location-Province/State"
+#: src/properties.cpp:732
+msgid "Image File Constraints"
 msgstr ""
 
-#: src/properties.cpp:661
+#: src/properties.cpp:732
 msgid ""
-"The name of a subregion of a country - a province or state - of a location."
+"Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:662
-msgid "Location-Sublocation"
+#: src/properties.cpp:733
+msgid "Image Alteration Constraints"
 msgstr ""
 
-#: src/properties.cpp:662
+#: src/properties.cpp:733
 msgid ""
-"Name of a sublocation. This sublocation name could either be the name of a "
-"sublocation to a city or the name of a well known location or (natural) "
-"monument outside a city."
+"Constraints on alteration of the image by cropping, flipping, retouching, "
+"colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:663
-msgid "Location-World Region"
+#: src/properties.cpp:734
+msgid "Image Duplication Constraints"
 msgstr ""
 
-#: src/properties.cpp:663
-msgid "The name of a world region of a location."
+#: src/properties.cpp:734
+msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:664
-msgid "Artwork or object in the image"
+#: src/properties.cpp:735
+#, fuzzy
+msgid "Model Release Status"
+msgstr "Mallin ID"
+
+#: src/properties.cpp:735
+msgid ""
+"Summarizes the availability and scope of model releases authorizing usage of "
+"the likenesses of persons appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:664
-msgid "A set of metadata about artwork or an object in the image."
+#: src/properties.cpp:736
+#, fuzzy
+msgid "Model Release ID"
+msgstr "Mallin ID"
+
+#: src/properties.cpp:736
+msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:665
-msgid "Artwork or object-Copyright notice"
+#: src/properties.cpp:737
+msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:665
+#: src/properties.cpp:737
 msgid ""
-"Contains any necessary copyright notice for claiming the intellectual "
-"property for artwork or an object in the image and should identify the "
-"current owner of the copyright of this work with associated intellectual "
-"property rights."
+"Age of the youngest model pictured in the image, at the time that the image "
+"was made."
 msgstr ""
 
-#: src/properties.cpp:666
-msgid "Artwork or object-Creator"
+#: src/properties.cpp:738
+msgid "Property Release Status"
 msgstr ""
 
-#: src/properties.cpp:666
+#: src/properties.cpp:738
 msgid ""
-"Contains the name of the artist who has created artwork or an object in the "
-"image. In cases where the artist could or should not be identified the name "
-"of a company or organisation may be appropriate."
+"Summarizes the availability and scope of property releases authorizing usage "
+"of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:667
-msgid "Artwork or object-Date Created"
-msgstr ""
+#: src/properties.cpp:739
+#, fuzzy
+msgid "Property Release ID"
+msgstr "Mallin ID"
 
-#: src/properties.cpp:667
-msgid ""
-"Designates the date and optionally the time the artwork or object in the "
-"image was created. This relates to artwork or objects with associated "
-"intellectual property rights."
+#: src/properties.cpp:739
+msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:668
-msgid "Artwork or object-Source"
+#: src/properties.cpp:740
+msgid "Other Constraints"
 msgstr ""
 
-#: src/properties.cpp:668
-msgid ""
-"The organisation or body holding and registering the artwork or object in "
-"the image for inventory purposes."
+#: src/properties.cpp:740
+msgid "Additional constraints on the license."
 msgstr ""
 
-#: src/properties.cpp:669
-msgid "Artwork or object-Source inventory number"
+#: src/properties.cpp:741
+msgid "Credit Line Required"
 msgstr ""
 
-#: src/properties.cpp:669
-msgid ""
-"The inventory number issued by the organisation or body holding and "
-"registering the artwork or object in the image."
+#: src/properties.cpp:741
+msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:670
-msgid "Artwork or object-Title"
+#: src/properties.cpp:742
+msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:670
-msgid "A reference for the artwork or object in the image."
+#: src/properties.cpp:742
+msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:677
-msgid "Scan from film"
+#: src/properties.cpp:743
+msgid "Other License Requirements"
 msgstr ""
 
-#: src/properties.cpp:678
-msgid "Scan from transparency (including slide)"
+#: src/properties.cpp:743
+msgid "Additional license requirements."
 msgstr ""
 
-#: src/properties.cpp:679
-msgid "Scan from print"
+#: src/properties.cpp:744
+msgid "Terms and Conditions Text"
 msgstr ""
 
-#: src/properties.cpp:680
-#, fuzzy
-msgid "Camera RAW"
-msgstr "Kameran merkki"
-
-#: src/properties.cpp:681
-#, fuzzy
-msgid "Camera TIFF"
-msgstr "Kameran tyyppi"
-
-#: src/properties.cpp:682
-#, fuzzy
-msgid "Camera JPEG"
-msgstr "Kameran merkki"
-
-#: src/properties.cpp:687
-#, fuzzy
-msgid "PLUS Version"
-msgstr "Ohjelman versio"
+#: src/properties.cpp:744
+msgid "Terms and Conditions applying to the license."
+msgstr ""
 
-#: src/properties.cpp:687
-msgid ""
-"The version number of the PLUS standards in place at the time of the "
-"transaction."
+#: src/properties.cpp:745
+msgid "Terms and Conditions URL"
 msgstr ""
 
-#: src/properties.cpp:688
-#, fuzzy
-msgid "Licensee"
-msgstr "Linssi"
+#: src/properties.cpp:745
+msgid "URL for Terms and Conditions applying to the license."
+msgstr ""
 
-#: src/properties.cpp:688
-msgid ""
-"Party or parties to whom the license is granted by the Licensor/s under the "
-"license transaction."
+#: src/properties.cpp:746
+msgid "Other License Conditions"
 msgstr ""
 
-#: src/properties.cpp:689
-msgid "Licensee ID"
+#: src/properties.cpp:746
+msgid "Additional license conditions."
 msgstr ""
 
-#: src/properties.cpp:689
-msgid "Optional PLUS-ID identifying each Licensee."
+#: src/properties.cpp:747
+msgid "Identifies the type of image delivered."
 msgstr ""
 
-#: src/properties.cpp:690
+#: src/properties.cpp:748
 #, fuzzy
-msgid "Licensee Name"
+msgid "Licensor Image ID"
 msgstr "Omistajan nimi"
 
-#: src/properties.cpp:690
-msgid "Name of each Licensee."
+#: src/properties.cpp:748
+msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:691
-msgid "End User"
+#: src/properties.cpp:749
+msgid "Image File Name As Delivered"
 msgstr ""
 
-#: src/properties.cpp:691
-msgid "Party or parties ultimately making use of the image under the license."
+#: src/properties.cpp:749
+msgid ""
+"Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:692
-msgid "End User ID"
+#: src/properties.cpp:750
+msgid "Image File Format As Delivered"
 msgstr ""
 
-#: src/properties.cpp:692
-msgid "Optional PLUS-ID identifying each End User."
+#: src/properties.cpp:750
+msgid ""
+"File format of the image file delivered to the Licensee for use under the "
+"license."
 msgstr ""
 
-#: src/properties.cpp:693
-#, fuzzy
-msgid "End User Name"
-msgstr "Omistajan nimi"
-
-#: src/properties.cpp:693
-msgid "Name of each End User."
+#: src/properties.cpp:751
+msgid "Image File Size As Delivered"
 msgstr ""
 
-#: src/properties.cpp:694
-#, fuzzy
-msgid "Licensor"
-msgstr "Linssi"
-
-#: src/properties.cpp:694
-msgid "Party or parties granting the license to the Licensee."
+#: src/properties.cpp:751
+msgid "Size of the image file delivered to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:695
-msgid "Licensor ID"
-msgstr ""
+#: src/properties.cpp:752
+#, fuzzy
+msgid "Copyright Status"
+msgstr "Omistusoikeus"
 
-#: src/properties.cpp:695
-msgid "Optional PLUS-ID identifying each Licensor."
-msgstr ""
+#: src/properties.cpp:752
+#, fuzzy
+msgid "Copyright status of the image."
+msgstr "Omistusoikeus"
 
-#: src/properties.cpp:696
+#: src/properties.cpp:753
 #, fuzzy
-msgid "Licensor Name"
+msgid "Copyright Registration Number"
 msgstr "Omistajan nimi"
 
-#: src/properties.cpp:696
-msgid "Name of each Licensor."
-msgstr ""
-
-#: src/properties.cpp:697
-msgid "Licensor Address"
-msgstr ""
-
-#: src/properties.cpp:697
-msgid "Licensor street address."
+#: src/properties.cpp:753
+msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:698
-msgid "Licensor Address Detail"
+#: src/properties.cpp:754
+msgid "First Publication Date"
 msgstr ""
 
-#: src/properties.cpp:698
-msgid "Additional Licensor mailing address details."
+#: src/properties.cpp:754
+msgid "The date on which the image was first published."
 msgstr ""
 
-#: src/properties.cpp:699
+#: src/properties.cpp:755
 #, fuzzy
-msgid "Licensor City"
-msgstr "Linssin tyyppi"
-
-#: src/properties.cpp:699
-msgid "Licensor City name."
-msgstr ""
+msgid "Copyright Owner"
+msgstr "Omistusoikeus"
 
-#: src/properties.cpp:700
-msgid "Licensor State or Province"
+#: src/properties.cpp:755
+msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:700
-msgid "Licensor State or Province name."
-msgstr ""
+#: src/properties.cpp:756
+#, fuzzy
+msgid "Copyright Owner ID"
+msgstr "Omistusoikeus"
 
-#: src/properties.cpp:701
-msgid "Licensor Postal Code"
+#: src/properties.cpp:756
+msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:701
-msgid "Licensor Postal Code or Zip Code."
-msgstr ""
+#: src/properties.cpp:757
+#, fuzzy
+msgid "Copyright Owner Name"
+msgstr "Omistajan nimi"
 
-#: src/properties.cpp:702
-msgid "Licensor Country"
-msgstr ""
+#: src/properties.cpp:757
+#, fuzzy
+msgid "Name of Copyright Owner."
+msgstr "Omistusoikeus"
 
-#: src/properties.cpp:702
-msgid "Licensor Country name."
-msgstr ""
+#: src/properties.cpp:758
+#, fuzzy
+msgid "Copyright Owner Image ID"
+msgstr "Omistusoikeus"
 
-#: src/properties.cpp:703
-msgid "Licensor Telephone Type 1"
+#: src/properties.cpp:758
+msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:703
-msgid "Licensor Telephone Type 1."
-msgstr ""
+#: src/properties.cpp:759
+#, fuzzy
+msgid "Image Creator"
+msgstr "Kuvan numero"
 
-#: src/properties.cpp:704
-msgid "Licensor Telephone 1"
+#: src/properties.cpp:759
+msgid "Creator/s of the image."
 msgstr ""
 
-#: src/properties.cpp:704
+#: src/properties.cpp:760
 #, fuzzy
-msgid "Licensor Telephone number 1."
-msgstr "Linssin sarjanumero"
+msgid "Image Creator ID"
+msgstr "Kuvan numero"
 
-#: src/properties.cpp:705
-msgid "Licensor Telephone Type 2"
+#: src/properties.cpp:760
+msgid "Optional PLUS-ID identifying each Image Creator."
 msgstr ""
 
-#: src/properties.cpp:705
-msgid "Licensor Telephone Type 2."
-msgstr ""
+#: src/properties.cpp:761
+#, fuzzy
+msgid "Image Creator Name"
+msgstr "Kuvan aikaleima"
 
-#: src/properties.cpp:706
-msgid "Licensor Telephone 2"
-msgstr ""
+#: src/properties.cpp:761
+#, fuzzy
+msgid "Name of Image Creator."
+msgstr "Kuvan numero"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:762
 #, fuzzy
-msgid "Licensor Telephone number 2."
-msgstr "Linssin sarjanumero"
+msgid "Image Creator Image ID"
+msgstr "Kuvan aikaleima"
 
-#: src/properties.cpp:707
-msgid "Licensor Email"
+#: src/properties.cpp:762
+msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:707
-msgid "Licensor Email address."
-msgstr ""
+#: src/properties.cpp:763
+#, fuzzy
+msgid "Image Supplier ID"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:708
-msgid "Licensor URL"
+#: src/properties.cpp:763
+msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:708
-msgid "Licensor world wide web address."
-msgstr ""
+#: src/properties.cpp:764
+#, fuzzy
+msgid "Image Supplier Name"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:709
+#: src/properties.cpp:764
 #, fuzzy
-msgid "Licensor Notes"
-msgstr "Linssin ominaisuudet"
+msgid "Name of Image Supplier."
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:709
-msgid ""
-"Supplemental information for use in identifying and contacting the Licensor/"
-"s."
-msgstr ""
+#: src/properties.cpp:765
+#, fuzzy
+msgid "Image Supplier Image ID"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:710
-msgid "PLUS Media Summary Code"
+#: src/properties.cpp:765
+msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:710
-msgid ""
-"A PLUS-standardized alphanumeric code string summarizing the media usages "
-"included in the license."
-msgstr ""
+#: src/properties.cpp:766
+#, fuzzy
+msgid "Licensee Image ID"
+msgstr "Omistajan nimi"
 
-#: src/properties.cpp:711
-msgid "License Start Date"
+#: src/properties.cpp:766
+msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:711
-msgid "The date on which the license takes effect."
-msgstr ""
+#: src/properties.cpp:767
+#, fuzzy
+msgid "Licensee Image Notes"
+msgstr "Linssin ominaisuudet"
 
-#: src/properties.cpp:712
-msgid "License End Date"
+#: src/properties.cpp:767
+msgid "Notes added by Licensee."
 msgstr ""
 
-#: src/properties.cpp:712
-msgid "The date on which the license expires."
+#: src/properties.cpp:768
+msgid "Other Image Info"
 msgstr ""
 
-#: src/properties.cpp:713
-msgid "Media Constraints"
+#: src/properties.cpp:768
+msgid "Additional image information."
 msgstr ""
 
-#: src/properties.cpp:713
-msgid ""
-"Constraints limiting the scope of PLUS Media Usage/s included in the license "
-"to particular named media or to media not yet specifically defined in the "
-"PLUS Media Matrix."
+#: src/properties.cpp:769
+#, fuzzy
+msgid "License ID"
+msgstr "Linssi"
+
+#: src/properties.cpp:769
+msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:714
-msgid "Region Constraints"
+#: src/properties.cpp:770
+msgid "Licensor Transaction ID"
 msgstr ""
 
-#: src/properties.cpp:714
+#: src/properties.cpp:770
 msgid ""
-"Constraints limiting the scope of geographic distribution to specific "
-"cities, states, provinces or other areas to be included in or excluded from "
-"the PLUS Regions specified in the Media Usages specified in the license."
+"Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:715
-msgid "Product or Service Constraints"
+#: src/properties.cpp:771
+msgid "Licensee Transaction ID"
 msgstr ""
 
-#: src/properties.cpp:715
+#: src/properties.cpp:771
 msgid ""
-"Constraints limiting usage of the image to promotion of/association with a "
-"named product or service."
+"Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:716
-msgid "Image File Constraints"
+#: src/properties.cpp:772
+msgid "Licensee Project Reference"
 msgstr ""
 
-#: src/properties.cpp:716
-msgid ""
-"Constraints on the changing of the image file name, metadata or file type."
+#: src/properties.cpp:772
+msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:717
-msgid "Image Alteration Constraints"
+#: src/properties.cpp:773
+msgid "License Transaction Date"
 msgstr ""
 
-#: src/properties.cpp:717
-msgid ""
-"Constraints on alteration of the image by cropping, flipping, retouching, "
-"colorization, de-colorization or merging."
+#: src/properties.cpp:773
+msgid "The date of the License Transaction."
 msgstr ""
 
-#: src/properties.cpp:718
-msgid "Image Duplication Constraints"
+#: src/properties.cpp:774
+msgid "Reuse"
 msgstr ""
 
-#: src/properties.cpp:718
-msgid "Constraints on the creation of duplicates of the image."
+#: src/properties.cpp:774
+msgid ""
+"Indicates whether a license is a repeat or an initial license.  Reuse may "
+"require that licenses stored in files previously delivered to the customer "
+"be updated."
 msgstr ""
 
-#: src/properties.cpp:719
-msgid "Model Release Status"
+#: src/properties.cpp:775
+msgid "Other License Documents"
 msgstr ""
 
-#: src/properties.cpp:719
+#: src/properties.cpp:775
 msgid ""
-"Summarizes the availability and scope of model releases authorizing usage of "
-"the likenesses of persons appearing in the photograph."
+"Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:720
-#, fuzzy
-msgid "Model Release ID"
-msgstr "Mallin ID"
-
-#: src/properties.cpp:720
-msgid "Optional identifier associated with each Model Release."
+#: src/properties.cpp:776
+msgid "Other License Info"
 msgstr ""
 
-#: src/properties.cpp:721
-msgid "Minor Model Age Disclosure"
+#: src/properties.cpp:776
+msgid "Additional license information."
 msgstr ""
 
-#: src/properties.cpp:721
-msgid ""
-"Age of the youngest model pictured in the image, at the time that the image "
-"was made."
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
+msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:722
-msgid "Property Release Status"
+#: src/properties.cpp:780
+msgid "Custom 4"
 msgstr ""
 
-#: src/properties.cpp:722
-msgid ""
-"Summarizes the availability and scope of property releases authorizing usage "
-"of the properties appearing in the photograph."
+#: src/properties.cpp:781
+msgid "Custom 5"
 msgstr ""
 
-#: src/properties.cpp:723
-msgid "Property Release ID"
+#: src/properties.cpp:782
+msgid "Custom 6"
 msgstr ""
 
-#: src/properties.cpp:723
-msgid "Optional identifier associated with each Property Release."
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
+msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:724
-msgid "Other Constraints"
+#: src/properties.cpp:783
+msgid "Custom 7"
 msgstr ""
 
-#: src/properties.cpp:724
-msgid "Additional constraints on the license."
+#: src/properties.cpp:784
+msgid "Custom 8"
 msgstr ""
 
-#: src/properties.cpp:725
-msgid "Credit Line Required"
+#: src/properties.cpp:785
+msgid "Custom 9"
 msgstr ""
 
-#: src/properties.cpp:725
-msgid "Attribution requirements, if any."
+#: src/properties.cpp:786
+msgid "Custom 10"
 msgstr ""
 
-#: src/properties.cpp:726
-msgid "Adult Content Warning"
+#: src/properties.cpp:793
+msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:726
-msgid "Warning indicating the presence of content not suitable for minors."
+#: src/properties.cpp:794
+msgid "Not Required"
 msgstr ""
 
-#: src/properties.cpp:727
-msgid "Other License Requirements"
+#: src/properties.cpp:800
+msgid "Protected"
 msgstr ""
 
-#: src/properties.cpp:727
-msgid "Additional license requirements."
+#: src/properties.cpp:801
+msgid "Public Domain"
 msgstr ""
 
-#: src/properties.cpp:728
-msgid "Terms and Conditions Text"
+#: src/properties.cpp:807
+msgid "Credit Adjacent To Image"
 msgstr ""
 
-#: src/properties.cpp:728
-msgid "Terms and Conditions applying to the license."
+#: src/properties.cpp:808
+msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:729
-msgid "Terms and Conditions URL"
+#: src/properties.cpp:809
+msgid "Credit on Image"
 msgstr ""
 
-#: src/properties.cpp:729
-msgid "URL for Terms and Conditions applying to the license."
+#: src/properties.cpp:810
+msgid "Not Require"
 msgstr ""
 
-#: src/properties.cpp:730
-msgid "Other License Conditions"
+#: src/properties.cpp:815
+msgid "No Colorization"
 msgstr ""
 
-#: src/properties.cpp:730
-msgid "Additional license conditions."
+#: src/properties.cpp:816
+msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:731
-msgid "Identifies the type of image delivered."
+#: src/properties.cpp:817
+msgid "No De-Colorization"
 msgstr ""
 
-#: src/properties.cpp:732
-msgid "Licensor Image ID"
+#: src/properties.cpp:818
+msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:732
-msgid "Optional identifier assigned by the Licensor to the image."
+#: src/properties.cpp:819
+msgid "No Merging"
 msgstr ""
 
-#: src/properties.cpp:733
-msgid "Image File Name As Delivered"
+#: src/properties.cpp:820
+msgid "No Retouching"
 msgstr ""
 
-#: src/properties.cpp:733
-msgid ""
-"Name of the image file delivered to the Licensee for use under the license."
+#: src/properties.cpp:825
+msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:734
-msgid "Image File Format As Delivered"
+#: src/properties.cpp:826
+msgid "No Duplication Constraints"
 msgstr ""
 
-#: src/properties.cpp:734
-msgid ""
-"File format of the image file delivered to the Licensee for use under the "
-"license."
+#: src/properties.cpp:827
+msgid "No Duplication"
 msgstr ""
 
-#: src/properties.cpp:735
-msgid "Image File Size As Delivered"
+#: src/properties.cpp:832
+msgid "Maintain File Name"
 msgstr ""
 
-#: src/properties.cpp:735
-msgid "Size of the image file delivered to the Licensee."
+#: src/properties.cpp:833
+msgid "Maintain File Type"
 msgstr ""
 
-#: src/properties.cpp:736
-#, fuzzy
-msgid "Copyright Status"
-msgstr "Omistusoikeus"
-
-#: src/properties.cpp:736
-msgid "Copyright status of the image."
+#: src/properties.cpp:834
+msgid "Maintain ID in File Name"
 msgstr ""
 
-#: src/properties.cpp:737
-msgid "Copyright Registration Number"
+#: src/properties.cpp:835
+msgid "Maintain Metadata"
 msgstr ""
 
-#: src/properties.cpp:737
-msgid "Copyright Registration Number, if any, applying to the licensed image."
+#: src/properties.cpp:840
+msgid "Windows Bitmap (BMP)"
 msgstr ""
 
-#: src/properties.cpp:738
-msgid "First Publication Date"
+#: src/properties.cpp:841
+msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:738
-msgid "The date on which the image was first published."
+#: src/properties.cpp:842
+msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
-#: src/properties.cpp:739
-#, fuzzy
-msgid "Copyright Owner"
-msgstr "Omistusoikeus"
+#: src/properties.cpp:843
+msgid "Graphics Interchange Format (GIF)"
+msgstr ""
 
-#: src/properties.cpp:739
-msgid "Owner or owners of the copyright in the licensed image."
+#: src/properties.cpp:844
+msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
 msgstr ""
 
-#: src/properties.cpp:740
-#, fuzzy
-msgid "Copyright Owner ID"
-msgstr "Omistusoikeus"
+#: src/properties.cpp:846
+msgid "Macintosh Picture (PICT)"
+msgstr ""
 
-#: src/properties.cpp:740
-msgid "Optional PLUS-ID identifying each Copyright Owner."
+#: src/properties.cpp:847
+msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:741
-#, fuzzy
-msgid "Copyright Owner Name"
-msgstr "Omistajan nimi"
+#: src/properties.cpp:848
+msgid "Photoshop Document (PSD)"
+msgstr ""
 
-#: src/properties.cpp:741
-msgid "Name of Copyright Owner."
+#: src/properties.cpp:849
+msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:742
-msgid "Copyright Owner Image ID"
+#: src/properties.cpp:850
+msgid "Tagged Image File Format (TIFF)"
 msgstr ""
 
-#: src/properties.cpp:742
-msgid "Optional identifier assigned by the Copyright Owner to the image."
+#: src/properties.cpp:851
+msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:743
-#, fuzzy
-msgid "Image Creator"
-msgstr "Kuvan numero"
+#: src/properties.cpp:856
+msgid "Greater than 50 MB"
+msgstr ""
 
-#: src/properties.cpp:743
-msgid "Creator/s of the image."
+#: src/properties.cpp:857
+msgid "Up to 1 MB"
 msgstr ""
 
-#: src/properties.cpp:744
-msgid "Image Creator ID"
+#: src/properties.cpp:858
+msgid "Up to 10 MB"
 msgstr ""
 
-#: src/properties.cpp:744
-msgid "Optional PLUS-ID identifying each Image Creator."
+#: src/properties.cpp:859
+msgid "Up to 30 MB"
 msgstr ""
 
-#: src/properties.cpp:745
-#, fuzzy
-msgid "Image Creator Name"
-msgstr "Kuvan aikaleima"
+#: src/properties.cpp:860
+msgid "Up to 50 MB"
+msgstr ""
 
-#: src/properties.cpp:745
-msgid "Name of Image Creator."
+#: src/properties.cpp:865
+msgid "Illustrated Image"
 msgstr ""
 
-#: src/properties.cpp:746
-msgid "Image Creator Image ID"
+#: src/properties.cpp:866
+msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:746
-msgid "Optional identifier assigned by the Image Creator to the image."
+#: src/properties.cpp:868
+msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:747
-#, fuzzy
-msgid "Image Supplier ID"
-msgstr "Kuvan koko"
+#: src/properties.cpp:874
+msgid "Cell"
+msgstr ""
 
-#: src/properties.cpp:747
-msgid "Optional PLUS-ID identifying the Image Supplier."
+#: src/properties.cpp:875
+msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:748
+#: src/properties.cpp:877
 #, fuzzy
-msgid "Image Supplier Name"
-msgstr "Kuvan koko"
+msgid "Pager"
+msgstr "Suuri"
 
-#: src/properties.cpp:748
-msgid "Name of Image Supplier."
+#: src/properties.cpp:878
+msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:749
-msgid "Image Supplier Image ID"
-msgstr ""
+#: src/properties.cpp:883
+#, fuzzy
+msgid "Age Unknown"
+msgstr "Tuntematon"
 
-#: src/properties.cpp:749
-msgid "Optional identifier assigned by the Image Supplier to the image."
+#: src/properties.cpp:884
+msgid "Age 25 or Over"
 msgstr ""
 
-#: src/properties.cpp:750
-msgid "Licensee Image ID"
+#: src/properties.cpp:885
+msgid "Age 24"
 msgstr ""
 
-#: src/properties.cpp:750
-msgid "Optional identifier assigned by the Licensee to the image."
+#: src/properties.cpp:886
+msgid "Age 23"
 msgstr ""
 
-#: src/properties.cpp:751
-msgid "Licensee Image Notes"
+#: src/properties.cpp:887
+msgid "Age 22"
 msgstr ""
 
-#: src/properties.cpp:751
-msgid "Notes added by Licensee."
+#: src/properties.cpp:888
+msgid "Age 21"
 msgstr ""
 
-#: src/properties.cpp:752
-msgid "Other Image Info"
+#: src/properties.cpp:889
+msgid "Age 20"
 msgstr ""
 
-#: src/properties.cpp:752
-msgid "Additional image information."
+#: src/properties.cpp:890
+msgid "Age 19"
 msgstr ""
 
-#: src/properties.cpp:753
-msgid "License ID"
+#: src/properties.cpp:891
+msgid "Age 18"
 msgstr ""
 
-#: src/properties.cpp:753
-msgid "Optional PLUS-ID assigned by the Licensor to the License."
+#: src/properties.cpp:892
+msgid "Age 17"
 msgstr ""
 
-#: src/properties.cpp:754
-msgid "Licensor Transaction ID"
+#: src/properties.cpp:893
+msgid "Age 16"
 msgstr ""
 
-#: src/properties.cpp:754
-msgid ""
-"Identifier assigned by Licensor for Licensor's reference and internal use."
+#: src/properties.cpp:894
+msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:755
-msgid "Licensee Transaction ID"
+#: src/properties.cpp:895
+msgid "Age 14 or Under"
 msgstr ""
 
-#: src/properties.cpp:755
-msgid ""
-"Identifier assigned by Licensee for Licensee's reference and internal use."
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
+msgid "Not Applicable"
 msgstr ""
 
-#: src/properties.cpp:756
-msgid "Licensee Project Reference"
-msgstr ""
+#: src/properties.cpp:902
+#, fuzzy
+msgid "Unlimited Model Releases"
+msgstr "Mallin ID"
 
-#: src/properties.cpp:756
-msgid "Project reference name or description assigned by Licensee."
+#: src/properties.cpp:903
+msgid "Limited or Incomplete Model Releases"
 msgstr ""
 
-#: src/properties.cpp:757
-msgid "License Transaction Date"
+#: src/properties.cpp:910
+msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:757
-msgid "The date of the License Transaction."
+#: src/properties.cpp:911
+msgid "Limited or Incomplete Property Releases"
 msgstr ""
 
-#: src/properties.cpp:758
-msgid "Reuse"
+#: src/properties.cpp:917
+msgid "Repeat Use"
 msgstr ""
 
-#: src/properties.cpp:758
-msgid ""
-"Indicates whether a license is a repeat or an initial license.  Reuse may "
-"require that licenses stored in files previously delivered to the customer "
-"be updated."
+#: src/properties.cpp:921 src/properties.cpp:930
+msgid "Fixture Identification"
 msgstr ""
 
-#: src/properties.cpp:759
-msgid "Other License Documents"
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "Status"
 msgstr ""
 
-#: src/properties.cpp:759
-msgid ""
-"Reference information for additional documents associated with the license."
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
 msgstr ""
 
-#: src/properties.cpp:760
-msgid "Other License Info"
+#: src/properties.cpp:923 src/properties.cpp:932
+msgid "People"
 msgstr ""
 
-#: src/properties.cpp:760
-msgid "Additional license information."
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
 msgstr ""
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
-msgid "Optional field for use at Licensor's discretion."
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
 msgstr ""
 
-#: src/properties.cpp:764
-msgid "Custom 4"
-msgstr ""
+#: src/sigmamn.cpp:62
+#, fuzzy
+msgid "Resolution Mode"
+msgstr "Resoluutioyksikkö"
 
-#: src/properties.cpp:765
-msgid "Custom 5"
-msgstr ""
+#: src/sigmamn.cpp:63
+#, fuzzy
+msgid "Resolution mode"
+msgstr "Resoluutioyksikkö"
 
-#: src/properties.cpp:766
-msgid "Custom 6"
-msgstr ""
+#: src/sigmamn.cpp:65
+#, fuzzy
+msgid "Autofocus Mode"
+msgstr "Tarkennustapa"
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
-msgid "Optional field for use at Licensee's discretion."
-msgstr ""
+#: src/sigmamn.cpp:66
+#, fuzzy
+msgid "Autofocus mode"
+msgstr "Tarkennustapa"
 
-#: src/properties.cpp:767
-msgid "Custom 7"
-msgstr ""
+#: src/sigmamn.cpp:68
+#, fuzzy
+msgid "Focus Setting"
+msgstr "Asetukset"
 
-#: src/properties.cpp:768
-msgid "Custom 8"
-msgstr ""
+#: src/sigmamn.cpp:69
+#, fuzzy
+msgid "Focus setting"
+msgstr "Tarkennustapa"
 
-#: src/properties.cpp:769
-msgid "Custom 9"
-msgstr ""
+#: src/sigmamn.cpp:80
+#, fuzzy
+msgid "Lens Range"
+msgstr "Linssin tyyppi"
 
-#: src/properties.cpp:770
-msgid "Custom 10"
-msgstr ""
+#: src/sigmamn.cpp:81
+#, fuzzy
+msgid "Lens focal length range"
+msgstr "Polttoväli"
 
-#: src/properties.cpp:777
-msgid "Adult Content Warning Required"
-msgstr ""
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+#, fuzzy
+msgid "Shadow"
+msgstr "Varjo"
 
-#: src/properties.cpp:778
-msgid "Not Required"
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
+msgid "Highlight"
 msgstr ""
 
-#: src/properties.cpp:784
-msgid "Protected"
+#: src/sigmamn.cpp:104
+msgid "Fill Light"
 msgstr ""
 
-#: src/properties.cpp:785
-msgid "Public Domain"
+#: src/sigmamn.cpp:105
+msgid "X3 Fill light"
 msgstr ""
 
-#: src/properties.cpp:791
-msgid "Credit Adjacent To Image"
-msgstr ""
+#: src/sigmamn.cpp:107
+#, fuzzy
+msgid "Color Adjustment"
+msgstr "Väriavaruus"
 
-#: src/properties.cpp:792
-msgid "Credit in Credits Area"
-msgstr ""
+#: src/sigmamn.cpp:108
+#, fuzzy
+msgid "Color adjustment"
+msgstr "Väriavaruus"
 
-#: src/properties.cpp:793
-msgid "Credit on Image"
+#: src/sigmamn.cpp:110
+msgid "Adjustment Mode"
 msgstr ""
 
-#: src/properties.cpp:794
-msgid "Not Require"
+#: src/sigmamn.cpp:111
+msgid "Adjustment mode"
 msgstr ""
 
-#: src/properties.cpp:799
-msgid "No Colorization"
-msgstr ""
+#: src/sigmamn.cpp:122
+#, fuzzy
+msgid "Auto Bracket"
+msgstr "Auto, välähti"
 
-#: src/properties.cpp:800
-msgid "No Cropping"
-msgstr ""
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
+#, fuzzy
+msgid "Auto bracket"
+msgstr "Auto, välähti"
 
-#: src/properties.cpp:801
-msgid "No De-Colorization"
+#: src/sigmamn.cpp:127
+msgid "Unknown SigmaMakerNote tag"
 msgstr ""
 
-#: src/properties.cpp:802
-msgid "No Flipping"
+#: src/sigmamn.cpp:170
+msgid "8-Segment"
 msgstr ""
 
-#: src/properties.cpp:803
-msgid "No Merging"
+#: src/sonymn.cpp:88
+msgid "Standard "
 msgstr ""
 
-#: src/properties.cpp:804
-msgid "No Retouching"
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
 msgstr ""
 
-#: src/properties.cpp:809
-msgid "Duplication Only as Necessary Under License"
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
 msgstr ""
 
-#: src/properties.cpp:810
-msgid "No Duplication Constraints"
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
 msgstr ""
 
-#: src/properties.cpp:811
-msgid "No Duplication"
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
 msgstr ""
 
-#: src/properties.cpp:816
-msgid "Maintain File Name"
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
 msgstr ""
 
-#: src/properties.cpp:817
-msgid "Maintain File Type"
-msgstr ""
+#: src/sonymn.cpp:109
+#, fuzzy
+msgid "Landscape "
+msgstr "Maisemakuva"
 
-#: src/properties.cpp:818
-msgid "Maintain ID in File Name"
+#: src/sonymn.cpp:113
+msgid "Night Scene / Twilight"
 msgstr ""
 
-#: src/properties.cpp:819
-msgid "Maintain Metadata"
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
 msgstr ""
 
-#: src/properties.cpp:824
-msgid "Windows Bitmap (BMP)"
-msgstr ""
+#: src/sonymn.cpp:115
+#, fuzzy
+msgid "Twilight Portrait"
+msgstr "Muotokuva"
 
-#: src/properties.cpp:825
-msgid "Digital Negative (DNG)"
+#: src/sonymn.cpp:116
+msgid "Soft Snap"
 msgstr ""
 
-#: src/properties.cpp:826
-msgid "Encapsulated PostScript (EPS)"
+#: src/sonymn.cpp:118
+msgid "Smile Shutter"
 msgstr ""
 
-#: src/properties.cpp:827
-msgid "Graphics Interchange Format (GIF)"
+#: src/sonymn.cpp:120
+msgid "High Sensitivity"
 msgstr ""
 
-#: src/properties.cpp:828
-msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
 msgstr ""
 
-#: src/properties.cpp:830
-msgid "Macintosh Picture (PICT)"
+#: src/sonymn.cpp:123
+msgid "Gourmet"
 msgstr ""
 
-#: src/properties.cpp:831
-msgid "Portable Network Graphics (PNG)"
+#: src/sonymn.cpp:125
+msgid "Handheld Twilight"
 msgstr ""
 
-#: src/properties.cpp:832
-msgid "Photoshop Document (PSD)"
+#: src/sonymn.cpp:126
+msgid "Anti Motion Blur"
 msgstr ""
 
-#: src/properties.cpp:833
-msgid "Proprietary RAW Image Format"
+#: src/sonymn.cpp:128
+msgid "Backlight Correction HDR"
 msgstr ""
 
-#: src/properties.cpp:834
-msgid "Tagged Image File Format (TIFF)"
+#: src/sonymn.cpp:142
+msgid "On (Continuous)"
 msgstr ""
 
-#: src/properties.cpp:835
-msgid "Windows Media Photo (HD Photo)"
+#: src/sonymn.cpp:143
+msgid "On (Shooting)"
 msgstr ""
 
-#: src/properties.cpp:840
-msgid "Greater than 50 MB"
+#: src/sonymn.cpp:151
+msgid "Plus"
 msgstr ""
 
-#: src/properties.cpp:841
-msgid "Up to 1 MB"
-msgstr ""
+#: src/sonymn.cpp:167
+#, fuzzy
+msgid "White Flourescent"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:842
-msgid "Up to 10 MB"
-msgstr ""
+#: src/sonymn.cpp:168
+#, fuzzy
+msgid "Cool White Flourescent"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:843
-msgid "Up to 30 MB"
-msgstr ""
+#: src/sonymn.cpp:169
+#, fuzzy
+msgid "Day White Flourescent"
+msgstr "Valkoinen loisteputki"
 
-#: src/properties.cpp:844
-msgid "Up to 50 MB"
+#: src/sonymn.cpp:172
+msgid "Underwater 1 (Blue Water)"
 msgstr ""
 
-#: src/properties.cpp:849
-msgid "Illustrated Image"
+#: src/sonymn.cpp:173
+msgid "Underwater 2 (Green Water)"
 msgstr ""
 
-#: src/properties.cpp:850
-msgid "Multimedia or Composited Image"
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
 msgstr ""
 
-#: src/properties.cpp:852
-msgid "Photographic Image"
+#: src/sonymn.cpp:188
+msgid "Center AF"
 msgstr ""
 
-#: src/properties.cpp:853
-msgid "Video"
-msgstr ""
+#: src/sonymn.cpp:189
+#, fuzzy
+msgid "Spot AF"
+msgstr "Piste"
 
-#: src/properties.cpp:858
-msgid "Cell"
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
 msgstr ""
 
-#: src/properties.cpp:859
-msgid "FAX"
+#: src/sonymn.cpp:191
+msgid "Touch AF"
 msgstr ""
 
-#: src/properties.cpp:861
+#: src/sonymn.cpp:192
 #, fuzzy
-msgid "Pager"
-msgstr "Suuri"
+msgid "Manual Focus"
+msgstr "Käsintarkennus, MF"
 
-#: src/properties.cpp:862
-msgid "Work"
+#: src/sonymn.cpp:193
+msgid "Face Detected"
 msgstr ""
 
-#: src/properties.cpp:867
+#: src/sonymn.cpp:208
 #, fuzzy
-msgid "Age Unknown"
-msgstr "Tuntematon"
-
-#: src/properties.cpp:868
-msgid "Age 25 or Over"
-msgstr ""
-
-#: src/properties.cpp:869
-msgid "Age 24"
-msgstr ""
+msgid "Close Focus"
+msgstr "Automaattivalotus"
 
-#: src/properties.cpp:870
-msgid "Age 23"
-msgstr ""
+#: src/sonymn.cpp:224
+#, fuzzy
+msgid "Exposure Bracketing"
+msgstr "Valotusaika"
 
-#: src/properties.cpp:871
-msgid "Age 22"
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+msgid "Multi Burst Mode"
 msgstr ""
 
-#: src/properties.cpp:872
-msgid "Age 21"
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+msgid "Multi Burst Image Width"
 msgstr ""
 
-#: src/properties.cpp:873
-msgid "Age 20"
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+msgid "Multi Burst Image Height"
 msgstr ""
 
-#: src/properties.cpp:874
-msgid "Age 19"
-msgstr ""
+#: src/sonymn.cpp:315
+#, fuzzy
+msgid "JPEG preview image"
+msgstr "Esikatselu"
 
-#: src/properties.cpp:875
-msgid "Age 18"
+#: src/sonymn.cpp:341
+msgid "Auto HDR"
 msgstr ""
 
-#: src/properties.cpp:876
-msgid "Age 17"
+#: src/sonymn.cpp:342
+msgid "High Definition Range Mode"
 msgstr ""
 
-#: src/properties.cpp:877
-msgid "Age 16"
-msgstr ""
+#: src/sonymn.cpp:346
+#, fuzzy
+msgid "Shot Information"
+msgstr "Värikylläisyys"
 
-#: src/properties.cpp:878
-msgid "Age 15"
-msgstr ""
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+#, fuzzy
+msgid "Sony Model ID"
+msgstr "Mallin ID"
 
-#: src/properties.cpp:879
-msgid "Age 14 or Under"
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+msgid "Color Reproduction"
 msgstr ""
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
-msgid "Not Applicable"
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+msgid "Dynamic Range Optimizer"
 msgstr ""
 
-#: src/properties.cpp:886
-msgid "Unlimited Model Releases"
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+msgid "Minolta MakerNote"
 msgstr ""
 
-#: src/properties.cpp:887
-msgid "Limited or Incomplete Model Releases"
-msgstr ""
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+#, fuzzy
+msgid "Full Image Size"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:894
-msgid "Unlimited Property Releases"
-msgstr ""
+#: src/sonymn.cpp:387
+#, fuzzy
+msgid "Preview Image Size"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:895
-msgid "Limited or Incomplete Property Releases"
-msgstr ""
+#: src/sonymn.cpp:388
+#, fuzzy
+msgid "Preview image size"
+msgstr "Kuvan koko"
 
-#: src/properties.cpp:901
-msgid "Repeat Use"
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
 msgstr ""
 
-#: src/sigmamn.cpp:60
-msgid "Resolution Mode"
-msgstr ""
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Kuvanlaatu"
 
-#: src/sigmamn.cpp:61
-msgid "Resolution mode"
-msgstr ""
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
+#, fuzzy
+msgid "Release Mode"
+msgstr "Salaman tila"
 
-#: src/sigmamn.cpp:62
-msgid "Autofocus Mode"
+#: src/sonymn.cpp:415
+msgid "Shot number in continous burst mode"
 msgstr ""
 
-#: src/sigmamn.cpp:63
-msgid "Autofocus mode"
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+msgid "Anti-Blur"
 msgstr ""
 
-#: src/sigmamn.cpp:65
-msgid "Focus Setting"
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
+msgid "Long Exposure Noise Reduction"
 msgstr ""
 
-#: src/sigmamn.cpp:66
-msgid "Focus setting"
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
+msgid "Intelligent Auto"
 msgstr ""
 
-#: src/sigmamn.cpp:77
-msgid "Lens Range"
+#: src/sonymn.cpp:434
+msgid "Unknown Sony1MakerNote tag"
 msgstr ""
 
-#: src/sigmamn.cpp:78
-msgid "Lens focal length range"
+#: src/sonymn.cpp:448
+msgid "Continuous High"
 msgstr ""
 
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
-msgid "Shadow"
+#: src/sonymn.cpp:452
+msgid "Continuous Low"
 msgstr ""
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
-msgid "Highlight"
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
+msgid "D-Range Optimizer Bracketing Low"
 msgstr ""
 
-#: src/sigmamn.cpp:101
-msgid "Fill Light"
+#: src/sonymn.cpp:487
+msgid "Autumn"
 msgstr ""
 
-#: src/sigmamn.cpp:102
-msgid "X3 Fill light"
+#: src/sonymn.cpp:493
+msgid "ADI"
 msgstr ""
 
-#: src/sigmamn.cpp:104
-msgid "Color Adjustment"
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
 msgstr ""
 
-#: src/sigmamn.cpp:105
-msgid "Color adjustment"
-msgstr ""
+#: src/sonymn.cpp:529
+#, fuzzy
+msgid "Auto No Flash"
+msgstr "Ei salamaa"
 
-#: src/sigmamn.cpp:107
-msgid "Adjustment Mode"
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
+msgid "Dynamic Range Optimizer Level"
 msgstr ""
 
-#: src/sigmamn.cpp:108
-msgid "Adjustment mode"
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
+msgid "Creative Style"
 msgstr ""
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
+msgid "Zone Matching Value"
 msgstr ""
 
-#: src/sigmamn.cpp:119
-msgid "Auto Bracket"
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
+msgid "AF With Shutter"
 msgstr ""
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
-msgid "Auto bracket"
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+msgid "High ISO NoiseReduction"
 msgstr ""
 
-#: src/sigmamn.cpp:124
-msgid "Unknown SigmaMakerNote tag"
-msgstr ""
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
+#, fuzzy
+msgid "Image Style"
+msgstr "Kuvan tyyppi"
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
-msgstr ""
+#: src/sonymn.cpp:655
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings tag"
+msgstr "Kameran asetukset"
 
-#: src/sonymn.cpp:80
-msgid "Unknown SonyMakerNote tag"
-msgstr ""
+#: src/sonymn.cpp:719
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings 2 tag"
+msgstr "Kameran asetukset"
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
+#, fuzzy
 msgid "Unknown section"
-msgstr ""
+msgstr "Tuntematon"
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
 msgid "Image data structure"
 msgstr ""
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
 msgid "Recording offset"
 msgstr ""
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
 msgid "Image data characteristics"
 msgstr ""
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 msgid "Other data"
 msgstr ""
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
 msgid "Exif data structure"
 msgstr ""
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
+#, fuzzy
 msgid "Image configuration"
-msgstr ""
+msgstr "Kuvan vakautus"
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
 msgid "User information"
 msgstr ""
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
+#, fuzzy
 msgid "Related file"
-msgstr ""
+msgstr "tiedostoon"
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 msgid "Date and time"
 msgstr "Päiväys ja aika"
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
 msgid "Picture taking conditions"
 msgstr ""
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
 msgid "GPS information"
 msgstr ""
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
 msgid "Interoperability information"
 msgstr ""
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
 msgid "Vendor specific information"
 msgstr ""
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 msgid "Adobe DNG tags"
 msgstr ""
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
 msgid "Panasonic RAW tags"
 msgstr ""
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 msgid "TIFF/EP tags"
 msgstr ""
 
-#: src/tags.cpp:193
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
+msgstr ""
+
+#: src/tags.cpp:208
+msgid "Adobe OPI tags"
+msgstr ""
+
+#: src/tags.cpp:209
 msgid "Last section"
 msgstr ""
 
-#: src/tags.cpp:213
+#: src/tags.cpp:225
 msgid "Primary image"
 msgstr ""
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
+#, fuzzy
 msgid "Thumbnail/Preview image"
-msgstr ""
+msgstr "Näytekuva"
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
 msgid "Primary image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
 msgid "Thumbnail/Preview image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
 msgid "Primary image, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
 msgid "Thumbnail/Preview image, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+msgid "Full-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr ""
+
+#: src/tags.cpp:246
 msgid "inch"
 msgstr "tuuma"
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr ""
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr ""
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr ""
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
 msgstr ""
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
 msgstr "Jpeg (vanhahtava)"
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr "Jpeg"
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
 msgid "Adobe Deflate"
 msgstr ""
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
 msgstr ""
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 msgid "JBIG Color"
 msgstr ""
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr ""
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 msgid "Epson ERF Compressed"
 msgstr ""
 
-#: src/tags.cpp:244
+#: src/tags.cpp:264
+msgid "Samsung SRW Compressed"
+msgstr ""
+
+#: src/tags.cpp:265
 msgid "CCITT RLE 1-word"
 msgstr ""
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr ""
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr ""
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr ""
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr ""
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
 msgid "IT8 Monochrome Picture"
 msgstr ""
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr ""
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr ""
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr ""
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
 msgid "Pixar Deflate"
 msgstr ""
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr ""
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
 msgid "ISO JBIG"
 msgstr ""
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr ""
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr ""
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr ""
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 msgid "Nikon NEF Compressed"
 msgstr ""
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
 msgid "Kodak DCR Compressed"
 msgstr ""
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 msgid "Pentax PEF Compressed"
 msgstr ""
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
 msgid "White Is Zero"
 msgstr ""
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
+#, fuzzy
 msgid "Black Is Zero"
-msgstr ""
+msgstr "Mustavalko"
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr ""
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
 msgstr ""
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
 msgstr ""
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
 msgstr ""
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr ""
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr ""
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr ""
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr ""
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
 msgid "Color Filter Array"
 msgstr ""
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr ""
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr ""
 
-#: src/tags.cpp:279
+#: src/tags.cpp:300
 msgid "Linear Raw"
 msgstr ""
 
-#: src/tags.cpp:284
-msgid "top, left"
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
 msgstr ""
 
-#: src/tags.cpp:285
-msgid "top, right"
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+msgid "Randomized process"
 msgstr ""
 
-#: src/tags.cpp:286
+#: src/tags.cpp:312
+#, fuzzy
+msgid "top, left"
+msgstr "tiedostoon"
+
+#: src/tags.cpp:313
+#, fuzzy
+msgid "top, right"
+msgstr "Omistusoikeus"
+
+#: src/tags.cpp:314
 msgid "bottom, right"
 msgstr ""
 
-#: src/tags.cpp:287
+#: src/tags.cpp:315
 msgid "bottom, left"
 msgstr ""
 
-#: src/tags.cpp:288
+#: src/tags.cpp:316
 msgid "left, top"
 msgstr ""
 
-#: src/tags.cpp:289
+#: src/tags.cpp:317
 msgid "right, top"
 msgstr ""
 
-#: src/tags.cpp:290
+#: src/tags.cpp:318
 msgid "right, bottom"
 msgstr ""
 
-#: src/tags.cpp:291
+#: src/tags.cpp:319 src/tags.cpp:320
 msgid "left, bottom"
 msgstr ""
 
-#: src/tags.cpp:296
-msgid "Centered"
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
 msgstr ""
 
-#: src/tags.cpp:297
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+msgid "not CMYK"
+msgstr ""
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr ""
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
+msgstr ""
+
+#: src/tags.cpp:340 src/tags.cpp:341
+msgid "Undefined data format"
+msgstr ""
+
+#: src/tags.cpp:346
+msgid "Not indexed"
+msgstr ""
+
+#: src/tags.cpp:347 src/tags.cpp:653
+msgid "Indexed"
+msgstr ""
+
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
+
+#: src/tags.cpp:353
+msgid "B"
+msgstr ""
+
+#: src/tags.cpp:354
+msgid "C"
+msgstr ""
+
+#: src/tags.cpp:355
+msgid "A+B-C"
+msgstr ""
+
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:358
+msgid "(A+B)/2"
+msgstr ""
+
+#: src/tags.cpp:363
+#, fuzzy
+msgid "Centered"
+msgstr "Keskustaa painottava"
+
+#: src/tags.cpp:364
 msgid "Co-sited"
 msgstr ""
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
+#, fuzzy
 msgid "No flash"
-msgstr ""
+msgstr "Ei salamaa"
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 msgid "Fired, strobe return light not detected"
 msgstr ""
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 msgid "Fired, strobe return light detected"
 msgstr ""
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
+#, fuzzy
 msgid "Yes, did not fire"
-msgstr ""
+msgstr "Ei välähtänyt"
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
 msgid "Yes, compulsory"
 msgstr ""
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 msgid "Yes, compulsory, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 msgid "Yes, compulsory, return light detected"
 msgstr ""
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
 msgstr ""
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 msgid "No, did not fire, return not detected"
 msgstr ""
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 msgid "No, auto"
 msgstr ""
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 msgid "Yes, auto"
 msgstr ""
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 msgid "Yes, auto, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 msgid "Yes, auto, return light detected"
 msgstr ""
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 msgid "No flash function"
 msgstr ""
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 msgid "No, no flash function"
 msgstr ""
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
+#, fuzzy
 msgid "Yes, red-eye reduction"
-msgstr ""
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 msgid "Yes, red-eye reduction, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 msgid "Yes, red-eye reduction, return light detected"
 msgstr ""
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
+#, fuzzy
 msgid "Yes, compulsory, red-eye reduction"
-msgstr ""
+msgstr "Auto, välähti, punasilmäisyyden esto"
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr ""
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
+#, fuzzy
 msgid "No, red-eye reduction"
-msgstr ""
+msgstr "Päällä, punasilmäisyyden esto"
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
+#, fuzzy
 msgid "No, auto, red-eye reduction"
-msgstr ""
+msgstr "Auto, välähti, punasilmäisyyden esto"
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
+#, fuzzy
 msgid "Yes, auto, red-eye reduction"
-msgstr ""
+msgstr "Auto, välähti, punasilmäisyyden esto"
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr ""
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr ""
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
 msgstr ""
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 msgid "Processing Software"
 msgstr ""
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
 msgstr ""
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
 msgid "New Subfile Type"
 msgstr ""
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: src/tags.cpp:350
+#: src/tags.cpp:416
+msgid "Subfile Type"
+msgstr ""
+
+#: src/tags.cpp:417
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
+msgstr ""
+
+#: src/tags.cpp:421
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr ""
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 msgid ""
 "The number of bits per image component. In this standard each component of "
 "the image is 8 bits, so the value for this tag is 8. See also "
@@ -14739,36 +18833,68 @@
 "this tag."
 msgstr ""
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
 msgid ""
 "The compression scheme used for the image data. When a primary image is JPEG "
 "compressed, this designation is not necessary and is omitted. When "
 "thumbnails use JPEG compression, this tag value is set to 6."
 msgstr ""
 
-#: src/tags.cpp:371
+#: src/tags.cpp:442
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
 msgstr ""
 
-#: src/tags.cpp:374
+#: src/tags.cpp:445
+msgid "Threshholding"
+msgstr ""
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+
+#: src/tags.cpp:449
+msgid "Cell Width"
+msgstr ""
+
+#: src/tags.cpp:450
+msgid ""
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:453
+#, fuzzy
+msgid "Cell Length"
+msgstr "Polttoväli"
+
+#: src/tags.cpp:454
+msgid ""
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr ""
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
 msgstr ""
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
+#, fuzzy
 msgid "Document Name"
-msgstr ""
+msgstr "Omistajan nimi"
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
 msgid "The name of the document from which this image was scanned"
 msgstr ""
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -14776,21 +18902,21 @@
 "is to be used."
 msgstr ""
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
 "When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
 "generated the image. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -14798,26 +18924,26 @@
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr ""
 
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr ""
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
 "JPEG marker is used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr ""
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
 "strip when an image is divided into strips. With JPEG compressed data this "
@@ -14825,58 +18951,94 @@
 "<StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:420
+#: src/tags.cpp:503
+#, fuzzy
 msgid "Strip Byte Count"
-msgstr ""
+msgstr "Valotusajan esivalinta (Tv)"
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: src/tags.cpp:424
+#: src/tags.cpp:507
+#, fuzzy
 msgid "X-Resolution"
-msgstr ""
+msgstr "Resoluutioyksikkö"
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
 msgstr ""
 
-#: src/tags.cpp:428
+#: src/tags.cpp:511
+#, fuzzy
 msgid "Y-Resolution"
-msgstr ""
+msgstr "Resoluutioyksikkö"
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
 msgstr ""
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
 "If this field does not exist, the TIFF default of 1 (chunky) is assumed."
 msgstr ""
 
-#: src/tags.cpp:439
+#: src/tags.cpp:521
+#, fuzzy
+msgid "Gray Response Unit"
+msgstr "Resoluutioyksikkö"
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr ""
+
+#: src/tags.cpp:524
+msgid "Gray Response Curve"
+msgstr ""
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+
+#: src/tags.cpp:527
+msgid "T4 Options"
+msgstr ""
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+msgid "T6 Options"
+msgstr ""
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
 "unknown, 2 (inches) is designated."
 msgstr ""
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -14884,13 +19046,13 @@
 "followed. When the field is left blank, it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
 "time the file was changed."
 msgstr ""
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
 "creator. The detailed format is not specified, but it is recommended that "
@@ -14900,52 +19062,86 @@
 "Ken James\""
 msgstr ""
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+msgid "Host Computer"
 msgstr ""
 
-#: src/tags.cpp:468
+#: src/tags.cpp:563
 msgid ""
 "This tag records information about the host computer used to generate the "
 "image."
 msgstr ""
 
-#: src/tags.cpp:472
+#: src/tags.cpp:566
+msgid "Predictor"
+msgstr ""
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+
+#: src/tags.cpp:571
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the colorspace information tag "
 "(<ColorSpace>)."
 msgstr ""
 
-#: src/tags.cpp:477
+#: src/tags.cpp:576
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since colorspace is specified in the colorspace "
 "information tag (<ColorSpace>)."
 msgstr ""
 
-#: src/tags.cpp:481
+#: src/tags.cpp:580
+#, fuzzy
+msgid "Color Map"
+msgstr "Väriavaruus"
+
+#: src/tags.cpp:581
+msgid ""
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
+msgstr ""
+
+#: src/tags.cpp:586
+msgid "Halftone Hints"
+msgstr ""
+
+#: src/tags.cpp:587
+msgid ""
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
+msgstr ""
+
+#: src/tags.cpp:591
 msgid "Tile Width"
 msgstr ""
 
-#: src/tags.cpp:482
+#: src/tags.cpp:592
 msgid "The tile width in pixels. This is the number of columns in each tile."
 msgstr ""
 
-#: src/tags.cpp:484
+#: src/tags.cpp:594
+#, fuzzy
 msgid "Tile Length"
-msgstr ""
+msgstr "Polttoväli"
 
-#: src/tags.cpp:485
+#: src/tags.cpp:595
 msgid ""
 "The tile length (height) in pixels. This is the number of rows in each tile."
 msgstr ""
 
-#: src/tags.cpp:487
+#: src/tags.cpp:597
 msgid "Tile Offsets"
 msgstr ""
 
-#: src/tags.cpp:488
+#: src/tags.cpp:598
 msgid ""
 "For each tile, the byte offset of that tile, as compressed and stored on "
 "disk. The offset is specified with respect to the beginning of the TIFF "
@@ -14953,65 +19149,197 @@
 "the locations of other tiles."
 msgstr ""
 
-#: src/tags.cpp:493
+#: src/tags.cpp:603
 msgid "Tile Byte Counts"
 msgstr ""
 
-#: src/tags.cpp:494
+#: src/tags.cpp:604
 msgid ""
 "For each tile, the number of (compressed) bytes in that tile. See "
 "TileOffsets for a description of how the byte counts are ordered."
 msgstr ""
 
-#: src/tags.cpp:497
+#: src/tags.cpp:607
 msgid "SubIFD Offsets"
 msgstr ""
 
-#: src/tags.cpp:498
+#: src/tags.cpp:608
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: src/tags.cpp:500
+#: src/tags.cpp:610
+#, fuzzy
+msgid "Ink Set"
+msgstr "Aseta"
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:613
+#, fuzzy
+msgid "Ink Names"
+msgstr "Omistajan nimi"
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+msgid "Number Of Inks"
+msgstr ""
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+msgid "Dot Range"
+msgstr ""
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
+
+#: src/tags.cpp:622
+msgid "Target Printer"
+msgstr ""
+
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
+msgstr ""
+
+#: src/tags.cpp:625
+msgid "Extra Samples"
+msgstr ""
+
+#: src/tags.cpp:626
+msgid ""
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
+msgstr ""
+
+#: src/tags.cpp:629
+msgid "Sample Format"
+msgstr ""
+
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr ""
+
+#: src/tags.cpp:632
+#, fuzzy
+msgid "SMin Sample Value"
+msgstr "Valotusaika"
+
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr ""
+
+#: src/tags.cpp:635
+#, fuzzy
+msgid "SMax Sample Value"
+msgstr "Valotusaika"
+
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr ""
+
+#: src/tags.cpp:638
 msgid "Transfer Range"
 msgstr ""
 
-#: src/tags.cpp:501
+#: src/tags.cpp:639
 msgid "Expands the range of the TransferFunction"
 msgstr ""
 
-#: src/tags.cpp:503
+#: src/tags.cpp:641
+msgid "Clip Path"
+msgstr ""
+
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
 msgid "JPEG tables"
 msgstr ""
 
-#: src/tags.cpp:504
+#: src/tags.cpp:659
 msgid ""
 "This optional tag may be used to encode the JPEG quantization andHuffman "
 "tables for subsequent use by the JPEG decompression process."
 msgstr ""
 
-#: src/tags.cpp:507
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
 msgid "JPEG Process"
 msgstr ""
 
-#: src/tags.cpp:508
+#: src/tags.cpp:667
 msgid "This field indicates the process used to produce the compressed data"
 msgstr ""
 
-#: src/tags.cpp:510
+#: src/tags.cpp:669
 msgid "JPEG Interchange Format"
 msgstr ""
 
-#: src/tags.cpp:511
+#: src/tags.cpp:670
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: src/tags.cpp:514
+#: src/tags.cpp:673
 msgid "JPEG Interchange Format Length"
 msgstr ""
 
-#: src/tags.cpp:515
+#: src/tags.cpp:674
 msgid ""
 "The number of bytes of JPEG compressed thumbnail data. This is not used for "
 "primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
@@ -15020,7 +19348,66 @@
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: src/tags.cpp:523
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
+msgstr ""
+
+#: src/tags.cpp:682
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
+msgstr ""
+
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
+msgstr ""
+
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
+msgstr ""
+
+#: src/tags.cpp:690
+msgid ""
+"This Field points to a list of point transform values, one per component."
+msgstr ""
+
+#: src/tags.cpp:692
+msgid "JPEG Q-Tables"
+msgstr ""
+
+#: src/tags.cpp:693
+msgid ""
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:696
+msgid "JPEG DC-Tables"
+msgstr ""
+
+#: src/tags.cpp:697
+msgid ""
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
+msgstr ""
+
+#: src/tags.cpp:700
+msgid "JPEG AC-Tables"
+msgstr ""
+
+#: src/tags.cpp:701
+msgid ""
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:705
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in Appendix E, \"Color "
@@ -15029,17 +19416,17 @@
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr ""
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
 "component. In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -15054,11 +19441,11 @@
 "both centered and co-sited positioning."
 msgstr ""
 
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr ""
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -15067,52 +19454,60 @@
 "Interoperability these conditions."
 msgstr ""
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr ""
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr ""
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 msgid "Windows Rating"
 msgstr ""
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr ""
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
 msgid "Windows Rating Percent"
 msgstr ""
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr ""
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+#, fuzzy
+msgid "Image ID"
+msgstr "Kuvan koko"
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr ""
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods"
 msgstr ""
 
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr ""
-
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
 "photographer and editor copyrights. It is the copyright notice of the person "
@@ -15131,93 +19526,94 @@
 "it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 msgid "Exposure time, given in seconds."
 msgstr ""
 
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
+#, fuzzy
 msgid "The F number."
-msgstr ""
+msgstr "F-luku"
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr ""
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr ""
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr ""
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr ""
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
 "contain image data as in the case of TIFF."
 msgstr ""
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
 msgid "Inter Color Profile"
 msgstr ""
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
 msgstr ""
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
 msgstr ""
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
 msgstr ""
 
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
 msgid "ISO Speed Ratings"
 msgstr "ISO-herkkyys"
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
 "14524."
 msgstr ""
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Interlace"
 msgstr "Sisäinen salama"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 msgid "Indicates the field number of multifield images."
 msgstr ""
 
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 msgid "Time Zone Offset"
 msgstr ""
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -15225,215 +19621,217 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Self Timer Mode"
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 msgid "Date Time Original"
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 msgid "The date and time when the original image data was generated."
 msgstr ""
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
 
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 #, fuzzy
 msgid "Shutter speed."
 msgstr "Valotusaika"
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
+#, fuzzy
 msgid "The lens aperture."
-msgstr ""
+msgstr "Aukko"
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 msgid "The value of brightness."
 msgstr ""
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 #, fuzzy
 msgid "The exposure bias."
 msgstr "Valotuksen korjaus"
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
+#, fuzzy
 msgid "Max Aperture Value"
-msgstr ""
+msgstr "Aukko"
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 msgid "The smallest F number of the lens."
 msgstr ""
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr ""
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
+#, fuzzy
 msgid "The metering mode."
-msgstr ""
+msgstr "Mittaustapa"
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr ""
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 msgid "Indicates the status of flash when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 msgid "The actual focal length of the lens, in mm."
 msgstr ""
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 msgid "Amount of flash energy (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 #, fuzzy
 msgid "Noise"
 msgstr "Ei käytössä"
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr ""
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
 "direction for main image."
 msgstr ""
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
 "direction for main image."
 msgstr ""
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
 "FocalPlaneYResolution(37391)."
 msgstr ""
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security Classification"
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security classification assigned to the image."
 msgstr ""
 
-#: src/tags.cpp:655
-#, fuzzy
-msgid "Image History"
-msgstr "Kuvan tyyppi"
-
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
 msgstr ""
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
 msgstr ""
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
 msgid "Type of image sensor."
 msgstr ""
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
 msgid "Windows Title"
 msgstr ""
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
+#, fuzzy
 msgid "Windows Comment"
-msgstr ""
+msgstr "Oma kommentti"
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 msgid "Windows Author"
 msgstr ""
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
+#, fuzzy
 msgid "Windows Keywords"
-msgstr ""
+msgstr "Avainsanat"
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 msgid "Windows Subject"
 msgstr ""
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
 msgid "Subject tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
 msgid "Print Image Matching"
 msgstr ""
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
+#: src/tags.cpp:866
+msgid "Print Image Matching, description needed."
 msgstr ""
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
+#, fuzzy
 msgid "DNG version"
-msgstr ""
+msgstr "Ohjelman versio"
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
 "1, 1, 0, 0."
 msgstr ""
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
+#, fuzzy
 msgid "DNG backward version"
-msgstr ""
+msgstr "Firmwaren versio"
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -15443,11 +19841,12 @@
 "values, to verify it is able to correctly read the file."
 msgstr ""
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
+#, fuzzy
 msgid "Unique Camera Model"
-msgstr ""
+msgstr "Kameran malli"
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -15457,35 +19856,36 @@
 "replacement profiles."
 msgstr ""
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
+#, fuzzy
 msgid "Localized Camera Model"
-msgstr ""
+msgstr "Kameran malli"
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
 msgstr ""
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
 msgid "CFA Plane Color"
 msgstr ""
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr ""
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr ""
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -15494,15 +19894,15 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
 msgid "Black Level Repeat Dim"
 msgstr ""
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -15510,11 +19910,11 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 msgid "Black Level Delta H"
 msgstr ""
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -15523,11 +19923,11 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 msgid "Black Level Delta V"
 msgstr ""
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -15535,22 +19935,24 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
+#, fuzzy
 msgid "White Level"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
+#, fuzzy
 msgid "Default Scale"
-msgstr ""
+msgstr "Oletus"
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -15560,11 +19962,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr ""
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -15573,11 +19975,12 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
+#, fuzzy
 msgid "Default Crop Size"
-msgstr ""
+msgstr "Kameran asetukset"
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -15585,11 +19988,11 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 msgid "Color Matrix 1"
 msgstr ""
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -15597,22 +20000,22 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 msgid "Color Matrix 2"
 msgstr ""
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 msgid "Camera Calibration 1"
 msgstr ""
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -15623,11 +20026,11 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
 msgid "Camera Calibration 2"
 msgstr ""
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -15638,11 +20041,11 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
 msgid "Reduction Matrix 1"
 msgstr ""
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -15650,11 +20053,11 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
 msgid "Reduction Matrix 2"
 msgstr ""
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -15662,11 +20065,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
+#, fuzzy
 msgid "Analog Balance"
-msgstr ""
+msgstr "Väriavaruus"
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -15677,33 +20081,35 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
+#, fuzzy
 msgid "As Shot Neutral"
-msgstr ""
+msgstr "Neutraali"
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 msgid "As Shot White XY"
 msgstr ""
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
+#, fuzzy
 msgid "Baseline Exposure"
-msgstr ""
+msgstr "Automaattivalotus"
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -15718,11 +20124,11 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
 msgid "Baseline Noise"
 msgstr ""
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -15731,11 +20137,12 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
+#, fuzzy
 msgid "Baseline Sharpness"
-msgstr ""
+msgstr "Terävyys"
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -15743,11 +20150,11 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 msgid "Bayer Green Split"
 msgstr ""
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -15757,11 +20164,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr ""
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -15771,27 +20178,28 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
 "that captured the image."
 msgstr ""
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
+#, fuzzy
 msgid "Lens Info"
-msgstr ""
+msgstr "Linssin malli"
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
 "f-stops are unknown, they should be encoded as 0/0."
 msgstr ""
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr ""
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -15802,11 +20210,11 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
 msgid "Anti Alias Strength"
 msgstr ""
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -15815,32 +20223,32 @@
 "artifacts)."
 msgstr ""
 
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 msgid "Shadow Scale"
 msgstr ""
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
 msgstr ""
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 msgid "DNG Private Data"
 msgstr ""
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
 "programs that edit DNG files."
 msgstr ""
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
 msgid "MakerNote Safety"
 msgstr ""
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -15849,22 +20257,22 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr ""
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
 msgid "Calibration Illuminant 2"
 msgstr ""
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -15873,11 +20281,11 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
 msgid "Best Quality Scale"
 msgstr ""
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -15886,11 +20294,11 @@
 "need to be multiplied to achieve the best quality image size."
 msgstr ""
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 msgid "Raw Data Unique ID"
 msgstr ""
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -15900,21 +20308,21 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 msgid "Original Raw File Name"
 msgstr ""
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
 msgid "Original Raw File Data"
 msgstr ""
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -15927,21 +20335,21 @@
 "data blocks."
 msgstr ""
 
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 msgid "Active Area"
 msgstr ""
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
 msgstr ""
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 msgid "Masked Areas"
 msgstr ""
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -15951,11 +20359,11 @@
 "masked pixels are no longer useful."
 msgstr ""
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
 msgid "As-Shot ICC Profile"
 msgstr ""
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -15968,11 +20376,11 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
 msgid "As-Shot Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -15984,11 +20392,11 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 msgid "Current ICC Profile"
 msgstr ""
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -15996,11 +20404,11 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
 msgid "Current Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -16008,225 +20416,232 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
+#, fuzzy
 msgid "Unknown IFD tag"
-msgstr ""
+msgstr "Tuntematon"
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr ""
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 msgid "Creative program"
 msgstr ""
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 msgid "Action program"
 msgstr ""
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
+#, fuzzy
 msgid "Portrait mode"
-msgstr ""
+msgstr "Muotokuva"
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
+#, fuzzy
 msgid "Landscape mode"
-msgstr ""
-
-#: src/tags.cpp:1051
-msgid "Center weighted average"
-msgstr ""
+msgstr "Maisemakuva"
 
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 msgid "Multi-spot"
 msgstr ""
 
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 msgid "Tungsten (incandescent light)"
 msgstr ""
 
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
 msgstr ""
 
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
+#, fuzzy
 msgid "Cloudy weather"
-msgstr ""
+msgstr "Pilvinen"
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 msgid "Daylight fluorescent (D 5700 - 7100K)"
 msgstr ""
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
 msgid "Day white fluorescent (N 4600 - 5400K)"
 msgstr ""
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
 msgid "Cool white fluorescent (W 3900 - 4500K)"
 msgstr ""
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
 msgid "White fluorescent (WW 3200 - 3700K)"
 msgstr ""
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr ""
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr ""
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr ""
 
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr ""
 
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr ""
 
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr ""
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 msgid "D50"
 msgstr ""
 
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
+#, fuzzy
 msgid "ISO studio tungsten"
-msgstr ""
+msgstr "ISO-herkkyys"
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 msgid "Other light source"
 msgstr ""
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr ""
 
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 msgid "One-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 msgid "Two-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 msgid "Three-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 msgid "Color sequential area"
 msgstr ""
 
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr ""
 
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 msgid "Color sequential linear"
 msgstr ""
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
+#, fuzzy
 msgid "Film scanner"
-msgstr ""
+msgstr "Tiedostonimi"
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr ""
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
+#, fuzzy
 msgid "Digital still camera"
-msgstr ""
+msgstr "Digitaalinen makro"
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr ""
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
+#, fuzzy
 msgid "Normal process"
-msgstr ""
+msgstr "Normaali"
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
+#, fuzzy
 msgid "Custom process"
-msgstr ""
+msgstr "Pakkaus"
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr ""
 
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr ""
 
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
 msgid "Low gain down"
 msgstr ""
 
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr ""
 
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr ""
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr ""
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr ""
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
 "tag value is an ASCII string compatible with the standard developed by the "
 "ASTM Technical Committee."
 msgstr ""
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr ""
 
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
+#, fuzzy
 msgid "Date and Time (original)"
-msgstr ""
+msgstr "Päiväys ja aika"
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
 msgstr ""
 
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
+#, fuzzy
 msgid "Date and Time (digitized)"
-msgstr ""
+msgstr "Päiväys ja aika"
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 msgid "The date and time when the image was stored as digital data."
 msgstr ""
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -16236,117 +20651,119 @@
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr ""
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr ""
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
 msgstr ""
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr "Valotuksen korjaus"
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
 msgstr ""
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
 msgstr ""
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
+#, fuzzy
 msgid "Maker Note"
-msgstr ""
+msgstr "Makrotila"
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
 msgstr ""
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
 msgid "Sub-seconds Time"
 msgstr ""
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 msgid "Sub-seconds Time Original"
 msgstr ""
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 msgid "Sub-seconds Time Digitized"
 msgstr ""
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
+#, fuzzy
 msgid "FlashPix Version"
-msgstr ""
+msgstr "Ohjelman versio"
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB is used to define the color space based on the PC "
@@ -16355,7 +20772,7 @@
 "treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -16363,7 +20780,7 @@
 "not exist in an uncompressed file."
 msgstr ""
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
@@ -16373,7 +20790,7 @@
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
@@ -16381,11 +20798,11 @@
 "characters). The path is not recorded."
 msgstr ""
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
 msgid "Interoperability IFD Pointer"
 msgstr ""
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -16394,46 +20811,46 @@
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 msgstr ""
 
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 msgid "Focal Plane X-Resolution"
 msgstr ""
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 msgid "Focal Plane Y-Resolution"
 msgstr ""
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -16441,207 +20858,212 @@
 "value indicates the X column number and second indicates the Y row number."
 msgstr ""
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
+#, fuzzy
 msgid "Exposure index"
-msgstr ""
+msgstr "Valotustila"
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
 msgstr ""
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
 msgid "Color Filter Array Pattern"
 msgstr ""
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods."
 msgstr ""
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
 "is expected to disable or minimize any further processing."
 msgstr ""
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
 "different exposure settings."
 msgstr ""
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
 "not used."
 msgstr ""
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
 "differs from the <FocalLength> tag."
 msgstr ""
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
 "record the mode in which the image was shot. Note that this differs from the "
 "<SceneType> tag."
 msgstr ""
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
 "conditions in the reader."
 msgstr ""
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
 "fixed length."
 msgstr ""
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
+#, fuzzy
 msgid "Unknown Exif tag"
-msgstr ""
+msgstr "Tuntematon"
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
+#, fuzzy
 msgid "North"
-msgstr ""
+msgstr "kuukausi"
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
+#, fuzzy
 msgid "South"
-msgstr ""
+msgstr "Piste"
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
 msgid "East"
 msgstr ""
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
 msgid "West"
 msgstr ""
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr ""
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
+#, fuzzy
 msgid "Below sea level"
-msgstr ""
+msgstr "Salaman malli"
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
 msgid "Measurement in progress"
 msgstr ""
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
 msgid "Measurement Interoperability"
 msgstr ""
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr ""
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr ""
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
 msgid "knots"
 msgstr ""
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 msgid "True direction"
 msgstr ""
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 msgid "Magnetic direction"
 msgstr ""
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 msgid "Kilometers"
 msgstr ""
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 msgid "Miles"
 msgstr ""
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 msgid "Knots"
 msgstr ""
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
 msgid "Without correction"
 msgstr ""
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 msgid "Correction applied"
 msgstr ""
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
 "tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
@@ -16649,17 +21071,17 @@
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
 msgid "GPS Latitude Reference"
 msgstr ""
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -16668,17 +21090,17 @@
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
 msgid "GPS Longitude Reference"
 msgstr ""
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -16687,7 +21109,7 @@
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -16696,20 +21118,20 @@
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
 "(atomic clock)."
 msgstr ""
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -16718,87 +21140,87 @@
 "the tag is set to NULL."
 msgstr ""
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
 "Interoperability."
 msgstr ""
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
 msgstr ""
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 msgid "GPS Data Degree of Precision"
 msgstr ""
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 msgstr ""
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
 msgid "GPS Track Ref"
 msgstr ""
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
 msgid "GPS Destination Latitude Refeference"
 msgstr ""
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
 "latitude. The ASCII value \"N\" indicates north latitude, and \"S\" is south "
 "latitude."
 msgstr ""
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -16808,17 +21230,17 @@
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
 msgid "GPS Destination Longitude Reference"
 msgstr ""
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII \"E\" indicates east longitude, and \"W\" is west longitude."
 msgstr ""
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -16828,70 +21250,70 @@
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
 msgid "GPS Destination Distance Reference"
 msgstr ""
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
 msgstr ""
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
 msgid "Indicates the distance to the destination point."
 msgstr ""
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
 "followed by the name of the method."
 msgstr ""
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
 "GPS area."
 msgstr ""
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
 msgid "GPS Date Stamp"
 msgstr ""
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
 msgstr ""
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 msgid "Unknown GPSInfo tag"
 msgstr ""
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
 msgid "Interoperability Index"
 msgstr ""
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -16899,76 +21321,84 @@
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
+#, fuzzy
 msgid "Interoperability Version"
-msgstr ""
+msgstr "Ohjelman versio"
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr ""
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
 msgid "Related Image File Format"
 msgstr ""
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
+#, fuzzy
 msgid "File format of image file"
-msgstr ""
+msgstr "Tiedoston avaus epäonnistui\n"
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 msgid "Related Image Width"
 msgstr ""
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 msgid "Related Image Length"
 msgstr ""
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 msgid "Unknown Exif Interoperability tag"
 msgstr ""
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
+#, fuzzy
 msgid "Offset"
-msgstr ""
+msgstr "Pois"
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr ""
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 msgid "Byte Order"
 msgstr ""
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
 msgstr ""
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr ""
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
+#, fuzzy
 msgid "Unknown tag"
-msgstr ""
+msgstr "Tuntematon"
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 msgid "Digital zoom not used"
 msgstr ""
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 msgid "TIFF header, offset"
 msgstr ""
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr ""
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Auto white balance"
+#~ msgid "Software firmware version"
+#~ msgstr "Firmwaren versio"
+
+#, fuzzy
+#~ msgid "White Balance Bracketing "
 #~ msgstr "Valkotasapaino"
Binary files /tmp/TId3M1M1Ks/exiv2-0.19/po/fr.gmo and /tmp/B4Gg93MYI9/exiv2-0.21/po/fr.gmo differ
diff -Nru exiv2-0.19/po/fr.po exiv2-0.21/po/fr.po
--- exiv2-0.19/po/fr.po	2009-12-29 10:51:25.000000000 +0000
+++ exiv2-0.21/po/fr.po	2010-11-22 15:13:38.000000000 +0000
@@ -10,1660 +10,1963 @@
 #   Olivier Tilloy <olivier@tilloy.net>, 2007.
 #   Stéphane Pontier <shadow.walker@free.fr>, 2007.
 # Fabien <fabien.ubuntu@gmail.com>, 2008.
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\n"
 "PO-Revision-Date: 2008-05-28 15:49+0200\n"
 "Last-Translator: Fabien <fabien.ubuntu@gmail.com>\n"
 "Language-Team: français <kde-francophone@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
 msgstr "Échec de l'ouverture du fichier\n"
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 msgid "File size"
 msgstr "Taille du fichier"
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 msgid "Bytes"
 msgstr "Octets"
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 msgid "Image size"
 msgstr "Taille de l'image"
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
 msgstr "Pas de données Exif trouvées dans le fichier\n"
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 msgid "Camera make"
 msgstr "Marque de l'appareil"
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 msgid "Camera model"
 msgstr "Modèle de l'appareil"
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 msgid "Image timestamp"
 msgstr "Horodatage de l'image"
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 msgid "Image number"
 msgstr "Numéro de l'image"
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 msgid "Exposure time"
 msgstr "Temps d'exposition"
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr "Ouverture"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 msgid "Exposure bias"
 msgstr "Correction d'exposition"
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr "Flash"
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 msgid "Flash bias"
 msgstr "Biais flash"
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 msgid "Focal length"
 msgstr "Distance focale"
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 msgid "35 mm equivalent"
 msgstr "Équivalent à 35 mm"
 
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 msgid "Subject distance"
 msgstr "Distance du sujet"
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 msgid "ISO speed"
 msgstr "Sensibilité ISO"
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 msgid "Exposure mode"
 msgstr "Mode d'exposition"
 
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 msgid "Metering mode"
 msgstr "Mode de mesure"
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 msgid "Macro mode"
 msgstr "Mode macro"
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 msgid "Image quality"
 msgstr "Qualité de l'image"
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 msgid "Exif Resolution"
 msgstr "Résolution Exif"
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 msgid "White balance"
 msgstr "Balance des blancs"
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
 msgstr "Miniature"
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr "Aucun"
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr "Droit d'auteur"
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
 msgstr "Commentaire Exif"
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 msgid "No IPTC data found in the file\n"
 msgstr "Pas de données IPTC trouvées dans le fichier\n"
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 msgid "No XMP data found in the file\n"
 msgstr "Pas de données XMP trouvées dans le fichier\n"
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
 msgstr "(Valeur binaire supprimée)"
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 msgid "JPEG comment"
 msgstr "Commentaire JPEG"
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 #, fuzzy
 msgid "Preview"
 msgstr "Données de prévisualisation"
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
 msgstr ""
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 msgid "bytes"
 msgstr "octets"
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 msgid "Neither tag"
 msgstr "Aucun des marqueurs"
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 msgid "nor"
 msgstr "ou"
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 msgid "found in the file"
 msgstr "n'a été trouvé dans le fichier"
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
 msgstr "Horodatage de création du fichier image non défini dans le fichier"
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
 msgstr "Échec de l'analyse de l'horodatage"
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 msgid "in the file"
 msgstr "dans le fichier"
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
 msgstr "Mise à jour de l'horodatage à"
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 #, fuzzy
 msgid "Erasing thumbnail data"
 msgstr "octets de données de la miniature"
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
 msgstr "Effacement des données Exif du fichier"
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
 msgstr "Effacement des données IPTC du fichier"
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
 msgstr "Effacement du commentaire JPEG du fichier"
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
 msgstr "Effacement des données XMP du fichier"
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
 msgstr "L'image ne contient pas de miniature Exif\n"
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 #, fuzzy
 msgid "Writing thumbnail"
 msgstr "de la miniature"
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 msgid "to file"
 msgstr "dans le fichier"
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
 msgstr "Les données Exif ne contiennent pas de miniature\n"
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
 msgstr ""
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 #, fuzzy
 msgid "Writing preview"
 msgstr "Écriture au format"
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 msgid "Setting JPEG comment"
 msgstr "Définition du commentaire JPEG"
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
 msgstr "Ajout de"
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 msgid "Failed to read"
 msgstr "Échec lors de la lecture"
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 msgid "value"
 msgstr "valeur"
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 msgid "Set"
 msgstr "Définition de"
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr "Effacement de"
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr "Reg "
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
 msgstr "Horodatage de la donnée de clé"
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
 msgstr "non défini\n"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
 msgstr "Ajustement de"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
 msgstr "de"
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 msgid "years"
 msgstr "années"
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
 msgstr "année"
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 msgid "months"
 msgstr "mois"
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 msgid "month"
 msgstr "mois"
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
 msgstr "jours"
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
 msgstr "jour"
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
 msgstr "s"
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 msgid "Can't adjust timestamp by"
 msgstr "Échec de l'ajustement de l'horodatage"
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 msgid "to"
 msgstr "vers"
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr "Tag EXIF standard (ISO), non modifié\n"
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
 msgstr "Définition de la valeur Exif de l'ISO à"
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1671
+#, fuzzy
+msgid "No Exif user comment found"
+msgstr "Commentaire Exif"
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:1692
+#, fuzzy
+msgid "Setting Exif UNICODE user comment to"
+msgstr "Définition de la valeur Exif de l'ISO à"
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
 msgstr "Écriture des données Exif de"
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
 msgstr "Écriture des données IPTC de"
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
 msgstr "Écriture des données Exif de"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
 msgstr "Écriture du commentaire JPEG de"
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
 msgstr "Impossible d'écrire les métadonnées dans le fichier"
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr ""
 "Le format spécifié pour le nom du fichier produit un nom de fichier vide"
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
 msgstr "Le nom de ce fichier est déjà correct"
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 msgid "File"
 msgstr "Le fichier"
 
-#: src/actions.cpp:1909
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
 msgstr " existe. Écraser [O], [r]enommer ou passer au [s]uivant?"
 
-#: src/actions.cpp:1937
+#: src/actions.cpp:1970
 msgid "Renaming file to"
 msgstr "Renommage du fichier en"
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
 msgstr "mise à jour de l'horodatage"
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
 msgstr "Échec du renommage de"
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr "Désactivé"
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr "Activé"
+
+#: src/canonmn.cpp:69
 msgid "PowerShot A30"
 msgstr ""
 
-#: src/canonmn.cpp:61
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr ""
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
 msgid "PowerShot A20"
 msgstr ""
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
 msgid "PowerShot A10"
 msgstr ""
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr ""
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 msgid "PowerShot G2"
 msgstr ""
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
 msgid "PowerShot S40"
 msgstr ""
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
 msgid "PowerShot S30"
 msgstr ""
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
 msgid "PowerShot A40"
 msgstr ""
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr ""
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
 msgid "PowerShot A100"
 msgstr ""
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr ""
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
 msgid "PowerShot A200"
 msgstr ""
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr ""
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 msgid "PowerShot G3"
 msgstr ""
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
 msgid "PowerShot S45"
 msgstr ""
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr ""
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr ""
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
 msgid "PowerShot A70"
 msgstr ""
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
 msgid "PowerShot A60"
 msgstr ""
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr ""
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 msgid "PowerShot G5"
 msgstr ""
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
 msgid "PowerShot A300"
 msgstr ""
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
 msgid "PowerShot S50"
 msgstr ""
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
 msgid "PowerShot A80"
 msgstr ""
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr ""
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
 msgid "PowerShot S1 IS"
 msgstr ""
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
 msgid "PowerShot Pro1"
 msgstr ""
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
 msgid "PowerShot S70"
 msgstr ""
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
 msgid "PowerShot S60"
 msgstr ""
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 msgid "PowerShot G6"
 msgstr ""
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr ""
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
 msgid "PowerShot A75"
 msgstr ""
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr ""
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
 msgid "PowerShot A400"
 msgstr ""
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
 msgid "PowerShot A310"
 msgstr ""
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
 msgid "PowerShot A85"
 msgstr ""
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr ""
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
 msgid "PowerShot A95"
 msgstr ""
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr ""
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr ""
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
 msgid "PowerShot A520"
 msgstr ""
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
 msgid "PowerShot A510"
 msgstr ""
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr ""
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
 msgid "PowerShot S2 IS"
 msgstr ""
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr ""
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr ""
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr ""
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr ""
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
 msgid "PowerShot A430"
 msgstr ""
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
 msgid "PowerShot A410"
 msgstr ""
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
 msgid "PowerShot S80"
 msgstr ""
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
 msgid "PowerShot A620"
 msgstr ""
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
 msgid "PowerShot A610"
 msgstr ""
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr ""
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr ""
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
 msgid "PowerShot TX1"
 msgstr ""
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr ""
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
 msgid "PowerShot A420"
 msgstr ""
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr ""
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr ""
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
 msgid "PowerShot A700"
 msgstr ""
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr ""
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
 msgid "PowerShot S3 IS"
 msgstr ""
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
 msgid "PowerShot A540"
 msgstr ""
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr ""
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 msgid "PowerShot G7"
 msgstr ""
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
 msgid "PowerShot A530"
 msgstr ""
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr ""
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr ""
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
 msgid "PowerShot A710 IS"
 msgstr ""
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
 msgid "PowerShot A640"
 msgstr ""
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
 msgid "PowerShot A630"
 msgstr ""
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
 msgid "PowerShot S5 IS"
 msgstr ""
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
 msgid "PowerShot A460"
 msgstr ""
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr ""
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
 msgid "PowerShot A570 IS"
 msgstr ""
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
 msgid "PowerShot A560"
 msgstr ""
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr ""
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr ""
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
 msgid "PowerShot A550"
 msgstr ""
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
 msgid "PowerShot A450"
 msgstr ""
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
 msgid "PowerShot Pro90 IS"
 msgstr ""
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 msgid "PowerShot G1"
 msgstr ""
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr ""
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr ""
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr ""
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr ""
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr ""
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr ""
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr ""
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr ""
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr ""
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr ""
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr ""
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr ""
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr ""
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr ""
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr ""
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr ""
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr ""
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
+#: src/canonmn.cpp:170
+msgid "EOS 7D"
+msgstr ""
+
+#: src/canonmn.cpp:171
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr ""
+
+#: src/canonmn.cpp:172
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr ""
+
+#: src/canonmn.cpp:173
+msgid "EOS 50D"
+msgstr ""
+
+#: src/canonmn.cpp:174
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr ""
+
+#: src/canonmn.cpp:175
+msgid "EOS-1D Mark IV"
+msgstr ""
+
+#: src/canonmn.cpp:180
+#, fuzzy
+msgid "Format 1"
+msgstr "Format du fichier"
+
+#: src/canonmn.cpp:181
+#, fuzzy
+msgid "Format 2"
+msgstr "Format du fichier"
+
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+#, fuzzy
+msgid "On (1)"
+msgstr "Activé"
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+#, fuzzy
+msgid "On (2)"
+msgstr "Activé"
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr "Adobe RGB"
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
 msgid "Camera Settings"
 msgstr "Réglage appareil photo"
 
-#: src/canonmn.cpp:166
+#: src/canonmn.cpp:200
 msgid "Various camera settings"
 msgstr "Divers réglages de l'appareil photo"
 
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
 msgid "Focal Length"
 msgstr "Longueur focale"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
 msgid "Shot Info"
 msgstr "Infos prise de vue"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203
 msgid "Shot information"
 msgstr "Informations prise de vue"
 
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
 msgid "Panorama"
 msgstr "Panorama"
 
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
 msgid "Image Type"
 msgstr "Type d'image"
 
-#: src/canonmn.cpp:171
+#: src/canonmn.cpp:205
 msgid "Image type"
 msgstr "Type d'image"
 
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware Version"
 msgstr "Version du microcode"
 
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware version"
 msgstr "Version de microcode"
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File Number"
 msgstr "Nombre F"
 
-#: src/canonmn.cpp:173
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File number"
 msgstr "Nom du fichier"
 
-#: src/canonmn.cpp:174
+#: src/canonmn.cpp:208
 msgid "Owner Name"
 msgstr "Nom du propriétaire"
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 msgid "Serial Number"
 msgstr "Numéro de série"
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 msgid "Camera serial number"
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera Info"
+msgstr "Identifiant appareil photo"
+
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera info"
+msgstr "Identifiant appareil photo"
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 msgid "Custom Functions"
 msgstr "Fonctions personnalisées"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "ModelID"
 msgstr "Modèle"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "Model ID"
 msgstr "Numéro modèle"
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
 msgid "Picture Info"
 msgstr "Infos image"
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 msgid "Picture info"
 msgstr "Infos image"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail Image Valid Area"
+msgstr "Miniature"
+
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail image valid area"
+msgstr "Miniature"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial Number Format"
+msgstr "Numéro de série 2"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial number format"
+msgstr "Numéro de série 2"
+
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+#, fuzzy
+msgid "Super Macro"
+msgstr "Super macro"
+
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+msgid "Super macro"
+msgstr "Super macro"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF Info"
+msgstr "Informations mise au point"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF info"
+msgstr "Informations mise au point"
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
 msgid "White Balance Table"
 msgstr "Table de balance des blancs"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:219
 msgid "White balance table"
 msgstr "Table de balance des blancs"
 
-#: src/canonmn.cpp:185
-msgid "Unknown CanonMakerNote tag"
-msgstr "Marqueur de note du fabriquant Canon inconnu"
+#: src/canonmn.cpp:220
+#, fuzzy
+msgid "LensModel"
+msgstr "Mode scène"
 
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
-msgstr "Activé"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+#, fuzzy
+msgid "Internal Serial Number"
+msgstr "Numéro de série de l'appareil photo"
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
-msgstr "Désactivé"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+#, fuzzy
+msgid "Internal serial number"
+msgstr "Numéro de série de l'appareil photo"
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
+msgstr ""
+
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
+
+#: src/canonmn.cpp:223
+#, fuzzy
+msgid "Custom functions"
+msgstr "Fonctions personnalisées"
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing Info"
+msgstr "Logiciel de traitement"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing info"
+msgstr "Logiciel de traitement"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured Color"
+msgstr "Couleur naturelle"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured color"
+msgstr "Couleur naturelle"
+
+#: src/canonmn.cpp:226
+#, fuzzy
+msgid "ColorSpace"
+msgstr "Espace des couleurs"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD Offset"
+msgstr "décalage"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD offset"
+msgstr "décalage"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor Info"
+msgstr "Objectif"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor info"
+msgstr "Infos prise de vue"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color Data"
+msgstr "Matrice des couleurs"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color data"
+msgstr "Données de mes couleurs"
+
+#: src/canonmn.cpp:234
+msgid "Unknown CanonMakerNote tag"
+msgstr "Marqueur de note du fabriquant Canon inconnu"
+
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
 msgid "Economy"
 msgstr "Économie"
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
 msgid "Normal"
 msgstr "Normal"
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
 msgid "Fine"
 msgstr "Fin"
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
 msgid "RAW"
 msgstr "BRUT"
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:254
 msgid "Superfine"
 msgstr "Super fin"
 
-#: src/canonmn.cpp:206
+#: src/canonmn.cpp:255
 #, fuzzy
 msgid "Normal Movie"
 msgstr "Processus normal"
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 msgid "Auto"
 msgstr "Automatique"
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
 msgid "Red-eye"
 msgstr "Réduction yeux rouges"
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 msgid "Slow sync"
 msgstr "Synchro lente"
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
 msgid "Auto + red-eye"
 msgstr "Flash automatique + réduction yeux rouges"
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
 msgid "On + red-eye"
 msgstr "Flash + réduction yeux rouges"
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
 msgid "External"
 msgstr "Externe"
 
-#: src/canonmn.cpp:223
+#: src/canonmn.cpp:273
 msgid "Single / timer"
 msgstr "Temporisateur"
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
 msgid "Continuous"
 msgstr "Continue"
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
 msgid "Movie"
 msgstr "Film"
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 msgid "Continuous, speed priority"
 msgstr "Continue, Priorité vitesse obturation"
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
 msgid "Continuous, low"
 msgstr "Continue, basse"
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
 msgid "Continuous, high"
 msgstr "Continue, Haute"
 
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 msgid "One shot AF"
 msgstr "AF One Shot"
 
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
 msgid "AI servo AF"
 msgstr "AF AI Servo"
 
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
 msgid "AI focus AF"
 msgstr "AF AI Focus"
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 msgid "Manual focus"
 msgstr "Mise au point manuel"
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
 msgid "Single"
 msgstr "Simple"
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
 msgid "Pan focus"
 msgstr "Continue"
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
 msgid "Large"
 msgstr "Grande"
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
 msgid "Medium"
 msgstr "Moyenne"
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
 msgid "Small"
 msgstr "Petite"
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
 msgid "Medium 1"
 msgstr "Moyenne 1"
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
 msgid "Medium 2"
 msgstr "Moyenne 2"
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
 msgid "Medium 3"
 msgstr "Moyenne 3"
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
 msgid "Full auto"
 msgstr "Complètement automatique"
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr "Paysage"
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
 msgid "Fast shutter"
 msgstr "Obturation rapide"
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 msgid "Slow shutter"
 msgstr "Obturation lente"
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 msgid "Night Scene"
 msgstr "Scène de nuit"
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
 msgid "Gray scale"
 msgstr "Niveaux de gris"
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
 msgstr "Sépia"
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 msgid "Sports"
 msgstr "Sports"
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 msgid "Macro / close-up"
 msgstr "Macro / gros plan"
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 msgid "Black & white"
 msgstr "Noir & Blanc"
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 msgid "Vivid"
 msgstr "Vif"
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 msgid "Neutral"
 msgstr "Neutre"
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
 msgid "Flash off"
 msgstr "Flash désactivé"
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 msgid "Long shutter"
 msgstr "Temps de pose lent"
 
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr "Super macro"
-
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
 msgid "Foliage"
 msgstr "Feuillage"
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
 msgid "Indoor"
 msgstr "Intérieur"
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
 msgstr "Feux d'artifices"
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
 msgstr "Plage"
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 msgid "Underwater"
 msgstr "Sous marin"
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
 msgid "Snow"
 msgstr "Neige"
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
 msgstr "Enfants & animaux"
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 msgid "Night SnapShot"
 msgstr "Instantané de nuit"
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 msgid "Digital macro"
 msgstr "Zoom numérique"
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
 msgid "My Colors"
 msgstr "Mes couleurs"
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
 msgid "Still image"
 msgstr "Image fixe"
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
 msgid "Other"
 msgstr "Autre"
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
 msgstr "Faible"
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 msgid "High"
 msgstr "Élevée"
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr "n/a"
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
+#, fuzzy
 msgid "Auto High"
-msgstr ""
+msgstr "Auto (lumière du jour)"
 
-#: src/canonmn.cpp:322
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
 msgid "Default"
 msgstr "Défaut"
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
 msgid "Spot"
 msgstr "Spot"
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr "Moyenne"
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
 msgid "Evaluative"
 msgstr "Évaluatif"
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
 msgid "Partial"
 msgstr "Partielle"
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 msgid "Center weighted"
 msgstr "Centre pondéré"
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 msgid "Not known"
 msgstr "Non connu"
 
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr "Macro"
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 msgid "Very close"
 msgstr "Très près"
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
 msgid "Close"
 msgstr "Près"
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
+#, fuzzy
 msgid "Middle range"
-msgstr ""
+msgstr "Modèle"
 
-#: src/canonmn.cpp:339
+#: src/canonmn.cpp:391
 msgid "Far range"
 msgstr "Loin"
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 msgid "Infinity"
 msgstr "Infinie"
 
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
 msgid "Manual AF point selection"
 msgstr "Sélection point AF manuelle"
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 msgid "None (MF)"
 msgstr "Aucun (MF)"
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 msgid "Auto-selected"
 msgstr "Sélection automatique"
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 msgid "Right"
 msgstr "Droit"
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 msgid "Center"
 msgstr "Centre"
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
 msgid "Left"
 msgstr "Gauche"
 
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
 msgid "Auto AF point selection"
 msgstr "Sélection point AF automatique"
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
 msgid "Easy shooting (Auto)"
 msgstr "Prise de vue facile (Auto)"
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 msgid "Program (P)"
 msgstr "Programme (P)"
 
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 msgid "Shutter priority (Tv)"
 msgstr "Priorité obturation (Tv)"
 
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 msgid "Aperture priority (Av)"
 msgstr "Priorité ouverture (Av)"
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 msgid "Manual (M)"
 msgstr "Manuel (M)"
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 msgid "Did not fire"
 msgstr "Le flash ne s'est pas déclenché."
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
 msgid "Fired"
 msgstr "Déclenché"
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 msgid "External flash"
 msgstr "Flash externe"
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
 msgid "Internal flash"
 msgstr "Flash interne"
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
 msgstr "TTL"
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr "Synchronisation grande vitesse activée"
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr "Synchronisation 2ème rideau activé"
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
 msgid "FP sync used"
 msgstr "Synchronisation grande vitesse utilisé"
 
-#: src/canonmn.cpp:625
+#: src/canonmn.cpp:707
 msgid "Normal AE"
 msgstr "AE Normal"
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
 msgid "Exposure compensation"
 msgstr "Compensation d'exposition"
 
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
 msgstr "AE verrouillé"
 
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 msgid "AE lock + exposure compensation"
 msgstr "AE verrouillé + compensation d'exposition"
 
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
 msgid "No AE"
 msgstr "Pas d'AE"
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
+#, fuzzy
 msgid "On, shot only"
-msgstr ""
+msgstr "AF One Shot"
+
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+msgid "AF Point"
+msgstr "Point AF"
 
-#: src/canonmn.cpp:644
+#: src/canonmn.cpp:732
+#, fuzzy
 msgid "Smooth"
-msgstr ""
+msgstr "mois"
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
 msgstr "N&B"
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 msgid "Custom"
 msgstr "Personnel"
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
 msgid "My color data"
 msgstr "Données de mes couleurs"
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+msgid "Full"
+msgstr "Plein"
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:759
 msgid "Selftimer"
 msgstr "Retardateur"
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
 msgid "Self timer"
 msgstr "Retardateur"
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 msgid "Quality"
 msgstr "Qualité"
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 msgid "Flash Mode"
 msgstr "Mode flash"
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
 msgid "Flash mode setting"
 msgstr "Réglage mode flash"
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
 msgid "Drive Mode"
 msgstr "Mode contrôle"
 
-#: src/canonmn.cpp:657
+#: src/canonmn.cpp:762
 msgid "Drive mode setting"
 msgstr "Réglage mode contrôle"
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 msgid "Focus Mode"
 msgstr "Mode mise au point"
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
 msgid "Focus mode setting"
 msgstr "Réglage mode de mise au point"
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 msgid "Image Size"
 msgstr "Taille de l'image"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy Mode"
 msgstr "Mode prise de vue"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy shooting mode"
 msgstr "Mode de prise de vue"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 msgid "Digital Zoom"
 msgstr "Zoom numérique"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 msgid "Digital zoom"
 msgstr "Zoom numérique"
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
 msgid "Contrast setting"
 msgstr "Réglage de contraste"
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr "Saturation"
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
 msgid "Saturation setting"
 msgstr "Réglage de saturation"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr "Netteté"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
 msgid "Sharpness setting"
 msgstr "Réglage de Netteté"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 msgid "ISO Speed Mode"
 msgstr "Mode vitesse ISO"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
 msgid "ISO speed setting"
 msgstr "Réglage vitesse ISO"
 
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
 msgstr "Mode de mesure"
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
 msgid "Metering mode setting"
 msgstr "Réglages mode mesure"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus Type"
 msgstr "Type de mise au point"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus type setting"
 msgstr "Réglage mise au point"
 
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-msgid "AF Point"
-msgstr "Point AF"
-
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 msgid "AF point selected"
 msgstr "Point AF sélectionné"
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 msgid "Exposure Program"
 msgstr "Programme d'exposition"
 
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
 msgid "Exposure mode setting"
 msgstr "Réglage mode exposition"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 msgid "Lens Type"
 msgstr "Type d'objectif"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 msgid "Lens type"
 msgstr "Type d'objectif"
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 msgid "Lens"
 msgstr "Objectif"
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
@@ -1671,679 +1974,996 @@
 "longueur de focale 'courte' ou 'longue' de l'objectif (en 'unité de focale') "
 "et 'unité de focale' par mm"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
+#: src/canonmn.cpp:781
+msgid "Short Focal"
+msgstr ""
+
+#: src/canonmn.cpp:781
+#, fuzzy
+msgid "Short focal"
+msgstr "Mise au point Spot"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal Units"
+msgstr "Distance focale"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal units"
+msgstr "Distance focale"
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
 msgid "Max Aperture"
 msgstr "Ouverture maximale"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
 msgid "Max aperture"
 msgstr "Ouverture maximale"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min Aperture"
 msgstr "Ouverture maximale"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min aperture"
 msgstr "Ouverture maximale"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash Activity"
 msgstr "Activité flash"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash activity"
 msgstr "Activité flash"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash Details"
 msgstr "Détails flash"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash details"
 msgstr "Détails flash"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus Continuous"
 msgstr "Mise au point continue"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus continuous setting"
 msgstr "Paramètre de la mise au point continue"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AESetting"
 msgstr "Réglage AE"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AE setting"
 msgstr "Réglage AE"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 msgid "Image Stabilization"
 msgstr "Stabilisation de l'image"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 msgid "Image stabilization"
 msgstr "Stabilisation de l'image"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display Aperture"
 msgstr "Affichage de l'ouverture"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display aperture"
 msgstr "Affichage de l'ouverture"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Droit d'auteur"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom source width"
-msgstr ""
+msgstr "Droit d'auteur"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
+#, fuzzy
 msgid "Zoom Target Width"
-msgstr ""
+msgstr "Largeur de l'image"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
+#, fuzzy
 msgid "Zoom target width"
-msgstr ""
+msgstr "Largeur de l'image"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot Metering Mode"
+msgstr "Mode de mesure"
+
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot metering mode"
+msgstr "Le mode de mesure."
+
+#: src/canonmn.cpp:797
 msgid "Photo Effect"
 msgstr "Effet photo"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 msgid "Photo effect"
 msgstr "Effet photo"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual Flash Output"
+msgstr "Déclenchement  manuel"
+
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual flash output"
+msgstr "Déclenchement  manuel"
+
+#: src/canonmn.cpp:799
 msgid "Color Tone"
 msgstr "Tonalité couleur"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
 msgid "Color tone"
 msgstr "Tonalité couleur"
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
+msgstr ""
+
+#: src/canonmn.cpp:800
+#, fuzzy
+msgid "SRAW quality"
+msgstr "Qualité de l'image"
+
+#: src/canonmn.cpp:802
 msgid "Unknown Canon Camera Settings 1 tag"
 msgstr "Marqueur 1 réglage appareil photo Canon inconnu"
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 msgid "Sunny"
 msgstr "Ensoleillé"
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 msgid "Cloudy"
 msgstr "Nuageux"
 
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 msgid "Tungsten"
 msgstr "Tungstène"
 
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
 msgstr "Fluorescent"
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
 msgid "Black & White"
 msgstr "Noir & Blanc"
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr "Ombragé"
 
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 msgid "Manual Temperature (Kelvin)"
 msgstr "Température manuelle (Kelvin)"
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
 msgstr "Réglage PC 1"
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
 msgstr "Réglage PC 3"
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
 msgstr "Réglage PC 3"
 
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
 msgid "Daylight Fluorescent"
 msgstr "Lumière du jour fluorescent"
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 msgid "Custom 1"
 msgstr "Personnel 1"
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 msgid "Custom 2"
 msgstr "Personnel 2"
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+msgid "Custom 3"
+msgstr "Processus personnel 2"
+
+#: src/canonmn.cpp:831
+#, fuzzy
+msgid "PC Set 4"
+msgstr "Réglage PC 1"
+
+#: src/canonmn.cpp:832
+#, fuzzy
+msgid "PC Set 5"
+msgstr "Réglage PC 1"
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 msgid "left"
 msgstr "gauche"
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 msgid "center"
 msgstr "centre"
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
 msgid "right"
 msgstr "droite"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO Speed Used"
 msgstr "Vitesse ISO utilisée"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO speed used"
 msgstr "Vitesse ISO utilisée"
 
-#: src/canonmn.cpp:758
+#: src/canonmn.cpp:867
+msgid "Measured EV"
+msgstr ""
+
+#: src/canonmn.cpp:868
 msgid "Target Aperture"
 msgstr "Ouverture cible"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target Shutter Speed"
 msgstr "Vitesse d'obturation cible"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target shutter speed"
 msgstr "Vitesse d'obturation cible"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr "Balance des blancs"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
 msgid "White balance setting"
 msgstr "Réglage balance des blancs"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence"
 msgstr "Séquence"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
 msgstr "Numéro séquence (si en mode rafale)"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF Point Used"
 msgstr "Point AF utilisé"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF point used"
 msgstr "Point AF utilisé"
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 msgid "Flash Bias"
 msgstr "Biais du flash"
 
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
 msgstr "Distance au sujet"
 
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 msgid "Subject distance (units are not clear)"
 msgstr "Distance au sujet (les unités ne sont pas clair)"
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 msgid "Aperture Value"
 msgstr "Valeur d'ouverture"
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 msgid "Shutter Speed Value"
 msgstr "Valeur de vitesse d'obturation"
 
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr "Vitesse d'obturation"
 
-#: src/canonmn.cpp:782
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
+msgstr ""
+
+#: src/canonmn.cpp:892
 msgid "Unknown Canon Camera Settings 2 tag"
 msgstr "Marqueur 2 réglage appareil photo Canon inconnu"
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 msgid "Left to right"
 msgstr "De gauche à droite"
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 msgid "Right to left"
 msgstr "De droite à gauche"
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 msgid "Bottom to top"
 msgstr "Du bas vers le haut"
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 msgid "Top to bottom"
 msgstr "Du haut vers le bas"
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
 msgstr "Matrice 2x2 (Sens horaire)"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama Frame"
 msgstr "Frame panorama"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama frame number"
 msgstr "Numéro frame panorama"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama Direction"
 msgstr "Direction panorama"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama direction"
 msgstr "Direction panorama"
 
-#: src/canonmn.cpp:804
+#: src/canonmn.cpp:914
 msgid "Unknown Canon Panorama tag"
 msgstr "Marqueur panorama Canon inconnu"
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 msgid "Noise Reduction"
 msgstr "Réduction du bruit"
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
 msgid "Long exposure noise reduction"
 msgstr "Réduction du bruit lors d'expositions longues"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
+#, fuzzy
 msgid "Shutter Ae Lock"
-msgstr ""
+msgstr "Vitesse d'obturation"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
+#, fuzzy
 msgid "Shutter/AE lock buttons"
-msgstr ""
+msgstr "Priorité obturation"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr "Verrouillage du miroir"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr "Verrouillage du miroir"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
 msgid "Exposure Level Increments"
 msgstr "Incrément de niveau d'exposition"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
 msgstr "Niveaux d'exposition et Tv/Av"
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
 msgid "AF Assist"
 msgstr "Faisceau AF"
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
 msgstr "Faisceau AF"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Flash Sync Speed Av"
 msgstr "Vitesse de synchro flash en mode Av"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Shutter speed in Av mode"
 msgstr "Vitesse d'obturation en mode Av"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
+#, fuzzy
 msgid "AEB Sequence"
-msgstr ""
+msgstr "Séquence"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB sequence/auto cancellation"
 msgstr ""
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
+#, fuzzy
 msgid "Shutter Curtain Sync"
-msgstr ""
+msgstr "Priorité obturation"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
+#, fuzzy
 msgid "Shutter curtain sync"
-msgstr ""
+msgstr "Priorité obturation"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
+#, fuzzy
 msgid "Lens AF Stop Button"
-msgstr ""
+msgstr "Type d'objectif"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF stop button Fn. Switch"
 msgstr ""
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
+#, fuzzy
 msgid "Fill Flash Auto Reduction"
-msgstr ""
+msgstr "Réduction du bruit"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu button return position"
 msgstr ""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
+#, fuzzy
 msgid "Set Button Function"
-msgstr ""
+msgstr "Fonctions personnalisées"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor Cleaning"
 msgstr "Nettoyage capteur"
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor cleaning"
 msgstr "Nettoyage capteur"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
 msgstr ""
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
 #, fuzzy
 msgid "Unknown Canon Custom Function tag"
 msgstr "Marqueur réglage appareil photo Canon inconnu"
 
-#: src/canonmn.cpp:841
+#: src/canonmn.cpp:951
 msgid "mid-right"
 msgstr "milieu-droit"
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 msgid "bottom"
 msgstr "bas"
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 msgid "top"
 msgstr "haut"
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
 msgid "mid-left"
 msgstr "milieu-gauche"
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
 msgid "upper-left"
 msgstr "haut-gauche"
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
 msgid "upper-right"
 msgstr "haut-droit"
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
 msgid "lower-left"
 msgstr "bas-gauche"
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
 msgid "lower-right"
 msgstr "bas-droit"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
 msgid "Image Width"
 msgstr "Largeur de l'image"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
 msgid "Image width"
 msgstr "Largeur de l'image"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
 msgid "Image Height"
 msgstr "Hauteur de l'image"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
 msgid "Image height"
 msgstr "Hauteur de l'image"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image Width As Shot"
 msgstr "Largeur de l'image"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image width (as shot)"
 msgstr "Largeur de l'image"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image Height As Shot"
 msgstr "Hauteur de l'image"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image height (as shot)"
 msgstr "Hauteur de l'image"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF Points Used"
 msgstr "Points AF utilisés"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF points used"
 msgstr "Points AF utilisés"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF Points Used 20D"
 msgstr "Points AF utilisés 20D"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF points used (20D)"
 msgstr "Points AF utilisés (20D)"
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 msgid "Unknown Canon Picture Info tag"
 msgstr "Marqueur info image Canon inconnu"
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
+#, fuzzy
 msgid "ISO"
-msgstr ""
+msgstr "Infos prise de vue"
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 msgid "WB"
 msgstr ""
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
 msgstr ""
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
 msgstr ""
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 #, fuzzy
 msgid "Medium Movie"
 msgstr "Moyenne 1"
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 #, fuzzy
 msgid "Small Movie"
 msgstr "Film"
 
-#: src/canonmn.cpp:905
+#: src/canonmn.cpp:1015
 #, fuzzy
 msgid "On 1"
 msgstr "Activé"
 
-#: src/canonmn.cpp:906
+#: src/canonmn.cpp:1016
 #, fuzzy
 msgid "On 2"
 msgstr "Activé"
 
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 #, fuzzy
 msgid "On (shift AB)"
 msgstr "AF One Shot"
 
-#: src/canonmn.cpp:915
+#: src/canonmn.cpp:1025
+#, fuzzy
 msgid "On (shift GM)"
-msgstr ""
+msgstr "AF One Shot"
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
 msgstr ""
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 #, fuzzy
 msgid "Orange"
 msgstr "Loin"
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 #, fuzzy
 msgid "Red"
 msgstr "Réduction yeux rouges"
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 #, fuzzy
 msgid "Green"
 msgstr "Mode contrôle"
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
 #, fuzzy
 msgid "Blue"
 msgstr "valeur"
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
 msgstr ""
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Pas du bracket"
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
 #, fuzzy
 msgid "Bracket Value"
 msgstr "Pas du bracket"
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
 #, fuzzy
 msgid "Bracket Shot Number"
 msgstr "Pas du bracket"
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 #, fuzzy
 msgid "Raw Jpg Quality"
 msgstr "Qualité de l'image"
 
-#: src/canonmn.cpp:943
+#: src/canonmn.cpp:1053
 #, fuzzy
 msgid "Raw Jpg Size"
 msgstr "Taille de l'image"
 
-#: src/canonmn.cpp:945
+#: src/canonmn.cpp:1055
 #, fuzzy
 msgid "WB Bracket Mode"
 msgstr "Pas du bracket"
 
-#: src/canonmn.cpp:946
+#: src/canonmn.cpp:1056
 #, fuzzy
 msgid "WB Bracket Value AB"
 msgstr "Table de balance des blancs"
 
-#: src/canonmn.cpp:947
+#: src/canonmn.cpp:1057
 #, fuzzy
 msgid "WB Bracket Value GM"
 msgstr "Table de balance des blancs"
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 #, fuzzy
 msgid "Filter Effect"
 msgstr "Effet de couleurs"
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 #, fuzzy
 msgid "Toning Effect"
 msgstr "Effet photo"
 
-#: src/canonmn.cpp:951
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro Magnification"
+msgstr "Augmentation électronique"
+
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro magnification"
+msgstr "Augmentation électronique"
+
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
+msgstr ""
+
+#: src/canonmn.cpp:1061
+#, fuzzy
+msgid "Live view shooting"
+msgstr "Réglage mode contrôle"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash Exposure Lock"
+msgstr "Compensation d'exposition du flash"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash exposure lock"
+msgstr "Compensation d'exposition du flash"
+
+#: src/canonmn.cpp:1064
 #, fuzzy
 msgid "Unknown Canon File Info tag"
 msgstr "Marqueur info image Canon inconnu"
 
-#: src/crwimage.cpp:663
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
+msgstr "Standard"
+
+#: src/canonmn.cpp:1082
+#, fuzzy
+msgid "Lowest"
+msgstr "Bas-gauche"
+
+#: src/canonmn.cpp:1086
+#, fuzzy
+msgid "Highest"
+msgstr "Élevée"
+
+#: src/canonmn.cpp:1094
+#, fuzzy
+msgid "High Saturation"
+msgstr "Saturation"
+
+#: src/canonmn.cpp:1096
+#, fuzzy
+msgid "Low Saturation"
+msgstr "Saturation"
+
+#: src/canonmn.cpp:1097
+#, fuzzy
+msgid "CM Set 1"
+msgstr "Réglage PC 1"
+
+#: src/canonmn.cpp:1098
+#, fuzzy
+msgid "CM Set 2"
+msgstr "Réglage PC 3"
+
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
+msgstr ""
+
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
+msgstr ""
+
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
+msgstr ""
+
+#: src/canonmn.cpp:1102
+msgid "PC 1"
+msgstr ""
+
+#: src/canonmn.cpp:1103
+msgid "PC 2"
+msgstr ""
+
+#: src/canonmn.cpp:1104
+msgid "PC 3"
+msgstr ""
+
+#: src/canonmn.cpp:1109
+msgid "Faithful"
+msgstr ""
+
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+msgid "Monochrome"
+msgstr "Monochrome"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "ToneCurve"
+msgstr "Courbe de tonalité"
+
+#: src/canonmn.cpp:1115
+msgid "Tone curve"
+msgstr "Courbe de tonalité"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "SharpnessFrequency"
+msgstr "Netteté"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "Sharpness frequency"
+msgstr "Netteté"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "SensorRedLevel"
+msgstr "Niveau de noir"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "Sensor red level"
+msgstr "Niveau de noir"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "SensorBlueLevel"
+msgstr "Niveau de noir"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "Sensor blue level"
+msgstr "Niveau de noir"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "WhiteBalanceRed"
+msgstr "Balance des blancs"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "White balance red"
+msgstr "Balance des blancs"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "WhiteBalanceBlue"
+msgstr "Table de balance des blancs"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "White balance blue"
+msgstr "Table de balance des blancs"
+
+#: src/canonmn.cpp:1122
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Balance des blancs"
+
+#: src/canonmn.cpp:1123
+#, fuzzy
+msgid "ColorTemperature"
+msgstr "Température des couleurs"
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+msgid "Color Temperature"
+msgstr "Température des couleurs"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "PictureStyle"
+msgstr "Mode d'image"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "Picture style"
+msgstr "Mode d'image"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "DigitalGain"
+msgstr "Zoom numérique"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "Digital gain"
+msgstr "Zoom numérique"
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+#, fuzzy
+msgid "WBShift AB"
+msgstr "AF One Shot"
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+#, fuzzy
+msgid "WB Shift GM"
+msgstr "AF One Shot"
+
+#: src/canonmn.cpp:1128
+#, fuzzy
+msgid "Unknown Canon Processing Info tag"
+msgstr "Marqueur info image Canon inconnu"
+
+#: src/crwimage.cpp:664
 msgid "Header, offset"
 msgstr "En-tête, décalage"
 
-#: src/crwimage.cpp:680
+#: src/crwimage.cpp:681
 msgid "tag"
 msgstr "marqueur"
 
-#: src/crwimage.cpp:682
+#: src/crwimage.cpp:683
 msgid "dir"
 msgstr "section"
 
-#: src/crwimage.cpp:684
+#: src/crwimage.cpp:685
 msgid "type"
 msgstr "type"
 
-#: src/crwimage.cpp:685
+#: src/crwimage.cpp:686
 msgid "size"
 msgstr "taille"
 
-#: src/crwimage.cpp:686
+#: src/crwimage.cpp:687
 msgid "offset"
 msgstr "décalage"
 
@@ -2373,8 +2993,8 @@
 "Part I, utilisé par le fournisseur. Les numéros de version sont assignés par "
 "l'IPTC et la NAA."
 
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
 msgid "Destination"
 msgstr "Destination"
 
@@ -2386,7 +3006,7 @@
 "Ce jeu de données est présent pour satisfaire certains fournisseurs qui "
 "attendent des informations de routage en sus des couches OSI appropriées."
 
-#: src/datasets.cpp:94
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
 msgid "File Format"
 msgstr "Format du fichier"
 
@@ -2543,21 +3163,28 @@
 msgstr "Version d'ARM"
 
 #: src/datasets.cpp:157
+#, fuzzy
 msgid ""
 "This tag consisting of a binary number representing the particular version "
 "of the ARM specified by tag <ARMId>."
 msgstr ""
+"Un champ binaire représentant la version courante du format du fichier "
+"spécifié par le marqueur <FileFormat>."
 
 #: src/datasets.cpp:170
 msgid "Record Version"
 msgstr "Version d'enregistrement"
 
 #: src/datasets.cpp:171
+#, fuzzy
 msgid ""
 "A binary number identifying the version of the Information Interchange "
 "Model, Part II, utilised by the provider. Version numbers are assigned by "
 "IPTC and NAA organizations."
 msgstr ""
+"Un champ binaire identifiant la version de l'Information Interchange Model, "
+"Part I, utilisé par le fournisseur. Les numéros de version sont assignés par "
+"l'IPTC et la NAA."
 
 #: src/datasets.cpp:175
 msgid "Object Type"
@@ -2603,7 +3230,7 @@
 msgid "Document Title"
 msgstr "Nom du document"
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
 msgid "Edit Status"
 msgstr "Statut des modifications"
 
@@ -2622,18 +3249,18 @@
 "<ARMVersion>, according to the practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
 msgstr "Priorité"
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
 msgid "Subject"
 msgstr "Sujet"
 
@@ -2641,7 +3268,7 @@
 msgid "The Subject Reference is a structured definition of the subject matter."
 msgstr ""
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
 msgid "Category"
 msgstr "Catégorie"
 
@@ -2664,7 +3291,7 @@
 "to the provider."
 msgstr ""
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
 msgstr "Catégories Supplémentaires"
 
@@ -2678,7 +3305,7 @@
 "immediately find or recall such an object."
 msgstr ""
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
 msgstr "Mots-clés"
 
@@ -2715,7 +3342,7 @@
 "provider."
 msgstr ""
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
 msgid "Release Date"
 msgstr "Date de publication"
 
@@ -2765,7 +3392,7 @@
 "embargoes and warnings."
 msgstr ""
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 msgid "Instructions"
 msgstr "Instructions"
 
@@ -2809,7 +3436,7 @@
 "object refers."
 msgstr ""
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
 msgid "Date Created"
 msgstr "Date de création"
 
@@ -2851,9 +3478,10 @@
 "representation of the object data was created. Follows ISO 8601 standard."
 msgstr ""
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 msgid "Program"
 msgstr "Logiciel"
 
@@ -2901,7 +3529,7 @@
 "Where used, a by-line title should follow the by-line it modifies."
 msgstr ""
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr "Ville"
 
@@ -2935,7 +3563,7 @@
 msgid "State/Province"
 msgstr "État/Région"
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
 msgid "Country Code"
 msgstr "Code du pays"
 
@@ -2961,11 +3589,11 @@
 "guidelines of the provider."
 msgstr ""
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
 msgid "Country"
 msgstr "Pays"
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
 msgid "Transmission Reference"
 msgstr "Référence de la transmission"
 
@@ -2975,7 +3603,7 @@
 "practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
 msgid "Headline"
 msgstr "Chapô"
 
@@ -2984,7 +3612,7 @@
 "A publishable entry providing a synopsis of the contents of the object data."
 msgstr ""
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
 msgid "Credit"
 msgstr "Crédit"
 
@@ -2994,8 +3622,8 @@
 "creator."
 msgstr ""
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
 msgid "Source"
 msgstr "Source"
 
@@ -3013,7 +3641,7 @@
 msgid "Copyright Notice"
 msgstr "Notice Droit d'auteur"
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
 msgid "Contact"
 msgstr "Contact"
 
@@ -3031,7 +3659,7 @@
 msgid "A textual description of the object data."
 msgstr ""
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 msgid "Description"
 msgstr "Description"
 
@@ -3046,8 +3674,9 @@
 msgstr ""
 
 #: src/datasets.cpp:392
+#, fuzzy
 msgid "Rasterized Caption"
-msgstr ""
+msgstr "Solarisation"
 
 #: src/datasets.cpp:393
 msgid ""
@@ -3064,10 +3693,13 @@
 msgstr "Orientation"
 
 #: src/datasets.cpp:400
+#, fuzzy
 msgid "Indicates the layout of an image."
 msgstr ""
+"Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
+"a été enregistrée."
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
 msgid "Language"
 msgstr "Langue"
 
@@ -3083,8 +3715,9 @@
 msgstr "Type audio"
 
 #: src/datasets.cpp:409
+#, fuzzy
 msgid "Indicates the type of an audio content."
-msgstr ""
+msgstr "Identifie le fournisseur et le produit"
 
 #: src/datasets.cpp:411
 msgid "Audio Rate"
@@ -3111,8 +3744,9 @@
 msgstr ""
 
 #: src/datasets.cpp:420
+#, fuzzy
 msgid "Audio Outcue"
-msgstr ""
+msgstr "Débit audio"
 
 #: src/datasets.cpp:421
 msgid ""
@@ -3136,10 +3770,13 @@
 msgstr "Version de prévisualisation"
 
 #: src/datasets.cpp:430
+#, fuzzy
 msgid ""
 "A binary number representing the particular version of the object data "
 "preview file format specified in tag <PreviewFormat>."
 msgstr ""
+"Un champ binaire représentant la version courante du format du fichier "
+"spécifié par le marqueur <FileFormat>."
 
 #: src/datasets.cpp:433
 msgid "Preview Data"
@@ -3157,222 +3794,227 @@
 msgid "Unknown dataset"
 msgstr "Données inconnues"
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+#, fuzzy
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr "Erreur %0 : arg1=%1, arg2=%2, arg3=%3."
 
-#: src/error.cpp:50
+#: src/error.cpp:56
 msgid "Success"
 msgstr "Réussite"
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr "Cela ne ressemble pas a une image %1"
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr "Nom de donnés `%1' invalide"
 
-#: src/error.cpp:55
+#: src/error.cpp:61
 msgid "Invalid record name `%1'"
 msgstr "Nom d'enregistrement `%1' invalide"
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr "Clef `%1' invalide"
 
-#: src/error.cpp:57
+#: src/error.cpp:63
+#, fuzzy
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
-msgstr ""
+msgstr "Nom de donnés `%1' invalide"
 
-#: src/error.cpp:58
+#: src/error.cpp:64
 msgid "Value not set"
 msgstr "Valeur non réglée"
 
-#: src/error.cpp:59
+#: src/error.cpp:65
 msgid "%1: Failed to open the data source: %2"
 msgstr "%1 : Impossible d'ouvrir la source de données : %2"
 
-#: src/error.cpp:60
+#: src/error.cpp:66
 msgid "%1: Failed to open file (%2): %3"
 msgstr "%1 : Impossible d'ouvrir le fichier (%2) : %3"
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr "%1 : Le fichier contient des données de type inconnu"
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr "La mémoire contient des données de type inconnu"
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr "Le type d'image %1 n'est pas supporté"
 
-#: src/error.cpp:64
+#: src/error.cpp:70
 msgid "Failed to read image data"
 msgstr "Impossible de lire les données de l'image"
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr "Cela ne semble pas être une image JPEG"
 
-#: src/error.cpp:67
+#: src/error.cpp:72
+#, fuzzy
+msgid "%1: Failed to map file for reading and writing: %2"
+msgstr "Impossible d'ouvrir le fichier à lire\n"
+
+#: src/error.cpp:73
 msgid "%1: Failed to rename file to %2: %3"
 msgstr "%1 : Impossible de renommer le fichier en %2 : %3"
 
-#: src/error.cpp:68
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr "%1 : Transfert échoué : %2"
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr "Transfert de mémoire échoué : %1"
 
-#: src/error.cpp:70
+#: src/error.cpp:76
 msgid "Failed to read input data"
 msgstr "Impossible de lire les données d'entrée"
 
-#: src/error.cpp:71
+#: src/error.cpp:77
 msgid "Failed to write image"
 msgstr "Impossible d'écrire l'image"
 
-#: src/error.cpp:72
+#: src/error.cpp:78
 msgid "Input data does not contain a valid image"
 msgstr "Les données d'entrée ne contiennent pas d'image valide"
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 #, fuzzy
 msgid "Invalid ifdId %1"
 msgstr "Clef `%1' invalide"
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 "Entry::setValue : valeur trop grande (marqueur=%1, taille=%2, demandé=%3)"
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 "Entry::setDataArea : valeur trop grande (marqueur=%1, taille=%2, demandé=%3)"
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr "Décalage hors de porté"
 
-#: src/error.cpp:77
+#: src/error.cpp:83
+#, fuzzy
 msgid "Unsupported data area offset type"
-msgstr ""
+msgstr "Format de date non supporté"
 
-#: src/error.cpp:78
+#: src/error.cpp:84
+#, fuzzy
 msgid "Invalid charset: `%1'"
-msgstr ""
+msgstr "Clef `%1' invalide"
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr "Format de date non supporté"
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr "Format d'heure non supporté"
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 #, fuzzy
 msgid "Writing to %1 images is not supported"
 msgstr "Écrire dans des images %2 n'est pas supporté"
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr "Régler %1 dans des image %2 n'est pas supporté"
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr "Cela ne semble pas être une image CRW"
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr "%1 : non supporté"
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr ""
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr "Taille du segment JPEG %1 est plus grand que 65535 octets"
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr ""
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr ""
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr ""
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr ""
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 
-#: src/error.cpp:98
+#: src/error.cpp:104
 #, fuzzy
 msgid "Invalid XmpText type `%1'"
 msgstr "Clef `%1' invalide"
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr ""
 
-#: src/error.cpp:100
+#: src/error.cpp:106
 msgid "Multiple TIFF array element tags %1 in one directory"
 msgstr ""
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr ""
 
-#: src/error.cpp:103
-msgid "(Unknown Error)"
-msgstr "(Erreur inconnue)"
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
-msgstr "Copyright (C) 2004-2009 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
+msgstr "Copyright (C) 2004-2010 Andreas Huggel.\n"
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3380,7 +4022,7 @@
 "of the License, or (at your option) any later version.\n"
 msgstr ""
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3388,7 +4030,7 @@
 "GNU General Public License for more details.\n"
 msgstr ""
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3396,11 +4038,11 @@
 "Boston, MA 02110-1301 USA\n"
 msgstr ""
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
@@ -3408,11 +4050,11 @@
 " [ options ] [ action ] fichier ...\n"
 "\n"
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr "Manipulation des métadonnées EXIF issues des images.\n"
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
@@ -3420,7 +4062,7 @@
 "\n"
 "Actions :\n"
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
@@ -3428,15 +4070,15 @@
 "  ad | adjust   Ajuste l'horodatage Exif par la date donnée. Cette\n"
 "                action nécessite l'option -a date.\n"
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr "  pr | print    Affiche les métadonnées de l'image.\n"
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr "  rm | delete   Supprime les métadonnées de l'image.\n"
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
@@ -3445,14 +4087,14 @@
 "                Utilisez l'option -S pour changer le suffixe des fichiers "
 "d'entrées.\n"
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 "  ex | extract  Extrait les métadonnées dans un ficher *.exv et l'aperçu de "
 "l'image.\n"
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
@@ -3465,7 +4107,7 @@
 "                -r format, les options d'horodatage sont contrôlées par -t "
 "et -T.\n"
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
@@ -3475,7 +4117,7 @@
 "                Exif et Iptc ou le commentaire JPEG de l'image.\n"
 "                Nécessite l'option -c, -m ou -M.\n"
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
@@ -3483,7 +4125,13 @@
 "  fi | fixiso   Copie le paramètre ISO du marqueur Nikon dans le marqueur\n"
 "                Exif standard.\n"
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
@@ -3491,39 +4139,54 @@
 "\n"
 "Options :\n"
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr "   -h      Affiche cette aide et sort.\n"
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr "   -V      Affiche la version du logiciel et sort.\n"
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr "   -v      Bavard lors de l'exécution du programme.\n"
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+#, fuzzy
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr "   -v      Bavard lors de l'exécution du programme.\n"
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr "   -b      Affiche les grandes données binaires.\n"
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 #, fuzzy
 msgid "   -u      Show unknown tags.\n"
 msgstr "   -u      N'affiche pas les marqueurs inconnus.\n"
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr "   -k      Préserve l'horodatage des fichiers.\n"
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 "   -t      Change aussi l'horodatage du fichier lors de l'action "
 "'rename' (redéfini -k).\n"
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
@@ -3532,16 +4195,16 @@
 "'rename'\n"
 "           ne ne renomme pas le fichier (redéfini -k).\n"
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr ""
 "   -f      Ne demande pas avant de réécrire un fichier existant (force).\n"
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr "   -F      Ne demande pas avant de renommer un fichier (Force).\n"
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
@@ -3549,75 +4212,75 @@
 "   -a time Ajustement temporel au format [-]HH[:MM[:SS]]. Cette option\n"
 "           est seulement utilisée avec l'action 'adjust'.\n"
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr ""
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr ""
 "   -p mode Mode d'affichage pour l'action 'print'. Les modes possible "
 "sont :\n"
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr "             s : Affiche un résumé des métadonnées Exif (par défaut)\n"
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 #, fuzzy
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
 msgstr ""
 "             v : Valeurs brutes des métadonnées Exif (raccourci -Pxgnycv)\n"
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 #, fuzzy
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 "             t : Interprète les métadonnées Exif data (raccourci pour -"
 "Pkyct)\n"
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 #, fuzzy
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr ""
 "             v : Valeurs brutes des métadonnées Exif (raccourci -Pxgnycv)\n"
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 #, fuzzy
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr ""
 "             h : hexdump des métadonnées Exif data (raccourci pour -"
 "Pxgnycsh)\n"
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 #, fuzzy
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr "             i : Données Iptc\n"
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 #, fuzzy
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr "             x : propriétés XMP \n"
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr "             c : Commentaire JPEG\n"
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 #, fuzzy
 msgid "             p : list available previews\n"
 msgstr "             l : intitulé du marqueur\n"
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 #, fuzzy
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
@@ -3625,94 +4288,94 @@
 "   -P cols Affiche les colonnes pour la liste de marqueurs Exif (action "
 "'print'). Colonnes Valides :\n"
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 #, fuzzy
 msgid "             E : include Exif tags in the list\n"
 msgstr "             s : taille en octets\n"
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 #, fuzzy
 msgid "             I : IPTC datasets\n"
 msgstr "             i : données IPTC\n"
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 #, fuzzy
 msgid "             X : XMP properties\n"
 msgstr "             x : propriétés XMP \n"
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 #, fuzzy
 msgid "             x : print a column with the tag number\n"
 msgstr "             x : affiche une colonne avec la valeur du marqueur\n"
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr "             g : nom du group\n"
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr "             k : clef\n"
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr "             l : intitulé du marqueur\n"
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr "             n : nom du marqueur\n"
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr "             y : type\n"
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr "             c : nombre de composant\n"
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr "             s : taille en octets\n"
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr "             v : valeur brute\n"
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr "             t : valeur interprété\n"
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr "             h : hexdump de la donnée\n"
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr ""
 "   -d tgt  Efface la(les) cible(s) de l'action 'delete'. Les cibles "
 "possibles sont :\n"
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr "             a : toutes les métadonnées (par défaut)\n"
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr "             e : section Exif\n"
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr "             t : aperçu Exif seulement\n"
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr "             i : données IPTC\n"
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr "             x : paquet XMP\n"
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 #, fuzzy
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
@@ -3726,7 +4389,7 @@
 "           les même que pour l'option -d. Seul les aperçus JPEG peuvent\n"
 "           inséré, ils doivent être nommés <fichier>-thumb.jpg\n"
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 #, fuzzy
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
@@ -3740,7 +4403,7 @@
 "possible sont\n"
 "           les même que pour l'option -d.\n"
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
@@ -3749,29 +4412,29 @@
 "format\n"
 "           suit strftime(3). Les mots-clés suivant sont supportés :\n"
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr "             :basename:   - nom de fichier original sans extensions\n"
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 "             :dirname:    - nom du répertoire contenant le fichier original\n"
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr "             :parentname: - nom du répertoire parent\n"
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr "           Le format du nom par défaut est "
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr "   -c txt  Commentaire JPEG a appliquer à l'image.\n"
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
@@ -3780,7 +4443,7 @@
 "commande est\n"
 "           set|add|del <clef> [[<type>] <valeur>].\n"
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
@@ -3789,7 +4452,7 @@
 "commande est\n"
 "           le meme que celui utilisé dans le fichier de commande.\n"
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
@@ -3797,7 +4460,7 @@
 "   -l dir  Emplacement (répertoire) pour les fichiers qui seront insérés de "
 "ou extraits dans.\n"
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
@@ -3806,568 +4469,575 @@
 "insertion.\n"
 "\n"
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 msgid "Option"
 msgstr "Оption"
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr "nécessite un argument\n"
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr "Option non reconnue"
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr "getopt a retourné un caractère non attendu"
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr "Ignore l'option supplémentaire"
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr "n'est pas compatible avec une option précédente\n"
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr "Ignore l'option supplémentaire -a"
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr "Erreur en traitant l'argument de l'option -a"
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr "L'option -a n'est pas compatible avec une option précédente\n"
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 msgid "Error parsing"
 msgstr "Erreur lors de l'analyse"
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 #, fuzzy
 msgid "option argument"
 msgstr "Nom du pays"
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr "Mode d'affichage non reconnu"
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr "Ignore l'option supplémentaire -p"
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr "L'option -p n'est pas compatible avec une option précédente\n"
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr "Élément d'affichage non reconnu"
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr "Ignore l'option supplémentaire -P"
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr "L'option -P n'est pas compatible avec une option précédente\n"
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr "L'option -d n'est pas compatible avec une option précédente\n"
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr "L'option -e n'est pas compatible avec une option précédente\n"
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr "L'option -i n'est pas compatible avec une option précédente\n"
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr "L'action ajuster n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr "L'action afficher n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr "L'action effacer n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr "L'action extraire n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr "L'action insérer n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr "L'action renommer n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr "L'action modifier n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr "L'action fixiso n'est pas compatible avec les options données\n"
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+#, fuzzy
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr "L'action fixiso n'est pas compatible avec les options données\n"
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr "Une action doit être spécifié\n"
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 #, fuzzy
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr "L'action modifier nécessite au moins une option -c, -m ou -M\n"
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr "L'action modifier nécessite au moins une option -c, -m ou -M\n"
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr "Au moins un fichier est nécessaire\n"
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr "Erreur en traitant les arguments de l'option -m\n"
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr "Erreur en traitant les arguments de l'option -M\n"
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr ""
 "L'option -I ne peut être utilisé qu'avec des actions d'insertion ou "
 "d'extraction\n"
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr "L'option -S ne peut être utilisé qu'avec l'action d'insertion\n"
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr "L'option -t ne peut être utilisé qu'avec l'actions de renommage\n"
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr "L'option -T ne peut être utilisé qu'avec l'actions de renommage\n"
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr "Non reconnu"
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 msgid "target"
 msgstr "cible"
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 #, fuzzy
 msgid "Invalid preview number"
 msgstr "Nombre d'intervalle"
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr "Impossible d'ouvrir le fichier à lire\n"
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 msgid "line"
 msgstr "ligne"
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 msgid "-M option"
 msgstr "option -M"
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr "ligne de commande invalide"
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr "commande invalide"
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
 msgstr "clef invalide"
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
 msgid "Soft mode 1"
 msgstr "Mode doux 1"
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
 msgid "Soft mode 2"
 msgstr "Mode doux 2"
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
 msgid "Hard mode 1"
 msgstr "Mode dur 1"
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
 msgid "Hard mode 2"
 msgstr "Mode dur 2"
 
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr "Lumière du jour"
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
 msgid "Fluorescent (daylight)"
 msgstr "Fluorescent (lumière du jour)"
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
 msgid "Fluorescent (warm white)"
 msgstr "Fluorescent (blanc chaud)"
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
 msgid "Fluorescent (cool white)"
 msgstr "Fluorescent (blanc froid)"
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
 msgid "Incandescent"
 msgstr "Incandescent"
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
 msgid "None (black & white)"
 msgstr "Aucun (Noir & Blanc)"
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
 msgid "Red-eye reduction"
 msgstr "Mode anti-yeux rouges."
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr "Scène de nuit"
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
 msgid "Program AE"
 msgstr "Programme exposition automatique"
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 msgid "Natural light"
 msgstr "Lumière naturelle"
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
 msgid "Anti-blur"
 msgstr "Anti flou"
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
 msgid "Sunset"
 msgstr "Ensoleillé"
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
 msgid "Museum"
 msgstr "Musée"
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
 msgid "Party"
 msgstr "Fête"
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 msgid "Flower"
 msgstr "Fleur"
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
 msgstr "Texte"
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
 msgid "Natural light & flash"
 msgstr "Lumière naturelle et flash"
 
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
 msgid "Aperture-priority AE"
 msgstr "Priorité ouverture AE"
 
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
 msgid "Shutter speed priority AE"
 msgstr "Priorité vitesse obturation AE"
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
 msgid "No flash & flash"
 msgstr "Pas de flash & flash"
 
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr "Standard"
-
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
 msgid "Chrome"
 msgstr "Chrome"
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
 msgid "Wide"
 msgstr "Large"
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
 msgid "F0/Standard"
 msgstr "F0/Standard"
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 msgid "F1/Studio portrait"
 msgstr "F1/Portrait studio"
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
 msgstr "F2/Fujichrome"
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
 msgid "F3/Studio portrait Ex"
 msgstr "F3/Portrait Studio Ex"
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr "F4/Velvia"
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr "Auto (100-400%)"
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr "Brut"
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
 msgid "Standard (100%)"
 msgstr "Standard (100%)"
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
 msgstr "Mode large 1 (230%)"
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
 msgstr "Mode large 2 (400%)"
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
 msgid "Film simulation mode"
 msgstr "Mode simulation de film"
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
 msgid "Version"
 msgstr "Version"
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
 msgid "Fujifilm Makernote version"
 msgstr "Version des notes de fabriquant Fujifilm"
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
 msgstr ""
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
 msgid "Image quality setting"
 msgstr "Réglage de qualité de l'image"
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
 msgid "Color"
 msgstr "Couleur"
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 msgid "Chroma saturation setting"
 msgstr "Réglage de saturation chromatique"
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
 msgid "Tone"
 msgstr "Ton"
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
 msgid "Flash firing mode setting"
 msgstr "Mode de déclenchement du flash"
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
 msgid "Flash Strength"
 msgstr "Puissance Flash"
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
+#, fuzzy
 msgid "Flash firing strength compensation setting"
-msgstr ""
+msgstr "Réglage compensation Flash"
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
 msgid "Macro mode setting"
 msgstr "Réglages du mode macro"
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 msgid "Focusing mode setting"
 msgstr "Réglage de mode de mise au point"
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
 msgstr "Synchro lente"
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
 msgid "Slow synchro mode setting"
 msgstr "Réglage de mode de synchro lente"
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
 msgid "Picture Mode"
 msgstr "Mode d'image"
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
 msgid "Picture mode setting"
 msgstr "Réglage de mode d'image"
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr "Réglage prise de vue continue ou auto-bracketing"
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
 msgid "Sequence Number"
 msgstr "Numéro Séquence"
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 msgid "Sequence number"
 msgstr "Numéro Séquence"
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
 msgid "FinePix Color"
 msgstr "Couleur FinePix"
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
 msgstr "Réglage couleur FinePix"
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
 msgid "Blur Warning"
 msgstr "Avertissement Flou"
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
 msgid "Blur warning status"
 msgstr "Statut avertissement Flou"
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
 msgid "Focus Warning"
 msgstr "Avertissement mise au point"
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
 msgid "Auto Focus warning status"
 msgstr "Statut avertissement mise au point auto"
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
 msgid "Exposure Warning"
 msgstr "Avertissement exposition"
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
 msgid "Auto exposure warning status"
 msgstr "Statut avertissement auto exposition"
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
 msgid "Dynamic Range"
 msgstr "Gamme dynamique"
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
 msgid "Dynamic range"
 msgstr "Gamme dynamique"
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
 msgid "Film Mode"
 msgstr "Mode Pellicule"
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
 msgid "Film mode"
 msgstr "Mode Pellicule"
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
 msgid "Dynamic Range Setting"
 msgstr "Réglage gamme dynamique"
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
 msgid "Dynamic range settings"
 msgstr "Réglage gamme dynamique"
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
+#, fuzzy
 msgid "Development Dynamic Range"
-msgstr ""
+msgstr "Gamme dynamique"
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
+#, fuzzy
 msgid "Development dynamic range"
-msgstr ""
+msgstr "Gamme dynamique"
 
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
 msgid "Minimum Focal Length"
 msgstr "Longueur focale minimale"
 
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
 msgid "Minimum focal length"
 msgstr "Longueur focale minimale"
 
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
 msgid "Maximum Focal Length"
 msgstr "Longueur focale maximum"
 
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
 msgid "Maximum focal length"
 msgstr "Longueur focale maximum"
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
 msgid "Maximum Aperture at Mininimum Focal"
 msgstr "Ouverture maximum à focal minimum"
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
 msgid "Maximum aperture at mininimum focal"
 msgstr "Ouverture maximum à focal minimum"
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
 msgid "Maximum Aperture at Maxinimum Focal"
 msgstr "Ouverture maximum à focal maximum"
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
 msgid "Maximum aperture at maxinimum focal"
 msgstr "Ouverture maximum à focal maximum"
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr "Source du fichier"
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 msgid "File source"
 msgstr "Source du fichier"
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
 msgid "Order Number"
 msgstr "Numéro ordre"
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
 msgid "Order number"
 msgstr "Numéro ordre"
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
 msgid "Frame Number"
 msgstr "Numéro frame"
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
 msgid "Frame number"
 msgstr "Numéro frame"
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
 msgid "Unknown FujiMakerNote tag"
 msgstr "Marqueur FujiMakerNote inconnu"
 
@@ -4375,20 +5045,20 @@
 msgid "Natural Color"
 msgstr "Couleur naturelle"
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
 msgid "Vivid Color"
 msgstr "Couleurs vives"
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
 msgid "Solarization"
 msgstr "Solarisation"
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
 msgid "Natural"
 msgstr "Naturel"
 
@@ -4404,6902 +5074,9593 @@
 msgid "Evening"
 msgstr "Soirée"
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
 msgid "Night Portrait"
 msgstr "Portrait de nuit"
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
 msgid "Super Fine"
 msgstr "Super fin"
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
 msgid "Extra Fine"
 msgstr "Extra fin"
 
-#: src/minoltamn.cpp:84
-msgid "ISO Setting Used"
-msgstr "Réglage ISO utilisé"
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr "Clef haute"
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr "Clef basse"
-
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
 msgid "Makernote Version"
 msgstr "Version des Notes du fabriquant"
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr "Chaîne 'MLT0' (non terminée par null)"
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
 msgid "Camera Settings (Std Old)"
 msgstr "Réglage appareil photo (ancien standard)"
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 "Réglage appareil photo standard (Anciens modèles comme les D5, D7, S304, et "
 "S404)"
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
 msgid "Camera Settings (Std New)"
 msgstr "Réglage appareil photo (Nouveau standard)"
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 "Réglage appareil photo standard (Nouveaux modèles comme les D7u, D7i, et "
 "D7hi)"
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
 msgid "Camera Settings (7D)"
 msgstr "Réglage appareil photo (7D)"
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
 msgid "Camera Settings (for Dynax 7D model)"
 msgstr "Réglage appareil photo (pour modèle Dymax 7D)"
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
 msgid "Image Stabilization Data"
 msgstr "Données stabilisation image"
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
 msgid "Image stabilization data"
 msgstr "Données stabilisation image"
 
-#: src/minoltamn.cpp:247
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
+msgstr ""
+
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:111
 msgid "Compressed Image Size"
 msgstr "Taille image compressée"
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:112
 msgid "Compressed image size"
 msgstr "Taille image compressée"
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
 msgstr "Aperçu Jpeg 640x480 pixels"
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
 msgid "Thumbnail Offset"
 msgstr "Décalage aperçu"
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr "Décalage de l'aperçu"
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
 msgid "Thumbnail Length"
 msgstr "Longueur de l'aperçu"
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
 msgid "Size of the thumbnail"
 msgstr "Taille de l'aperçu"
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+msgid "Scene Mode"
+msgstr "Mode scène"
+
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
 msgid "Color Mode"
 msgstr "Mode couleur"
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
 msgid "Color mode"
 msgstr "Mode couleur"
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
 msgid "Image Quality"
 msgstr "Qualité de l'image"
 
-#: src/minoltamn.cpp:271
-msgid "Zone Matching"
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
 msgstr ""
 
-#: src/minoltamn.cpp:272
-msgid "Zone matching"
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+msgid "Flash Exposure Compensation"
+msgstr "Compensation exposition flash"
+
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+msgid "Flash exposure compensation in EV"
+msgstr "Compensation exposition flash en EV"
+
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+#, fuzzy
+msgid "Teleconverter Model"
+msgstr "Mode scène"
+
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
 msgstr ""
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
-msgid "Color Temperature"
-msgstr "Température des couleurs"
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
+msgstr ""
+
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
+#, fuzzy
+msgid "Zone Matching"
+msgstr "Réduction du bruit"
+
+#: src/minoltamn.cpp:154
+#, fuzzy
+msgid "Zone matching"
+msgstr "Réduction du bruit"
 
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
 msgid "Color temperature"
 msgstr "Température des couleurs"
 
-#: src/minoltamn.cpp:277
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
 msgid "Lens ID"
 msgstr "ID Objectif"
 
-#: src/minoltamn.cpp:278
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
 msgid "Lens identifier"
 msgstr "Identifiant objectif"
 
-#: src/minoltamn.cpp:280
-msgid "Camera Settings (5D)"
-msgstr "Réglage appareil photo (5D)"
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+#, fuzzy
+msgid "Color Compensation Filter"
+msgstr "Compensation de tonalité"
 
-#: src/minoltamn.cpp:281
-msgid "Camera Settings (for Dynax 5D model)"
-msgstr "Réglage appareil photo (pour modèles Dymax 5D)"
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
+msgstr ""
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
-msgid "Print IM"
-msgstr "Print IM"
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+#, fuzzy
+msgid "White Balance Fine Tune"
+msgstr "Table de balance des blancs"
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
-msgid "PrintIM information"
-msgstr "Information PrintIM"
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+#, fuzzy
+msgid "White Balance Fine Tune Value"
+msgstr "Table de balance des blancs"
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:168
+#, fuzzy
+msgid "Image Stabilization A100"
+msgstr "Stabilisation de l'image"
+
+#: src/minoltamn.cpp:169
+#, fuzzy
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr "Données stabilisation image"
+
+#: src/minoltamn.cpp:173
+msgid "Camera Settings (5D)"
+msgstr "Réglage appareil photo (5D)"
+
+#: src/minoltamn.cpp:174
+msgid "Camera Settings (for Dynax 5D model)"
+msgstr "Réglage appareil photo (pour modèles Dymax 5D)"
+
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
+msgid "Print IM"
+msgstr "Print IM"
+
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
+msgid "PrintIM information"
+msgstr "Information PrintIM"
+
+#: src/minoltamn.cpp:183
 msgid "Camera Settings (Z1)"
 msgstr "Réglage appareil photo (Z1)"
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr "Réglage appareil photo (pour modèles Z1, DImage X, et F100)"
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
 msgid "Unknown Minolta MakerNote tag"
 msgstr "Marqueur de note du fabriquant Minolta inconnu"
 
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr "Priorité ouverture"
 
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr "Priorité obturation"
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
+#, fuzzy
 msgid "Fill flash"
-msgstr ""
+msgstr "Flash"
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
 msgid "Rear flash sync"
 msgstr "Synchro flash arrière"
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
 msgid "Wireless"
 msgstr "Sans fil"
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
 msgid "Fluorescent 2"
 msgstr "Fluorescent 2"
 
-#: src/minoltamn.cpp:329 src/properties.cpp:763
-msgid "Custom 3"
-msgstr "Processus personnel 2"
-
-#: src/minoltamn.cpp:334
+#: src/minoltamn.cpp:231
 msgid "Full size"
 msgstr "Pleine taille"
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
 msgid "Super fine"
 msgstr "Super fin"
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr "Extra fin"
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+#, fuzzy
+msgid "Single Frame"
+msgstr "Zone unique"
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
 msgid "Self-timer"
 msgstr "retardateur"
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
 msgid "Bracketing"
 msgstr "bracketing"
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
 msgid "Interval"
 msgstr "Interval"
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
+#, fuzzy
 msgid "UHS continuous"
-msgstr ""
+msgstr "Continue"
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
+#, fuzzy
 msgid "HS continuous"
-msgstr ""
+msgstr "Continue"
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
 msgid "Multi-segment"
 msgstr "Multi-segments"
 
-#: src/minoltamn.cpp:380
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+msgid "Center weighted average"
+msgstr "Moyenne pondérée au centre"
+
+#: src/minoltamn.cpp:271
 msgid "Electronic magnification"
 msgstr "Augmentation électronique"
 
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
 msgid "Top"
 msgstr "Haut"
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
 msgid "Top-right"
 msgstr "Haut-droit"
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 msgid "Bottom-right"
 msgstr "Bas-droit"
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
 msgid "Bottom"
 msgstr "Bas"
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
 msgid "Bottom-left"
 msgstr "Bas-gauche"
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
 msgid "Top-left"
 msgstr "Haut-gauche"
 
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
 msgid "Hard"
 msgstr "Dur"
 
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
 msgid "Soft"
 msgstr "Doux"
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
 msgid "Night portrait"
 msgstr "Portrait de nuit"
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
 msgid "Sports action"
 msgstr "Action sports"
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr ""
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 msgid "Standard form"
 msgstr "Formulaire standard"
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
 msgid "Data form"
 msgstr "Formulaire de donné"
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
 msgid "Natural color"
 msgstr "Couleur naturelle"
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
 msgid "Black and white"
 msgstr "Noir et Blanc"
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
 msgid "Vivid color"
 msgstr "Couleur vive"
 
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr "Adobe RGB"
-
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
 msgid "No zone"
 msgstr "Pas de zone"
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr "Zone centrale (orientation horizontale)"
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr "Zone centrale (orientation verticale)"
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
 msgid "Left zone"
 msgstr "Zone gauche"
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 msgid "Right zone"
 msgstr "Zone droite"
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
 msgid "Auto focus"
 msgstr "Mise au point auto"
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
 msgid "Wide focus (normal)"
 msgstr "Mise au point large (normale)"
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
 msgid "Spot focus"
 msgstr "Mise au point Spot"
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
 msgid "Exposure"
 msgstr "Exposition"
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 msgid "Filter"
 msgstr "Filtre"
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 msgid "Not embedded"
 msgstr "Non embarqué"
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
 msgid "Embedded"
 msgstr "Embarqué"
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr "Texte + N° ID"
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr ""
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr "Pré-flash TTl"
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
 msgid "Manual flash control"
 msgstr "Contrôle de flash manuel"
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr "Mode d'exposition"
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
 msgid "Flash mode"
 msgstr "Mode flash"
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
 msgid "Drive mode"
 msgstr "Mode contrôle"
 
-#: src/minoltamn.cpp:631
-msgid "Exposure Speed"
-msgstr "Vitesse d'exposition"
-
-#: src/minoltamn.cpp:632
-msgid "Exposure speed"
-msgstr "Vitesse d'exposition"
+#: src/minoltamn.cpp:512
+#, fuzzy
+msgid "ISO Value"
+msgstr "Valeur de vitesse ISO"
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr "Temps d'exposition"
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 msgid "FNumber"
 msgstr "Nombre F"
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 msgid "The F-Number"
 msgstr "Le F-nombre"
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 msgid "Macro Mode"
 msgstr "Mode macro"
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
 msgid "Exposure Compensation"
 msgstr "Compensation d'exposition"
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
 msgid "Bracket Step"
 msgstr "Pas du bracket"
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
 msgid "Bracket step"
 msgstr "Pas du bracket"
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
 msgid "Interval Length"
 msgstr "Longueur intervalle"
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
 msgid "Interval length"
 msgstr "Longueur intervalle"
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
 msgid "Interval Number"
 msgstr "Nombre d'intervalle"
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
 msgid "Interval number"
 msgstr "Nombre d'intervalle"
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
 msgid "Focus Distance"
 msgstr "Distance de mise au point"
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
 msgid "Focus distance"
 msgstr "Distance de mise au point"
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+#, fuzzy
+msgid "Flash Fired"
+msgstr "Matériel du flash"
+
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+#, fuzzy
+msgid "Flash fired"
+msgstr "Flash désactivé"
+
+#: src/minoltamn.cpp:547
 msgid "Minolta Date"
 msgstr "Date Minolta"
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
 msgid "Minolta date"
 msgstr "Date Minolta"
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
 msgid "Minolta Time"
 msgstr "Heure Minolta"
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
 msgid "Minolta time"
 msgstr "Heure Minolta"
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
+#, fuzzy
 msgid "File Number Memory"
-msgstr ""
+msgstr "Nombre F"
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
+#, fuzzy
 msgid "File number memory"
-msgstr ""
+msgstr "Nom du fichier"
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
-msgid "Image Number"
+#: src/minoltamn.cpp:559
+#, fuzzy
+msgid "Last Image Number"
 msgstr "Numéro d'image"
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:560
+#, fuzzy
+msgid "Last image number"
+msgstr "Numéro de l'image"
+
+#: src/minoltamn.cpp:562
 msgid "Color Balance Red"
 msgstr "Balance des rouges"
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
 msgid "Color balance red"
 msgstr "Balance des rouges"
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
 msgid "Color Balance Green"
 msgstr "Balance des verts"
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
 msgid "Color balance green"
 msgstr "Balance des verts"
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
 msgid "Color Balance Blue"
 msgstr "Balance des bleus"
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
 msgid "Color balance blue"
 msgstr "Balance des bleus"
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
+#, fuzzy
 msgid "Subject Program"
-msgstr ""
+msgstr "Aire du sujet"
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
+#, fuzzy
 msgid "Subject program"
-msgstr ""
+msgstr "Aire du sujet"
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
-msgid "Flash Exposure Compensation"
-msgstr "Compensation exposition flash"
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
+msgid "ISO Settings"
+msgstr "Réglage ISO"
 
-#: src/minoltamn.cpp:704
-msgid "Flash exposure compensation in EV"
-msgstr "Compensation exposition flash en EV"
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
+msgid "ISO setting"
+msgstr "Réglage ISO"
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
 msgid "Minolta Model"
 msgstr "Modèle Minolta"
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
 msgid "Minolta model"
 msgstr "Modèle Minolta"
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
 msgid "Interval Mode"
 msgstr "Mode interval"
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
 msgid "Interval mode"
 msgstr "Mode interval"
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
 msgid "Folder Name"
 msgstr "Nom répertoire"
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
 msgid "Folder name"
 msgstr "Nom répertoire"
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
 msgid "ColorMode"
 msgstr "Mode couleur"
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
 msgid "Color Filter"
 msgstr "Filtre couleur"
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
 msgid "Color filter"
 msgstr "Filtre couleur"
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
 msgid "Black and White Filter"
 msgstr "Filtre Noir et Blanc"
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
 msgid "Black and white filter"
 msgstr "Filtre Noir et Blanc"
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
 msgid "Internal Flash"
 msgstr "Flash interne"
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr "Luminosité"
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
+#, fuzzy
 msgid "Spot Focus Point X"
-msgstr ""
+msgstr "Mise au point Spot"
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
+#, fuzzy
 msgid "Spot focus point X"
-msgstr ""
+msgstr "Mise au point Spot"
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
+#, fuzzy
 msgid "Spot Focus Point Y"
-msgstr ""
+msgstr "Mise au point Spot"
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
+#, fuzzy
 msgid "Spot focus point Y"
-msgstr ""
+msgstr "Mise au point Spot"
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
 msgid "Wide Focus Zone"
 msgstr "Zone mise au point large"
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
 msgid "Wide focus zone"
 msgstr "Zone mise au point large"
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
 msgid "Focus mode"
 msgstr "Mode mise au point"
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
 msgid "Focus area"
 msgstr "Zone mise au point"
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
+#, fuzzy
 msgid "DEC Switch Position"
-msgstr ""
+msgstr "Position mise au point"
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
+#, fuzzy
 msgid "DEC switch position"
-msgstr ""
+msgstr "Position mise au point"
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
 msgid "Color Profile"
 msgstr "Profil couleur"
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
 msgid "Color profile"
 msgstr "Profil couleur"
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
 msgid "Data Imprint"
 msgstr ""
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
+#, fuzzy
 msgid "Flash Metering"
-msgstr ""
+msgstr "Réglage flash"
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
+#, fuzzy
 msgid "Flash metering"
-msgstr ""
+msgstr "Réglage flash"
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
 msgid "Unknown Minolta Camera Settings tag"
 msgstr "Marqueur réglage appareil photo Minolta inconnu"
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
+#, fuzzy
 msgid "Program-shift A"
-msgstr ""
+msgstr "Logiciel"
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
+#, fuzzy
 msgid "Program-shift S"
-msgstr ""
+msgstr "Logiciel"
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
 msgid "Raw+Jpeg"
 msgstr "Brut+Jpeg"
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
 msgid "Kelvin"
 msgstr "Kelvin"
 
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
+#, fuzzy
 msgid "Single-shot AF"
-msgstr ""
+msgstr "Simple"
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
+#, fuzzy
 msgid "Continuous AF"
-msgstr ""
+msgstr "Continue"
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
 msgid "Automatic AF"
 msgstr "AF automatique"
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
 msgid "sRGB (Natural)"
 msgstr "sRGB (naturel)"
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
 msgid "sRGB (Natural+)"
 msgstr "sRGB (naturel+)"
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr "Horizontale (normale)"
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr "Rotation 90° Horaire"
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr "Rotation 270° Horaire"
 
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
 msgid "AF Points"
 msgstr "Points AF"
 
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
 msgid "AF points"
 msgstr "AF Points"
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr "Espace des couleurs"
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 msgid "Color space"
 msgstr "Espace des couleurs"
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 msgid "Free Memory Card Images"
 msgstr ""
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 msgid "Free memory card images"
 msgstr ""
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
 msgid "Hue"
 msgstr "tonalité"
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+msgid "Image Number"
+msgstr "Numéro d'image"
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
 msgid "Noise reduction"
 msgstr "Réduction du bruit"
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
 msgid "Zone Matching On"
 msgstr ""
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
+#, fuzzy
 msgid "Zone matching on"
-msgstr ""
+msgstr "Compensation de tonalité"
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
 msgid "Unknown Minolta Camera Settings 7D tag"
 msgstr "Marqueur 7D réglage appareil photo Minolta inconnu"
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
-msgstr ""
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+#, fuzzy
+msgid "Program Shift A"
+msgstr "Logiciel"
+
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+#, fuzzy
+msgid "Program Shift S"
+msgstr "Logiciel"
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+#, fuzzy
+msgid "Night View/Portrait"
+msgstr "Portrait de nuit"
+
+#: src/minoltamn.cpp:895
 msgid "200 (Zone Matching High)"
 msgstr ""
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
 msgid "80 (Zone Matching Low)"
 msgstr ""
 
-#: src/minoltamn.cpp:1065
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+#, fuzzy
+msgid "Adobe RGB (ICC)"
+msgstr "Adobe RGB"
+
+#: src/minoltamn.cpp:918
 msgid "Central"
 msgstr "Central"
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:919
 msgid "Up"
 msgstr "Haut"
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
 msgid "Up right"
 msgstr "Haut droit"
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
 msgid "Down right"
 msgstr "Bas droit"
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
 msgid "Down"
 msgstr "Bas"
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
 msgid "Down left"
 msgstr "Bas gauche"
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
 msgid "Up left"
 msgstr "Haut gauche"
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 msgid "Selection"
 msgstr "Sélection"
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+#, fuzzy
+msgid "Natural+"
+msgstr "Naturel"
+
+#: src/minoltamn.cpp:949
+#, fuzzy
+msgid "Wind Scene"
+msgstr "Scène de nuit"
+
+#: src/minoltamn.cpp:950
+#, fuzzy
+msgid "Evening Scene"
+msgstr "Soirée"
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus Position"
 msgstr "Position mise au point"
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus position"
 msgstr "Position mise au point"
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
 msgid "Focus Area"
 msgstr "Zone mise au point"
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
+#, fuzzy
 msgid "Exposure Revision"
-msgstr ""
+msgstr "Compensation d'exposition"
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
+#, fuzzy
 msgid "Exposure revision"
-msgstr ""
+msgstr "Compensation d'exposition"
+
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+#, fuzzy
+msgid "Rotation2"
+msgstr "Rotation"
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+#, fuzzy
+msgid "Picture Finish"
+msgstr "Infos image"
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1059
 msgid "Exposure Manual Bias"
 msgstr "Biais manuel d'exposition"
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
 msgid "Exposure manual bias"
 msgstr "Biais manuel d'exposition"
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
 msgid "AF Mode"
 msgstr "Mode mise au point automatique"
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
 msgid "AF mode"
 msgstr "Mode mise au point automatique"
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
 msgid "Unknown Minolta Camera Settings 5D tag"
 msgstr "Marqueur 5D réglage appareil photo Minolta inconnu"
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
-msgid "Single area"
-msgstr "Zone unique"
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
+#, fuzzy
+msgid "Self-timer 10 sec"
+msgstr "retardateur"
 
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
-msgid "Dynamic area"
-msgstr "Zone dynamique"
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
+#, fuzzy
+msgid "Self-timer 2 sec"
+msgstr "retardateur"
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
-msgstr "Zone dynamique, sujet proche"
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+#, fuzzy
+msgid "White Balance Bracketing Low"
+msgstr "Biais de balance des blancs"
 
-#: src/nikonmn.cpp:77
-msgid "Group dynamic"
-msgstr ""
+#: src/minoltamn.cpp:1101
+#, fuzzy
+msgid "White Balance Bracketing High"
+msgstr "Biais de balance des blancs"
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr "Zone unique (large)"
+#: src/minoltamn.cpp:1102
+#, fuzzy
+msgid "Single-frame Bracketing Low"
+msgstr "Zone unique"
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
-msgstr "Zone dynamique (large)"
+#: src/minoltamn.cpp:1103
+#, fuzzy
+msgid "Continous Bracketing Low"
+msgstr "Bracketing automatique"
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
-msgid "Upper-left"
-msgstr "Haut-gauche"
+#: src/minoltamn.cpp:1104
+#, fuzzy
+msgid "Single-frame Bracketing High"
+msgstr "Zone unique"
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
-msgid "Upper-right"
-msgstr "Haut-droit"
+#: src/minoltamn.cpp:1105
+#, fuzzy
+msgid "Continous Bracketing High"
+msgstr "Continue, Haute"
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
-msgid "Lower-left"
-msgstr "Bas-gauche"
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
+msgstr ""
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
-msgid "Lower-right"
-msgstr "Bas-droit"
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
+#, fuzzy
+msgid "Continuous Bracketing"
+msgstr "Continue, Haute"
 
-#: src/nikonmn.cpp:96
-msgid "Left-most"
-msgstr "Plus à gauche"
+#: src/minoltamn.cpp:1152
+#, fuzzy
+msgid "Single-Frame Bracketing"
+msgstr "Zone unique"
 
-#: src/nikonmn.cpp:97
-msgid "Right-most"
-msgstr "Plus à droite"
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
+#, fuzzy
+msgid "White Balance Bracketing"
+msgstr "Biais de balance des blancs"
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
-msgstr "sRGB"
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
+msgid "Preset"
+msgstr "Présélection"
 
-#: src/nikonmn.cpp:131
-msgid "Fire, manual"
-msgstr "Flash déclenché, manuel"
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
+#, fuzzy
+msgid "Color Temperature/Color Filter"
+msgstr "Température des couleurs"
 
-#: src/nikonmn.cpp:132
-msgid "Fire, external"
-msgstr "Flash déclenché, externe"
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
+#, fuzzy
+msgid "Temperature"
+msgstr "Température de l'objectif"
 
-#: src/nikonmn.cpp:133
-msgid "Fire, commander mode"
-msgstr "Flash déclenché, mode maître"
+#: src/minoltamn.cpp:1209
+#, fuzzy
+msgid "Setup"
+msgstr "Définition de"
 
-#: src/nikonmn.cpp:134
-msgid "Fire, TTL mode"
-msgstr "Flash déclenché, mode TTL"
+#: src/minoltamn.cpp:1210
+msgid "Recall"
+msgstr ""
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
-msgstr "Délai"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
+msgstr ""
 
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
-msgid "PC control"
-msgstr "Contrôle PC"
-
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
-msgid "Exposure bracketing"
+#: src/minoltamn.cpp:1216
+msgid "Error"
 msgstr ""
 
-#: src/nikonmn.cpp:143
+#: src/minoltamn.cpp:1228
 #, fuzzy
-msgid "Auto ISO"
-msgstr "Automatique"
-
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
-msgid "White balance bracketing"
-msgstr ""
+msgid "Image and Information"
+msgstr "Configuration image"
 
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
-msgid "IR control"
-msgstr "Contrôle infrarouge"
+#: src/minoltamn.cpp:1229
+#, fuzzy
+msgid "Image Only"
+msgstr "Type d'image"
 
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
-msgstr ""
+#: src/minoltamn.cpp:1230
+#, fuzzy
+msgid "Image and Histogram"
+msgstr "Hauteur de l'image"
 
-#: src/nikonmn.cpp:162
-msgid "Auto release"
-msgstr "Déclenchement automatique"
+#: src/minoltamn.cpp:1236
+#, fuzzy
+msgid "Fill Flash"
+msgstr "Flash"
 
-#: src/nikonmn.cpp:163
-msgid "Manual release"
-msgstr "Déclenchement  manuel"
+#: src/minoltamn.cpp:1247
+#, fuzzy
+msgid "Focus Hold"
+msgstr "Mode mise au point"
 
-#: src/nikonmn.cpp:168
+#: src/minoltamn.cpp:1248
 #, fuzzy
-msgid "Lossy (type 1)"
-msgstr "Type d'objectif"
+msgid "DOF Preview"
+msgstr "Données de prévisualisation"
 
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
-msgstr "Non compressé"
+#: src/minoltamn.cpp:1253
+msgid "Hold"
+msgstr ""
 
-#: src/nikonmn.cpp:170
+#: src/minoltamn.cpp:1254
 #, fuzzy
-msgid "Lossless"
-msgstr "Los Angeles"
+msgid "Toggle"
+msgstr "Ton"
 
-#: src/nikonmn.cpp:171
+#: src/minoltamn.cpp:1255
 #, fuzzy
-msgid "Lossy (type 2)"
-msgstr "Type d'objectif"
+msgid "Spot Hold"
+msgstr "Mode doux 1"
 
-#: src/nikonmn.cpp:177
+#: src/minoltamn.cpp:1256
 #, fuzzy
-msgid "B & W"
-msgstr "N&B"
+msgid "Spot Toggle"
+msgstr "Mode doux 1"
 
-#: src/nikonmn.cpp:179
-#, fuzzy
-msgid "Trim"
-msgstr "Heure d'envoi"
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+msgid "Shutter Speed"
+msgstr "Vitesse d'obturation"
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:181
-msgid "D-Lighting"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
 msgstr ""
 
-#: src/nikonmn.cpp:182
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
+msgstr ""
+
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
+msgstr ""
+
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
 #, fuzzy
-msgid "Red eye"
-msgstr "Réduction yeux rouges"
+msgid "Automatic"
+msgstr "AF automatique"
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
 #, fuzzy
-msgid "Cyanotype"
-msgstr "type"
+msgid "Auto-rotate"
+msgstr "Contraste"
 
-#: src/nikonmn.cpp:184
+#: src/minoltamn.cpp:1287
 #, fuzzy
-msgid "Sky light"
-msgstr "Lumière du jour"
+msgid "Horizontal"
+msgstr "Horizontale (normale)"
 
-#: src/nikonmn.cpp:185
+#: src/minoltamn.cpp:1293
 #, fuzzy
-msgid "Warm tone"
-msgstr "Tonalité couleur"
+msgid "Manual Rotate"
+msgstr "Déclenchement  manuel"
 
-#: src/nikonmn.cpp:186
+#: src/minoltamn.cpp:1298
 #, fuzzy
-msgid "Color custom"
-msgstr "Tonalité couleur"
+msgid "Within Range"
+msgstr "Classement Windows"
 
-#: src/nikonmn.cpp:187
+#: src/minoltamn.cpp:1299
 #, fuzzy
-msgid "Image overlay"
-msgstr "Type d'image"
+msgid "Under/Over Range"
+msgstr "Échelle de transfert"
 
-#: src/nikonmn.cpp:193
+#: src/minoltamn.cpp:1300
 #, fuzzy
-msgid "Minimal"
-msgstr "Manuel"
+msgid "Out of Range"
+msgstr "Décalage hors de porté"
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
-msgid "Nikon Makernote version"
-msgstr "Version des note du fabriquant Nikon"
+#: src/minoltamn.cpp:1305
+#, fuzzy
+msgid "Not Indicated"
+msgstr "Non défini"
 
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
-msgid "ISO Speed"
-msgstr "Vitesse ISO"
+#: src/minoltamn.cpp:1306
+#, fuzzy
+msgid "Under Scale"
+msgstr "Sous marin"
 
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
-msgid "Sharpening"
-msgstr "Netteté"
+#: src/minoltamn.cpp:1307
+#, fuzzy
+msgid "Bottom of Scale"
+msgstr "Du bas vers le haut"
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
-msgid "Image sharpening setting"
-msgstr "Réglage netteté image"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
+msgstr ""
 
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
-msgid "Focus"
-msgstr "Mise au point"
+#: src/minoltamn.cpp:1326
+#, fuzzy
+msgid "Over Scale"
+msgstr "Défaut"
 
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
-msgid "Flash Setting"
-msgstr "Réglage flash"
+#: src/minoltamn.cpp:1331
+msgid "AM"
+msgstr ""
 
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
-msgid "Flash setting"
-msgstr "Réglage flash"
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
+msgstr ""
 
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
-msgid "ISO Selection"
-msgstr "Sélection ISO"
+#: src/minoltamn.cpp:1338
+msgid "Built-in"
+msgstr ""
 
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
-msgid "ISO selection"
-msgstr "Sélection ISO"
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
+msgid "Very Low"
+msgstr "Très faible"
 
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data Dump"
-msgstr ""
+#: src/minoltamn.cpp:1346
+#, fuzzy
+msgid "Half Full"
+msgstr "Plein"
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data dump"
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
 msgstr ""
 
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
-msgid "Image Adjustment"
-msgstr "Ajustement image"
+#: src/minoltamn.cpp:1355
+#, fuzzy
+msgid "Exposure Compensation Setting"
+msgstr "Compensation d'exposition"
 
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
-msgid "Image adjustment setting"
-msgstr "Réglage ajustement image"
+#: src/minoltamn.cpp:1356
+#, fuzzy
+msgid "Exposure compensation setting"
+msgstr "Compensation d'exposition"
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
-msgid "Auxiliary Lens"
-msgstr "Objectif auxiliaire"
+#: src/minoltamn.cpp:1358
+#, fuzzy
+msgid "High Speed Sync"
+msgstr "Scène de nuit"
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
-msgstr "Objectif auxiliaire (adaptateur)"
+#: src/minoltamn.cpp:1359
+#, fuzzy
+msgid "High speed sync"
+msgstr "Scène de nuit"
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
-msgid "Manual focus distance"
-msgstr "Distance mise au point manuelle"
+#: src/minoltamn.cpp:1361
+#, fuzzy
+msgid "Manual Exposure Time"
+msgstr "Temps d'exposition"
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
-msgid "Digital zoom setting"
-msgstr "Réglage du zoom numérique"
+#: src/minoltamn.cpp:1362
+#, fuzzy
+msgid "Manual exposure time"
+msgstr "Temps d'exposition"
 
-#: src/nikonmn.cpp:246
-msgid "AF Focus Position"
-msgstr ""
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
+#, fuzzy
+msgid "Manual FNumber"
+msgstr "Nombre d'intervalle"
 
-#: src/nikonmn.cpp:247
-msgid "AF focus position information"
-msgstr ""
+#: src/minoltamn.cpp:1373
+#, fuzzy
+msgid "Drive Mode 2"
+msgstr "Mode contrôle"
 
-#: src/nikonmn.cpp:252
-msgid "Unknown Nikon1MakerNote tag"
-msgstr "Marqueur 1 de note du fabriquant Nikon inconnu"
+#: src/minoltamn.cpp:1374
+#, fuzzy
+msgid "Drive mode 2"
+msgstr "Mode contrôle"
 
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
 msgstr ""
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
-msgstr ""
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
+#, fuzzy
+msgid "AF Area Mode"
+msgstr "Mode mise au point automatique"
 
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
-msgid "Not used"
-msgstr "Non utilisé"
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
+#, fuzzy
+msgid "FlashMode"
+msgstr "Mode flash"
 
-#: src/nikonmn.cpp:353
-msgid "guess"
-msgstr "deviné"
+#: src/minoltamn.cpp:1391
+#, fuzzy
+msgid "Flash Exposure Comp Setting"
+msgstr "Compensation exposition flash"
 
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
-msgstr "VGA grossier"
+#: src/minoltamn.cpp:1392
+#, fuzzy
+msgid "Flash exposure compensation setting"
+msgstr "Compensation exposition flash en EV"
 
-#: src/nikonmn.cpp:401
-msgid "VGA Normal"
-msgstr "VGA normal"
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
+#, fuzzy
+msgid "ISO Setting"
+msgstr "Réglage ISO"
 
-#: src/nikonmn.cpp:402
-msgid "VGA Fine"
-msgstr "VGA fin"
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
+#, fuzzy
+msgid "Zone Matching Mode"
+msgstr "Réduction du bruit"
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
-msgstr "SXGA grossier"
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
+#, fuzzy
+msgid "Dynamic Range Optimizer Mode"
+msgstr "Réglage gamme dynamique"
 
-#: src/nikonmn.cpp:404
-msgid "SXGA Normal"
-msgstr "SXGA normal"
+#: src/minoltamn.cpp:1404
+#, fuzzy
+msgid "Dynamic range optimizer mode"
+msgstr "Réglage gamme dynamique"
 
-#: src/nikonmn.cpp:405
-msgid "SXGA Fine"
-msgstr "SXGA fin"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
+msgstr ""
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
-msgid "Monochrome"
-msgstr "Monochrome"
+#: src/minoltamn.cpp:1430
+#, fuzzy
+msgid "Self Timer Time"
+msgstr "Retardateur"
 
-#: src/nikonmn.cpp:417
-msgid "Bright+"
-msgstr "Luminosité+"
+#: src/minoltamn.cpp:1431
+#, fuzzy
+msgid "Self timer time"
+msgstr "Retardateur"
 
-#: src/nikonmn.cpp:418
-msgid "Bright-"
-msgstr "Luminosité-"
+#: src/minoltamn.cpp:1434
+#, fuzzy
+msgid "Continuous bracketing"
+msgstr "Continue, Haute"
 
-#: src/nikonmn.cpp:419
-msgid "Contrast+"
-msgstr "Contraste+"
+#: src/minoltamn.cpp:1436
+#, fuzzy
+msgid "Single Frame Bracketing"
+msgstr "bracketing"
 
-#: src/nikonmn.cpp:420
-msgid "Contrast-"
-msgstr "Contraste-"
+#: src/minoltamn.cpp:1437
+#, fuzzy
+msgid "Single frame bracketing"
+msgstr "Zone unique"
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
-msgstr "Présélection"
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
+#, fuzzy
+msgid "White balance bracketing"
+msgstr "Biais de balance des blancs"
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
-msgstr "Vitesse lumière"
+#: src/minoltamn.cpp:1442
+#, fuzzy
+msgid "White Balance Setting"
+msgstr "Réglage balance des blancs"
 
-#: src/nikonmn.cpp:479
-msgid "Unknown Nikon2MakerNote tag"
-msgstr "Marqueur 2 de note du fabriquant Nikon inconnu"
+#: src/minoltamn.cpp:1445
+#, fuzzy
+msgid "Preset White Balance"
+msgstr "Balance des blancs"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
-msgid "Flash Device"
-msgstr "Matériel du flash"
+#: src/minoltamn.cpp:1446
+#, fuzzy
+msgid "Preset white balance"
+msgstr "Balance des blancs"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
-msgid "Flash device"
-msgstr "Matériel du flash"
+#: src/minoltamn.cpp:1448
+#, fuzzy
+msgid "Color Temperature Setting"
+msgstr "Température des couleurs"
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
-msgid "White Balance Bias"
-msgstr "Biais de balance des blancs"
+#: src/minoltamn.cpp:1449
+#, fuzzy
+msgid "Color temperature setting"
+msgstr "Température des couleurs"
 
-#: src/nikonmn.cpp:522
-msgid "White balance bias"
-msgstr "Biais de balance des blancs"
+#: src/minoltamn.cpp:1451
+#, fuzzy
+msgid "Custom WB Setting"
+msgstr "Personnel 1"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1452
 #, fuzzy
-msgid "WB RB Levels"
+msgid "Custom WB setting"
+msgstr "Personnel 1"
+
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
+#, fuzzy
+msgid "Dynamic Range Optimizer Settings"
+msgstr "Réglage gamme dynamique"
+
+#: src/minoltamn.cpp:1460
+#, fuzzy
+msgid "Custom WB Red Level"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1461
 #, fuzzy
-msgid "WB RB levels"
+msgid "Custom WB red level"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:524
-msgid "Program Shift"
-msgstr ""
+#: src/minoltamn.cpp:1463
+#, fuzzy
+msgid "Custom WB Green Level"
+msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:524
-msgid "Program shift"
-msgstr ""
+#: src/minoltamn.cpp:1464
+#, fuzzy
+msgid "Custom WB green level"
+msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure Difference"
-msgstr "Différence d'exposition"
+#: src/minoltamn.cpp:1466
+#, fuzzy
+msgid "Custom WB Blue Level"
+msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure difference"
-msgstr "Différence d'exposition"
+#: src/minoltamn.cpp:1467
+#, fuzzy
+msgid "CustomWB blue level"
+msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
-msgstr "Pointeur vers l'image d'aperçu"
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
+#, fuzzy
+msgid "Custom WB Error"
+msgstr "Personnel 1"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
-msgstr "Décalage vers l'IFD contenant l'aperçu"
+#: src/minoltamn.cpp:1473
+#, fuzzy
+msgid "White balance fine tune"
+msgstr "Ajustement de la balance des blancs"
 
-#: src/nikonmn.cpp:529
-msgid "Flash Comp"
-msgstr "Compensation Flash"
+#: src/minoltamn.cpp:1479
+#, fuzzy
+msgid "Color compensation filter"
+msgstr "Valeur de compensation d'exposition"
 
-#: src/nikonmn.cpp:529
-msgid "Flash compensation setting"
-msgstr "Réglage compensation Flash"
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
+#, fuzzy
+msgid "Sony Image Size"
+msgstr "Taille de l'image"
 
-#: src/nikonmn.cpp:530
-msgid "ISO Settings"
-msgstr "Réglage ISO"
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
+msgstr ""
 
-#: src/nikonmn.cpp:530
-msgid "ISO setting"
-msgstr "Réglage ISO"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
+msgstr ""
 
-#: src/nikonmn.cpp:531
-msgid "Image Boundary"
-msgstr "Limite de l'image"
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
+msgstr ""
 
-#: src/nikonmn.cpp:531
-msgid "Image boundary"
-msgstr "Limite de l'image"
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
+msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash Bracket Comp"
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
 msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash bracket compensation applied"
+#: src/minoltamn.cpp:1497
+#, fuzzy
+msgid "Eye start AF"
+msgstr "AF One Shot"
+
+#: src/minoltamn.cpp:1499
+#, fuzzy
+msgid "Red Eye Reduction"
+msgstr "Mode anti-yeux rouges."
+
+#: src/minoltamn.cpp:1500
+#, fuzzy
+msgid "Red eye reduction"
+msgstr "Mode anti-yeux rouges."
+
+#: src/minoltamn.cpp:1502
+#, fuzzy
+msgid "Flash Default"
+msgstr "Détails flash"
+
+#: src/minoltamn.cpp:1503
+#, fuzzy
+msgid "Flash default"
+msgstr "Détails flash"
+
+#: src/minoltamn.cpp:1505
+#, fuzzy
+msgid "Auto Bracket Order"
+msgstr "Bracketing automatique"
+
+#: src/minoltamn.cpp:1506
+#, fuzzy
+msgid "Auto bracket order"
+msgstr "Bracketing automatique"
+
+#: src/minoltamn.cpp:1508
+#, fuzzy
+msgid "Focus Hold Button"
+msgstr "Réglage mode de mise au point"
+
+#: src/minoltamn.cpp:1509
+#, fuzzy
+msgid "Focus hold button"
+msgstr "Réglage mode de mise au point"
+
+#: src/minoltamn.cpp:1511
+#, fuzzy
+msgid "AEL Button"
+msgstr "Réglage AE"
+
+#: src/minoltamn.cpp:1512
+#, fuzzy
+msgid "AEL button"
+msgstr "Réglage AE"
+
+#: src/minoltamn.cpp:1514
+#, fuzzy
+msgid "Control Dial Set"
+msgstr "Réglage de contraste"
+
+#: src/minoltamn.cpp:1515
+#, fuzzy
+msgid "Control dial set"
+msgstr "Contraste"
+
+#: src/minoltamn.cpp:1517
+#, fuzzy
+msgid "Exposure Compensation Mode"
+msgstr "Compensation d'exposition"
+
+#: src/minoltamn.cpp:1518
+#, fuzzy
+msgid "Exposure compensation mode"
+msgstr "Compensation d'exposition"
+
+#: src/minoltamn.cpp:1521
+#, fuzzy
+msgid "AF assist"
+msgstr "Faisceau AF"
+
+#: src/minoltamn.cpp:1523
+#, fuzzy
+msgid "Card Shutter Lock"
+msgstr "Priorité obturation"
+
+#: src/minoltamn.cpp:1524
+#, fuzzy
+msgid "Card shutter lock"
+msgstr "Obturation rapide"
+
+#: src/minoltamn.cpp:1526
+#, fuzzy
+msgid "Lens Shutter Lock"
+msgstr "Temps de pose lent"
+
+#: src/minoltamn.cpp:1527
+#, fuzzy
+msgid "Lens shutter lock"
+msgstr "Temps de pose lent"
+
+#: src/minoltamn.cpp:1529
+msgid "AF Area Illumination"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "Exposure Bracket Comp"
+#: src/minoltamn.cpp:1530
+#, fuzzy
+msgid "AF area illumination"
+msgstr "Mode mise au point automatique"
+
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
 msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "AE bracket compensation applied"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
 msgstr ""
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
-msgid "Image Processing"
-msgstr "  Traitement d'image"
+#: src/minoltamn.cpp:1535
+msgid "Record Display"
+msgstr ""
 
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
-msgid "Image processing"
-msgstr "  Traitement d'image"
+#: src/minoltamn.cpp:1536
+msgid "Record display"
+msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
 msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
+#: src/minoltamn.cpp:1539
+msgid "Play display"
 msgstr ""
 
-#: src/nikonmn.cpp:539
+#: src/minoltamn.cpp:1541
 #, fuzzy
-msgid "VR Info"
-msgstr "Informations brutes"
+msgid "Exposure Indicator"
+msgstr "Index d'exposition"
 
-#: src/nikonmn.cpp:539
+#: src/minoltamn.cpp:1542
 #, fuzzy
-msgid "VR info"
-msgstr "Informations brutes"
+msgid "Exposure indicator"
+msgstr "Index d'exposition"
 
-#: src/nikonmn.cpp:540
+#: src/minoltamn.cpp:1544
 #, fuzzy
-msgid "Image Authentication"
-msgstr "Orientation"
+msgid "AEL Exposure Indicator"
+msgstr "Index d'exposition"
+
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
+msgstr ""
+
+#: src/minoltamn.cpp:1547
+msgid "Exposure Bracketing Indicator Last"
+msgstr ""
+
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
+msgstr ""
+
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
+msgstr ""
 
-#: src/nikonmn.cpp:540
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
+msgstr ""
+
+#: src/minoltamn.cpp:1553
 #, fuzzy
-msgid "Image authentication"
-msgstr "Orientation"
+msgid "Flash Exposure Indicator"
+msgstr "Compensation exposition flash"
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
+#: src/minoltamn.cpp:1554
+#, fuzzy
+msgid "Flash exposure indicator"
+msgstr "Compensation d'exposition du flash"
+
+#: src/minoltamn.cpp:1556
+#, fuzzy
+msgid "Flash Exposure Indicator Next"
+msgstr "Compensation exposition flash"
+
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
+#: src/minoltamn.cpp:1559
+#, fuzzy
+msgid "Flash Exposure Indicator Last"
+msgstr "Compensation exposition flash"
+
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1565
 #, fuzzy
-msgid "Picture Control"
-msgstr "Infos image"
+msgid "Focus Mode Switch"
+msgstr "Mode mise au point"
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1566
 #, fuzzy
-msgid " Picture control"
-msgstr "Infos image"
+msgid "Focus mode switch"
+msgstr "Réglage mode de mise au point"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
 #, fuzzy
-msgid "World Time"
-msgstr "Heure Minolta"
+msgid "Flash Type"
+msgstr "Mode flash"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
 #, fuzzy
-msgid "World time"
-msgstr "Heure Minolta"
+msgid "Flash type"
+msgstr "Mode flash"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
 #, fuzzy
-msgid "ISO Info"
-msgstr "Infos prise de vue"
+msgid "AE Lock"
+msgstr "AE verrouillé"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
+msgstr ""
+
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
+msgstr "Niveau de charge"
+
+#: src/minoltamn.cpp:1584
 #, fuzzy
-msgid "ISO info"
-msgstr "Réglage ISO"
+msgid "Battery level"
+msgstr "Niveau de charge"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1588
 #, fuzzy
-msgid "Vignette Control"
-msgstr "Point blanc"
+msgid "Unknown Sony Camera Settings A100 tag"
+msgstr "Marqueur 1 réglage appareil photo Canon inconnu"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
 #, fuzzy
-msgid "Vignette control"
-msgstr "Point blanc"
+msgid "Clear"
+msgstr "année"
 
-#: src/nikonmn.cpp:547
-msgid "Tone Compensation"
-msgstr "Compensation de tonalité"
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
+#, fuzzy
+msgid "Deep"
+msgstr "Denver"
 
-#: src/nikonmn.cpp:547
-msgid "Tone compensation"
-msgstr "Compensation de tonalité"
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
+#, fuzzy
+msgid "Light"
+msgstr "Droit"
 
-#: src/nikonmn.cpp:553
-msgid "Mode of flash used"
-msgstr "Mode de flash utilisé"
+#: src/minoltamn.cpp:1897
+#, fuzzy
+msgid "Night View"
+msgstr "Scène de nuit"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
+msgstr ""
+
+#: src/minoltamn.cpp:1937
 #, fuzzy
-msgid "AF Info"
-msgstr "Informations mise au point"
+msgid "Local"
+msgstr "Lieu précis"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1952
 #, fuzzy
-msgid "AF info"
-msgstr "Informations mise au point"
+msgid "Top-Right"
+msgstr "Haut-droit"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
-msgid "Shooting Mode"
-msgstr "Mode de prise de vue"
+#: src/minoltamn.cpp:1954
+#, fuzzy
+msgid "Bottom-Right"
+msgstr "Bas-droit"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
-msgid "Shooting mode"
-msgstr "Mode de prise de vue"
+#: src/minoltamn.cpp:1956
+#, fuzzy
+msgid "Bottom-Left"
+msgstr "Bas-gauche"
 
-#: src/nikonmn.cpp:556
+#: src/minoltamn.cpp:1958
 #, fuzzy
-msgid "Auto Bracket Release"
-msgstr "Bracketing automatique"
+msgid "Top-Left"
+msgstr "Haut-gauche"
+
+#: src/minoltamn.cpp:1959
+#, fuzzy
+msgid "Far-Right"
+msgstr "Droit d'auteur"
+
+#: src/minoltamn.cpp:1960
+#, fuzzy
+msgid "Far-Left"
+msgstr "haut, gauche"
+
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
+#, fuzzy
+msgid "Advanced Auto"
+msgstr "Fonction de transfert"
+
+#: src/minoltamn.cpp:1975
+#, fuzzy
+msgid "Advanced Level"
+msgstr "Niveau de noir"
+
+#: src/minoltamn.cpp:1988
+msgid "AF"
+msgstr ""
+
+#: src/minoltamn.cpp:1989
+#, fuzzy
+msgid "Release"
+msgstr "Date de publication"
+
+#: src/minoltamn.cpp:2001
+#, fuzzy
+msgid "RAW "
+msgstr "BRUT"
+
+#: src/minoltamn.cpp:2002
+#, fuzzy
+msgid "CRAW "
+msgstr "BRUT"
+
+#: src/minoltamn.cpp:2005
+#, fuzzy
+msgid "RAW+JPEG"
+msgstr "JPEG"
+
+#: src/minoltamn.cpp:2006
+#, fuzzy
+msgid "CRAW+JPEG"
+msgstr "JPEG"
+
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
+msgstr ""
+
+#: src/minoltamn.cpp:2063
+#, fuzzy
+msgid "Compressed Raw"
+msgstr "Rapport de compression"
+
+#: src/minoltamn.cpp:2064
+#, fuzzy
+msgid "Compressed Raw + JPEG"
+msgstr "Taille image compressée"
+
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
+msgstr ""
+
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
+msgstr ""
+
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
+msgstr ""
+
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
+msgstr ""
+
+#: src/minoltamn.cpp:2110
+msgid "ISO Setting Used"
+msgstr "Réglage ISO utilisé"
+
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
+msgid "High Key"
+msgstr "Clef haute"
+
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
+msgstr "Clef basse"
+
+#: src/nikonmn.cpp:80
+#, fuzzy
+msgid "Extra High"
+msgstr "Extra fin"
+
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
+msgid "Single area"
+msgstr "Zone unique"
+
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
+msgid "Dynamic area"
+msgstr "Zone dynamique"
+
+#: src/nikonmn.cpp:88
+msgid "Dynamic area, closest subject"
+msgstr "Zone dynamique, sujet proche"
+
+#: src/nikonmn.cpp:89
+msgid "Group dynamic"
+msgstr ""
+
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
+msgstr "Zone unique (large)"
+
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
+msgid "Dynamic area (wide)"
+msgstr "Zone dynamique (large)"
+
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
+msgid "Upper-left"
+msgstr "Haut-gauche"
+
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
+msgid "Upper-right"
+msgstr "Haut-droit"
+
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
+msgid "Lower-left"
+msgstr "Bas-gauche"
+
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
+msgid "Lower-right"
+msgstr "Bas-droit"
+
+#: src/nikonmn.cpp:108
+msgid "Left-most"
+msgstr "Plus à gauche"
+
+#: src/nikonmn.cpp:109
+msgid "Right-most"
+msgstr "Plus à droite"
+
+#: src/nikonmn.cpp:143
+msgid "Fire, manual"
+msgstr "Flash déclenché, manuel"
+
+#: src/nikonmn.cpp:144
+msgid "Fire, external"
+msgstr "Flash déclenché, externe"
+
+#: src/nikonmn.cpp:145
+msgid "Fire, commander mode"
+msgstr "Flash déclenché, mode maître"
+
+#: src/nikonmn.cpp:146
+msgid "Fire, TTL mode"
+msgstr "Flash déclenché, mode TTL"
+
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
+msgid "Delay"
+msgstr "Délai"
+
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
+msgid "PC control"
+msgstr "Contrôle PC"
+
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
+#, fuzzy
+msgid "Exposure bracketing"
+msgstr "Avertissement exposition"
+
+#: src/nikonmn.cpp:155
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Automatique"
+
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
+msgid "IR control"
+msgstr "Contrôle infrarouge"
+
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
+msgstr ""
+
+#: src/nikonmn.cpp:174
+msgid "Auto release"
+msgstr "Déclenchement automatique"
+
+#: src/nikonmn.cpp:175
+msgid "Manual release"
+msgstr "Déclenchement  manuel"
+
+#: src/nikonmn.cpp:180
+#, fuzzy
+msgid "Lossy (type 1)"
+msgstr "Type d'objectif"
+
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+msgid "Uncompressed"
+msgstr "Non compressé"
+
+#: src/nikonmn.cpp:182
+#, fuzzy
+msgid "Lossless"
+msgstr "Los Angeles"
+
+#: src/nikonmn.cpp:183
+#, fuzzy
+msgid "Lossy (type 2)"
+msgstr "Type d'objectif"
+
+#: src/nikonmn.cpp:189
+#, fuzzy
+msgid "B & W"
+msgstr "N&B"
+
+#: src/nikonmn.cpp:191
+#, fuzzy
+msgid "Trim"
+msgstr "Heure d'envoi"
+
+#: src/nikonmn.cpp:192
+#, fuzzy
+msgid "Small picture"
+msgstr "Film"
+
+#: src/nikonmn.cpp:193
+#, fuzzy
+msgid "D-Lighting"
+msgstr "Lumière du jour"
+
+#: src/nikonmn.cpp:194
+#, fuzzy
+msgid "Red eye"
+msgstr "Réduction yeux rouges"
+
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
+#, fuzzy
+msgid "Cyanotype"
+msgstr "type"
+
+#: src/nikonmn.cpp:196
+#, fuzzy
+msgid "Sky light"
+msgstr "Lumière du jour"
+
+#: src/nikonmn.cpp:197
+#, fuzzy
+msgid "Warm tone"
+msgstr "Tonalité couleur"
+
+#: src/nikonmn.cpp:198
+#, fuzzy
+msgid "Color custom"
+msgstr "Tonalité couleur"
+
+#: src/nikonmn.cpp:199
+#, fuzzy
+msgid "Image overlay"
+msgstr "Type d'image"
+
+#: src/nikonmn.cpp:205
+#, fuzzy
+msgid "Minimal"
+msgstr "Manuel"
+
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
+msgid "Nikon Makernote version"
+msgstr "Version des note du fabriquant Nikon"
+
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
+msgid "ISO Speed"
+msgstr "Vitesse ISO"
+
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
+msgid "Sharpening"
+msgstr "Netteté"
+
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
+msgid "Image sharpening setting"
+msgstr "Réglage netteté image"
+
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
+msgid "Focus"
+msgstr "Mise au point"
+
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
+msgid "Flash Setting"
+msgstr "Réglage flash"
+
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
+msgid "Flash setting"
+msgstr "Réglage flash"
+
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
+msgid "ISO Selection"
+msgstr "Sélection ISO"
+
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
+msgid "ISO selection"
+msgstr "Sélection ISO"
+
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+#, fuzzy
+msgid "Data Dump"
+msgstr "Formulaire de donné"
+
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+#, fuzzy
+msgid "Data dump"
+msgstr "Formulaire de donné"
+
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+msgid "Image Adjustment"
+msgstr "Ajustement image"
+
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+msgid "Image adjustment setting"
+msgstr "Réglage ajustement image"
+
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+msgid "Auxiliary Lens"
+msgstr "Objectif auxiliaire"
+
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+msgid "Auxiliary lens (adapter)"
+msgstr "Objectif auxiliaire (adaptateur)"
+
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
+msgid "Manual focus distance"
+msgstr "Distance mise au point manuelle"
+
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
+msgid "Digital zoom setting"
+msgstr "Réglage du zoom numérique"
+
+#: src/nikonmn.cpp:258
+#, fuzzy
+msgid "AF Focus Position"
+msgstr "Position mise au point"
+
+#: src/nikonmn.cpp:259
+#, fuzzy
+msgid "AF focus position information"
+msgstr "Position mise au point"
+
+#: src/nikonmn.cpp:263
+msgid "Unknown Nikon1MakerNote tag"
+msgstr "Marqueur 1 de note du fabriquant Nikon inconnu"
+
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+msgid "Continuous autofocus"
+msgstr ""
+
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
+msgid "Single autofocus"
+msgstr ""
+
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
+msgid "Not used"
+msgstr "Non utilisé"
+
+#: src/nikonmn.cpp:365
+msgid "guess"
+msgstr "deviné"
+
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
+msgstr "VGA grossier"
+
+#: src/nikonmn.cpp:413
+msgid "VGA Normal"
+msgstr "VGA normal"
+
+#: src/nikonmn.cpp:414
+msgid "VGA Fine"
+msgstr "VGA fin"
+
+#: src/nikonmn.cpp:415
+msgid "SXGA Basic"
+msgstr "SXGA grossier"
+
+#: src/nikonmn.cpp:416
+msgid "SXGA Normal"
+msgstr "SXGA normal"
+
+#: src/nikonmn.cpp:417
+msgid "SXGA Fine"
+msgstr "SXGA fin"
+
+#: src/nikonmn.cpp:429
+msgid "Bright+"
+msgstr "Luminosité+"
+
+#: src/nikonmn.cpp:430
+msgid "Bright-"
+msgstr "Luminosité-"
+
+#: src/nikonmn.cpp:431
+msgid "Contrast+"
+msgstr "Contraste+"
+
+#: src/nikonmn.cpp:432
+msgid "Contrast-"
+msgstr "Contraste-"
+
+#: src/nikonmn.cpp:451
+msgid "Speedlight"
+msgstr "Vitesse lumière"
+
+#: src/nikonmn.cpp:491
+msgid "Unknown Nikon2MakerNote tag"
+msgstr "Marqueur 2 de note du fabriquant Nikon inconnu"
+
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
+msgid "Flash Device"
+msgstr "Matériel du flash"
+
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
+msgid "Flash device"
+msgstr "Matériel du flash"
+
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
+msgid "White Balance Bias"
+msgstr "Biais de balance des blancs"
+
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
+msgid "White balance bias"
+msgstr "Biais de balance des blancs"
+
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB Levels"
+msgstr "Niveau de noir"
+
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB levels"
+msgstr "Niveau de noir"
+
+#: src/nikonmn.cpp:536
+#, fuzzy
+msgid "Program Shift"
+msgstr "Logiciel"
+
+#: src/nikonmn.cpp:536
+#, fuzzy
+msgid "Program shift"
+msgstr "Logiciel"
+
+#: src/nikonmn.cpp:537
+msgid "Exposure Difference"
+msgstr "Différence d'exposition"
+
+#: src/nikonmn.cpp:537
+msgid "Exposure difference"
+msgstr "Différence d'exposition"
+
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+msgid "Pointer to a preview image"
+msgstr "Pointeur vers l'image d'aperçu"
+
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+msgid "Offset to an IFD containing a preview image"
+msgstr "Décalage vers l'IFD contenant l'aperçu"
+
+#: src/nikonmn.cpp:541
+msgid "Flash Comp"
+msgstr "Compensation Flash"
+
+#: src/nikonmn.cpp:541
+msgid "Flash compensation setting"
+msgstr "Réglage compensation Flash"
+
+#: src/nikonmn.cpp:543
+msgid "Image Boundary"
+msgstr "Limite de l'image"
+
+#: src/nikonmn.cpp:543
+msgid "Image boundary"
+msgstr "Limite de l'image"
+
+#: src/nikonmn.cpp:544
+#, fuzzy
+msgid "Flash exposure comp"
+msgstr "Compensation d'exposition du flash"
+
+#: src/nikonmn.cpp:545
+#, fuzzy
+msgid "Flash Bracket Comp"
+msgstr "Compensation Flash"
+
+#: src/nikonmn.cpp:545
+#, fuzzy
+msgid "Flash bracket compensation applied"
+msgstr "Compensation d'exposition du flash"
+
+#: src/nikonmn.cpp:546
+#, fuzzy
+msgid "Exposure Bracket Comp"
+msgstr "Programme d'exposition"
+
+#: src/nikonmn.cpp:546
+#, fuzzy
+msgid "AE bracket compensation applied"
+msgstr "Valeur de compensation d'exposition"
+
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
+msgid "Image Processing"
+msgstr "  Traitement d'image"
+
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+msgid "Image processing"
+msgstr "  Traitement d'image"
+
+#: src/nikonmn.cpp:548
+#, fuzzy
+msgid "Crop High Speed"
+msgstr "Scène de nuit"
+
+#: src/nikonmn.cpp:548
+#, fuzzy
+msgid "Crop high speed"
+msgstr "Droit d'auteur"
+
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure Tuning"
+msgstr "Avertissement exposition"
+
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure tuning"
+msgstr "Avertissement exposition"
+
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR Info"
+msgstr "Informations brutes"
+
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR info"
+msgstr "Informations brutes"
+
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image Authentication"
+msgstr "Orientation"
+
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image authentication"
+msgstr "Orientation"
+
+#: src/nikonmn.cpp:554
+msgid "ActiveD-Lighting"
+msgstr ""
+
+#: src/nikonmn.cpp:554
+msgid "ActiveD-lighting"
+msgstr ""
+
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid "Picture Control"
+msgstr "Infos image"
+
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid " Picture control"
+msgstr "Infos image"
+
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World Time"
+msgstr "Heure Minolta"
+
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World time"
+msgstr "Heure Minolta"
+
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO Info"
+msgstr "Infos prise de vue"
+
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO info"
+msgstr "Réglage ISO"
+
+#: src/nikonmn.cpp:558
+#, fuzzy
+msgid "Vignette Control"
+msgstr "Point blanc"
+
+#: src/nikonmn.cpp:558
+#, fuzzy
+msgid "Vignette control"
+msgstr "Point blanc"
+
+#: src/nikonmn.cpp:560
+msgid "Tone Compensation"
+msgstr "Compensation de tonalité"
+
+#: src/nikonmn.cpp:560
+msgid "Tone compensation"
+msgstr "Compensation de tonalité"
+
+#: src/nikonmn.cpp:566
+msgid "Mode of flash used"
+msgstr "Mode de flash utilisé"
+
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
+msgid "Shooting Mode"
+msgstr "Mode de prise de vue"
+
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
+msgid "Shooting mode"
+msgstr "Mode de prise de vue"
+
+#: src/nikonmn.cpp:569
+#, fuzzy
+msgid "Auto Bracket Release"
+msgstr "Bracketing automatique"
+
+#: src/nikonmn.cpp:569
+#, fuzzy
+msgid "Auto bracket release"
+msgstr "Bracketing automatique"
+
+#: src/nikonmn.cpp:570
+#, fuzzy
+msgid "Lens FStops"
+msgstr "Type d'objectif"
+
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast Curve"
+msgstr "Contraste"
+
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast curve"
+msgstr "Contraste"
+
+#: src/nikonmn.cpp:572
+#, fuzzy
+msgid "Color Hue"
+msgstr "Tonalité couleur"
+
+#: src/nikonmn.cpp:572
+#, fuzzy
+msgid "Color hue"
+msgstr "Tonalité couleur"
+
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
+msgid "Scene mode"
+msgstr "Mode scène"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
+msgid "Light Source"
+msgstr "Source lumineuse"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
+msgid "Light source"
+msgstr "Source lumineuse"
+
+#: src/nikonmn.cpp:575
+#, fuzzy
+msgid "Shot info"
+msgstr "Infos prise de vue"
+
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue Adjustment"
+msgstr "Ajustement de teinte"
+
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue adjustment"
+msgstr "Ajustement de teinte"
+
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF Compression"
+msgstr "Compression"
+
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF compression"
+msgstr "Compression"
+
+#: src/nikonmn.cpp:580 src/tags.cpp:903
+#, fuzzy
+msgid "Linearization Table"
+msgstr "Date de numérisation"
+
+#: src/nikonmn.cpp:580
+#, fuzzy
+msgid "Linearization table"
+msgstr "Date de numérisation"
+
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color Balance"
+msgstr "Balance des couleurs 1"
+
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color balance"
+msgstr "Balance des rouges"
+
+#: src/nikonmn.cpp:582
+msgid "Lens Data"
+msgstr "Données de l'objectif"
+
+#: src/nikonmn.cpp:582
+msgid "Lens data settings"
+msgstr "Réglage des données de l'objectif"
+
+#: src/nikonmn.cpp:583
+#, fuzzy
+msgid "Raw Image Center"
+msgstr "Comptage d'image"
+
+#: src/nikonmn.cpp:583
+#, fuzzy
+msgid "Raw image center"
+msgstr "Aperçu embarqué"
+
+#: src/nikonmn.cpp:584
+msgid "Sensor Pixel Size"
+msgstr "Taille pixel du capteur"
+
+#: src/nikonmn.cpp:584
+msgid "Sensor pixel size"
+msgstr "Taille pixel du capteur"
+
+#: src/nikonmn.cpp:586
+#, fuzzy
+msgid "Scene Assist"
+msgstr "Faisceau AF"
+
+#: src/nikonmn.cpp:586
+#, fuzzy
+msgid "Scene assist"
+msgstr "Mode scène"
+
+#: src/nikonmn.cpp:587
+#, fuzzy
+msgid "Retouch History"
+msgstr "Hauteur de l'image"
+
+#: src/nikonmn.cpp:587
+msgid "Retouch history"
+msgstr ""
+
+#: src/nikonmn.cpp:589
+#, fuzzy
+msgid "Serial NO"
+msgstr "Numéro de série"
+
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
+msgstr ""
+
+#: src/nikonmn.cpp:590
+msgid "Image Data Size"
+msgstr "Taille des données de l'image"
+
+#: src/nikonmn.cpp:590
+msgid "Image data size"
+msgstr "Taille des données de l'image"
+
+#: src/nikonmn.cpp:592
+msgid "Image Count"
+msgstr "Comptage d'image"
+
+#: src/nikonmn.cpp:592
+msgid "Image count"
+msgstr "Comptage d'image"
+
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted Image Count"
+msgstr "Effacer le comptage d'image"
+
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted image count"
+msgstr "Effacer le comptage d'image"
+
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
+#, fuzzy
+msgid "Shutter Count"
+msgstr "Priorité obturation"
+
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
+msgstr "Nombre de photo pris par l'appareil"
+
+#: src/nikonmn.cpp:595
+#, fuzzy
+msgid "Flash info"
+msgstr "Flash"
+
+#: src/nikonmn.cpp:596
+msgid "Image Optimization"
+msgstr "Optimisation d'image"
+
+#: src/nikonmn.cpp:596
+msgid "Image optimization"
+msgstr "Optimisation d'image"
+
+#: src/nikonmn.cpp:598
+#, fuzzy
+msgid "Program Variation"
+msgstr "Version du logiciel"
+
+#: src/nikonmn.cpp:598
+#, fuzzy
+msgid "Program variation"
+msgstr "Version du logiciel"
+
+#: src/nikonmn.cpp:600
+msgid "AF Response"
+msgstr "Réponse mise au point automatique"
+
+#: src/nikonmn.cpp:600
+msgid "AF response"
+msgstr "Réponse mise au point automatique"
+
+#: src/nikonmn.cpp:601
+#, fuzzy
+msgid "Multi exposure"
+msgstr "Exposition"
+
+#: src/nikonmn.cpp:602
+msgid "High ISO Noise Reduction"
+msgstr "Réduction de bruit Iso élevé"
+
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
+#, fuzzy
+msgid "Toning effect"
+msgstr "Effet photo"
+
+#: src/nikonmn.cpp:604
+#, fuzzy
+msgid "AF info 2"
+msgstr "Informations mise au point"
+
+#: src/nikonmn.cpp:605
+#, fuzzy
+msgid "File info"
+msgstr "Nom du fichier"
+
+#: src/nikonmn.cpp:608
+#, fuzzy
+msgid "Capture Data"
+msgstr "Date de publication"
+
+#: src/nikonmn.cpp:608
+#, fuzzy
+msgid "Capture data"
+msgstr "Autre données"
+
+#: src/nikonmn.cpp:609
+#, fuzzy
+msgid "Capture Version"
+msgstr "Version du microcode"
+
+#: src/nikonmn.cpp:609
+#, fuzzy
+msgid "Capture version"
+msgstr "Version de microcode"
+
+#: src/nikonmn.cpp:611
+#, fuzzy
+msgid "Capture Offsets"
+msgstr "Décalage aperçu"
+
+#: src/nikonmn.cpp:611
+#, fuzzy
+msgid "Capture offsets"
+msgstr "Décalage aperçu"
+
+#: src/nikonmn.cpp:612
+#, fuzzy
+msgid "Scan IFD"
+msgstr "Identifiant appareil photo"
+
+#: src/nikonmn.cpp:613
+#, fuzzy
+msgid "ICC profile"
+msgstr "Profil couleur"
+
+#: src/nikonmn.cpp:614
+msgid "Capture output"
+msgstr ""
+
+#: src/nikonmn.cpp:616
+msgid "Unknown Nikon3MakerNote tag"
+msgstr "Marqueur 3 de note du fabriquant Nikon inconnu"
+
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+msgid "No"
+msgstr "Non"
+
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
+msgid "Yes"
+msgstr "Oui"
+
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
+msgstr ""
+
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
+msgstr ""
+
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
+msgstr ""
+
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+#, fuzzy
+msgid "Vibration Reduction"
+msgstr "Réduction du bruit"
+
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+#, fuzzy
+msgid "Vibration reduction"
+msgstr "Réduction du bruit"
+
+#: src/nikonmn.cpp:648
+#, fuzzy
+msgid "Unknown Nikon Vibration Reduction Tag"
+msgstr "Marqueur réglage appareil photo Canon inconnu"
+
+#: src/nikonmn.cpp:658
+#, fuzzy
+msgid "Default Settings"
+msgstr "Réglage flash"
+
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
+#, fuzzy
+msgid "Quick Adjust"
+msgstr "Ajustement de teinte"
+
+#: src/nikonmn.cpp:660
+#, fuzzy
+msgid "Full Control"
+msgstr "Contrôle des couleurs"
+
+#: src/nikonmn.cpp:681
+msgid "Blue-green"
+msgstr ""
+
+#: src/nikonmn.cpp:683
+msgid "Purple-blue"
+msgstr ""
+
+#: src/nikonmn.cpp:684
+msgid "Red-purple"
+msgstr ""
+
+#: src/nikonmn.cpp:691
+#, fuzzy
+msgid "Name"
+msgstr "Nom du propriétaire"
+
+#: src/nikonmn.cpp:692
+msgid "Base"
+msgstr ""
+
+#: src/nikonmn.cpp:693
+#, fuzzy
+msgid "Adjust"
+msgstr "Ajustement de"
+
+#: src/nikonmn.cpp:694
+#, fuzzy
+msgid "Quick adjust"
+msgstr "Ajustement de teinte"
+
+#: src/nikonmn.cpp:700
+#, fuzzy
+msgid "Filter effect"
+msgstr "Effet de couleurs"
+
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning Saturation"
+msgstr "Saturation"
+
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning saturation"
+msgstr "Saturation"
+
+#: src/nikonmn.cpp:704
+#, fuzzy
+msgid "Unknown Nikon Picture Control Tag"
+msgstr "Marqueur info image Canon inconnu"
+
+#: src/nikonmn.cpp:714
+#, fuzzy
+msgid "Timezone"
+msgstr "Ton"
+
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight Savings"
+msgstr "Lumière du jour"
+
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight savings"
+msgstr "Lumière du jour"
+
+#: src/nikonmn.cpp:716
+#, fuzzy
+msgid "Date Display Format"
+msgstr "Format du fichier"
+
+#: src/nikonmn.cpp:716
+#, fuzzy
+msgid "Date display format"
+msgstr "Formulaire de donné"
+
+#: src/nikonmn.cpp:718
+#, fuzzy
+msgid "Unknown Nikon World Time Tag"
+msgstr "Marqueur 1 de note du fabriquant Nikon inconnu"
+
+#: src/nikonmn.cpp:729
+msgid "Hi 0.3"
+msgstr ""
+
+#: src/nikonmn.cpp:730
+msgid "Hi 0.5"
+msgstr ""
+
+#: src/nikonmn.cpp:731
+msgid "Hi 0.7"
+msgstr ""
+
+#: src/nikonmn.cpp:732
+msgid "Hi 1.0"
+msgstr ""
+
+#: src/nikonmn.cpp:733
+msgid "Hi 1.3"
+msgstr ""
+
+#: src/nikonmn.cpp:734
+msgid "Hi 1.5"
+msgstr ""
+
+#: src/nikonmn.cpp:735
+msgid "Hi 1.7"
+msgstr ""
+
+#: src/nikonmn.cpp:736
+msgid "Hi 2.0"
+msgstr ""
+
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
+msgstr ""
+
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
+msgstr ""
+
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
+msgstr ""
+
+#: src/nikonmn.cpp:740
+msgid "Lo 1.0"
+msgstr ""
+
+#: src/nikonmn.cpp:746
+#, fuzzy
+msgid "ISO Expansion"
+msgstr "Sélection ISO"
+
+#: src/nikonmn.cpp:746
+#, fuzzy
+msgid "ISO expansion"
+msgstr "Sélection ISO"
+
+#: src/nikonmn.cpp:747
+#, fuzzy
+msgid "ISO 2"
+msgstr "Infos prise de vue"
+
+#: src/nikonmn.cpp:748
+#, fuzzy
+msgid "ISO Expansion 2"
+msgstr "Sélection ISO"
+
+#: src/nikonmn.cpp:748
+#, fuzzy
+msgid "ISO expansion 2"
+msgstr "Sélection ISO"
+
+#: src/nikonmn.cpp:750
+#, fuzzy
+msgid "Unknown Nikon Iso Info Tag"
+msgstr "Marqueur info image Canon inconnu"
+
+#: src/nikonmn.cpp:760
+#, fuzzy
+msgid "Single Area"
+msgstr "Zone unique"
+
+#: src/nikonmn.cpp:761
+#, fuzzy
+msgid "Dynamic Area"
+msgstr "Zone dynamique"
 
-#: src/nikonmn.cpp:556
+#: src/nikonmn.cpp:762
 #, fuzzy
-msgid "Auto bracket release"
-msgstr "Bracketing automatique"
+msgid "Dynamic Area, Closest Subject"
+msgstr "Zone dynamique, sujet proche"
 
-#: src/nikonmn.cpp:557
-msgid "Lens FStops"
+#: src/nikonmn.cpp:763
+msgid "Group Dynamic"
 msgstr ""
 
-#: src/nikonmn.cpp:558
+#: src/nikonmn.cpp:764
 #, fuzzy
-msgid "Contrast Curve"
-msgstr "Contraste"
+msgid "Single Area (wide)"
+msgstr "Zone unique (large)"
 
-#: src/nikonmn.cpp:558
+#: src/nikonmn.cpp:765
 #, fuzzy
-msgid "Contrast curve"
-msgstr "Contraste"
+msgid "Dynamic Area (wide)"
+msgstr "Zone dynamique (large)"
+
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
+msgid "Mid-left"
+msgstr "milieu-gauche"
+
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
+msgid "Mid-right"
+msgstr "milieu-droit"
 
-#: src/nikonmn.cpp:559
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
 #, fuzzy
-msgid "Color Hue"
-msgstr "Tonalité couleur"
+msgid "Far Left"
+msgstr "haut, gauche"
 
-#: src/nikonmn.cpp:559
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
 #, fuzzy
-msgid "Color hue"
-msgstr "Tonalité couleur"
+msgid "Far Right"
+msgstr "Droit d'auteur"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene Mode"
-msgstr "Mode scène"
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
+#, fuzzy
+msgid "AF area mode"
+msgstr "Mode mise au point automatique"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene mode"
-msgstr "Mode scène"
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
+#, fuzzy
+msgid "AF point"
+msgstr "AF Points"
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
-msgstr "Source lumineuse"
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF Points In Focus"
+msgstr "Points AF utilisés"
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
-msgid "Light source"
-msgstr "Source lumineuse"
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF points in focus"
+msgstr "Points AF utilisés"
 
-#: src/nikonmn.cpp:562
+#: src/nikonmn.cpp:804
 #, fuzzy
-msgid "Shot info"
-msgstr "Infos prise de vue"
+msgid "Unknown Nikon Auto Focus Tag"
+msgstr "Marqueur réglage appareil photo Canon inconnu"
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue Adjustment"
-msgstr "Ajustement de teinte"
+#: src/nikonmn.cpp:815
+msgid "On (51-point)"
+msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue adjustment"
-msgstr "Ajustement de teinte"
+#: src/nikonmn.cpp:816
+msgid "On (11-point)"
+msgstr ""
 
-#: src/nikonmn.cpp:564
+#: src/nikonmn.cpp:822
 #, fuzzy
-msgid "NEF Compression"
-msgstr "Compression"
+msgid "Contrast Detect AF"
+msgstr "Réglage de contraste"
 
-#: src/nikonmn.cpp:564
+#: src/nikonmn.cpp:822
 #, fuzzy
-msgid "NEF compression"
-msgstr "Compression"
+msgid "Contrast detect AF"
+msgstr "Réglage de contraste"
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
+#: src/nikonmn.cpp:824
 #, fuzzy
-msgid "Linearization Table"
-msgstr "Date de numérisation"
+msgid "Phase Detect AF"
+msgstr "Échec lors de la lecture"
 
-#: src/nikonmn.cpp:567
+#: src/nikonmn.cpp:824
 #, fuzzy
-msgid "Linearization table"
-msgstr "Date de numérisation"
+msgid "Phase detect AF"
+msgstr "Échec lors de la lecture"
 
-#: src/nikonmn.cpp:568
+#: src/nikonmn.cpp:825
 #, fuzzy
-msgid "Color Balance"
-msgstr "Balance des couleurs 1"
+msgid "Primary AF Point"
+msgstr "Point AF"
 
-#: src/nikonmn.cpp:568
+#: src/nikonmn.cpp:825
 #, fuzzy
-msgid "Color balance"
-msgstr "Balance des rouges"
-
-#: src/nikonmn.cpp:569
-msgid "Lens Data"
-msgstr "Données de l'objectif"
-
-#: src/nikonmn.cpp:569
-msgid "Lens data settings"
-msgstr "Réglage des données de l'objectif"
+msgid "Primary AF point"
+msgstr "AF Points"
 
-#: src/nikonmn.cpp:570
+#: src/nikonmn.cpp:827
 #, fuzzy
-msgid "Raw Image Center"
-msgstr "Comptage d'image"
+msgid "AF Image Width"
+msgstr "Largeur de l'image"
 
-#: src/nikonmn.cpp:570
+#: src/nikonmn.cpp:827
 #, fuzzy
-msgid "Raw image center"
-msgstr "Aperçu embarqué"
-
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
-msgstr "Taille pixel du capteur"
-
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
-msgstr "Taille pixel du capteur"
+msgid "AF image width"
+msgstr "Largeur de l'image"
 
-#: src/nikonmn.cpp:573
+#: src/nikonmn.cpp:828
 #, fuzzy
-msgid "Scene Assist"
-msgstr "Faisceau AF"
+msgid "AF Image Height"
+msgstr "Hauteur de l'image"
 
-#: src/nikonmn.cpp:573
+#: src/nikonmn.cpp:828
 #, fuzzy
-msgid "Scene assist"
-msgstr "Mode scène"
-
-#: src/nikonmn.cpp:574
-msgid "Retouch History"
-msgstr ""
+msgid "AF image height"
+msgstr "Hauteur de l'image"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
-msgstr ""
+#: src/nikonmn.cpp:829
+#, fuzzy
+msgid "AF Area X Position"
+msgstr "Position mise au point"
 
-#: src/nikonmn.cpp:576
+#: src/nikonmn.cpp:829
 #, fuzzy
-msgid "Serial NO"
-msgstr "Numéro de série"
+msgid "AF area x position"
+msgstr "Position mise au point"
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
-msgstr ""
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF Area Y Position"
+msgstr "Position mise au point"
 
-#: src/nikonmn.cpp:577
-msgid "Image Data Size"
-msgstr "Taille des données de l'image"
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF area y position"
+msgstr "Position mise au point"
 
-#: src/nikonmn.cpp:577
-msgid "Image data size"
-msgstr "Taille des données de l'image"
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF Area Width"
+msgstr "Mode mise au point automatique"
 
-#: src/nikonmn.cpp:579
-msgid "Image Count"
-msgstr "Comptage d'image"
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF area width"
+msgstr "Mode mise au point automatique"
 
-#: src/nikonmn.cpp:579
-msgid "Image count"
-msgstr "Comptage d'image"
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF Area Height"
+msgstr "Mode mise au point automatique"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/nikonmn.cpp:832
 #, fuzzy
-msgid "Deleted Image Count"
-msgstr "Effacer le comptage d'image"
+msgid "AF area height"
+msgstr "Droit d'auteur"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/nikonmn.cpp:833
 #, fuzzy
-msgid "Deleted image count"
-msgstr "Effacer le comptage d'image"
+msgid "Contrast Detect AF In Focus"
+msgstr "Réglage de contraste"
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
-msgid "Shutter Count"
-msgstr ""
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast detect AF in focus"
+msgstr "Réglage de contraste"
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
-msgstr "Nombre de photo pris par l'appareil"
+#: src/nikonmn.cpp:835
+#, fuzzy
+msgid "Unknown Nikon Auto Focus 2 Tag"
+msgstr "Marqueur réglage appareil photo Canon inconnu"
 
-#: src/nikonmn.cpp:582
+#: src/nikonmn.cpp:846
 #, fuzzy
-msgid "Flash info"
-msgstr "Flash"
+msgid "Directory Number"
+msgstr "Numéro ordre"
 
-#: src/nikonmn.cpp:583
-msgid "Image Optimization"
-msgstr "Optimisation d'image"
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory number"
+msgstr "Numéro ordre"
 
-#: src/nikonmn.cpp:583
-msgid "Image optimization"
-msgstr "Optimisation d'image"
+#: src/nikonmn.cpp:849
+#, fuzzy
+msgid "Unknown Nikon File Info Tag"
+msgstr "Marqueur info image Canon inconnu"
 
-#: src/nikonmn.cpp:585
-msgid "Program Variation"
-msgstr ""
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
+#, fuzzy
+msgid "Multiple Exposure"
+msgstr "Exposition"
 
-#: src/nikonmn.cpp:585
-msgid "Program variation"
-msgstr ""
+#: src/nikonmn.cpp:861
+#, fuzzy
+msgid "Image Overlay"
+msgstr "Type d'image"
 
-#: src/nikonmn.cpp:587
-msgid "AF Response"
-msgstr "Réponse mise au point automatique"
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi Exposure Mode"
+msgstr "Mode d'exposition"
 
-#: src/nikonmn.cpp:587
-msgid "AF response"
-msgstr "Réponse mise au point automatique"
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi exposure mode"
+msgstr "Exposition"
 
-#: src/nikonmn.cpp:588
+#: src/nikonmn.cpp:868
 #, fuzzy
-msgid "Multi exposure"
+msgid "Multi Exposure Shots"
 msgstr "Exposition"
 
-#: src/nikonmn.cpp:589
-msgid "High ISO Noise Reduction"
-msgstr "Réduction de bruit Iso élevé"
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi exposure shots"
+msgstr "Exposition"
 
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
+#: src/nikonmn.cpp:869
 #, fuzzy
-msgid "Toning effect"
-msgstr "Effet photo"
+msgid "Multi Exposure Auto Gain"
+msgstr "Exposition"
 
-#: src/nikonmn.cpp:591
+#: src/nikonmn.cpp:869
 #, fuzzy
-msgid "AF info 2"
-msgstr "Informations mise au point"
+msgid "Multi exposure auto gain"
+msgstr "Exposition"
 
-#: src/nikonmn.cpp:592
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
 #, fuzzy
-msgid "File info"
-msgstr "Nom du fichier"
+msgid "Unknown Nikon Multi Exposure Tag"
+msgstr "Marqueur réglage appareil photo Canon inconnu"
 
-#: src/nikonmn.cpp:595
-msgid "Capture Data"
-msgstr ""
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
+msgid "Internal"
+msgstr "Interne"
 
-#: src/nikonmn.cpp:595
-msgid "Capture data"
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
 msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture Version"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
 msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture version"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
 msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture Offsets"
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
 msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture offsets"
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
 msgstr ""
 
-#: src/nikonmn.cpp:599
-#, fuzzy
-msgid "Scan IFD"
-msgstr "Identifiant appareil photo"
-
-#: src/nikonmn.cpp:600
-#, fuzzy
-msgid "ICC profile"
-msgstr "Profil couleur"
-
-#: src/nikonmn.cpp:601
-msgid "Capture output"
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
 msgstr ""
 
-#: src/nikonmn.cpp:603
-msgid "Unknown Nikon3MakerNote tag"
-msgstr "Marqueur 3 de note du fabriquant Nikon inconnu"
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
+msgstr ""
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
-msgstr "Non"
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
+msgstr ""
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
-msgid "Yes"
-msgstr "Oui"
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
+msgstr ""
 
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
 msgstr ""
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
 msgstr ""
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-#, fuzzy
-msgid "Vibration Reduction"
-msgstr "Réduction du bruit"
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
+msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-#, fuzzy
-msgid "Vibration reduction"
-msgstr "Réduction du bruit"
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
+msgstr ""
 
-#: src/nikonmn.cpp:635
-#, fuzzy
-msgid "Unknown Nikon Vibration Reduction Tag"
-msgstr "Marqueur réglage appareil photo Canon inconnu"
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
+msgstr ""
 
-#: src/nikonmn.cpp:645
-#, fuzzy
-msgid "Default Settings"
-msgstr "Réglage flash"
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
+msgstr ""
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
-#, fuzzy
-msgid "Quick Adjust"
-msgstr "Ajustement de teinte"
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
+msgstr ""
 
-#: src/nikonmn.cpp:647
-#, fuzzy
-msgid "Full Control"
-msgstr "Contrôle des couleurs"
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
+msgstr ""
 
-#: src/nikonmn.cpp:668
-msgid "Blue-green"
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
 msgstr ""
 
-#: src/nikonmn.cpp:670
-msgid "Purple-blue"
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
 msgstr ""
 
-#: src/nikonmn.cpp:671
-msgid "Red-purple"
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:678
-#, fuzzy
-msgid "Name"
-msgstr "Nom du propriétaire"
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
+msgstr ""
 
-#: src/nikonmn.cpp:679
-msgid "Base"
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
 msgstr ""
 
-#: src/nikonmn.cpp:680
-#, fuzzy
-msgid "Adjust"
-msgstr "Ajustement de"
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
+msgstr ""
 
-#: src/nikonmn.cpp:681
-#, fuzzy
-msgid "Quick adjust"
-msgstr "Ajustement de teinte"
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
+msgstr ""
 
-#: src/nikonmn.cpp:687
-#, fuzzy
-msgid "Filter effect"
-msgstr "Effet de couleurs"
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
+msgstr ""
 
-#: src/nikonmn.cpp:689
-#, fuzzy
-msgid "Toning Saturation"
-msgstr "Saturation"
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
+msgstr ""
 
-#: src/nikonmn.cpp:689
-#, fuzzy
-msgid "Toning saturation"
-msgstr "Saturation"
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
+msgstr ""
 
-#: src/nikonmn.cpp:691
-#, fuzzy
-msgid "Unknown Nikon Picture Control Tag"
-msgstr "Marqueur info image Canon inconnu"
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
+msgstr ""
 
-#: src/nikonmn.cpp:701
-#, fuzzy
-msgid "Timezone"
-msgstr "Ton"
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
+msgstr ""
 
-#: src/nikonmn.cpp:702
-#, fuzzy
-msgid "Daylight Savings"
-msgstr "Lumière du jour"
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
+msgstr ""
 
-#: src/nikonmn.cpp:702
-#, fuzzy
-msgid "Daylight savings"
-msgstr "Lumière du jour"
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
+msgstr ""
 
-#: src/nikonmn.cpp:703
-#, fuzzy
-msgid "Date Display Format"
-msgstr "Format du fichier"
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
+msgstr ""
 
-#: src/nikonmn.cpp:703
-#, fuzzy
-msgid "Date display format"
-msgstr "Formulaire de donné"
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
+msgstr ""
 
-#: src/nikonmn.cpp:705
-#, fuzzy
-msgid "Unknown Nikon World Time Tag"
-msgstr "Marqueur 1 de note du fabriquant Nikon inconnu"
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
+msgstr ""
 
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
 msgstr ""
 
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
 msgstr ""
 
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
 msgstr ""
 
-#: src/nikonmn.cpp:719
-msgid "Hi 1.0"
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
+#: src/nikonmn.cpp:934
+msgid "10.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
+#: src/nikonmn.cpp:938
+msgid "16.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
+#: src/nikonmn.cpp:940
+msgid "20.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:947
 #, fuzzy
-msgid "ISO Expansion"
-msgstr "Sélection ISO"
+msgid "iTTL-BL"
+msgstr "TTL"
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:948
 #, fuzzy
-msgid "ISO expansion"
-msgstr "Sélection ISO"
+msgid "iTTL"
+msgstr "TTL"
 
-#: src/nikonmn.cpp:734
+#: src/nikonmn.cpp:949
 #, fuzzy
-msgid "ISO 2"
-msgstr "Infos prise de vue"
+msgid "Auto Aperture"
+msgstr "Ouverture"
 
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
 msgstr ""
 
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
+msgid "Repeating Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:737
+#: src/nikonmn.cpp:960
 #, fuzzy
-msgid "Unknown Nikon Iso Info Tag"
-msgstr "Marqueur info image Canon inconnu"
+msgid "Bounce Flash"
+msgstr "Pas de flash"
 
-#: src/nikonmn.cpp:747
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
+msgstr ""
+
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
+msgstr ""
+
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
+msgstr ""
+
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
+msgstr ""
+
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
+msgstr ""
+
+#: src/nikonmn.cpp:974
 #, fuzzy
-msgid "Single Area"
-msgstr "Zone unique"
+msgid "Amber"
+msgstr "Nombre F"
 
-#: src/nikonmn.cpp:748
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "Dynamic Area"
-msgstr "Zone dynamique"
+msgid "Flash Source"
+msgstr "Source du fichier"
 
-#: src/nikonmn.cpp:749
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "Dynamic Area, Closest Subject"
-msgstr "Zone dynamique, sujet proche"
+msgid "Flash source"
+msgstr "Source du fichier"
 
-#: src/nikonmn.cpp:750
-msgid "Group Dynamic"
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
+msgid "0x0005"
 msgstr ""
 
-#: src/nikonmn.cpp:751
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Single Area (wide)"
-msgstr "Zone unique (large)"
+msgid "External Flash Firmware"
+msgstr "Zoom flash externe"
 
-#: src/nikonmn.cpp:752
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Dynamic Area (wide)"
-msgstr "Zone dynamique (large)"
+msgid "External flash firmware"
+msgstr "Mode flash externe"
 
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
-msgid "Mid-left"
-msgstr "milieu-gauche"
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External Flash Flags"
+msgstr "Flash externe"
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
-msgid "Mid-right"
-msgstr "milieu-droit"
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External flash flags"
+msgstr "Flash externe"
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Far Left"
-msgstr "haut, gauche"
+msgid "Flash Focal Length"
+msgstr "Longueur focale maximum"
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Far Right"
-msgstr "Droit d'auteur"
+msgid "Flash focal length"
+msgstr "Longueur focale maximum"
+
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
+msgstr ""
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
 #, fuzzy
-msgid "AF Area Mode"
-msgstr "Mode mise au point automatique"
+msgid "Repeating flash rate"
+msgstr "Renommage du fichier en"
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
+msgstr ""
+
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
 #, fuzzy
-msgid "AF area mode"
-msgstr "Mode mise au point automatique"
+msgid "Repeating flash count"
+msgstr "Contrôle de flash manuel"
 
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF point"
-msgstr "AF Points"
+msgid "Flash GN Distance"
+msgstr "Distance de mise au point"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF Points In Focus"
-msgstr "Points AF utilisés"
+msgid "Flash GN distance"
+msgstr "Distance de mise au point"
+
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
+msgstr ""
+
+#: src/nikonmn.cpp:988
+msgid "Flash group a control mode"
+msgstr ""
+
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
+msgstr ""
+
+#: src/nikonmn.cpp:989
+msgid "Flash group b control mode"
+msgstr ""
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "AF points in focus"
-msgstr "Points AF utilisés"
+msgid "Flash Color Filter"
+msgstr "Filtre couleur"
 
-#: src/nikonmn.cpp:791
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "Unknown Nikon Auto Focus Tag"
-msgstr "Marqueur réglage appareil photo Canon inconnu"
+msgid "Flash color filter"
+msgstr "Filtre couleur"
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
 #, fuzzy
 msgid "Shutter count"
 msgstr "Priorité obturation"
 
-#: src/nikonmn.cpp:804
+#: src/nikonmn.cpp:1044
 #, fuzzy
 msgid "Unknown Nikon Shot Info D80 Tag"
 msgstr "Marqueur info image Canon inconnu"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
 #, fuzzy
 msgid "Flash Level"
 msgstr "Matériel du flash"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:1056
 #, fuzzy
 msgid "Flash level"
 msgstr "Matériel du flash"
 
-#: src/nikonmn.cpp:818
+#: src/nikonmn.cpp:1058
 #, fuzzy
 msgid "Unknown Nikon Shot Info D40 Tag"
 msgstr "Marqueur info image Canon inconnu"
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
 msgid "0"
 msgstr ""
 
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
+#, fuzzy
 msgid "+1"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
 msgid "+2"
 msgstr ""
 
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
 msgid "+4"
 msgstr ""
 
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
 msgid "+8"
 msgstr ""
 
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
+#, fuzzy
 msgid "+16"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
+#, fuzzy
 msgid "-16"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
 msgid "-8"
 msgstr ""
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
 msgid "-4"
 msgstr ""
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
 msgid "-2"
 msgstr ""
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
+#, fuzzy
 msgid "-1"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
+#, fuzzy
 msgid "+17"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
+#, fuzzy
 msgid "-17"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
 msgid "+9"
 msgstr ""
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
+#, fuzzy
 msgid "+18"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
+#, fuzzy
 msgid "-18"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
 msgid "-9"
 msgstr ""
 
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
+#, fuzzy
 msgid "+19"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
+#, fuzzy
 msgid "-19"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
 msgid "+5"
 msgstr ""
 
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
 #, fuzzy
 msgid "+10"
 msgstr "10s"
 
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
+#, fuzzy
 msgid "+20"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
+#, fuzzy
 msgid "-20"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
 #, fuzzy
 msgid "-10"
 msgstr "10s"
 
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
 msgid "-5"
 msgstr ""
 
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
+#, fuzzy
 msgid "+11"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
+#, fuzzy
 msgid "-11"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
 msgid "+3"
 msgstr ""
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
 msgid "+6"
 msgstr ""
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
+#, fuzzy
 msgid "+12"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
+#, fuzzy
 msgid "-12"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
 msgid "-6"
 msgstr ""
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
 msgid "-3"
 msgstr ""
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
+#, fuzzy
 msgid "+13"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
+#, fuzzy
 msgid "-13"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
 msgid "+7"
 msgstr ""
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
+#, fuzzy
 msgid "+14"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
+#, fuzzy
 msgid "-14"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
 msgid "-7"
 msgstr ""
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
+#, fuzzy
 msgid "+15"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
+#, fuzzy
 msgid "-15"
-msgstr ""
+msgstr "10s"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
 msgid "AF Fine Tune Adj"
 msgstr "Point AF utilisé"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
 msgid "AF fine tune adj"
 msgstr "Point AF utilisé"
 
-#: src/nikonmn.cpp:878
+#: src/nikonmn.cpp:1118
 #, fuzzy
 msgid "Unknown Nikon Shot Info D300 (a) Tag"
 msgstr "Marqueur info image Canon inconnu"
 
-#: src/nikonmn.cpp:938
+#: src/nikonmn.cpp:1178
 #, fuzzy
 msgid "Unknown Nikon Shot Info D300 (b) Tag"
 msgstr "Marqueur info image Canon inconnu"
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
-msgstr ""
-
-#: src/nikonmn.cpp:950
-msgid "On (2)"
-msgstr ""
-
-#: src/nikonmn.cpp:951
+#: src/nikonmn.cpp:1191
+#, fuzzy
 msgid "On (3)"
-msgstr ""
+msgstr "Activé"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:1204
 #, fuzzy
 msgid "Shutter Count 1"
 msgstr "Priorité obturation"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:1204
 #, fuzzy
 msgid "Shutter count 1"
 msgstr "Priorité obturation"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:1208
 #, fuzzy
 msgid "Shutter Count 2"
 msgstr "Priorité obturation"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:1208
 #, fuzzy
 msgid "Shutter count 2"
 msgstr "Priorité obturation"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:1209
 #, fuzzy
 msgid "Vibration Reduction 2"
 msgstr "Réduction du bruit"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:1209
 #, fuzzy
 msgid "Vibration reduction 2"
 msgstr "Réduction du bruit"
 
-#: src/nikonmn.cpp:973
+#: src/nikonmn.cpp:1213
 #, fuzzy
 msgid "Unknown Nikon Shot Info Tag"
 msgstr "Marqueur info image Canon inconnu"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:1224
 #, fuzzy
 msgid "WB RBGG Levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:1224
 #, fuzzy
 msgid "WB RBGG levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:986
+#: src/nikonmn.cpp:1226
 #, fuzzy
 msgid "Unknown Nikon Color Balance 1 Tag"
 msgstr "Balance des couleurs 1"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
 msgid "WB RGGB Levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
 msgid "WB RGGB levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:999
+#: src/nikonmn.cpp:1239
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2 Tag"
 msgstr "Balance des couleurs 1"
 
-#: src/nikonmn.cpp:1012
+#: src/nikonmn.cpp:1252
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2a Tag"
 msgstr "Balance des couleurs 1"
 
-#: src/nikonmn.cpp:1025
+#: src/nikonmn.cpp:1265
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2b Tag"
 msgstr "Balance des couleurs 1"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:1276
 #, fuzzy
 msgid "WB RGBG Levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:1276
 #, fuzzy
 msgid "WB RGBG levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:1038
+#: src/nikonmn.cpp:1278
 #, fuzzy
 msgid "Unknown Nikon Color Balance 3 Tag"
 msgstr "Marqueur panorama Canon inconnu"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:1289
 #, fuzzy
 msgid "WB GRBG Levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:1289
 #, fuzzy
 msgid "WB GRBG levels"
 msgstr "Niveau de noir"
 
-#: src/nikonmn.cpp:1051
+#: src/nikonmn.cpp:1291
 #, fuzzy
 msgid "Unknown Nikon Color Balance 4 Tag"
 msgstr "Marqueur panorama Canon inconnu"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
 msgid "Lens ID Number"
 msgstr "Numéro de série"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
 msgid "Lens ID number"
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
 msgid "Lens F-Stops"
 msgstr "Type d'objectif"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
 msgid "Lens F-stops"
 msgstr "Type d'objectif"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 #, fuzzy
 msgid "Min Focal Length"
 msgstr "Longueur focale minimale"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 #, fuzzy
 msgid "Min focal length"
 msgstr "Longueur focale minimale"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 #, fuzzy
 msgid "Max Focal Length"
 msgstr "Longueur focale maximum"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 #, fuzzy
 msgid "Max focal length"
 msgstr "Longueur focale maximum"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
 #, fuzzy
 msgid "Max Aperture At Min Focal"
 msgstr "Ouverture maximum à focal minimum"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
 #, fuzzy
 msgid "Max aperture at min focal"
 msgstr "Ouverture maximum à focal minimum"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
 #, fuzzy
 msgid "Max Aperture At Max Focal"
 msgstr "Ouverture maximum à focal maximum"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
 #, fuzzy
 msgid "Max aperture at max focal"
 msgstr "Ouverture maximum à focal maximum"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
 msgid "MCU Version"
 msgstr "Version d'ARM"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
 msgid "MCU version"
 msgstr "Version d'ARM"
 
-#: src/nikonmn.cpp:1070
+#: src/nikonmn.cpp:1310
 #, fuzzy
 msgid "Unknown Nikon Lens Data 1 Tag"
 msgstr "Marqueur 1 de note du fabriquant Nikon inconnu"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
 msgid "Exit Pupil Position"
 msgstr "Position mise au point"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
 msgid "Exit pupil position"
 msgstr "Position mise au point"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
 msgid "AF Aperture"
 msgstr "Ouverture"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
 msgid "AF aperture"
 msgstr "Ouverture"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
 msgid "Effective Max Aperture"
 msgstr "Ouverture maximale"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
 msgid "Effective max aperture"
 msgstr "Ouverture maximale"
 
-#: src/nikonmn.cpp:1095
+#: src/nikonmn.cpp:1335
 #, fuzzy
 msgid "Unknown Nikon Lens Data 2 Tag"
 msgstr "Marqueur 1 de note du fabriquant Nikon inconnu"
 
-#: src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1355
 #, fuzzy
 msgid "Max aperture at min focal length"
 msgstr "Ouverture maximum à focal minimum"
 
-#: src/nikonmn.cpp:1116
+#: src/nikonmn.cpp:1356
 #, fuzzy
 msgid "Max aperture at max focal length"
 msgstr "Ouverture maximum à focal maximum"
 
-#: src/nikonmn.cpp:1120
+#: src/nikonmn.cpp:1360
 #, fuzzy
 msgid "Unknown Nikon Lens Data 3 Tag"
 msgstr "Marqueur 1 de note du fabriquant Nikon inconnu"
 
-#: src/nikonmn.cpp:1299
+#: src/nikonmn.cpp:1540
 msgid "Closest subject"
 msgstr "Sujet proche"
 
-#: src/nikonmn.cpp:1300
+#: src/nikonmn.cpp:1541
 msgid "Group dynamic-AF"
 msgstr ""
 
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
 msgid "none"
 msgstr "Aucun"
 
-#: src/nikonmn.cpp:1333
+#: src/nikonmn.cpp:1574
 msgid "used"
 msgstr "utilisé"
 
-#: src/nikonmn.cpp:1359
+#: src/nikonmn.cpp:1600
 #, fuzzy
 msgid "All 11 Points"
 msgstr "Points AF"
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
 #, fuzzy
 msgid "Single-frame"
 msgstr "Zone unique"
 
-#: src/olympusmn.cpp:68
+#: src/olympusmn.cpp:71
 msgid "Standard Quality (SQ)"
 msgstr "Qualité standard (SQ)"
 
-#: src/olympusmn.cpp:69
+#: src/olympusmn.cpp:72
 msgid "High Quality (HQ)"
 msgstr "Qualité haute (HQ)"
 
-#: src/olympusmn.cpp:70
+#: src/olympusmn.cpp:73
 msgid "Super High Quality (SHQ)"
 msgstr "Qualité très haute (HQ)"
 
-#: src/olympusmn.cpp:85
+#: src/olympusmn.cpp:88
 msgid "On (preset)"
 msgstr ""
 
-#: src/olympusmn.cpp:91
-msgid "Internal"
-msgstr "Interne"
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
+msgid "Sport"
+msgstr "Sport"
+
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
+#, fuzzy
+msgid "Landscape+Portrait"
+msgstr "Paysage"
+
+#: src/olympusmn.cpp:100
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Portrait"
+
+#: src/olympusmn.cpp:102
+#, fuzzy
+msgid "2 in 1"
+msgstr "Activé"
+
+#: src/olympusmn.cpp:105
+#, fuzzy
+msgid "Night+Portrait"
+msgstr "Portrait de nuit"
+
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
+msgstr "Nourriture"
+
+#: src/olympusmn.cpp:112
+#, fuzzy
+msgid "Documents"
+msgstr "Nom du document"
+
+#: src/olympusmn.cpp:114
+#, fuzzy
+msgid "Shoot & Select"
+msgstr "Effet photo"
+
+#: src/olympusmn.cpp:115
+#, fuzzy
+msgid "Beach & Snow"
+msgstr "Surf et Neige"
+
+#: src/olympusmn.cpp:116
+#, fuzzy
+msgid "Self Portrait+Timer"
+msgstr "Retardateur"
+
+#: src/olympusmn.cpp:117
+#, fuzzy
+msgid "Candle"
+msgstr "Lumière de bougie"
+
+#: src/olympusmn.cpp:118
+#, fuzzy
+msgid "Available Light"
+msgstr "Longueur focale maximum"
+
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
+msgstr ""
+
+#: src/olympusmn.cpp:120
+#, fuzzy
+msgid "My Mode"
+msgstr "Mode prise de vue"
+
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
+msgid "Pet"
+msgstr "Animaux"
+
+#: src/olympusmn.cpp:122
+#, fuzzy
+msgid "Underwater Wide1"
+msgstr "Sous marin"
+
+#: src/olympusmn.cpp:123
+#, fuzzy
+msgid "Underwater Macro"
+msgstr "Sous marin"
+
+#: src/olympusmn.cpp:124
+#, fuzzy
+msgid "Shoot & Select1"
+msgstr "Effet photo"
+
+#: src/olympusmn.cpp:125
+#, fuzzy
+msgid "Shoot & Select2"
+msgstr "Effet photo"
+
+#: src/olympusmn.cpp:127
+#, fuzzy
+msgid "Digital Image Stabilization"
+msgstr "Stabilisation de l'image"
+
+#: src/olympusmn.cpp:128
+#, fuzzy
+msgid "Auction"
+msgstr "Automatique"
+
+#: src/olympusmn.cpp:131
+#, fuzzy
+msgid "Underwater Wide2"
+msgstr "Sous marin"
 
-#: src/olympusmn.cpp:93
+#: src/olympusmn.cpp:133
+msgid "Children"
+msgstr ""
+
+#: src/olympusmn.cpp:135
+#, fuzzy
+msgid "Nature Macro"
+msgstr "Couleur naturelle"
+
+#: src/olympusmn.cpp:136
+#, fuzzy
+msgid "Underwater Snapshot"
+msgstr "Sous marin"
+
+#: src/olympusmn.cpp:137
+#, fuzzy
+msgid "Shooting Guide"
+msgstr "Mode de prise de vue"
+
+#: src/olympusmn.cpp:145
 msgid "Internal + External"
 msgstr "Interne + Externe"
 
-#: src/olympusmn.cpp:118
+#: src/olympusmn.cpp:176
 msgid "Interlaced"
 msgstr "Entrelacé"
 
-#: src/olympusmn.cpp:119
+#: src/olympusmn.cpp:177
 msgid "Progressive"
 msgstr "Progressif"
 
-#: src/olympusmn.cpp:127
+#: src/olympusmn.cpp:188
 #, fuzzy
 msgid "Thumbnail Image"
 msgstr "Miniature"
 
-#: src/olympusmn.cpp:128
+#: src/olympusmn.cpp:189
 #, fuzzy
 msgid "Thumbnail image"
 msgstr "Miniature"
 
-#: src/olympusmn.cpp:131
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body Firmware Version"
+msgstr "Version du microcode"
+
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body firmware version"
+msgstr "Version de microcode"
+
+#: src/olympusmn.cpp:195
 msgid "Special Mode"
 msgstr "Mode spécial"
 
-#: src/olympusmn.cpp:132
+#: src/olympusmn.cpp:196
 msgid "Picture taking mode"
 msgstr "Mode de prise de vue"
 
-#: src/olympusmn.cpp:140
+#: src/olympusmn.cpp:204
 msgid "Black & White Mode"
 msgstr "Mode noir & blanc"
 
-#: src/olympusmn.cpp:141
+#: src/olympusmn.cpp:205
 msgid "Black and white mode"
 msgstr "Mode noir et blanc"
 
-#: src/olympusmn.cpp:144
+#: src/olympusmn.cpp:208
 msgid "Digital zoom ratio"
 msgstr "Rapport de zoom numérique"
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
 msgid "Focal Plane Diagonal"
 msgstr "Diagonal du plan focal"
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
 msgid "Focal plane diagonal"
 msgstr "Diagonal du plan focal"
 
-#: src/olympusmn.cpp:149
+#: src/olympusmn.cpp:213
 msgid "Lens Distortion Parameters"
 msgstr "Paramètre de distorsion de l'objectif"
 
-#: src/olympusmn.cpp:150
+#: src/olympusmn.cpp:214
 msgid "Lens distortion parameters"
 msgstr "Paramètre de distorsion de l'objectif"
 
-#: src/olympusmn.cpp:153
-msgid "Software firmware version"
-msgstr "Version du microcode"
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
+#, fuzzy
+msgid "Camera Type"
+msgstr "Marque de l'appareil"
+
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
+#, fuzzy
+msgid "Camera type"
+msgstr "Marque de l'appareil"
 
-#: src/olympusmn.cpp:156
+#: src/olympusmn.cpp:220
 msgid "ASCII format data such as [PictureInfo]"
 msgstr "Format de données ASCII comme [PictureInfo]"
 
-#: src/olympusmn.cpp:158
+#: src/olympusmn.cpp:222
 msgid "Camera ID"
 msgstr "Identifiant appareil photo"
 
-#: src/olympusmn.cpp:159
+#: src/olympusmn.cpp:223
 msgid "Camera ID data"
 msgstr "Données de l'identifiant appareil photo"
 
-#: src/olympusmn.cpp:178
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
+msgstr "Logiciel"
+
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
+#, fuzzy
+msgid "Preview Image"
+msgstr "Aperçu embarqué"
+
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
+#, fuzzy
+msgid "Preview image"
+msgstr "Aperçu embarqué"
+
+#: src/olympusmn.cpp:237
+#, fuzzy
 msgid "Pre Capture Frames"
-msgstr ""
+msgstr "Nom du propriétaire"
 
-#: src/olympusmn.cpp:179
+#: src/olympusmn.cpp:238
+#, fuzzy
 msgid "Pre-capture frames"
-msgstr ""
+msgstr "Nom du propriétaire"
+
+#: src/olympusmn.cpp:240
+#, fuzzy
+msgid "White Board"
+msgstr "Balance des blancs"
+
+#: src/olympusmn.cpp:241
+#, fuzzy
+msgid "White board"
+msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:184
+#: src/olympusmn.cpp:243
 msgid "One Touch WB"
 msgstr "Balance des blancs en une touche"
 
-#: src/olympusmn.cpp:185
+#: src/olympusmn.cpp:244
 msgid "One touch white balance"
 msgstr "Balance des blancs en une touche"
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
-msgid "Serial number"
-msgstr "Numéro de série"
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White Balance Bracket"
+msgstr "Biais de balance des blancs"
+
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White balance bracket"
+msgstr "Biais de balance des blancs"
+
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+msgid "Firmware"
+msgstr "Microcode"
+
+#: src/olympusmn.cpp:256
+#, fuzzy
+msgid "Firmwarer"
+msgstr "Microcode"
 
-#: src/olympusmn.cpp:199
+#: src/olympusmn.cpp:261
+#, fuzzy
 msgid "Data Dump 1"
-msgstr ""
+msgstr "Formulaire de donné"
 
-#: src/olympusmn.cpp:200
+#: src/olympusmn.cpp:262
 msgid "Various camera settings 1"
 msgstr "Divers réglages de l'appareil photo 1"
 
-#: src/olympusmn.cpp:202
+#: src/olympusmn.cpp:264
+#, fuzzy
 msgid "Data Dump 2"
-msgstr ""
+msgstr "Formulaire de donné"
 
-#: src/olympusmn.cpp:203
+#: src/olympusmn.cpp:265
 msgid "Various camera settings 2"
 msgstr "Divers réglages de l'appareil photo 1"
 
-#: src/olympusmn.cpp:205
-msgid "Shutter Speed"
-msgstr "Vitesse d'obturation"
-
-#: src/olympusmn.cpp:206
+#: src/olympusmn.cpp:268
 msgid "Shutter speed value"
 msgstr "Valeur de vitesse d'obturation"
 
-#: src/olympusmn.cpp:209
+#: src/olympusmn.cpp:271
 msgid "ISO speed value"
 msgstr "Valeur de vitesse ISO"
 
-#: src/olympusmn.cpp:212
+#: src/olympusmn.cpp:274
 msgid "Aperture value"
 msgstr "Valeur d'ouverture"
 
-#: src/olympusmn.cpp:215
+#: src/olympusmn.cpp:277
 msgid "Brightness value"
 msgstr "Valeur de luminosité"
 
-#: src/olympusmn.cpp:223
+#: src/olympusmn.cpp:285
 msgid "Bracket"
 msgstr "Bracket"
 
-#: src/olympusmn.cpp:224
+#: src/olympusmn.cpp:286
 msgid "Exposure compensation value"
 msgstr "Valeur de compensation d'exposition"
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
 msgid "Sensor Temperature"
 msgstr "Température de la sonde"
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
 msgid "Sensor temperature"
 msgstr "Température de la sonde"
 
-#: src/olympusmn.cpp:229
+#: src/olympusmn.cpp:291
 msgid "Lens Temperature"
 msgstr "Température de l'objectif"
 
-#: src/olympusmn.cpp:230
+#: src/olympusmn.cpp:292
 msgid "Lens temperature"
 msgstr "Température de l'objectif"
 
-#: src/olympusmn.cpp:244
+#: src/olympusmn.cpp:294
+#, fuzzy
+msgid "Light Condition"
+msgstr "Fonctions personnalisées"
+
+#: src/olympusmn.cpp:295
+#, fuzzy
+msgid "Light condition"
+msgstr "Fonctions personnalisées"
+
+#: src/olympusmn.cpp:297
+#, fuzzy
+msgid "Focus Range"
+msgstr "Zone mise au point"
+
+#: src/olympusmn.cpp:298
+#, fuzzy
+msgid "Focus range"
+msgstr "Zone mise au point"
+
+#: src/olympusmn.cpp:306
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
+#, fuzzy
 msgid "Zoom step count"
-msgstr ""
+msgstr "Comptage d'image"
 
-#: src/olympusmn.cpp:247
+#: src/olympusmn.cpp:309
 msgid "Macro Focus"
 msgstr "Mise au point macro"
 
-#: src/olympusmn.cpp:248
+#: src/olympusmn.cpp:310
+#, fuzzy
 msgid "Macro focus step count"
-msgstr ""
+msgstr "Position mise au point"
 
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
 msgid "Sharpness Factor"
 msgstr "Facteur de netteté"
 
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
 msgid "Sharpness factor"
 msgstr "Facteur de netteté"
 
-#: src/olympusmn.cpp:253
+#: src/olympusmn.cpp:315
+#, fuzzy
 msgid "Flash Charge Level"
-msgstr ""
+msgstr "Matériel du flash"
 
-#: src/olympusmn.cpp:254
+#: src/olympusmn.cpp:316
+#, fuzzy
 msgid "Flash charge level"
-msgstr ""
+msgstr "Matériel du flash"
 
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
 msgid "Color Matrix"
 msgstr "Matrice des couleurs"
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
 msgid "Color matrix"
 msgstr "Matrice des couleurs"
 
-#: src/olympusmn.cpp:259
+#: src/olympusmn.cpp:321
 msgid "BlackLevel"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
 msgid "Black level"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:269
+#: src/olympusmn.cpp:331
 msgid "White balance mode"
 msgstr "Mode balance des blancs"
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
 msgid "Red Balance"
 msgstr "Balance des rouges"
 
-#: src/olympusmn.cpp:275
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
 msgid "Red balance"
 msgstr "Balance des rouges"
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
 msgid "Blue Balance"
 msgstr "Balance des bleus"
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
 msgid "Blue balance"
 msgstr "Balance des bleus"
 
-#: src/olympusmn.cpp:283
+#: src/olympusmn.cpp:342
+#, fuzzy
+msgid "Color Matrix Number"
+msgstr "Matrice des couleurs"
+
+#: src/olympusmn.cpp:343
+#, fuzzy
+msgid "Color matrix mumber"
+msgstr "Matrice des couleurs"
+
+#: src/olympusmn.cpp:345
 msgid "Serial Number 2"
 msgstr "Numéro de série 2"
 
-#: src/olympusmn.cpp:284
+#: src/olympusmn.cpp:346
 msgid "Serial number 2"
 msgstr "Numéro de série 2"
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
 msgid "Flash exposure compensation"
 msgstr "Compensation d'exposition du flash"
 
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
+#, fuzzy
 msgid "External Flash Bounce"
-msgstr ""
+msgstr "Mode flash externe"
 
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
+#, fuzzy
 msgid "External flash bounce"
-msgstr ""
+msgstr "Mode flash externe"
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
 msgid "External Flash Zoom"
 msgstr "Zoom flash externe"
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
 msgid "External flash zoom"
 msgstr "Zoom flash externe"
 
-#: src/olympusmn.cpp:325
+#: src/olympusmn.cpp:387
 msgid "External Flash Mode"
 msgstr "Mode flash externe"
 
-#: src/olympusmn.cpp:326
+#: src/olympusmn.cpp:388
 msgid "External flash mode"
 msgstr "Mode flash externe"
 
-#: src/olympusmn.cpp:334
+#: src/olympusmn.cpp:396
 msgid "Color Control"
 msgstr "Contrôle des couleurs"
 
-#: src/olympusmn.cpp:335
+#: src/olympusmn.cpp:397
 msgid "Color control"
 msgstr "Contrôle des couleurs"
 
-#: src/olympusmn.cpp:337
+#: src/olympusmn.cpp:399
 msgid "ValidBits"
 msgstr ""
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
 msgid "Valid bits"
 msgstr ""
 
-#: src/olympusmn.cpp:340
+#: src/olympusmn.cpp:402
+#, fuzzy
 msgid "CoringFilter"
-msgstr ""
+msgstr "Filtre couleur"
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
 msgid "Coring filter"
-msgstr ""
+msgstr "Filtre couleur"
 
-#: src/olympusmn.cpp:361
+#: src/olympusmn.cpp:423
 msgid "Compression Ratio"
 msgstr "Rapport de compression"
 
-#: src/olympusmn.cpp:362
+#: src/olympusmn.cpp:424
 msgid "Compression ratio"
 msgstr "Rapport de compression"
 
-#: src/olympusmn.cpp:365
+#: src/olympusmn.cpp:427
 msgid "Preview image embedded"
 msgstr "Aperçu embarqué"
 
-#: src/olympusmn.cpp:368
+#: src/olympusmn.cpp:430
 msgid "Offset of the preview image"
 msgstr "Décalage de l'aperçu"
 
-#: src/olympusmn.cpp:371
+#: src/olympusmn.cpp:433
 msgid "Size of the preview image"
 msgstr "Taille de l'aperçu"
 
-#: src/olympusmn.cpp:373
+#: src/olympusmn.cpp:435
+#, fuzzy
 msgid "CCD Scan Mode"
-msgstr ""
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:374
+#: src/olympusmn.cpp:436
+#, fuzzy
 msgid "CCD scan mode"
-msgstr ""
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:379
+#: src/olympusmn.cpp:441
+#, fuzzy
 msgid "Infinity Lens Step"
-msgstr ""
+msgstr "Infinie"
 
-#: src/olympusmn.cpp:380
+#: src/olympusmn.cpp:442
+#, fuzzy
 msgid "Infinity lens step"
-msgstr ""
+msgstr "Infinie"
 
-#: src/olympusmn.cpp:382
+#: src/olympusmn.cpp:444
+#, fuzzy
 msgid "Near Lens Step"
-msgstr ""
+msgstr "Type d'objectif"
 
-#: src/olympusmn.cpp:383
+#: src/olympusmn.cpp:445
 msgid "Near lens step"
 msgstr ""
 
-#: src/olympusmn.cpp:385
+#: src/olympusmn.cpp:447
 msgid "Equipment Info"
 msgstr "Informations équipement"
 
-#: src/olympusmn.cpp:386
+#: src/olympusmn.cpp:448
 #, fuzzy
 msgid "Camera equipment sub-IFD"
 msgstr "Informations équipement de l'appareil"
 
-#: src/olympusmn.cpp:389
+#: src/olympusmn.cpp:451
 #, fuzzy
 msgid "Camera Settings sub-IFD"
 msgstr "Réglage appareil photo (7D)"
 
-#: src/olympusmn.cpp:391
+#: src/olympusmn.cpp:453
+#, fuzzy
 msgid "Raw Development"
-msgstr ""
+msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:392
+#: src/olympusmn.cpp:454
+#, fuzzy
 msgid "Raw development sub-IFD"
-msgstr ""
+msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:394
+#: src/olympusmn.cpp:456
+#, fuzzy
 msgid "Raw Development 2"
-msgstr ""
+msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:395
+#: src/olympusmn.cpp:457
+#, fuzzy
 msgid "Raw development 2 sub-IFD"
-msgstr ""
+msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:398
+#: src/olympusmn.cpp:460
 #, fuzzy
 msgid "Image processing sub-IFD"
 msgstr "  Traitement d'image"
 
-#: src/olympusmn.cpp:400
+#: src/olympusmn.cpp:462
 msgid "Focus Info"
 msgstr "Informations mise au point"
 
-#: src/olympusmn.cpp:401
+#: src/olympusmn.cpp:463
 #, fuzzy
 msgid "Focus sub-IFD"
 msgstr "Informations mise au point"
 
-#: src/olympusmn.cpp:403
+#: src/olympusmn.cpp:465
 msgid "Raw Info"
 msgstr "Informations brutes"
 
-#: src/olympusmn.cpp:404
+#: src/olympusmn.cpp:466
 #, fuzzy
 msgid "Raw sub-IFD"
 msgstr "Sous-IFD"
 
-#: src/olympusmn.cpp:409
+#: src/olympusmn.cpp:470
 msgid "Unknown OlympusMakerNote tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:424
+#: src/olympusmn.cpp:486
 #, fuzzy
 msgid "Program-shift"
 msgstr "Logiciel"
 
-#: src/olympusmn.cpp:429
+#: src/olympusmn.cpp:491
 #, fuzzy
 msgid "Center-weighted average"
 msgstr "Moyenne pondérée au centre"
 
-#: src/olympusmn.cpp:431
+#: src/olympusmn.cpp:493
 msgid "ESP"
 msgstr ""
 
-#: src/olympusmn.cpp:432
+#: src/olympusmn.cpp:494
 #, fuzzy
 msgid "Pattern+AF"
 msgstr "Motif CFA"
 
-#: src/olympusmn.cpp:433
+#: src/olympusmn.cpp:495
+#, fuzzy
 msgid "Spot+Highlight control"
-msgstr ""
+msgstr "Contrôle des couleurs"
 
-#: src/olympusmn.cpp:434
+#: src/olympusmn.cpp:496
 #, fuzzy
 msgid "Spot+Shadow control"
 msgstr "Contrôle des couleurs"
 
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
-#, fuzzy
-msgid "Super Macro"
-msgstr "Super macro"
-
-#: src/olympusmn.cpp:446
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
 #, fuzzy
 msgid "Single AF"
 msgstr "Simple"
 
-#: src/olympusmn.cpp:447
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
 msgid "Sequential shooting AF"
 msgstr ""
 
-#: src/olympusmn.cpp:449
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
 #, fuzzy
 msgid "Multi AF"
 msgstr "AF automatique"
 
-#: src/olympusmn.cpp:450
-msgid "MF"
-msgstr ""
-
-#: src/olympusmn.cpp:455
+#: src/olympusmn.cpp:517
 #, fuzzy
 msgid "AF Not Used"
 msgstr "Point AF utilisé"
 
-#: src/olympusmn.cpp:456
+#: src/olympusmn.cpp:518
 #, fuzzy
 msgid "AF Used"
 msgstr "Point AF utilisé"
 
-#: src/olympusmn.cpp:461
+#: src/olympusmn.cpp:523
 #, fuzzy
 msgid "Not Ready"
 msgstr "Non utilisé"
 
-#: src/olympusmn.cpp:462
+#: src/olympusmn.cpp:524
 #, fuzzy
 msgid "Ready"
 msgstr "Réduction yeux rouges"
 
-#: src/olympusmn.cpp:469
+#: src/olympusmn.cpp:531
+#, fuzzy
 msgid "Fill-in"
-msgstr ""
+msgstr "Nom du fichier"
 
-#: src/olympusmn.cpp:471
+#: src/olympusmn.cpp:533
 #, fuzzy
 msgid "Slow-sync"
 msgstr "Synchro lente"
 
-#: src/olympusmn.cpp:472
+#: src/olympusmn.cpp:534
 #, fuzzy
 msgid "Forced On"
 msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:473
+#: src/olympusmn.cpp:535
 msgid "2nd Curtain"
 msgstr ""
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
 msgstr ""
 
-#: src/olympusmn.cpp:480
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
+msgstr ""
+
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
+msgstr ""
+
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
+msgstr ""
+
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
+msgstr ""
+
+#: src/olympusmn.cpp:566
+#, fuzzy
+msgid "7500K (Fine Weather with Shade)"
+msgstr "Ensoleillé"
+
+#: src/olympusmn.cpp:567
 #, fuzzy
 msgid "6000K (Cloudy)"
 msgstr "Auto (Nuageux)"
 
-#: src/olympusmn.cpp:481
+#: src/olympusmn.cpp:568
 #, fuzzy
 msgid "5300K (Fine Weather)"
 msgstr "Ensoleillé"
 
-#: src/olympusmn.cpp:482
+#: src/olympusmn.cpp:569
 msgid "3000K (Tungsten light)"
 msgstr ""
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
 msgid "3600K (Tungsten light-like)"
 msgstr ""
 
-#: src/olympusmn.cpp:484
+#: src/olympusmn.cpp:571
 #, fuzzy
 msgid "6600K (Daylight fluorescent)"
 msgstr "Lumière du jour fluorescent"
 
-#: src/olympusmn.cpp:485
+#: src/olympusmn.cpp:572
 #, fuzzy
 msgid "4500K (Neutral white fluorescent)"
 msgstr "Auto (lumière du jour fluorescent)"
 
-#: src/olympusmn.cpp:486
+#: src/olympusmn.cpp:573
 #, fuzzy
 msgid "4000K (Cool white fluorescent)"
 msgstr "Blanc froid fluorescent (W 3900 - 4500K)"
 
-#: src/olympusmn.cpp:488
+#: src/olympusmn.cpp:575
 #, fuzzy
 msgid "Custom WB 1"
 msgstr "Personnel 1"
 
-#: src/olympusmn.cpp:489
+#: src/olympusmn.cpp:576
 #, fuzzy
 msgid "Custom WB 2"
 msgstr "Personnel 2"
 
-#: src/olympusmn.cpp:490
+#: src/olympusmn.cpp:577
 #, fuzzy
 msgid "Custom WB 3"
 msgstr "Processus personnel 2"
 
-#: src/olympusmn.cpp:491
+#: src/olympusmn.cpp:578
 #, fuzzy
 msgid "Custom WB 4"
 msgstr "Personnel 1"
 
-#: src/olympusmn.cpp:492
+#: src/olympusmn.cpp:579
 #, fuzzy
 msgid "Custom WB 5400K"
 msgstr "Personnel 1"
 
-#: src/olympusmn.cpp:493
+#: src/olympusmn.cpp:580
 #, fuzzy
 msgid "Custom WB 2900K"
 msgstr "Personnel 2"
 
-#: src/olympusmn.cpp:494
+#: src/olympusmn.cpp:581
 #, fuzzy
 msgid "Custom WB 8000K"
 msgstr "Personnel 1"
 
-#: src/olympusmn.cpp:500
+#: src/olympusmn.cpp:587
+#, fuzzy
 msgid "CM1 (Red Enhance)"
-msgstr ""
+msgstr "Balance des bleus"
 
-#: src/olympusmn.cpp:501
+#: src/olympusmn.cpp:588
+#, fuzzy
 msgid "CM2 (Green Enhance)"
-msgstr ""
+msgstr "Balance des bleus"
 
-#: src/olympusmn.cpp:502
+#: src/olympusmn.cpp:589
 #, fuzzy
 msgid "CM3 (Blue Enhance)"
 msgstr "Balance des bleus"
 
-#: src/olympusmn.cpp:503
+#: src/olympusmn.cpp:590
 msgid "CM4 (Skin Tones)"
 msgstr ""
 
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
 msgid "Pro Photo RGB"
 msgstr ""
 
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
-msgid "Sport"
-msgstr "Sport"
-
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
-#, fuzzy
-msgid "Landscape+Portrait"
-msgstr "Paysage"
-
-#: src/olympusmn.cpp:522
-#, fuzzy
-msgid "Self Portrait"
-msgstr "Portrait"
-
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
-msgstr ""
-
-#: src/olympusmn.cpp:527
-#, fuzzy
-msgid "Night+Portrait"
-msgstr "Portrait de nuit"
-
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
-msgstr "Nourriture"
-
-#: src/olympusmn.cpp:534
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
 #, fuzzy
-msgid "Documents"
-msgstr "Nom du document"
+msgid "Noise Filter"
+msgstr "Filtre"
 
-#: src/olympusmn.cpp:536
+#: src/olympusmn.cpp:604
 #, fuzzy
-msgid "Shoot & Select"
-msgstr "Effet photo"
+msgid "Noise Filter (ISO Boost)"
+msgstr "Filtre"
 
-#: src/olympusmn.cpp:537
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
 #, fuzzy
-msgid "Beach & Snow"
-msgstr "Surf et Neige"
+msgid "Muted"
+msgstr "utilisé"
 
-#: src/olympusmn.cpp:538
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
 #, fuzzy
-msgid "Self Portrait+Timer"
-msgstr "Retardateur"
+msgid "Monotone"
+msgstr "Tonalité couleur"
 
-#: src/olympusmn.cpp:539
-#, fuzzy
-msgid "Candle"
-msgstr "Lumière de bougie"
+#: src/olympusmn.cpp:640
+msgid "SQ"
+msgstr ""
 
-#: src/olympusmn.cpp:540
-msgid "Available Light"
+#: src/olympusmn.cpp:641
+msgid "HQ"
 msgstr ""
 
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
+#: src/olympusmn.cpp:642
+msgid "SHQ"
 msgstr ""
 
-#: src/olympusmn.cpp:542
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
 #, fuzzy
-msgid "My Mode"
-msgstr "Mode prise de vue"
-
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-msgid "Pet"
-msgstr "Animaux"
+msgid "On, Mode 1"
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:544
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
 #, fuzzy
-msgid "Underwater Wide1"
-msgstr "Sous marin"
+msgid "On, Mode 2"
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:545
+#: src/olympusmn.cpp:651
 #, fuzzy
-msgid "Underwater Macro"
-msgstr "Sous marin"
-
-#: src/olympusmn.cpp:546
-msgid "Shoot & Select1"
-msgstr ""
-
-#: src/olympusmn.cpp:547
-msgid "Shoot & Select2"
-msgstr ""
+msgid "On, Mode 3"
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:549
+#: src/olympusmn.cpp:655
 #, fuzzy
-msgid "Digital Image Stabilization"
-msgstr "Stabilisation de l'image"
+msgid "Camera Settings Version"
+msgstr "informations de réglage appareil photo"
 
-#: src/olympusmn.cpp:550
+#: src/olympusmn.cpp:655
 #, fuzzy
-msgid "Auction"
-msgstr "Automatique"
+msgid "Camera settings version"
+msgstr "informations de réglage appareil photo"
 
-#: src/olympusmn.cpp:553
+#: src/olympusmn.cpp:656
 #, fuzzy
-msgid "Underwater Wide2"
-msgstr "Sous marin"
+msgid "PreviewImage Valid"
+msgstr "Aperçu embarqué"
 
-#: src/olympusmn.cpp:555
-msgid "Children"
-msgstr ""
+#: src/olympusmn.cpp:656
+#, fuzzy
+msgid "Preview image valid"
+msgstr "Aperçu embarqué"
 
-#: src/olympusmn.cpp:557
+#: src/olympusmn.cpp:657
 #, fuzzy
-msgid "Nature Macro"
-msgstr "Couleur naturelle"
+msgid "PreviewImage Start"
+msgstr "Données de prévisualisation"
 
-#: src/olympusmn.cpp:558
+#: src/olympusmn.cpp:657
 #, fuzzy
-msgid "Underwater Snapshot"
-msgstr "Sous marin"
+msgid "Preview image start"
+msgstr "Aperçu embarqué"
 
-#: src/olympusmn.cpp:559
+#: src/olympusmn.cpp:658
 #, fuzzy
-msgid "Shooting Guide"
-msgstr "Mode de prise de vue"
+msgid "PreviewImage Length"
+msgstr "Hauteur de l'image"
 
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
+#: src/olympusmn.cpp:658
 #, fuzzy
-msgid "Noise Filter"
-msgstr "Filtre"
+msgid "Preview image length"
+msgstr "Aperçu embarqué"
 
-#: src/olympusmn.cpp:566
-msgid "Noise Filter (ISO Boost)"
-msgstr ""
+#: src/olympusmn.cpp:660
+#, fuzzy
+msgid "Auto exposure lock"
+msgstr "Exposition"
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
+#: src/olympusmn.cpp:662
 #, fuzzy
-msgid "Muted"
-msgstr "utilisé"
+msgid "Exposure Shift"
+msgstr "Temps d'exposition"
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
+#: src/olympusmn.cpp:662
 #, fuzzy
-msgid "Monotone"
-msgstr "Tonalité couleur"
+msgid "Exposure shift"
+msgstr "Temps d'exposition"
 
-#: src/olympusmn.cpp:601
-msgid "SQ"
-msgstr ""
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus Process"
+msgstr "Mode mise au point"
 
-#: src/olympusmn.cpp:602
-msgid "HQ"
-msgstr ""
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus process"
+msgstr "Processus personnel"
 
-#: src/olympusmn.cpp:603
-msgid "SHQ"
+#: src/olympusmn.cpp:666
+msgid "AF Search"
 msgstr ""
 
-#: src/olympusmn.cpp:608
-#, fuzzy
-msgid "Camera Settings Version"
-msgstr "informations de réglage appareil photo"
-
-#: src/olympusmn.cpp:608
+#: src/olympusmn.cpp:666
 #, fuzzy
-msgid "Camera settings version"
-msgstr "informations de réglage appareil photo"
+msgid "AF search"
+msgstr "Point AF utilisé"
 
-#: src/olympusmn.cpp:609
+#: src/olympusmn.cpp:667
 #, fuzzy
-msgid "PreviewImage Valid"
-msgstr "Aperçu embarqué"
+msgid "AF Areas"
+msgstr "Zone mise au point"
 
-#: src/olympusmn.cpp:609
+#: src/olympusmn.cpp:667
 #, fuzzy
-msgid "Preview image valid"
-msgstr "Aperçu embarqué"
+msgid "AF areas"
+msgstr "Zone mise au point"
 
-#: src/olympusmn.cpp:610
+#: src/olympusmn.cpp:668
 #, fuzzy
-msgid "PreviewImage Start"
-msgstr "Données de prévisualisation"
+msgid "AFPointSelected"
+msgstr "Point AF sélectionné"
 
-#: src/olympusmn.cpp:610
+#: src/olympusmn.cpp:669
 #, fuzzy
-msgid "Preview image start"
-msgstr "Aperçu embarqué"
+msgid "AF Fine Tune Adjust"
+msgstr "Point AF utilisé"
 
-#: src/olympusmn.cpp:611
+#: src/olympusmn.cpp:669
 #, fuzzy
-msgid "PreviewImage Length"
-msgstr "Hauteur de l'image"
+msgid "AF fine tune adjust"
+msgstr "Point AF utilisé"
 
-#: src/olympusmn.cpp:611
+#: src/olympusmn.cpp:672
 #, fuzzy
-msgid "Preview image length"
-msgstr "Aperçu embarqué"
+msgid "Flash Remote Control"
+msgstr "Contrôle des couleurs"
 
-#: src/olympusmn.cpp:613
+#: src/olympusmn.cpp:672
 #, fuzzy
-msgid "AE Lock"
-msgstr "AE verrouillé"
+msgid "Flash remote control"
+msgstr "Contrôle des couleurs"
 
-#: src/olympusmn.cpp:613
+#: src/olympusmn.cpp:673
 #, fuzzy
-msgid "Auto exposure lock"
-msgstr "Exposition"
+msgid "Flash Control Mode"
+msgstr "Mode flash"
 
-#: src/olympusmn.cpp:617
+#: src/olympusmn.cpp:673
 #, fuzzy
-msgid "Focus Process"
-msgstr "Mode mise au point"
+msgid "Flash control mode"
+msgstr "Mode flash"
 
-#: src/olympusmn.cpp:617
+#: src/olympusmn.cpp:674
 #, fuzzy
-msgid "Focus process"
-msgstr "Processus personnel"
-
-#: src/olympusmn.cpp:618
-msgid "AF Search"
-msgstr ""
+msgid "Flash Intensity"
+msgstr "Activité flash"
 
-#: src/olympusmn.cpp:618
-msgid "AF search"
-msgstr ""
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash intensity"
+msgstr "Activité flash"
 
-#: src/olympusmn.cpp:619
+#: src/olympusmn.cpp:675
 #, fuzzy
-msgid "AF Areas"
-msgstr "Zone mise au point"
+msgid "Manual Flash Strength"
+msgstr "Puissance Flash"
 
-#: src/olympusmn.cpp:619
+#: src/olympusmn.cpp:675
 #, fuzzy
-msgid "AF areas"
-msgstr "Zone mise au point"
+msgid "Manual flash strength"
+msgstr "Contrôle de flash manuel"
 
-#: src/olympusmn.cpp:622
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
 #, fuzzy
 msgid "White Balance 2"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:622
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
 #, fuzzy
 msgid "White balance 2"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:623
+#: src/olympusmn.cpp:677
 #, fuzzy
 msgid "White Balance Temperature"
 msgstr "Table de balance des blancs"
 
-#: src/olympusmn.cpp:623
+#: src/olympusmn.cpp:677
 #, fuzzy
 msgid "White balance temperature"
 msgstr "Table de balance des blancs"
 
-#: src/olympusmn.cpp:624
-#, fuzzy
-msgid "White Balance Bracket"
-msgstr "Biais de balance des blancs"
-
-#: src/olympusmn.cpp:624
-#, fuzzy
-msgid "White balance bracket"
-msgstr "Biais de balance des blancs"
-
-#: src/olympusmn.cpp:625
+#: src/olympusmn.cpp:679
 #, fuzzy
 msgid "Custom Saturation"
 msgstr "Saturation"
 
-#: src/olympusmn.cpp:625
+#: src/olympusmn.cpp:679
 #, fuzzy
 msgid "Custom saturation"
 msgstr "Fonctions personnalisées"
 
-#: src/olympusmn.cpp:626
+#: src/olympusmn.cpp:680
 #, fuzzy
 msgid "Modified Saturation"
 msgstr "Saturation"
 
-#: src/olympusmn.cpp:626
+#: src/olympusmn.cpp:680
 #, fuzzy
 msgid "Modified saturation"
 msgstr "Saturation"
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
 #, fuzzy
 msgid "Contrast Setting"
 msgstr "Réglage de contraste"
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
 #, fuzzy
 msgid "Sharpness Setting"
 msgstr "Réglage de Netteté"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+#, fuzzy
 msgid "Distortion Correction"
-msgstr ""
+msgstr "Réduction du bruit"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+#, fuzzy
 msgid "Distortion correction"
-msgstr ""
+msgstr "Réduction du bruit"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
 #, fuzzy
 msgid "Shading Compensation"
 msgstr "Compensation de tonalité"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
 #, fuzzy
 msgid "Shading compensation"
 msgstr "Compensation de tonalité"
 
-#: src/olympusmn.cpp:634
+#: src/olympusmn.cpp:688
 #, fuzzy
 msgid "Compression Factor"
 msgstr "Rapport de compression"
 
-#: src/olympusmn.cpp:634
+#: src/olympusmn.cpp:688
 #, fuzzy
 msgid "Compression factor"
 msgstr "Rapport de compression"
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
 #, fuzzy
 msgid "Gradation"
 msgstr "Saturation"
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
 #, fuzzy
 msgid "Picture mode"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:637
+#: src/olympusmn.cpp:691
 #, fuzzy
 msgid "Picture Mode Saturation"
 msgstr "Réglage de mode d'image"
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
 #, fuzzy
 msgid "Picture mode saturation"
 msgstr "Réglage de mode d'image"
 
-#: src/olympusmn.cpp:638
+#: src/olympusmn.cpp:692
 #, fuzzy
 msgid "Picture Mode Hue"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:638
+#: src/olympusmn.cpp:692
 #, fuzzy
 msgid "Picture mode hue"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:639
+#: src/olympusmn.cpp:693
 #, fuzzy
 msgid "Picture Mode Contrast"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
 #, fuzzy
 msgid "Picture mode contrast"
 msgstr "Réglage de mode d'image"
 
-#: src/olympusmn.cpp:640
+#: src/olympusmn.cpp:694
 #, fuzzy
 msgid "Picture Mode Sharpness"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
 #, fuzzy
 msgid "Picture mode sharpness"
 msgstr "Réglage de mode d'image"
 
-#: src/olympusmn.cpp:641
+#: src/olympusmn.cpp:695
 #, fuzzy
 msgid "Picture Mode BW Filter"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:641
+#: src/olympusmn.cpp:695
 #, fuzzy
 msgid "Picture mode BW filter"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:642
+#: src/olympusmn.cpp:696
 #, fuzzy
 msgid "Picture Mode Tone"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:642
+#: src/olympusmn.cpp:696
 #, fuzzy
 msgid "Picture mode tone"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:643
+#: src/olympusmn.cpp:697
 #, fuzzy
 msgid "Noise filter"
 msgstr "Filtre couleur"
 
-#: src/olympusmn.cpp:645
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art Filter"
+msgstr "Filtre"
+
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art filter"
+msgstr "Filtre couleur"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic Filter"
+msgstr "Filtre digital"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic filter"
+msgstr "Appareil photo numérique"
+
+#: src/olympusmn.cpp:701
 #, fuzzy
 msgid "Panorama Mode"
 msgstr "Panorama"
 
-#: src/olympusmn.cpp:645
+#: src/olympusmn.cpp:701
 #, fuzzy
 msgid "Panorama mode"
 msgstr "Frame panorama"
 
-#: src/olympusmn.cpp:646
+#: src/olympusmn.cpp:702
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "Qualité de l'image"
 
-#: src/olympusmn.cpp:646
+#: src/olympusmn.cpp:702
 #, fuzzy
 msgid "Image quality 2"
 msgstr "Qualité de l'image"
 
-#: src/olympusmn.cpp:647
+#: src/olympusmn.cpp:704
+#, fuzzy
 msgid "Manometer Pressure"
-msgstr ""
+msgstr "Non compressé"
 
-#: src/olympusmn.cpp:647
+#: src/olympusmn.cpp:704
 #, fuzzy
 msgid "Manometer pressure"
 msgstr "Non compressé"
 
-#: src/olympusmn.cpp:648
+#: src/olympusmn.cpp:705
+#, fuzzy
 msgid "Manometer Reading"
-msgstr ""
+msgstr "Non compressé"
 
-#: src/olympusmn.cpp:648
+#: src/olympusmn.cpp:705
+#, fuzzy
 msgid "Manometer reading"
-msgstr ""
+msgstr "Non compressé"
 
-#: src/olympusmn.cpp:649
+#: src/olympusmn.cpp:706
+#, fuzzy
 msgid "Extended WB Detect"
-msgstr ""
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:649
+#: src/olympusmn.cpp:706
+#, fuzzy
 msgid "Extended WB detect"
+msgstr "Mode scène"
+
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
 msgstr ""
 
-#: src/olympusmn.cpp:651
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:710
 #, fuzzy
 msgid "Unknown OlympusCs tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:662
+#: src/olympusmn.cpp:721
 msgid "Simple E-System"
 msgstr ""
 
-#: src/olympusmn.cpp:663
+#: src/olympusmn.cpp:722
 msgid "E-System"
 msgstr ""
 
-#: src/olympusmn.cpp:679
+#: src/olympusmn.cpp:739
 #, fuzzy
 msgid "Equipment Version"
 msgstr "Informations équipement"
 
-#: src/olympusmn.cpp:679
+#: src/olympusmn.cpp:739
 #, fuzzy
 msgid "Equipment version"
 msgstr "Informations équipement"
 
-#: src/olympusmn.cpp:680
-#, fuzzy
-msgid "Camera Type"
-msgstr "Marque de l'appareil"
-
-#: src/olympusmn.cpp:680
-#, fuzzy
-msgid "Camera type"
-msgstr "Marque de l'appareil"
+#: src/olympusmn.cpp:741
+msgid "Serial number"
+msgstr "Numéro de série"
 
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
 #, fuzzy
-msgid "Internal Serial Number"
-msgstr "Numéro de série de l'appareil photo"
+msgid "Lens Serial Number"
+msgstr "Numéro de série"
 
-#: src/olympusmn.cpp:682
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
 #, fuzzy
-msgid "Internal serial number"
+msgid "Lens serial number"
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-#, fuzzy
-msgid "Body Firmware Version"
-msgstr "Version du microcode"
-
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-#, fuzzy
-msgid "Body firmware version"
-msgstr "Version de microcode"
-
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/olympusmn.cpp:747 src/properties.cpp:374
 #, fuzzy
-msgid "Lens Serial Number"
-msgstr "Numéro de série"
+msgid "Lens Model"
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/olympusmn.cpp:747
 #, fuzzy
-msgid "Lens serial number"
-msgstr "Numéro de série de l'appareil photo"
+msgid "Lens model"
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:687
+#: src/olympusmn.cpp:748
 #, fuzzy
 msgid "Lens Firmware Version"
 msgstr "Version du microcode"
 
-#: src/olympusmn.cpp:687
+#: src/olympusmn.cpp:748
 #, fuzzy
 msgid "Lens firmware version"
 msgstr "Version de microcode"
 
-#: src/olympusmn.cpp:692
+#: src/olympusmn.cpp:753
 #, fuzzy
 msgid "Max Aperture At Current Focal"
 msgstr "Ouverture maximum à focal minimum"
 
-#: src/olympusmn.cpp:692
+#: src/olympusmn.cpp:753
 #, fuzzy
 msgid "Max aperture at current focal"
 msgstr "Ouverture maximum à focal minimum"
 
-#: src/olympusmn.cpp:693
+#: src/olympusmn.cpp:754
 #, fuzzy
 msgid "Lens Properties"
 msgstr "Température de l'objectif"
 
-#: src/olympusmn.cpp:693
+#: src/olympusmn.cpp:754
 #, fuzzy
 msgid "Lens properties"
 msgstr "Température de l'objectif"
 
-#: src/olympusmn.cpp:694
+#: src/olympusmn.cpp:755
 #, fuzzy
 msgid "Extender"
 msgstr "Externe"
 
-#: src/olympusmn.cpp:695
+#: src/olympusmn.cpp:756
 #, fuzzy
 msgid "Extender Serial Number"
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/olympusmn.cpp:695
+#: src/olympusmn.cpp:756
 #, fuzzy
 msgid "Extender serial number"
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/olympusmn.cpp:696
+#: src/olympusmn.cpp:757
 #, fuzzy
 msgid "Extender Model"
 msgstr "Mode scène"
 
-#: src/olympusmn.cpp:696
+#: src/olympusmn.cpp:757
 #, fuzzy
 msgid "Extender model"
 msgstr "Mode scène"
 
-#: src/olympusmn.cpp:697
+#: src/olympusmn.cpp:758
 #, fuzzy
 msgid "Extender Firmware Version"
 msgstr "Version du microcode"
 
-#: src/olympusmn.cpp:697
+#: src/olympusmn.cpp:758
 #, fuzzy
 msgid "Extender firmwareversion"
 msgstr "Version du microcode"
 
-#: src/olympusmn.cpp:698
-#, fuzzy
-msgid "Flash Type"
-msgstr "Mode flash"
-
-#: src/olympusmn.cpp:698
-#, fuzzy
-msgid "Flash type"
-msgstr "Mode flash"
-
-#: src/olympusmn.cpp:699 src/properties.cpp:354
+#: src/olympusmn.cpp:760 src/properties.cpp:370
 #, fuzzy
 msgid "Flash Model"
 msgstr "Mode flash"
 
-#: src/olympusmn.cpp:699
+#: src/olympusmn.cpp:760
 #, fuzzy
 msgid "Flash model"
 msgstr "Mode flash"
 
-#: src/olympusmn.cpp:700
+#: src/olympusmn.cpp:761
 #, fuzzy
 msgid "Flash Firmware Version"
 msgstr "Version du microcode"
 
-#: src/olympusmn.cpp:700
+#: src/olympusmn.cpp:761
 #, fuzzy
 msgid "Flash firmware version"
 msgstr "Version de microcode"
 
-#: src/olympusmn.cpp:701
+#: src/olympusmn.cpp:762
 #, fuzzy
 msgid "FlashSerialNumber"
 msgstr "Numéro de série"
 
-#: src/olympusmn.cpp:703
+#: src/olympusmn.cpp:764
 #, fuzzy
 msgid "Unknown OlympusEq tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
 #, fuzzy
 msgid "High Speed"
 msgstr "Scène de nuit"
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
 #, fuzzy
 msgid "High Function"
 msgstr "Fonctions personnalisées"
 
-#: src/olympusmn.cpp:722
+#: src/olympusmn.cpp:783
+#, fuzzy
 msgid "Advanced High Speed"
-msgstr ""
+msgstr "Scène de nuit"
 
-#: src/olympusmn.cpp:723
+#: src/olympusmn.cpp:784
 #, fuzzy
 msgid "Advanced High Function"
 msgstr "Fonction de transfert"
 
-#: src/olympusmn.cpp:728
+#: src/olympusmn.cpp:789
+#, fuzzy
 msgid "Original"
-msgstr ""
+msgstr "Date et heure (originel)"
 
-#: src/olympusmn.cpp:729
+#: src/olympusmn.cpp:790
 #, fuzzy
 msgid "Edited (Landscape)"
 msgstr "Paysage"
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
 #, fuzzy
 msgid "Edited (Portrait)"
 msgstr "Portrait de nuit"
 
-#: src/olympusmn.cpp:736
+#: src/olympusmn.cpp:797
 #, fuzzy
 msgid "WB Color Temp"
 msgstr "Tonalité couleur"
 
-#: src/olympusmn.cpp:737
+#: src/olympusmn.cpp:798
+#, fuzzy
 msgid "WB Gray Point"
-msgstr ""
+msgstr "Point AF"
 
-#: src/olympusmn.cpp:747
+#: src/olympusmn.cpp:808
 #, fuzzy
 msgid "Raw Development Version"
 msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:747
+#: src/olympusmn.cpp:808
+#, fuzzy
 msgid "Raw development version"
-msgstr ""
+msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
 #, fuzzy
 msgid "Exposure Bias Value"
 msgstr "Correction d'exposition"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
 #, fuzzy
 msgid "Exposure bias value"
 msgstr "Correction d'exposition"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
 #, fuzzy
 msgid "White Balance Value"
 msgstr "Table de balance des blancs"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
 #, fuzzy
 msgid "White balance value"
 msgstr "Table de balance des blancs"
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
 #, fuzzy
 msgid "WB Fine Adjustment"
 msgstr "Ajustement de teinte"
 
-#: src/olympusmn.cpp:750
+#: src/olympusmn.cpp:811
 #, fuzzy
 msgid "WB fine adjustment"
 msgstr "Ajustement de teinte"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
 #, fuzzy
 msgid "Gray Point"
 msgstr "Point AF"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
 #, fuzzy
 msgid "Gray point"
 msgstr "AF Points"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
 #, fuzzy
 msgid "Saturation Emphasis"
 msgstr "Réglage de saturation"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
 #, fuzzy
 msgid "Saturation emphasis"
 msgstr "Réglage de saturation"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
 #, fuzzy
 msgid "Memory Color Emphasis"
 msgstr "Mes couleurs"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
 msgid "Memory color emphasis"
-msgstr ""
+msgstr "Mes couleurs"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
 #, fuzzy
 msgid "Contrast Value"
 msgstr "Contraste"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
 #, fuzzy
 msgid "Contrast value"
 msgstr "Contraste"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
 #, fuzzy
 msgid "Sharpness Value"
 msgstr "Netteté"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
 #, fuzzy
 msgid "Sharpness value"
 msgstr "Netteté"
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
 #, fuzzy
 msgid "Engine"
 msgstr "centre"
 
-#: src/olympusmn.cpp:759
+#: src/olympusmn.cpp:820
 #, fuzzy
 msgid "Edit status"
 msgstr "Statut des modifications"
 
-#: src/olympusmn.cpp:760
+#: src/olympusmn.cpp:821
 #, fuzzy
 msgid "Settings"
 msgstr "Réglage AE"
 
-#: src/olympusmn.cpp:762
+#: src/olympusmn.cpp:823
 #, fuzzy
 msgid "Unknown OlympusRd tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:878
+#, fuzzy
 msgid "Raw Development 2 Version"
-msgstr ""
+msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:878
+#, fuzzy
 msgid "Raw development 2 version"
-msgstr ""
+msgstr "Version des Notes du fabriquant"
 
-#: src/olympusmn.cpp:821
+#: src/olympusmn.cpp:882
 #, fuzzy
 msgid "White balance fine adjustment"
 msgstr "Ajustement de la balance des blancs"
 
-#: src/olympusmn.cpp:831
+#: src/olympusmn.cpp:892
 #, fuzzy
 msgid "PM Saturation"
 msgstr "Saturation"
 
-#: src/olympusmn.cpp:832
+#: src/olympusmn.cpp:893
 #, fuzzy
 msgid "PM Contrast"
 msgstr "Contraste"
 
-#: src/olympusmn.cpp:833
+#: src/olympusmn.cpp:894
 #, fuzzy
 msgid "PM Sharpness"
 msgstr "Netteté"
 
-#: src/olympusmn.cpp:834
+#: src/olympusmn.cpp:895
 #, fuzzy
 msgid "PM BW Filter"
 msgstr "Filtre"
 
-#: src/olympusmn.cpp:834
+#: src/olympusmn.cpp:895
+#, fuzzy
 msgid "PM BW filter"
-msgstr ""
+msgstr "Filtre"
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:896
 #, fuzzy
 msgid "PM Picture Tone"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:896
 #, fuzzy
 msgid "PM picture tone"
 msgstr "Mode d'image"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:899
 #, fuzzy
 msgid "Auto Gradation"
 msgstr "Durée audio"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:899
 #, fuzzy
 msgid "Auto gradation"
 msgstr "Durée audio"
 
-#: src/olympusmn.cpp:839
+#: src/olympusmn.cpp:900
+#, fuzzy
 msgid "PM Noise Filter"
-msgstr ""
+msgstr "Filtre"
 
-#: src/olympusmn.cpp:839
+#: src/olympusmn.cpp:900
 #, fuzzy
 msgid "Picture mode noise filter"
 msgstr "Réglage de mode d'image"
 
-#: src/olympusmn.cpp:841
+#: src/olympusmn.cpp:902
 #, fuzzy
 msgid "Unknown OlympusRd2 tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:913
+#, fuzzy
+msgid "On (2 frames)"
+msgstr "Activé"
+
+#: src/olympusmn.cpp:914
+#, fuzzy
+msgid "On (3 frames)"
+msgstr "Activé"
+
+#: src/olympusmn.cpp:919
+msgid "4:3"
+msgstr ""
+
+#: src/olympusmn.cpp:920
+#, fuzzy
+msgid "3:2"
+msgstr "320x240"
+
+#: src/olympusmn.cpp:921
+msgid "16:9"
+msgstr ""
+
+#: src/olympusmn.cpp:922
+msgid "6:6"
+msgstr ""
+
+#: src/olympusmn.cpp:923
+msgid "5:4"
+msgstr ""
+
+#: src/olympusmn.cpp:924
+msgid "7:6"
+msgstr ""
+
+#: src/olympusmn.cpp:925
+#, fuzzy
+msgid "6:5"
+msgstr "D65"
+
+#: src/olympusmn.cpp:926
+#, fuzzy
+msgid "7:5"
+msgstr "D75"
+
+#: src/olympusmn.cpp:927
+msgid "3:4"
+msgstr ""
+
+#: src/olympusmn.cpp:931
 #, fuzzy
 msgid "Image Processing Version"
 msgstr "  Traitement d'image"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:931
 #, fuzzy
 msgid "Image processing version"
 msgstr "Informations du traitement d'image"
 
-#: src/olympusmn.cpp:852
+#: src/olympusmn.cpp:933
+#, fuzzy
 msgid "WB RB Levels 3000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:852
+#: src/olympusmn.cpp:933
+#, fuzzy
 msgid "WB RB levels 3000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:853
+#: src/olympusmn.cpp:934
+#, fuzzy
 msgid "WB RB Levels 3300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:853
+#: src/olympusmn.cpp:934
+#, fuzzy
 msgid "WB RB levels 3300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:854
+#: src/olympusmn.cpp:935
+#, fuzzy
 msgid "WB RB Levels 3600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:854
+#: src/olympusmn.cpp:935
+#, fuzzy
 msgid "WB RB levels 3600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:855
+#: src/olympusmn.cpp:936
+#, fuzzy
 msgid "WB RB Levels 3900K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:855
+#: src/olympusmn.cpp:936
+#, fuzzy
 msgid "WB RB levels 3900K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:856
+#: src/olympusmn.cpp:937
+#, fuzzy
 msgid "WB RB Levels 4000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:856
+#: src/olympusmn.cpp:937
+#, fuzzy
 msgid "WB RB levels 4000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:857
+#: src/olympusmn.cpp:938
+#, fuzzy
 msgid "WB RB Levels 4300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:857
+#: src/olympusmn.cpp:938
+#, fuzzy
 msgid "WB RB levels 4300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:858
+#: src/olympusmn.cpp:939
+#, fuzzy
 msgid "WB RB Levels 4500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:858
+#: src/olympusmn.cpp:939
+#, fuzzy
 msgid "WB RB levels 4500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:859
+#: src/olympusmn.cpp:940
+#, fuzzy
 msgid "WB RB Levels 4800K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:859
+#: src/olympusmn.cpp:940
+#, fuzzy
 msgid "WB RB levels 4800K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:860
+#: src/olympusmn.cpp:941
+#, fuzzy
 msgid "WB RB Levels 5300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:860
+#: src/olympusmn.cpp:941
+#, fuzzy
 msgid "WB RB levels 5300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:861
+#: src/olympusmn.cpp:942
+#, fuzzy
 msgid "WB RB Levels 6000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:861
+#: src/olympusmn.cpp:942
+#, fuzzy
 msgid "WB RB levels 6000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:862
+#: src/olympusmn.cpp:943
+#, fuzzy
 msgid "WB RB Levels 6600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:862
+#: src/olympusmn.cpp:943
+#, fuzzy
 msgid "WB RB levels 6600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:863
+#: src/olympusmn.cpp:944
+#, fuzzy
 msgid "WB RB Levels 7500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:863
+#: src/olympusmn.cpp:944
+#, fuzzy
 msgid "WB RB levels 7500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:864
+#: src/olympusmn.cpp:945
+#, fuzzy
 msgid "WB RB Levels CWB1"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:864
+#: src/olympusmn.cpp:945
+#, fuzzy
 msgid "WB RB levels CWB1"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:865
+#: src/olympusmn.cpp:946
+#, fuzzy
 msgid "WB RB Levels CWB2"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:865
+#: src/olympusmn.cpp:946
+#, fuzzy
 msgid "WB RB levels CWB2"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:866
+#: src/olympusmn.cpp:947
+#, fuzzy
 msgid "WB RB Levels CWB3"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:866
+#: src/olympusmn.cpp:947
+#, fuzzy
 msgid "WB RB levels CWB3"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:867
+#: src/olympusmn.cpp:948
+#, fuzzy
 msgid "WB RB Levels CWB4"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:867
+#: src/olympusmn.cpp:948
+#, fuzzy
 msgid "WB RB levels CWB4"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:868
+#: src/olympusmn.cpp:949
+#, fuzzy
 msgid "WB G Level 3000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:868
+#: src/olympusmn.cpp:949
+#, fuzzy
 msgid "WB G level 3000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:869
+#: src/olympusmn.cpp:950
+#, fuzzy
 msgid "WB G Level 3300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:869
+#: src/olympusmn.cpp:950
+#, fuzzy
 msgid "WB G level 3300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:870
+#: src/olympusmn.cpp:951
+#, fuzzy
 msgid "WB G Level 3600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:870
+#: src/olympusmn.cpp:951
+#, fuzzy
 msgid "WB G level 3600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:871
+#: src/olympusmn.cpp:952
+#, fuzzy
 msgid "WB G Level 3900K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:871
+#: src/olympusmn.cpp:952
+#, fuzzy
 msgid "WB G level 3900K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:872
+#: src/olympusmn.cpp:953
+#, fuzzy
 msgid "WB G Level 4000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:872
+#: src/olympusmn.cpp:953
+#, fuzzy
 msgid "WB G level 4000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:873
+#: src/olympusmn.cpp:954
+#, fuzzy
 msgid "WB G Level 4300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:873
+#: src/olympusmn.cpp:954
+#, fuzzy
 msgid "WB G level 4300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:874
+#: src/olympusmn.cpp:955
+#, fuzzy
 msgid "WB G Level 4500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:874
+#: src/olympusmn.cpp:955
+#, fuzzy
 msgid "WB G level 4500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:875
+#: src/olympusmn.cpp:956
+#, fuzzy
 msgid "WB G Level 4800K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:875
+#: src/olympusmn.cpp:956
+#, fuzzy
 msgid "WB G level 4800K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:876
+#: src/olympusmn.cpp:957
+#, fuzzy
 msgid "WB G Level 5300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:876
+#: src/olympusmn.cpp:957
+#, fuzzy
 msgid "WB G level 5300K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:877
+#: src/olympusmn.cpp:958
+#, fuzzy
 msgid "WB G Level 6000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:877
+#: src/olympusmn.cpp:958
+#, fuzzy
 msgid "WB G level 6000K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:878
+#: src/olympusmn.cpp:959
+#, fuzzy
 msgid "WB G Level 6600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:878
+#: src/olympusmn.cpp:959
+#, fuzzy
 msgid "WB G level 6600K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:879
+#: src/olympusmn.cpp:960
+#, fuzzy
 msgid "WB G Level 7500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:879
+#: src/olympusmn.cpp:960
+#, fuzzy
 msgid "WB G level 7500K"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:961
 #, fuzzy
 msgid "WB G Level"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:961
 #, fuzzy
 msgid "WB G level"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:882
+#: src/olympusmn.cpp:963
 #, fuzzy
 msgid "Enhancer"
 msgstr "centre"
 
-#: src/olympusmn.cpp:883
+#: src/olympusmn.cpp:964
+#, fuzzy
 msgid "Enhancer Values"
-msgstr ""
+msgstr "centre"
 
-#: src/olympusmn.cpp:883
+#: src/olympusmn.cpp:964
+#, fuzzy
 msgid "Enhancer values"
-msgstr ""
+msgstr "centre"
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
 #, fuzzy
 msgid "Coring Filter"
 msgstr "Filtre couleur"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
 #, fuzzy
 msgid "Coring Values"
 msgstr "Valeur de luminosité"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
 #, fuzzy
 msgid "Coring values"
 msgstr "Valeur de luminosité"
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
+#: src/olympusmn.cpp:967 src/tags.cpp:913
 #, fuzzy
 msgid "Black Level"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:887
+#: src/olympusmn.cpp:968
 msgid "Gain Base"
 msgstr ""
 
-#: src/olympusmn.cpp:887
+#: src/olympusmn.cpp:968
 msgid "Gain base"
 msgstr ""
 
-#: src/olympusmn.cpp:888
+#: src/olympusmn.cpp:969
 msgid "Valid Bits"
 msgstr ""
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
 #, fuzzy
 msgid "Crop Left"
 msgstr "haut, gauche"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
 #, fuzzy
 msgid "Crop left"
 msgstr "haut, gauche"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
 #, fuzzy
 msgid "Crop Top"
 msgstr "Crédit"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
 #, fuzzy
 msgid "Crop top"
 msgstr "Crédit"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
 #, fuzzy
 msgid "Crop Width"
 msgstr "Droit d'auteur"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
 #, fuzzy
 msgid "Crop width"
 msgstr "Droit d'auteur"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
 #, fuzzy
 msgid "Crop Height"
 msgstr "Droit d'auteur"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
 #, fuzzy
 msgid "Crop height"
 msgstr "Droit d'auteur"
 
-#: src/olympusmn.cpp:896
-msgid "Face Detect"
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple Exposure Mode"
+msgstr "Mode d'exposition"
+
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple exposure mode"
+msgstr "Exposition"
+
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+msgid "Aspect Ratio"
 msgstr ""
 
-#: src/olympusmn.cpp:896
+#: src/olympusmn.cpp:978
+#, fuzzy
+msgid "Aspect ratio"
+msgstr "Durée audio"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect Frame"
+msgstr "Nom de l'objet"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect frame"
+msgstr "Nom de l'objet"
+
+#: src/olympusmn.cpp:980
+#, fuzzy
+msgid "Face Detect"
+msgstr "Échec lors de la lecture"
+
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+#, fuzzy
 msgid "Face detect"
-msgstr ""
+msgstr "Échec lors de la lecture"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:981
 #, fuzzy
 msgid "Face Detect Area"
 msgstr "Échec lors de la lecture"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:981
 #, fuzzy
 msgid "Face detect area"
 msgstr "Échec lors de la lecture"
 
-#: src/olympusmn.cpp:899
+#: src/olympusmn.cpp:983
 #, fuzzy
 msgid "Unknown OlympusIp tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:909
+#: src/olympusmn.cpp:993
 msgid "Bounce or Off"
 msgstr ""
 
-#: src/olympusmn.cpp:910
+#: src/olympusmn.cpp:994
 msgid "Direct"
 msgstr ""
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:998
 #, fuzzy
 msgid "Focus Info Version"
 msgstr "Informations mise au point"
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:998
 #, fuzzy
 msgid "Focus info version"
 msgstr "Informations mise au point"
 
-#: src/olympusmn.cpp:915
+#: src/olympusmn.cpp:999
 #, fuzzy
 msgid "Auto Focus"
 msgstr "Mise au point auto"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:1000
 #, fuzzy
 msgid "Scene Detect"
 msgstr "Mode scène"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:1000
 #, fuzzy
 msgid "Scene detect"
 msgstr "Mode scène"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:1001
 #, fuzzy
 msgid "Scene Area"
 msgstr "Mode scène"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:1001
 #, fuzzy
 msgid "Scene area"
 msgstr "Zone unique"
 
-#: src/olympusmn.cpp:918
+#: src/olympusmn.cpp:1002
+#, fuzzy
 msgid "Scene Detect Data"
-msgstr ""
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:918
+#: src/olympusmn.cpp:1002
+#, fuzzy
 msgid "Scene detect data"
-msgstr ""
+msgstr "Mode scène"
 
-#: src/olympusmn.cpp:919
+#: src/olympusmn.cpp:1003
 #, fuzzy
 msgid "Zoom Step Count"
 msgstr "Comptage d'image"
 
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:1004
 #, fuzzy
 msgid "Focus Step Count"
 msgstr "Mise au point continue"
 
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:1004
 #, fuzzy
 msgid "Focus step count"
 msgstr "Position mise au point"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:1005
 #, fuzzy
 msgid "Focus Step Infinity"
 msgstr "Réglage mise au point"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:1005
 #, fuzzy
 msgid "Focus step infinity"
 msgstr "Réglage mise au point"
 
-#: src/olympusmn.cpp:922
+#: src/olympusmn.cpp:1006
 #, fuzzy
 msgid "Focus Step Near"
 msgstr "Type de mise au point"
 
-#: src/olympusmn.cpp:922
+#: src/olympusmn.cpp:1006
 #, fuzzy
 msgid "Focus step near"
 msgstr "Distance de mise au point"
 
-#: src/olympusmn.cpp:925
+#: src/olympusmn.cpp:1009
 #, fuzzy
 msgid "External Flash"
 msgstr "Flash externe"
 
-#: src/olympusmn.cpp:926
+#: src/olympusmn.cpp:1010
 #, fuzzy
 msgid "External Flash Guide Number"
 msgstr "Mode flash externe"
 
-#: src/olympusmn.cpp:926
+#: src/olympusmn.cpp:1010
 #, fuzzy
 msgid "External flash guide number"
 msgstr "Mode flash externe"
 
-#: src/olympusmn.cpp:930
+#: src/olympusmn.cpp:1014
 #, fuzzy
 msgid "Manual Flash"
 msgstr "Déclenchement  manuel"
 
-#: src/olympusmn.cpp:930
+#: src/olympusmn.cpp:1014
 #, fuzzy
 msgid "Manual flash"
 msgstr "Déclenchement  manuel"
 
-#: src/olympusmn.cpp:934
+#: src/olympusmn.cpp:1018
 #, fuzzy
 msgid "Unknown OlympusFi tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:945
+#: src/olympusmn.cpp:1029
 #, fuzzy
 msgid "Unknown OlympusFe tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:958
+#: src/olympusmn.cpp:1042
 #, fuzzy
 msgid "Fine Weather"
 msgstr "Ensoleillé"
 
-#: src/olympusmn.cpp:959
+#: src/olympusmn.cpp:1043
 #, fuzzy
 msgid "Tungsten (incandescent)"
 msgstr "Tungstène (lampe à incandescence)"
 
-#: src/olympusmn.cpp:960
+#: src/olympusmn.cpp:1044
 #, fuzzy
 msgid "Evening Sunlight"
 msgstr "Soirée"
 
-#: src/olympusmn.cpp:961
+#: src/olympusmn.cpp:1045
 #, fuzzy
 msgid "Daylight Fluorescent (D 5700 - 7100K)"
 msgstr "Lumière du jour fluorescent (D 5700 - 7100K)"
 
-#: src/olympusmn.cpp:962
+#: src/olympusmn.cpp:1046
 #, fuzzy
 msgid "Day White Fluorescent (N 4600 - 5400K)"
 msgstr "Blanc chaud fluorescent (N 4600 - 5400K)"
 
-#: src/olympusmn.cpp:963
+#: src/olympusmn.cpp:1047
 #, fuzzy
 msgid "Cool White Fluorescent (W 3900 - 4500K)"
 msgstr "Blanc froid fluorescent (W 3900 - 4500K)"
 
-#: src/olympusmn.cpp:964
+#: src/olympusmn.cpp:1048
 #, fuzzy
 msgid "White Fluorescent (WW 3200 - 3700K)"
 msgstr "Blanc fluorescent (WW 3200 - 3700K)"
 
-#: src/olympusmn.cpp:965
+#: src/olympusmn.cpp:1049
 #, fuzzy
 msgid "One Touch White Balance"
 msgstr "Balance des blancs en une touche"
 
-#: src/olympusmn.cpp:966
+#: src/olympusmn.cpp:1050
 #, fuzzy
 msgid "Custom 1-4"
 msgstr "Personnel 1"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:1054
 #, fuzzy
 msgid "Raw Info Version"
 msgstr "Informations mise au point"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:1054
 #, fuzzy
 msgid "Raw info version"
 msgstr "Informations brutes"
 
-#: src/olympusmn.cpp:971
+#: src/olympusmn.cpp:1055
 #, fuzzy
 msgid "WB_RB Levels Used"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:971
+#: src/olympusmn.cpp:1055
 #, fuzzy
 msgid "WB_RB levels used"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:1056
 #, fuzzy
 msgid "WB_RB Levels Auto"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:1056
 #, fuzzy
 msgid "WB_RB levels auto"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:1057
 #, fuzzy
 msgid "WB_RB Levels Shade"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:1057
 #, fuzzy
 msgid "WB_RB levels shade"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:1058
 #, fuzzy
 msgid "WB_RB Levels Cloudy"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:1058
 #, fuzzy
 msgid "WB_RB levels cloudy"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:975
+#: src/olympusmn.cpp:1059
 #, fuzzy
 msgid "WB_RB Levels Fine Weather"
 msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:975
+#: src/olympusmn.cpp:1059
+#, fuzzy
 msgid "WB_RB levels fine weather"
-msgstr ""
+msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:1060
 #, fuzzy
 msgid "WB_RB Levels Tungsten"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:1060
 #, fuzzy
 msgid "WB_RB levels tungsten"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:977
+#: src/olympusmn.cpp:1061
+#, fuzzy
 msgid "WB_RB Levels Evening Sunlight"
-msgstr ""
+msgstr "Soirée"
 
-#: src/olympusmn.cpp:977
+#: src/olympusmn.cpp:1061
+#, fuzzy
 msgid "WB_RB levels evening sunlight"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:978
+#: src/olympusmn.cpp:1062
 #, fuzzy
 msgid "WB_RB Levels Daylight Fluor"
 msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:978
+#: src/olympusmn.cpp:1062
+#, fuzzy
 msgid "WB_RB levels daylight fluor"
-msgstr ""
+msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:979
+#: src/olympusmn.cpp:1063
 #, fuzzy
 msgid "WB_RB Levels Day White Fluor"
 msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:979
+#: src/olympusmn.cpp:1063
+#, fuzzy
 msgid "WB_RB levels day white fluor"
-msgstr ""
+msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:980
+#: src/olympusmn.cpp:1064
+#, fuzzy
 msgid "WB_RB Levels Cool White Fluor"
-msgstr ""
+msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:980
+#: src/olympusmn.cpp:1064
+#, fuzzy
 msgid "WB_RB levels cool white fluor"
-msgstr ""
+msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:1065
 #, fuzzy
 msgid "WB_RB Levels White Fluorescent"
 msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:1065
 #, fuzzy
 msgid "WB_RB levels white fluorescent"
 msgstr "Fluorescent"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:1066
 #, fuzzy
 msgid "Color Matrix2"
 msgstr "Matrice des couleurs"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:1066
 #, fuzzy
 msgid "Color matrix 2"
 msgstr "Matrice des couleurs"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1069
 #, fuzzy
 msgid "Black Level 2"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1069
 #, fuzzy
 msgid "Black level 2"
 msgstr "Niveau de noir"
 
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
 msgid "YCbCr Coefficients"
 msgstr "Coefficients YCbCr"
 
-#: src/olympusmn.cpp:986
+#: src/olympusmn.cpp:1070
 #, fuzzy
 msgid "YCbCr coefficients"
 msgstr "Coefficients YCbCr"
 
-#: src/olympusmn.cpp:987
+#: src/olympusmn.cpp:1071
 msgid "Valid Pixel Depth"
 msgstr ""
 
-#: src/olympusmn.cpp:987
+#: src/olympusmn.cpp:1071
 msgid "Valid pixel depth"
 msgstr ""
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:1077
 #, fuzzy
 msgid "White Balance Comp"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:1077
 #, fuzzy
 msgid "White balance comp"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:994
+#: src/olympusmn.cpp:1078
 #, fuzzy
 msgid "Saturation Setting"
 msgstr "Réglage de saturation"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:1079
 #, fuzzy
 msgid "Hue Setting"
 msgstr "Réglage flash"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:1079
 #, fuzzy
 msgid "Hue setting"
 msgstr "Réglage AE"
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:1082
 #, fuzzy
 msgid "CM Exposure Compensation"
 msgstr "Compensation d'exposition"
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:1082
 #, fuzzy
 msgid "CM exposure compensation"
 msgstr "Compensation d'exposition"
 
-#: src/olympusmn.cpp:999
+#: src/olympusmn.cpp:1083
 #, fuzzy
 msgid "CM White Balance"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:999
+#: src/olympusmn.cpp:1083
 #, fuzzy
 msgid "CM white balance"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:1000
+#: src/olympusmn.cpp:1084
 #, fuzzy
 msgid "CM White Balance Comp"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:1000
+#: src/olympusmn.cpp:1084
 #, fuzzy
 msgid "CM white balance comp"
 msgstr "Balance des blancs"
 
-#: src/olympusmn.cpp:1001
+#: src/olympusmn.cpp:1085
 #, fuzzy
 msgid "CM White Balance Gray Point"
 msgstr "Biais de balance des blancs"
 
-#: src/olympusmn.cpp:1001
+#: src/olympusmn.cpp:1085
 #, fuzzy
 msgid "CM white balance gray point"
 msgstr "Biais de balance des blancs"
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:1086
 #, fuzzy
 msgid "CM Saturation"
 msgstr "Saturation"
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:1086
 #, fuzzy
 msgid "CM saturation"
 msgstr "Saturation"
 
-#: src/olympusmn.cpp:1003
+#: src/olympusmn.cpp:1087
 #, fuzzy
 msgid "CM Hue"
 msgstr "tonalité"
 
-#: src/olympusmn.cpp:1003
+#: src/olympusmn.cpp:1087
+#, fuzzy
 msgid "CM hue"
-msgstr ""
+msgstr "tonalité"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:1088
 #, fuzzy
 msgid "CM Contrast"
 msgstr "Contraste"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:1088
 #, fuzzy
 msgid "CM contrast"
 msgstr "Contraste"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:1089
 #, fuzzy
 msgid "CM Sharpness"
 msgstr "Netteté"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:1089
 #, fuzzy
 msgid "CM sharpness"
 msgstr "Netteté"
 
-#: src/olympusmn.cpp:1007
+#: src/olympusmn.cpp:1091
 #, fuzzy
 msgid "Unknown OlympusRi tag"
 msgstr "Marqueur de note du fabriquant Olympus inconnu"
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
 msgid "User-Selected"
 msgstr "Sélection utilisateur"
 
-#: src/olympusmn.cpp:1031
+#: src/olympusmn.cpp:1115
 #, fuzzy
 msgid "Auto-Override"
 msgstr "Écraser"
 
-#: src/olympusmn.cpp:1067
+#: src/olympusmn.cpp:1151
 msgid "Fast"
 msgstr "Rapide"
 
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
-msgstr "3000 Kelvin"
+#: src/olympusmn.cpp:1208
+msgid "3000 Kelvin"
+msgstr "3000 Kelvin"
+
+#: src/olympusmn.cpp:1209
+msgid "3700 Kelvin"
+msgstr "3700 Kelvin"
+
+#: src/olympusmn.cpp:1210
+msgid "4000 Kelvin"
+msgstr "4000 Kelvin"
+
+#: src/olympusmn.cpp:1211
+msgid "4500 Kelvin"
+msgstr "4500 Kelvin"
+
+#: src/olympusmn.cpp:1212
+msgid "5500 Kelvin"
+msgstr "5500 Kelvin"
+
+#: src/olympusmn.cpp:1213
+msgid "6500 Kelvin"
+msgstr "6500 Kelvin"
+
+#: src/olympusmn.cpp:1214
+msgid "7500 Kelvin"
+msgstr "7500 Kelvin"
+
+#: src/olympusmn.cpp:1220
+msgid "One-touch"
+msgstr ""
+
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
+msgstr ""
+
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
+msgstr ""
+
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
+msgstr ""
+
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
+msgstr ""
+
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
+msgstr ""
+
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
+msgstr ""
+
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
+msgstr ""
+
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
+msgstr ""
+
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1386
+#, fuzzy
+msgid "Imager AF"
+msgstr "ID unique de l'image"
+
+#: src/olympusmn.cpp:1387
+#, fuzzy
+msgid "AF sensor"
+msgstr "Point AF utilisé"
+
+#: src/olympusmn.cpp:1433
+#, fuzzy
+msgid "Soft Focus"
+msgstr "Mise au point Spot"
+
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
+msgstr ""
+
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
+msgstr ""
+
+#: src/olympusmn.cpp:1436
+#, fuzzy
+msgid "Light Tone"
+msgstr "Zone droite"
+
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
+msgstr ""
+
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
+msgstr ""
+
+#: src/olympusmn.cpp:1439
+#, fuzzy
+msgid "Diorama"
+msgstr "Panorama"
+
+#: src/olympusmn.cpp:1440
+#, fuzzy
+msgid "Cross Process"
+msgstr "Mode mise au point"
+
+#: src/olympusmn.cpp:1441
+#, fuzzy
+msgid "Fish Eye"
+msgstr "Puissance flash"
+
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
+msgstr ""
+
+#: src/olympusmn.cpp:1489
+#, fuzzy
+msgid "Left (or n/a)"
+msgstr "Zone gauche"
+
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
+#, fuzzy
+msgid "Center (horizontal)"
+msgstr "Zone centrale (orientation horizontale)"
+
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
+#, fuzzy
+msgid "Center (vertical)"
+msgstr "Zone centrale (orientation verticale)"
+
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1504
+#, fuzzy
+msgid "Top-center (horizontal)"
+msgstr "Zone centrale (orientation horizontale)"
+
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1506
+#, fuzzy
+msgid "Left (horizontal)"
+msgstr "Horizontale (normale)"
+
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1510
+#, fuzzy
+msgid "Right (horizontal)"
+msgstr "Horizontale (normale)"
+
+#: src/olympusmn.cpp:1511
+#, fuzzy
+msgid "Bottom-left (horizontal)"
+msgstr "Bas-gauche"
+
+#: src/olympusmn.cpp:1512
+#, fuzzy
+msgid "Bottom-center (horizontal)"
+msgstr "Bas-gauche"
+
+#: src/olympusmn.cpp:1513
+#, fuzzy
+msgid "Bottom-right (horizontal)"
+msgstr "Bas-droit"
+
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1515
+#, fuzzy
+msgid "Top-center (vertical)"
+msgstr "centre"
+
+#: src/olympusmn.cpp:1516
+#, fuzzy
+msgid "Top-right (vertical)"
+msgstr "Haut-droit"
+
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
-msgstr "3700 Kelvin"
+#: src/olympusmn.cpp:1520
+#, fuzzy
+msgid "Mid-right (vertical)"
+msgstr "milieu-droit"
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
-msgstr "4000 Kelvin"
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
-msgstr "4500 Kelvin"
+#: src/olympusmn.cpp:1522
+#, fuzzy
+msgid "Bottom-left (vertical)"
+msgstr "Bas-gauche"
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
-msgstr "5500 Kelvin"
+#: src/olympusmn.cpp:1523
+#, fuzzy
+msgid "Bottom-center (vertical)"
+msgstr "Bas-gauche"
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
-msgstr "6500 Kelvin"
+#: src/olympusmn.cpp:1524
+#, fuzzy
+msgid "Bottom-right (vertical)"
+msgstr "Bas-droit"
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
-msgstr "7500 Kelvin"
+#: src/olympusmn.cpp:1561
+#, fuzzy
+msgid "Single Target"
+msgstr "Zone unique"
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
-msgstr ""
+#: src/olympusmn.cpp:1562
+#, fuzzy
+msgid "All Target"
+msgstr "cible"
+
+#: src/olympusmn.cpp:1563
+#, fuzzy
+msgid "Dynamic Single Target"
+msgstr "Réglage gamme dynamique"
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
 msgid "Very High"
 msgstr "Très haute"
 
-#: src/panasonicmn.cpp:57
+#: src/panasonicmn.cpp:59
 #, fuzzy
 msgid "Motion Picture"
 msgstr "Mode d'image"
 
-#: src/panasonicmn.cpp:65
+#: src/panasonicmn.cpp:67
 msgid "Halogen"
 msgstr "Halogène"
 
-#: src/panasonicmn.cpp:76
+#: src/panasonicmn.cpp:79
+#, fuzzy
 msgid "Auto, focus button"
-msgstr ""
+msgstr "Mise au point auto"
 
-#: src/panasonicmn.cpp:77
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
+#, fuzzy
 msgid "Auto, continuous"
-msgstr ""
-
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
-msgstr ""
-
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
-msgstr ""
+msgstr "Continue"
 
-#: src/panasonicmn.cpp:91
+#: src/panasonicmn.cpp:95
 msgid "Tele-macro"
 msgstr ""
 
-#: src/panasonicmn.cpp:99
+#: src/panasonicmn.cpp:103
+#, fuzzy
 msgid "Scenery"
-msgstr ""
+msgstr "centre"
 
-#: src/panasonicmn.cpp:104
+#: src/panasonicmn.cpp:108
 msgid "Shutter-speed priority"
 msgstr "Priorité vitesse obturation"
 
-#: src/panasonicmn.cpp:108
+#: src/panasonicmn.cpp:112
 #, fuzzy
 msgid "Movie preview"
 msgstr "Écriture au format"
 
-#: src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:113
+#, fuzzy
 msgid "Panning"
-msgstr ""
+msgstr "Avertissement"
 
-#: src/panasonicmn.cpp:110
+#: src/panasonicmn.cpp:114
 #, fuzzy
 msgid "Simple"
 msgstr "Simple"
 
-#: src/panasonicmn.cpp:111
+#: src/panasonicmn.cpp:115
 #, fuzzy
 msgid "Color effects"
 msgstr "Effet de couleurs"
 
-#: src/panasonicmn.cpp:115
+#: src/panasonicmn.cpp:119
 msgid "Night scenery"
 msgstr "Scène de nuit"
 
-#: src/panasonicmn.cpp:117
+#: src/panasonicmn.cpp:121
 #, fuzzy
 msgid "Baby"
 msgstr "de"
 
-#: src/panasonicmn.cpp:118
+#: src/panasonicmn.cpp:122
 #, fuzzy
 msgid "Soft skin"
 msgstr "Doux"
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
 msgid "Candlelight"
 msgstr "Lumière de bougie"
 
-#: src/panasonicmn.cpp:120
+#: src/panasonicmn.cpp:124
 #, fuzzy
 msgid "Starry night"
 msgstr "Lumière standard A"
 
-#: src/panasonicmn.cpp:121
+#: src/panasonicmn.cpp:125
 #, fuzzy
 msgid "High sensitivity"
 msgstr "Sensibilité spectrale"
 
-#: src/panasonicmn.cpp:122
+#: src/panasonicmn.cpp:126
 #, fuzzy
 msgid "Panorama assist"
 msgstr "Panorama"
 
-#: src/panasonicmn.cpp:125
+#: src/panasonicmn.cpp:129
 msgid "Aerial photo"
 msgstr ""
 
-#: src/panasonicmn.cpp:128
+#: src/panasonicmn.cpp:132
 #, fuzzy
 msgid "Intelligent ISO"
 msgstr "Longueur intervalle"
 
-#: src/panasonicmn.cpp:129
+#: src/panasonicmn.cpp:133
 #, fuzzy
 msgid "High speed continuous shooting"
 msgstr "Paramètre de la mise au point continue"
 
-#: src/panasonicmn.cpp:130
+#: src/panasonicmn.cpp:134
+#, fuzzy
 msgid "Intelligent auto"
-msgstr ""
+msgstr "Longueur intervalle"
 
-#: src/panasonicmn.cpp:142
+#: src/panasonicmn.cpp:146
 msgid "Warm"
 msgstr "Chaud"
 
-#: src/panasonicmn.cpp:143
+#: src/panasonicmn.cpp:147
 msgid "Cool"
 msgstr "Froid"
 
-#: src/panasonicmn.cpp:151
+#: src/panasonicmn.cpp:155
 msgid "Low/High quality"
 msgstr "Qualité basse/haute"
 
-#: src/panasonicmn.cpp:152
+#: src/panasonicmn.cpp:156
 msgid "Infinite"
 msgstr "Infini"
 
-#: src/panasonicmn.cpp:160
+#: src/panasonicmn.cpp:164
 #, fuzzy
 msgid "Medium low"
 msgstr "Moyenne 1"
 
-#: src/panasonicmn.cpp:161
+#: src/panasonicmn.cpp:165
 #, fuzzy
 msgid "Medium high"
 msgstr "Moyenne 1"
 
-#: src/panasonicmn.cpp:170
+#: src/panasonicmn.cpp:175
 msgid "Low (-1)"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
+#: src/panasonicmn.cpp:176
 #, fuzzy
 msgid "High (+1)"
 msgstr "Élevée"
 
-#: src/panasonicmn.cpp:172
+#: src/panasonicmn.cpp:177
 msgid "Lowest (-2)"
 msgstr ""
 
-#: src/panasonicmn.cpp:173
+#: src/panasonicmn.cpp:178
+#, fuzzy
 msgid "Highest (+2)"
-msgstr ""
+msgstr "Élevée"
 
-#: src/panasonicmn.cpp:179
+#: src/panasonicmn.cpp:184
 msgid "10s"
 msgstr "10s"
 
-#: src/panasonicmn.cpp:180
+#: src/panasonicmn.cpp:185
 msgid "2s"
 msgstr "2s"
 
-#: src/panasonicmn.cpp:200
+#: src/panasonicmn.cpp:205
 msgid "EX optics"
 msgstr ""
 
-#: src/panasonicmn.cpp:207
+#: src/panasonicmn.cpp:212
 msgid "Telephoto"
 msgstr ""
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
 #, fuzzy
 msgid "Home"
 msgstr "Rome"
 
-#: src/panasonicmn.cpp:219
+#: src/panasonicmn.cpp:225
 #, fuzzy
 msgid "Standard (color)"
 msgstr "Formulaire standard"
 
-#: src/panasonicmn.cpp:220
+#: src/panasonicmn.cpp:226
 #, fuzzy
 msgid "Dynamic (color)"
 msgstr "Zone dynamique"
 
-#: src/panasonicmn.cpp:221
+#: src/panasonicmn.cpp:227
 #, fuzzy
 msgid "Nature (color)"
 msgstr "Couleur naturelle"
 
-#: src/panasonicmn.cpp:222
+#: src/panasonicmn.cpp:228
+#, fuzzy
 msgid "Smooth (color)"
-msgstr ""
+msgstr "Formulaire standard"
 
-#: src/panasonicmn.cpp:223
+#: src/panasonicmn.cpp:229
 #, fuzzy
 msgid "Standard (B&W)"
 msgstr "Standard (100%)"
 
-#: src/panasonicmn.cpp:224
+#: src/panasonicmn.cpp:230
 #, fuzzy
 msgid "Dynamic (B&W)"
 msgstr "Zone dynamique"
 
-#: src/panasonicmn.cpp:225
+#: src/panasonicmn.cpp:231
+#, fuzzy
 msgid "Smooth (B&W)"
-msgstr ""
+msgstr "Standard (100%)"
 
-#: src/panasonicmn.cpp:239
+#: src/panasonicmn.cpp:245
 msgid "Audio"
 msgstr "Audio"
 
-#: src/panasonicmn.cpp:242
+#: src/panasonicmn.cpp:248
 msgid "White balance adjustment"
 msgstr "Ajustement de la balance des blancs"
 
-#: src/panasonicmn.cpp:243
+#: src/panasonicmn.cpp:249
 msgid "FlashBias"
 msgstr "Biais du flash"
 
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
 msgid "Exif version"
 msgstr "Version d'exif"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color Effect"
 msgstr "Effet de couleurs"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color effect"
 msgstr "Effet de couleurs"
 
-#: src/panasonicmn.cpp:248
+#: src/panasonicmn.cpp:254
 msgid ""
 "Time in 1/100 s from when the camera was powered on to when the image is "
 "written to memory card"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst Mode"
 msgstr "Mode rafale"
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst mode"
 msgstr "Mode rafale"
 
-#: src/panasonicmn.cpp:252
+#: src/panasonicmn.cpp:258
 msgid "NoiseReduction"
 msgstr "Réduction de bruit"
 
-#: src/panasonicmn.cpp:253
+#: src/panasonicmn.cpp:259
 msgid "Self Timer"
 msgstr "Retardateur"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+#, fuzzy
 msgid "Baby Age"
-msgstr ""
+msgstr "de"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
 msgid "Baby (or pet) age"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical Zoom Mode"
 msgstr "Mode spécial"
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical zoom mode"
 msgstr "Mode Pellicule"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion Lens"
 msgstr "Version"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion lens"
 msgstr "Valeur de luminosité"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel Day"
 msgstr ""
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel day"
 msgstr ""
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World Time Location"
 msgstr "Lieu précis"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World time location"
 msgstr "Lieu précis"
 
-#: src/panasonicmn.cpp:264
+#: src/panasonicmn.cpp:270
 #, fuzzy
 msgid "Program ISO"
 msgstr "Logiciel"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 #, fuzzy
 msgid "WB Adjust AB"
 msgstr "Ajustement de teinte"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 msgid "WB adjust AB. Positive is a shift toward blue."
 msgstr ""
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 #, fuzzy
 msgid "WB Adjust GM"
 msgstr "Ajustement de teinte"
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 msgid "WBAdjustGM. Positive is a shift toward green."
 msgstr ""
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory Type"
 msgstr "Type d'objectif"
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory type"
 msgstr "Type d'objectif"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote Version"
 msgstr "Version des Notes du fabriquant"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote version"
 msgstr "Version des Notes du fabriquant"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB Red Level"
 msgstr "Niveau de noir"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB red level"
 msgstr "Niveau de noir"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB Green Level"
 msgstr "Niveau de noir"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB green level"
 msgstr "Niveau de noir"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB Blue Level"
 msgstr "Niveau de noir"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB blue level"
 msgstr "Niveau de noir"
 
-#: src/panasonicmn.cpp:282
+#: src/panasonicmn.cpp:288
 msgid "Unknown PanasonicMakerNote tag"
 msgstr "Marqueur de note du fabriquant Panasonic inconnu"
 
-#: src/panasonicmn.cpp:299
+#: src/panasonicmn.cpp:305
 #, fuzzy
 msgid "Spot mode on"
 msgstr "Mode doux 1"
 
-#: src/panasonicmn.cpp:300
+#: src/panasonicmn.cpp:306
 msgid "Spot mode off or 3-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:301
+#: src/panasonicmn.cpp:307
 #, fuzzy
 msgid "Spot focussing"
 msgstr "Mise au point Spot"
 
-#: src/panasonicmn.cpp:302
+#: src/panasonicmn.cpp:308
 msgid "5-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:303
+#: src/panasonicmn.cpp:309
 msgid "1-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:304
+#: src/panasonicmn.cpp:310
 msgid "1-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:305
+#: src/panasonicmn.cpp:311
 msgid "3-area (auto)"
 msgstr ""
 
-#: src/panasonicmn.cpp:306
+#: src/panasonicmn.cpp:312
 msgid "3-area (left)"
 msgstr ""
 
-#: src/panasonicmn.cpp:307
+#: src/panasonicmn.cpp:313
 msgid "3-area (center)"
 msgstr ""
 
-#: src/panasonicmn.cpp:308
+#: src/panasonicmn.cpp:314
 msgid "3-area (right)"
 msgstr ""
 
-#: src/panasonicmn.cpp:320
+#: src/panasonicmn.cpp:326
 msgid " EV"
 msgstr " EV"
 
-#: src/panasonicmn.cpp:329
+#: src/panasonicmn.cpp:335
 #, fuzzy
 msgid "Panasonic raw version"
 msgstr "Version de microcode"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor Width"
 msgstr "Droit d'auteur"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor width"
 msgstr "Droit d'auteur"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor Height"
 msgstr "Nettoyage capteur"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor height"
 msgstr "Nettoyage capteur"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor Top Border"
 msgstr "Température de la sonde"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor top border"
 msgstr "Température de la sonde"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor Left Border"
 msgstr "Température de la sonde"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor left border"
 msgstr "Température de la sonde"
 
-#: src/panasonicmn.cpp:336
+#: src/panasonicmn.cpp:342
 msgid "Red balance (found in Digilux 2 RAW images)"
 msgstr ""
 
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview Image"
-msgstr "Aperçu embarqué"
-
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview image"
-msgstr "Aperçu embarqué"
-
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
 msgid "Manufacturer"
 msgstr "Constructeur"
 
-#: src/panasonicmn.cpp:343
+#: src/panasonicmn.cpp:349
 msgid "The manufacturer of the recording equipment"
 msgstr ""
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
 msgid "Model"
 msgstr "Modèle"
 
-#: src/panasonicmn.cpp:344
+#: src/panasonicmn.cpp:350
+#, fuzzy
 msgid "The model name or model number of the equipment"
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
+#, fuzzy
 msgid "Strip Offsets"
-msgstr ""
+msgstr "Décalage aperçu"
 
-#: src/panasonicmn.cpp:345
+#: src/panasonicmn.cpp:351
 #, fuzzy
 msgid "Strip offsets"
 msgstr "Décalage aperçu"
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
 msgid "Orientation"
 msgstr "Orientation"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 msgid "Rows Per Strip"
 msgstr ""
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 #, fuzzy
 msgid "The number of rows per strip"
 msgstr "Le nombre F."
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip Byte Counts"
 msgstr "Priorité obturation"
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip byte counts"
 msgstr "Priorité obturation"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw Data Offset"
 msgstr "Décalage IFD"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw data offset"
 msgstr "En-tête, décalage"
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
 msgid "Exif IFD Pointer"
 msgstr "Pointeur IFD Exif"
 
-#: src/panasonicmn.cpp:350
+#: src/panasonicmn.cpp:356
 msgid "A pointer to the Exif IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
 msgid "GPS Info IFD Pointer"
 msgstr "Pointeur IFD information GPS"
 
-#: src/panasonicmn.cpp:351
+#: src/panasonicmn.cpp:357
 msgid "A pointer to the GPS Info IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:353
+#: src/panasonicmn.cpp:359
 #, fuzzy
 msgid "Unknown PanasonicRaw tag"
 msgstr "Marqueur de note du fabriquant Panasonic inconnu"
 
-#: src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:57
 msgid "Night-Scene"
 msgstr "Scène de nuit"
 
-#: src/pentaxmn.cpp:62
+#: src/pentaxmn.cpp:63
+#, fuzzy
 msgid "Optio 330/430"
-msgstr ""
+msgstr "Оption"
 
-#: src/pentaxmn.cpp:63
+#: src/pentaxmn.cpp:64
+#, fuzzy
 msgid "Optio 230"
-msgstr ""
+msgstr "Оption"
 
-#: src/pentaxmn.cpp:64
+#: src/pentaxmn.cpp:65
+#, fuzzy
 msgid "Optio 330GS"
-msgstr ""
+msgstr "Оption"
 
-#: src/pentaxmn.cpp:65
+#: src/pentaxmn.cpp:66
+#, fuzzy
 msgid "Optio 450/550"
-msgstr ""
+msgstr "Оption"
 
-#: src/pentaxmn.cpp:66
+#: src/pentaxmn.cpp:67
 #, fuzzy
 msgid "Optio S"
 msgstr "Оption"
 
-#: src/pentaxmn.cpp:67
+#: src/pentaxmn.cpp:68
 msgid "*ist D"
 msgstr ""
 
-#: src/pentaxmn.cpp:68
+#: src/pentaxmn.cpp:69
 #, fuzzy
 msgid "Optio 33L"
 msgstr "Оption"
 
-#: src/pentaxmn.cpp:69
+#: src/pentaxmn.cpp:70
 #, fuzzy
 msgid "Optio 33LF"
 msgstr "Оption"
 
-#: src/pentaxmn.cpp:70
-msgid "Optio 33WR/43WR/555"
-msgstr ""
-
 #: src/pentaxmn.cpp:71
-msgid "Optio S4"
+msgid "Optio 33WR/43WR/555"
 msgstr ""
 
 #: src/pentaxmn.cpp:72
-msgid "Optio MX"
-msgstr ""
+#, fuzzy
+msgid "Optio S4"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:73
-msgid "Optio S40"
-msgstr ""
+#, fuzzy
+msgid "Optio MX"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:74
-msgid "Optio S4i"
-msgstr ""
+#, fuzzy
+msgid "Optio S40"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:75
-msgid "Optio 30"
-msgstr ""
+#, fuzzy
+msgid "Optio S4i"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:76
-msgid "Optio S30"
-msgstr ""
+#, fuzzy
+msgid "Optio 30"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:77
-msgid "Optio 750Z"
-msgstr ""
+#, fuzzy
+msgid "Optio S30"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:78
-msgid "Optio SV"
-msgstr ""
+#, fuzzy
+msgid "Optio 750Z"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:79
-msgid "Optio SVi"
-msgstr ""
+#, fuzzy
+msgid "Optio SV"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:80
-msgid "Optio X"
-msgstr ""
+#, fuzzy
+msgid "Optio SVi"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:81
-msgid "Optio S5i"
-msgstr ""
+#, fuzzy
+msgid "Optio X"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:82
-msgid "Optio S50"
-msgstr ""
+#, fuzzy
+msgid "Optio S5i"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:83
-msgid "*ist DS"
-msgstr ""
+#, fuzzy
+msgid "Optio S50"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:84
-msgid "Optio MX4"
+msgid "*ist DS"
 msgstr ""
 
 #: src/pentaxmn.cpp:85
-msgid "Optio S5n"
-msgstr ""
+#, fuzzy
+msgid "Optio MX4"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:86
-msgid "Optio WP"
-msgstr ""
+#, fuzzy
+msgid "Optio S5n"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:87
-msgid "Optio S55"
-msgstr ""
+#, fuzzy
+msgid "Optio WP"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:88
-msgid "Optio S5z"
-msgstr ""
+#, fuzzy
+msgid "Optio S55"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:89
-msgid "*ist DL"
-msgstr ""
+#, fuzzy
+msgid "Optio S5z"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:90
-msgid "Optio S60"
+msgid "*ist DL"
 msgstr ""
 
 #: src/pentaxmn.cpp:91
-msgid "Optio S45"
-msgstr ""
+#, fuzzy
+msgid "Optio S60"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:92
-msgid "Optio S6"
-msgstr ""
+#, fuzzy
+msgid "Optio S45"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:93
-msgid "Optio WPi"
-msgstr ""
+#, fuzzy
+msgid "Optio S6"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:94
-msgid "BenQ DC X600"
-msgstr ""
+#, fuzzy
+msgid "Optio WPi"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:95
-msgid "*ist DS2"
+msgid "BenQ DC X600"
 msgstr ""
 
 #: src/pentaxmn.cpp:96
-msgid "Samsung GX-1S"
+msgid "*ist DS2"
 msgstr ""
 
 #: src/pentaxmn.cpp:97
-msgid "Optio A10"
+msgid "Samsung GX-1S"
 msgstr ""
 
 #: src/pentaxmn.cpp:98
-msgid "*ist DL2"
-msgstr ""
+#, fuzzy
+msgid "Optio A10"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:99
-msgid "Samsung GX-1L"
+msgid "*ist DL2"
 msgstr ""
 
 #: src/pentaxmn.cpp:100
-msgid "K100D"
+msgid "Samsung GX-1L"
 msgstr ""
 
 #: src/pentaxmn.cpp:101
-msgid "K110D"
+msgid "K100D"
 msgstr ""
 
 #: src/pentaxmn.cpp:102
-msgid "K100D Super"
+msgid "K110D"
 msgstr ""
 
 #: src/pentaxmn.cpp:103
-msgid "Optio T10"
+msgid "K100D Super"
 msgstr ""
 
 #: src/pentaxmn.cpp:104
-msgid "Optio W10"
-msgstr ""
+#, fuzzy
+msgid "Optio T10/T20"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:105
-msgid "Optio M10"
-msgstr ""
+#, fuzzy
+msgid "Optio W10"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:106
-msgid "K10D"
-msgstr ""
+#, fuzzy
+msgid "Optio M10"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:107
-msgid "Samsung GX10"
+msgid "K10D"
 msgstr ""
 
 #: src/pentaxmn.cpp:108
-msgid "Optio S7"
+msgid "Samsung GX10"
 msgstr ""
 
 #: src/pentaxmn.cpp:109
-msgid "Optio M20"
-msgstr ""
+#, fuzzy
+msgid "Optio S7"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:110
-msgid "Optio W20"
-msgstr ""
+#, fuzzy
+msgid "Optio L20"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:111
-msgid "Optio A20"
-msgstr ""
+#, fuzzy
+msgid "Optio M20"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:112
-msgid "Optio M30"
-msgstr ""
+#, fuzzy
+msgid "Optio W20"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:113
-msgid "Optio E30"
-msgstr ""
+#, fuzzy
+msgid "Optio A20"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:114
-msgid "Optio T30"
-msgstr ""
+#, fuzzy
+msgid "Optio M30"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:115
-msgid "Optio W30"
-msgstr ""
+#, fuzzy
+msgid "Optio E30"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:116
-msgid "Optio A30"
-msgstr ""
+#, fuzzy
+msgid "Optio E35"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:117
-msgid "Optio E40"
-msgstr ""
+#, fuzzy
+msgid "Optio T30"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:118
-msgid "Optio M40"
-msgstr ""
+#, fuzzy
+msgid "Optio W30"
+msgstr "Оption"
 
 #: src/pentaxmn.cpp:119
+#, fuzzy
+msgid "Optio A30"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:120
+#, fuzzy
+msgid "Optio E40"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:121
+#, fuzzy
+msgid "Optio M40"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:122
+#, fuzzy
 msgid "Optio Z10"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:123
+msgid "K20D"
 msgstr ""
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
-msgid "Optio S10"
+#: src/pentaxmn.cpp:124
+msgid "Samsung GX20"
 msgstr ""
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
+#: src/pentaxmn.cpp:125
+#, fuzzy
+msgid "Optio S10"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:126
+#, fuzzy
 msgid "Optio A40"
-msgstr ""
+msgstr "Оption"
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
+#: src/pentaxmn.cpp:127
+#, fuzzy
 msgid "Optio V10"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:128
+msgid "K200D"
 msgstr ""
 
-#: src/pentaxmn.cpp:123
-msgid "K20D"
+#: src/pentaxmn.cpp:129
+#, fuzzy
+msgid "Optio S12"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:130
+#, fuzzy
+msgid "Optio E50"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:131
+#, fuzzy
+msgid "Optio M50"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:132
+#, fuzzy
+msgid "Optio V20"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:133
+#, fuzzy
+msgid "Optio W60"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:134
+#, fuzzy
+msgid "Optio M60"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:135
+#, fuzzy
+msgid "Optio E60"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:136
+msgid "K2000"
 msgstr ""
 
-#: src/pentaxmn.cpp:127
-msgid "K200D"
+#: src/pentaxmn.cpp:137
+msgid "K-m"
 msgstr ""
 
-#: src/pentaxmn.cpp:128
-msgid "Optio E50"
+#: src/pentaxmn.cpp:138
+#, fuzzy
+msgid "Optio P70"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:139
+#, fuzzy
+msgid "Optio E70"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:140
+msgid "X70"
 msgstr ""
 
-#: src/pentaxmn.cpp:129
-msgid "Optio M50"
+#: src/pentaxmn.cpp:141
+msgid "K-7"
 msgstr ""
 
-#: src/pentaxmn.cpp:134
+#: src/pentaxmn.cpp:142
+#, fuzzy
+msgid "Optio W80"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:143
+#, fuzzy
+msgid "Optio P80"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:144
+#, fuzzy
+msgid "Optio WS80"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:145
+msgid "K-x"
+msgstr ""
+
+#: src/pentaxmn.cpp:146
+msgid "645D"
+msgstr ""
+
+#: src/pentaxmn.cpp:147
+#, fuzzy
+msgid "Optio I-10"
+msgstr "Оption"
+
+#: src/pentaxmn.cpp:152
 msgid "Good"
 msgstr "Bien"
 
-#: src/pentaxmn.cpp:135
+#: src/pentaxmn.cpp:153
 msgid "Better"
 msgstr "Mieux"
 
-#: src/pentaxmn.cpp:136
+#: src/pentaxmn.cpp:154
 msgid "Best"
 msgstr "Meilleur"
 
-#: src/pentaxmn.cpp:137
+#: src/pentaxmn.cpp:155
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/pentaxmn.cpp:139
+#: src/pentaxmn.cpp:157
 msgid "Premium"
 msgstr "Premium"
 
-#: src/pentaxmn.cpp:144
+#: src/pentaxmn.cpp:162
 msgid "640x480"
 msgstr "640x480"
 
-#: src/pentaxmn.cpp:145
-msgid "Full"
-msgstr "Plein"
-
-#: src/pentaxmn.cpp:146
+#: src/pentaxmn.cpp:164
 msgid "1024x768"
 msgstr "1024x768"
 
-#: src/pentaxmn.cpp:147
+#: src/pentaxmn.cpp:165
 msgid "1280x960"
 msgstr "1280x960"
 
-#: src/pentaxmn.cpp:148
+#: src/pentaxmn.cpp:166
 msgid "1600x1200"
 msgstr "1600x1200"
 
-#: src/pentaxmn.cpp:149
+#: src/pentaxmn.cpp:167
 msgid "2048x1536"
 msgstr "2048x1536"
 
-#: src/pentaxmn.cpp:150
+#: src/pentaxmn.cpp:168
 msgid "2560x1920 or 2304x1728"
 msgstr "2560x1920 ou 2304x1728"
 
-#: src/pentaxmn.cpp:151
+#: src/pentaxmn.cpp:169
 msgid "3072x2304"
 msgstr "3072x2304"
 
-#: src/pentaxmn.cpp:152
+#: src/pentaxmn.cpp:170
 msgid "3264x2448"
 msgstr "3264x2448"
 
-#: src/pentaxmn.cpp:153
+#: src/pentaxmn.cpp:171
 msgid "320x240"
 msgstr "320x240"
 
-#: src/pentaxmn.cpp:154
+#: src/pentaxmn.cpp:172
 msgid "2288x1712"
 msgstr "2288x1712"
 
-#: src/pentaxmn.cpp:155
+#: src/pentaxmn.cpp:173
 msgid "2592x1944"
 msgstr "2592x1944"
 
-#: src/pentaxmn.cpp:156
+#: src/pentaxmn.cpp:174
 msgid "2304x1728 or 2592x1944"
 msgstr "2304x1728 ou 2592x1944"
 
-#: src/pentaxmn.cpp:157
+#: src/pentaxmn.cpp:175
 msgid "3056x2296"
 msgstr "3056x2296"
 
-#: src/pentaxmn.cpp:158
+#: src/pentaxmn.cpp:176
 msgid "2816x2212 or 2816x2112"
 msgstr "2816x2212 ou 2816x2112"
 
-#: src/pentaxmn.cpp:159
+#: src/pentaxmn.cpp:177
 msgid "3648x2736"
 msgstr "3648x2736"
 
-#: src/pentaxmn.cpp:164
+#: src/pentaxmn.cpp:182
 msgid "Auto, Did not fire"
 msgstr "Flash auto, non déclenché"
 
-#: src/pentaxmn.cpp:166
+#: src/pentaxmn.cpp:184
 msgid "Auto, Did not fire, Red-eye reduction"
 msgstr "Flash auto non déclenché, mode anti-yeux rouges"
 
-#: src/pentaxmn.cpp:167
+#: src/pentaxmn.cpp:185
 msgid "Auto, Fired"
 msgstr "Flash automatique, déclenché"
 
-#: src/pentaxmn.cpp:169
+#: src/pentaxmn.cpp:187
 msgid "Auto, Fired, Red-eye reduction"
 msgstr "Flash auto déclenché, mode anti-yeux rouges"
 
-#: src/pentaxmn.cpp:170
+#: src/pentaxmn.cpp:188
 msgid "On, Red-eye reduction"
 msgstr "Activé, Mode anti-yeux rouges"
 
-#: src/pentaxmn.cpp:171
+#: src/pentaxmn.cpp:189
 msgid "On, Wireless"
 msgstr "Activé, Sans fil"
 
-#: src/pentaxmn.cpp:172
+#: src/pentaxmn.cpp:190
 msgid "On, Soft"
 msgstr "Activé, Doux"
 
-#: src/pentaxmn.cpp:173
+#: src/pentaxmn.cpp:191
 msgid "On, Slow-sync"
 msgstr "Activé, Synchro lente"
 
-#: src/pentaxmn.cpp:174
+#: src/pentaxmn.cpp:192
 msgid "On, Slow-sync, Red-eye reduction"
 msgstr "Flash déclenché, synchro lente, mode anti-yeux rouges"
 
-#: src/pentaxmn.cpp:175
+#: src/pentaxmn.cpp:193
 msgid "On, Trailing-curtain Sync"
 msgstr ""
 
-#: src/pentaxmn.cpp:184
+#: src/pentaxmn.cpp:203
+#, fuzzy
 msgid "Pan Focus"
-msgstr ""
+msgstr "Continue"
 
-#: src/pentaxmn.cpp:185
+#: src/pentaxmn.cpp:204
 msgid "AF-S"
 msgstr ""
 
-#: src/pentaxmn.cpp:186
+#: src/pentaxmn.cpp:205
 msgid "AF-C"
 msgstr ""
 
-#: src/pentaxmn.cpp:192
+#: src/pentaxmn.cpp:206
+msgid "AF-A"
+msgstr ""
+
+#: src/pentaxmn.cpp:212
+#, fuzzy
 msgid "Fixed Center"
+msgstr "Centre"
+
+#: src/pentaxmn.cpp:213
+#, fuzzy
+msgid "Automatic Tracking AF"
+msgstr "AF automatique"
+
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
 msgstr ""
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
-msgid "50"
+#: src/pentaxmn.cpp:231
+msgid "Fixed Center or multiple"
 msgstr ""
 
-#: src/pentaxmn.cpp:209
+#: src/pentaxmn.cpp:233
+#, fuzzy
+msgid "Top-center"
+msgstr "centre"
+
+#: src/pentaxmn.cpp:239
+#, fuzzy
+msgid "Bottom-center"
+msgstr "Bas-gauche"
+
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
+#, fuzzy
+msgid "50"
+msgstr "D55"
+
+#: src/pentaxmn.cpp:246
 msgid "64"
 msgstr ""
 
-#: src/pentaxmn.cpp:210
+#: src/pentaxmn.cpp:247
 msgid "80"
 msgstr ""
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
+#, fuzzy
 msgid "100"
-msgstr ""
+msgstr "10s"
 
-#: src/pentaxmn.cpp:212
+#: src/pentaxmn.cpp:249
 msgid "125"
 msgstr ""
 
-#: src/pentaxmn.cpp:213
+#: src/pentaxmn.cpp:250
+#, fuzzy
 msgid "160"
-msgstr ""
+msgstr "10s"
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
+#, fuzzy
 msgid "200"
-msgstr ""
+msgstr "320x240"
 
-#: src/pentaxmn.cpp:215
+#: src/pentaxmn.cpp:252
+#, fuzzy
 msgid "250"
-msgstr ""
+msgstr "D55"
 
-#: src/pentaxmn.cpp:216
+#: src/pentaxmn.cpp:253
+#, fuzzy
 msgid "320"
-msgstr ""
+msgstr "320x240"
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
+#, fuzzy
 msgid "400"
-msgstr ""
+msgstr "640x480"
 
-#: src/pentaxmn.cpp:218
+#: src/pentaxmn.cpp:255
+#, fuzzy
 msgid "500"
-msgstr ""
+msgstr "D55"
 
-#: src/pentaxmn.cpp:219
+#: src/pentaxmn.cpp:256
+#, fuzzy
 msgid "640"
-msgstr ""
+msgstr "640x480"
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
 msgid "800"
 msgstr ""
 
-#: src/pentaxmn.cpp:221
+#: src/pentaxmn.cpp:258
+#, fuzzy
 msgid "1000"
-msgstr ""
+msgstr "1600x1200"
 
-#: src/pentaxmn.cpp:222
+#: src/pentaxmn.cpp:259
 msgid "1250"
 msgstr ""
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
+#, fuzzy
 msgid "1600"
+msgstr "1600x1200"
+
+#: src/pentaxmn.cpp:261
+msgid "2000"
 msgstr ""
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
+#: src/pentaxmn.cpp:262
+msgid "2500"
+msgstr ""
+
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
+#, fuzzy
 msgid "3200"
+msgstr "320x240"
+
+#: src/pentaxmn.cpp:264
+msgid "4000"
 msgstr ""
 
-#: src/pentaxmn.cpp:249
+#: src/pentaxmn.cpp:265
+msgid "5000"
+msgstr ""
+
+#: src/pentaxmn.cpp:266
+#, fuzzy
+msgid "6400"
+msgstr "640x480"
+
+#: src/pentaxmn.cpp:276
+msgid "70"
+msgstr ""
+
+#: src/pentaxmn.cpp:278
+#, fuzzy
+msgid "140"
+msgstr "10s"
+
+#: src/pentaxmn.cpp:280
+msgid "280"
+msgstr ""
+
+#: src/pentaxmn.cpp:282
+#, fuzzy
+msgid "560"
+msgstr "D55"
+
+#: src/pentaxmn.cpp:284
+#, fuzzy
+msgid "1100"
+msgstr "1600x1200"
+
+#: src/pentaxmn.cpp:286
+msgid "2200"
+msgstr ""
+
+#: src/pentaxmn.cpp:304
 msgid "Multi Segment"
 msgstr "Multi-segments"
 
-#: src/pentaxmn.cpp:250
+#: src/pentaxmn.cpp:305
 msgid "Center Weighted"
 msgstr "Centre pondéré"
 
-#: src/pentaxmn.cpp:262
+#: src/pentaxmn.cpp:317
 msgid "DaylightFluorescent"
 msgstr "Lumière du jour fluorescent"
 
-#: src/pentaxmn.cpp:263
+#: src/pentaxmn.cpp:318
 msgid "DaywhiteFluorescent"
 msgstr "Lumière du jour fluorescent"
 
-#: src/pentaxmn.cpp:264
+#: src/pentaxmn.cpp:319
 #, fuzzy
 msgid "WhiteFluorescent"
 msgstr "Fluorescent"
 
-#: src/pentaxmn.cpp:268
+#: src/pentaxmn.cpp:324
 msgid "User Selected"
 msgstr "Sélection utilisateur"
 
-#: src/pentaxmn.cpp:273
+#: src/pentaxmn.cpp:329
 msgid "Auto (Daylight)"
 msgstr "Auto (lumière du jour)"
 
-#: src/pentaxmn.cpp:274
+#: src/pentaxmn.cpp:330
+#, fuzzy
 msgid "Auto (Shade)"
-msgstr ""
+msgstr "Ombragé"
 
-#: src/pentaxmn.cpp:275
+#: src/pentaxmn.cpp:331
 msgid "Auto (Flash)"
 msgstr "Auto (Flash)"
 
-#: src/pentaxmn.cpp:276
+#: src/pentaxmn.cpp:332
 msgid "Auto (Tungsten)"
 msgstr "Auto (Tungstène)"
 
-#: src/pentaxmn.cpp:277
+#: src/pentaxmn.cpp:333
 msgid "Auto (DaywhiteFluorescent)"
 msgstr "Auto (lumière du jour fluorescent)"
 
-#: src/pentaxmn.cpp:278
+#: src/pentaxmn.cpp:334
 msgid "Auto (WhiteFluorescent)"
 msgstr "Auto (lumière fluorescente)"
 
-#: src/pentaxmn.cpp:279
+#: src/pentaxmn.cpp:335
 msgid "Auto (Cloudy)"
 msgstr "Auto (Nuageux)"
 
-#: src/pentaxmn.cpp:281
+#: src/pentaxmn.cpp:337
 msgid "Preset (Fireworks?)"
 msgstr "Programme (Feux d'artifices)"
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
 msgid "Med Low"
 msgstr "Plutôt faible"
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
 msgid "Med High"
 msgstr "Plutôt élevé"
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-msgid "Very Low"
-msgstr "Très faible"
-
-#: src/pentaxmn.cpp:311
+#: src/pentaxmn.cpp:369
 msgid "Med Soft"
 msgstr "Plutôt doux"
 
-#: src/pentaxmn.cpp:312
+#: src/pentaxmn.cpp:370
 msgid "Med Hard"
 msgstr "Plutôt dur"
 
-#: src/pentaxmn.cpp:313
+#: src/pentaxmn.cpp:371
 msgid "Very Soft"
 msgstr "Très doux"
 
-#: src/pentaxmn.cpp:314
+#: src/pentaxmn.cpp:372
 msgid "Very Hard"
 msgstr "Très dur"
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
 msgid "Home town"
 msgstr "Maison"
 
-#: src/pentaxmn.cpp:325
+#: src/pentaxmn.cpp:383
 msgid "Pago Pago"
 msgstr "Pago Pago"
 
-#: src/pentaxmn.cpp:326
+#: src/pentaxmn.cpp:384
 msgid "Honolulu"
 msgstr "Honolulu"
 
-#: src/pentaxmn.cpp:327
+#: src/pentaxmn.cpp:385
 msgid "Anchorage"
 msgstr "Anchorage"
 
-#: src/pentaxmn.cpp:328
+#: src/pentaxmn.cpp:386
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: src/pentaxmn.cpp:329
+#: src/pentaxmn.cpp:387
 msgid "San Fransisco"
 msgstr "San Fransisco"
 
-#: src/pentaxmn.cpp:330
+#: src/pentaxmn.cpp:388
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: src/pentaxmn.cpp:331
+#: src/pentaxmn.cpp:389
 msgid "Calgary"
 msgstr "Calgary"
 
-#: src/pentaxmn.cpp:332
+#: src/pentaxmn.cpp:390
 msgid "Denver"
 msgstr "Denver"
 
-#: src/pentaxmn.cpp:333
+#: src/pentaxmn.cpp:391
 msgid "Mexico City"
 msgstr "Mexico Ville"
 
-#: src/pentaxmn.cpp:334
+#: src/pentaxmn.cpp:392
 msgid "Chicago"
 msgstr "Chicago"
 
-#: src/pentaxmn.cpp:335
+#: src/pentaxmn.cpp:393
 msgid "Miami"
 msgstr "Miami"
 
-#: src/pentaxmn.cpp:336
+#: src/pentaxmn.cpp:394
 msgid "Toronto"
 msgstr "Toronto"
 
-#: src/pentaxmn.cpp:337
+#: src/pentaxmn.cpp:395
 msgid "New York"
 msgstr "New York"
 
-#: src/pentaxmn.cpp:338
+#: src/pentaxmn.cpp:396
 msgid "Santiago"
 msgstr "Santiago"
 
-#: src/pentaxmn.cpp:339
+#: src/pentaxmn.cpp:397
 msgid "Caracus"
 msgstr "Caracas"
 
-#: src/pentaxmn.cpp:340
+#: src/pentaxmn.cpp:398
 msgid "Halifax"
 msgstr "Halifax"
 
-#: src/pentaxmn.cpp:341
+#: src/pentaxmn.cpp:399
 msgid "Buenos Aires"
 msgstr "Buenos Aires"
 
-#: src/pentaxmn.cpp:342
+#: src/pentaxmn.cpp:400
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: src/pentaxmn.cpp:343
+#: src/pentaxmn.cpp:401
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
-#: src/pentaxmn.cpp:344
+#: src/pentaxmn.cpp:402
 msgid "Madrid"
 msgstr "Madrid"
 
-#: src/pentaxmn.cpp:345
+#: src/pentaxmn.cpp:403
 msgid "London"
 msgstr "Londres"
 
-#: src/pentaxmn.cpp:346
+#: src/pentaxmn.cpp:404
 msgid "Paris"
 msgstr "Paris"
 
-#: src/pentaxmn.cpp:347
+#: src/pentaxmn.cpp:405
 msgid "Milan"
 msgstr "Milan"
 
-#: src/pentaxmn.cpp:348
+#: src/pentaxmn.cpp:406
 msgid "Rome"
 msgstr "Rome"
 
-#: src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:407
 msgid "Berlin"
 msgstr "Berlin"
 
-#: src/pentaxmn.cpp:350
+#: src/pentaxmn.cpp:408
 msgid "Johannesburg"
 msgstr "Johannesburg"
 
-#: src/pentaxmn.cpp:351
+#: src/pentaxmn.cpp:409
 msgid "Istanbul"
 msgstr "Istanbul"
 
-#: src/pentaxmn.cpp:352
+#: src/pentaxmn.cpp:410
 msgid "Cairo"
 msgstr "Le Caire"
 
-#: src/pentaxmn.cpp:353
+#: src/pentaxmn.cpp:411
 msgid "Jerusalem"
 msgstr "Jérusalem"
 
-#: src/pentaxmn.cpp:354
+#: src/pentaxmn.cpp:412
 msgid "Moscow"
 msgstr "Moscou"
 
-#: src/pentaxmn.cpp:355
+#: src/pentaxmn.cpp:413
 msgid "Jeddah"
 msgstr "Jeddah"
 
-#: src/pentaxmn.cpp:356
+#: src/pentaxmn.cpp:414
 msgid "Tehran"
 msgstr "Téhéran"
 
-#: src/pentaxmn.cpp:357
+#: src/pentaxmn.cpp:415
 msgid "Dubai"
 msgstr "Dubaï"
 
-#: src/pentaxmn.cpp:358
+#: src/pentaxmn.cpp:416
 msgid "Karachi"
 msgstr "Karachi"
 
-#: src/pentaxmn.cpp:359
+#: src/pentaxmn.cpp:417
 msgid "Kabul"
 msgstr "Kaboul"
 
-#: src/pentaxmn.cpp:360
+#: src/pentaxmn.cpp:418
 msgid "Male"
 msgstr "Male"
 
-#: src/pentaxmn.cpp:361
+#: src/pentaxmn.cpp:419
 msgid "Delhi"
 msgstr "Delhi"
 
-#: src/pentaxmn.cpp:362
+#: src/pentaxmn.cpp:420
 msgid "Colombo"
 msgstr "Colombo"
 
-#: src/pentaxmn.cpp:363
+#: src/pentaxmn.cpp:421
 msgid "Kathmandu"
 msgstr "Kathmandu"
 
-#: src/pentaxmn.cpp:364
+#: src/pentaxmn.cpp:422
+#, fuzzy
 msgid "Dacca"
-msgstr ""
+msgstr "Dackar"
 
-#: src/pentaxmn.cpp:365
+#: src/pentaxmn.cpp:423
+#, fuzzy
 msgid "Yangon"
-msgstr ""
+msgstr "Bangkok"
 
-#: src/pentaxmn.cpp:366
+#: src/pentaxmn.cpp:424
 msgid "Bangkok"
 msgstr "Bangkok"
 
-#: src/pentaxmn.cpp:367
+#: src/pentaxmn.cpp:425
 msgid "Kuala Lumpur"
 msgstr "Kuala Lumpur"
 
-#: src/pentaxmn.cpp:368
+#: src/pentaxmn.cpp:426
+#, fuzzy
 msgid "Vientiane"
-msgstr ""
+msgstr "Orientation"
 
-#: src/pentaxmn.cpp:369
+#: src/pentaxmn.cpp:427
 msgid "Singapore"
 msgstr "Singapour"
 
-#: src/pentaxmn.cpp:370
+#: src/pentaxmn.cpp:428
 msgid "Phnom Penh"
 msgstr "Phnom Penh"
 
-#: src/pentaxmn.cpp:371
+#: src/pentaxmn.cpp:429
 msgid "Ho Chi Minh"
 msgstr "Ho Chi Minh"
 
-#: src/pentaxmn.cpp:372
+#: src/pentaxmn.cpp:430
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: src/pentaxmn.cpp:373
+#: src/pentaxmn.cpp:431
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: src/pentaxmn.cpp:374
+#: src/pentaxmn.cpp:432
+#, fuzzy
 msgid "Perth"
-msgstr ""
+msgstr "Animaux"
 
-#: src/pentaxmn.cpp:375
+#: src/pentaxmn.cpp:433
 msgid "Beijing"
 msgstr "Pékin"
 
-#: src/pentaxmn.cpp:376
+#: src/pentaxmn.cpp:434
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: src/pentaxmn.cpp:377
+#: src/pentaxmn.cpp:435
 msgid "Manila"
 msgstr "Manille"
 
-#: src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:436
 msgid "Taipei"
 msgstr "Taipei"
 
-#: src/pentaxmn.cpp:379
+#: src/pentaxmn.cpp:437
 msgid "Seoul"
 msgstr "Séoul"
 
-#: src/pentaxmn.cpp:380
+#: src/pentaxmn.cpp:438
 msgid "Adelaide"
 msgstr "Adélaïde"
 
-#: src/pentaxmn.cpp:381
+#: src/pentaxmn.cpp:439
 msgid "Tokyo"
 msgstr "Tokyo"
 
-#: src/pentaxmn.cpp:382
+#: src/pentaxmn.cpp:440
 msgid "Guam"
 msgstr ""
 
-#: src/pentaxmn.cpp:383
+#: src/pentaxmn.cpp:441
 msgid "Sydney"
 msgstr "Sydney"
 
-#: src/pentaxmn.cpp:384
+#: src/pentaxmn.cpp:442
 msgid "Noumea"
 msgstr "Nouméa"
 
-#: src/pentaxmn.cpp:385
+#: src/pentaxmn.cpp:443
 msgid "Wellington"
 msgstr "Wellington"
 
-#: src/pentaxmn.cpp:386
+#: src/pentaxmn.cpp:444
 msgid "Auckland"
 msgstr "Auckland"
 
-#: src/pentaxmn.cpp:387
+#: src/pentaxmn.cpp:445
 msgid "Lima"
 msgstr "Lima"
 
-#: src/pentaxmn.cpp:388
+#: src/pentaxmn.cpp:446
 msgid "Dakar"
 msgstr "Dackar"
 
-#: src/pentaxmn.cpp:389
+#: src/pentaxmn.cpp:447
 msgid "Algiers"
 msgstr "Alger"
 
-#: src/pentaxmn.cpp:390
+#: src/pentaxmn.cpp:448
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: src/pentaxmn.cpp:391
+#: src/pentaxmn.cpp:449
 msgid "Athens"
 msgstr "Athène"
 
-#: src/pentaxmn.cpp:392
+#: src/pentaxmn.cpp:450
 msgid "Nairobi"
 msgstr "Nairobi"
 
-#: src/pentaxmn.cpp:393
+#: src/pentaxmn.cpp:451
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
-#: src/pentaxmn.cpp:394
+#: src/pentaxmn.cpp:452
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: src/pentaxmn.cpp:395
+#: src/pentaxmn.cpp:453
 msgid "Lisbon"
 msgstr "Lisbonne"
 
-#: src/pentaxmn.cpp:400
+#: src/pentaxmn.cpp:454
+#, fuzzy
+msgid "Copenhagen"
+msgstr "Moyenne"
+
+#: src/pentaxmn.cpp:459
 msgid "Unprocessed"
 msgstr "Non traité"
 
-#: src/pentaxmn.cpp:401
+#: src/pentaxmn.cpp:460
 msgid "Digital Filter"
 msgstr "Filtre digital"
 
-#: src/pentaxmn.cpp:402
+#: src/pentaxmn.cpp:461
 msgid "Cropped"
 msgstr "Rogné"
 
-#: src/pentaxmn.cpp:404
+#: src/pentaxmn.cpp:463
 msgid "Frame Synthesis?"
 msgstr ""
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
+#, fuzzy
 msgid "MTF Program"
-msgstr ""
+msgstr "Logiciel"
 
-#: src/pentaxmn.cpp:416
+#: src/pentaxmn.cpp:475
 msgid "Night Scene Portrait"
 msgstr "Portrait de nuit"
 
-#: src/pentaxmn.cpp:417
+#: src/pentaxmn.cpp:476
 msgid "No Flash"
 msgstr "Pas de flash"
 
-#: src/pentaxmn.cpp:420
+#: src/pentaxmn.cpp:479
 msgid "Surf & Snow"
 msgstr "Surf et Neige"
 
-#: src/pentaxmn.cpp:423
+#: src/pentaxmn.cpp:482
 msgid "Kids"
 msgstr "Enfants"
 
-#: src/pentaxmn.cpp:428
+#: src/pentaxmn.cpp:487
+#, fuzzy
+msgid "Stage Lighting"
+msgstr "Hauteur de l'image"
+
+#: src/pentaxmn.cpp:488
+#, fuzzy
+msgid "Night Snap"
+msgstr "Instantané de nuit"
+
+#: src/pentaxmn.cpp:490
+#, fuzzy
 msgid "Auto PICT (Standard)"
-msgstr ""
+msgstr "Auto (Paysage)"
 
-#: src/pentaxmn.cpp:429
+#: src/pentaxmn.cpp:491
+#, fuzzy
 msgid "Auto PICT (Portrait)"
-msgstr ""
+msgstr "Contraste"
 
-#: src/pentaxmn.cpp:430
+#: src/pentaxmn.cpp:492
 msgid "Auto PICT (Landscape)"
 msgstr "Auto (Paysage)"
 
-#: src/pentaxmn.cpp:431
+#: src/pentaxmn.cpp:493
+#, fuzzy
 msgid "Auto PICT (Macro)"
-msgstr ""
+msgstr "Auto (Paysage)"
 
-#: src/pentaxmn.cpp:432
+#: src/pentaxmn.cpp:494
+#, fuzzy
 msgid "Auto PICT (Sport)"
-msgstr ""
+msgstr "Auto (Paysage)"
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
+#, fuzzy
 msgid "Green Mode"
-msgstr ""
+msgstr "Mode contrôle"
 
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
 msgid "Shutter Speed Priority"
 msgstr "Priorité vitesse obturation"
 
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
 msgid "Aperture Priority"
 msgstr "Priorité ouverture"
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
 msgid "Bulb"
 msgstr "Bulb"
 
-#: src/pentaxmn.cpp:442
+#: src/pentaxmn.cpp:504
+#, fuzzy
 msgid "Hi-speed Program"
-msgstr ""
+msgstr "Programme d'exposition"
 
-#: src/pentaxmn.cpp:443
+#: src/pentaxmn.cpp:505
+#, fuzzy
 msgid "DOF Program"
-msgstr ""
+msgstr "Logiciel"
 
-#: src/pentaxmn.cpp:448
+#: src/pentaxmn.cpp:510
+#, fuzzy
 msgid "Program Tv Shift"
-msgstr ""
+msgstr "Logiciel"
 
-#: src/pentaxmn.cpp:449
+#: src/pentaxmn.cpp:511
+#, fuzzy
 msgid "Program Av Shift"
-msgstr ""
+msgstr "Logiciel"
 
-#: src/pentaxmn.cpp:452
+#: src/pentaxmn.cpp:514
 msgid "Aperture Priority (Off-Auto-Aperture)"
 msgstr "Priorité ouverture (Av)"
 
-#: src/pentaxmn.cpp:453
+#: src/pentaxmn.cpp:515
 msgid "Manual (Off-Auto-Aperture)"
 msgstr "Manuel"
 
-#: src/pentaxmn.cpp:454
+#: src/pentaxmn.cpp:516
 msgid "Bulb (Off-Auto-Aperture)"
 msgstr "Bulb"
 
-#: src/pentaxmn.cpp:456
+#: src/pentaxmn.cpp:518
 msgid "Shutter Priority"
 msgstr "Priorité obturation"
 
-#: src/pentaxmn.cpp:457
+#: src/pentaxmn.cpp:519
 msgid "Shutter & Aperture Priority AE"
 msgstr "Priorité vitesse obturation et ouverture AE"
 
-#: src/pentaxmn.cpp:458
+#: src/pentaxmn.cpp:520
 msgid "Shutter & Aperture Priority AE (1)"
 msgstr "Priorité vitesse obturation et ouverture AE (1)"
 
-#: src/pentaxmn.cpp:459
+#: src/pentaxmn.cpp:521
+#, fuzzy
 msgid "Sensitivity Priority AE"
-msgstr ""
+msgstr "Sensibilité spectrale"
 
-#: src/pentaxmn.cpp:460
+#: src/pentaxmn.cpp:522
+#, fuzzy
 msgid "Sensitivity Priority AE (1)"
-msgstr ""
+msgstr "Priorité vitesse obturation et ouverture AE (1)"
 
-#: src/pentaxmn.cpp:461
+#: src/pentaxmn.cpp:523
+#, fuzzy
 msgid "Flash X-Sync Speed AE"
-msgstr ""
+msgstr "Vitesse de synchro flash en mode Av"
 
-#: src/pentaxmn.cpp:462
+#: src/pentaxmn.cpp:524
+#, fuzzy
 msgid "Flash X-Sync Speed AE (1)"
+msgstr "Vitesse de synchro flash en mode Av"
+
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
 msgstr ""
 
-#: src/pentaxmn.cpp:471
+#: src/pentaxmn.cpp:535
 #, fuzzy
 msgid "Continuous (Hi)"
 msgstr "Continue"
 
-#: src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
 #, fuzzy
 msgid "Burst"
 msgstr "Mode rafale"
 
-#: src/pentaxmn.cpp:473
+#: src/pentaxmn.cpp:538
 #, fuzzy
 msgid "Self-timer (12 sec)"
 msgstr "retardateur"
 
-#: src/pentaxmn.cpp:474
+#: src/pentaxmn.cpp:539
 #, fuzzy
 msgid "Self-timer (2 sec)"
 msgstr "retardateur"
 
-#: src/pentaxmn.cpp:475
+#: src/pentaxmn.cpp:540
 #, fuzzy
 msgid "Remote Control (3 sec)"
 msgstr "Contrôle des couleurs"
 
-#: src/pentaxmn.cpp:476
+#: src/pentaxmn.cpp:541
 #, fuzzy
 msgid "Remote Control"
 msgstr "Contrôle des couleurs"
 
-#: src/pentaxmn.cpp:477
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
 #, fuzzy
-msgid "Multiple Exposure"
-msgstr "Exposition"
+msgid "Video"
+msgstr "Large"
 
-#: src/pentaxmn.cpp:488
+#: src/pentaxmn.cpp:554
 msgid "M-42 or No Lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:489
+#: src/pentaxmn.cpp:555
 #, fuzzy
 msgid "K,M Lens"
 msgstr "Objectif"
 
-#: src/pentaxmn.cpp:490
+#: src/pentaxmn.cpp:556
 msgid "A Series Lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:625
+#: src/pentaxmn.cpp:703
 #, fuzzy
 msgid "Bright"
 msgstr "Luminosité+"
 
-#: src/pentaxmn.cpp:628
+#: src/pentaxmn.cpp:706
 msgid "Vibrant"
 msgstr ""
 
-#: src/pentaxmn.cpp:641
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
+msgstr ""
+
+#: src/pentaxmn.cpp:720
 #, fuzzy
 msgid "Weakest"
 msgstr "Ouest"
 
-#: src/pentaxmn.cpp:642
+#: src/pentaxmn.cpp:721
 msgid "Weak"
 msgstr "Faible"
 
-#: src/pentaxmn.cpp:643
+#: src/pentaxmn.cpp:722
 msgid "Strong"
 msgstr "Fort"
 
-#: src/pentaxmn.cpp:752
+#: src/pentaxmn.cpp:832
 msgid "No extended bracketing"
 msgstr ""
 
-#: src/pentaxmn.cpp:758
+#: src/pentaxmn.cpp:838
 msgid "WB-BA"
 msgstr ""
 
-#: src/pentaxmn.cpp:761
+#: src/pentaxmn.cpp:841
 msgid "WB-GM"
 msgstr ""
 
-#: src/pentaxmn.cpp:773
+#: src/pentaxmn.cpp:853
 #, fuzzy
 msgid "Unknown "
 msgstr "Inconnu"
 
-#: src/pentaxmn.cpp:786
+#: src/pentaxmn.cpp:866
 #, fuzzy
 msgid "Pentax Makernote version"
 msgstr "Version des note du fabriquant Nikon"
 
-#: src/pentaxmn.cpp:789
+#: src/pentaxmn.cpp:869
 #, fuzzy
 msgid "Camera shooting mode"
 msgstr "Mode de prise de vue"
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
 #, fuzzy
 msgid "Resolution of a preview image"
 msgstr "Pointeur vers l'image d'aperçu"
 
-#: src/pentaxmn.cpp:794
+#: src/pentaxmn.cpp:874
 #, fuzzy
 msgid "Length of a preview image"
 msgstr "Pointeur vers l'image d'aperçu"
 
-#: src/pentaxmn.cpp:795
+#: src/pentaxmn.cpp:875
 #, fuzzy
 msgid "Size of an IFD containing a preview image"
 msgstr "Décalage vers l'IFD contenant l'aperçu"
 
-#: src/pentaxmn.cpp:800
+#: src/pentaxmn.cpp:880
 #, fuzzy
 msgid "Model identification"
 msgstr "Version du Modèle"
 
-#: src/pentaxmn.cpp:801
+#: src/pentaxmn.cpp:881
+#, fuzzy
 msgid "Pentax model idenfication"
-msgstr ""
+msgstr "Version du Modèle"
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
 #, fuzzy
 msgid "Date"
 msgstr "Date d'envoi"
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
 #, fuzzy
 msgid "Time"
 msgstr "Heure d'envoi"
 
-#: src/pentaxmn.cpp:810
+#: src/pentaxmn.cpp:890
 #, fuzzy
 msgid "Image quality settings"
 msgstr "Réglage de qualité de l'image"
 
-#: src/pentaxmn.cpp:813
+#: src/pentaxmn.cpp:893
 #, fuzzy
 msgid "Image size settings"
 msgstr "Réglage de qualité de l'image"
 
-#: src/pentaxmn.cpp:817
+#: src/pentaxmn.cpp:897
 #, fuzzy
 msgid "Flash mode settings"
 msgstr "Réglage mode flash"
 
-#: src/pentaxmn.cpp:820
+#: src/pentaxmn.cpp:900
 #, fuzzy
 msgid "Focus mode settings"
 msgstr "Réglage mode de mise au point"
 
-#: src/pentaxmn.cpp:823
+#: src/pentaxmn.cpp:903
 #, fuzzy
 msgid "Selected AF point"
 msgstr "AF Points"
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+#, fuzzy
+msgid "AF point in focus"
+msgstr "Points AF utilisés"
+
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
 #, fuzzy
 msgid "F-Number"
 msgstr "Nombre F"
 
-#: src/pentaxmn.cpp:832
+#: src/pentaxmn.cpp:915
 #, fuzzy
 msgid "ISO sensitivity"
 msgstr "Sensibilité spectrale"
 
-#: src/pentaxmn.cpp:833
+#: src/pentaxmn.cpp:916
 #, fuzzy
 msgid "ISO sensitivity settings"
 msgstr "Réglage vitesse ISO"
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
 #, fuzzy
 msgid "MeteringMode"
 msgstr "Mode de mesure"
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
 #, fuzzy
 msgid "AutoBracketing"
 msgstr "Bracketing automatique"
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
 #, fuzzy
 msgid "White ballance"
 msgstr "Balance des blancs"
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
 #, fuzzy
 msgid "White ballance mode"
 msgstr "Mode balance des blancs"
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
+#: src/pentaxmn.cpp:936
+#, fuzzy
+msgid "Blue color balance"
+msgstr "Balance des bleus"
+
+#: src/pentaxmn.cpp:939
+#, fuzzy
+msgid "Red color balance"
+msgstr "Balance des rouges"
+
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
 #, fuzzy
 msgid "FocalLength"
 msgstr "Longueur focale"
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
 #, fuzzy
 msgid "Location"
 msgstr "Lieu précis"
 
-#: src/pentaxmn.cpp:869
+#: src/pentaxmn.cpp:959
+#, fuzzy
 msgid "Hometown"
-msgstr ""
+msgstr "Maison"
 
-#: src/pentaxmn.cpp:875
+#: src/pentaxmn.cpp:965
+#, fuzzy
 msgid "Hometown DST"
-msgstr ""
+msgstr "Maison"
 
-#: src/pentaxmn.cpp:876
+#: src/pentaxmn.cpp:966
 msgid "Whether day saving time is active in home town"
 msgstr ""
 
-#: src/pentaxmn.cpp:878
+#: src/pentaxmn.cpp:968
 #, fuzzy
 msgid "Destination DST"
 msgstr "Destination"
 
-#: src/pentaxmn.cpp:879
+#: src/pentaxmn.cpp:969
 msgid "Whether day saving time is active in destination"
 msgstr ""
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
 #, fuzzy
 msgid "DSPFirmwareVersion"
 msgstr "Version du microcode"
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
 #, fuzzy
 msgid "CPUFirmwareVersion"
 msgstr "Version du microcode"
 
-#: src/pentaxmn.cpp:891
+#: src/pentaxmn.cpp:981
 #, fuzzy
 msgid "Light value"
 msgstr "Valeur de luminosité"
 
-#: src/pentaxmn.cpp:892
+#: src/pentaxmn.cpp:982
 msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+#, fuzzy
+msgid "Image area offset"
+msgstr "Taille des données de l'image"
+
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+#, fuzzy
+msgid "Raw image size"
+msgstr "Taille de l'image"
+
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
 #, fuzzy
 msgid "Preview image borders"
 msgstr "Aperçu embarqué"
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
 #, fuzzy
 msgid "Sensitivity adjust"
 msgstr "Sensibilité spectrale"
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
 #, fuzzy
 msgid "Digital filter"
 msgstr "Appareil photo numérique"
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-#, fuzzy
-msgid "Temperature"
-msgstr "Température de l'objectif"
-
-#: src/pentaxmn.cpp:923
+#: src/pentaxmn.cpp:1019
 #, fuzzy
 msgid "Camera temperature"
 msgstr "Température des couleurs"
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
 #, fuzzy
 msgid "Image tone"
 msgstr "Type d'image"
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
 #, fuzzy
 msgid "Colort temperature"
 msgstr "Température des couleurs"
 
-#: src/pentaxmn.cpp:943
+#: src/pentaxmn.cpp:1039
 #, fuzzy
 msgid "Shake reduction"
 msgstr "Réduction du bruit"
 
-#: src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:1040
 #, fuzzy
 msgid "Shake reduction information"
 msgstr "informations de réglage appareil photo"
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
 #, fuzzy
 msgid "Dynamic range expansion"
 msgstr "Réglage gamme dynamique"
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "Réduction de bruit Iso élevé"
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+#, fuzzy
+msgid "AF Adjustment"
+msgstr "Ajustement de teinte"
+
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
 #, fuzzy
 msgid "Black point"
 msgstr "Noir & Blanc"
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
 #, fuzzy
 msgid "White point"
 msgstr "Point blanc"
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
 #, fuzzy
 msgid "ShotInfo"
 msgstr "Infos prise de vue"
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
+#, fuzzy
 msgid "AEInfo"
-msgstr ""
+msgstr "Informations mise au point"
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
 #, fuzzy
 msgid "LensInfo"
 msgstr "Objectif"
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
 #, fuzzy
 msgid "FlashInfo"
 msgstr "Flash"
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
 #, fuzzy
 msgid "AEMeteringSegments"
 msgstr "Mode de mesure"
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
 #, fuzzy
 msgid "FlashADump"
 msgstr "Compensation Flash"
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
 #, fuzzy
 msgid "FlashBDump"
 msgstr "Compensation Flash"
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
+#, fuzzy
 msgid "WB_RGGBLevelsDaylight"
-msgstr ""
+msgstr "Fluorescent"
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
+#, fuzzy
 msgid "WB_RGGBLevelsShade"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
+#, fuzzy
 msgid "WB_RGGBLevelsCloudy"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
+#, fuzzy
 msgid "WB_RGGBLevelsTungsten"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentD"
 msgstr "Fluorescent"
 
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentN"
 msgstr "Fluorescent"
 
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentW"
 msgstr "Fluorescent"
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
+#, fuzzy
 msgid "WB_RGGBLevelsFlash"
-msgstr ""
+msgstr "Niveau de noir"
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
 #, fuzzy
 msgid "CameraInfo"
 msgstr "Identifiant appareil photo"
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
+#, fuzzy
 msgid "BatteryInfo"
-msgstr ""
+msgstr "Identifiant appareil photo"
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
 #, fuzzy
 msgid "AFInfo"
 msgstr "Informations mise au point"
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
 #, fuzzy
 msgid "ColorInfo"
 msgstr "Couleur"
 
-#: src/pentaxmn.cpp:1023
+#: src/pentaxmn.cpp:1125
 #, fuzzy
 msgid "Unknown PentaxMakerNote tag"
 msgstr "Marqueur de note du fabriquant Minolta inconnu"
 
-#: src/properties.cpp:92
+#: src/properties.cpp:97
 msgid "Dublin Core schema"
 msgstr ""
 
-#: src/properties.cpp:93
+#: src/properties.cpp:98
 msgid "digiKam Photo Management schema"
 msgstr ""
 
-#: src/properties.cpp:94
-msgid "XMP Basic schema"
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
 msgstr ""
 
-#: src/properties.cpp:95
+#: src/properties.cpp:100
+#, fuzzy
+msgid "XMP Basic schema"
+msgstr "Zone dynamique"
+
+#: src/properties.cpp:101
 msgid "XMP Rights Management schema"
 msgstr ""
 
-#: src/properties.cpp:96
+#: src/properties.cpp:102
+#, fuzzy
 msgid "XMP Media Management schema"
-msgstr ""
+msgstr "Zone dynamique"
 
-#: src/properties.cpp:97
+#: src/properties.cpp:103
+#, fuzzy
 msgid "XMP Basic Job Ticket schema"
-msgstr ""
+msgstr "Zone dynamique"
 
-#: src/properties.cpp:98
+#: src/properties.cpp:104
+#, fuzzy
 msgid "XMP Paged-Text schema"
-msgstr ""
+msgstr "Zone dynamique"
 
-#: src/properties.cpp:99
+#: src/properties.cpp:105
 #, fuzzy
 msgid "XMP Dynamic Media schema"
 msgstr "Zone dynamique"
 
-#: src/properties.cpp:100
+#: src/properties.cpp:106
 msgid "Microsoft Photo schema"
 msgstr ""
 
-#: src/properties.cpp:101
+#: src/properties.cpp:107
 #, fuzzy
 msgid "Adobe PDF schema"
 msgstr "Décompression Adobe"
 
-#: src/properties.cpp:102
+#: src/properties.cpp:108
+#, fuzzy
 msgid "Adobe photoshop schema"
-msgstr ""
+msgstr "Décompression Adobe"
 
-#: src/properties.cpp:103
+#: src/properties.cpp:109
 #, fuzzy
 msgid "Camera Raw schema"
 msgstr "Marque de l'appareil"
 
-#: src/properties.cpp:104
+#: src/properties.cpp:110
 msgid "Exif Schema for TIFF Properties"
 msgstr ""
 
-#: src/properties.cpp:105
+#: src/properties.cpp:111
 msgid "Exif schema for Exif-specific Properties"
 msgstr ""
 
-#: src/properties.cpp:106
+#: src/properties.cpp:112
 msgid "Exif schema for Additional Exif Properties"
 msgstr ""
 
-#: src/properties.cpp:107
+#: src/properties.cpp:113
 msgid "IPTC Core schema"
 msgstr ""
 
-#: src/properties.cpp:109
+#: src/properties.cpp:115
 msgid "IPTC Extension schema"
 msgstr ""
 
-#: src/properties.cpp:111
+#: src/properties.cpp:117
 msgid "PLUS License Data Format schema"
 msgstr ""
 
-#: src/properties.cpp:114
+#: src/properties.cpp:118
+#, fuzzy
+msgid "iView Media Pro schema"
+msgstr "Zone dynamique"
+
+#: src/properties.cpp:119
+msgid "Expression Media schema"
+msgstr ""
+
+#: src/properties.cpp:122
 #, fuzzy
 msgid "Colorant structure"
 msgstr "Température des couleurs"
 
-#: src/properties.cpp:115
+#: src/properties.cpp:123
 #, fuzzy
 msgid "Dimensions structure"
 msgstr "Structure des données de l'image"
 
-#: src/properties.cpp:116
+#: src/properties.cpp:124
 #, fuzzy
 msgid "Font structure"
 msgstr "Structure des donnée Exif"
 
-#: src/properties.cpp:117
+#: src/properties.cpp:125
 #, fuzzy
 msgid "Thumbnail structure"
 msgstr "Décalage aperçu"
 
-#: src/properties.cpp:118
+#: src/properties.cpp:126
+#, fuzzy
 msgid "Resource Event structure"
-msgstr ""
+msgstr "Structure des donnée Exif"
 
-#: src/properties.cpp:119
+#: src/properties.cpp:127
+#, fuzzy
 msgid "ResourceRef structure"
-msgstr ""
+msgstr "Structure des donnée Exif"
 
-#: src/properties.cpp:120
+#: src/properties.cpp:128
 #, fuzzy
 msgid "Version structure"
 msgstr "Structure des donnée Exif"
 
-#: src/properties.cpp:121
+#: src/properties.cpp:129
 msgid "Basic Job/Workflow structure"
 msgstr ""
 
-#: src/properties.cpp:124
+#: src/properties.cpp:132
 msgid "Qualifier for xmp:Identifier"
 msgstr ""
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 #, fuzzy
 msgid "Contributor"
 msgstr "Continue"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributors to the resource (other than the authors)."
 msgstr ""
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 #, fuzzy
 msgid "Coverage"
 msgstr "Moyenne"
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid ""
 "The spatial or temporal topic of the resource, the spatial applicability of "
 "the resource, or the jurisdiction under which the resource is relevant."
 msgstr ""
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 #, fuzzy
 msgid "Creator"
 msgstr "Catégorie"
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid ""
 "The authors of the resource (listed in order of precedence, if significant)."
 msgstr ""
 
-#: src/properties.cpp:132
+#: src/properties.cpp:140
 msgid "Date(s) that something interesting happened to the resource."
 msgstr ""
 
-#: src/properties.cpp:133
+#: src/properties.cpp:141
 msgid ""
 "A textual description of the content of the resource. Multiple values may be "
 "present for different languages."
 msgstr ""
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 #, fuzzy
 msgid "Format"
 msgstr "Format du fichier"
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid ""
 "The file format used when saving the resource. Tools and applications should "
 "set this property to the save format of the data. It may include appropriate "
 "qualifiers."
 msgstr ""
 
-#: src/properties.cpp:137 src/properties.cpp:180
+#: src/properties.cpp:145 src/properties.cpp:196
 #, fuzzy
 msgid "Identifier"
 msgstr "Identifiant ARM"
 
-#: src/properties.cpp:137
+#: src/properties.cpp:145
 msgid ""
 "Unique identifier of the resource. Recommended best practice is to identify "
 "the resource by means of a string conforming to a formal identification "
 "system."
 msgstr ""
 
-#: src/properties.cpp:139
+#: src/properties.cpp:147
 msgid "An unordered array specifying the languages used in the resource."
 msgstr ""
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid "Publisher"
 msgstr ""
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid ""
 "An entity responsible for making the resource available. Examples of a "
 "Publisher include a person, an organization, or a service. Typically, the "
 "name of a Publisher should be used to indicate the entity."
 msgstr ""
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 #, fuzzy
 msgid "Relation"
 msgstr "Rotation"
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid ""
 "Relationships to other documents. Recommended best practice is to identify "
 "the related resource by means of a string conforming to a formal "
 "identification system."
 msgstr ""
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 #, fuzzy
 msgid "Rights"
 msgstr "Droit"
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid ""
 "Informal rights statement, selected by language. Typically, rights "
 "information includes a statement about various property rights associated "
 "with the resource, including intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:148
+#: src/properties.cpp:156
 msgid "Unique identifier of the work from which this resource was derived."
 msgstr ""
 
-#: src/properties.cpp:149
+#: src/properties.cpp:157
 msgid ""
 "An unordered array of descriptive phrases or keywords that specify the topic "
 "of the content of the resource."
 msgstr ""
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 #, fuzzy
 msgid "Title"
 msgstr "Le fichier"
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid ""
 "The title of the document, or the name given to the resource. Typically, it "
 "will be a name by which the resource is formally known."
 msgstr ""
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 #, fuzzy
 msgid "Type"
 msgstr "type"
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "A document type; for example, novel, poem, or working paper."
 msgstr ""
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid "Tags List"
 msgstr ""
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid ""
 "The list of complete tags path as string. The path hierarchy is separated by "
 "'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
 msgstr ""
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 #, fuzzy
 msgid "Captions Author Names"
 msgstr "Libellé du pays"
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 msgid ""
 "The list of all captions author names for each language alternative captions "
 "set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 #, fuzzy
 msgid "Captions Date Time Stamps"
 msgstr "mise à jour de l'horodatage"
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 msgid ""
 "The list of all captions date time stamps for each language alternative "
 "captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:168
+#: src/properties.cpp:170 src/tags.cpp:842
+#, fuzzy
+msgid "Image History"
+msgstr "Hauteur de l'image"
+
+#: src/properties.cpp:170
+msgid ""
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
+msgstr ""
+
+#: src/properties.cpp:171
+#, fuzzy
+msgid "Lens Correction Settings"
+msgstr "Réglage des données de l'objectif"
+
+#: src/properties.cpp:171
+msgid ""
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
+msgstr ""
+
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
+msgstr ""
+
+#: src/properties.cpp:177
+msgid ""
+"The list of files processed with Enfuse program through ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:178
+#, fuzzy
+msgid "Enfuse Settings"
+msgstr "Réglage flash"
+
+#: src/properties.cpp:178
+msgid ""
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:184
 #, fuzzy
 msgid "Advisory"
 msgstr "Audio"
 
-#: src/properties.cpp:168
+#: src/properties.cpp:184
 msgid ""
 "An unordered array specifying properties that were edited outside the "
 "authoring application. Each item should contain a single namespace and XPath "
 "separated by one ASCII space (U+0020)."
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid "Base URL"
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid ""
 "The base URL for relative URLs in the document content. If this document "
 "contains Internet links, and those links are relative, they are relative to "
@@ -11308,28 +14669,29 @@
 "based on their notion of where URLs will be interpreted."
 msgstr ""
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 #, fuzzy
 msgid "Create Date"
 msgstr "Date de publication"
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 #, fuzzy
 msgid "The date and time the resource was originally created."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
+#, fuzzy
 msgid "Creator Tool"
-msgstr ""
+msgstr "Catégorie"
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid ""
 "The name of the first known tool used to create the resource. If history is "
 "present in the metadata, this value should be equivalent to that of xmpMM:"
 "History's softwareAgent property."
 msgstr ""
 
-#: src/properties.cpp:180
+#: src/properties.cpp:196
 msgid ""
 "An unordered array of text strings that unambiguously identify the resource "
 "within a given context. An array item may be qualified with xmpidq:Scheme to "
@@ -11339,120 +14701,122 @@
 "(single-valued) property."
 msgstr ""
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 #, fuzzy
 msgid "Label"
 msgstr "Grande"
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid ""
 "A word or short phrase that identifies a document as a member of a user-"
 "defined collection. Used to organize documents in a file browser."
 msgstr ""
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 #, fuzzy
 msgid "Metadata Date"
 msgstr "Date Minolta"
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid ""
 "The date and time that any metadata for this resource was last changed. It "
 "should be the same as or more recent than xmp:ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 #, fuzzy
 msgid "Modify Date"
 msgstr "Date Minolta"
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid ""
 "The date and time the resource was last modified. Note: The value of this "
 "property is not necessarily the same as the file's system modification date "
 "because it is set before the file is saved."
 msgstr ""
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
+#, fuzzy
 msgid "Nickname"
-msgstr ""
+msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "A short informal name for the resource."
 msgstr ""
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 #, fuzzy
 msgid "Rating"
 msgstr "Rotation"
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid ""
 "A number that indicates a document's status relative to other documents, "
 "used to organize documents in a file browser. Values are user-defined within "
 "an application-defined range."
 msgstr ""
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 #, fuzzy
 msgid "Thumbnails"
 msgstr "Miniature"
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid ""
 "An alternative array of thumbnail images for a file, which can differ in "
 "characteristics such as size or image encoding."
 msgstr ""
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Certificate"
 msgstr ""
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Online rights management certificate."
 msgstr ""
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 #, fuzzy
 msgid "Marked"
 msgstr "Dur"
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 msgid "Indicates that this is a rights-managed resource."
 msgstr ""
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 #, fuzzy
 msgid "Owner"
 msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "An unordered array specifying the legal owner(s) of a resource."
 msgstr ""
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Usage Terms"
 msgstr ""
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Text instructions on how a resource can be legally used."
 msgstr ""
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
+#, fuzzy
 msgid "Web Statement"
-msgstr ""
+msgstr "8-segments"
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid ""
 "The location of a web page describing the owner and/or rights statement for "
 "this resource."
 msgstr ""
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid "Derived From"
 msgstr "Mode contrôle"
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid ""
 "A reference to the original document from which this one is derived. It is a "
 "minimal reference; missing components can be assumed to be unchanged. For "
@@ -11461,22 +14825,23 @@
 "specify the instance ID and rendition class of the original."
 msgstr ""
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 #, fuzzy
 msgid "Document ID"
 msgstr "Nom du document"
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid ""
 "The common identifier for all versions and renditions of a document. It "
 "should be based on a UUID; see Document and Instance IDs below."
 msgstr ""
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
+#, fuzzy
 msgid "History"
-msgstr ""
+msgstr "Hauteur de l'image"
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid ""
 "An ordered array of high-level user actions that resulted in this resource. "
 "It is intended to give human readers a general indication of the steps taken "
@@ -11485,22 +14850,24 @@
 "other detailed history."
 msgstr ""
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
+#, fuzzy
 msgid "Instance ID"
-msgstr ""
+msgstr "Entrelacé"
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid ""
 "An identifier for a specific incarnation of a document, updated each time a "
 "file is saved. It should be based on a UUID; see Document and Instance IDs "
 "below."
 msgstr ""
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
+#, fuzzy
 msgid "Managed From"
-msgstr ""
+msgstr "Langue"
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid ""
 "A reference to the document as it was prior to becoming managed. It is set "
 "when a managed document is introduced to an asset management system that "
@@ -11508,23 +14875,24 @@
 "management systems."
 msgstr ""
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 #, fuzzy
 msgid "Manager"
 msgstr "Langue"
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid ""
 "The name of the asset management system that manages this resource. Along "
 "with xmpMM: ManagerVariant, it tells applications which asset management "
 "system to contact concerning this document."
 msgstr ""
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
+#, fuzzy
 msgid "Manage To"
-msgstr ""
+msgstr "Langue"
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 msgid ""
 "A URI identifying the managed resource to the asset management system; the "
 "presence of this property is the formal indication that this resource is "
@@ -11532,53 +14900,56 @@
 "system."
 msgstr ""
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
+#, fuzzy
 msgid "Manage UI"
-msgstr ""
+msgstr "Langue"
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 msgid ""
 "A URI that can be used to access information about the managed resource "
 "through a web browser. It might require a custom browser plug-in."
 msgstr ""
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
+#, fuzzy
 msgid "Manager Variant"
-msgstr ""
+msgstr "Langue"
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 msgid ""
 "Specifies a particular variant of the asset management system. The format of "
 "this property is private to the specific asset management system."
 msgstr ""
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
+#, fuzzy
 msgid "Rendition Class"
-msgstr ""
+msgstr "Paramètre de distorsion de l'objectif"
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid ""
 "The rendition class name for this resource. This property should be absent "
 "or set to default for a document version that is not a derived rendition."
 msgstr ""
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 #, fuzzy
 msgid "Rendition Params"
 msgstr "Paramètre de distorsion de l'objectif"
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid ""
 "Can be used to provide additional rendition parameters that are too complex "
 "or verbose to encode in xmpMM: RenditionClass."
 msgstr ""
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 #, fuzzy
 msgid "Version ID"
 msgstr "ID version GPS"
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid ""
 "The document version identifier for this resource. Each version of a "
 "document gets a new identifier, usually simply by incrementing integers 1, "
@@ -11586,12 +14957,12 @@
 "support branching which requires a more complex scheme."
 msgstr ""
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 #, fuzzy
 msgid "Versions"
 msgstr "Version"
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid ""
 "The version history associated with this resource. Entry [1] is the oldest "
 "known version for this document, entry [last()] is the most recent version. "
@@ -11602,39 +14973,40 @@
 "the version history can be truncated at some point."
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Last URL"
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Deprecated for privacy protection."
 msgstr ""
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
+#, fuzzy
 msgid "Rendition Of"
-msgstr ""
+msgstr "Paramètre de distorsion de l'objectif"
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid ""
 "Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
 "which this is a rendition."
 msgstr ""
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 #, fuzzy
 msgid "Save ID"
 msgstr "Identifiant appareil photo"
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
 msgstr ""
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 #, fuzzy
 msgid "Job Reference"
 msgstr "Date de référence"
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 msgid ""
 "References an external job management file for a job process in which the "
 "document is being used. Use of job names is under user control. Typical use "
@@ -11644,746 +15016,749 @@
 "historical information about what jobs a document was part of previously."
 msgstr ""
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 #, fuzzy
 msgid "Maximum Page Size"
 msgstr "Taille de l'image"
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid ""
 "The size of the largest page in the document (including any in contained "
 "documents)."
 msgstr ""
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 #, fuzzy
 msgid "Number of Pages"
 msgstr "Le nombre F."
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid ""
 "The number of pages in the document (including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 #, fuzzy
 msgid "Fonts"
 msgstr "Points AF"
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid ""
 "An unordered array of fonts that are used in the document (including any in "
 "contained documents)."
 msgstr ""
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 #, fuzzy
 msgid "Colorants"
 msgstr "Couleur"
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid ""
 "An ordered array of colorants (swatches) that are used in the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 #, fuzzy
 msgid "Plate Names"
 msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid ""
 "An ordered array of plate names that are needed to print the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 #, fuzzy
 msgid "Project Reference"
 msgstr "Date de référence"
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "A reference to the project that created this file."
 msgstr ""
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
+#, fuzzy
 msgid "Video Frame Rate"
-msgstr ""
+msgstr "Débit audio"
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "The video frame rate. One of: 24, NTSC, PAL."
 msgstr ""
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
+#, fuzzy
 msgid "Video Frame Size"
-msgstr ""
+msgstr "Espace des couleurs"
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "The frame size. For example: w:720, h: 480, unit:pixels"
 msgstr ""
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "Video Pixel Aspect Ratio"
 msgstr ""
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
 msgstr ""
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
+#, fuzzy
 msgid "Video Pixel Depth"
-msgstr ""
+msgstr "Ordre de remplissage"
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid ""
 "The size in bits of each color component of a pixel. Standard Windows 32-bit "
 "pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 #, fuzzy
 msgid "Video Color Space"
 msgstr "Espace des couleurs"
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid ""
 "The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
 "CCIR-709 (used for HD)."
 msgstr ""
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 #, fuzzy
 msgid "Video Alpha Mode"
 msgstr "Modèle Minolta"
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 msgid "The alpha mode. One of: straight, pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid "Video Alpha Premultiple Color"
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid ""
 "A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
 "is pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "Video Alpha Unity Is Transparent"
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "When true, unity is clear, when false, it is opaque."
 msgstr ""
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 #, fuzzy
 msgid "Video Compressor"
 msgstr "Compression"
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video compression used. For example, jpeg."
 msgstr ""
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 #, fuzzy
 msgid "Video Field Order"
 msgstr "Ordre de remplissage"
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "The field order for video. One of: Upper, Lower, Progressive."
 msgstr ""
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 #, fuzzy
 msgid "Pull Down"
 msgstr "Bas"
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid ""
 "The sampling phase of film to be converted to video (pull-down). One of: "
 "WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
 "WWWSS_24p, WWSSW_24p."
 msgstr ""
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 #, fuzzy
 msgid "Audio Sample Rate"
 msgstr "Débit audio"
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid ""
 "The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
 msgstr ""
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 #, fuzzy
 msgid "Audio Sample Type"
 msgstr "Type audio"
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 #, fuzzy
 msgid "Audio Channel Type"
 msgstr "Type audio"
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
 msgstr ""
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 #, fuzzy
 msgid "Audio Compressor"
 msgstr "Compression"
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "The audio compression used. For example, MP3."
 msgstr ""
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid "Speaker Placement"
 msgstr ""
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid ""
 "A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
 msgstr ""
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 #, fuzzy
 msgid "File Data Rate"
 msgstr "Date Minolta"
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 msgid ""
 "The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
 "sec"
 msgstr ""
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 #, fuzzy
 msgid "Tape Name"
 msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid ""
 "The name of the tape from which the clip was captured, as set during the "
 "capture process."
 msgstr ""
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 #, fuzzy
 msgid "Alternative Tape Name"
 msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid ""
 "An alternative tape name, set via the project window or timecode dialog in "
 "Premiere. If an alternative name has been set and has not been reverted, "
 "that name is displayed."
 msgstr ""
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 #, fuzzy
 msgid "Start Time Code"
 msgstr "Mode mise au point automatique"
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid ""
 "The timecode of the first frame of video in the file, as obtained from the "
 "device control."
 msgstr ""
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 #, fuzzy
 msgid "Alternative Time code"
 msgstr "Mode mise au point automatique"
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid ""
 "A timecode set by the user. When specified, it is used instead of the "
 "startTimecode."
 msgstr ""
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 #, fuzzy
 msgid "Duration"
 msgstr "Saturation"
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 #, fuzzy
 msgid "The duration of the media file."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 #, fuzzy
 msgid "Scene"
 msgstr "centre"
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 #, fuzzy
 msgid "The name of the scene."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 #, fuzzy
 msgid "Shot Name"
 msgstr "Libellé du pays"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 #, fuzzy
 msgid "The name of the shot or take."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 #, fuzzy
 msgid "Shot Date"
 msgstr "Date d'envoi"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 #, fuzzy
 msgid "The date and time when the video was shot."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 #, fuzzy
 msgid "Shot Location"
 msgstr "Lieu précis"
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid ""
 "The name of the location where the video was shot. For example: "
 "\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
 "GPS values."
 msgstr ""
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "Log Comment"
 msgstr "Commentaire Windows"
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "User's log comments."
 msgstr "Commentaire de l'utilisateur"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 #, fuzzy
 msgid "Markers"
 msgstr "Dur"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "An ordered list of markers"
 msgstr ""
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 #, fuzzy
 msgid "Contributed Media"
 msgstr "Continue"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 msgid "An unordered list of all media used to create this media."
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid "Absolute Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid ""
 "The absolute path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid "Relative Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid ""
 "The relative path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 #, fuzzy
 msgid "Video Modified Date"
 msgstr "Date Minolta"
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 #, fuzzy
 msgid "The date and time when the video was last modified."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 #, fuzzy
 msgid "Audio Modified Date"
 msgstr "Débit audio"
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 #, fuzzy
 msgid "The date and time when the audio was last modified."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 #, fuzzy
 msgid "Metadata Modified Date"
 msgstr "Date Minolta"
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 #, fuzzy
 msgid "The date and time when the metadata was last modified."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/properties.cpp:323
+#: src/properties.cpp:339
 #, fuzzy
 msgid "The name of the artist or artists."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 #, fuzzy
 msgid "Album"
 msgstr "Évaluatif"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 #, fuzzy
 msgid "The name of the album."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 #, fuzzy
 msgid "Track Number"
 msgstr "Numéro frame"
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid ""
 "A numeric value indicating the order of the audio file within its original "
 "recording."
 msgstr ""
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 #, fuzzy
 msgid "Genre"
 msgstr "Centré"
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 #, fuzzy
 msgid "The name of the genre."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:327
+#: src/properties.cpp:343
 #, fuzzy
 msgid "The copyright information."
 msgstr "Informations prise de vue"
 
-#: src/properties.cpp:328
+#: src/properties.cpp:344
 #, fuzzy
 msgid "The date the title was released."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 #, fuzzy
 msgid "Composer"
 msgstr "composant"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "The composer's name."
 msgstr ""
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 #, fuzzy
 msgid "Engineer"
 msgstr "centre"
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "The engineer's name."
 msgstr ""
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "Tempo"
 msgstr ""
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "The audio's tempo."
 msgstr ""
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 #, fuzzy
 msgid "Instrument"
 msgstr "Heure Minolta"
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "The musical instrument."
 msgstr ""
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 #, fuzzy
 msgid "Intro Time"
 msgstr "Heure Minolta"
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
+#, fuzzy
 msgid "The duration of lead time for queuing music."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "Out Cue"
 msgstr ""
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "The time at which to fade out."
 msgstr ""
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 #, fuzzy
 msgid "Relative Timestamp"
 msgstr "mise à jour de l'horodatage"
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "The start time of the media inside the audio project."
 msgstr ""
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 #, fuzzy
 msgid "Loop"
 msgstr "Faible réduction du gain"
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "When true, the clip can be looped seemlessly."
 msgstr ""
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 #, fuzzy
 msgid "Number Of Beats"
 msgstr "Le nombre F."
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 #, fuzzy
 msgid "The number of beats."
 msgstr "Le nombre F."
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 #, fuzzy
 msgid "Key"
 msgstr "Clef basse"
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid ""
 "The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
 msgstr ""
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 #, fuzzy
 msgid "Stretch Mode"
 msgstr "Mode ajustement"
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid ""
 "The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
 "Splice, Hybrid."
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Time Scale Parameters"
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Additional parameters for Time-Scale stretch mode."
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Resample Parameters"
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Additional parameters for Resample stretch mode."
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Beat Splice Parameters"
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Additional parameters for Beat Splice stretch mode."
 msgstr ""
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 #, fuzzy
 msgid "Time Signature"
 msgstr "Heure d'envoi"
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid ""
 "The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
 "12/8, other."
 msgstr ""
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 #, fuzzy
 msgid "Scale Type"
 msgstr "Type d'image"
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid ""
 "The musical scale used in the music. One of: Major, Minor, Both, Neither. "
 "Neither is most often used for instruments with no associated scale, such as "
 "drums."
 msgstr ""
 
-#: src/properties.cpp:351 src/tags.cpp:889
+#: src/properties.cpp:367 src/tags.cpp:1076
 #, fuzzy
 msgid "Camera Serial Number"
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:351
+#: src/properties.cpp:367
 #, fuzzy
 msgid "Camera Serial Number."
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired"
 msgstr "Date de création"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired."
 msgstr "Date de création"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 #, fuzzy
 msgid "Flash Manufacturer"
 msgstr "Constructeur"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 #, fuzzy
 msgid "Flash Manufacturer."
 msgstr "Constructeur"
 
-#: src/properties.cpp:354
+#: src/properties.cpp:370
 #, fuzzy
 msgid "Flash Model."
 msgstr "Mode flash"
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
+#, fuzzy
 msgid "Last Keyword IPTC"
-msgstr ""
+msgstr "Mots-clés"
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
+#, fuzzy
 msgid "Last Keyword IPTC."
-msgstr ""
+msgstr "Mots-clés"
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
+#, fuzzy
 msgid "Last Keyword XMP"
-msgstr ""
+msgstr "Mots-clés"
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 #, fuzzy
 msgid "Last Keyword XMP."
 msgstr "Mots-clés"
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 #, fuzzy
 msgid "Lens Manufacturer"
 msgstr "Constructeur"
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 #, fuzzy
 msgid "Lens Manufacturer."
 msgstr "Constructeur"
 
-#: src/properties.cpp:358
-#, fuzzy
-msgid "Lens Model"
-msgstr "Mode scène"
-
-#: src/properties.cpp:358
+#: src/properties.cpp:374
 #, fuzzy
 msgid "Lens Model."
 msgstr "Mode scène"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 #, fuzzy
 msgid "Rating Percent"
 msgstr "Classement Windows (pourcentage)"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 #, fuzzy
 msgid "Rating Percent."
 msgstr "Classement Windows (pourcentage)"
 
-#: src/properties.cpp:365
+#: src/properties.cpp:381
 msgid "Keywords."
 msgstr "Mots-clés"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 #, fuzzy
 msgid "PDF Version"
 msgstr "Version du fichier"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
 msgstr ""
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 #, fuzzy
 msgid "Producer"
 msgstr "Identifiant du produit"
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
+#, fuzzy
 msgid "The name of the tool that created the PDF document."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 #, fuzzy
 msgid "Authors Position"
 msgstr "Position mise au point"
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 #, fuzzy
 msgid "By-line title."
 msgstr "Titre du créateur"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 #, fuzzy
 msgid "Caption Writer"
 msgstr "Légende"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 #, fuzzy
 msgid "Writer/editor."
 msgstr "Auteur de la Description"
 
-#: src/properties.cpp:375
+#: src/properties.cpp:391
 msgid "Category. Limited to 3 7-bit ASCII characters."
 msgstr ""
 
-#: src/properties.cpp:376
+#: src/properties.cpp:392
 #, fuzzy
 msgid "City."
 msgstr "Ville"
 
-#: src/properties.cpp:377
+#: src/properties.cpp:393
 msgid "Country/primary location."
 msgstr ""
 
-#: src/properties.cpp:378
+#: src/properties.cpp:394
 #, fuzzy
 msgid "Credit."
 msgstr "Crédit"
 
-#: src/properties.cpp:379
+#: src/properties.cpp:395
 msgid ""
 "The date the intellectual content of the document was created (rather than "
 "the creation date of the physical representation), following IIM "
@@ -12392,426 +15767,426 @@
 "photo was digitized for archiving."
 msgstr ""
 
-#: src/properties.cpp:383
+#: src/properties.cpp:399
 #, fuzzy
 msgid "Headline."
 msgstr "Chapô"
 
-#: src/properties.cpp:384
+#: src/properties.cpp:400
 #, fuzzy
 msgid "Special instructions."
 msgstr "Instructions particulières"
 
-#: src/properties.cpp:385
+#: src/properties.cpp:401
 #, fuzzy
 msgid "Source."
 msgstr "Source"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 #, fuzzy
 msgid "State"
 msgstr "Date d'envoi"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 #, fuzzy
 msgid "Province/state."
 msgstr "État Région"
 
-#: src/properties.cpp:387
+#: src/properties.cpp:403
 #, fuzzy
 msgid "Supplemental category."
 msgstr "Catégorie Supplémentaire"
 
-#: src/properties.cpp:388
+#: src/properties.cpp:404
 #, fuzzy
 msgid "Original transmission reference."
 msgstr "Référence de la transmission"
 
-#: src/properties.cpp:389
+#: src/properties.cpp:405
 msgid "Urgency. Valid range is 1-8."
 msgstr ""
 
-#: src/properties.cpp:397
+#: src/properties.cpp:413
 #, fuzzy
 msgid "inches"
 msgstr "Pouce"
 
-#: src/properties.cpp:398 src/tags.cpp:227
+#: src/properties.cpp:414 src/tags.cpp:247
 msgid "cm"
 msgstr "cm"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 #, fuzzy
 msgid "Auto Brightness"
 msgstr "Luminosité"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "When true, \"Brightness\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 #, fuzzy
 msgid "Auto Contrast"
 msgstr "Contraste"
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "When true, \"Contrast\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 #, fuzzy
 msgid "Auto Exposure"
 msgstr "Exposition"
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "When true, \"Exposure\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 #, fuzzy
 msgid "Auto Shadows"
 msgstr "Ombragé"
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "When true,\"Shadows\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 #, fuzzy
 msgid "Blue Hue"
 msgstr "Balance des bleus"
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 #, fuzzy
 msgid "\"Blue Hue\" setting. Range -100 to 100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 #, fuzzy
 msgid "Blue Saturation"
 msgstr "Saturation"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 #, fuzzy
 msgid "\"Blue Saturation\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:408
+#: src/properties.cpp:424
 #, fuzzy
 msgid "\"Brightness\" setting. Range 0 to +150."
 msgstr "Réglage de Netteté"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 #, fuzzy
 msgid "Camera Profile"
 msgstr "Profil couleur"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 #, fuzzy
 msgid "\"Camera Profile\" setting."
 msgstr "Réglage appareil photo"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 #, fuzzy
 msgid "Chromatic Aberration Blue"
 msgstr "Réglage de saturation chromatique"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 #, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 #, fuzzy
 msgid "Chromatic Aberration Red"
 msgstr "Réglage de saturation chromatique"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 #, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 #, fuzzy
 msgid "Color Noise Reduction"
 msgstr "Réduction du bruit"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 #, fuzzy
 msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:413
+#: src/properties.cpp:429
 #, fuzzy
 msgid "\"Contrast\" setting. Range -50 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:414
+#: src/properties.cpp:430
 msgid "When \"Has Crop\" is true, top of crop rectangle"
 msgstr ""
 
-#: src/properties.cpp:415
+#: src/properties.cpp:431
 msgid "When \"Has Crop\" is true, left of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 #, fuzzy
 msgid "Crop Bottom"
 msgstr "Bas"
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "When \"Has Crop\" is true, bottom of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 #, fuzzy
 msgid "Crop Right"
 msgstr "Droit d'auteur"
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "When \"Has Crop\" is true, right of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 #, fuzzy
 msgid "Crop Angle"
 msgstr "haut, gauche"
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "When \"Has Crop\" is true, angle of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:419
+#: src/properties.cpp:435
 msgid "Width of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:420
+#: src/properties.cpp:436
 msgid "Height of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 #, fuzzy
 msgid "Crop Units"
 msgstr "Droit d'auteur"
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
 msgstr ""
 
-#: src/properties.cpp:422
+#: src/properties.cpp:438
 #, fuzzy
 msgid "\"Exposure\" setting. Range -4.0 to +4.0."
 msgstr "Réglage de Netteté"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 msgid "GreenHue"
 msgstr "Mode contrôle"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 #, fuzzy
 msgid "\"Green Hue\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 #, fuzzy
 msgid "Green Saturation"
 msgstr "Saturation"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 #, fuzzy
 msgid "\"Green Saturation\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 #, fuzzy
 msgid "Has Crop"
 msgstr "Compensation Flash"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "When true, image has a cropping rectangle."
 msgstr ""
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 #, fuzzy
 msgid "Has Settings"
 msgstr "Réglage flash"
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "When true, non-default camera raw settings."
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 msgid "Luminance Smoothing"
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 #, fuzzy
 msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 #, fuzzy
 msgid "Raw File Name"
 msgstr "Nom du fichier"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "File name of raw file (not a complete path)."
 msgstr ""
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 #, fuzzy
 msgid "Red Hue"
 msgstr "tonalité"
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 #, fuzzy
 msgid "\"Red Hue\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 #, fuzzy
 msgid "Red Saturation"
 msgstr "Saturation"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 #, fuzzy
 msgid "\"Red Saturation\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:431
+#: src/properties.cpp:447
 #, fuzzy
 msgid "\"Saturation\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 #, fuzzy
 msgid "Shadows"
 msgstr "Ombragé"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 #, fuzzy
 msgid "\"Shadows\" setting. Range 0 to +100."
 msgstr "Réglage de Netteté"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 #, fuzzy
 msgid "Shadow Tint"
 msgstr "Ombragé"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 #, fuzzy
 msgid "\"Shadow Tint\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:434
+#: src/properties.cpp:450
 #, fuzzy
 msgid "\"Sharpness\" setting. Range 0 to +100."
 msgstr "Réglage de Netteté"
 
-#: src/properties.cpp:435
+#: src/properties.cpp:451
 #, fuzzy
 msgid "\"Temperature\" setting. Range 2000 to 50000."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 #, fuzzy
 msgid "Tint"
 msgstr "Le fichier"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 #, fuzzy
 msgid "\"Tint\" setting. Range -150 to +150."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Tone Curve"
 msgstr "Courbe de tonalité"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
 msgstr ""
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 #, fuzzy
 msgid "Tone Curve Name"
 msgstr "Courbe de tonalité"
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid ""
 "The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
 "Contrast, Strong Contrast, Custom or a user-defined preset name."
 msgstr ""
 
-#: src/properties.cpp:440
+#: src/properties.cpp:456
 msgid "Version of Camera Raw plugin."
 msgstr ""
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 #, fuzzy
 msgid "Vignette Amount"
 msgstr "Point blanc"
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 #, fuzzy
 msgid "\"Vignetting Amount\" setting. Range -100 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 #, fuzzy
 msgid "Vignette Midpoint"
 msgstr "Point blanc"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 #, fuzzy
 msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
 msgstr "Réglage de saturation"
 
-#: src/properties.cpp:443
+#: src/properties.cpp:459
 msgid ""
 "\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
 "Tungsten, Fluorescent, Flash, Custom"
 msgstr ""
 
-#: src/properties.cpp:450
+#: src/properties.cpp:466
 msgid "TIFF tag 256, 0x100. Image width in pixels."
 msgstr ""
 
-#: src/properties.cpp:451 src/tags.cpp:354
+#: src/properties.cpp:467 src/tags.cpp:425
 msgid "Image Length"
 msgstr "Hauteur de l'image"
 
-#: src/properties.cpp:451
+#: src/properties.cpp:467
 msgid "TIFF tag 257, 0x101. Image height in pixels."
 msgstr ""
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 #, fuzzy
 msgid "Bits Per Sample"
 msgstr "Bits des échantillons"
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
 msgstr ""
 
-#: src/properties.cpp:453 src/tags.cpp:364
+#: src/properties.cpp:469 src/tags.cpp:435
 msgid "Compression"
 msgstr "Compression"
 
-#: src/properties.cpp:453
+#: src/properties.cpp:469
 msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
 msgstr ""
 
-#: src/properties.cpp:454 src/tags.cpp:370
+#: src/properties.cpp:470 src/tags.cpp:441
 msgid "Photometric Interpretation"
 msgstr "Interprétation photométrique"
 
-#: src/properties.cpp:454
+#: src/properties.cpp:470
 msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
 msgstr ""
 
-#: src/properties.cpp:455
+#: src/properties.cpp:471
 msgid ""
 "TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
 "0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
@@ -12820,117 +16195,117 @@
 "0th column at bottom 8 = 0th row at left, 0th column at bottom"
 msgstr ""
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 #, fuzzy
 msgid "Samples Per Pixel"
 msgstr "Échantillons par pixel"
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 msgid "TIFF tag 277, 0x115. Number of components per pixel."
 msgstr ""
 
-#: src/properties.cpp:465 src/tags.cpp:432
+#: src/properties.cpp:481 src/tags.cpp:515
 msgid "Planar Configuration"
 msgstr "Configuration planaire"
 
-#: src/properties.cpp:465
+#: src/properties.cpp:481
 msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
 msgstr ""
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 #, fuzzy
 msgid "YCbCr Sub Sampling"
 msgstr "Sous échantillonage YCbCr"
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid ""
 "TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
 "YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
+#: src/properties.cpp:484 src/tags.cpp:718
 msgid "YCbCr Positioning"
 msgstr "Positionnement YCbCr"
 
-#: src/properties.cpp:468
+#: src/properties.cpp:484
 msgid ""
 "TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
 "centered; 2 = co-sited."
 msgstr ""
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 #, fuzzy
 msgid "X Resolution"
 msgstr "Résolution X"
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
 msgstr ""
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 #, fuzzy
 msgid "Y Resolution"
 msgstr "Résolution Y"
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
 msgstr ""
 
-#: src/properties.cpp:472 src/tags.cpp:438
+#: src/properties.cpp:488 src/tags.cpp:533
 msgid "Resolution Unit"
 msgstr "Unité de résolution"
 
-#: src/properties.cpp:472
+#: src/properties.cpp:488
 msgid ""
 "TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
 "of: 2 = inches; 3 = centimeters."
 msgstr ""
 
-#: src/properties.cpp:474 src/tags.cpp:443
+#: src/properties.cpp:490 src/tags.cpp:538
 msgid "Transfer Function"
 msgstr "Fonction de transfert"
 
-#: src/properties.cpp:474
+#: src/properties.cpp:490
 msgid ""
 "TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
 "with 3 * 256 entries."
 msgstr ""
 
-#: src/properties.cpp:476 src/tags.cpp:471
+#: src/properties.cpp:492 src/tags.cpp:570
 msgid "White Point"
 msgstr "Point blanc"
 
-#: src/properties.cpp:476
+#: src/properties.cpp:492
 msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
 msgstr ""
 
-#: src/properties.cpp:477 src/tags.cpp:476
+#: src/properties.cpp:493 src/tags.cpp:575
 msgid "Primary Chromaticities"
 msgstr "Chromaticitées Primaire"
 
-#: src/properties.cpp:477
+#: src/properties.cpp:493
 msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
 msgstr ""
 
-#: src/properties.cpp:478
+#: src/properties.cpp:494
 msgid ""
 "TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
 msgstr ""
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 #, fuzzy
 msgid "Reference Black White"
 msgstr "Noir/Blanc de Référence"
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "TIFF tag 532, 0x214. Reference black and white point values."
 msgstr ""
 
-#: src/properties.cpp:480 src/tags.cpp:455
+#: src/properties.cpp:496 src/tags.cpp:550
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: src/properties.cpp:480
+#: src/properties.cpp:496
 msgid ""
 "TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
 "and time of image creation (no time zone in EXIF), stored in ISO 8601 "
@@ -12939,145 +16314,141 @@
 "ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
+#: src/properties.cpp:502 src/tags.cpp:463
 msgid "Image Description"
 msgstr "Description de l'image"
 
-#: src/properties.cpp:486
+#: src/properties.cpp:502
 msgid ""
 "TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
 "in XMP as dc:description."
 msgstr ""
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 #, fuzzy
 msgid "Make"
 msgstr "Dur"
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
 msgstr ""
 
-#: src/properties.cpp:488
+#: src/properties.cpp:504
 msgid "TIFF tag 272, 0x110. Model name or number of equipment."
 msgstr ""
 
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
-msgstr "Logiciel"
-
-#: src/properties.cpp:489
+#: src/properties.cpp:505
 msgid ""
 "TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
 "property is stored in XMP as xmp:CreatorTool. "
 msgstr ""
 
-#: src/properties.cpp:491
+#: src/properties.cpp:507
 msgid ""
 "TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
 "property is stored in XMP as the first item in the dc:creator array."
 msgstr ""
 
-#: src/properties.cpp:493
+#: src/properties.cpp:509
 msgid ""
 "TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
 "in XMP as dc:rights."
 msgstr ""
 
-#: src/properties.cpp:500 src/tags.cpp:1198
+#: src/properties.cpp:516 src/tags.cpp:1388
 msgid "Exif Version"
 msgstr "Version d'exif"
 
-#: src/properties.cpp:500
+#: src/properties.cpp:516
 msgid "EXIF tag 36864, 0x9000. EXIF version number."
 msgstr ""
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 #, fuzzy
 msgid "Flashpix Version"
 msgstr "Version FlashPix"
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
 msgstr ""
 
-#: src/properties.cpp:502
+#: src/properties.cpp:518
 msgid "EXIF tag 40961, 0xA001. Color space information"
 msgstr ""
 
-#: src/properties.cpp:503 src/tags.cpp:1209
+#: src/properties.cpp:519 src/tags.cpp:1399
+#, fuzzy
 msgid "Components Configuration"
-msgstr ""
+msgstr "Configuration image"
 
-#: src/properties.cpp:503
+#: src/properties.cpp:519
 msgid ""
 "EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
 "compressed data), 1 2 3 0 (other cases)."
 msgstr ""
 
-#: src/properties.cpp:505 src/tags.cpp:636
+#: src/properties.cpp:521 src/tags.cpp:823
 #, fuzzy
 msgid "Compressed Bits Per Pixel"
 msgstr "Bits compressés par pixel"
 
-#: src/properties.cpp:505
+#: src/properties.cpp:521
 msgid ""
 "EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
 "indicated in unit bits per pixel."
 msgstr ""
 
-#: src/properties.cpp:507 src/tags.cpp:1293
+#: src/properties.cpp:523 src/tags.cpp:1483
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: src/properties.cpp:507
+#: src/properties.cpp:523
 msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
 msgstr ""
 
-#: src/properties.cpp:508 src/tags.cpp:1300
+#: src/properties.cpp:524 src/tags.cpp:1490
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: src/properties.cpp:508
+#: src/properties.cpp:524
 msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
 msgstr ""
 
-#: src/properties.cpp:509 src/tags.cpp:1267
+#: src/properties.cpp:525 src/tags.cpp:1457
 msgid "User Comment"
 msgstr "Commentaire de l'utilisateur"
 
-#: src/properties.cpp:509
+#: src/properties.cpp:525
 msgid "EXIF tag 37510, 0x9286. Comments from user."
 msgstr ""
 
-#: src/properties.cpp:510 src/tags.cpp:1309
+#: src/properties.cpp:526 src/tags.cpp:1499
 msgid "Related Sound File"
 msgstr ""
 
-#: src/properties.cpp:510
+#: src/properties.cpp:526
 msgid ""
 "EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
 msgstr ""
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 #, fuzzy
 msgid "Date and Time Original"
 msgstr "Date et heure (originel)"
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid ""
 "EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
 "time when original image was generated, in ISO 8601 format. Includes the "
 "EXIF SubSecTimeOriginal data."
 msgstr ""
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 #, fuzzy
 msgid "Date and Time Digitized"
 msgstr "Date et heure (numérisé)"
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid ""
 "EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
 "time when image was stored as digital data, can be the same as "
@@ -13085,110 +16456,117 @@
 "format. Includes the EXIF SubSecTimeDigitized data."
 msgstr ""
 
-#: src/properties.cpp:518
+#: src/properties.cpp:534
+#, fuzzy
 msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
-msgstr ""
+msgstr "Temps d'exposition, en secondes (sec)."
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 #, fuzzy
 msgid "F Number"
 msgstr "Nombre F"
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "EXIF tag 33437, 0x829D. F number."
 msgstr ""
 
-#: src/properties.cpp:520
+#: src/properties.cpp:536
 msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
 msgstr ""
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
 msgid "Spectral Sensitivity"
 msgstr "Sensibilité spectrale"
 
-#: src/properties.cpp:521
+#: src/properties.cpp:537
 msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
 msgstr ""
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 #, fuzzy
 msgid "ISOSpeedRatings"
 msgstr "Vitesse en ISO"
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 msgid ""
 "EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: src/properties.cpp:524 src/tags.cpp:625
+#: src/properties.cpp:540 src/tags.cpp:812
 msgid "OECF"
 msgstr ""
 
-#: src/properties.cpp:524
+#: src/properties.cpp:540
 msgid ""
 "EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
 "ISO 14524."
 msgstr ""
 
-#: src/properties.cpp:525
+#: src/properties.cpp:541
 msgid ""
 "EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
 "specification."
 msgstr ""
 
-#: src/properties.cpp:526
+#: src/properties.cpp:542
+#, fuzzy
 msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:527 src/tags.cpp:639
+#: src/properties.cpp:543 src/tags.cpp:826
 #, fuzzy
 msgid "Brightness Value"
 msgstr "Valeur de luminosité"
 
-#: src/properties.cpp:527
+#: src/properties.cpp:543
+#, fuzzy
 msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:528
+#: src/properties.cpp:544
 msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
 msgstr ""
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 #, fuzzy
 msgid "Maximum Aperture Value"
 msgstr "Valeur maximal d'ouverture"
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
+#, fuzzy
 msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:530
+#: src/properties.cpp:546
 #, fuzzy
 msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
 msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:531
+#: src/properties.cpp:547
+#, fuzzy
 msgid "EXIF tag 37383, 0x9207. Metering mode."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:532
+#: src/properties.cpp:548
+#, fuzzy
 msgid "EXIF tag 37384, 0x9208. Light source."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:533
+#: src/properties.cpp:549
 msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
 msgstr ""
 
-#: src/properties.cpp:534
+#: src/properties.cpp:550
+#, fuzzy
 msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:535 src/tags.cpp:1259
+#: src/properties.cpp:551 src/tags.cpp:1449
 msgid "Subject Area"
 msgstr "Aire du sujet"
 
-#: src/properties.cpp:535
+#: src/properties.cpp:551
 #, fuzzy
 msgid ""
 "EXIF tag 37396, 0x9214. The location and area of the main subject in the "
@@ -13197,117 +16575,122 @@
 "Ce marqueur indique l'emplacement et l'aire du sujet principal dans la scène "
 "générale."
 
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
 msgid "Flash Energy"
 msgstr "Puissance flash"
 
-#: src/properties.cpp:536
+#: src/properties.cpp:552
 msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
 msgstr ""
 
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: src/properties.cpp:537
+#: src/properties.cpp:553
 msgid ""
 "EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
 "as specified in ISO 12233."
 msgstr ""
 
-#: src/properties.cpp:539 src/tags.cpp:650
+#: src/properties.cpp:555 src/tags.cpp:837
 #, fuzzy
 msgid "Focal Plane X Resolution"
 msgstr "x-Résolution du plan focal"
 
-#: src/properties.cpp:539
+#: src/properties.cpp:555
 msgid ""
 "EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
 "unit."
 msgstr ""
 
-#: src/properties.cpp:540 src/tags.cpp:651
+#: src/properties.cpp:556 src/tags.cpp:838
 #, fuzzy
 msgid "Focal Plane Y Resolution"
 msgstr "x-Résolution du plan focal"
 
-#: src/properties.cpp:540
+#: src/properties.cpp:556
 msgid ""
 "EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
 "unit."
 msgstr ""
 
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
 msgid "Focal Plane Resolution Unit"
 msgstr "Unité de résolution du plan focal"
 
-#: src/properties.cpp:541
+#: src/properties.cpp:557
 msgid ""
 "EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
 "FocalPlaneYResolution."
 msgstr ""
 
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
 msgid "Subject Location"
 msgstr "Emplacement du sujet"
 
-#: src/properties.cpp:542
+#: src/properties.cpp:558
 msgid ""
 "EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
 "value is the horizontal pixel and the second value is the vertical pixel at "
 "which the main subject appears."
 msgstr ""
 
-#: src/properties.cpp:545 src/tags.cpp:657
+#: src/properties.cpp:561 src/tags.cpp:844
 #, fuzzy
 msgid "Exposure Index"
 msgstr "Index d'exposition"
 
-#: src/properties.cpp:545
+#: src/properties.cpp:561
 msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
 msgstr ""
 
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
 msgid "Sensing Method"
 msgstr "Méthode de capture numérique"
 
-#: src/properties.cpp:546
+#: src/properties.cpp:562
 msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
 msgstr ""
 
-#: src/properties.cpp:547
+#: src/properties.cpp:563
+#, fuzzy
 msgid "EXIF tag 41728, 0xA300. Indicates image source."
-msgstr ""
+msgstr "Ce marqueur indique la distance au sujet."
 
-#: src/properties.cpp:548 src/tags.cpp:1364
+#: src/properties.cpp:564 src/tags.cpp:1554
 msgid "Scene Type"
 msgstr "Type de scène"
 
-#: src/properties.cpp:548
+#: src/properties.cpp:564
+#, fuzzy
 msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
-msgstr ""
+msgstr "Ce marqueur indique la distance au sujet."
 
-#: src/properties.cpp:549 src/tags.cpp:572
+#: src/properties.cpp:565 src/tags.cpp:759
 msgid "CFA Pattern"
 msgstr "Motif CFA"
 
-#: src/properties.cpp:549
+#: src/properties.cpp:565
 msgid ""
 "EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
 "sense."
 msgstr ""
 
-#: src/properties.cpp:550 src/tags.cpp:1374
+#: src/properties.cpp:566 src/tags.cpp:1564
 msgid "Custom Rendered"
 msgstr "Rendu personnalisé"
 
-#: src/properties.cpp:550
+#: src/properties.cpp:566
+#, fuzzy
 msgid ""
 "EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
 "data."
 msgstr ""
+"Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
+"a été enregistrée."
 
-#: src/properties.cpp:551
+#: src/properties.cpp:567
 #, fuzzy
 msgid ""
 "EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
@@ -13316,7 +16699,7 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/properties.cpp:552
+#: src/properties.cpp:568
 #, fuzzy
 msgid ""
 "EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
@@ -13325,11 +16708,11 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/properties.cpp:553 src/tags.cpp:1388
+#: src/properties.cpp:569 src/tags.cpp:1578
 msgid "Digital Zoom Ratio"
 msgstr "Rapport de zoom numérique"
 
-#: src/properties.cpp:553
+#: src/properties.cpp:569
 #, fuzzy
 msgid ""
 "EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
@@ -13338,11 +16721,11 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/properties.cpp:554 src/tags.cpp:1393
+#: src/properties.cpp:570 src/tags.cpp:1583
 msgid "Focal Length In 35mm Film"
 msgstr "Longueur focale dans un film de 35mm"
 
-#: src/properties.cpp:554
+#: src/properties.cpp:570
 #, fuzzy
 msgid ""
 "EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
@@ -13353,26 +16736,29 @@
 "avec un film de 35mm, en mm. Une valeur de 0 indique que la longueur focale "
 "est inconnue. Notez que ce marqueur est différent du marqueur <FocalLength>."
 
-#: src/properties.cpp:557 src/tags.cpp:1399
+#: src/properties.cpp:573 src/tags.cpp:1589
 msgid "Scene Capture Type"
 msgstr "Type de scène photographiée"
 
-#: src/properties.cpp:557
+#: src/properties.cpp:573
+#, fuzzy
 msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
 msgstr ""
+"Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
+"a été enregistrée."
 
-#: src/properties.cpp:558 src/tags.cpp:1404
+#: src/properties.cpp:574 src/tags.cpp:1594
 msgid "Gain Control"
 msgstr "Contrôle du gain"
 
-#: src/properties.cpp:558
+#: src/properties.cpp:574
 #, fuzzy
 msgid ""
 "EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
 "adjustment."
 msgstr "Ce marqueur indique le degré général d'ajustement du gain de l'image."
 
-#: src/properties.cpp:559
+#: src/properties.cpp:575
 #, fuzzy
 msgid ""
 "EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
@@ -13381,7 +16767,7 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/properties.cpp:560
+#: src/properties.cpp:576
 #, fuzzy
 msgid ""
 "EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
@@ -13390,7 +16776,7 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/properties.cpp:561
+#: src/properties.cpp:577
 #, fuzzy
 msgid ""
 "EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
@@ -13399,11 +16785,11 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/properties.cpp:562 src/tags.cpp:1419
+#: src/properties.cpp:578 src/tags.cpp:1609
 msgid "Device Setting Description"
 msgstr "Description des paramètres du matériel"
 
-#: src/properties.cpp:562
+#: src/properties.cpp:578
 #, fuzzy
 msgid ""
 "EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
@@ -13413,20 +16799,20 @@
 "vue pour un modèle particulier d'appareil. Ce marqueur n'est utilisé que "
 "pour indiquer les paramètres de prise de vue au lecteur."
 
-#: src/properties.cpp:563 src/tags.cpp:1424
+#: src/properties.cpp:579 src/tags.cpp:1614
 msgid "Subject Distance Range"
 msgstr "Échelle de distance au sujet"
 
-#: src/properties.cpp:563
+#: src/properties.cpp:579
 #, fuzzy
 msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
 msgstr "Ce marqueur indique la distance au sujet."
 
-#: src/properties.cpp:564 src/tags.cpp:1427
+#: src/properties.cpp:580 src/tags.cpp:1617
 msgid "Image Unique ID"
 msgstr "ID unique de l'image"
 
-#: src/properties.cpp:564
+#: src/properties.cpp:580
 #, fuzzy
 msgid ""
 "EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
@@ -13437,58 +16823,58 @@
 "enregistré sous la forme d'une chaîne ASCII équivalente à la notation "
 "hexadécimale et d'une longueur fixe de 128 bits."
 
-#: src/properties.cpp:566 src/tags.cpp:1501
+#: src/properties.cpp:582 src/tags.cpp:1691
 msgid "GPS Version ID"
 msgstr "ID version GPS"
 
-#: src/properties.cpp:566
+#: src/properties.cpp:582
 msgid ""
 "GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
 "period separators. The current value is \"2.0.0.0\"."
 msgstr ""
 
-#: src/properties.cpp:568 src/tags.cpp:1512
+#: src/properties.cpp:584 src/tags.cpp:1702
 msgid "GPS Latitude"
 msgstr "Latitude GPS"
 
-#: src/properties.cpp:568
+#: src/properties.cpp:584
 msgid ""
 "GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
 msgstr ""
 
-#: src/properties.cpp:569 src/tags.cpp:1524
+#: src/properties.cpp:585 src/tags.cpp:1714
 msgid "GPS Longitude"
 msgstr "Longitude GPS"
 
-#: src/properties.cpp:569
+#: src/properties.cpp:585
 msgid ""
 "GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
 msgstr ""
 
-#: src/properties.cpp:570 src/tags.cpp:1532
+#: src/properties.cpp:586 src/tags.cpp:1722
 msgid "GPS Altitude Reference"
 msgstr "Référence d'altitude GPS"
 
-#: src/properties.cpp:570
+#: src/properties.cpp:586
 #, fuzzy
 msgid ""
 "GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
 msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:571 src/tags.cpp:1540
+#: src/properties.cpp:587 src/tags.cpp:1730
 msgid "GPS Altitude"
 msgstr "Altitude GPS"
 
-#: src/properties.cpp:571
+#: src/properties.cpp:587
 #, fuzzy
 msgid "GPS tag 6, 0x06. Indicates altitude in meters."
 msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:572 src/tags.cpp:1544
+#: src/properties.cpp:588 src/tags.cpp:1734
 msgid "GPS Time Stamp"
 msgstr "Horodateur GPS"
 
-#: src/properties.cpp:572
+#: src/properties.cpp:588
 msgid ""
 "GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
 "data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
@@ -13498,178 +16884,191 @@
 "no date is available, do not write exif:GPSTimeStamp to XMP."
 msgstr ""
 
-#: src/properties.cpp:578 src/tags.cpp:1549
+#: src/properties.cpp:594 src/tags.cpp:1739
 msgid "GPS Satellites"
 msgstr "Satellites GPS"
 
-#: src/properties.cpp:578
+#: src/properties.cpp:594
 msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
 msgstr ""
 
-#: src/properties.cpp:579 src/tags.cpp:1556
+#: src/properties.cpp:595 src/tags.cpp:1746
 msgid "GPS Status"
 msgstr "Statut GPS"
 
-#: src/properties.cpp:579
+#: src/properties.cpp:595
+#, fuzzy
 msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:580 src/tags.cpp:1561
+#: src/properties.cpp:596 src/tags.cpp:1751
 msgid "GPS Measure Mode"
 msgstr "Mode de mesure GPS"
 
-#: src/properties.cpp:580
+#: src/properties.cpp:596
 msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 msgid "GPS DOP"
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 #, fuzzy
 msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
 msgstr "Degrés de précision des données GPS"
 
-#: src/properties.cpp:582 src/tags.cpp:1569
+#: src/properties.cpp:598 src/tags.cpp:1759
 msgid "GPS Speed Reference"
 msgstr "Référence de vitesse de GPS"
 
-#: src/properties.cpp:582
+#: src/properties.cpp:598
+#, fuzzy
 msgid "GPS tag 12, 0x0C. Units used to speed measurement."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:583 src/tags.cpp:1573
+#: src/properties.cpp:599 src/tags.cpp:1763
 msgid "GPS Speed"
 msgstr "Vitesse GPS"
 
-#: src/properties.cpp:583
+#: src/properties.cpp:599
+#, fuzzy
 msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
-msgstr ""
+msgstr "Degrés de précision des données GPS"
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
 #, fuzzy
 msgid "GPS Track Reference"
 msgstr "Référence de vitesse de GPS"
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
+#, fuzzy
 msgid "GPS tag 14, 0x0E. Reference for movement direction."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:585 src/tags.cpp:1580
+#: src/properties.cpp:601 src/tags.cpp:1770
+#, fuzzy
 msgid "GPS Track"
-msgstr ""
+msgstr "Référence de vitesse de GPS"
 
-#: src/properties.cpp:585
+#: src/properties.cpp:601
 msgid ""
 "GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
 msgstr ""
 
-#: src/properties.cpp:586 src/tags.cpp:1584
+#: src/properties.cpp:602 src/tags.cpp:1774
 msgid "GPS Image Direction Reference"
 msgstr "Référence de direction de l'image GPS"
 
-#: src/properties.cpp:586
+#: src/properties.cpp:602
 #, fuzzy
 msgid "GPS tag 16, 0x10. Reference for image direction."
 msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:587 src/tags.cpp:1588
+#: src/properties.cpp:603 src/tags.cpp:1778
 msgid "GPS Image Direction"
 msgstr "Direction de l'image GPS"
 
-#: src/properties.cpp:587
+#: src/properties.cpp:603
 msgid ""
 "GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
 "359.99."
 msgstr ""
 
-#: src/properties.cpp:588 src/tags.cpp:1592
+#: src/properties.cpp:604 src/tags.cpp:1782
+#, fuzzy
 msgid "GPS Map Datum"
-msgstr ""
+msgstr "Statut GPS"
 
-#: src/properties.cpp:588
+#: src/properties.cpp:604
+#, fuzzy
 msgid "GPS tag 18, 0x12. Geodetic survey data."
-msgstr ""
+msgstr "Degrés de précision des données GPS"
 
-#: src/properties.cpp:589 src/tags.cpp:1600
+#: src/properties.cpp:605 src/tags.cpp:1790
 msgid "GPS Destination Latitude"
 msgstr "Latitude de destination GPS"
 
-#: src/properties.cpp:589
+#: src/properties.cpp:605
 msgid ""
 "GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
 "destination latitude."
 msgstr ""
 
-#: src/properties.cpp:590 src/tags.cpp:1612
+#: src/properties.cpp:606 src/tags.cpp:1802
 msgid "GPS Destination Longitude"
 msgstr "Longitude de destination GPS"
 
-#: src/properties.cpp:590
+#: src/properties.cpp:606
 msgid ""
 "GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
 "longitude."
 msgstr ""
 
-#: src/properties.cpp:591 src/tags.cpp:1619
+#: src/properties.cpp:607 src/tags.cpp:1809
+#, fuzzy
 msgid "GPS Destination Bearing Reference"
-msgstr ""
+msgstr "Référence de latitude de destination GPS"
 
-#: src/properties.cpp:591
+#: src/properties.cpp:607
+#, fuzzy
 msgid "GPS tag 23, 0x17. Reference for movement direction."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:592 src/tags.cpp:1623
+#: src/properties.cpp:608 src/tags.cpp:1813
+#, fuzzy
 msgid "GPS Destination Bearing"
-msgstr ""
+msgstr "Latitude de destination GPS"
 
-#: src/properties.cpp:592
+#: src/properties.cpp:608
 msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
 msgstr ""
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
 #, fuzzy
 msgid "GPS Destination Distance Refefrence"
 msgstr "Référence de latitude de destination GPS"
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
+#, fuzzy
 msgid "GPS tag 25, 0x19. Units used for speed measurement."
-msgstr ""
+msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:594 src/tags.cpp:1631
+#: src/properties.cpp:610 src/tags.cpp:1821
 msgid "GPS Destination Distance"
 msgstr "Distance à la destination GPS"
 
-#: src/properties.cpp:594
+#: src/properties.cpp:610
 #, fuzzy
 msgid "GPS tag 26, 0x1A. Distance to destination."
 msgstr "La distance au sujet, donnée en mètres."
 
-#: src/properties.cpp:595 src/tags.cpp:1634
+#: src/properties.cpp:611 src/tags.cpp:1824
+#, fuzzy
 msgid "GPS Processing Method"
-msgstr ""
+msgstr "Méthode de capture numérique"
 
-#: src/properties.cpp:595
+#: src/properties.cpp:611
 msgid ""
 "GPS tag 27, 0x1B. A character string recording the name of the method used "
 "for location finding."
 msgstr ""
 
-#: src/properties.cpp:596 src/tags.cpp:1639
+#: src/properties.cpp:612 src/tags.cpp:1829
+#, fuzzy
 msgid "GPS Area Information"
-msgstr ""
+msgstr "Information GPS"
 
-#: src/properties.cpp:596
+#: src/properties.cpp:612
 msgid ""
 "GPS tag 28, 0x1C. A character string recording the name of the GPS area."
 msgstr ""
 
-#: src/properties.cpp:597 src/tags.cpp:1647
+#: src/properties.cpp:613 src/tags.cpp:1837
 msgid "GPS Differential"
 msgstr ""
 
-#: src/properties.cpp:597
+#: src/properties.cpp:613
 #, fuzzy
 msgid ""
 "GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
@@ -13678,95 +17077,105 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/properties.cpp:603
+#: src/properties.cpp:619
 msgid ""
 "A description of the lens used to take the photograph. For example, \"70-200 "
 "mm f/2.8-4.0\"."
 msgstr ""
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 #, fuzzy
 msgid "SerialNumber"
 msgstr "Numéro de série"
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid ""
 "The serial number of the camera or camera body used to take the photograph."
 msgstr ""
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
+#, fuzzy
 msgid "Contact Info-City"
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
 #, fuzzy
 msgid "The contact information city part."
 msgstr "Informations prise de vue"
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
+#, fuzzy
 msgid "Contact Info-Country"
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 #, fuzzy
 msgid "The contact information country part."
 msgstr "Informations prise de vue"
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
+#, fuzzy
 msgid "Contact Info-Address"
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid ""
 "The contact information address part. Comprises an optional company name and "
 "all required information to locate the building or postbox to which mail "
 "should be sent."
 msgstr ""
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
+#, fuzzy
 msgid "Contact Info-Postal Code"
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
+#, fuzzy
 msgid "The contact information part denoting the local postal code."
-msgstr ""
+msgstr "Informations prise de vue"
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 #, fuzzy
 msgid "Contact Info-State/Province"
 msgstr "État/Région"
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid ""
 "The contact information part denoting regional information like state or "
 "province."
 msgstr ""
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
+#, fuzzy
 msgid "Contact Info-Email"
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
+#, fuzzy
 msgid "The contact information email address part."
-msgstr ""
+msgstr "Informations prise de vue"
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
+#, fuzzy
 msgid "Contact Info-Phone"
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
+#, fuzzy
 msgid "The contact information phone number part."
-msgstr ""
+msgstr "Informations prise de vue"
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
 msgid "Contact Info-Web URL"
 msgstr ""
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
+#, fuzzy
 msgid "The contact information web address part."
-msgstr ""
+msgstr "Informations prise de vue"
 
-#: src/properties.cpp:619
+#: src/properties.cpp:635
 msgid ""
 "Code of the country the content is focussing on -- either the country shown "
 "in visual media or referenced in text or audio media. This element is at the "
@@ -13775,28 +17184,28 @@
 "should go to the \"Country\" element."
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid "Creator's Contact Info"
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid ""
 "The creator's contact information provides all necessary information to get "
 "in contact with the creator of this news object and comprises a set of sub-"
 "properties for proper addressing."
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid "Intellectual Genre"
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid ""
 "Describes the nature, intellectual or journalistic characteristic of a news "
 "object, not specifically its content."
 msgstr ""
 
-#: src/properties.cpp:627
+#: src/properties.cpp:643
 msgid ""
 "Name of a location the content is focussing on -- either the location shown "
 "in visual media or referenced by text or audio media. This location name "
@@ -13806,274 +17215,282 @@
 "geographical hierarchy."
 msgstr ""
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
+#, fuzzy
 msgid "IPTC Scene"
-msgstr ""
+msgstr "centre"
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid ""
 "Describes the scene of a photo content. Specifies one or more terms from the "
 "IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
 "in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 #, fuzzy
 msgid "IPTC Subject Code"
 msgstr "Aire du sujet"
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid ""
 "Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
 "to categorize the content. Each Subject is represented as a string of 8 "
 "digits in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
+#, fuzzy
 msgid "Additional model info"
-msgstr ""
+msgstr "informations de réglage appareil photo"
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
 msgid ""
 "Information about the ethnicity and other facts of the model(s) in a model-"
 "released image."
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid "Code of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid ""
 "Code from controlled vocabulary for identyfing the organisation or company "
 "which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid "Controlled Vocabulary Term"
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid ""
 "A term to describe the content of the image by a value from a Controlled "
 "Vocabulary."
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 #, fuzzy
 msgid "Model age"
 msgstr "Modèle"
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 msgid ""
 "Age of the human model(s) at the time this image was taken in a model "
 "released image."
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of the organisation or company which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 #, fuzzy
 msgid "Person shown"
 msgstr "Version"
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 msgid "Name of a person shown in the image."
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 #, fuzzy
 msgid "Digital Image Identifier"
 msgstr "Stabilisation de l'image"
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 msgid ""
 "Globally unique identifier for this digital image. It is created and applied "
 "by the creator of the digital image at the time of its creation. this value "
 "shall not be changed after that time."
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 msgid "Physical type of original photo"
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 #, fuzzy
 msgid "The type of the source digital file."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
 #, fuzzy
 msgid "Event"
 msgstr "Soirée"
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665
 msgid "Names or describes the specific event at which the photo was taken."
 msgstr ""
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 #, fuzzy
 msgid "Maximum available height"
 msgstr "Longueur focale maximum"
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 msgid ""
 "The maximum available height in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 #, fuzzy
 msgid "Maximum available width"
 msgstr "Longueur focale maximum"
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 msgid ""
 "The maximum available width in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid "Registry Entry"
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid ""
 "Both a Registry Item Id and a Registry Organisation Id to record any "
 "registration of this digital image with a registry."
 msgstr ""
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
+#, fuzzy
 msgid "Registry Entry-Item Identifier"
-msgstr ""
+msgstr "Stabilisation de l'image"
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
 msgid ""
 "A unique identifier created by a registry and applied by the creator of the "
 "digital image. This value shall not be changed after being applied. This "
 "identifier is linked to a corresponding Registry Organisation Identifier."
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid "Registry Entry-Organisation Identifier"
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid ""
 "An identifier for the registry which issued the corresponding Registry Image "
 "Id."
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 msgid "IPTC Fields Last Edited"
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 #, fuzzy
 msgid ""
 "The date and optionally time when any of the IPTC photo metadata fields has "
 "been last edited."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
 #, fuzzy
 msgid "Location shown"
 msgstr "Code du pays"
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
+#, fuzzy
 msgid "A location shown in the image."
-msgstr ""
+msgstr "Décalage de l'aperçu"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "Location Created"
 msgstr "Code du pays"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "The location the photo was taken."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Location-City"
 msgstr "Lieu précis"
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Name of the city of a location."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
 #, fuzzy
 msgid "Location-Country ISO-Code"
 msgstr "Code du pays"
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
+#, fuzzy
 msgid "The ISO code of a country of a location."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "Location-Country Name"
 msgstr "Nom du pays"
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "The name of a country of a location."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
 #, fuzzy
 msgid "Location-Province/State"
 msgstr "État Région"
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
+#, fuzzy
 msgid ""
 "The name of a subregion of a country - a province or state - of a location."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 #, fuzzy
 msgid "Location-Sublocation"
 msgstr "Lieu précis"
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 msgid ""
 "Name of a sublocation. This sublocation name could either be the name of a "
 "sublocation to a city or the name of a well known location or (natural) "
 "monument outside a city."
 msgstr ""
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
 #, fuzzy
 msgid "Location-World Region"
 msgstr "Code du pays"
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
+#, fuzzy
 msgid "The name of a world region of a location."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
+#, fuzzy
 msgid "Artwork or object in the image"
-msgstr ""
+msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
 msgid "A set of metadata about artwork or an object in the image."
 msgstr ""
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 #, fuzzy
 msgid "Artwork or object-Copyright notice"
 msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 msgid ""
 "Contains any necessary copyright notice for claiming the intellectual "
 "property for artwork or an object in the image and should identify the "
@@ -14081,1641 +17498,2182 @@
 "property rights."
 msgstr ""
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
+#, fuzzy
 msgid "Artwork or object-Creator"
-msgstr ""
+msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
 msgid ""
 "Contains the name of the artist who has created artwork or an object in the "
 "image. In cases where the artist could or should not be identified the name "
 "of a company or organisation may be appropriate."
 msgstr ""
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
+#, fuzzy
 msgid "Artwork or object-Date Created"
-msgstr ""
+msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
 msgid ""
 "Designates the date and optionally the time the artwork or object in the "
 "image was created. This relates to artwork or objects with associated "
 "intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
+#, fuzzy
 msgid "Artwork or object-Source"
-msgstr ""
+msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
 msgid ""
 "The organisation or body holding and registering the artwork or object in "
 "the image for inventory purposes."
 msgstr ""
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
+#, fuzzy
 msgid "Artwork or object-Source inventory number"
-msgstr ""
+msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
 msgid ""
 "The inventory number issued by the organisation or body holding and "
 "registering the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
+#, fuzzy
 msgid "Artwork or object-Title"
-msgstr ""
+msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
 msgid "A reference for the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:677
+#: src/properties.cpp:693
 msgid "Scan from film"
 msgstr ""
 
-#: src/properties.cpp:678
+#: src/properties.cpp:694
 msgid "Scan from transparency (including slide)"
 msgstr ""
 
-#: src/properties.cpp:679
+#: src/properties.cpp:695
 msgid "Scan from print"
 msgstr ""
 
-#: src/properties.cpp:680
+#: src/properties.cpp:696
 #, fuzzy
 msgid "Camera RAW"
 msgstr "Identifiant appareil photo"
 
-#: src/properties.cpp:681
+#: src/properties.cpp:697
 #, fuzzy
 msgid "Camera TIFF"
 msgstr "Identifiant appareil photo"
 
-#: src/properties.cpp:682
+#: src/properties.cpp:698
 #, fuzzy
 msgid "Camera JPEG"
 msgstr "Identifiant appareil photo"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 #, fuzzy
 msgid "PLUS Version"
 msgstr "Version du fichier"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 msgid ""
 "The version number of the PLUS standards in place at the time of the "
 "transaction."
 msgstr ""
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 #, fuzzy
 msgid "Licensee"
 msgstr "Objectif"
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 msgid ""
 "Party or parties to whom the license is granted by the Licensor/s under the "
 "license transaction."
 msgstr ""
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 #, fuzzy
 msgid "Licensee ID"
 msgstr "ID Objectif"
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 msgid "Optional PLUS-ID identifying each Licensee."
 msgstr ""
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Licensee Name"
 msgstr "Nom du pays"
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Name of each Licensee."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 #, fuzzy
 msgid "End User"
 msgstr "Externe"
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 msgid "Party or parties ultimately making use of the image under the license."
 msgstr ""
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
+#, fuzzy
 msgid "End User ID"
-msgstr ""
+msgstr "Externe"
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
 msgid "Optional PLUS-ID identifying each End User."
 msgstr ""
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
 #, fuzzy
 msgid "End User Name"
 msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
+#, fuzzy
 msgid "Name of each End User."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 #, fuzzy
 msgid "Licensor"
 msgstr "Objectif"
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 msgid "Party or parties granting the license to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 #, fuzzy
 msgid "Licensor ID"
 msgstr "ID Objectif"
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 msgid "Optional PLUS-ID identifying each Licensor."
 msgstr ""
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
 #, fuzzy
 msgid "Licensor Name"
 msgstr "Nom du pays"
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
+#, fuzzy
 msgid "Name of each Licensor."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor Address"
-msgstr ""
+msgstr "Température de l'objectif"
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor street address."
-msgstr ""
+msgstr "Libellé du pays"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
 msgid "Licensor Address Detail"
 msgstr ""
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
 msgid "Additional Licensor mailing address details."
 msgstr ""
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
 #, fuzzy
 msgid "Licensor City"
 msgstr "Mexico Ville"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
+#, fuzzy
 msgid "Licensor City name."
-msgstr ""
+msgstr "Libellé du pays"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
 #, fuzzy
 msgid "Licensor State or Province"
 msgstr "État/Région"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
+#, fuzzy
 msgid "Licensor State or Province name."
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
+#, fuzzy
 msgid "Licensor Postal Code"
-msgstr ""
+msgstr "Température de l'objectif"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
+#, fuzzy
 msgid "Licensor Postal Code or Zip Code."
-msgstr ""
+msgstr "État/Région"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country"
 msgstr "Pays"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country name."
 msgstr "Libellé du pays"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1"
-msgstr ""
+msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1."
-msgstr ""
+msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
+#, fuzzy
 msgid "Licensor Telephone 1"
-msgstr ""
+msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
 #, fuzzy
 msgid "Licensor Telephone number 1."
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2"
-msgstr ""
+msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2."
-msgstr ""
+msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
+#, fuzzy
 msgid "Licensor Telephone 2"
-msgstr ""
+msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
 #, fuzzy
 msgid "Licensor Telephone number 2."
 msgstr "Numéro de série de l'appareil photo"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email"
-msgstr ""
+msgstr "Nom du pays"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email address."
-msgstr ""
+msgstr "Nom du pays"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
+#, fuzzy
 msgid "Licensor URL"
-msgstr ""
+msgstr "Objectif"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 msgid "Licensor world wide web address."
 msgstr ""
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 #, fuzzy
 msgid "Licensor Notes"
 msgstr "Température de l'objectif"
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 msgid ""
 "Supplemental information for use in identifying and contacting the Licensor/"
 "s."
 msgstr ""
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 #, fuzzy
 msgid "PLUS Media Summary Code"
 msgstr "Mode de mesure GPS"
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 msgid ""
 "A PLUS-standardized alphanumeric code string summarizing the media usages "
 "included in the license."
 msgstr ""
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "License Start Date"
 msgstr "Date Minolta"
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "The date on which the license takes effect."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "License End Date"
 msgstr "Données de l'objectif"
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "The date on which the license expires."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 #, fuzzy
 msgid "Media Constraints"
 msgstr "Contraste"
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 msgid ""
 "Constraints limiting the scope of PLUS Media Usage/s included in the license "
 "to particular named media or to media not yet specifically defined in the "
 "PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
+#, fuzzy
 msgid "Region Constraints"
-msgstr ""
+msgstr "Contraste"
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
 msgid ""
 "Constraints limiting the scope of geographic distribution to specific "
 "cities, states, provinces or other areas to be included in or excluded from "
 "the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
+#, fuzzy
 msgid "Product or Service Constraints"
-msgstr ""
+msgstr "Contraste"
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
 msgid ""
 "Constraints limiting usage of the image to promotion of/association with a "
 "named product or service."
 msgstr ""
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 #, fuzzy
 msgid "Image File Constraints"
 msgstr "Réglage de qualité de l'image"
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 msgid ""
 "Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
+#, fuzzy
 msgid "Image Alteration Constraints"
-msgstr ""
+msgstr "Réglage de qualité de l'image"
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
 msgid ""
 "Constraints on alteration of the image by cropping, flipping, retouching, "
 "colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 #, fuzzy
 msgid "Image Duplication Constraints"
 msgstr "Réglage de qualité de l'image"
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 #, fuzzy
 msgid "Model Release Status"
 msgstr "Date de publication"
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 msgid ""
 "Summarizes the availability and scope of model releases authorizing usage of "
 "the likenesses of persons appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 #, fuzzy
 msgid "Model Release ID"
 msgstr "Numéro modèle"
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid ""
 "Age of the youngest model pictured in the image, at the time that the image "
 "was made."
 msgstr ""
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
+#, fuzzy
 msgid "Property Release Status"
-msgstr ""
+msgstr "Date de publication"
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
 msgid ""
 "Summarizes the availability and scope of property releases authorizing usage "
 "of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
+#, fuzzy
 msgid "Property Release ID"
-msgstr ""
+msgstr "Numéro modèle"
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
 msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
 #, fuzzy
 msgid "Other Constraints"
 msgstr "Contraste"
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
 msgid "Additional constraints on the license."
 msgstr ""
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
+#, fuzzy
 msgid "Credit Line Required"
-msgstr ""
+msgstr "Non utilisé"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
 msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Other License Requirements"
-msgstr ""
+msgstr "Objectif"
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Additional license requirements."
-msgstr ""
+msgstr "informations de réglage appareil photo"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
+#, fuzzy
 msgid "Terms and Conditions Text"
-msgstr ""
+msgstr "Condition de prise de vue"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
 msgid "Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
+#, fuzzy
 msgid "Terms and Conditions URL"
-msgstr ""
+msgstr "Condition de prise de vue"
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
 msgid "URL for Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
 #, fuzzy
 msgid "Other License Conditions"
 msgstr "Condition de prise de vue"
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
+#, fuzzy
 msgid "Additional license conditions."
-msgstr ""
+msgstr "informations de réglage appareil photo"
 
-#: src/properties.cpp:731
+#: src/properties.cpp:747
 #, fuzzy
 msgid "Identifies the type of image delivered."
 msgstr "Identifie le fournisseur et le produit"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
+#, fuzzy
 msgid "Licensor Image ID"
-msgstr ""
+msgstr "ID Objectif"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
 msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
 msgid "Image File Name As Delivered"
 msgstr ""
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
 msgid ""
 "Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
+#, fuzzy
 msgid "Image File Format As Delivered"
-msgstr ""
+msgstr "Réglage de qualité de l'image"
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 msgid ""
 "File format of the image file delivered to the Licensee for use under the "
 "license."
 msgstr ""
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
 msgid "Image File Size As Delivered"
 msgstr ""
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
 msgid "Size of the image file delivered to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright Status"
 msgstr "Droit d'auteur"
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright status of the image."
 msgstr "Notice Droit d'auteur"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
+#, fuzzy
 msgid "Copyright Registration Number"
-msgstr ""
+msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
 msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "First Publication Date"
 msgstr "Date de numérisation"
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "The date on which the image was first published."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 #, fuzzy
 msgid "Copyright Owner"
 msgstr "Droit d'auteur"
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 #, fuzzy
 msgid "Copyright Owner ID"
 msgstr "Droit d'auteur"
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
 #, fuzzy
 msgid "Copyright Owner Name"
 msgstr "Nom du propriétaire"
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
+#, fuzzy
 msgid "Name of Copyright Owner."
-msgstr ""
+msgstr "Droit d'auteur"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
+#, fuzzy
 msgid "Copyright Owner Image ID"
-msgstr ""
+msgstr "Droit d'auteur"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
 msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Image Creator"
 msgstr "Orientation"
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Creator/s of the image."
 msgstr "Décalage de l'aperçu"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 #, fuzzy
 msgid "Image Creator ID"
 msgstr "Orientation"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 msgid "Optional PLUS-ID identifying each Image Creator."
 msgstr ""
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Image Creator Name"
 msgstr "Type d'image"
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Name of Image Creator."
 msgstr "Comptage d'image"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
+#, fuzzy
 msgid "Image Creator Image ID"
-msgstr ""
+msgstr "Orientation"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
 msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 #, fuzzy
 msgid "Image Supplier ID"
 msgstr "ID unique de l'image"
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
 #, fuzzy
 msgid "Image Supplier Name"
 msgstr "Taille de l'image"
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
+#, fuzzy
 msgid "Name of Image Supplier."
-msgstr ""
+msgstr "Comptage d'image"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
+#, fuzzy
 msgid "Image Supplier Image ID"
-msgstr ""
+msgstr "ID unique de l'image"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
 msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
+#, fuzzy
 msgid "Licensee Image ID"
-msgstr ""
+msgstr "Effacer le comptage d'image"
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
 msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
 #, fuzzy
 msgid "Licensee Image Notes"
 msgstr "Effacer le comptage d'image"
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
+#, fuzzy
 msgid "Notes added by Licensee."
-msgstr ""
+msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
+#, fuzzy
 msgid "Other Image Info"
-msgstr ""
+msgstr "Objectif"
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
 #, fuzzy
 msgid "Additional image information."
 msgstr "informations de réglage appareil photo"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 #, fuzzy
 msgid "License ID"
 msgstr "ID Objectif"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
+#, fuzzy
 msgid "Licensor Transaction ID"
-msgstr ""
+msgstr "Date d'expiration"
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
 msgid ""
 "Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
+#, fuzzy
 msgid "Licensee Transaction ID"
-msgstr ""
+msgstr "Date d'expiration"
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
 msgid ""
 "Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 #, fuzzy
 msgid "Licensee Project Reference"
 msgstr "Date de référence"
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "License Transaction Date"
 msgstr "Date d'expiration"
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "The date of the License Transaction."
 msgstr "Le type de source lumineuse."
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 #, fuzzy
 msgid "Reuse"
 msgstr "utilisé"
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 msgid ""
 "Indicates whether a license is a repeat or an initial license.  Reuse may "
 "require that licenses stored in files previously delivered to the customer "
 "be updated."
 msgstr ""
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
+#, fuzzy
 msgid "Other License Documents"
-msgstr ""
+msgstr "Condition de prise de vue"
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
 msgid ""
 "Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Other License Info"
 msgstr "Objectif"
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
+#, fuzzy
 msgid "Additional license information."
-msgstr ""
+msgstr "informations de réglage appareil photo"
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
 msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:764
+#: src/properties.cpp:780
 #, fuzzy
 msgid "Custom 4"
 msgstr "Personnel 1"
 
-#: src/properties.cpp:765
+#: src/properties.cpp:781
 #, fuzzy
 msgid "Custom 5"
 msgstr "Personnel 1"
 
-#: src/properties.cpp:766
+#: src/properties.cpp:782
 #, fuzzy
 msgid "Custom 6"
 msgstr "Personnel 1"
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
 msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:767
+#: src/properties.cpp:783
 #, fuzzy
 msgid "Custom 7"
 msgstr "Personnel 1"
 
-#: src/properties.cpp:768
+#: src/properties.cpp:784
 #, fuzzy
 msgid "Custom 8"
 msgstr "Personnel 1"
 
-#: src/properties.cpp:769
+#: src/properties.cpp:785
 #, fuzzy
 msgid "Custom 9"
 msgstr "Personnel 1"
 
-#: src/properties.cpp:770
+#: src/properties.cpp:786
 #, fuzzy
 msgid "Custom 10"
 msgstr "Personnel 1"
 
-#: src/properties.cpp:777
+#: src/properties.cpp:793
 msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:778
+#: src/properties.cpp:794
 #, fuzzy
 msgid "Not Required"
 msgstr "Non utilisé"
 
-#: src/properties.cpp:784
+#: src/properties.cpp:800
 #, fuzzy
 msgid "Protected"
 msgstr "Identifiant du produit"
 
-#: src/properties.cpp:785
+#: src/properties.cpp:801
 #, fuzzy
 msgid "Public Domain"
 msgstr "Bas"
 
-#: src/properties.cpp:791
+#: src/properties.cpp:807
+#, fuzzy
 msgid "Credit Adjacent To Image"
-msgstr ""
+msgstr "Aperçu embarqué"
 
-#: src/properties.cpp:792
+#: src/properties.cpp:808
 msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:793
+#: src/properties.cpp:809
 #, fuzzy
 msgid "Credit on Image"
 msgstr "Aperçu embarqué"
 
-#: src/properties.cpp:794
+#: src/properties.cpp:810
 #, fuzzy
 msgid "Not Require"
 msgstr "Non défini"
 
-#: src/properties.cpp:799
+#: src/properties.cpp:815
 #, fuzzy
 msgid "No Colorization"
 msgstr "Solarisation"
 
-#: src/properties.cpp:800
+#: src/properties.cpp:816
 msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:801
+#: src/properties.cpp:817
 #, fuzzy
 msgid "No De-Colorization"
 msgstr "Solarisation"
 
-#: src/properties.cpp:802
+#: src/properties.cpp:818
 msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:803
+#: src/properties.cpp:819
+#, fuzzy
 msgid "No Merging"
-msgstr ""
+msgstr "Réduction du bruit"
 
-#: src/properties.cpp:804
+#: src/properties.cpp:820
 #, fuzzy
 msgid "No Retouching"
 msgstr "Réduction du bruit"
 
-#: src/properties.cpp:809
+#: src/properties.cpp:825
 msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:810
+#: src/properties.cpp:826
+#, fuzzy
 msgid "No Duplication Constraints"
-msgstr ""
+msgstr "Réglage de qualité de l'image"
 
-#: src/properties.cpp:811
+#: src/properties.cpp:827
 #, fuzzy
 msgid "No Duplication"
 msgstr "Durée audio"
 
-#: src/properties.cpp:816
+#: src/properties.cpp:832
 #, fuzzy
 msgid "Maintain File Name"
 msgstr "Nom du fichier"
 
-#: src/properties.cpp:817
+#: src/properties.cpp:833
+#, fuzzy
 msgid "Maintain File Type"
-msgstr ""
+msgstr "Nom du fichier"
 
-#: src/properties.cpp:818
+#: src/properties.cpp:834
 #, fuzzy
 msgid "Maintain ID in File Name"
 msgstr "Nom du fichier"
 
-#: src/properties.cpp:819
+#: src/properties.cpp:835
 #, fuzzy
 msgid "Maintain Metadata"
 msgstr "Date Minolta"
 
-#: src/properties.cpp:824
+#: src/properties.cpp:840
 #, fuzzy
 msgid "Windows Bitmap (BMP)"
 msgstr "Titre Windows"
 
-#: src/properties.cpp:825
+#: src/properties.cpp:841
 msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:826
+#: src/properties.cpp:842
 msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
-#: src/properties.cpp:827
+#: src/properties.cpp:843
 #, fuzzy
 msgid "Graphics Interchange Format (GIF)"
 msgstr "Format d'échange JPEG"
 
-#: src/properties.cpp:828
+#: src/properties.cpp:844
 #, fuzzy
 msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
 msgstr "Format d'échange JPEG"
 
-#: src/properties.cpp:830
+#: src/properties.cpp:846
 msgid "Macintosh Picture (PICT)"
 msgstr ""
 
-#: src/properties.cpp:831
+#: src/properties.cpp:847
 msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:832
+#: src/properties.cpp:848
 msgid "Photoshop Document (PSD)"
 msgstr ""
 
-#: src/properties.cpp:833
+#: src/properties.cpp:849
 msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:834
+#: src/properties.cpp:850
 msgid "Tagged Image File Format (TIFF)"
 msgstr ""
 
-#: src/properties.cpp:835
+#: src/properties.cpp:851
 msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:840
+#: src/properties.cpp:856
 msgid "Greater than 50 MB"
 msgstr ""
 
-#: src/properties.cpp:841
+#: src/properties.cpp:857
 msgid "Up to 1 MB"
 msgstr ""
 
-#: src/properties.cpp:842
+#: src/properties.cpp:858
 msgid "Up to 10 MB"
 msgstr ""
 
-#: src/properties.cpp:843
+#: src/properties.cpp:859
 msgid "Up to 30 MB"
 msgstr ""
 
-#: src/properties.cpp:844
+#: src/properties.cpp:860
 msgid "Up to 50 MB"
 msgstr ""
 
-#: src/properties.cpp:849
+#: src/properties.cpp:865
 #, fuzzy
 msgid "Illustrated Image"
 msgstr "Hauteur de l'image"
 
-#: src/properties.cpp:850
+#: src/properties.cpp:866
 msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:852
+#: src/properties.cpp:868
 msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:853
-#, fuzzy
-msgid "Video"
-msgstr "Large"
-
-#: src/properties.cpp:858
+#: src/properties.cpp:874
 msgid "Cell"
 msgstr ""
 
-#: src/properties.cpp:859
+#: src/properties.cpp:875
 msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:861
+#: src/properties.cpp:877
 #, fuzzy
 msgid "Pager"
 msgstr "Langue"
 
-#: src/properties.cpp:862
+#: src/properties.cpp:878
 msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:867
+#: src/properties.cpp:883
 #, fuzzy
 msgid "Age Unknown"
 msgstr "Inconnu"
 
-#: src/properties.cpp:868
+#: src/properties.cpp:884
 msgid "Age 25 or Over"
 msgstr ""
 
-#: src/properties.cpp:869
+#: src/properties.cpp:885
 msgid "Age 24"
 msgstr ""
 
-#: src/properties.cpp:870
+#: src/properties.cpp:886
 msgid "Age 23"
 msgstr ""
 
-#: src/properties.cpp:871
+#: src/properties.cpp:887
 msgid "Age 22"
 msgstr ""
 
-#: src/properties.cpp:872
+#: src/properties.cpp:888
 msgid "Age 21"
 msgstr ""
 
-#: src/properties.cpp:873
+#: src/properties.cpp:889
 msgid "Age 20"
 msgstr ""
 
-#: src/properties.cpp:874
+#: src/properties.cpp:890
 msgid "Age 19"
 msgstr ""
 
-#: src/properties.cpp:875
+#: src/properties.cpp:891
 msgid "Age 18"
 msgstr ""
 
-#: src/properties.cpp:876
+#: src/properties.cpp:892
 msgid "Age 17"
 msgstr ""
 
-#: src/properties.cpp:877
+#: src/properties.cpp:893
 msgid "Age 16"
 msgstr ""
 
-#: src/properties.cpp:878
+#: src/properties.cpp:894
 msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:879
+#: src/properties.cpp:895
 msgid "Age 14 or Under"
 msgstr ""
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
 msgid "Not Applicable"
 msgstr ""
 
-#: src/properties.cpp:886
+#: src/properties.cpp:902
+#, fuzzy
 msgid "Unlimited Model Releases"
-msgstr ""
+msgstr "Numéro modèle"
 
-#: src/properties.cpp:887
+#: src/properties.cpp:903
 msgid "Limited or Incomplete Model Releases"
 msgstr ""
 
-#: src/properties.cpp:894
+#: src/properties.cpp:910
 msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:895
+#: src/properties.cpp:911
 msgid "Limited or Incomplete Property Releases"
 msgstr ""
 
-#: src/properties.cpp:901
+#: src/properties.cpp:917
 msgid "Repeat Use"
 msgstr ""
 
-#: src/sigmamn.cpp:60
+#: src/properties.cpp:921 src/properties.cpp:930
+#, fuzzy
+msgid "Fixture Identification"
+msgstr "Version du Modèle"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+#, fuzzy
+msgid "Status"
+msgstr "Statut GPS"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
+msgstr ""
+
+#: src/properties.cpp:923 src/properties.cpp:932
+msgid "People"
+msgstr ""
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
+msgstr ""
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
+msgstr ""
+
+#: src/sigmamn.cpp:62
 msgid "Resolution Mode"
 msgstr "Mode résolution"
 
-#: src/sigmamn.cpp:61
+#: src/sigmamn.cpp:63
 msgid "Resolution mode"
 msgstr "Mode résolution"
 
-#: src/sigmamn.cpp:62
+#: src/sigmamn.cpp:65
 msgid "Autofocus Mode"
 msgstr "Mode autofocus"
 
-#: src/sigmamn.cpp:63
+#: src/sigmamn.cpp:66
 msgid "Autofocus mode"
 msgstr "Mode autofocus"
 
-#: src/sigmamn.cpp:65
+#: src/sigmamn.cpp:68
 msgid "Focus Setting"
 msgstr "Réglage mise au point"
 
-#: src/sigmamn.cpp:66
+#: src/sigmamn.cpp:69
 msgid "Focus setting"
 msgstr "Réglage mise au point"
 
-#: src/sigmamn.cpp:77
+#: src/sigmamn.cpp:80
+#, fuzzy
 msgid "Lens Range"
-msgstr ""
+msgstr "Échelle de transfert"
 
-#: src/sigmamn.cpp:78
+#: src/sigmamn.cpp:81
+#, fuzzy
 msgid "Lens focal length range"
-msgstr ""
+msgstr "Longueur focale minimale"
 
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
 msgid "Shadow"
 msgstr "Ombragé"
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
 msgid "Highlight"
 msgstr "Ensoleillé"
 
-#: src/sigmamn.cpp:101
+#: src/sigmamn.cpp:104
+#, fuzzy
 msgid "Fill Light"
-msgstr ""
+msgstr "Droit d'auteur"
 
-#: src/sigmamn.cpp:102
+#: src/sigmamn.cpp:105
 msgid "X3 Fill light"
 msgstr ""
 
-#: src/sigmamn.cpp:104
+#: src/sigmamn.cpp:107
 msgid "Color Adjustment"
 msgstr "justement couleurs"
 
-#: src/sigmamn.cpp:105
+#: src/sigmamn.cpp:108
 msgid "Color adjustment"
 msgstr "Ajustement couleurs"
 
-#: src/sigmamn.cpp:107
+#: src/sigmamn.cpp:110
 msgid "Adjustment Mode"
 msgstr "Mode ajustement"
 
-#: src/sigmamn.cpp:108
+#: src/sigmamn.cpp:111
 msgid "Adjustment mode"
 msgstr "Mode ajustement"
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
-msgstr "Microcode"
+#: src/sigmamn.cpp:122
+#, fuzzy
+msgid "Auto Bracket"
+msgstr "Bracketing automatique"
+
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
+msgid "Auto bracket"
+msgstr "Bracketing automatique"
+
+#: src/sigmamn.cpp:127
+msgid "Unknown SigmaMakerNote tag"
+msgstr "Marqueur de note du fabriquant Sigma inconnu"
+
+#: src/sigmamn.cpp:170
+msgid "8-Segment"
+msgstr "8-segments"
+
+#: src/sonymn.cpp:88
+#, fuzzy
+msgid "Standard "
+msgstr "Standard"
+
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
+msgstr ""
+
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
+msgstr ""
+
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
+msgstr ""
+
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
+msgstr ""
+
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
+msgstr ""
+
+#: src/sonymn.cpp:109
+#, fuzzy
+msgid "Landscape "
+msgstr "Paysage"
+
+#: src/sonymn.cpp:113
+#, fuzzy
+msgid "Night Scene / Twilight"
+msgstr "Scène de nuit"
+
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
+msgstr ""
+
+#: src/sonymn.cpp:115
+#, fuzzy
+msgid "Twilight Portrait"
+msgstr "Portrait de nuit"
+
+#: src/sonymn.cpp:116
+#, fuzzy
+msgid "Soft Snap"
+msgstr "Doux"
+
+#: src/sonymn.cpp:118
+#, fuzzy
+msgid "Smile Shutter"
+msgstr "Obturation lente"
+
+#: src/sonymn.cpp:120
+#, fuzzy
+msgid "High Sensitivity"
+msgstr "Sensibilité spectrale"
+
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
+msgstr ""
+
+#: src/sonymn.cpp:123
+#, fuzzy
+msgid "Gourmet"
+msgstr "Nom du document"
+
+#: src/sonymn.cpp:125
+#, fuzzy
+msgid "Handheld Twilight"
+msgstr "Lumière de bougie"
+
+#: src/sonymn.cpp:126
+#, fuzzy
+msgid "Anti Motion Blur"
+msgstr "Mode d'image"
+
+#: src/sonymn.cpp:128
+msgid "Backlight Correction HDR"
+msgstr ""
+
+#: src/sonymn.cpp:142
+#, fuzzy
+msgid "On (Continuous)"
+msgstr "Continue"
+
+#: src/sonymn.cpp:143
+#, fuzzy
+msgid "On (Shooting)"
+msgstr "Mode de prise de vue"
+
+#: src/sonymn.cpp:151
+msgid "Plus"
+msgstr ""
+
+#: src/sonymn.cpp:167
+#, fuzzy
+msgid "White Flourescent"
+msgstr "Fluorescent"
+
+#: src/sonymn.cpp:168
+#, fuzzy
+msgid "Cool White Flourescent"
+msgstr "Fluorescent"
+
+#: src/sonymn.cpp:169
+#, fuzzy
+msgid "Day White Flourescent"
+msgstr "Lumière du jour fluorescent"
+
+#: src/sonymn.cpp:172
+#, fuzzy
+msgid "Underwater 1 (Blue Water)"
+msgstr "Sous marin"
+
+#: src/sonymn.cpp:173
+#, fuzzy
+msgid "Underwater 2 (Green Water)"
+msgstr "Sous marin"
+
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
+msgstr ""
+
+#: src/sonymn.cpp:188
+#, fuzzy
+msgid "Center AF"
+msgstr "Centre"
+
+#: src/sonymn.cpp:189
+#, fuzzy
+msgid "Spot AF"
+msgstr "Spot"
+
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
+msgstr ""
+
+#: src/sonymn.cpp:191
+#, fuzzy
+msgid "Touch AF"
+msgstr "Balance des blancs en une touche"
+
+#: src/sonymn.cpp:192
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Mise au point manuel"
+
+#: src/sonymn.cpp:193
+#, fuzzy
+msgid "Face Detected"
+msgstr "Échec lors de la lecture"
+
+#: src/sonymn.cpp:208
+#, fuzzy
+msgid "Close Focus"
+msgstr "Mise au point auto"
+
+#: src/sonymn.cpp:224
+#, fuzzy
+msgid "Exposure Bracketing"
+msgstr "Avertissement exposition"
+
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+#, fuzzy
+msgid "Multi Burst Mode"
+msgstr "Mode rafale"
+
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+#, fuzzy
+msgid "Multi Burst Image Width"
+msgstr "Hauteur de l'image"
+
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+#, fuzzy
+msgid "Multi Burst Image Height"
+msgstr "Hauteur de l'image"
+
+#: src/sonymn.cpp:315
+#, fuzzy
+msgid "JPEG preview image"
+msgstr "Aperçu embarqué"
+
+#: src/sonymn.cpp:341
+#, fuzzy
+msgid "Auto HDR"
+msgstr "Automatique"
+
+#: src/sonymn.cpp:342
+msgid "High Definition Range Mode"
+msgstr ""
+
+#: src/sonymn.cpp:346
+#, fuzzy
+msgid "Shot Information"
+msgstr "Informations prise de vue"
+
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+#, fuzzy
+msgid "Sony Model ID"
+msgstr "Numéro modèle"
+
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+#, fuzzy
+msgid "Color Reproduction"
+msgstr "Réduction du bruit"
+
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+#, fuzzy
+msgid "Dynamic Range Optimizer"
+msgstr "Réglage gamme dynamique"
+
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+#, fuzzy
+msgid "Minolta MakerNote"
+msgstr "Date Minolta"
+
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+#, fuzzy
+msgid "Full Image Size"
+msgstr "Taille de l'image"
+
+#: src/sonymn.cpp:387
+#, fuzzy
+msgid "Preview Image Size"
+msgstr "Aperçu embarqué"
+
+#: src/sonymn.cpp:388
+#, fuzzy
+msgid "Preview image size"
+msgstr "Aperçu embarqué"
+
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
+msgstr ""
+
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Qualité"
+
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
+#, fuzzy
+msgid "Release Mode"
+msgstr "Date de publication"
+
+#: src/sonymn.cpp:415
+#, fuzzy
+msgid "Shot number in continous burst mode"
+msgstr "Numéro séquence (si en mode rafale)"
+
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+#, fuzzy
+msgid "Anti-Blur"
+msgstr "Anti flou"
+
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
+#, fuzzy
+msgid "Long Exposure Noise Reduction"
+msgstr "Réduction du bruit lors d'expositions longues"
+
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
+#, fuzzy
+msgid "Intelligent Auto"
+msgstr "Longueur intervalle"
+
+#: src/sonymn.cpp:434
+#, fuzzy
+msgid "Unknown Sony1MakerNote tag"
+msgstr "Marqueur de note du fabriquant Sony inconnu"
+
+#: src/sonymn.cpp:448
+#, fuzzy
+msgid "Continuous High"
+msgstr "Continue, Haute"
+
+#: src/sonymn.cpp:452
+#, fuzzy
+msgid "Continuous Low"
+msgstr "Continue, basse"
+
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
+#, fuzzy
+msgid "D-Range Optimizer Bracketing Low"
+msgstr "Optimisation d'image"
+
+#: src/sonymn.cpp:487
+#, fuzzy
+msgid "Autumn"
+msgstr "Automatique"
+
+#: src/sonymn.cpp:493
+msgid "ADI"
+msgstr ""
+
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
+msgstr ""
+
+#: src/sonymn.cpp:529
+#, fuzzy
+msgid "Auto No Flash"
+msgstr "Auto (Flash)"
+
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
+#, fuzzy
+msgid "Dynamic Range Optimizer Level"
+msgstr "Réglage gamme dynamique"
+
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
+#, fuzzy
+msgid "Creative Style"
+msgstr "Date de publication"
+
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
+#, fuzzy
+msgid "Zone Matching Value"
+msgstr "Valeur de luminosité"
 
-#: src/sigmamn.cpp:119
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
 #, fuzzy
-msgid "Auto Bracket"
-msgstr "Bracketing automatique"
+msgid "AF With Shutter"
+msgstr "Obturation rapide"
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
-msgid "Auto bracket"
-msgstr "Bracketing automatique"
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+#, fuzzy
+msgid "High ISO NoiseReduction"
+msgstr "Réduction de bruit Iso élevé"
 
-#: src/sigmamn.cpp:124
-msgid "Unknown SigmaMakerNote tag"
-msgstr "Marqueur de note du fabriquant Sigma inconnu"
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
+#, fuzzy
+msgid "Image Style"
+msgstr "Type d'image"
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
-msgstr "8-segments"
+#: src/sonymn.cpp:655
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings tag"
+msgstr "Marqueur 1 réglage appareil photo Canon inconnu"
 
-#: src/sonymn.cpp:80
-msgid "Unknown SonyMakerNote tag"
-msgstr "Marqueur de note du fabriquant Sony inconnu"
+#: src/sonymn.cpp:719
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings 2 tag"
+msgstr "Marqueur 2 réglage appareil photo Canon inconnu"
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
 msgid "Unknown section"
 msgstr "Section inconnue"
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
 msgid "Image data structure"
 msgstr "Structure des données de l'image"
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
 msgid "Recording offset"
 msgstr "Décalage d'enregistrement"
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
 msgid "Image data characteristics"
 msgstr "Caractéristique des données de l'image"
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 msgid "Other data"
 msgstr "Autre données"
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
 msgid "Exif data structure"
 msgstr "Structure des donnée Exif"
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
 msgid "Image configuration"
 msgstr "Configuration image"
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
 msgid "User information"
 msgstr "Information utilisateur"
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
+#, fuzzy
 msgid "Related file"
-msgstr ""
+msgstr "Heure de publication"
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 msgid "Date and time"
 msgstr "Date et heure"
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
 msgid "Picture taking conditions"
 msgstr "Condition de prise de vue"
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
 msgid "GPS information"
 msgstr "Information GPS"
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
 msgid "Interoperability information"
 msgstr "Information d'interopérabilité"
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
 msgid "Vendor specific information"
 msgstr "Information Spécifique au vendeur"
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 #, fuzzy
 msgid "Adobe DNG tags"
 msgstr "Adobe RGB"
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
+#, fuzzy
 msgid "Panasonic RAW tags"
-msgstr ""
+msgstr "Marqueur de note du fabriquant Panasonic inconnu"
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 msgid "TIFF/EP tags"
 msgstr ""
 
-#: src/tags.cpp:193
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
+msgstr ""
+
+#: src/tags.cpp:208
+#, fuzzy
+msgid "Adobe OPI tags"
+msgstr "Adobe RGB"
+
+#: src/tags.cpp:209
 msgid "Last section"
 msgstr "Dernière section"
 
-#: src/tags.cpp:213
+#: src/tags.cpp:225
+#, fuzzy
 msgid "Primary image"
-msgstr ""
+msgstr "Aperçu embarqué"
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
+#, fuzzy
 msgid "Thumbnail/Preview image"
-msgstr ""
+msgstr "Miniature"
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
 msgid "Primary image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
 msgid "Thumbnail/Preview image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
+#, fuzzy
 msgid "Primary image, Transparency mask"
-msgstr ""
+msgstr "Masque de transparence"
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
 msgid "Thumbnail/Preview image, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+#, fuzzy
+msgid "Full-resolution image data"
+msgstr "Impossible de lire les données de l'image"
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr ""
+
+#: src/tags.cpp:246
 msgid "inch"
 msgstr "Pouce"
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr ""
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr ""
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr ""
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
 msgstr "LZW"
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
 msgstr "JPEG (ancienne version)"
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr "JPEG"
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
 msgid "Adobe Deflate"
 msgstr "Décompression Adobe"
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
 msgstr "JBIG Noir & Blanc"
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 msgid "JBIG Color"
 msgstr "JBIG Couleur"
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr ""
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 #, fuzzy
 msgid "Epson ERF Compressed"
 msgstr "compression NEF Nikon"
 
-#: src/tags.cpp:244
+#: src/tags.cpp:264
+#, fuzzy
+msgid "Samsung SRW Compressed"
+msgstr "compression NEF Nikon"
+
+#: src/tags.cpp:265
 msgid "CCITT RLE 1-word"
 msgstr ""
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr ""
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr ""
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr ""
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr ""
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
+#, fuzzy
 msgid "IT8 Monochrome Picture"
-msgstr ""
+msgstr "Monochrome"
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr ""
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr ""
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr ""
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
+#, fuzzy
 msgid "Pixar Deflate"
-msgstr ""
+msgstr "Décompression Adobe"
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr ""
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
 msgid "ISO JBIG"
 msgstr "ISO JBIG"
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr ""
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr ""
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr ""
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 msgid "Nikon NEF Compressed"
 msgstr "compression NEF Nikon"
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
 #, fuzzy
 msgid "Kodak DCR Compressed"
 msgstr "compression NEF Nikon"
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 #, fuzzy
 msgid "Pentax PEF Compressed"
 msgstr "compression NEF Nikon"
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
 msgid "White Is Zero"
 msgstr "Blanc est zéro"
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
 msgid "Black Is Zero"
 msgstr "Noir est zéro"
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr "RGB"
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
 msgstr "Palette RGB"
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
 msgstr "Masque de transparence"
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
 msgstr "CMJN"
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr "CIELab"
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr "ICCLab"
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr "ITULab"
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
 msgid "Color Filter Array"
 msgstr "Matrice de filtre de couleur"
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr ""
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr ""
 
-#: src/tags.cpp:279
+#: src/tags.cpp:300
 msgid "Linear Raw"
 msgstr ""
 
-#: src/tags.cpp:284
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
+msgstr ""
+
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+#, fuzzy
+msgid "Randomized process"
+msgstr "Processus normal"
+
+#: src/tags.cpp:312
 msgid "top, left"
 msgstr "haut, gauche"
 
-#: src/tags.cpp:285
+#: src/tags.cpp:313
 msgid "top, right"
 msgstr "haut, droit"
 
-#: src/tags.cpp:286
+#: src/tags.cpp:314
 msgid "bottom, right"
 msgstr "bas, droit"
 
-#: src/tags.cpp:287
+#: src/tags.cpp:315
 msgid "bottom, left"
 msgstr "bas, gauche"
 
-#: src/tags.cpp:288
+#: src/tags.cpp:316
 msgid "left, top"
 msgstr "gauche, haut"
 
-#: src/tags.cpp:289
+#: src/tags.cpp:317
 msgid "right, top"
 msgstr "droit, haut"
 
-#: src/tags.cpp:290
+#: src/tags.cpp:318
 msgid "right, bottom"
 msgstr "droit, bas"
 
-#: src/tags.cpp:291
+#: src/tags.cpp:319 src/tags.cpp:320
 msgid "left, bottom"
 msgstr "gauche, bas"
 
-#: src/tags.cpp:296
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
+msgstr ""
+
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+#, fuzzy
+msgid "not CMYK"
+msgstr "CMJN"
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr ""
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
+msgstr ""
+
+#: src/tags.cpp:340 src/tags.cpp:341
+#, fuzzy
+msgid "Undefined data format"
+msgstr "Format de date non supporté"
+
+#: src/tags.cpp:346
+#, fuzzy
+msgid "Not indexed"
+msgstr "Non défini"
+
+#: src/tags.cpp:347 src/tags.cpp:653
+msgid "Indexed"
+msgstr ""
+
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
+
+#: src/tags.cpp:353
+msgid "B"
+msgstr ""
+
+#: src/tags.cpp:354
+msgid "C"
+msgstr ""
+
+#: src/tags.cpp:355
+msgid "A+B-C"
+msgstr ""
+
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:358
+msgid "(A+B)/2"
+msgstr ""
+
+#: src/tags.cpp:363
 msgid "Centered"
 msgstr "Centré"
 
-#: src/tags.cpp:297
+#: src/tags.cpp:364
+#, fuzzy
 msgid "Co-sited"
-msgstr ""
+msgstr "Près"
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
 msgid "No flash"
 msgstr "Pas de flash"
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 msgid "Fired, strobe return light not detected"
 msgstr "Flash déclenché, mode auto, lumière de retour non détectée"
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 msgid "Fired, strobe return light detected"
 msgstr "Flash déclenché, mode auto, lumière de retour détectée"
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
 #, fuzzy
 msgid "Yes, did not fire"
 msgstr "Le flash ne s'est pas déclenché."
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
 msgid "Yes, compulsory"
 msgstr "Flash déclenché, mode de flash obligatoire"
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 msgid "Yes, compulsory, return light not detected"
 msgstr ""
 "Flash déclenché, mode de flash obligatoire, lumière de retour non détectée"
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 msgid "Yes, compulsory, return light detected"
 msgstr "Flash déclenché, mode de flash obligatoire, lumière de retour détectée"
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
 msgstr "Non, inhibé"
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 #, fuzzy
 msgid "No, did not fire, return not detected"
 msgstr "Flash déclenché, mode auto, lumière de retour non détectée"
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 msgid "No, auto"
 msgstr "Non, mode auto"
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 msgid "Yes, auto"
 msgstr "Flash déclenché, mode auto"
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 msgid "Yes, auto, return light not detected"
 msgstr "Flash déclenché, mode auto, lumière de retour non détectée"
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 msgid "Yes, auto, return light detected"
 msgstr "Flash déclenché, mode auto, lumière de retour détectée"
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 msgid "No flash function"
 msgstr "Pas de fonction flash"
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 #, fuzzy
 msgid "No, no flash function"
 msgstr "Pas de fonction flash"
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
 msgid "Yes, red-eye reduction"
 msgstr "Flash déclenché, mode anti-yeux rouges"
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 msgid "Yes, red-eye reduction, return light not detected"
 msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour non détectée"
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 msgid "Yes, red-eye reduction, return light detected"
 msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour détectée"
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
 msgid "Yes, compulsory, red-eye reduction"
 msgstr "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges"
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr ""
 "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière "
 "de retour non détectée"
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr ""
 "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière "
 "de retour détectée"
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
 #, fuzzy
 msgid "No, red-eye reduction"
 msgstr "Flash déclenché, mode anti-yeux rouges"
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
 #, fuzzy
 msgid "No, auto, red-eye reduction"
 msgstr "Flash déclenché, mode anti-yeux rouges"
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
 msgid "Yes, auto, red-eye reduction"
 msgstr "Flash déclenché, mode anti-yeux rouges"
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour non détectée"
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour détectée"
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
 msgstr ""
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 msgid "Processing Software"
 msgstr "Logiciel de traitement"
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
 msgstr ""
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
 msgid "New Subfile Type"
 msgstr "Nouveau type de sous fichier"
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: src/tags.cpp:350
+#: src/tags.cpp:416
+#, fuzzy
+msgid "Subfile Type"
+msgstr "Nouveau type de sous fichier"
+
+#: src/tags.cpp:417
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
+msgstr ""
+
+#: src/tags.cpp:421
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -15724,7 +19682,7 @@
 "ligne. Dans des données compressées en JPEG un marqueur JPEG est utilisé à "
 "la place de ce marqueur."
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -15732,11 +19690,11 @@
 "Le nombre de lignes des données de l'image. Dans des données compressées en "
 "JPEG un marqueur JPEG est utilisé à la place de ce marqueur."
 
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr "Bits des échantillons"
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 msgid ""
 "The number of bits per image component. In this standard each component of "
 "the image is 8 bits, so the value for this tag is 8. See also "
@@ -15748,7 +19706,7 @@
 "<SamplesPerPixel>. Dans des données compressées en JPEG un marqueur JPEG est "
 "utilisé à la place de ce marqueur."
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
 msgid ""
 "The compression scheme used for the image data. When a primary image is JPEG "
 "compressed, this designation is not necessary and is omitted. When "
@@ -15759,7 +19717,7 @@
 "est omise. Lorsque les vignettes utilisent la compression JPEG, la valeur de "
 "ce marqueur est de 6."
 
-#: src/tags.cpp:371
+#: src/tags.cpp:442
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -15767,23 +19725,56 @@
 "La composition des pixels. Dans des données compressées en JPEG un marqueur "
 "JPEG est utilisé à la place de ce marqueur."
 
-#: src/tags.cpp:374
+#: src/tags.cpp:445
+msgid "Threshholding"
+msgstr ""
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+
+#: src/tags.cpp:449
+#, fuzzy
+msgid "Cell Width"
+msgstr "Droit d'auteur"
+
+#: src/tags.cpp:450
+msgid ""
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:453
+#, fuzzy
+msgid "Cell Length"
+msgstr "Longueur de l'aperçu"
+
+#: src/tags.cpp:454
+msgid ""
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr "Ordre de remplissage"
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
 msgstr ""
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
 msgid "Document Name"
 msgstr "Nom du document"
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
+#, fuzzy
 msgid "The name of the document from which this image was scanned"
-msgstr ""
+msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -15796,7 +19787,7 @@
 "octets est nécessaire, le marqueur privé exif <UserComment> doit être "
 "utilisé."
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -15806,7 +19797,7 @@
 "DSC, scanner, enregistreur vidéo ou tout autre équipement ayant généré "
 "l'image. Quand ce champ est vide, il est traité en tant qu'inconnu."
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
@@ -15817,7 +19808,7 @@
 "équipement ayant généré l'image. Quand ce champ est vide, il est traité en "
 "tant qu'inconnu."
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -15825,15 +19816,15 @@
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "L'orientation de l'image vue en terme de lignes et colonnes."
 
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr "Échantillons par pixel"
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
@@ -15843,11 +19834,11 @@
 "RGB et YCbCr, la valeur de ce marqueur est 3. Dans des données compressées "
 "en JPEG un marqueur JPEG est utilisé à la place de ce marqueur."
 
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr ""
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
 "strip when an image is divided into strips. With JPEG compressed data this "
@@ -15855,21 +19846,22 @@
 "<StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:420
+#: src/tags.cpp:503
+#, fuzzy
 msgid "Strip Byte Count"
-msgstr ""
+msgstr "Priorité obturation"
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: src/tags.cpp:424
+#: src/tags.cpp:507
 msgid "X-Resolution"
 msgstr "Résolution X"
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -15877,11 +19869,11 @@
 "Le nombre de pixels par <ResolutionUnit> dans la direction <ImageWidth>."
 "Lorsque la résolution de l'image est inconnu, 72 [dpi] sont utilisés."
 
-#: src/tags.cpp:428
+#: src/tags.cpp:511
 msgid "Y-Resolution"
 msgstr "Résolution Y"
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -15889,14 +19881,50 @@
 "Le nombre de pixels par <ResolutionUnit> dans la direction <ImageLength>.La "
 "même valeur que pour <XResolution> est utilisée."
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
 "If this field does not exist, the TIFF default of 1 (chunky) is assumed."
 msgstr ""
 
-#: src/tags.cpp:439
+#: src/tags.cpp:521
+#, fuzzy
+msgid "Gray Response Unit"
+msgstr "AF Points"
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr ""
+
+#: src/tags.cpp:524
+#, fuzzy
+msgid "Gray Response Curve"
+msgstr "Courbe de tonalité"
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+
+#: src/tags.cpp:527
+#, fuzzy
+msgid "T4 Options"
+msgstr "Оption"
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+#, fuzzy
+msgid "T6 Options"
+msgstr "Оption"
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -15906,7 +19934,7 @@
 "utilisée pour <XResolution> et <YResolution>. Si la résolution de l'image "
 "est inconnue, 2 (pouces) sont utilisées."
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
@@ -15917,7 +19945,7 @@
 "est spécifié dans le marqueur d'information sur l'espace des couleurs "
 "(<ColorSpace>)."
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -15929,7 +19957,7 @@
 "format détaillé n'est pas spécifié, mais il est recommandé que l'exemple ci-"
 "dessous soit suivi. Lorsque le champ est vide, il est traité comme inconnu."
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
 "time the file was changed."
@@ -15937,7 +19965,7 @@
 "La date et l'heure de création de l'image. Dans ce standard, il s'agit de la "
 "date et de l'heure de modification du fichier."
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 #, fuzzy
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
@@ -15953,17 +19981,28 @@
 "dessous pour faciliter l'interopérabilité. Lorsque le champ est laissé "
 "blanc, il est considéré comme inconnu."
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+msgid "Host Computer"
 msgstr ""
 
-#: src/tags.cpp:468
+#: src/tags.cpp:563
 msgid ""
 "This tag records information about the host computer used to generate the "
 "image."
 msgstr ""
 
-#: src/tags.cpp:472
+#: src/tags.cpp:566
+#, fuzzy
+msgid "Predictor"
+msgstr "Crédit"
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+
+#: src/tags.cpp:571
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the colorspace information tag "
@@ -15973,38 +20012,65 @@
 "pas nécessaire, puisque l'espace des couleurs est spécifié dans le marqueur "
 "d'information sur l'espace des couleurs (<ColorSpace>)."
 
-#: src/tags.cpp:477
+#: src/tags.cpp:576
+#, fuzzy
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since colorspace is specified in the colorspace "
 "information tag (<ColorSpace>)."
 msgstr ""
+"La chromaticité du point blanc de l'image. Normalement, ce marqueur n'est "
+"pas nécessaire, puisque l'espace des couleurs est spécifié dans le marqueur "
+"d'information sur l'espace des couleurs (<ColorSpace>)."
+
+#: src/tags.cpp:580
+#, fuzzy
+msgid "Color Map"
+msgstr "Matrice des couleurs"
+
+#: src/tags.cpp:581
+msgid ""
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
+msgstr ""
+
+#: src/tags.cpp:586
+msgid "Halftone Hints"
+msgstr ""
+
+#: src/tags.cpp:587
+msgid ""
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
+msgstr ""
 
-#: src/tags.cpp:481
+#: src/tags.cpp:591
 #, fuzzy
 msgid "Tile Width"
 msgstr "Largeur de l'image"
 
-#: src/tags.cpp:482
+#: src/tags.cpp:592
 msgid "The tile width in pixels. This is the number of columns in each tile."
 msgstr ""
 
-#: src/tags.cpp:484
+#: src/tags.cpp:594
 #, fuzzy
 msgid "Tile Length"
 msgstr "Longueur de l'aperçu"
 
-#: src/tags.cpp:485
+#: src/tags.cpp:595
 msgid ""
 "The tile length (height) in pixels. This is the number of rows in each tile."
 msgstr ""
 
-#: src/tags.cpp:487
+#: src/tags.cpp:597
 #, fuzzy
 msgid "Tile Offsets"
 msgstr "Décalage aperçu"
 
-#: src/tags.cpp:488
+#: src/tags.cpp:598
 msgid ""
 "For each tile, the byte offset of that tile, as compressed and stored on "
 "disk. The offset is specified with respect to the beginning of the TIFF "
@@ -16012,66 +20078,205 @@
 "the locations of other tiles."
 msgstr ""
 
-#: src/tags.cpp:493
+#: src/tags.cpp:603
+#, fuzzy
 msgid "Tile Byte Counts"
-msgstr ""
+msgstr "Priorité obturation"
 
-#: src/tags.cpp:494
+#: src/tags.cpp:604
 msgid ""
 "For each tile, the number of (compressed) bytes in that tile. See "
 "TileOffsets for a description of how the byte counts are ordered."
 msgstr ""
 
-#: src/tags.cpp:497
+#: src/tags.cpp:607
+#, fuzzy
 msgid "SubIFD Offsets"
-msgstr ""
+msgstr "Décalage aperçu"
 
-#: src/tags.cpp:498
+#: src/tags.cpp:608
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 
-#: src/tags.cpp:500
+#: src/tags.cpp:610
+#, fuzzy
+msgid "Ink Set"
+msgstr "Définition de"
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:613
+#, fuzzy
+msgid "Ink Names"
+msgstr "Nom du propriétaire"
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+#, fuzzy
+msgid "Number Of Inks"
+msgstr "Le nombre F."
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+#, fuzzy
+msgid "Dot Range"
+msgstr "Gamme dynamique"
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
+
+#: src/tags.cpp:622
+#, fuzzy
+msgid "Target Printer"
+msgstr "Ouverture cible"
+
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
+msgstr ""
+
+#: src/tags.cpp:625
+#, fuzzy
+msgid "Extra Samples"
+msgstr "Bits des échantillons"
+
+#: src/tags.cpp:626
+msgid ""
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
+msgstr ""
+
+#: src/tags.cpp:629
+#, fuzzy
+msgid "Sample Format"
+msgstr "Format du fichier"
+
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr ""
+
+#: src/tags.cpp:632
+#, fuzzy
+msgid "SMin Sample Value"
+msgstr "Débit audio"
+
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr ""
+
+#: src/tags.cpp:635
+#, fuzzy
+msgid "SMax Sample Value"
+msgstr "Valeur maximal d'ouverture"
+
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr ""
+
+#: src/tags.cpp:638
 msgid "Transfer Range"
 msgstr "Échelle de transfert"
 
-#: src/tags.cpp:501
+#: src/tags.cpp:639
 msgid "Expands the range of the TransferFunction"
 msgstr ""
 
-#: src/tags.cpp:503
+#: src/tags.cpp:641
+msgid "Clip Path"
+msgstr ""
+
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
 #, fuzzy
 msgid "JPEG tables"
 msgstr "Processus JPEG"
 
-#: src/tags.cpp:504
+#: src/tags.cpp:659
 msgid ""
 "This optional tag may be used to encode the JPEG quantization andHuffman "
 "tables for subsequent use by the JPEG decompression process."
 msgstr ""
 
-#: src/tags.cpp:507
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
 msgid "JPEG Process"
 msgstr "Processus JPEG"
 
-#: src/tags.cpp:508
+#: src/tags.cpp:667
 msgid "This field indicates the process used to produce the compressed data"
 msgstr ""
 
-#: src/tags.cpp:510
+#: src/tags.cpp:669
 msgid "JPEG Interchange Format"
 msgstr "Format d'échange JPEG"
 
-#: src/tags.cpp:511
+#: src/tags.cpp:670
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: src/tags.cpp:514
+#: src/tags.cpp:673
 msgid "JPEG Interchange Format Length"
 msgstr "Longueur du format d'échange JPEG"
 
-#: src/tags.cpp:515
+#: src/tags.cpp:674
 msgid ""
 "The number of bytes of JPEG compressed thumbnail data. This is not used for "
 "primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
@@ -16087,7 +20292,72 @@
 "de 64 kilo-octets, incluant toutes les autres données devant être "
 "enregistrées dans APP1."
 
-#: src/tags.cpp:523
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
+msgstr ""
+
+#: src/tags.cpp:682
+#, fuzzy
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
+msgstr ""
+"Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
+"a été enregistrée."
+
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
+msgstr ""
+
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
+msgstr ""
+
+#: src/tags.cpp:690
+msgid ""
+"This Field points to a list of point transform values, one per component."
+msgstr ""
+
+#: src/tags.cpp:692
+#, fuzzy
+msgid "JPEG Q-Tables"
+msgstr "Processus JPEG"
+
+#: src/tags.cpp:693
+msgid ""
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:696
+#, fuzzy
+msgid "JPEG DC-Tables"
+msgstr "Processus JPEG"
+
+#: src/tags.cpp:697
+msgid ""
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
+msgstr ""
+
+#: src/tags.cpp:700
+#, fuzzy
+msgid "JPEG AC-Tables"
+msgstr "Processus JPEG"
+
+#: src/tags.cpp:701
+msgid ""
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:705
 #, fuzzy
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
@@ -16102,11 +20372,11 @@
 "couleurs, avec la valeur par défaut étant celle donnant les caractéristiques "
 "optimales de l'image dans ces conditions."
 
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr "Sous échantillonage YCbCr"
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
 #, fuzzy
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
@@ -16115,7 +20385,7 @@
 "La composition des pixels. Dans des données compressées en JPEG un marqueur "
 "JPEG est utilisé à la place de ce marqueur."
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -16130,11 +20400,11 @@
 "both centered and co-sited positioning."
 msgstr ""
 
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr "Noir/Blanc de Référence"
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -16148,52 +20418,60 @@
 "couleurs, avec la valeur par défaut étant celle donnant les caractéristiques "
 "optimales de l'image dans ces conditions."
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr "Paquets XML"
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr "Métadonnées XMP (Adobe technote 9-14-02)"
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 msgid "Windows Rating"
 msgstr "Classement Windows"
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr ""
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
 msgid "Windows Rating Percent"
 msgstr "Classement Windows (pourcentage)"
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr ""
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+#, fuzzy
+msgid "Image ID"
+msgstr "ID unique de l'image"
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr "Dimension motif CFA"
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods"
 msgstr ""
 
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr "Niveau de charge"
-
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
 "photographer and editor copyrights. It is the copyright notice of the person "
@@ -16212,49 +20490,50 @@
 "it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 #, fuzzy
 msgid "Exposure time, given in seconds."
 msgstr "Temps d'exposition, en secondes (sec)."
 
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
 msgid "The F number."
 msgstr "Le nombre F."
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr "IPTC/NAA"
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr ""
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr ""
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr ""
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
 "contain image data as in the case of TIFF."
 msgstr ""
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
+#, fuzzy
 msgid "Inter Color Profile"
-msgstr ""
+msgstr "Profil couleur"
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
 msgstr ""
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -16262,47 +20541,50 @@
 "La classe du programme utilisé par l'appareil pour configurer l'exposition "
 "lorsque la photo a été prise."
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
+#, fuzzy
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
 msgstr ""
+"Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
+"a été enregistrée."
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
 msgstr ""
 
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
 msgid "ISO Speed Ratings"
 msgstr "Vitesse en ISO"
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
 "14524."
 msgstr ""
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Interlace"
 msgstr "Entrelacé"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 msgid "Indicates the field number of multifield images."
 msgstr ""
 
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 #, fuzzy
 msgid "Time Zone Offset"
 msgstr "Décalage aperçu"
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -16310,99 +20592,99 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 #, fuzzy
 msgid "Self Timer Mode"
 msgstr "Retardateur"
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "Date Time Original"
 msgstr "Date et heure (originel)"
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "The date and time when the original image data was generated."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
 
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 #, fuzzy
 msgid "Shutter speed."
 msgstr "Vitesse d'obturation"
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
 #, fuzzy
 msgid "The lens aperture."
 msgstr "Ouverture maximale"
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 #, fuzzy
 msgid "The value of brightness."
 msgstr "Le nombre F."
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 #, fuzzy
 msgid "The exposure bias."
 msgstr "Correction d'exposition"
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
 msgid "Max Aperture Value"
 msgstr "Valeur maximal d'ouverture"
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 #, fuzzy
 msgid "The smallest F number of the lens."
 msgstr "Le type de source lumineuse."
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr "La distance au sujet, donnée en mètres."
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
 msgid "The metering mode."
 msgstr "Le mode de mesure."
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr "Le type de source lumineuse."
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 #, fuzzy
 msgid "Indicates the status of flash when the image was shot."
 msgstr ""
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 msgid "The actual focal length of the lens, in mm."
 msgstr ""
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 msgid "Amount of flash energy (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 #, fuzzy
 msgid "Noise"
 msgstr "Aucun"
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr ""
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
@@ -16411,7 +20693,7 @@
 "Le nombre de pixels par <ResolutionUnit> dans la direction <ImageLength>.La "
 "même valeur que pour <XResolution> est utilisée."
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
@@ -16420,35 +20702,31 @@
 "Le nombre de pixels par <ResolutionUnit> dans la direction <ImageLength>.La "
 "même valeur que pour <XResolution> est utilisée."
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
 "FocalPlaneYResolution(37391)."
 msgstr ""
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 #, fuzzy
 msgid "Security Classification"
 msgstr "Augmentation électronique"
 
-#: src/tags.cpp:654
-msgid "Security classification assigned to the image."
-msgstr ""
-
-#: src/tags.cpp:655
+#: src/tags.cpp:841
 #, fuzzy
-msgid "Image History"
-msgstr "Hauteur de l'image"
+msgid "Security classification assigned to the image."
+msgstr "Augmentation électronique"
 
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 #, fuzzy
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
@@ -16456,90 +20734,92 @@
 "Ce marqueur indique l'emplacement et l'aire du sujet principal dans la scène "
 "générale."
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
+#, fuzzy
 msgid "TIFF/EP Standard ID"
-msgstr ""
+msgstr "F0/Standard"
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
 msgstr ""
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
+#, fuzzy
 msgid "Type of image sensor."
-msgstr ""
+msgstr "Comptage d'image"
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
 msgid "Windows Title"
 msgstr "Titre Windows"
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
 msgid "Windows Comment"
 msgstr "Commentaire Windows"
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 msgid "Windows Author"
 msgstr "Auteur Windows"
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
 msgid "Windows Keywords"
 msgstr "mots-clés Windows"
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 msgid "Windows Subject"
 msgstr "Sujet Windows"
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
 msgid "Subject tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
 msgid "Print Image Matching"
 msgstr ""
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
+#: src/tags.cpp:866
+msgid "Print Image Matching, description needed."
 msgstr ""
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
 #, fuzzy
 msgid "DNG version"
 msgstr "Version du fichier"
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
 "1, 1, 0, 0."
 msgstr ""
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
 #, fuzzy
 msgid "DNG backward version"
 msgstr "Version de microcode"
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -16549,12 +20829,12 @@
 "values, to verify it is able to correctly read the file."
 msgstr ""
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
 #, fuzzy
 msgid "Unique Camera Model"
 msgstr "Modèle de l'appareil"
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -16564,37 +20844,37 @@
 "replacement profiles."
 msgstr ""
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
 #, fuzzy
 msgid "Localized Camera Model"
 msgstr "Modèle de l'appareil"
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
 msgstr ""
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
 #, fuzzy
 msgid "CFA Plane Color"
 msgstr "Couleur FinePix"
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr ""
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr ""
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -16603,16 +20883,16 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
 #, fuzzy
 msgid "Black Level Repeat Dim"
 msgstr "Niveau de noir"
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -16620,12 +20900,12 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 #, fuzzy
 msgid "Black Level Delta H"
 msgstr "Niveau de noir"
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -16634,12 +20914,12 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 #, fuzzy
 msgid "Black Level Delta V"
 msgstr "Niveau de noir"
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -16647,24 +20927,24 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
 #, fuzzy
 msgid "White Level"
 msgstr "Niveau de charge"
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
 #, fuzzy
 msgid "Default Scale"
 msgstr "Défaut"
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -16674,11 +20954,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr ""
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16687,11 +20967,12 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
+#, fuzzy
 msgid "Default Crop Size"
-msgstr ""
+msgstr "Défaut"
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16699,12 +20980,12 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 #, fuzzy
 msgid "Color Matrix 1"
 msgstr "Matrice des couleurs"
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -16712,24 +20993,24 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 #, fuzzy
 msgid "Color Matrix 2"
 msgstr "Matrice des couleurs"
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 #, fuzzy
 msgid "Camera Calibration 1"
 msgstr "Réglage appareil photo (Z1)"
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16740,11 +21021,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
+#, fuzzy
 msgid "Camera Calibration 2"
-msgstr ""
+msgstr "Réglage appareil photo (Z1)"
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16755,11 +21037,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
+#, fuzzy
 msgid "Reduction Matrix 1"
-msgstr ""
+msgstr "Matrice des couleurs"
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16767,11 +21050,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
+#, fuzzy
 msgid "Reduction Matrix 2"
-msgstr ""
+msgstr "Matrice des couleurs"
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16779,12 +21063,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
 #, fuzzy
 msgid "Analog Balance"
 msgstr "Balance des bleus"
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -16795,35 +21079,35 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
 #, fuzzy
 msgid "As Shot Neutral"
 msgstr "Neutre"
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 msgid "As Shot White XY"
 msgstr ""
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
 #, fuzzy
 msgid "Baseline Exposure"
 msgstr "Exposition"
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -16838,11 +21122,12 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
+#, fuzzy
 msgid "Baseline Noise"
-msgstr ""
+msgstr "Exposition"
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -16851,12 +21136,12 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
 #, fuzzy
 msgid "Baseline Sharpness"
 msgstr "Netteté"
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -16864,11 +21149,11 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 msgid "Bayer Green Split"
 msgstr ""
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -16878,11 +21163,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr ""
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -16892,28 +21177,28 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
 "that captured the image."
 msgstr ""
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
 #, fuzzy
 msgid "Lens Info"
 msgstr "Objectif"
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
 "f-stops are unknown, they should be encoded as 0/0."
 msgstr ""
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr ""
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -16924,12 +21209,12 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
 #, fuzzy
 msgid "Anti Alias Strength"
 msgstr "Puissance Flash"
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -16938,35 +21223,35 @@
 "artifacts)."
 msgstr ""
 
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 #, fuzzy
 msgid "Shadow Scale"
 msgstr "Ombragé"
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
 msgstr ""
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 #, fuzzy
 msgid "DNG Private Data"
 msgstr "Données de prévisualisation"
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
 "programs that edit DNG files."
 msgstr ""
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
 #, fuzzy
 msgid "MakerNote Safety"
 msgstr "Note du fabriquant"
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -16975,22 +21260,23 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr ""
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
+#, fuzzy
 msgid "Calibration Illuminant 2"
-msgstr ""
+msgstr "Réduction du bruit"
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -16999,11 +21285,12 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
+#, fuzzy
 msgid "Best Quality Scale"
-msgstr ""
+msgstr "Défaut"
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -17012,12 +21299,12 @@
 "need to be multiplied to achieve the best quality image size."
 msgstr ""
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 #, fuzzy
 msgid "Raw Data Unique ID"
 msgstr "ID unique de l'image"
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -17027,22 +21314,23 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 #, fuzzy
 msgid "Original Raw File Name"
 msgstr "Nom du fichier"
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
+#, fuzzy
 msgid "Original Raw File Data"
-msgstr ""
+msgstr "Nom du fichier"
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -17055,23 +21343,23 @@
 "data blocks."
 msgstr ""
 
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 #, fuzzy
 msgid "Active Area"
 msgstr "Aire du sujet"
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
 msgstr ""
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 #, fuzzy
 msgid "Masked Areas"
 msgstr "Dur"
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -17081,11 +21369,12 @@
 "masked pixels are no longer useful."
 msgstr ""
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
+#, fuzzy
 msgid "As-Shot ICC Profile"
-msgstr ""
+msgstr "Profil couleur"
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -17098,11 +21387,11 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
 msgid "As-Shot Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -17114,12 +21403,12 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 #, fuzzy
 msgid "Current ICC Profile"
 msgstr "Profil couleur"
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17127,11 +21416,12 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
+#, fuzzy
 msgid "Current Pre-Profile Matrix"
-msgstr ""
+msgstr "Profil couleur"
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17139,211 +21429,207 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
 msgid "Unknown IFD tag"
 msgstr "Marqueur IFD inconnu"
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr "Non défini"
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 msgid "Creative program"
 msgstr "Programme Créatif"
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 msgid "Action program"
 msgstr "Programme Action"
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
 msgid "Portrait mode"
 msgstr "Mode portrait"
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
 msgid "Landscape mode"
 msgstr "Mode paysage"
 
-#: src/tags.cpp:1051
-msgid "Center weighted average"
-msgstr "Moyenne pondérée au centre"
-
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 msgid "Multi-spot"
 msgstr "Multi-spots"
 
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 msgid "Tungsten (incandescent light)"
 msgstr "Tungstène (lampe à incandescence)"
 
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
 msgstr "Ensoleillé"
 
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
 msgid "Cloudy weather"
 msgstr "Nuageux"
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 msgid "Daylight fluorescent (D 5700 - 7100K)"
 msgstr "Lumière du jour fluorescent (D 5700 - 7100K)"
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
 msgid "Day white fluorescent (N 4600 - 5400K)"
 msgstr "Blanc chaud fluorescent (N 4600 - 5400K)"
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
 msgid "Cool white fluorescent (W 3900 - 4500K)"
 msgstr "Blanc froid fluorescent (W 3900 - 4500K)"
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
 msgid "White fluorescent (WW 3200 - 3700K)"
 msgstr "Blanc fluorescent (WW 3200 - 3700K)"
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr "Lumière standard A"
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr "Lumière standard B"
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr "Lumière standard C"
 
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr "D55"
 
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr "D65"
 
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr "D75"
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 msgid "D50"
 msgstr "D55"
 
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
 msgid "ISO studio tungsten"
 msgstr "Lampe de studio tungstène ISO"
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 msgid "Other light source"
 msgstr "Autre source lumineuse"
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr "Non calibré"
 
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 msgid "One-chip color area"
 msgstr "Mono-CCD"
 
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 msgid "Two-chip color area"
 msgstr "Bi-CCD"
 
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 msgid "Three-chip color area"
 msgstr "Tri-CCD"
 
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 msgid "Color sequential area"
 msgstr "CCD séquentiel"
 
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr "Capteur trilinéaire"
 
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 msgid "Color sequential linear"
 msgstr "Capteur séquentiel linéaire"
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
 msgid "Film scanner"
 msgstr "Numériseur de film"
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr "Numériseur de documents imprimés"
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
 msgid "Digital still camera"
 msgstr "Appareil photo numérique"
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr "Photographié directement"
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
 msgid "Normal process"
 msgstr "Processus normal"
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
 msgid "Custom process"
 msgstr "Processus personnel"
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr "Faible augmentation du gain"
 
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr "Forte augmentation du gain"
 
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
 msgid "Low gain down"
 msgstr "Faible réduction du gain"
 
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr "Forte réduction du gain"
 
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr "Gros plan"
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr "Plan large"
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Temps d'exposition, en secondes (sec)."
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
 "tag value is an ASCII string compatible with the standard developed by the "
 "ASTM Technical Committee."
 msgstr ""
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr "Fonction de conversion opto-electrique"
 
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
 msgstr ""
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
 msgid "Date and Time (original)"
 msgstr "Date et heure (originel)"
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
@@ -17351,15 +21637,15 @@
 "La date et l'heure de création de l'image originale. Pour un appareil photo "
 "numérique il s'agit de la date et heure à laquelle la photo a été prise."
 
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
 msgid "Date and Time (digitized)"
 msgstr "Date et heure (numérisé)"
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 msgid "The date and time when the image was stored as digital data."
 msgstr "La date et l'heure où l'image a été sauvée sous forme digitale."
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -17369,60 +21655,60 @@
 "components other than Y, Cb, and Cr and to enable support of other sequences."
 msgstr ""
 
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr "Bits compressés par pixel"
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
 msgstr ""
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
 msgstr ""
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Ouverture de l'objectif. L'unité est la valeur APEX."
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
 msgstr ""
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr "Correction d'exposition"
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
 msgstr ""
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
 msgstr ""
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
@@ -17430,11 +21716,11 @@
 "Ce marqueur indique l'emplacement et l'aire du sujet principal dans la scène "
 "générale."
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
 msgid "Maker Note"
 msgstr "Note du fabriquant"
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -17442,56 +21728,57 @@
 "Un marqueur pour les constructeurs des logiciels d'écriture Exif pour noter "
 "une information désirée. Le contenu dépend du constructeur."
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
+#, fuzzy
 msgid "Sub-seconds Time"
-msgstr ""
+msgstr "Date et heure (originel)"
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 "Marqueur utilisé pour enregistrer des fractions de secondes pour le marqueur "
 "<DateTime>."
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 #, fuzzy
 msgid "Sub-seconds Time Original"
 msgstr "Date et heure (originel)"
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Marqueur utilisé pour enregistrer des fractions de secondes pour le marqueur "
 "<DateTimeOriginal>."
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 #, fuzzy
 msgid "Sub-seconds Time Digitized"
 msgstr "Date et heure (numérique)"
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Marqueur utilisé pour enregistrer des fractions de secondes pour le marqueur "
 "<DateTimeDigitized>."
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
 msgid "FlashPix Version"
 msgstr "Version FlashPix"
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB is used to define the color space based on the PC "
@@ -17500,7 +21787,7 @@
 "treated as sRGB when it is converted to FlashPix."
 msgstr ""
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -17508,7 +21795,7 @@
 "not exist in an uncompressed file."
 msgstr ""
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
@@ -17518,7 +21805,7 @@
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
@@ -17526,11 +21813,11 @@
 "characters). The path is not recorded."
 msgstr ""
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
 msgid "Interoperability IFD Pointer"
 msgstr "Pointeur IDF interopérabilité"
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -17539,24 +21826,24 @@
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 msgstr ""
 
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 msgid "Focal Plane X-Resolution"
 msgstr "x-Résolution du plan focal"
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17564,11 +21851,11 @@
 "Indique le nombre de pixels de largeur (X) de l'image par "
 "<FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
 
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 msgid "Focal Plane Y-Resolution"
 msgstr "x-Résolution du plan focal"
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17576,7 +21863,7 @@
 "Indique le nombre de pixels de hauteur (Y) de l'image par "
 "<FocalPlaneResolutionUnit> sur le plan focal de l'appareil."
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -17584,7 +21871,7 @@
 "Indique l'unité de mesure de <FocalPlaneXResolution> et de "
 "<FocalPlaneYResolution>. Cette valeur est la même que <ResolutionUnit>."
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -17592,21 +21879,21 @@
 "value indicates the X column number and second indicates the Y row number."
 msgstr ""
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
 msgid "Exposure index"
 msgstr "Index d'exposition"
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -17615,7 +21902,7 @@
 "ce marqueur doit toujours être de 3, indiquant que l'image a été directement "
 "photographiée."
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
@@ -17624,38 +21911,39 @@
 "marqueur doit toujours être de 1, indiquant que l'image a été directement "
 "photographiée."
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
+#, fuzzy
 msgid "Color Filter Array Pattern"
-msgstr ""
+msgstr "Matrice de filtre de couleur"
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods."
 msgstr ""
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
 "is expected to disable or minimize any further processing."
 msgstr ""
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
 "different exposure settings."
 msgstr ""
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
@@ -17665,7 +21953,7 @@
 "Si le numérateur de la valeur enregistrée est 0, cela signifie que le zoom "
 "numérique n'a pas été utilisé."
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
@@ -17675,18 +21963,22 @@
 "avec un film de 35mm, en mm. Une valeur de 0 indique que la longueur focale "
 "est inconnue. Notez que ce marqueur est différent du marqueur <FocalLength>."
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
+#, fuzzy
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
 "record the mode in which the image was shot. Note that this differs from the "
 "<SceneType> tag."
 msgstr ""
+"Ce marqueur indique la longueur focale équivalente en assumant un appareil "
+"avec un film de 35mm, en mm. Une valeur de 0 indique que la longueur focale "
+"est inconnue. Notez que ce marqueur est différent du marqueur <FocalLength>."
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Ce marqueur indique le degré général d'ajustement du gain de l'image."
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 #, fuzzy
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
@@ -17695,7 +21987,7 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 #, fuzzy
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
@@ -17704,7 +21996,7 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 #, fuzzy
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
@@ -17713,7 +22005,7 @@
 "Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
 "a été enregistrée."
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
@@ -17723,11 +22015,11 @@
 "vue pour un modèle particulier d'appareil. Ce marqueur n'est utilisé que "
 "pour indiquer les paramètres de prise de vue au lecteur."
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
 msgid "This tag indicates the distance to the subject."
 msgstr "Ce marqueur indique la distance au sujet."
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
@@ -17737,97 +22029,99 @@
 "enregistré sous la forme d'une chaîne ASCII équivalente à la notation "
 "hexadécimale et d'une longueur fixe de 128 bits."
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
 msgid "Unknown Exif tag"
 msgstr "Marqueur Exif inconnue"
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
 msgid "North"
 msgstr "Nord"
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
 msgid "South"
 msgstr "Sud"
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
 msgid "East"
 msgstr "Est"
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
 msgid "West"
 msgstr "Ouest"
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr "Au dessus du niveau de la mer"
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
 msgid "Below sea level"
 msgstr "En dessous du niveau de la mer"
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
+#, fuzzy
 msgid "Measurement in progress"
-msgstr ""
+msgstr "Index interopérabilité"
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
 #, fuzzy
 msgid "Measurement Interoperability"
 msgstr "Index interopérabilité"
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr "Km/h"
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr "mph"
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
 msgid "knots"
 msgstr "Noeuds"
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 #, fuzzy
 msgid "True direction"
 msgstr "Direction panorama"
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 #, fuzzy
 msgid "Magnetic direction"
 msgstr "Direction de l'image GPS"
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 #, fuzzy
 msgid "Kilometers"
 msgstr "Filtre"
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 #, fuzzy
 msgid "Miles"
 msgstr "Le fichier"
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 #, fuzzy
 msgid "Knots"
 msgstr "Noeuds"
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
+#, fuzzy
 msgid "Without correction"
-msgstr ""
+msgstr "Lieu précis"
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 msgid "Correction applied"
 msgstr ""
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
 "tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
@@ -17835,17 +22129,17 @@
 "2.0.0.0, the tag value is 02000000.H)."
 msgstr ""
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
 msgid "GPS Latitude Reference"
 msgstr "Référence de latitude GPS"
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
 msgstr ""
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17854,17 +22148,17 @@
 "given up to two decimal places, the format is dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
 msgid "GPS Longitude Reference"
 msgstr "Référence de longitude GPS"
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
 msgstr ""
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17873,7 +22167,7 @@
 "given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -17882,20 +22176,20 @@
 "that this tag is BYTE type, unlike other reference tags."
 msgstr ""
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
 msgstr ""
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
 "(atomic clock)."
 msgstr ""
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -17904,87 +22198,88 @@
 "the tag is set to NULL."
 msgstr ""
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
 "Interoperability."
 msgstr ""
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
 msgstr ""
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 msgid "GPS Data Degree of Precision"
 msgstr "Degrés de précision des données GPS"
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 msgstr ""
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
 msgid "Indicates the speed of GPS receiver movement."
 msgstr ""
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
+#, fuzzy
 msgid "GPS Track Ref"
-msgstr ""
+msgstr "Référence de vitesse de GPS"
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
 msgid "GPS Destination Latitude Refeference"
 msgstr "Référence de latitude de destination GPS"
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
 "latitude. The ASCII value \"N\" indicates north latitude, and \"S\" is south "
 "latitude."
 msgstr ""
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -17994,17 +22289,17 @@
 "the format would be dd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
 msgid "GPS Destination Longitude Reference"
 msgstr "Référence de longitude de destination GPS"
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII \"E\" indicates east longitude, and \"W\" is west longitude."
 msgstr ""
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -18014,70 +22309,75 @@
 "the format would be ddd/1,mmmm/100,0/1."
 msgstr ""
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
+#, fuzzy
 msgid "GPS Destination Distance Reference"
-msgstr ""
+msgstr "Référence de latitude de destination GPS"
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
 msgstr ""
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
+#, fuzzy
 msgid "Indicates the distance to the destination point."
-msgstr ""
+msgstr "Ce marqueur indique la distance au sujet."
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
 "followed by the name of the method."
 msgstr ""
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
 "GPS area."
 msgstr ""
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
 msgid "GPS Date Stamp"
 msgstr "Horodatage GPS"
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
 msgstr ""
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
+#, fuzzy
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
+"Ce marqueur indique le mode de balance des blancs positionné lorsque l'image "
+"a été enregistrée."
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 msgid "Unknown GPSInfo tag"
 msgstr "Marqueur GPSInfo inconnu"
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
 msgid "Interoperability Index"
 msgstr "Index interopérabilité"
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -18090,87 +22390,101 @@
 "d'interopérabilité recommandées pour exif (ExifR98) pour les autres "
 "marqueurs utilisés pour ExifR98."
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
 msgid "Interoperability Version"
 msgstr "Version interopérabilité"
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr "Version interopérabilité"
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
+#, fuzzy
 msgid "Related Image File Format"
-msgstr ""
+msgstr "Hauteur de l'image"
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
 msgid "File format of image file"
 msgstr "Format du fichier image"
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 #, fuzzy
 msgid "Related Image Width"
 msgstr "Hauteur de l'image"
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 msgid "Related Image Length"
 msgstr "Longueur de l'image"
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 msgid "Unknown Exif Interoperability tag"
 msgstr "Marqueur Interopérabilité Exif inconnu"
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
 #, fuzzy
 msgid "Offset"
 msgstr "décalage"
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr ""
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 #, fuzzy
 msgid "Byte Order"
 msgstr "Ordre de remplissage"
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
 msgstr ""
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 #, fuzzy
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr "Marqueur 2 de note du fabriquant Nikon inconnu"
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
 msgid "Unknown tag"
 msgstr "Marqueur inconnu"
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 msgid "Digital zoom not used"
 msgstr "Zoom numérique non utilisé"
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 #, fuzzy
 msgid "TIFF header, offset"
 msgstr "En-tête, décalage"
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr "encodage petit-boutiste"
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr "encodage gros-boutiste"
 
+#~ msgid "Software firmware version"
+#~ msgstr "Version du microcode"
+
+#, fuzzy
+#~ msgid "White Balance Bracketing "
+#~ msgstr "Biais de balance des blancs"
+
+#~ msgid "(Unknown Error)"
+#~ msgstr "(Erreur inconnue)"
+
+#~ msgid "Exposure Speed"
+#~ msgstr "Vitesse d'exposition"
+
+#~ msgid "Exposure speed"
+#~ msgstr "Vitesse d'exposition"
+
 #~ msgid "Color balance settings 1"
 #~ msgstr "Réglage balance des couleurs 1"
 
-#~ msgid "Tone curve"
-#~ msgstr "Courbe de tonalité"
-
 #~ msgid "Compression Curve"
 #~ msgstr "Courbe de compression"
 
@@ -18222,10 +22536,6 @@
 #~ msgid "component"
 #~ msgstr "composant"
 
-#, fuzzy
-#~ msgid "element"
-#~ msgstr "8-segments"
-
 #~ msgid "NEF Thumbnail Size"
 #~ msgstr "Taille aperçu NEF"
 
Binary files /tmp/TId3M1M1Ks/exiv2-0.19/po/pl.gmo and /tmp/B4Gg93MYI9/exiv2-0.21/po/pl.gmo differ
diff -Nru exiv2-0.19/po/pl.po exiv2-0.21/po/pl.po
--- exiv2-0.19/po/pl.po	2009-12-30 13:17:06.000000000 +0000
+++ exiv2-0.21/po/pl.po	2010-11-22 15:13:38.000000000 +0000
@@ -7,15 +7,16 @@
 #   Jakub Bogusz <qboosh@pld-linux.org>, 2005.
 #   Piotr Eljasiak <epiotr@use.pl>, 2007-2008.
 # Michał Smoczyk <msmoczyk@wp.pl>, 2009.
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\n"
 "PO-Revision-Date: 2009-12-30 14:02+0100\n"
 "Last-Translator: Michał Smoczyk <msmoczyk@wp.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,1648 +24,1948 @@
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Bookmarks: 991,1974,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
 msgstr "Nie można otworzyć pliku\n"
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 msgid "File size"
 msgstr "Rozmiar pliku"
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 msgid "Bytes"
 msgstr "Bajtów"
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 msgid "Image size"
 msgstr "Rozmiar obrazu"
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
 msgstr "Nie znaleziono żadnych danych Exif w pliku\n"
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 msgid "Camera make"
 msgstr "Producent aparatu"
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 msgid "Camera model"
 msgstr "Model aparatu"
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 msgid "Image timestamp"
 msgstr "Znacznik czasu zdjęcia"
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 msgid "Image number"
 msgstr "Numer zdjęcia"
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 msgid "Exposure time"
 msgstr "Czas ekspozycji"
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr "Przysłona"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 msgid "Exposure bias"
 msgstr "Odchylenie ekspozycji"
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr "Lampa błyskowa"
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 msgid "Flash bias"
 msgstr "Odchylenie ekspozycji błysku"
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 msgid "Focal length"
 msgstr "Długość ogniskowej "
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 msgid "35 mm equivalent"
 msgstr "odpowiednik 35mm"
 
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 msgid "Subject distance"
 msgstr "Odległość obiektu"
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 msgid "ISO speed"
 msgstr "Czułość ISO"
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 msgid "Exposure mode"
 msgstr "Tryb naświetlania"
 
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 msgid "Metering mode"
 msgstr "Tryb pomiaru"
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 msgid "Macro mode"
 msgstr "Tryb makro"
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 msgid "Image quality"
 msgstr "Jakość obrazu"
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 msgid "Exif Resolution"
 msgstr "Rozdzielczość Exif"
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 msgid "White balance"
 msgstr "Balans bieli"
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr "Brak"
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
 msgstr "Komentarz Exif"
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 msgid "No IPTC data found in the file\n"
 msgstr "Nie znaleziono żadnych danych IPTC w pliku\n"
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 msgid "No XMP data found in the file\n"
 msgstr "Nie znaleziono żadnych danych XMP w pliku\n"
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
 msgstr "(Pominięto dane binarne)"
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 msgid "JPEG comment"
 msgstr "Komentarz JPEG"
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 msgid "Preview"
 msgstr "Podgląd"
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
 msgstr "piksele"
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 msgid "bytes"
 msgstr "bajtów"
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 msgid "Neither tag"
 msgstr "Żaden znacznik"
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 msgid "nor"
 msgstr "ani"
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 msgid "found in the file"
 msgstr "znalezione w pliku"
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
 msgstr "Znacznik czasu tworzenia obrazu nie jest ustawiony w pliku"
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
 msgstr "Błąd podczas analizowania znacznika czasu"
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 msgid "in the file"
 msgstr "w pliku"
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
 msgstr "Uaktualnianie znacznika czasu do"
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 msgid "Erasing thumbnail data"
 msgstr "Usuwanie danych miniatury"
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
 msgstr "Usuwanie danych Exif z pliku"
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
 msgstr "Usuwanie danych IPTC z pliku"
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
 msgstr "Usuwanie komentarza JPEG z pliku"
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
 msgstr "Usuwanie danych XMP z pliku"
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
 msgstr "Obrazek nie zawiera miniatury Exif\n"
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 msgid "Writing thumbnail"
 msgstr "Zapisywanie miniatury"
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 msgid "to file"
 msgstr "do pliku"
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
 msgstr "Dane EXIF nie zawierają miniatury\n"
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
 msgstr "Obraz nie posiada podglądu"
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 msgid "Writing preview"
 msgstr "Zapisywanie podglądu"
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 msgid "Setting JPEG comment"
 msgstr "Ustawianie komentarza JPEG"
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 msgid "Failed to read"
 msgstr "Nie można odczytać"
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 msgid "value"
 msgstr "wartość"
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 msgid "Set"
 msgstr "Ustaw"
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr "Usuń"
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr ""
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
 msgstr "Znacznik czasu metadaty z kluczem"
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
 msgstr "nie ustawiono\n"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
 msgstr "Dostosowywanie"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
 msgstr "przez"
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 msgid "years"
 msgstr "lat"
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
 msgstr "rok"
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 msgid "months"
 msgstr "miesięcy"
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 msgid "month"
 msgstr "miesiąc"
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
 msgstr "dni"
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
 msgstr "dzień"
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
 msgstr "s"
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 #, fuzzy
 msgid "Can't adjust timestamp by"
 msgstr "Nie można dopasować znacznika czasu do"
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 msgid "to"
 msgstr "do"
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr "Standardowy znacznik Exif ISO istnieje, więc nie zmieniono go\n"
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
 msgstr "Ustawianie wartości Exif ISO na"
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1671
+#, fuzzy
+msgid "No Exif user comment found"
+msgstr "Komentarz Exif"
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:1692
+#, fuzzy
+msgid "Setting Exif UNICODE user comment to"
+msgstr "Ustawianie wartości Exif ISO na"
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
 msgstr "Zapisywanie danych Exif z"
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
 msgstr "Zapisywanie danych IPTC z"
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
 msgstr "Zapisywanie danych XMP z"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
 msgstr "Zapisywanie komentarza JPEG z"
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
 msgstr "Nie można zapisać metadanych do pliku"
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr "Format pliku zwrócił pustą nazwę dla pliku"
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
 msgstr "Ten plik posiada już poprawną nazwę"
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 msgid "File"
 msgstr "Plik"
 
-#: src/actions.cpp:1909
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
 msgstr "istnieje: (O) Nadpisać, (R) Zmienić nazwę czy (S) Anulować?"
 
-#: src/actions.cpp:1937
+#: src/actions.cpp:1970
 msgid "Renaming file to"
 msgstr "Zmianie nazwy pliku na"
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
 msgstr "aktualizacja znacznika czasu"
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
 msgstr "Nie można zmienić nazwy"
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr "Wyłączony"
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr "Włączony"
+
+#: src/canonmn.cpp:69
 msgid "PowerShot A30"
 msgstr "PowerShot A30"
 
-#: src/canonmn.cpp:61
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
 msgid "PowerShot A20"
 msgstr "PowerShot A20"
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
 msgid "PowerShot A10"
 msgstr "PowerShot A10"
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 msgid "PowerShot G2"
 msgstr "PowerShot G2"
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
 msgid "PowerShot S40"
 msgstr "PowerShot S40"
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
 msgid "PowerShot S30"
 msgstr "PowerShot S30"
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
 msgid "PowerShot A40"
 msgstr "PowerShot A40"
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr "EOS D30"
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
 msgid "PowerShot A100"
 msgstr "PowerShot A100"
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
 msgid "PowerShot A200"
 msgstr "PowerShot A200"
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 msgid "PowerShot G3"
 msgstr "PowerShot G3"
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
 msgid "PowerShot S45"
 msgstr "PowerShot S45"
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
 msgid "PowerShot A70"
 msgstr "PowerShot A70"
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
 msgid "PowerShot A60"
 msgstr "PowerShot A60"
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 msgid "PowerShot G5"
 msgstr "PowerShot G5"
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
 msgid "PowerShot A300"
 msgstr "PowerShot A300"
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
 msgid "PowerShot S50"
 msgstr "PowerShot S50"
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
 msgid "PowerShot A80"
 msgstr "PowerShot A80"
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
 msgid "PowerShot S1 IS"
 msgstr "PowerShot S1 IS"
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
 msgid "PowerShot Pro1"
 msgstr "PowerShot Pro1"
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
 msgid "PowerShot S70"
 msgstr "PowerShot S70"
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
 msgid "PowerShot S60"
 msgstr "PowerShot S60"
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 msgid "PowerShot G6"
 msgstr "PowerShot G6"
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
 msgid "PowerShot A75"
 msgstr "PowerShot A75"
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
 msgid "PowerShot A400"
 msgstr "PowerShot A400"
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
 msgid "PowerShot A310"
 msgstr "PowerShot A310"
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
 msgid "PowerShot A85"
 msgstr "PowerShot A85"
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
 msgid "PowerShot A95"
 msgstr "PowerShot A95"
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
 msgid "PowerShot A520"
 msgstr "PowerShot A520"
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
 msgid "PowerShot A510"
 msgstr "PowerShot A510"
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
 msgid "PowerShot S2 IS"
 msgstr "PowerShot S2 IS"
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr "EOS D60"
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
 msgid "PowerShot A430"
 msgstr "PowerShot A430"
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
 msgid "PowerShot A410"
 msgstr "PowerShot A410"
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
 msgid "PowerShot S80"
 msgstr "PowerShot S80"
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
 msgid "PowerShot A620"
 msgstr "PowerShot A620"
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
 msgid "PowerShot A610"
 msgstr "PowerShot A610"
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
 msgid "PowerShot TX1"
 msgstr "PowerShot TX1"
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
 msgid "PowerShot A420"
 msgstr "PowerShot A420"
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
 msgid "PowerShot A700"
 msgstr "PowerShot A700"
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
 msgid "PowerShot S3 IS"
 msgstr "PowerShot S3 IS"
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
 msgid "PowerShot A540"
 msgstr "PowerShot A540"
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 msgid "PowerShot G7"
 msgstr "PowerShot G7"
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
 msgid "PowerShot A530"
 msgstr "PowerShot A530"
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
 msgid "PowerShot A710 IS"
 msgstr "PowerShot A710 IS"
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
 msgid "PowerShot A640"
 msgstr "PowerShot A640"
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
 msgid "PowerShot A630"
 msgstr "PowerShot A630"
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
 msgid "PowerShot S5 IS"
 msgstr "PowerShot S5 IS"
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
 msgid "PowerShot A460"
 msgstr "PowerShot A460"
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr "PowerShot SD850 IS / Digital IXUS 950 IS"
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
 msgid "PowerShot A570 IS"
 msgstr "PowerShot A570 IS"
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
 msgid "PowerShot A560"
 msgstr "PowerShot A560"
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
 msgid "PowerShot A550"
 msgstr "PowerShot A550"
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
 msgid "PowerShot A450"
 msgstr "PowerShot A450"
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
 msgid "PowerShot Pro90 IS"
 msgstr "PowerShot Pro90 IS"
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 msgid "PowerShot G1"
 msgstr "PowerShot G1"
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr "PowerShot S100 / Digital IXUS / IXY Digital"
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr "HV10"
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr "iVIS DC50"
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr "iVIS HV20"
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr "EOS-1D"
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr "EOS-1DS"
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr "EOS 10D"
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr "EOS-1D Mark III"
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr "EOS Digital Rebel / 300D / Kiss Digital"
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr "EOS-1D Mark II"
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr "EOS 20D"
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr "EOS-1Ds Mark II"
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr "EOS Digital Rebel XT / 350D / Kiss Digital N"
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr "EOS 5D"
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr "EOS-1D Mark II N"
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr "EOS 30D"
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
+#: src/canonmn.cpp:170
+#, fuzzy
+msgid "EOS 7D"
+msgstr "EOS 5D"
+
+#: src/canonmn.cpp:171
+#, fuzzy
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
+
+#: src/canonmn.cpp:172
+#, fuzzy
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr "EOS Digital Rebel / 300D / Kiss Digital"
+
+#: src/canonmn.cpp:173
+#, fuzzy
+msgid "EOS 50D"
+msgstr "EOS 5D"
+
+#: src/canonmn.cpp:174
+#, fuzzy
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
+
+#: src/canonmn.cpp:175
+#, fuzzy
+msgid "EOS-1D Mark IV"
+msgstr "EOS-1D Mark II"
+
+#: src/canonmn.cpp:180
+#, fuzzy
+msgid "Format 1"
+msgstr "Format"
+
+#: src/canonmn.cpp:181
+#, fuzzy
+msgid "Format 2"
+msgstr "Format"
+
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+msgid "On (1)"
+msgstr "Włączone (1)"
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+msgid "On (2)"
+msgstr "Włączone (2)"
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr "Adobe RGB"
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
 msgid "Unknown"
 msgstr "Brak informacji"
 
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
 msgid "Camera Settings"
 msgstr "Ustawienia aparatu"
 
-#: src/canonmn.cpp:166
+#: src/canonmn.cpp:200
 msgid "Various camera settings"
 msgstr "Różne ustawienia aparatu"
 
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
 msgid "Focal Length"
 msgstr "Ogniskowa"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
 msgid "Shot Info"
 msgstr "Informacje o zdjęciu"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203
 msgid "Shot information"
 msgstr "Informacje o zdjęciu"
 
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
 msgid "Panorama"
 msgstr "panorama"
 
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
 msgid "Image Type"
 msgstr "Rodzaj obrazu"
 
-#: src/canonmn.cpp:171
+#: src/canonmn.cpp:205
 msgid "Image type"
 msgstr "Rodzaj obrazu"
 
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware Version"
 msgstr "Wersja firmware"
 
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware version"
 msgstr "Wersja firmware"
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
 msgid "File Number"
 msgstr "Numer pliku"
 
-#: src/canonmn.cpp:173
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
 msgid "File number"
 msgstr "Numer pliku"
 
-#: src/canonmn.cpp:174
+#: src/canonmn.cpp:208
 msgid "Owner Name"
 msgstr "Nazwa właściciela"
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 msgid "Serial Number"
 msgstr "Numer seryjny"
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 msgid "Camera serial number"
 msgstr "Numer seryjny aparatu"
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera Info"
+msgstr "Informacja o aparacie"
+
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera info"
+msgstr "Informacja o aparacie"
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 msgid "Custom Functions"
 msgstr "Funkcje użytkownika"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "ModelID"
 msgstr "ID modelu"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "Model ID"
 msgstr "Identyfikator modelu"
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
 msgid "Picture Info"
 msgstr "Informacje o zdjęciu"
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 msgid "Picture info"
 msgstr "Informacje o zdjęciu"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail Image Valid Area"
+msgstr "Obraz miniatury"
+
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail image valid area"
+msgstr "Obraz miniatury"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial Number Format"
+msgstr "Numer seryjny 2"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial number format"
+msgstr "Numer seryjny 2"
+
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+msgid "Super Macro"
+msgstr "Super Makro"
+
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+msgid "Super macro"
+msgstr "Super makro"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF Info"
+msgstr "Informacja AF"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+msgid "AF info"
+msgstr "Informacja AF"
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
 msgid "White Balance Table"
 msgstr "Tablica balansu bieli"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:219
 msgid "White balance table"
 msgstr "Tablica balansu bieli"
 
-#: src/canonmn.cpp:185
-msgid "Unknown CanonMakerNote tag"
-msgstr "Nieznany znacznik CanonMakerNote"
+#: src/canonmn.cpp:220
+#, fuzzy
+msgid "LensModel"
+msgstr "Model obiektywu"
 
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
-msgstr "Włączony"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+msgid "Internal Serial Number"
+msgstr "Wewnętrzny numer seryjny"
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
-msgstr "Wyłączony"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+msgid "Internal serial number"
+msgstr "Wewnętrzny numer seryjny"
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
+msgstr ""
+
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
+
+#: src/canonmn.cpp:223
+#, fuzzy
+msgid "Custom functions"
+msgstr "Funkcje użytkownika"
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing Info"
+msgstr "Program"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing info"
+msgstr "Program"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured Color"
+msgstr "Barwa naturalna"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured color"
+msgstr "Naturalny (kolorowy)"
+
+#: src/canonmn.cpp:226
+#, fuzzy
+msgid "ColorSpace"
+msgstr "Przestrzeń kolorów"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD Offset"
+msgstr "Przesunięcie"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD offset"
+msgstr "przesunięcie"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor Info"
+msgstr "Obiektyw"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor info"
+msgstr "Informacje o zdjęciu"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color Data"
+msgstr "Matryca kolorów"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color data"
+msgstr "Moje dane kolorów"
+
+#: src/canonmn.cpp:234
+msgid "Unknown CanonMakerNote tag"
+msgstr "Nieznany znacznik CanonMakerNote"
+
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
 msgid "Economy"
 msgstr "Ekonomiczny"
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
 msgid "Normal"
 msgstr "Normalna"
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
 msgid "Fine"
 msgstr "Dobra"
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
 msgid "RAW"
 msgstr "RAW"
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:254
 msgid "Superfine"
 msgstr "Bardzo dobra"
 
-#: src/canonmn.cpp:206
+#: src/canonmn.cpp:255
 msgid "Normal Movie"
 msgstr "Normalny film"
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 msgid "Auto"
 msgstr "Auto"
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
 msgid "Red-eye"
 msgstr "Redukcja czerwonych oczu"
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 msgid "Slow sync"
 msgstr "Synchronizacja z długimi czasami"
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
 msgid "Auto + red-eye"
 msgstr "Automatycznie + redukcja czerwonych oczu"
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
 msgid "On + red-eye"
 msgstr "Tak, redukcja czerwonych oczu"
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
 msgid "External"
 msgstr "Zewnętrzny"
 
-#: src/canonmn.cpp:223
+#: src/canonmn.cpp:273
 #, fuzzy
 msgid "Single / timer"
 msgstr "Pojedynczy / czasowo"
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
 msgid "Continuous"
 msgstr "Ciągły"
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
 msgid "Movie"
 msgstr "Film"
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 msgid "Continuous, speed priority"
 msgstr "Ciągły, priorytet szybkości"
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
 #, fuzzy
 msgid "Continuous, low"
 msgstr "Ciągły, niski"
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
 #, fuzzy
 msgid "Continuous, high"
 msgstr "Ciągły, wysoki"
 
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 msgid "One shot AF"
 msgstr "One shot AF"
 
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
 msgid "AI servo AF"
 msgstr "AI servo AF"
 
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
 msgid "AI focus AF"
 msgstr "AI focus AF"
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 msgid "Manual focus"
 msgstr "Ręczne ostrzenie"
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
 msgid "Single"
 msgstr "Pojedynczy"
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
+#, fuzzy
 msgid "Pan focus"
-msgstr ""
+msgstr "Śledzące ostrzenie"
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
 msgid "Large"
 msgstr "Duży"
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
 msgid "Medium"
 msgstr "Średni"
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
 msgid "Small"
 msgstr "Mały"
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
 msgid "Medium 1"
 msgstr "Średni 1"
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
 msgid "Medium 2"
 msgstr "Średni 2"
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
 msgid "Medium 3"
 msgstr "Średni 3"
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
 msgid "Full auto"
 msgstr "Pełna automatyka"
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr "Ręczny"
 
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr "Pejzaż"
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
 msgid "Fast shutter"
 msgstr "Szybka migawka"
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 msgid "Slow shutter"
 msgstr "Wolna migawka"
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 msgid "Night Scene"
 msgstr "Scena nocna"
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
 msgid "Gray scale"
 msgstr "Skala odcieni szarości"
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
 msgstr "Sepia"
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 msgid "Sports"
 msgstr "Sport"
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 msgid "Macro / close-up"
 msgstr "Makro / zbliżenie"
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 msgid "Black & white"
 msgstr "Czarno-biały"
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 msgid "Vivid"
 msgstr "Jaskrawy"
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
 msgid "Flash off"
 msgstr "Flesz wyłączony"
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 msgid "Long shutter"
 msgstr "Długo otwarta migawka"
 
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr "Super makro"
-
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
 msgid "Foliage"
 msgstr "Listowie"
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
 msgid "Indoor"
 msgstr "W pomieszczeniu"
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
 msgstr "Fajerwerki"
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
 msgstr "Plaża"
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 msgid "Underwater"
 msgstr "Podwodny"
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
 msgid "Snow"
 msgstr "Śnieg"
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
 msgstr "Dzieci i zwierzęta domowe"
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 msgid "Night SnapShot"
 msgstr "Nocne zdjęcie"
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 msgid "Digital macro"
 msgstr "Cyfrowe makro"
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
 msgid "My Colors"
 msgstr "Moje kolory"
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
 msgid "Still image"
 msgstr "Nieruchomy obraz"
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
 msgid "Other"
 msgstr "Inny"
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
 msgstr "Mało"
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 msgid "High"
 msgstr "Dużo"
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr "nd"
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
 #, fuzzy
 msgid "Auto High"
 msgstr "Wysoki zakres"
 
-#: src/canonmn.cpp:322
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
 msgid "Default"
 msgstr "Domyślnie"
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
 msgid "Spot"
 msgstr "Punktowy"
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr "Uśredniony"
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
 msgid "Evaluative"
 msgstr "Matrycowy"
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
 msgid "Partial"
 msgstr "Częściowy"
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 msgid "Center weighted"
 msgstr "Centralnie ważony"
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 msgid "Not known"
 msgstr "Nieznany"
 
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr "Makro"
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 msgid "Very close"
 msgstr "Bardzo blisko"
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
 msgid "Close"
 msgstr "Blisko"
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
 msgid "Middle range"
 msgstr "Średnia odległość"
 
-#: src/canonmn.cpp:339
+#: src/canonmn.cpp:391
 msgid "Far range"
 msgstr "Daleko"
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 msgid "Infinity"
 msgstr "Nieskończoność"
 
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
 msgid "Manual AF point selection"
 msgstr "Ręczny wybór punktu AF"
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 msgid "None (MF)"
 msgstr "Żaden (MF)"
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 msgid "Auto-selected"
 msgstr "Automatycznie"
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 msgid "Right"
 msgstr "Prawy"
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 msgid "Center"
 msgstr "Środkowy"
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
 msgid "Left"
 msgstr "Lewy"
 
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
 msgid "Auto AF point selection"
 msgstr "Automatyczny wybór punktu AF"
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
 msgid "Easy shooting (Auto)"
 msgstr "Łatwe fotografowanie (Automatyczne)"
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 msgid "Program (P)"
 msgstr "Program (P)"
 
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 msgid "Shutter priority (Tv)"
 msgstr "Priorytet migawki (Tv)"
 
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 msgid "Aperture priority (Av)"
 msgstr "Priorytet przysłony (Av)"
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 msgid "Manual (M)"
 msgstr "Ręczny (M)"
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 msgid "Did not fire"
 msgstr "Flesz się nie uruchomił"
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
 msgid "Fired"
 msgstr "Flesz uruchomił się"
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 msgid "External flash"
 msgstr "Zewnętrzny flesz"
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
 msgid "Internal flash"
 msgstr "Wewnętrzny flesz"
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
 msgstr "TTL"
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr "Włączono FP sync"
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr "Synchronizacja na drugą kurtynę"
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
 msgid "FP sync used"
 msgstr "Użyto FP sync"
 
-#: src/canonmn.cpp:625
+#: src/canonmn.cpp:707
 #, fuzzy
 msgid "Normal AE"
 msgstr "Normal AE"
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
 msgid "Exposure compensation"
 msgstr "Kompensacja ekspozycji"
 
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
 msgstr "Blokada ekspozycji"
 
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 msgid "AE lock + exposure compensation"
 msgstr "Blokada ekspozycji + kompensacja ekspozycji"
 
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
 msgid "No AE"
 msgstr "Brak AE"
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
+#, fuzzy
 msgid "On, shot only"
-msgstr ""
+msgstr "One shot AF"
+
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+msgid "AF Point"
+msgstr "Punkt AF"
 
-#: src/canonmn.cpp:644
+#: src/canonmn.cpp:732
 #, fuzzy
 msgid "Smooth"
 msgstr "Gładki"
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
 msgstr "Czarno-biały"
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 msgid "Custom"
 msgstr "Własny"
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
 msgid "My color data"
 msgstr "Moje dane kolorów"
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+msgid "Full"
+msgstr "Pełny"
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:759
 msgid "Selftimer"
 msgstr "Samowyzwalacz"
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
 msgid "Self timer"
 msgstr "Samowyzwalacz"
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 msgid "Quality"
 msgstr "Jakość"
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 msgid "Flash Mode"
 msgstr "Tryb flesza"
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
 msgid "Flash mode setting"
 msgstr "Ustawienie trybu flesza"
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
 msgid "Drive Mode"
 msgstr "Tryb działania"
 
-#: src/canonmn.cpp:657
+#: src/canonmn.cpp:762
 msgid "Drive mode setting"
 msgstr "Ustawienie trybu działania"
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 msgid "Focus Mode"
 msgstr "Tryb ogniskowania"
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
 msgid "Focus mode setting"
 msgstr "Ustawienie trybu ogniskowania"
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 msgid "Image Size"
 msgstr "Rozmiar obrazu"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy Mode"
 msgstr "Tryb Easy"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy shooting mode"
 msgstr "Łatwy tryb fotografowania"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 msgid "Digital Zoom"
 msgstr "Powiększenie cyfrowe"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 msgid "Digital zoom"
 msgstr "Powiększenie cyfrowe"
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr "Kontrastowość"
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
 msgid "Contrast setting"
 msgstr "Ustawienie kontrastu"
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
 msgid "Saturation setting"
 msgstr "Ustawienie nasycenia"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr "Wyostrzenie"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
 msgid "Sharpness setting"
 msgstr "Ustawienie wyostrzenia"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 msgid "ISO Speed Mode"
 msgstr "Tryb ISO"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
 msgid "ISO speed setting"
 msgstr "Ustawienie trybu ISO"
 
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
 msgstr "Tryb pomiaru"
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
 msgid "Metering mode setting"
 msgstr "Ustawienie trybu pomiaru"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus Type"
 msgstr "Typ ogniskowania"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus type setting"
 msgstr "Ustawienie typu ogniskowania"
 
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-msgid "AF Point"
-msgstr "Punkt AF"
-
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 msgid "AF point selected"
 msgstr "Wybrany punkt AF"
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 msgid "Exposure Program"
 msgstr "Tryb ekspozycji"
 
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
 msgid "Exposure mode setting"
 msgstr "Ustawienie trybu ekspozycji"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 msgid "Lens Type"
 msgstr "Rodzaj obiektywu"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 msgid "Lens type"
 msgstr "Rodzaj obiektywu"
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 msgid "Lens"
 msgstr "Obiektyw"
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
@@ -1672,665 +1973,973 @@
 "\"Długa\" i \"krótka\" długość ogniskowej obiektywu (w \"jednostkach "
 "ogniskowej\") i liczba \"jednostek ogniskowej\" na milimetr"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
+#: src/canonmn.cpp:781
+msgid "Short Focal"
+msgstr ""
+
+#: src/canonmn.cpp:781
+#, fuzzy
+msgid "Short focal"
+msgstr "Ostrzenie punktowe"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal Units"
+msgstr "Długość ogniskowej "
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal units"
+msgstr "Długość ogniskowej "
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
 msgid "Max Aperture"
 msgstr "Największa wartość przysłony"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
 msgid "Max aperture"
 msgstr "Największa wartość przysłony"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 msgid "Min Aperture"
 msgstr "Najmniejsza wartość przysłony"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 msgid "Min aperture"
 msgstr "Najmniejsza wartość przysłony"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash Activity"
 msgstr "Aktywność flesza"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash activity"
 msgstr "Aktywność flesza"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash Details"
 msgstr "Szczegóły flesza"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash details"
 msgstr "Szczegóły flesza"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus Continuous"
 msgstr "Ciągły focus"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus continuous setting"
 msgstr "Ustawienie ciągłego focusu"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AESetting"
 msgstr "Ustawienie AE"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AE setting"
 msgstr "Ustawienie automatycznej ekspozycji"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 msgid "Image Stabilization"
 msgstr "Stabilizacja obrazu"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 msgid "Image stabilization"
 msgstr "Stabilizacja obrazu"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 #, fuzzy
 msgid "Display Aperture"
 msgstr "Przesłona"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 #, fuzzy
 msgid "Display aperture"
 msgstr "Przesłona"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Szerokość sensora"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom source width"
-msgstr ""
+msgstr "Szerokość sensora"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
+#, fuzzy
 msgid "Zoom Target Width"
-msgstr ""
+msgstr "Szerokość obrazu"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
+#, fuzzy
 msgid "Zoom target width"
-msgstr ""
+msgstr "Szerokość obrazu"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot Metering Mode"
+msgstr "Tryb pomiaru"
+
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot metering mode"
+msgstr "Tryb pomiaru."
+
+#: src/canonmn.cpp:797
 msgid "Photo Effect"
 msgstr "Efekt fotograficzny"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 msgid "Photo effect"
 msgstr "Efekt fotograficzny"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual Flash Output"
+msgstr "Flesz ręczny"
+
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual flash output"
+msgstr "Flesz ręczny"
+
+#: src/canonmn.cpp:799
 msgid "Color Tone"
 msgstr "Odcień koloru"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
 msgid "Color tone"
 msgstr "Odcień koloru"
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
+msgstr ""
+
+#: src/canonmn.cpp:800
+#, fuzzy
+msgid "SRAW quality"
+msgstr "Jakość obrazu"
+
+#: src/canonmn.cpp:802
 msgid "Unknown Canon Camera Settings 1 tag"
 msgstr "Nieznany znacznik Canon Camera Settings 1"
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 msgid "Sunny"
 msgstr "Słonecznie"
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 msgid "Cloudy"
 msgstr "Pochmurno"
 
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 msgid "Tungsten"
 msgstr "Światło wolframowe"
 
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
 msgstr "Fluorescencja"
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
 msgid "Black & White"
 msgstr "Czarno-biały"
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr "Cień"
 
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 msgid "Manual Temperature (Kelvin)"
 msgstr "Ręczna temperatura (K)"
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
 msgstr "PC Set 1"
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
 msgstr "PC Set 2"
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
 msgstr "PC Set 3"
 
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
 msgid "Daylight Fluorescent"
 msgstr "Lampa fluorescencyjna (światło dzienne)"
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 msgid "Custom 1"
 msgstr "Użytkownika 1"
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 msgid "Custom 2"
 msgstr "Użytkownika 2"
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+msgid "Custom 3"
+msgstr "Użytkownika 3"
+
+#: src/canonmn.cpp:831
+#, fuzzy
+msgid "PC Set 4"
+msgstr "PC Set 1"
+
+#: src/canonmn.cpp:832
+#, fuzzy
+msgid "PC Set 5"
+msgstr "PC Set 1"
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 msgid "left"
 msgstr "lewy"
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 msgid "center"
 msgstr "Środek"
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
 msgid "right"
 msgstr "prawy"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO Speed Used"
 msgstr "Użyta czułość ISO"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO speed used"
 msgstr "Użyta czułość ISO"
 
-#: src/canonmn.cpp:758
+#: src/canonmn.cpp:867
+msgid "Measured EV"
+msgstr ""
+
+#: src/canonmn.cpp:868
 msgid "Target Aperture"
 msgstr "Docelowa przysłona"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target Shutter Speed"
 msgstr "Docelowa szybkość migawki"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target shutter speed"
 msgstr "Docelowy czas otwarcia migawki"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr "Balans bieli"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
 msgid "White balance setting"
 msgstr "Ustawienie balansu bieli"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence"
 msgstr "Sekwencja"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
 msgstr "Numer sekwencji (jeśli w serii)"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF Point Used"
 msgstr "Użyty punkt AF"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF point used"
 msgstr "Użyty punkt AF"
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 msgid "Flash Bias"
 msgstr "Odchylenie ekspozycji flesza"
 
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
 msgstr "Odległość obiektu"
 
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 msgid "Subject distance (units are not clear)"
 msgstr "Odległość do obiektu (jednostki nie są jednoznaczne)"
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 msgid "Aperture Value"
 msgstr "Wartość przysłony"
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 msgid "Shutter Speed Value"
 msgstr "Szybkość migawki"
 
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr "Szybkość migawki"
 
-#: src/canonmn.cpp:782
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
+msgstr ""
+
+#: src/canonmn.cpp:892
 msgid "Unknown Canon Camera Settings 2 tag"
 msgstr "Nieznany znacznik Canon Camera Settings 2"
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 msgid "Left to right"
 msgstr "Od lewej do prawej"
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 msgid "Right to left"
 msgstr "Od prawej do lewej"
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 msgid "Bottom to top"
 msgstr "Od dołu do góry"
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 msgid "Top to bottom"
 msgstr "Od góry do dołu"
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
 msgstr "Matryca 2x2 (przeciwnie do wskazówek zegara)"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama Frame"
 msgstr "Klatka panoramy"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama frame number"
 msgstr "Numer klatki panoramy"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama Direction"
 msgstr "Kierunek panoramy"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama direction"
 msgstr "Kierunek panoramy"
 
-#: src/canonmn.cpp:804
+#: src/canonmn.cpp:914
 msgid "Unknown Canon Panorama tag"
 msgstr "Nieznany znacznik Canon Panorama"
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 msgid "Noise Reduction"
 msgstr "Redukcja szumów"
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
 msgid "Long exposure noise reduction"
 msgstr "Redukcja szumów przy długiej ekspozycji"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 msgid "Shutter Ae Lock"
 msgstr "Blokada ekspozycji"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 msgid "Shutter/AE lock buttons"
 msgstr "Przyciski blokady ekspozycji"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr "Blokada lustra"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr "Wstępne podnoszenie lustra"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
 msgid "Exposure Level Increments"
 msgstr "Krok poziomu ekspozycji"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
 msgid "AF Assist"
 msgstr "Wspomaganie AF"
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
 msgstr "Światło pomocnicze automatycznego ostrzenia"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Flash Sync Speed Av"
 msgstr "Synchronizacja flesza Av"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Shutter speed in Av mode"
 msgstr "Prędkość migawki w trybie Av (priorytetu przysłony)"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB Sequence"
 msgstr "Sekwencja AEB"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 #, fuzzy
 msgid "AEB sequence/auto cancellation"
 msgstr "Sekwencja automatycznego bracketingu"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 msgid "Shutter Curtain Sync"
 msgstr "Synchronizacja migawki"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 msgid "Shutter curtain sync"
 msgstr "Kurtyna synchronizacji migawki"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF Stop Button"
 msgstr "Przycisk obiektywu AF stop"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 msgid "Lens AF stop button Fn. Switch"
 msgstr "Przycisk funkcji wyłączenia automatycznego ostrzenia w obiektywie"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Fill Flash Auto Reduction"
 msgstr "Auto redukcja błysku wypełniającego"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
 msgstr "Automatyczna redukcja siły błysku wypełniającego"
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
 msgstr "Pozycja przycisku Menu"
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu button return position"
 msgstr "Pozycja przycisku Menu"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "Set Button Function"
 msgstr "Funkcja przycisku Set"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr "Funkcja przycisku SET podczas wykonywania zdjęcia"
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor Cleaning"
 msgstr "Czyszczenie matrycy"
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor cleaning"
 msgstr "Czyszczenie matrycy"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
 msgstr "Wyświetlanie nałożone"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
 msgstr "Wyświetlanie nałożone"
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr "Migawka wyzwolona bez karty CF"
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr "Migawka wyzwolona bez karty CF"
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
 msgid "Unknown Canon Custom Function tag"
 msgstr "Nieznany znacznik Canon Custom Function"
 
-#: src/canonmn.cpp:841
+#: src/canonmn.cpp:951
 msgid "mid-right"
 msgstr "środek-prawo"
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 msgid "bottom"
 msgstr "dół"
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 msgid "top"
 msgstr "góra"
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
 msgid "mid-left"
 msgstr "środek-lewo"
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
 msgid "upper-left"
 msgstr "góra-lewo"
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
 msgid "upper-right"
 msgstr "góra-prawo"
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
 msgid "lower-left"
 msgstr "dół-lewo"
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
 msgid "lower-right"
 msgstr "dół-prawo"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
 msgid "Image Width"
 msgstr "Szerokość obrazu"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
 msgid "Image width"
 msgstr "Szerokość obrazu"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
 msgid "Image Height"
 msgstr "Wysokość obrazu"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
 msgid "Image height"
 msgstr "Wysokość obrazu"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 #, fuzzy
 msgid "Image Width As Shot"
 msgstr "Szerokość obrazu podczas fotografowania"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 #, fuzzy
 msgid "Image width (as shot)"
 msgstr "Szerokość obrazu podczas fotografowania"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 #, fuzzy
 msgid "Image Height As Shot"
 msgstr "Wysokość obrazu podczas fotografowania"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 #, fuzzy
 msgid "Image height (as shot)"
 msgstr "Wysokość obrazu podczas fotografowania"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF Points Used"
 msgstr "Użyte punkty AF"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF points used"
 msgstr "Użyte punkty AF"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF Points Used 20D"
 msgstr "Użyte punkty AF 20D"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF points used (20D)"
 msgstr "Użyte punkty AF (20D)"
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 msgid "Unknown Canon Picture Info tag"
 msgstr "Nieznany znacznik Canon Picture Info"
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
 msgid "ISO"
 msgstr "ISO"
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 #, fuzzy
 msgid "WB"
 msgstr "Balans bieli"
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
 msgstr "Pocztówka"
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
 msgstr "Szeroki ekran"
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 msgid "Medium Movie"
 msgstr "Średni film"
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 msgid "Small Movie"
 msgstr "Mały film"
 
-#: src/canonmn.cpp:905
+#: src/canonmn.cpp:1015
 msgid "On 1"
 msgstr "Włączony 1"
 
-#: src/canonmn.cpp:906
+#: src/canonmn.cpp:1016
 msgid "On 2"
 msgstr "Włączony 2"
 
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 msgid "On (shift AB)"
 msgstr "Włączony (shitf AB)"
 
-#: src/canonmn.cpp:915
+#: src/canonmn.cpp:1025
 msgid "On (shift GM)"
 msgstr "Włączony (shift GM)"
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
 msgstr "Żółty"
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 msgid "Orange"
 msgstr "Pomarańczowy"
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 msgid "Red"
 msgstr "Czerwony"
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 msgid "Green"
 msgstr "Zielony"
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
 msgid "Blue"
 msgstr "Niebieski"
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
 msgstr "Purpurowy"
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 msgid "Bracket Mode"
 msgstr "Tryb bracketingu"
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
 msgid "Bracket Value"
 msgstr "Krok bracketingu"
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
 msgid "Bracket Shot Number"
 msgstr "Numer zdjęcia bracketingu"
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 msgid "Raw Jpg Quality"
 msgstr "Jakość RAW JPG"
 
-#: src/canonmn.cpp:943
+#: src/canonmn.cpp:1053
 msgid "Raw Jpg Size"
 msgstr "Rozmiar RAW JPG"
 
-#: src/canonmn.cpp:945
+#: src/canonmn.cpp:1055
 msgid "WB Bracket Mode"
 msgstr "Tryb bracketingu balansu bieli"
 
-#: src/canonmn.cpp:946
+#: src/canonmn.cpp:1056
 msgid "WB Bracket Value AB"
 msgstr "Krok bracketingu balansu bieli AB"
 
-#: src/canonmn.cpp:947
+#: src/canonmn.cpp:1057
 msgid "WB Bracket Value GM"
 msgstr "Krok bracketingu balansu bieli GM"
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 msgid "Filter Effect"
 msgstr "Efekt filtra"
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 msgid "Toning Effect"
 msgstr "Efekt tonowania"
 
-#: src/canonmn.cpp:951
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro Magnification"
+msgstr "Powiększenie elektroniczne"
+
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro magnification"
+msgstr "Powiększenie elektroniczne"
+
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
+msgstr ""
+
+#: src/canonmn.cpp:1061
+#, fuzzy
+msgid "Live view shooting"
+msgstr "Ustawienie trybu działania"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash Exposure Lock"
+msgstr "Kompensacja ekspozycji błysku"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash exposure lock"
+msgstr "Kompensacja ekspozycji błysku"
+
+#: src/canonmn.cpp:1064
 msgid "Unknown Canon File Info tag"
 msgstr "Nieznany znacznik Canon File Info"
 
-#: src/crwimage.cpp:663
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
+msgstr "Standardowy"
+
+#: src/canonmn.cpp:1082
+#, fuzzy
+msgid "Lowest"
+msgstr "Dolny lewy"
+
+#: src/canonmn.cpp:1086
+#, fuzzy
+msgid "Highest"
+msgstr "Dużo"
+
+#: src/canonmn.cpp:1094
+#, fuzzy
+msgid "High Saturation"
+msgstr "Nasycenie kolorów"
+
+#: src/canonmn.cpp:1096
+#, fuzzy
+msgid "Low Saturation"
+msgstr "Nasycenie"
+
+#: src/canonmn.cpp:1097
+#, fuzzy
+msgid "CM Set 1"
+msgstr "PC Set 1"
+
+#: src/canonmn.cpp:1098
+#, fuzzy
+msgid "CM Set 2"
+msgstr "PC Set 2"
+
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
+msgstr ""
+
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
+msgstr ""
+
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
+msgstr ""
+
+#: src/canonmn.cpp:1102
+msgid "PC 1"
+msgstr ""
+
+#: src/canonmn.cpp:1103
+msgid "PC 2"
+msgstr ""
+
+#: src/canonmn.cpp:1104
+msgid "PC 3"
+msgstr ""
+
+#: src/canonmn.cpp:1109
+msgid "Faithful"
+msgstr ""
+
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+msgid "Monochrome"
+msgstr "Monochromatyczny"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "ToneCurve"
+msgstr "Krzywa tonalna"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "Tone curve"
+msgstr "Krzywa tonalna"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "SharpnessFrequency"
+msgstr "Wyostrzenie"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "Sharpness frequency"
+msgstr "Ostrość"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "SensorRedLevel"
+msgstr "WB poziom czerwieni"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "Sensor red level"
+msgstr "WB poziom czerwieni"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "SensorBlueLevel"
+msgstr "WB poziom błękitu"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "Sensor blue level"
+msgstr "WB poziom błękitu"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "WhiteBalanceRed"
+msgstr "Balans bieli"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "White balance red"
+msgstr "Balans bieli 2"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "WhiteBalanceBlue"
+msgstr "Wartość balansu bieli"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "White balance blue"
+msgstr "Tablica balansu bieli"
+
+#: src/canonmn.cpp:1122
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Balans bieli"
+
+#: src/canonmn.cpp:1123
+#, fuzzy
+msgid "ColorTemperature"
+msgstr "Temperatura koloru"
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+msgid "Color Temperature"
+msgstr "Temperatura koloru"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "PictureStyle"
+msgstr "Tryb zdjęcia"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "Picture style"
+msgstr "Tryb zdjęcia"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "DigitalGain"
+msgstr "Cyfrowe makro"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "Digital gain"
+msgstr "Cyfrowe makro"
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+#, fuzzy
+msgid "WBShift AB"
+msgstr "Włączony (shitf AB)"
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+#, fuzzy
+msgid "WB Shift GM"
+msgstr "Włączony (shift GM)"
+
+#: src/canonmn.cpp:1128
+#, fuzzy
+msgid "Unknown Canon Processing Info tag"
+msgstr "Nieznany znacznik Canon Picture Info"
+
+#: src/crwimage.cpp:664
 msgid "Header, offset"
 msgstr "Przesunięcie nagłówka"
 
-#: src/crwimage.cpp:680
+#: src/crwimage.cpp:681
 msgid "tag"
 msgstr "znacznik"
 
-#: src/crwimage.cpp:682
+#: src/crwimage.cpp:683
 #, fuzzy
 msgid "dir"
 msgstr "katalog"
 
-#: src/crwimage.cpp:684
+#: src/crwimage.cpp:685
 msgid "type"
 msgstr "typ"
 
-#: src/crwimage.cpp:685
+#: src/crwimage.cpp:686
 msgid "size"
 msgstr "rozmiar"
 
-#: src/crwimage.cpp:686
+#: src/crwimage.cpp:687
 msgid "offset"
 msgstr "przesunięcie"
 
@@ -2357,8 +2966,8 @@
 "IPTC and NAA organizations."
 msgstr ""
 
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
 msgid "Destination"
 msgstr "Cel"
 
@@ -2368,7 +2977,7 @@
 "information above the appropriate OSI layers."
 msgstr ""
 
-#: src/datasets.cpp:94
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
 msgid "File Format"
 msgstr "Format pliku"
 
@@ -2503,10 +3112,13 @@
 msgstr "Wersja ARM"
 
 #: src/datasets.cpp:157
+#, fuzzy
 msgid ""
 "This tag consisting of a binary number representing the particular version "
 "of the ARM specified by tag <ARMId>."
 msgstr ""
+"Liczba dwójkowa określająca wersję formatu pliku podaną w znaczniku "
+"<FileFormat>."
 
 #: src/datasets.cpp:170
 msgid "Record Version"
@@ -2563,7 +3175,7 @@
 msgid "Document Title"
 msgstr "Tytuł dokumentu"
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
 msgid "Edit Status"
 msgstr "Stan edycji"
 
@@ -2582,18 +3194,18 @@
 "<ARMVersion>, according to the practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
 msgstr "Ważność"
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
 msgid "Subject"
 msgstr "Temat"
 
@@ -2601,7 +3213,7 @@
 msgid "The Subject Reference is a structured definition of the subject matter."
 msgstr ""
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
 msgid "Category"
 msgstr "Kategoria"
 
@@ -2624,13 +3236,14 @@
 "to the provider."
 msgstr ""
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
 msgstr "Kategorie dodatkowe"
 
 #: src/datasets.cpp:229
+#, fuzzy
 msgid "Fixture Id"
-msgstr ""
+msgstr "Flesz uruchomił się"
 
 #: src/datasets.cpp:230
 msgid ""
@@ -2638,7 +3251,7 @@
 "immediately find or recall such an object."
 msgstr ""
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
 msgstr "Słowa kluczowe"
 
@@ -2675,7 +3288,7 @@
 "provider."
 msgstr ""
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
 msgid "Release Date"
 msgstr "Data udostępnienia"
 
@@ -2727,7 +3340,7 @@
 "Inne instrukcje edytorskie dotyczące użycia danych obiektu, takie jak "
 "ostrzeżenia i ograniczenia."
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 msgid "Instructions"
 msgstr "Instrukcje"
 
@@ -2757,9 +3370,10 @@
 msgstr "Data odniesienia"
 
 #: src/datasets.cpp:284
+#, fuzzy
 msgid ""
 "Identifies the date of a prior envelope to which the current object refers."
-msgstr ""
+msgstr "Określa rodzaj programu użyty do uzyskania danych obiektu."
 
 #: src/datasets.cpp:286
 msgid "Reference Number"
@@ -2771,7 +3385,7 @@
 "object refers."
 msgstr ""
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
 msgid "Date Created"
 msgstr "Data utworzenia"
 
@@ -2813,9 +3427,10 @@
 "representation of the object data was created. Follows ISO 8601 standard."
 msgstr ""
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 msgid "Program"
 msgstr "Program"
 
@@ -2865,7 +3480,7 @@
 "Where used, a by-line title should follow the by-line it modifies."
 msgstr ""
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr "Miasto"
 
@@ -2899,7 +3514,7 @@
 msgid "State/Province"
 msgstr "Stan/Prowincja"
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
 msgid "Country Code"
 msgstr "Kod państwa"
 
@@ -2925,11 +3540,11 @@
 "guidelines of the provider."
 msgstr ""
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
 msgid "Country"
 msgstr "Państwo"
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
 #, fuzzy
 msgid "Transmission Reference"
 msgstr "Oryginalne miejsce transmisji"
@@ -2940,7 +3555,7 @@
 "practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
 msgid "Headline"
 msgstr "Nagłówek"
 
@@ -2949,7 +3564,7 @@
 "A publishable entry providing a synopsis of the contents of the object data."
 msgstr ""
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
 #, fuzzy
 msgid "Credit"
 msgstr "Wyrazy uznania"
@@ -2960,8 +3575,8 @@
 "creator."
 msgstr ""
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
 msgid "Source"
 msgstr "Źródło"
 
@@ -2979,7 +3594,7 @@
 msgid "Copyright Notice"
 msgstr "Uwaga o prawach autorskich"
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -2999,7 +3614,7 @@
 msgid "A textual description of the object data."
 msgstr "Tekstowy opis obiektu."
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 msgid "Description"
 msgstr "Opis"
 
@@ -3035,7 +3650,7 @@
 msgid "Indicates the layout of an image."
 msgstr "Określa układ obrazu."
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
 msgid "Language"
 msgstr "Język"
 
@@ -3068,8 +3683,9 @@
 msgstr "Rozdzielczość próbkowania dźwięku"
 
 #: src/datasets.cpp:415
+#, fuzzy
 msgid "Indicates the sampling resolution of an audio content."
-msgstr ""
+msgstr "Oznacza częstotliwość próbkowania zawartości dźwiękowej (w hercach)."
 
 #: src/datasets.cpp:417
 msgid "Audio Duration"
@@ -3131,228 +3747,231 @@
 msgid "Unknown dataset"
 msgstr "Nieznany zestaw danych"
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+#, fuzzy
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr "Błąd %0: arg1=%1, arg2=%2, arg3=%3."
 
-#: src/error.cpp:50
+#: src/error.cpp:56
 msgid "Success"
 msgstr "Powodzenie"
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr "To nie wygląda na obrazek %1"
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr "Nieprawidłowa nazwa zestawu danych \"%1\""
 
-#: src/error.cpp:55
+#: src/error.cpp:61
 msgid "Invalid record name `%1'"
 msgstr "Nieprawidłowa nazwa rekordu \"%1\""
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr "Nieprawidłowy klucz \"%1\""
 
-#: src/error.cpp:57
+#: src/error.cpp:63
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
 msgstr "Nieprawidłowa nazwa znacznika lub ifdId \"%1\", ifdId %2"
 
-#: src/error.cpp:58
+#: src/error.cpp:64
 msgid "Value not set"
 msgstr "Wartość nie ustawiona"
 
-#: src/error.cpp:59
+#: src/error.cpp:65
 msgid "%1: Failed to open the data source: %2"
 msgstr "%1: Nie można było otworzyć źródła danych: %2"
 
-#: src/error.cpp:60
+#: src/error.cpp:66
 msgid "%1: Failed to open file (%2): %3"
 msgstr "%1: Nie można było otworzyć pliku (%2): %3"
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr "%1: Plik zawiera dane nieznanego typu obrazu"
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr "Pamięć zawiera dane nieznanego typu obrazu"
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr "Obrazy typu \"%1\" nie są obsługiwane"
 
-#: src/error.cpp:64
+#: src/error.cpp:70
 msgid "Failed to read image data"
 msgstr "Nie można było odczytać danych obrazu"
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr "To nie wygląda jak obrazek JPEG"
 
-#: src/error.cpp:67
+#: src/error.cpp:72
+#, fuzzy
+msgid "%1: Failed to map file for reading and writing: %2"
+msgstr "Nie można otworzyć pliku poleceń do odczytu\n"
+
+#: src/error.cpp:73
 msgid "%1: Failed to rename file to %2: %3"
 msgstr "%1: Nie można było zmienić nazwy pliku na %2: %3"
 
-#: src/error.cpp:68
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr "%1: Transfer nie powiódł się: %2"
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr "Transfer pamięci nie powiódł się: %1"
 
-#: src/error.cpp:70
+#: src/error.cpp:76
 msgid "Failed to read input data"
 msgstr "Nie można było odczytać danych wejściowych"
 
-#: src/error.cpp:71
+#: src/error.cpp:77
 msgid "Failed to write image"
 msgstr "Nie można było zapisać obrazka"
 
-#: src/error.cpp:72
+#: src/error.cpp:78
 msgid "Input data does not contain a valid image"
 msgstr "Dane wejściowe nie zawierają prawidłowego obrazu"
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 msgid "Invalid ifdId %1"
 msgstr "Nieprawidłowy ifdld %1"
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 "Entry::setValue: Zbyt duża wartość (znacznik=%1, rozmiar=%2, wymagane=%3)"
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 "Entry::setDataArea: Zbyt duża wartość (znacznik=%1, rozmiar=%2, wymagane=%3)"
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr "Pozycja poza zakresem"
 
-#: src/error.cpp:77
+#: src/error.cpp:83
 msgid "Unsupported data area offset type"
 msgstr "Nieobsługiwany typ przesunięcia obszaru danych"
 
-#: src/error.cpp:78
+#: src/error.cpp:84
 msgid "Invalid charset: `%1'"
 msgstr "Nieprawidłowy zestaw znaków: \"%1\""
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr "Nieobsługiwany format daty"
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr "Nieobsługiwany format czasu"
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 #, fuzzy
 msgid "Writing to %1 images is not supported"
 msgstr "Zapis do formatu %2 nie jest obsługiwany"
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr "Ustawienie %1 w obrazach %2 nie jest obsługiwane"
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr "To nie wygląda jak obrazek CRW"
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr "%1: Nieobsługiwany"
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr ""
 "Brak dostępnej informacji o przestrzeni nazw dla przedrostka \"%1\" XMP"
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr ""
 "Brak zarejestrowanego przedrostka dla przestrzeni nazw \"%2\", potrzebnego "
 "dla właściwego umieszczenia \"%1\""
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr "Rozmiar %1 segmentu JPEG jest większy niż 65535 bajtów"
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr "Nieobsługiwany Xmpdatum %1 typu %2"
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr "Nieobsługiwany węzeł XMP %1 z opt=%2"
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr "Błąd pakietu narzędziowego XMP %1: %2"
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr "Nie można było zdekodować właściwości Lang Alt %1 z opt=%2"
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr "Nie można było zdekodować kwalifikatora Lang Alt %1 z opt=%2"
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr "Nie można było zdekodować właściwości Lang Alt %1"
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
 "Nie można było określić nazwy właściwości w ścieżce %1, przestrzeń nazw %2"
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr ""
 "Schemat przestrzeni nazw %1 nie jest zarejestrowany w pakiecie narzędzionym "
 "XMP"
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr "Brak zarejestrowanej przestrzeni nazw dla przedrostka \"%1\""
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 "Aliasy nie są obsługiwane. Prześlij proszę ten pakiet XMP do ahuggel@gmx.net "
 "\"%1\", \"%2\", \"%3\""
 
-#: src/error.cpp:98
+#: src/error.cpp:104
 msgid "Invalid XmpText type `%1'"
 msgstr "Nieprawidłowy typ XmpText \"%1\""
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr "Katalog TIFF %1 posiada zbyt wiele elementów"
 
-#: src/error.cpp:100
+#: src/error.cpp:106
+#, fuzzy
 msgid "Multiple TIFF array element tags %1 in one directory"
-msgstr ""
+msgstr "Znacznik elementu tablicy TIFF %1 posiada zły typ"
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr "Znacznik elementu tablicy TIFF %1 posiada zły typ"
 
-#: src/error.cpp:103
-msgid "(Unknown Error)"
-msgstr "(Nieznany błąd)"
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
-msgstr "Copyright © 2004-2009 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
+msgstr "Copyright (C) 2004-2010 Andreas Huggel.\n"
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3364,7 +3983,7 @@
 "przez Free Software Foundation, zarówno w wersji 2 tej Licencji, jak\n"
 "też jakiejkolwiek późniejszej wersji.\n"
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3377,7 +3996,7 @@
 "ZASTOSOWAŃ. W celu uzyskania bliższych informacji przeczytaj\n"
 "Powszechną Licencję Publiczną GNU.\n"
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3388,11 +4007,11 @@
 "programem, jeśli nie napisz do Free Software Foundation, Inc.\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr "Użycie:"
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
@@ -3400,11 +4019,11 @@
 "[ opcje ] [ akcja ] plik ...\n"
 "\n"
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr "Manipulowanie metadanymi Exif obrazów.\n"
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
@@ -3412,7 +4031,7 @@
 "\n"
 "Akcje:\n"
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
@@ -3421,15 +4040,15 @@
 "                 wymaga użycia co najmniej jednej z opcji -a, -Y, -O lub -"
 "D.\n"
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr "  pr | print    Wyświetla metadane obrazu.\n"
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr "  rm | delete   Usuwa metadane obrazu z plików.\n"
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
@@ -3437,14 +4056,14 @@
 "  in | insert   Wstawia metadane z odpowiadających plików *.exv.\n"
 "                Użyj opcji -S aby zmienić rozszerzenie plików wejściowych.\n"
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 "  ex | extract  Eksportuje metadane do plików *.exv, *.xmp oraz plików "
 "miniaturek.\n"
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
@@ -3457,7 +4076,7 @@
 "                pomocą -r format, opcje znacznika czasu są kontrolowane za "
 "pomocą -t i -T.\n"
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
@@ -3468,7 +4087,7 @@
 "                i IPTC w plikach lub ustawienie komentarza JPEG.\n"
 "                Wymaga podania opcji -c, -m lub -M.\n"
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
@@ -3476,7 +4095,13 @@
 "  fi | fixiso   Kopiuje ustawienie ISO z Nikon Makernote do normalnego\n"
 "                znacznika Exif.\n"
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
@@ -3484,40 +4109,57 @@
 "\n"
 "Opcje:\n"
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr "   -h      Wyświetla tę pomoc i kończy pracę.\n"
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr "   -V      Wyświetla wersję programu i kończy pracę.\n"
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr ""
 "   -v      Tryb \"gadatliwy\", wyświetla wiele komunikatów podczas pracy "
 "programu.\n"
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+#, fuzzy
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr ""
+"   -v      Tryb \"gadatliwy\", wyświetla wiele komunikatów podczas pracy "
+"programu.\n"
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr "   -b      Pokaż duże wartości binarne.\n"
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 msgid "   -u      Show unknown tags.\n"
 msgstr "   -u      Pokaż nieznane znaczniki.\n"
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr "   -k      Zachowuje znaczniki czasowe.\n"
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 "   -t      Ustawia także znacznik czasowy pliku podczas akcji \"rename"
 "\" (nadpisuje opcję -k).\n"
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
@@ -3526,15 +4168,15 @@
 "zmienia nazwy pliku\n"
 "           (nadpisuje opcję -k).\n"
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr "   -f      Nie pyta przed nadpisaniem istniejących plików.\n"
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr "   -F      Nie pyta przed zmianą nazwy plików.\n"
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
@@ -3542,151 +4184,151 @@
 "   -a czas Poprawka czasu w formacie [-]GG[:MM[:SS]]. Ta opcja\n"
 "           jest używana tylko z akcją \"adjust\".\n"
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr "   -Y rok  Poprawka roku dla akcji \"adjust\".\n"
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr "   -O mie  Poprawka miesiąca dla akcji \"adjust\".\n"
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr "   -D dzi  Poprawka dnia dla akcji \"adjust\".\n"
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr "   -p tryb Tryb wyświetlania dla akcji \"print\". Możliwe tryby to:\n"
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr "             s : wyświetla podsumowanie metadanych Exif (domyślnie)\n"
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
 msgstr ""
 "             a : wyświetla metadane Exif, IPTC i XMP (skrót dla -Pkyct)\n"
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 "             t : zinterpretowane (przetłumaczone) dane Exif (-PEkyct)\n"
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr "             v : proste wartości danych Exif (-PExgnycv)\n"
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr ""
 "             h : zrzut danych Exif w postaci szesnastkowej (-PExgnycsh)\n"
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr "             i : wartości danych IPTC (-PIkyct)\n"
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr "             x : właściwości XMP (-PXkyct)\n"
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr "             c : komentarz JPEG\n"
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 msgid "             p : list available previews\n"
 msgstr "             p : wyświetla dostępne podglądy\n"
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
 msgstr ""
 "   -P przl Przełączniki wyświetlania kontrolujące sposób wyświetlania "
 "znaczników (akcja \"print\"):\n"
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 msgid "             E : include Exif tags in the list\n"
 msgstr "             E : dołącz znaczniki Exif do listy\n"
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 msgid "             I : IPTC datasets\n"
 msgstr "             I : dane IPTC\n"
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 msgid "             X : XMP properties\n"
 msgstr "             X : właściwości XMP\n"
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 msgid "             x : print a column with the tag number\n"
 msgstr "             x : wyświetla kolumnę z numerem znacznika\n"
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr "             g : nazwa grupy\n"
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr "             k : klucz\n"
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr "             l : etykieta znacznika\n"
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr "             n : nazwa znacznika\n"
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr "             y : typ\n"
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr "             c : liczba elementów\n"
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr "             s : wielkość w bajtach\n"
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr "             v : proste wartości danych\n"
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr "             t : zinterpretowane (przetłumaczone) dane\n"
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr "             h : zrzut danych w postaci szesnastkowej\n"
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr "   -d cel  Cel(e) usunięcia dla akcji \"delete\". Możliwe cele to:\n"
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr "             a : wszystkie obsługiwane metadane (domyślne)\n"
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr "             e : sekcja Exif\n"
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr "             t : tylko miniatury Exif\n"
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr "             i : dane IPTC\n"
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr "             x : pakiet XMP\n"
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
 "           the same as those for the -d option, plus a modifier:\n"
@@ -3700,7 +4342,7 @@
 "           Tylko miniatury JPEG mogą być wstawione i muszą mieć nazwę\n"
 "           <file>-thumb.jpg\n"
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
 "           are the same as those for the -d option, plus a target to "
@@ -3710,7 +4352,7 @@
 "             X : Extract metadata to an XMP sidecar file <file>.xmp\n"
 msgstr ""
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
@@ -3719,29 +4361,29 @@
 "           jest zgodny z strftime(3). Obsługiwane są następujące słowa "
 "kluczowe:\n"
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr "             :basename:   - oryginalna nazwa pliku bez rozszerzenia\n"
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 "             :dirname:    - nazwa katalogu zawierającego oryginalny plik\n"
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr "             :parentname: - nazwa katalogu macierzystego\n"
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr "           Domyślny format nazwy pliku to "
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr "   -c txt  komentarz JPEG do wstawienia do obrazu.\n"
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
@@ -3749,7 +4391,7 @@
 "   -m plik Plik poleceń dla akcji \"modify\". Format poleceń to\n"
 "           set|add|del <klucz> [[<typ>] <wartosc>].\n"
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
@@ -3757,7 +4399,7 @@
 "   -M kmd  Linia poleceń dla akcji \"modify\". Format poleceń jest\n"
 "            taki sam jak format linii w pliku komend.\n"
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
@@ -3765,7 +4407,7 @@
 "   -l kat  Lokalizacja (katalog) dla plików ze wstawianymi lub "
 "eksportowanymi metadanymi.\n"
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
@@ -3773,377 +4415,385 @@
 "   -S .roz Użyj rozszerzenia .roz dla plików źródłowych w akcji \"insert\".\n"
 "\n"
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 msgid "Option"
 msgstr "Opcja"
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr "wymaga argumentu\n"
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr "Nierozpoznana opcja"
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr "getopt zwrócił nieoczekiwany kod znaku"
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr "Zignorowano nadmiarową opcję"
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr "nie jest zgodny z poprzednią opcją\n"
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr "Zignorowano nadmiarową opcję -a"
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr "Błąd podczas przetwarzania argumentu opcji -a"
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr "Opcja -a jest niezgodna z poprzednią opcją\n"
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 msgid "Error parsing"
 msgstr "Błąd przetwarzania"
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 msgid "option argument"
 msgstr "argument opcji"
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr "Nierozpoznany tryb wyświetlania"
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr "Zignorowano nadmiarową opcję -p"
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr "Opcja -p jest niezgodna z poprzednią opcją\n"
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr "Nierozpoznany element wydruku"
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr "Zignorowano nadmiarową opcję -P"
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr "Opcja -P jest niezgodna z poprzednią opcją\n"
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr "Opcja -d jest niezgodna z poprzednią opcją\n"
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr "Opcja -e jest niezgodna z poprzednią opcją\n"
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr "Opcja -i jest niezgodna z poprzednią opcją\n"
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr "Akcja adjust jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr "Akcja print jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr "Akcja delete jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr "Akcja extract jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr "Akcja insert jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr "Akcja rename jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr "Akcja modify jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr "Akcja fixiso jest niezgodna z podanymi opcjami\n"
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+#, fuzzy
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr "Akcja fixiso jest niezgodna z podanymi opcjami\n"
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr "Należy podać akcję\n"
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr ""
 "Akcja adjust wymaga podania przynajmniej jednej z opcji -a, -Y, -O lub -D\n"
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr ""
 "Akcja modify wymaga podania przynajmniej jednej z opcji -c, -m lub -M\n"
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr "Wymagany jest co najmniej jeden plik\n"
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr "Błąd podczas przetwarzania argumentów opcji -m\n"
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr "Błąd podczas przetwarzania argumentów opcji -M\n"
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr "Opcja -I może być użyta jedynie z akcjami extract lub insert\n"
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr "Opcja -S może być użyta jedynie z akcją insert\n"
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr "Opcja -t może być użyta jedynie z akcją rename\n"
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr "Opcja -T może być użyta jedynie z akcją rename\n"
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr "Nierozpoznany"
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 msgid "target"
 msgstr "cel"
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 msgid "Invalid preview number"
 msgstr "Niepoprawna liczba podglądów"
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr "Nie można otworzyć pliku poleceń do odczytu\n"
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 msgid "line"
 msgstr "wiersz"
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 msgid "-M option"
 msgstr "Opcja -M"
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr "Niepoprawny wiersz poleceń"
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr "Niepoprawne polecenie"
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
 msgstr "Niepoprawny klucz"
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
+#, fuzzy
 msgid "Soft mode 1"
-msgstr ""
+msgstr "Tryb punktowy włączony"
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
+#, fuzzy
 msgid "Soft mode 2"
-msgstr ""
+msgstr "Tryb punktowy włączony"
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
+#, fuzzy
 msgid "Hard mode 1"
-msgstr ""
+msgstr "Tryb makro"
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
+#, fuzzy
 msgid "Hard mode 2"
-msgstr ""
+msgstr "Tryb makro"
 
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr "Światło dzienne"
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
 msgid "Fluorescent (daylight)"
 msgstr "Lampa fluorescencyjna (światło dzienne)"
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
 msgid "Fluorescent (warm white)"
 msgstr "Lampa fluorescencyjna (ciepło-biała)"
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
 msgid "Fluorescent (cool white)"
 msgstr "Lampa fluorescencyjna (zimno-biała)"
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
 #, fuzzy
 msgid "Incandescent"
 msgstr "Rozpalony"
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
 msgid "None (black & white)"
 msgstr "Brak (czarno-biały)"
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
 msgid "Red-eye reduction"
 msgstr "Redukcja czerwonych oczu"
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr "Scena nocna"
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
 msgid "Program AE"
 msgstr "Program AE"
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 msgid "Natural light"
 msgstr "Światło naturalne"
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
 msgid "Anti-blur"
 msgstr "Anti-blur"
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
 msgid "Sunset"
 msgstr "Zachód słońca"
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
 msgid "Museum"
 msgstr "Muzeum"
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
 msgid "Party"
 msgstr "Przyjęcie"
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 msgid "Flower"
 msgstr "Kwiat"
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
 msgstr "Tekst"
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
 msgid "Natural light & flash"
 msgstr "Światło naturalny i błysk"
 
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
 msgid "Aperture-priority AE"
 msgstr "Priorytet przysłony"
 
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
 msgid "Shutter speed priority AE"
 msgstr "Priorytet migawki"
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
 #, fuzzy
 msgid "No flash & flash"
 msgstr "Bez flesza i flesz"
 
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr "Standardowy"
-
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
 msgid "Chrome"
 msgstr "Chrom"
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
 #, fuzzy
 msgid "Wide"
 msgstr "Szeroki"
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
 msgid "F0/Standard"
 msgstr "F0/Standard"
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 msgid "F1/Studio portrait"
 msgstr "F1/Studio portrait"
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
 msgstr "F2/Fujichrome"
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
 msgid "F3/Studio portrait Ex"
 msgstr "F3/Studio portrait Ex"
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr "F4/Velvia"
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr ""
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr "Binarny"
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
 msgid "Standard (100%)"
 msgstr "Standard (100%)"
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
 msgstr ""
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
 msgstr ""
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
 msgid "Film simulation mode"
 msgstr "Tryb symulacji filmu"
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
 msgid "Version"
 msgstr "Wersja"
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
 msgid "Fujifilm Makernote version"
 msgstr "Wersja Fujifilm Makernote"
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
@@ -4151,193 +4801,195 @@
 "Ten numer jest unikalny i zawiera datę produkcji, ale nie jest tożsamy z "
 "numerem umieszczonym na korpusie aparatu."
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
 msgid "Image quality setting"
 msgstr "Ustawienie jakości obrazu"
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
 msgid "Color"
 msgstr "Kolor"
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 msgid "Chroma saturation setting"
 msgstr "Ustawienie nasycenia barw"
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
 msgid "Tone"
 msgstr "Ton"
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
 msgid "Flash firing mode setting"
 msgstr "Ustawienie trybu błysku"
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
 msgid "Flash Strength"
 msgstr "Siła błysku"
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
 msgid "Flash firing strength compensation setting"
 msgstr "Ustawienie siły kompensacji błysku"
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
 msgid "Macro mode setting"
 msgstr "Ustawienie trybu makro"
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 msgid "Focusing mode setting"
 msgstr "Ustawienie trybu ostrzenia"
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
 msgstr "Synchronizacja z długimi czasami"
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
 msgid "Slow synchro mode setting"
 msgstr ""
 "Ustawienie trybu synchronizacji błysku z długimi czasami otwarcia migawki"
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
 msgid "Picture Mode"
 msgstr "Tryb zdjęcia"
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
 msgid "Picture mode setting"
 msgstr "Ustawienie trybu zdjęcia"
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr ""
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
 msgid "Sequence Number"
 msgstr "Numer sekwencyjny"
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 msgid "Sequence number"
 msgstr "Numer sekwencyjny"
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
 msgid "FinePix Color"
 msgstr "Kolor FinePix"
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
 msgstr "Ustawienie koloru Fuji FinePix"
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
 msgid "Blur Warning"
 msgstr "Ostrzeżenie o rozmyciu"
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
 msgid "Blur warning status"
 msgstr "Stan ostrzeżenia o rozmyciu"
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
 msgid "Focus Warning"
 msgstr "Ostrzeżenie o ostrzeniu"
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
 msgid "Auto Focus warning status"
 msgstr "Stan ostrzeżenia o automatycznym ostrzeniu"
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
 msgid "Exposure Warning"
 msgstr "Ostrzeżenie ekspozycji"
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
 msgid "Auto exposure warning status"
 msgstr "Stan ostrzeżenia o automatycznej ekspozycji"
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
 msgid "Dynamic Range"
 msgstr "Dynamiczny zakres"
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
 msgid "Dynamic range"
 msgstr "Dynamiczny zakres"
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
 msgid "Film Mode"
 msgstr "Tryb filmu"
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
 msgid "Film mode"
 msgstr "Tryb filmu"
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
 msgid "Dynamic Range Setting"
 msgstr "Ustawienia trybu dynamicznego"
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
 msgid "Dynamic range settings"
 msgstr "Ustawienia trybu dynamicznego"
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
+#, fuzzy
 msgid "Development Dynamic Range"
-msgstr ""
+msgstr "Dynamiczny zakres"
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
+#, fuzzy
 msgid "Development dynamic range"
-msgstr ""
+msgstr "Dynamiczny zakres"
 
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
 msgid "Minimum Focal Length"
 msgstr "Minimalna długość ogniskowej"
 
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
 msgid "Minimum focal length"
 msgstr "Minimalna długość ogniskowej"
 
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
 msgid "Maximum Focal Length"
 msgstr "Maksymalna długość ogniskowej"
 
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
 msgid "Maximum focal length"
 msgstr "Maksymalna długość ogniskowej"
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
 msgid "Maximum Aperture at Mininimum Focal"
 msgstr "Maksymalna jasność przy minimalnej ogniskowej"
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
 msgid "Maximum aperture at mininimum focal"
 msgstr "Maksymalna jasność przy minimalnej ogniskowej"
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
 msgid "Maximum Aperture at Maxinimum Focal"
 msgstr "Maksymalna jasność przy maksymalnej ogniskowej"
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
 msgid "Maximum aperture at maxinimum focal"
 msgstr "Maksymalna jasność przy maksymalnej ogniskowej"
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr "Źródło pliku"
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 msgid "File source"
 msgstr "Źródło pliku"
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
 msgid "Order Number"
 msgstr "Liczba porządkowa"
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
 msgid "Order number"
 msgstr "Liczba porządkowa"
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
 msgid "Frame Number"
 msgstr "Numer klatki"
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
 msgid "Frame number"
 msgstr "Numer klatki"
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
 msgid "Unknown FujiMakerNote tag"
 msgstr "Nieznany znacznik FujiMakerNote"
 
@@ -4345,20 +4997,20 @@
 msgid "Natural Color"
 msgstr "Barwa naturalna"
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
 msgid "Vivid Color"
 msgstr "Barwa jaskrawa"
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
 msgid "Solarization"
 msgstr "Solaryzacja"
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
 msgid "Natural"
 msgstr "Naturalny"
 
@@ -4374,4549 +5026,6831 @@
 msgid "Evening"
 msgstr "Wieczór"
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
 msgid "Night Portrait"
 msgstr "Portret nocny"
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
 msgid "Super Fine"
 msgstr "Bardzo dobra"
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
 msgid "Extra Fine"
 msgstr "Ekstra dobra"
 
-#: src/minoltamn.cpp:84
-msgid "ISO Setting Used"
-msgstr "Użyte ustawienie ISO"
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr "High Key"
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr "Low Key"
-
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
 msgid "Makernote Version"
 msgstr "Wersja Makernote"
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr "Łańcuch \"MTL0\" (nie jest zakończony przez NULL)"
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
 msgid "Camera Settings (Std Old)"
 msgstr "Ustawienia aparatu (Std stary)"
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 "Standardowe ustawienia aparatu (starsze modele aparatów jak D5, D7, S304 i "
 "S404)"
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
 msgid "Camera Settings (Std New)"
 msgstr "Ustawienia aparatu (Std nowy)"
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 "Standardowe ustawienia aparatu (nowsze modele aparatów jak D7u, D7i i D7hi)"
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
 msgid "Camera Settings (7D)"
 msgstr "Ustawienia aparatu (7D)"
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
 msgid "Camera Settings (for Dynax 7D model)"
 msgstr "Ustawienia aparatu (dla modelu Dynax 7D)"
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
 msgid "Image Stabilization Data"
 msgstr "Dane stabilizacji obrazu"
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
 msgid "Image stabilization data"
 msgstr "Dane stabilizacji obrazu"
 
-#: src/minoltamn.cpp:247
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
+msgstr ""
+
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:111
 msgid "Compressed Image Size"
 msgstr "Rozmiar skompresowanego obrazka"
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:112
 msgid "Compressed image size"
 msgstr "Rozmiar skompresowanego obrazka"
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
 msgstr "Miniatura JPEG 640x480 pikseli"
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
 msgid "Thumbnail Offset"
 msgstr "Przesunięcie miniatury"
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr "Przesunięcie miniatury"
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
 msgid "Thumbnail Length"
 msgstr "Długość miniatury"
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
 msgid "Size of the thumbnail"
 msgstr "Rozmiar miniatury"
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+msgid "Scene Mode"
+msgstr "Rodzaj sceny"
+
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
 msgid "Color Mode"
 msgstr "Tryb koloru"
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
 msgid "Color mode"
 msgstr "Tryb koloru"
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
 msgid "Image Quality"
 msgstr "Jakość obrazu"
 
-#: src/minoltamn.cpp:271
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
+msgstr ""
+
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+msgid "Flash Exposure Compensation"
+msgstr "Kompensacja ekspozycji błysku"
+
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+msgid "Flash exposure compensation in EV"
+msgstr "Kompensacja ekspozycji błysku w jednostkach EV"
+
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+#, fuzzy
+msgid "Teleconverter Model"
+msgstr "Model ekstendera"
+
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
+msgstr ""
+
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
+msgstr ""
+
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
 msgid "Zone Matching"
 msgstr "Pasująca strefa"
 
-#: src/minoltamn.cpp:272
+#: src/minoltamn.cpp:154
 msgid "Zone matching"
 msgstr "Pasująca strefa"
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
-msgid "Color Temperature"
-msgstr "Temperatura koloru"
-
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
 msgid "Color temperature"
 msgstr "Temperatura koloru"
 
-#: src/minoltamn.cpp:277
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
 msgid "Lens ID"
 msgstr "ID obiektywu"
 
-#: src/minoltamn.cpp:278
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
 msgid "Lens identifier"
 msgstr "Identyfikator obiektywu"
 
-#: src/minoltamn.cpp:280
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+#, fuzzy
+msgid "Color Compensation Filter"
+msgstr "Kompensacja tonów"
+
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
+msgstr ""
+
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+#, fuzzy
+msgid "White Balance Fine Tune"
+msgstr "Tablica balansu bieli"
+
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+#, fuzzy
+msgid "White Balance Fine Tune Value"
+msgstr "Wartość balansu bieli"
+
+#: src/minoltamn.cpp:168
+#, fuzzy
+msgid "Image Stabilization A100"
+msgstr "Stabilizacja obrazu"
+
+#: src/minoltamn.cpp:169
+#, fuzzy
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr "Dane stabilizacji obrazu"
+
+#: src/minoltamn.cpp:173
 msgid "Camera Settings (5D)"
 msgstr "Ustawienia aparatu (5D)"
 
-#: src/minoltamn.cpp:281
+#: src/minoltamn.cpp:174
 msgid "Camera Settings (for Dynax 5D model)"
 msgstr "Ustawienia aparatu (dla modelu Dynax 5D)"
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
 msgid "Print IM"
 msgstr "Print IM"
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
 msgid "PrintIM information"
 msgstr "Informacja PrintIM"
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:183
 msgid "Camera Settings (Z1)"
 msgstr "Ustawienia aparatu (Z1)"
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr "Ustawienia aparatu (dla modeli Z1, DImage X i F100)"
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
 msgid "Unknown Minolta MakerNote tag"
 msgstr "Nieznany znacznik Minolta MakerNote"
 
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr "Priorytet przysłony"
 
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr "Priorytet migawki"
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
 msgid "Fill flash"
 msgstr "Błysk wypełniający"
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
 msgid "Rear flash sync"
 msgstr "Synchronizacja na zamknięcie migawki"
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
 msgid "Wireless"
 msgstr "Bezprzewodowy"
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
 #, fuzzy
 msgid "Fluorescent 2"
 msgstr "Fluorescencja 2"
 
-#: src/minoltamn.cpp:329 src/properties.cpp:763
-msgid "Custom 3"
-msgstr "Użytkownika 3"
-
-#: src/minoltamn.cpp:334
+#: src/minoltamn.cpp:231
 msgid "Full size"
 msgstr "Pełny rozmiar"
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
 msgid "Super fine"
 msgstr "Bardzo dobra"
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr "Ekstra dobra"
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+#, fuzzy
+msgid "Single Frame"
+msgstr "Pojedynczy obszar"
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
 msgid "Self-timer"
 msgstr "Samowyzwalacz"
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
 msgid "Bracketing"
 msgstr "Bracketing"
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
 msgid "Interval"
 msgstr "Odstęp"
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
 #, fuzzy
 msgid "UHS continuous"
 msgstr "Gradient ciągły"
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
 #, fuzzy
 msgid "HS continuous"
 msgstr "Gradient ciągły"
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
 msgid "Multi-segment"
 msgstr "Wielopolowy"
 
-#: src/minoltamn.cpp:380
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+msgid "Center weighted average"
+msgstr "Centralnie ważony uśredniony"
+
+#: src/minoltamn.cpp:271
 msgid "Electronic magnification"
 msgstr "Powiększenie elektroniczne"
 
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
 msgid "Top"
 msgstr "Góra"
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
 msgid "Top-right"
 msgstr "Górny prawy"
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 msgid "Bottom-right"
 msgstr "Dolny prawy"
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
 msgid "Bottom"
 msgstr "Dół"
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
 msgid "Bottom-left"
 msgstr "Dolny lewy"
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
 msgid "Top-left"
 msgstr "Górny lewy"
 
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
 msgid "Hard"
 msgstr "Duża"
 
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
 msgid "Soft"
 msgstr "Mała"
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
 msgid "Night portrait"
 msgstr "Nocny portret"
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
 msgid "Sports action"
 msgstr "Sport"
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr ""
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 #, fuzzy
 msgid "Standard form"
 msgstr "Forma standardowa"
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
 #, fuzzy
 msgid "Data form"
 msgstr "Formularz danych"
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
 msgid "Natural color"
 msgstr "Naturalny kolor"
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
 msgid "Black and white"
 msgstr "Czarno-biały"
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
 msgid "Vivid color"
 msgstr "Barwa jaskrawa"
 
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr "Adobe RGB"
-
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
 msgid "No zone"
 msgstr "Brak strefy"
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr "Strefa środkowa (układ poziomy)"
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr "Strefa środkowa (układ pionowa)"
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
 msgid "Left zone"
 msgstr "Strefa lewa"
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 msgid "Right zone"
 msgstr "Strefa prawa"
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
 msgid "Auto focus"
 msgstr "Ostrzenie automatyczne"
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
 msgid "Wide focus (normal)"
 msgstr ""
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
 msgid "Spot focus"
 msgstr "Ostrzenie punktowe"
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 msgid "Filter"
 msgstr "Filtr"
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 msgid "Not embedded"
 msgstr "Niedołączona"
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
 msgid "Embedded"
 msgstr "Osadzone"
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr "Tekst + ID"
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr "ADI (Advanced Distance Integration)"
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr "Przedbłysk TTL"
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
 msgid "Manual flash control"
 msgstr "Ręczne sterowanie lampą"
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr "Tryb ekspozycji"
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
 msgid "Flash mode"
 msgstr "Tryb flesza"
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
+#, fuzzy
 msgid "Drive mode"
-msgstr ""
-
-#: src/minoltamn.cpp:631
-msgid "Exposure Speed"
-msgstr ""
+msgstr "Tryb działania"
 
-#: src/minoltamn.cpp:632
-msgid "Exposure speed"
-msgstr ""
+#: src/minoltamn.cpp:512
+#, fuzzy
+msgid "ISO Value"
+msgstr "Czułość ISO"
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr "Czas ekspozycji"
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 msgid "FNumber"
 msgstr "Liczba F"
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 msgid "The F-Number"
 msgstr "Liczba F"
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 msgid "Macro Mode"
 msgstr "Tryb makro"
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
 msgid "Exposure Compensation"
 msgstr "Kompensacja ekspozycji"
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
 msgid "Bracket Step"
 msgstr "Krok bracketingu"
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
 msgid "Bracket step"
 msgstr "Krok bracketingu"
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
 msgid "Interval Length"
 msgstr "Rozmiar odstępu"
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
 msgid "Interval length"
 msgstr "Rozmiar odstępu"
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
 msgid "Interval Number"
 msgstr "Numer odstępu"
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
 msgid "Interval number"
 msgstr "Numer odstępu"
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
 msgid "Focus Distance"
 msgstr "Odległość ostrzenia"
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
 msgid "Focus distance"
 msgstr "Odległość ostrzenia"
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+#, fuzzy
+msgid "Flash Fired"
+msgstr "Urządzenie flesza"
+
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+#, fuzzy
+msgid "Flash fired"
+msgstr "Flesz wyłączony"
+
+#: src/minoltamn.cpp:547
 msgid "Minolta Date"
 msgstr "Minolta data"
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
 msgid "Minolta date"
 msgstr "Minolta data"
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
 msgid "Minolta Time"
 msgstr "Minolta czas"
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
 msgid "Minolta time"
 msgstr "Minolta czas"
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
 #, fuzzy
 msgid "File Number Memory"
 msgstr "Pamięć numeracji plików"
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
 #, fuzzy
 msgid "File number memory"
 msgstr "Pamięć numeracji plików"
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
-msgid "Image Number"
+#: src/minoltamn.cpp:559
+#, fuzzy
+msgid "Last Image Number"
 msgstr "Numer obrazu"
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:560
+#, fuzzy
+msgid "Last image number"
+msgstr "Numer zdjęcia"
+
+#: src/minoltamn.cpp:562
 msgid "Color Balance Red"
 msgstr "Balans kolorów czerwieni"
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
 msgid "Color balance red"
 msgstr "Balans kolorów czerwieni"
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
 msgid "Color Balance Green"
 msgstr "Balans kolorów zieleni"
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
 msgid "Color balance green"
 msgstr "Balans kolorów zieleni"
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
 msgid "Color Balance Blue"
 msgstr "Balans kolorów błękitu"
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
 msgid "Color balance blue"
 msgstr "Balans kolorów błękitu"
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
 msgid "Subject Program"
 msgstr "Program tematyczny"
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
 msgid "Subject program"
 msgstr "Program tematyczny"
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
-msgid "Flash Exposure Compensation"
-msgstr "Kompensacja ekspozycji błysku"
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
+msgid "ISO Settings"
+msgstr "Ustawienia ISO"
 
-#: src/minoltamn.cpp:704
-msgid "Flash exposure compensation in EV"
-msgstr "Kompensacja ekspozycji błysku w jednostkach EV"
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
+msgid "ISO setting"
+msgstr "Ustawienie ISO"
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
 msgid "Minolta Model"
 msgstr "Minolta model"
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
 msgid "Minolta model"
 msgstr "Minolta model"
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
 #, fuzzy
 msgid "Interval Mode"
 msgstr "Tryb odstępu"
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
 #, fuzzy
 msgid "Interval mode"
 msgstr "Tryb odstępu"
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
 msgid "Folder Name"
 msgstr "Nazwa katalogu"
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
 msgid "Folder name"
 msgstr "Nazwa katalogu"
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
 msgid "ColorMode"
 msgstr "Tryb koloru"
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
 msgid "Color Filter"
 msgstr "Filtr kolorów"
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
 msgid "Color filter"
 msgstr "Filtr kolorów"
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
 msgid "Black and White Filter"
 msgstr "Filtr czarno-biały"
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
 msgid "Black and white filter"
 msgstr "Filtr czarno-biały"
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
 msgid "Internal Flash"
 msgstr "Wewnętrzny flesz"
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr "Jasność"
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
+#, fuzzy
 msgid "Spot Focus Point X"
-msgstr ""
+msgstr "Ostrzenie punktowe"
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
+#, fuzzy
 msgid "Spot focus point X"
-msgstr ""
+msgstr "Ostrzenie punktowe"
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
+#, fuzzy
 msgid "Spot Focus Point Y"
-msgstr ""
+msgstr "Ostrzenie punktowe"
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
+#, fuzzy
 msgid "Spot focus point Y"
-msgstr ""
+msgstr "Ostrzenie punktowe"
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
+#, fuzzy
 msgid "Wide Focus Zone"
-msgstr ""
+msgstr "Tryb ogniskowania"
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
 msgid "Wide focus zone"
 msgstr ""
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
 msgid "Focus mode"
 msgstr "Tryb ogniskowania"
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
 msgid "Focus area"
 msgstr "Obszar ogniskowania"
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
 msgid "DEC Switch Position"
 msgstr "Pozycja przełącznika DEC"
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
 msgid "DEC switch position"
 msgstr "Pozycja przełącznika DEC"
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
 msgid "Color Profile"
 msgstr "Profil koloru"
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
 msgid "Color profile"
 msgstr "Profil koloru"
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
 #, fuzzy
 msgid "Data Imprint"
 msgstr "Kompresja danych"
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
 msgid "Flash Metering"
 msgstr "Tryb pomiaru błysku"
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
 msgid "Flash metering"
 msgstr "Tryb pomiaru światła błyskowego"
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
 msgid "Unknown Minolta Camera Settings tag"
 msgstr "Nieznany znacznik Minolta Camera Settings"
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
 msgid "Program-shift A"
 msgstr "Program-shift A"
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
 msgid "Program-shift S"
 msgstr "Program-shift S"
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
 msgid "Raw+Jpeg"
 msgstr "RAW+JPEG"
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
 msgid "Kelvin"
 msgstr "Kelvin"
 
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
 msgid "Single-shot AF"
 msgstr "Pojedyncze zdjęcie"
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
 msgid "Continuous AF"
 msgstr "Ciągły"
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
 msgid "Automatic AF"
 msgstr "Automatycznie"
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
 msgid "sRGB (Natural)"
 msgstr "sRGB (Natural)"
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
 msgid "sRGB (Natural+)"
 msgstr "sRGB (Natural+)"
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr "Poziome (normalne)"
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr "Obrót o 90 w prawo"
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr "Obrót o 270 w prawo"
 
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
 msgid "AF Points"
 msgstr "Punkty AF"
 
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
 msgid "AF points"
 msgstr "Punkty AF"
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr "Przestrzeń kolorów"
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 msgid "Color space"
 msgstr "Przestrzeń kolorów"
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 #, fuzzy
 msgid "Free Memory Card Images"
 msgstr "Liczba wolnych zdjęć na karcie pamięci"
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 #, fuzzy
 msgid "Free memory card images"
 msgstr "Liczba wolnych zdjęć na karcie pamięci"
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
 msgid "Hue"
 msgstr "Odcień"
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
 msgid "Rotation"
 msgstr "Obrót"
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+msgid "Image Number"
+msgstr "Numer obrazu"
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
 msgid "Noise reduction"
 msgstr "Redukcja szumów"
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
+#, fuzzy
 msgid "Zone Matching On"
-msgstr ""
+msgstr "Pasująca strefa"
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
+#, fuzzy
 msgid "Zone matching on"
-msgstr ""
+msgstr "Pasująca strefa"
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
 msgid "Unknown Minolta Camera Settings 7D tag"
 msgstr "Nieznany znacznik Minolta Camera Settings 7D"
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
-msgstr ""
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+#, fuzzy
+msgid "Program Shift A"
+msgstr "Program-shift A"
+
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+#, fuzzy
+msgid "Program Shift S"
+msgstr "Program-shift S"
+
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+#, fuzzy
+msgid "Night View/Portrait"
+msgstr "Portret nocny"
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:895
+#, fuzzy
 msgid "200 (Zone Matching High)"
-msgstr ""
+msgstr "Pasująca strefa"
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
+#, fuzzy
 msgid "80 (Zone Matching Low)"
-msgstr ""
+msgstr "Pasująca strefa"
+
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+#, fuzzy
+msgid "Adobe RGB (ICC)"
+msgstr "Adobe RGB"
 
-#: src/minoltamn.cpp:1065
+#: src/minoltamn.cpp:918
 #, fuzzy
 msgid "Central"
 msgstr "Środek"
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:919
 #, fuzzy
 msgid "Up"
 msgstr "W górę"
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
 #, fuzzy
 msgid "Up right"
 msgstr "W prawo do góry"
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
 #, fuzzy
 msgid "Down right"
 msgstr "W prawo do dołu"
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
 #, fuzzy
 msgid "Down"
 msgstr "W dół"
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
 #, fuzzy
 msgid "Down left"
 msgstr "W lewo do dołu"
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
 #, fuzzy
 msgid "Up left"
 msgstr "W lewo do góry"
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 msgid "Selection"
 msgstr "Zaznaczenie"
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+#, fuzzy
+msgid "Natural+"
+msgstr "Naturalny"
+
+#: src/minoltamn.cpp:949
+#, fuzzy
+msgid "Wind Scene"
+msgstr "Scena nocna"
+
+#: src/minoltamn.cpp:950
+#, fuzzy
+msgid "Evening Scene"
+msgstr "Wieczór"
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus Position"
 msgstr "Pozycja ostrzenia"
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus position"
 msgstr "Pozycja ostrzenia"
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
 msgid "Focus Area"
 msgstr "Obszar ostrzenia"
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
+#, fuzzy
 msgid "Exposure Revision"
-msgstr ""
+msgstr "Kompensacja ekspozycji"
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
+#, fuzzy
 msgid "Exposure revision"
-msgstr ""
+msgstr "Kompensacja ekspozycji"
+
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+#, fuzzy
+msgid "Rotation2"
+msgstr "Obrót"
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+#, fuzzy
+msgid "Picture Finish"
+msgstr "Informacje o zdjęciu"
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1059
 msgid "Exposure Manual Bias"
 msgstr "Ręczna korekta ekspozycji"
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
 #, fuzzy
 msgid "Exposure manual bias"
 msgstr "Ręczna korekta ekspozycji (APEX)"
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
 msgid "AF Mode"
 msgstr "Tryb AF"
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
 msgid "AF mode"
 msgstr "Tryb działania AF"
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
 msgid "Unknown Minolta Camera Settings 5D tag"
 msgstr "Nieznany znacznik Minolta Camera settings 5D"
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
-msgid "Single area"
-msgstr "Pojedynczy obszar"
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
+#, fuzzy
+msgid "Self-timer 10 sec"
+msgstr "Samowyzwalacz (12 s)"
 
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
-msgid "Dynamic area"
-msgstr "Dynamiczny obszar"
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
+#, fuzzy
+msgid "Self-timer 2 sec"
+msgstr "Samowyzwalacz (2 s)"
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
-msgstr "Dynamiczny obszar, najbliższy obiekt"
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+#, fuzzy
+msgid "White Balance Bracketing Low"
+msgstr "Bracketing balansu bieli"
 
-#: src/nikonmn.cpp:77
+#: src/minoltamn.cpp:1101
 #, fuzzy
-msgid "Group dynamic"
-msgstr "Dynamiczna siatka"
+msgid "White Balance Bracketing High"
+msgstr "Bracketing balansu bieli"
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr "Pojedynczy obszar (szeroki)"
+#: src/minoltamn.cpp:1102
+msgid "Single-frame Bracketing Low"
+msgstr ""
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
-msgstr "Dynamiczny obszar (szeroki)"
+#: src/minoltamn.cpp:1103
+#, fuzzy
+msgid "Continous Bracketing Low"
+msgstr "Auto bracketing"
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
-msgid "Upper-left"
-msgstr "Górny lewy"
+#: src/minoltamn.cpp:1104
+msgid "Single-frame Bracketing High"
+msgstr ""
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
-msgid "Upper-right"
-msgstr "Górny prawy"
+#: src/minoltamn.cpp:1105
+#, fuzzy
+msgid "Continous Bracketing High"
+msgstr "Ciągły, wysoki"
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
-msgid "Lower-left"
-msgstr "Dolny lewy"
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
+msgstr ""
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
-msgid "Lower-right"
-msgstr "Dolny prawy"
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
+#, fuzzy
+msgid "Continuous Bracketing"
+msgstr "Ciągły, wysoki"
 
-#: src/nikonmn.cpp:96
+#: src/minoltamn.cpp:1152
 #, fuzzy
-msgid "Left-most"
-msgstr "Lewy największy"
+msgid "Single-Frame Bracketing"
+msgstr "Bracketing"
 
-#: src/nikonmn.cpp:97
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
 #, fuzzy
-msgid "Right-most"
-msgstr "Prawy największy"
+msgid "White Balance Bracketing"
+msgstr "Bracketing balansu bieli"
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
-msgstr "sRGB"
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
+msgid "Preset"
+msgstr "Predefiniowany"
 
-#: src/nikonmn.cpp:131
-msgid "Fire, manual"
-msgstr "Tak, ręczna"
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
+#, fuzzy
+msgid "Color Temperature/Color Filter"
+msgstr "Temperatura koloru"
 
-#: src/nikonmn.cpp:132
-msgid "Fire, external"
-msgstr "Tak, zewnętrzna"
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
+msgid "Temperature"
+msgstr "Temperatura"
 
-#: src/nikonmn.cpp:133
+#: src/minoltamn.cpp:1209
 #, fuzzy
-msgid "Fire, commander mode"
-msgstr "Tak, tryb zarządcy"
+msgid "Setup"
+msgstr "Ustaw"
 
-#: src/nikonmn.cpp:134
-msgid "Fire, TTL mode"
-msgstr "Tak, tryb TTL"
+#: src/minoltamn.cpp:1210
+#, fuzzy
+msgid "Recall"
+msgstr "Żółty"
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
-msgstr "Opóźnienie"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
+msgstr ""
 
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
-msgid "PC control"
+#: src/minoltamn.cpp:1216
+msgid "Error"
 msgstr ""
 
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
-msgid "Exposure bracketing"
-msgstr "Bracketing ekspozycji"
+#: src/minoltamn.cpp:1228
+#, fuzzy
+msgid "Image and Information"
+msgstr "Konfiguracja obrazu"
 
-#: src/nikonmn.cpp:143
-msgid "Auto ISO"
-msgstr "Automatyczne ISO"
+#: src/minoltamn.cpp:1229
+#, fuzzy
+msgid "Image Only"
+msgstr "Rodzaj obrazu"
 
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
-msgid "White balance bracketing"
-msgstr "Bracketing balansu bieli"
+#: src/minoltamn.cpp:1230
+#, fuzzy
+msgid "Image and Histogram"
+msgstr "Wysokość obrazu"
 
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
-msgid "IR control"
-msgstr "Sterowanie podczerwienią"
+#: src/minoltamn.cpp:1236
+#, fuzzy
+msgid "Fill Flash"
+msgstr "Błysk wypełniający"
 
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
+#: src/minoltamn.cpp:1247
+#, fuzzy
+msgid "Focus Hold"
+msgstr "Tryb ogniskowania"
+
+#: src/minoltamn.cpp:1248
+#, fuzzy
+msgid "DOF Preview"
+msgstr "Podgląd"
+
+#: src/minoltamn.cpp:1253
+msgid "Hold"
 msgstr ""
 
-#: src/nikonmn.cpp:162
-msgid "Auto release"
-msgstr "Automatyczne wyzwolenie"
+#: src/minoltamn.cpp:1254
+#, fuzzy
+msgid "Toggle"
+msgstr "Ton"
 
-#: src/nikonmn.cpp:163
-msgid "Manual release"
-msgstr "Ręczne wyzwolenie"
+#: src/minoltamn.cpp:1255
+#, fuzzy
+msgid "Spot Hold"
+msgstr "Tryb punktowy włączony"
 
-#: src/nikonmn.cpp:168
-msgid "Lossy (type 1)"
-msgstr "Stratna (typ 1)"
+#: src/minoltamn.cpp:1256
+#, fuzzy
+msgid "Spot Toggle"
+msgstr "Tryb punktowy włączony"
 
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
-msgstr "Bez kompresji"
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+msgid "Shutter Speed"
+msgstr "Czas otwarcia migawki"
 
-#: src/nikonmn.cpp:170
-msgid "Lossless"
-msgstr "Bezstratna"
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
+msgstr ""
 
-#: src/nikonmn.cpp:171
-msgid "Lossy (type 2)"
-msgstr "Stratna (typ 2)"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
+msgstr ""
 
-#: src/nikonmn.cpp:177
-msgid "B & W"
-msgstr "Czarno-biały"
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
+msgstr ""
+
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
+msgstr ""
 
-#: src/nikonmn.cpp:179
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
 #, fuzzy
-msgid "Trim"
-msgstr "Przycięcie"
+msgid "Automatic"
+msgstr "Automatycznie"
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
-msgstr "Mały obrazek"
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
+#, fuzzy
+msgid "Auto-rotate"
+msgstr "Automatyczna regulacja kontrastu"
 
-#: src/nikonmn.cpp:181
-msgid "D-Lighting"
-msgstr "D-Lighting"
+#: src/minoltamn.cpp:1287
+#, fuzzy
+msgid "Horizontal"
+msgstr "Poziome (normalne)"
 
-#: src/nikonmn.cpp:182
-msgid "Red eye"
-msgstr "Efekt czerwonych oczu"
+#: src/minoltamn.cpp:1293
+#, fuzzy
+msgid "Manual Rotate"
+msgstr "Ręczne wyzwolenie"
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
-msgid "Cyanotype"
-msgstr "Cyjanotypia"
+#: src/minoltamn.cpp:1298
+#, fuzzy
+msgid "Within Range"
+msgstr "Zakres obiektywu"
 
-#: src/nikonmn.cpp:184
-msgid "Sky light"
-msgstr "Światło dzienne"
+#: src/minoltamn.cpp:1299
+#, fuzzy
+msgid "Under/Over Range"
+msgstr "Zakres przejścia"
 
-#: src/nikonmn.cpp:185
-msgid "Warm tone"
-msgstr "Ciepły odcień"
+#: src/minoltamn.cpp:1300
+#, fuzzy
+msgid "Out of Range"
+msgstr "Pozycja poza zakresem"
 
-#: src/nikonmn.cpp:186
-msgid "Color custom"
-msgstr "Własny kolor"
+#: src/minoltamn.cpp:1305
+#, fuzzy
+msgid "Not Indicated"
+msgstr "Nieokreślony"
 
-#: src/nikonmn.cpp:187
-msgid "Image overlay"
-msgstr ""
+#: src/minoltamn.cpp:1306
+#, fuzzy
+msgid "Under Scale"
+msgstr "Podwodny"
 
-#: src/nikonmn.cpp:193
-msgid "Minimal"
-msgstr "Minimalny"
+#: src/minoltamn.cpp:1307
+#, fuzzy
+msgid "Bottom of Scale"
+msgstr "Od dołu do góry"
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
-msgid "Nikon Makernote version"
-msgstr "Wersja Nikon Makernote"
-
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
-msgid "ISO Speed"
-msgstr "Czułość ISO"
-
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
-msgid "Sharpening"
-msgstr "Wyostrzenie"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
+msgstr ""
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
-msgid "Image sharpening setting"
-msgstr "Ustawienie wyostrzenia obrazu"
+#: src/minoltamn.cpp:1326
+#, fuzzy
+msgid "Over Scale"
+msgstr "Domyślna skala"
 
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
-msgid "Focus"
-msgstr "Ogniskowanie"
+#: src/minoltamn.cpp:1331
+msgid "AM"
+msgstr ""
 
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
-msgid "Flash Setting"
-msgstr "Ustawienie flesza"
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
+msgstr "Ręczne ostrzenie"
 
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
-msgid "Flash setting"
-msgstr "Ustawienie flesza"
+#: src/minoltamn.cpp:1338
+#, fuzzy
+msgid "Built-in"
+msgstr "Błysk wypełniający"
 
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
-msgid "ISO Selection"
-msgstr "Wybór ISO"
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
+#, fuzzy
+msgid "Very Low"
+msgstr "Bardzo niski"
 
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
-msgid "ISO selection"
-msgstr "Wybór ISO"
+#: src/minoltamn.cpp:1346
+#, fuzzy
+msgid "Half Full"
+msgstr "Pełny"
 
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data Dump"
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
 msgstr ""
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data dump"
-msgstr ""
+#: src/minoltamn.cpp:1355
+#, fuzzy
+msgid "Exposure Compensation Setting"
+msgstr "Kompensacja ekspozycji"
 
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
-msgid "Image Adjustment"
-msgstr "Dopasowanie obrazu"
+#: src/minoltamn.cpp:1356
+#, fuzzy
+msgid "Exposure compensation setting"
+msgstr "Kompensacja ekspozycji"
 
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
-msgid "Image adjustment setting"
-msgstr "Ustawienie dopasowania obrazu"
+#: src/minoltamn.cpp:1358
+#, fuzzy
+msgid "High Speed Sync"
+msgstr "Duża szybkość"
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
-msgid "Auxiliary Lens"
-msgstr "Obiektyw zewnętrzny"
+#: src/minoltamn.cpp:1359
+#, fuzzy
+msgid "High speed sync"
+msgstr "Duża szybkość"
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
-msgstr "Obiektyw zewnętrzny (adapter)"
+#: src/minoltamn.cpp:1361
+#, fuzzy
+msgid "Manual Exposure Time"
+msgstr "Czas ekspozycji"
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
-msgid "Manual focus distance"
-msgstr "Ręczna odległość ostrzenia"
+#: src/minoltamn.cpp:1362
+#, fuzzy
+msgid "Manual exposure time"
+msgstr "Czas ekspozycji"
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
-msgid "Digital zoom setting"
-msgstr "Ustawienie powiększenia cyfrowego"
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
+#, fuzzy
+msgid "Manual FNumber"
+msgstr "Numer odstępu"
 
-#: src/nikonmn.cpp:246
-msgid "AF Focus Position"
-msgstr "Pozycja AF"
+#: src/minoltamn.cpp:1373
+#, fuzzy
+msgid "Drive Mode 2"
+msgstr "Tryb działania"
 
-#: src/nikonmn.cpp:247
-msgid "AF focus position information"
-msgstr "Informacja o pozycji AF"
+#: src/minoltamn.cpp:1374
+#, fuzzy
+msgid "Drive mode 2"
+msgstr "Tryb działania"
 
-#: src/nikonmn.cpp:252
-msgid "Unknown Nikon1MakerNote tag"
-msgstr "Nieznany znacznik Nikon1MakerNote"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
+msgstr ""
 
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
-msgstr "Ciągły AF"
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
+msgid "AF Area Mode"
+msgstr "Tryb strefy AF"
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
-msgstr "Pojedynczy AF"
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
+#, fuzzy
+msgid "FlashMode"
+msgstr "Tryb flesza"
 
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
-msgid "Not used"
-msgstr "Nie używany"
+#: src/minoltamn.cpp:1391
+#, fuzzy
+msgid "Flash Exposure Comp Setting"
+msgstr "Kompensacja ekspozycji błysku"
 
-#: src/nikonmn.cpp:353
-msgid "guess"
-msgstr "wartość szacowana"
+#: src/minoltamn.cpp:1392
+#, fuzzy
+msgid "Flash exposure compensation setting"
+msgstr "Kompensacja ekspozycji błysku w jednostkach EV"
 
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
-msgstr "Podstawowa VGA"
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
+#, fuzzy
+msgid "ISO Setting"
+msgstr "Ustawienia ISO"
 
-#: src/nikonmn.cpp:401
-msgid "VGA Normal"
-msgstr "Normalna VGA"
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
+#, fuzzy
+msgid "Zone Matching Mode"
+msgstr "Pasująca strefa"
 
-#: src/nikonmn.cpp:402
-msgid "VGA Fine"
-msgstr "Dobra VGA"
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
+#, fuzzy
+msgid "Dynamic Range Optimizer Mode"
+msgstr "Ustawienia trybu dynamicznego"
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
-msgstr "Podstawowa SXGA"
+#: src/minoltamn.cpp:1404
+#, fuzzy
+msgid "Dynamic range optimizer mode"
+msgstr "Rozszerzenie dynamiczny zakresu"
 
-#: src/nikonmn.cpp:404
-msgid "SXGA Normal"
-msgstr "Normalna SXGA"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
+msgstr ""
 
-#: src/nikonmn.cpp:405
-msgid "SXGA Fine"
-msgstr "Dobra SXGA"
+#: src/minoltamn.cpp:1430
+#, fuzzy
+msgid "Self Timer Time"
+msgstr "Samowyzwalacz"
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
-msgid "Monochrome"
-msgstr "Monochromatyczny"
+#: src/minoltamn.cpp:1431
+#, fuzzy
+msgid "Self timer time"
+msgstr "Samowyzwalacz"
 
-#: src/nikonmn.cpp:417
-msgid "Bright+"
-msgstr "Jasność+"
+#: src/minoltamn.cpp:1434
+#, fuzzy
+msgid "Continuous bracketing"
+msgstr "Ciągły, wysoki"
 
-#: src/nikonmn.cpp:418
-msgid "Bright-"
-msgstr "Jasność-"
+#: src/minoltamn.cpp:1436
+#, fuzzy
+msgid "Single Frame Bracketing"
+msgstr "Bracketing balansu bieli"
 
-#: src/nikonmn.cpp:419
-msgid "Contrast+"
-msgstr "Kontrast+"
+#: src/minoltamn.cpp:1437
+#, fuzzy
+msgid "Single frame bracketing"
+msgstr "Bracketing balansu bieli"
 
-#: src/nikonmn.cpp:420
-msgid "Contrast-"
-msgstr "Kontrast-"
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
+msgid "White balance bracketing"
+msgstr "Bracketing balansu bieli"
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
-msgstr "Predefiniowany"
+#: src/minoltamn.cpp:1442
+#, fuzzy
+msgid "White Balance Setting"
+msgstr "Ustawienie balansu bieli"
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
-msgstr "SpeedLight"
+#: src/minoltamn.cpp:1445
+#, fuzzy
+msgid "Preset White Balance"
+msgstr "Balans bieli"
 
-#: src/nikonmn.cpp:479
-msgid "Unknown Nikon2MakerNote tag"
-msgstr "Nieznany znacznik Nikon2MakerNote"
+#: src/minoltamn.cpp:1446
+#, fuzzy
+msgid "Preset white balance"
+msgstr "CM Balans bieli"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
-msgid "Flash Device"
-msgstr "Urządzenie flesza"
+#: src/minoltamn.cpp:1448
+#, fuzzy
+msgid "Color Temperature Setting"
+msgstr "Temperatura koloru"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
-msgid "Flash device"
-msgstr "Urządzenie flesza"
+#: src/minoltamn.cpp:1449
+#, fuzzy
+msgid "Color temperature setting"
+msgstr "Temperatura koloru"
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
-msgid "White Balance Bias"
-msgstr "Odchylenie balansu bieli"
+#: src/minoltamn.cpp:1451
+#, fuzzy
+msgid "Custom WB Setting"
+msgstr "Własny balans bieli 1"
 
-#: src/nikonmn.cpp:522
-msgid "White balance bias"
-msgstr "Odchylenie balansu bieli"
+#: src/minoltamn.cpp:1452
+#, fuzzy
+msgid "Custom WB setting"
+msgstr "Własny balans bieli 1"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB Levels"
-msgstr "Poziomy balansu bieli RB"
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
+#, fuzzy
+msgid "Dynamic Range Optimizer Settings"
+msgstr "Ustawienia trybu dynamicznego"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB levels"
-msgstr "Poziomy balansu bieli RB"
+#: src/minoltamn.cpp:1460
+#, fuzzy
+msgid "Custom WB Red Level"
+msgstr "WB poziom czerwieni"
 
-#: src/nikonmn.cpp:524
-msgid "Program Shift"
-msgstr ""
+#: src/minoltamn.cpp:1461
+#, fuzzy
+msgid "Custom WB red level"
+msgstr "WB poziom czerwieni"
 
-#: src/nikonmn.cpp:524
-msgid "Program shift"
-msgstr ""
+#: src/minoltamn.cpp:1463
+#, fuzzy
+msgid "Custom WB Green Level"
+msgstr "WB poziom zieleni"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure Difference"
-msgstr "Różnica ekspozycji"
+#: src/minoltamn.cpp:1464
+#, fuzzy
+msgid "Custom WB green level"
+msgstr "WB poziom zieleni"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure difference"
-msgstr "Różnica ekspozycji"
+#: src/minoltamn.cpp:1466
+#, fuzzy
+msgid "Custom WB Blue Level"
+msgstr "WB poziom błękitu"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
-msgstr "Wskaźnik podglądu obrazka"
+#: src/minoltamn.cpp:1467
+#, fuzzy
+msgid "CustomWB blue level"
+msgstr "WB poziom błękitu"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
-msgstr "Przesunięcie do IFD zawierającego obrazek podglądu"
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
+#, fuzzy
+msgid "Custom WB Error"
+msgstr "Własny balans bieli 1"
 
-#: src/nikonmn.cpp:529
-msgid "Flash Comp"
-msgstr "Kompensacja błysku"
+#: src/minoltamn.cpp:1473
+#, fuzzy
+msgid "White balance fine tune"
+msgstr "Poprawka balansu bieli"
 
-#: src/nikonmn.cpp:529
-msgid "Flash compensation setting"
-msgstr "Ustawienie kompensacji błysku"
+#: src/minoltamn.cpp:1479
+#, fuzzy
+msgid "Color compensation filter"
+msgstr "Wartość kompensacji ekspozycji"
 
-#: src/nikonmn.cpp:530
-msgid "ISO Settings"
-msgstr "Ustawienia ISO"
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
+#, fuzzy
+msgid "Sony Image Size"
+msgstr "Rozmiar obrazu"
 
-#: src/nikonmn.cpp:530
-msgid "ISO setting"
-msgstr "Ustawienie ISO"
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
+msgstr ""
 
-#: src/nikonmn.cpp:531
-msgid "Image Boundary"
-msgstr "Granice obrazu"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
+msgstr ""
 
-#: src/nikonmn.cpp:531
-msgid "Image boundary"
-msgstr "Granice obrazu"
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
+msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash Bracket Comp"
-msgstr "Kompensacja bracketingu błysku"
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
+msgstr ""
 
-#: src/nikonmn.cpp:533
-msgid "Flash bracket compensation applied"
-msgstr "Zastosowana kompensacja bracketingu błysku"
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
+msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "Exposure Bracket Comp"
-msgstr "Kompensacja bracketingu ekspozycji"
+#: src/minoltamn.cpp:1497
+#, fuzzy
+msgid "Eye start AF"
+msgstr "One shot AF"
 
-#: src/nikonmn.cpp:534
-msgid "AE bracket compensation applied"
-msgstr "Zastosowana kompensacja bracketingu automatycznej ekspozycji"
+#: src/minoltamn.cpp:1499
+#, fuzzy
+msgid "Red Eye Reduction"
+msgstr "Redukcja czerwonych oczu"
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
-msgid "Image Processing"
-msgstr "Przetwarzanie obrazu"
+#: src/minoltamn.cpp:1500
+#, fuzzy
+msgid "Red eye reduction"
+msgstr "Redukcja czerwonych oczu"
 
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
-msgid "Image processing"
-msgstr "Przetwarzanie obrazu"
+#: src/minoltamn.cpp:1502
+#, fuzzy
+msgid "Flash Default"
+msgstr "Szczegóły flesza"
 
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
-msgstr ""
+#: src/minoltamn.cpp:1503
+#, fuzzy
+msgid "Flash default"
+msgstr "Szczegóły flesza"
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
-msgstr ""
+#: src/minoltamn.cpp:1505
+#, fuzzy
+msgid "Auto Bracket Order"
+msgstr "Auto bracketing"
 
-#: src/nikonmn.cpp:539
-msgid "VR Info"
-msgstr "Informacja o redukcji wstrząsów"
+#: src/minoltamn.cpp:1506
+#, fuzzy
+msgid "Auto bracket order"
+msgstr "Auto bracketing"
 
-#: src/nikonmn.cpp:539
-msgid "VR info"
-msgstr "Informacja o redukcji wstrząsów"
+#: src/minoltamn.cpp:1508
+#, fuzzy
+msgid "Focus Hold Button"
+msgstr "Ustawienie trybu ogniskowania"
 
-#: src/nikonmn.cpp:540
-msgid "Image Authentication"
-msgstr "Autoryzacja obrazu"
+#: src/minoltamn.cpp:1509
+#, fuzzy
+msgid "Focus hold button"
+msgstr "Ustawienie trybu ogniskowania"
 
-#: src/nikonmn.cpp:540
-msgid "Image authentication"
-msgstr "Autoryzacja obrazu"
-
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
-msgstr ""
-
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
-msgstr ""
-
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1511
 #, fuzzy
-msgid "Picture Control"
-msgstr "Informacje o zdjęciu"
+msgid "AEL Button"
+msgstr "Ustawienie automatycznej ekspozycji"
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1512
 #, fuzzy
-msgid " Picture control"
-msgstr "Informacje o zdjęciu"
-
-#: src/nikonmn.cpp:543
-msgid "World Time"
-msgstr "Czas światowy"
-
-#: src/nikonmn.cpp:543
-msgid "World time"
-msgstr "Czas światowy"
+msgid "AEL button"
+msgstr "Ustawienie automatycznej ekspozycji"
 
-#: src/nikonmn.cpp:544
-msgid "ISO Info"
-msgstr "Informacja ISO"
+#: src/minoltamn.cpp:1514
+#, fuzzy
+msgid "Control Dial Set"
+msgstr "Ustawienie kontrastu"
 
-#: src/nikonmn.cpp:544
-msgid "ISO info"
-msgstr "Informacja ISO"
+#: src/minoltamn.cpp:1515
+#, fuzzy
+msgid "Control dial set"
+msgstr "Kontrastowość"
 
-#: src/nikonmn.cpp:545
-msgid "Vignette Control"
-msgstr "Kontrola winietowania"
+#: src/minoltamn.cpp:1517
+#, fuzzy
+msgid "Exposure Compensation Mode"
+msgstr "Kompensacja ekspozycji"
 
-#: src/nikonmn.cpp:545
-msgid "Vignette control"
-msgstr "Kontrola winietowania"
+#: src/minoltamn.cpp:1518
+#, fuzzy
+msgid "Exposure compensation mode"
+msgstr "Kompensacja ekspozycji"
 
-#: src/nikonmn.cpp:547
-msgid "Tone Compensation"
-msgstr "Kompensacja tonów"
+#: src/minoltamn.cpp:1521
+#, fuzzy
+msgid "AF assist"
+msgstr "Wspomaganie AF"
 
-#: src/nikonmn.cpp:547
-msgid "Tone compensation"
-msgstr "Kompensacja tonów"
+#: src/minoltamn.cpp:1523
+#, fuzzy
+msgid "Card Shutter Lock"
+msgstr "Blokada ekspozycji"
 
-#: src/nikonmn.cpp:553
-msgid "Mode of flash used"
-msgstr "Użyty tryb flesza"
+#: src/minoltamn.cpp:1524
+#, fuzzy
+msgid "Card shutter lock"
+msgstr "Blokada ekspozycji"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1526
 #, fuzzy
-msgid "AF Info"
-msgstr "Informacja AF"
+msgid "Lens Shutter Lock"
+msgstr "Blokada ekspozycji"
 
-#: src/nikonmn.cpp:554
-msgid "AF info"
-msgstr "Informacja AF"
+#: src/minoltamn.cpp:1527
+#, fuzzy
+msgid "Lens shutter lock"
+msgstr "Długo otwarta migawka"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
-msgid "Shooting Mode"
-msgstr "Tryb robienia zdjęcia"
+#: src/minoltamn.cpp:1529
+#, fuzzy
+msgid "AF Area Illumination"
+msgstr "GPS Informacja o obszarze"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
-msgid "Shooting mode"
-msgstr "Tryb robienia zdjęcia"
+#: src/minoltamn.cpp:1530
+#, fuzzy
+msgid "AF area illumination"
+msgstr "Tryb strefy AF"
 
-#: src/nikonmn.cpp:556
-msgid "Auto Bracket Release"
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
 msgstr ""
 
-#: src/nikonmn.cpp:556
-msgid "Auto bracket release"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
 msgstr ""
 
-#: src/nikonmn.cpp:557
+#: src/minoltamn.cpp:1535
 #, fuzzy
-msgid "Lens FStops"
-msgstr "Apertura obiektywu"
+msgid "Record Display"
+msgstr "Wyświetlanie nałożone"
 
-#: src/nikonmn.cpp:558
-msgid "Contrast Curve"
-msgstr "Krzywa kontrastu"
+#: src/minoltamn.cpp:1536
+#, fuzzy
+msgid "Record display"
+msgstr "Wyświetlanie nałożone"
 
-#: src/nikonmn.cpp:558
-msgid "Contrast curve"
-msgstr "Krzywa kontrastu"
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
+msgstr ""
 
-#: src/nikonmn.cpp:559
-msgid "Color Hue"
-msgstr "Odcień koloru"
+#: src/minoltamn.cpp:1539
+msgid "Play display"
+msgstr ""
 
-#: src/nikonmn.cpp:559
-msgid "Color hue"
-msgstr "Odcień koloru"
+#: src/minoltamn.cpp:1541
+#, fuzzy
+msgid "Exposure Indicator"
+msgstr "Indeks ekspozycji"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene Mode"
-msgstr "Rodzaj sceny"
+#: src/minoltamn.cpp:1542
+#, fuzzy
+msgid "Exposure indicator"
+msgstr "Indeks ekspozycji"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene mode"
-msgstr "Rodzaj sceny"
+#: src/minoltamn.cpp:1544
+#, fuzzy
+msgid "AEL Exposure Indicator"
+msgstr "Indeks ekspozycji"
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
-msgstr "Źródło światła"
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
-msgid "Light source"
-msgstr "Źródło światła"
+#: src/minoltamn.cpp:1547
+#, fuzzy
+msgid "Exposure Bracketing Indicator Last"
+msgstr "Bracketing ekspozycji"
 
-#: src/nikonmn.cpp:562
-msgid "Shot info"
-msgstr "Informacje o zdjęciu"
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue Adjustment"
-msgstr "Dopasowanie odcieni"
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
+msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue adjustment"
-msgstr "Dopasowanie odcieni"
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
+msgstr ""
 
-#: src/nikonmn.cpp:564
-msgid "NEF Compression"
-msgstr "Kompresja NEF"
+#: src/minoltamn.cpp:1553
+#, fuzzy
+msgid "Flash Exposure Indicator"
+msgstr "Kompensacja ekspozycji błysku"
 
-#: src/nikonmn.cpp:564
-msgid "NEF compression"
-msgstr "Kompresja NEF"
+#: src/minoltamn.cpp:1554
+#, fuzzy
+msgid "Flash exposure indicator"
+msgstr "Kompensacja ekspozycji błysku"
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
-msgid "Linearization Table"
-msgstr "Tabela linearyzacji"
+#: src/minoltamn.cpp:1556
+#, fuzzy
+msgid "Flash Exposure Indicator Next"
+msgstr "Kompensacja ekspozycji błysku"
 
-#: src/nikonmn.cpp:567
-msgid "Linearization table"
-msgstr "Tabela linearyzacji"
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:568
-msgid "Color Balance"
-msgstr "Balans kolorów"
+#: src/minoltamn.cpp:1559
+#, fuzzy
+msgid "Flash Exposure Indicator Last"
+msgstr "Kompensacja ekspozycji błysku"
 
-#: src/nikonmn.cpp:568
-msgid "Color balance"
-msgstr "Balans kolorów"
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:569
-msgid "Lens Data"
-msgstr "Dane obiektywu"
+#: src/minoltamn.cpp:1565
+#, fuzzy
+msgid "Focus Mode Switch"
+msgstr "Tryb ogniskowania"
 
-#: src/nikonmn.cpp:569
-msgid "Lens data settings"
-msgstr "Ustawienia danych obiektywu"
+#: src/minoltamn.cpp:1566
+#, fuzzy
+msgid "Focus mode switch"
+msgstr "Ustawienie trybu ogniskowania"
 
-#: src/nikonmn.cpp:570
-msgid "Raw Image Center"
-msgstr "Środek obrazu Raw"
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
+msgid "Flash Type"
+msgstr "Rodzaj flesza"
 
-#: src/nikonmn.cpp:570
-msgid "Raw image center"
-msgstr "Środek obrazu Raw"
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
+msgid "Flash type"
+msgstr "Rodzaj flesza"
 
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
-msgstr "Rozmiar sensora"
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
+msgid "AE Lock"
+msgstr "Blokada ekspozycji"
 
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
-msgstr "Rozmiar sensora"
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
+msgstr ""
 
-#: src/nikonmn.cpp:573
-msgid "Scene Assist"
-msgstr "Wspomaganie AF"
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
+msgstr "Poziom baterii"
 
-#: src/nikonmn.cpp:573
-msgid "Scene assist"
-msgstr "Pomoc automatycznego ostrzenia"
+#: src/minoltamn.cpp:1584
+#, fuzzy
+msgid "Battery level"
+msgstr "Poziom baterii"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch History"
-msgstr "Historia retuszu"
+#: src/minoltamn.cpp:1588
+#, fuzzy
+msgid "Unknown Sony Camera Settings A100 tag"
+msgstr "Nieznany znacznik Canon Camera Settings 1"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
-msgstr "Historia retuszu"
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
+#, fuzzy
+msgid "Clear"
+msgstr "rok"
 
-#: src/nikonmn.cpp:576
-msgid "Serial NO"
-msgstr "Numer seryjny"
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
+#, fuzzy
+msgid "Deep"
+msgstr "Denver"
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
-msgstr "Numer seryjny aparatu, zwykle zaczyna się od \"NO= \""
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
+#, fuzzy
+msgid "Light"
+msgstr "Prawy"
 
-#: src/nikonmn.cpp:577
-msgid "Image Data Size"
-msgstr "Rozmiar danych obrazu"
+#: src/minoltamn.cpp:1897
+#, fuzzy
+msgid "Night View"
+msgstr "Scena nocna"
 
-#: src/nikonmn.cpp:577
-msgid "Image data size"
-msgstr "Rozmiar danych obrazu"
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
+msgstr ""
 
-#: src/nikonmn.cpp:579
-msgid "Image Count"
-msgstr "Licznik zdjęć"
+#: src/minoltamn.cpp:1937
+#, fuzzy
+msgid "Local"
+msgstr "Położenie"
 
-#: src/nikonmn.cpp:579
-msgid "Image count"
-msgstr "Licznik zdjęć"
+#: src/minoltamn.cpp:1952
+#, fuzzy
+msgid "Top-Right"
+msgstr "Górny prawy"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
-msgid "Deleted Image Count"
-msgstr "Licznik usuniętych zdjęć"
+#: src/minoltamn.cpp:1954
+#, fuzzy
+msgid "Bottom-Right"
+msgstr "Dolny prawy"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
-msgid "Deleted image count"
-msgstr "Licznik usuniętych zdjęć"
+#: src/minoltamn.cpp:1956
+#, fuzzy
+msgid "Bottom-Left"
+msgstr "Dolny lewy"
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
-msgid "Shutter Count"
-msgstr "Licznik migawki"
+#: src/minoltamn.cpp:1958
+#, fuzzy
+msgid "Top-Left"
+msgstr "Górny lewy"
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
-msgstr "Liczba zdjęć wykonanych aparatem"
+#: src/minoltamn.cpp:1959
+#, fuzzy
+msgid "Far-Right"
+msgstr "Przycięcie prawo"
 
-#: src/nikonmn.cpp:582
-msgid "Flash info"
-msgstr "Informacja o fleszu"
+#: src/minoltamn.cpp:1960
+#, fuzzy
+msgid "Far-Left"
+msgstr "Przycięcie lewo"
 
-#: src/nikonmn.cpp:583
-msgid "Image Optimization"
-msgstr "Optymalizacja obrazu"
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
+msgid "Advanced Auto"
+msgstr ""
 
-#: src/nikonmn.cpp:583
-msgid "Image optimization"
-msgstr "Optymalizacja obrazu"
+#: src/minoltamn.cpp:1975
+#, fuzzy
+msgid "Advanced Level"
+msgstr "Poziom czerni"
 
-#: src/nikonmn.cpp:585
+#: src/minoltamn.cpp:1988
 #, fuzzy
-msgid "Program Variation"
-msgstr "Wariacje programu"
+msgid "AF"
+msgstr "AF-S"
 
-#: src/nikonmn.cpp:585
+#: src/minoltamn.cpp:1989
 #, fuzzy
-msgid "Program variation"
-msgstr "Wariacje programu"
+msgid "Release"
+msgstr "Data udostępnienia"
 
-#: src/nikonmn.cpp:587
-msgid "AF Response"
-msgstr "Odpowiedź AF"
-
-#: src/nikonmn.cpp:587
-msgid "AF response"
-msgstr "Odpowiedź AF"
-
-#: src/nikonmn.cpp:588
-msgid "Multi exposure"
-msgstr "Wielokrotna ekspozycja"
-
-#: src/nikonmn.cpp:589
-msgid "High ISO Noise Reduction"
-msgstr "Redukcja szumów przy wysokim ISO"
-
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
-msgid "Toning effect"
-msgstr "Efekt tonowania"
-
-#: src/nikonmn.cpp:591
-msgid "AF info 2"
-msgstr "Informacja AF 2"
-
-#: src/nikonmn.cpp:592
-msgid "File info"
-msgstr "Informacja o pliku"
-
-#: src/nikonmn.cpp:595
+#: src/minoltamn.cpp:2001
 #, fuzzy
-msgid "Capture Data"
-msgstr "Przechwycone dane"
+msgid "RAW "
+msgstr "RAW"
 
-#: src/nikonmn.cpp:595
+#: src/minoltamn.cpp:2002
 #, fuzzy
-msgid "Capture data"
-msgstr "Przechwycone dane"
+msgid "CRAW "
+msgstr "RAW"
 
-#: src/nikonmn.cpp:596
+#: src/minoltamn.cpp:2005
 #, fuzzy
-msgid "Capture Version"
-msgstr "Wersja programu"
+msgid "RAW+JPEG"
+msgstr "JPEG"
 
-#: src/nikonmn.cpp:596
+#: src/minoltamn.cpp:2006
 #, fuzzy
-msgid "Capture version"
-msgstr "Wersja programu"
+msgid "CRAW+JPEG"
+msgstr "JPEG"
 
-#: src/nikonmn.cpp:598
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
+msgstr ""
+
+#: src/minoltamn.cpp:2063
 #, fuzzy
-msgid "Capture Offsets"
-msgstr "Przesunięcia (piksele * 2)"
+msgid "Compressed Raw"
+msgstr "Współczynnik kompresji"
 
-#: src/nikonmn.cpp:598
+#: src/minoltamn.cpp:2064
 #, fuzzy
-msgid "Capture offsets"
-msgstr "Przesunięcia (piksele * 2)"
+msgid "Compressed Raw + JPEG"
+msgstr "Rozmiar skompresowanego obrazka"
 
-#: src/nikonmn.cpp:599
-msgid "Scan IFD"
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:600
-#, fuzzy
-msgid "ICC profile"
-msgstr "Profil CC"
-
-#: src/nikonmn.cpp:601
-msgid "Capture output"
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:603
-msgid "Unknown Nikon3MakerNote tag"
-msgstr "Nieznany znacznik Nikon3MakerNote"
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
+msgstr ""
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
-msgstr "Nie"
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
+msgstr ""
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
-msgid "Yes"
-msgstr "Tak"
+#: src/minoltamn.cpp:2110
+msgid "ISO Setting Used"
+msgstr "Użyte ustawienie ISO"
 
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
-msgstr "R/M/D"
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
+msgid "High Key"
+msgstr "High Key"
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
-msgstr "M/D/R"
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
+msgstr "Low Key"
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
-msgstr "D/M/R"
+#: src/nikonmn.cpp:80
+#, fuzzy
+msgid "Extra High"
+msgstr "Ekstra dobra"
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-msgid "Vibration Reduction"
-msgstr "Redukcja wstrząsów"
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
+msgid "Single area"
+msgstr "Pojedynczy obszar"
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-msgid "Vibration reduction"
-msgstr "Redukcja wstrząsów"
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
+msgid "Dynamic area"
+msgstr "Dynamiczny obszar"
 
-#: src/nikonmn.cpp:635
-msgid "Unknown Nikon Vibration Reduction Tag"
-msgstr "Nieznany znacznik Nikon Vibration Reduction"
+#: src/nikonmn.cpp:88
+msgid "Dynamic area, closest subject"
+msgstr "Dynamiczny obszar, najbliższy obiekt"
 
-#: src/nikonmn.cpp:645
-msgid "Default Settings"
-msgstr "Ustawienia standardowe"
+#: src/nikonmn.cpp:89
+#, fuzzy
+msgid "Group dynamic"
+msgstr "Dynamiczna siatka"
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
-msgid "Quick Adjust"
-msgstr "Szybkie dopasowanie"
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
+msgstr "Pojedynczy obszar (szeroki)"
 
-#: src/nikonmn.cpp:647
-msgid "Full Control"
-msgstr "Pełna kontrola"
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
+msgid "Dynamic area (wide)"
+msgstr "Dynamiczny obszar (szeroki)"
 
-#: src/nikonmn.cpp:668
-#, fuzzy
-msgid "Blue-green"
-msgstr "Niebieski-zielony"
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
+msgid "Upper-left"
+msgstr "Górny lewy"
 
-#: src/nikonmn.cpp:670
-#, fuzzy
-msgid "Purple-blue"
-msgstr "Purpurowy-niebieski"
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
+msgid "Upper-right"
+msgstr "Górny prawy"
 
-#: src/nikonmn.cpp:671
-#, fuzzy
-msgid "Red-purple"
-msgstr "Czerwony-purpurowy"
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
+msgid "Lower-left"
+msgstr "Dolny lewy"
 
-#: src/nikonmn.cpp:678
-msgid "Name"
-msgstr "Nazwa"
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
+msgid "Lower-right"
+msgstr "Dolny prawy"
 
-#: src/nikonmn.cpp:679
+#: src/nikonmn.cpp:108
 #, fuzzy
-msgid "Base"
-msgstr "Podstawa"
-
-#: src/nikonmn.cpp:680
-msgid "Adjust"
-msgstr "Dopasowanie"
-
-#: src/nikonmn.cpp:681
-msgid "Quick adjust"
-msgstr "Szybkie dopasowanie"
+msgid "Left-most"
+msgstr "Lewy największy"
 
-#: src/nikonmn.cpp:687
-msgid "Filter effect"
-msgstr "Efekt filtra"
+#: src/nikonmn.cpp:109
+#, fuzzy
+msgid "Right-most"
+msgstr "Prawy największy"
 
-#: src/nikonmn.cpp:689
-msgid "Toning Saturation"
-msgstr "Nasycenie kolorów"
+#: src/nikonmn.cpp:143
+msgid "Fire, manual"
+msgstr "Tak, ręczna"
 
-#: src/nikonmn.cpp:689
-msgid "Toning saturation"
-msgstr "Nasycenie kolorów"
+#: src/nikonmn.cpp:144
+msgid "Fire, external"
+msgstr "Tak, zewnętrzna"
 
-#: src/nikonmn.cpp:691
-msgid "Unknown Nikon Picture Control Tag"
-msgstr "Nieznany znacznik Nikon Picture Control"
+#: src/nikonmn.cpp:145
+#, fuzzy
+msgid "Fire, commander mode"
+msgstr "Tak, tryb zarządcy"
 
-#: src/nikonmn.cpp:701
-msgid "Timezone"
-msgstr "Strefa czasowa"
+#: src/nikonmn.cpp:146
+msgid "Fire, TTL mode"
+msgstr "Tak, tryb TTL"
 
-#: src/nikonmn.cpp:702
-#, fuzzy
-msgid "Daylight Savings"
-msgstr "Światło dzienne"
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
+msgid "Delay"
+msgstr "Opóźnienie"
 
-#: src/nikonmn.cpp:702
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
 #, fuzzy
-msgid "Daylight savings"
-msgstr "Światło dzienne"
+msgid "PC control"
+msgstr "Sterowanie podczerwienią"
 
-#: src/nikonmn.cpp:703
-msgid "Date Display Format"
-msgstr "Format wyświetlania daty"
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
+msgid "Exposure bracketing"
+msgstr "Bracketing ekspozycji"
 
-#: src/nikonmn.cpp:703
-msgid "Date display format"
-msgstr "Formularz wyświetlania daty"
+#: src/nikonmn.cpp:155
+msgid "Auto ISO"
+msgstr "Automatyczne ISO"
 
-#: src/nikonmn.cpp:705
-msgid "Unknown Nikon World Time Tag"
-msgstr "Nieznany znacznik Nikon World Time"
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
+msgid "IR control"
+msgstr "Sterowanie podczerwienią"
 
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
 msgstr ""
 
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
-msgstr ""
+#: src/nikonmn.cpp:174
+msgid "Auto release"
+msgstr "Automatyczne wyzwolenie"
 
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
-msgstr ""
+#: src/nikonmn.cpp:175
+msgid "Manual release"
+msgstr "Ręczne wyzwolenie"
 
-#: src/nikonmn.cpp:719
-msgid "Hi 1.0"
-msgstr ""
+#: src/nikonmn.cpp:180
+msgid "Lossy (type 1)"
+msgstr "Stratna (typ 1)"
 
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
-msgstr ""
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+msgid "Uncompressed"
+msgstr "Bez kompresji"
 
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
-msgstr ""
+#: src/nikonmn.cpp:182
+msgid "Lossless"
+msgstr "Bezstratna"
 
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
-msgstr ""
+#: src/nikonmn.cpp:183
+msgid "Lossy (type 2)"
+msgstr "Stratna (typ 2)"
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
-msgstr ""
+#: src/nikonmn.cpp:189
+msgid "B & W"
+msgstr "Czarno-biały"
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
-msgstr ""
+#: src/nikonmn.cpp:191
+#, fuzzy
+msgid "Trim"
+msgstr "Przycięcie"
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
-msgstr ""
+#: src/nikonmn.cpp:192
+msgid "Small picture"
+msgstr "Mały obrazek"
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
-msgstr ""
+#: src/nikonmn.cpp:193
+msgid "D-Lighting"
+msgstr "D-Lighting"
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
-msgstr ""
+#: src/nikonmn.cpp:194
+msgid "Red eye"
+msgstr "Efekt czerwonych oczu"
 
-#: src/nikonmn.cpp:733
-msgid "ISO Expansion"
-msgstr "Rozszerzenie ISO"
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
+msgid "Cyanotype"
+msgstr "Cyjanotypia"
 
-#: src/nikonmn.cpp:733
-msgid "ISO expansion"
-msgstr "Rozszerzenie ISO"
+#: src/nikonmn.cpp:196
+msgid "Sky light"
+msgstr "Światło dzienne"
 
-#: src/nikonmn.cpp:734
-msgid "ISO 2"
-msgstr "ISO 2"
+#: src/nikonmn.cpp:197
+msgid "Warm tone"
+msgstr "Ciepły odcień"
 
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
-msgstr "Rozszerzenie ISO 2"
+#: src/nikonmn.cpp:198
+msgid "Color custom"
+msgstr "Własny kolor"
 
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
-msgstr "Rozszerzenie ISO 2"
-
-#: src/nikonmn.cpp:737
-msgid "Unknown Nikon Iso Info Tag"
-msgstr "Nieznany znacznik Nikon ISO Info"
-
-#: src/nikonmn.cpp:747
-#, fuzzy
-msgid "Single Area"
-msgstr "Pojedynczy obszar"
-
-#: src/nikonmn.cpp:748
-#, fuzzy
-msgid "Dynamic Area"
-msgstr "Dynamiczny obszar"
-
-#: src/nikonmn.cpp:749
+#: src/nikonmn.cpp:199
 #, fuzzy
-msgid "Dynamic Area, Closest Subject"
-msgstr "Dynamiczny obszar, najbliższy obiekt"
+msgid "Image overlay"
+msgstr "Tonacja obrazu"
 
-#: src/nikonmn.cpp:750
-#, fuzzy
-msgid "Group Dynamic"
-msgstr "Dynamiczna siatka"
+#: src/nikonmn.cpp:205
+msgid "Minimal"
+msgstr "Minimalny"
 
-#: src/nikonmn.cpp:751
-#, fuzzy
-msgid "Single Area (wide)"
-msgstr "Pojedynczy obszar (szeroki)"
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
+msgid "Nikon Makernote version"
+msgstr "Wersja Nikon Makernote"
 
-#: src/nikonmn.cpp:752
-#, fuzzy
-msgid "Dynamic Area (wide)"
-msgstr "Dynamiczny obszar (szeroki)"
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
+msgid "ISO Speed"
+msgstr "Czułość ISO"
 
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
-msgid "Mid-left"
-msgstr "Środek-lewo"
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
+msgid "Sharpening"
+msgstr "Wyostrzenie"
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
-msgid "Mid-right"
-msgstr "Środek-prawo"
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
+msgid "Image sharpening setting"
+msgstr "Ustawienie wyostrzenia obrazu"
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
-#, fuzzy
-msgid "Far Left"
-msgstr "Przycięcie lewo"
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
+msgid "Focus"
+msgstr "Ogniskowanie"
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
-#, fuzzy
-msgid "Far Right"
-msgstr "Przycięcie prawo"
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
+msgid "Flash Setting"
+msgstr "Ustawienie flesza"
 
-#: src/nikonmn.cpp:787
-msgid "AF Area Mode"
-msgstr "Tryb strefy AF"
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
+msgid "Flash setting"
+msgstr "Ustawienie flesza"
 
-#: src/nikonmn.cpp:787
-msgid "AF area mode"
-msgstr "Tryb strefy AF"
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
+msgid "ISO Selection"
+msgstr "Wybór ISO"
 
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
-msgid "AF point"
-msgstr "Punkt AF"
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
+msgid "ISO selection"
+msgstr "Wybór ISO"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
 #, fuzzy
-msgid "AF Points In Focus"
-msgstr "Użyte punkty AF"
+msgid "Data Dump"
+msgstr "Zrzut danych 1"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
 #, fuzzy
-msgid "AF points in focus"
-msgstr "Użyte punkty AF"
+msgid "Data dump"
+msgstr "Zrzut danych 1"
 
-#: src/nikonmn.cpp:791
-msgid "Unknown Nikon Auto Focus Tag"
-msgstr "Nieznany znacznik Nikon Auto Focus"
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+msgid "Image Adjustment"
+msgstr "Dopasowanie obrazu"
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
-msgid "Shutter count"
-msgstr "Licznik migawki"
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+msgid "Image adjustment setting"
+msgstr "Ustawienie dopasowania obrazu"
 
-#: src/nikonmn.cpp:804
-msgid "Unknown Nikon Shot Info D80 Tag"
-msgstr "Nieznany znacznik Nikon Shot Info D80"
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+msgid "Auxiliary Lens"
+msgstr "Obiektyw zewnętrzny"
 
-#: src/nikonmn.cpp:816
-msgid "Flash Level"
-msgstr "Poziom flesza"
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+msgid "Auxiliary lens (adapter)"
+msgstr "Obiektyw zewnętrzny (adapter)"
 
-#: src/nikonmn.cpp:816
-msgid "Flash level"
-msgstr "Poziom flesza"
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
+msgid "Manual focus distance"
+msgstr "Ręczna odległość ostrzenia"
 
-#: src/nikonmn.cpp:818
-msgid "Unknown Nikon Shot Info D40 Tag"
-msgstr "Nieznany znacznik Nikon Shot Info D40"
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
+msgid "Digital zoom setting"
+msgstr "Ustawienie powiększenia cyfrowego"
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
-msgid "0"
-msgstr "0"
+#: src/nikonmn.cpp:258
+msgid "AF Focus Position"
+msgstr "Pozycja AF"
 
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
-msgid "+1"
-msgstr "+1"
+#: src/nikonmn.cpp:259
+msgid "AF focus position information"
+msgstr "Informacja o pozycji AF"
 
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
-msgid "+2"
-msgstr "+2"
+#: src/nikonmn.cpp:263
+msgid "Unknown Nikon1MakerNote tag"
+msgstr "Nieznany znacznik Nikon1MakerNote"
 
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
-msgid "+4"
-msgstr "+4"
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+msgid "Continuous autofocus"
+msgstr "Ciągły AF"
 
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
-msgid "+8"
-msgstr "+8"
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
+msgid "Single autofocus"
+msgstr "Pojedynczy AF"
 
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
-msgid "+16"
-msgstr "+16"
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
+msgid "Not used"
+msgstr "Nie używany"
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
-msgid "-16"
-msgstr "-16"
+#: src/nikonmn.cpp:365
+msgid "guess"
+msgstr "wartość szacowana"
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
-msgid "-8"
-msgstr "-8"
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
+msgstr "Podstawowa VGA"
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
-msgid "-4"
-msgstr "-4"
+#: src/nikonmn.cpp:413
+msgid "VGA Normal"
+msgstr "Normalna VGA"
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
-msgid "-2"
-msgstr "-2"
+#: src/nikonmn.cpp:414
+msgid "VGA Fine"
+msgstr "Dobra VGA"
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
-msgid "-1"
-msgstr "-1"
+#: src/nikonmn.cpp:415
+msgid "SXGA Basic"
+msgstr "Podstawowa SXGA"
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
-msgid "+17"
-msgstr "+17"
+#: src/nikonmn.cpp:416
+msgid "SXGA Normal"
+msgstr "Normalna SXGA"
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
-msgid "-17"
-msgstr "-17"
+#: src/nikonmn.cpp:417
+msgid "SXGA Fine"
+msgstr "Dobra SXGA"
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
-msgid "+9"
-msgstr "+9"
+#: src/nikonmn.cpp:429
+msgid "Bright+"
+msgstr "Jasność+"
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
-msgid "+18"
-msgstr "+18"
+#: src/nikonmn.cpp:430
+msgid "Bright-"
+msgstr "Jasność-"
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
-msgid "-18"
-msgstr "-18"
+#: src/nikonmn.cpp:431
+msgid "Contrast+"
+msgstr "Kontrast+"
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
-msgid "-9"
-msgstr "-9"
+#: src/nikonmn.cpp:432
+msgid "Contrast-"
+msgstr "Kontrast-"
 
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
-msgid "+19"
-msgstr "+19"
+#: src/nikonmn.cpp:451
+msgid "Speedlight"
+msgstr "SpeedLight"
 
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
-msgid "-19"
-msgstr "-19"
+#: src/nikonmn.cpp:491
+msgid "Unknown Nikon2MakerNote tag"
+msgstr "Nieznany znacznik Nikon2MakerNote"
 
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
-msgid "+5"
-msgstr "+5"
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
+msgid "Flash Device"
+msgstr "Urządzenie flesza"
 
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
-msgid "+10"
-msgstr "+10"
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
+msgid "Flash device"
+msgstr "Urządzenie flesza"
 
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
-msgid "+20"
-msgstr "+20"
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
+msgid "White Balance Bias"
+msgstr "Odchylenie balansu bieli"
 
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
-msgid "-20"
-msgstr "-20"
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
+msgid "White balance bias"
+msgstr "Odchylenie balansu bieli"
 
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
-msgid "-10"
-msgstr "-10"
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+msgid "WB RB Levels"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
-msgid "-5"
-msgstr "-5"
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+msgid "WB RB levels"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
-msgid "+11"
-msgstr "+11"
+#: src/nikonmn.cpp:536
+#, fuzzy
+msgid "Program Shift"
+msgstr "Program Tv Shift"
 
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
-msgid "-11"
-msgstr "-11"
+#: src/nikonmn.cpp:536
+#, fuzzy
+msgid "Program shift"
+msgstr "Program-shift"
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
-msgid "+3"
-msgstr "+3"
+#: src/nikonmn.cpp:537
+msgid "Exposure Difference"
+msgstr "Różnica ekspozycji"
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
-msgid "+6"
-msgstr "+6"
+#: src/nikonmn.cpp:537
+msgid "Exposure difference"
+msgstr "Różnica ekspozycji"
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
-msgid "+12"
-msgstr "+12"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+msgid "Pointer to a preview image"
+msgstr "Wskaźnik podglądu obrazka"
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
-msgid "-12"
-msgstr "-12"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+msgid "Offset to an IFD containing a preview image"
+msgstr "Przesunięcie do IFD zawierającego obrazek podglądu"
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
-msgid "-6"
-msgstr "-6"
+#: src/nikonmn.cpp:541
+msgid "Flash Comp"
+msgstr "Kompensacja błysku"
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
-msgid "-3"
-msgstr "-3"
+#: src/nikonmn.cpp:541
+msgid "Flash compensation setting"
+msgstr "Ustawienie kompensacji błysku"
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
-msgid "+13"
-msgstr "+13"
+#: src/nikonmn.cpp:543
+msgid "Image Boundary"
+msgstr "Granice obrazu"
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
-msgid "-13"
-msgstr "-13"
+#: src/nikonmn.cpp:543
+msgid "Image boundary"
+msgstr "Granice obrazu"
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
-msgid "+7"
-msgstr "+7"
+#: src/nikonmn.cpp:544
+#, fuzzy
+msgid "Flash exposure comp"
+msgstr "Kompensacja ekspozycji błysku"
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
-msgid "+14"
-msgstr "+14"
+#: src/nikonmn.cpp:545
+msgid "Flash Bracket Comp"
+msgstr "Kompensacja bracketingu błysku"
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
-msgid "-14"
-msgstr "-14"
+#: src/nikonmn.cpp:545
+msgid "Flash bracket compensation applied"
+msgstr "Zastosowana kompensacja bracketingu błysku"
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
-msgid "-7"
-msgstr "-7"
+#: src/nikonmn.cpp:546
+msgid "Exposure Bracket Comp"
+msgstr "Kompensacja bracketingu ekspozycji"
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
-msgid "+15"
-msgstr "+15"
+#: src/nikonmn.cpp:546
+msgid "AE bracket compensation applied"
+msgstr "Zastosowana kompensacja bracketingu automatycznej ekspozycji"
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
-msgid "-15"
-msgstr "-15"
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
+msgid "Image Processing"
+msgstr "Przetwarzanie obrazu"
+
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+msgid "Image processing"
+msgstr "Przetwarzanie obrazu"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:548
 #, fuzzy
-msgid "AF Fine Tune Adj"
-msgstr "Dostrojenie AF"
+msgid "Crop High Speed"
+msgstr "Duża szybkość"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:548
 #, fuzzy
-msgid "AF fine tune adj"
-msgstr "Dostrojenie AF"
+msgid "Crop high speed"
+msgstr "1-strefowy (wysoka czułość)"
 
-#: src/nikonmn.cpp:878
-msgid "Unknown Nikon Shot Info D300 (a) Tag"
-msgstr "Nieznany znacznik Nikon Shot Info D300 (a)"
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure Tuning"
+msgstr "Ostrzeżenie ekspozycji"
 
-#: src/nikonmn.cpp:938
-msgid "Unknown Nikon Shot Info D300 (b) Tag"
-msgstr "Nieznany znacznik Nikon Shot Info D300 (b)"
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure tuning"
+msgstr "Ostrzeżenie ekspozycji"
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
-msgstr "Włączone (1)"
+#: src/nikonmn.cpp:552
+msgid "VR Info"
+msgstr "Informacja o redukcji wstrząsów"
 
-#: src/nikonmn.cpp:950
-msgid "On (2)"
-msgstr "Włączone (2)"
+#: src/nikonmn.cpp:552
+msgid "VR info"
+msgstr "Informacja o redukcji wstrząsów"
 
-#: src/nikonmn.cpp:951
-msgid "On (3)"
-msgstr "Włączone (3)"
+#: src/nikonmn.cpp:553
+msgid "Image Authentication"
+msgstr "Autoryzacja obrazu"
 
-#: src/nikonmn.cpp:964
-msgid "Shutter Count 1"
-msgstr "Licznik migawki 1"
+#: src/nikonmn.cpp:553
+msgid "Image authentication"
+msgstr "Autoryzacja obrazu"
 
-#: src/nikonmn.cpp:964
-msgid "Shutter count 1"
-msgstr "Licznik migawki 1"
+#: src/nikonmn.cpp:554
+#, fuzzy
+msgid "ActiveD-Lighting"
+msgstr "D-Lighting"
 
-#: src/nikonmn.cpp:968
-msgid "Shutter Count 2"
-msgstr "Licznik migawki 2"
+#: src/nikonmn.cpp:554
+#, fuzzy
+msgid "ActiveD-lighting"
+msgstr "D-Lighting"
 
-#: src/nikonmn.cpp:968
-msgid "Shutter count 2"
-msgstr "Licznik migawki 2"
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid "Picture Control"
+msgstr "Informacje o zdjęciu"
 
-#: src/nikonmn.cpp:969
-msgid "Vibration Reduction 2"
-msgstr "Redukcja wstrząsów 2"
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid " Picture control"
+msgstr "Informacje o zdjęciu"
 
-#: src/nikonmn.cpp:969
-msgid "Vibration reduction 2"
-msgstr "Redukcja wstrząsów 2"
+#: src/nikonmn.cpp:556
+msgid "World Time"
+msgstr "Czas światowy"
 
-#: src/nikonmn.cpp:973
-msgid "Unknown Nikon Shot Info Tag"
-msgstr "Nieznany znacznik Nikon Shot Info"
+#: src/nikonmn.cpp:556
+msgid "World time"
+msgstr "Czas światowy"
 
-#: src/nikonmn.cpp:984
-msgid "WB RBGG Levels"
-msgstr "Poziomy balansu bieli RBGG"
+#: src/nikonmn.cpp:557
+msgid "ISO Info"
+msgstr "Informacja ISO"
 
-#: src/nikonmn.cpp:984
-msgid "WB RBGG levels"
-msgstr "Poziomy balansu bieli RBGG"
+#: src/nikonmn.cpp:557
+msgid "ISO info"
+msgstr "Informacja ISO"
 
-#: src/nikonmn.cpp:986
-msgid "Unknown Nikon Color Balance 1 Tag"
-msgstr "Nieznany znacznik Nikon Color Balance 1"
+#: src/nikonmn.cpp:558
+msgid "Vignette Control"
+msgstr "Kontrola winietowania"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
-msgid "WB RGGB Levels"
-msgstr "Poziomy balansu bieli RGGB"
+#: src/nikonmn.cpp:558
+msgid "Vignette control"
+msgstr "Kontrola winietowania"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
-msgid "WB RGGB levels"
-msgstr "Poziomy balansu bieli RGGB"
+#: src/nikonmn.cpp:560
+msgid "Tone Compensation"
+msgstr "Kompensacja tonów"
 
-#: src/nikonmn.cpp:999
-msgid "Unknown Nikon Color Balance 2 Tag"
-msgstr "Nieznany znacznik Nikon Color Balance 2"
+#: src/nikonmn.cpp:560
+msgid "Tone compensation"
+msgstr "Kompensacja tonów"
 
-#: src/nikonmn.cpp:1012
-msgid "Unknown Nikon Color Balance 2a Tag"
-msgstr "Nieznany znacznik Nikon Color Balance 2a"
+#: src/nikonmn.cpp:566
+msgid "Mode of flash used"
+msgstr "Użyty tryb flesza"
 
-#: src/nikonmn.cpp:1025
-msgid "Unknown Nikon Color Balance 2b Tag"
-msgstr "Nieznany znacznik Nikon Color Balance 2b"
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
+msgid "Shooting Mode"
+msgstr "Tryb robienia zdjęcia"
 
-#: src/nikonmn.cpp:1036
-msgid "WB RGBG Levels"
-msgstr "Poziomy balansu bieli RGBG"
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
+msgid "Shooting mode"
+msgstr "Tryb robienia zdjęcia"
 
-#: src/nikonmn.cpp:1036
-msgid "WB RGBG levels"
-msgstr "Poziomy balansu bieli RGBG"
+#: src/nikonmn.cpp:569
+#, fuzzy
+msgid "Auto Bracket Release"
+msgstr "Automatyczne wyzwolenie"
 
-#: src/nikonmn.cpp:1038
-msgid "Unknown Nikon Color Balance 3 Tag"
-msgstr "Nieznany znacznik Nikon Color Balance 3"
+#: src/nikonmn.cpp:569
+#, fuzzy
+msgid "Auto bracket release"
+msgstr "Automatyczne wyzwolenie"
 
-#: src/nikonmn.cpp:1049
-msgid "WB GRBG Levels"
-msgstr "Poziomy balansu bieli GRBG"
+#: src/nikonmn.cpp:570
+#, fuzzy
+msgid "Lens FStops"
+msgstr "Apertura obiektywu"
 
-#: src/nikonmn.cpp:1049
-msgid "WB GRBG levels"
-msgstr "Poziomy balansu bieli GRBG"
+#: src/nikonmn.cpp:571
+msgid "Contrast Curve"
+msgstr "Krzywa kontrastu"
 
-#: src/nikonmn.cpp:1051
-msgid "Unknown Nikon Color Balance 4 Tag"
-msgstr "Nieznany znacznik Nikon Color Balance 4"
+#: src/nikonmn.cpp:571
+msgid "Contrast curve"
+msgstr "Krzywa kontrastu"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
-msgid "Lens ID Number"
-msgstr "Numer identyfikacyjny obiektywu"
+#: src/nikonmn.cpp:572
+msgid "Color Hue"
+msgstr "Odcień koloru"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
-msgid "Lens ID number"
-msgstr "Numer identyfikacyjny obiektywu"
+#: src/nikonmn.cpp:572
+msgid "Color hue"
+msgstr "Odcień koloru"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
-msgid "Lens F-Stops"
-msgstr "Apertura obiektywu"
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
+msgid "Scene mode"
+msgstr "Rodzaj sceny"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
-msgid "Lens F-stops"
-msgstr "Apertura obiektywu"
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
+msgid "Light Source"
+msgstr "Źródło światła"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
-msgid "Min Focal Length"
-msgstr "Minimalna ogniskowa"
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
+msgid "Light source"
+msgstr "Źródło światła"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
-msgid "Min focal length"
-msgstr "Minimalna ogniskowa"
+#: src/nikonmn.cpp:575
+msgid "Shot info"
+msgstr "Informacje o zdjęciu"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
-msgid "Max Focal Length"
-msgstr "Maksymalna ogniskowa"
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue Adjustment"
+msgstr "Dopasowanie odcieni"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
-msgid "Max focal length"
-msgstr "Maksymalna ogniskowa"
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue adjustment"
+msgstr "Dopasowanie odcieni"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
-msgid "Max Aperture At Min Focal"
-msgstr "Maksymalna apertura przy minimalnej ogniskowej"
+#: src/nikonmn.cpp:577
+msgid "NEF Compression"
+msgstr "Kompresja NEF"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
-msgid "Max aperture at min focal"
-msgstr "Maksymalna apertura przy minimalnej ogniskowej"
+#: src/nikonmn.cpp:577
+msgid "NEF compression"
+msgstr "Kompresja NEF"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
-msgid "Max Aperture At Max Focal"
-msgstr "Maksymalna apertura przy maksymalnej ogniskowej"
+#: src/nikonmn.cpp:580 src/tags.cpp:903
+msgid "Linearization Table"
+msgstr "Tabela linearyzacji"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
-msgid "Max aperture at max focal"
-msgstr "Maksymalna apertura przy maksymalnej ogniskowej"
+#: src/nikonmn.cpp:580
+msgid "Linearization table"
+msgstr "Tabela linearyzacji"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
-msgid "MCU Version"
-msgstr "Wersja MCU"
+#: src/nikonmn.cpp:581
+msgid "Color Balance"
+msgstr "Balans kolorów"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
-msgid "MCU version"
-msgstr "Wersja MCU"
+#: src/nikonmn.cpp:581
+msgid "Color balance"
+msgstr "Balans kolorów"
 
-#: src/nikonmn.cpp:1070
-msgid "Unknown Nikon Lens Data 1 Tag"
-msgstr "Nieznany znacznik Nikon Lens Data 1"
+#: src/nikonmn.cpp:582
+msgid "Lens Data"
+msgstr "Dane obiektywu"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-#, fuzzy
-msgid "Exit Pupil Position"
-msgstr "Pozycja przełącznika DEC"
+#: src/nikonmn.cpp:582
+msgid "Lens data settings"
+msgstr "Ustawienia danych obiektywu"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-#, fuzzy
-msgid "Exit pupil position"
-msgstr "Pozycja przełącznika DEC"
+#: src/nikonmn.cpp:583
+msgid "Raw Image Center"
+msgstr "Środek obrazu Raw"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
-#, fuzzy
-msgid "AF Aperture"
-msgstr "Przysłona"
+#: src/nikonmn.cpp:583
+msgid "Raw image center"
+msgstr "Środek obrazu Raw"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
-#, fuzzy
-msgid "AF aperture"
-msgstr "Przysłona"
+#: src/nikonmn.cpp:584
+msgid "Sensor Pixel Size"
+msgstr "Rozmiar sensora"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
-msgid "Effective Max Aperture"
-msgstr "Największa efektywna apertura"
+#: src/nikonmn.cpp:584
+msgid "Sensor pixel size"
+msgstr "Rozmiar sensora"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
-msgid "Effective max aperture"
-msgstr "Największa efektywna apertura"
+#: src/nikonmn.cpp:586
+msgid "Scene Assist"
+msgstr "Wspomaganie AF"
 
-#: src/nikonmn.cpp:1095
-msgid "Unknown Nikon Lens Data 2 Tag"
-msgstr "Nieznany znacznik Nikon Lens Data 2"
+#: src/nikonmn.cpp:586
+msgid "Scene assist"
+msgstr "Pomoc automatycznego ostrzenia"
 
-#: src/nikonmn.cpp:1115
-msgid "Max aperture at min focal length"
-msgstr "Maksymalna apertura przy minimalnej ogniskowej"
+#: src/nikonmn.cpp:587
+msgid "Retouch History"
+msgstr "Historia retuszu"
 
-#: src/nikonmn.cpp:1116
-msgid "Max aperture at max focal length"
-msgstr "Maksymalna apertura przy maksymalnej ogniskowej"
+#: src/nikonmn.cpp:587
+msgid "Retouch history"
+msgstr "Historia retuszu"
 
-#: src/nikonmn.cpp:1120
-msgid "Unknown Nikon Lens Data 3 Tag"
-msgstr "Nieznany znacznik Nikon Lens Data 3"
+#: src/nikonmn.cpp:589
+msgid "Serial NO"
+msgstr "Numer seryjny"
 
-#: src/nikonmn.cpp:1299
-msgid "Closest subject"
-msgstr "Najbliższy obiekt"
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
+msgstr "Numer seryjny aparatu, zwykle zaczyna się od \"NO= \""
 
-#: src/nikonmn.cpp:1300
-#, fuzzy
-msgid "Group dynamic-AF"
-msgstr "Dynamiczna zmiana rozmiaru siatki"
+#: src/nikonmn.cpp:590
+msgid "Image Data Size"
+msgstr "Rozmiar danych obrazu"
 
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
-msgid "none"
-msgstr "brak"
+#: src/nikonmn.cpp:590
+msgid "Image data size"
+msgstr "Rozmiar danych obrazu"
 
-#: src/nikonmn.cpp:1333
-msgid "used"
-msgstr "użyto"
+#: src/nikonmn.cpp:592
+msgid "Image Count"
+msgstr "Licznik zdjęć"
 
-#: src/nikonmn.cpp:1359
-msgid "All 11 Points"
-msgstr "Wszystkie 11 punktów"
+#: src/nikonmn.cpp:592
+msgid "Image count"
+msgstr "Licznik zdjęć"
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
-msgid "Single-frame"
-msgstr ""
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+msgid "Deleted Image Count"
+msgstr "Licznik usuniętych zdjęć"
 
-#: src/olympusmn.cpp:68
-msgid "Standard Quality (SQ)"
-msgstr "Standardowa jakość (SQ)"
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+msgid "Deleted image count"
+msgstr "Licznik usuniętych zdjęć"
 
-#: src/olympusmn.cpp:69
-msgid "High Quality (HQ)"
-msgstr "Wysoka jakość (HQ)"
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
+msgid "Shutter Count"
+msgstr "Licznik migawki"
 
-#: src/olympusmn.cpp:70
-msgid "Super High Quality (SHQ)"
-msgstr "Bardzo wysoka jakość (SHQ)"
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
+msgstr "Liczba zdjęć wykonanych aparatem"
 
-#: src/olympusmn.cpp:85
-msgid "On (preset)"
-msgstr "Włączony (predefiniowany)"
+#: src/nikonmn.cpp:595
+msgid "Flash info"
+msgstr "Informacja o fleszu"
 
-#: src/olympusmn.cpp:91
-msgid "Internal"
-msgstr "Wewnętrzny"
+#: src/nikonmn.cpp:596
+msgid "Image Optimization"
+msgstr "Optymalizacja obrazu"
 
-#: src/olympusmn.cpp:93
-msgid "Internal + External"
-msgstr "Wewnętrzny + Zewnętrzny"
+#: src/nikonmn.cpp:596
+msgid "Image optimization"
+msgstr "Optymalizacja obrazu"
 
-#: src/olympusmn.cpp:118
-msgid "Interlaced"
-msgstr "Z przeplotem"
+#: src/nikonmn.cpp:598
+#, fuzzy
+msgid "Program Variation"
+msgstr "Wariacje programu"
 
-#: src/olympusmn.cpp:119
-msgid "Progressive"
-msgstr "Przyrostowy"
+#: src/nikonmn.cpp:598
+#, fuzzy
+msgid "Program variation"
+msgstr "Wariacje programu"
 
-#: src/olympusmn.cpp:127
-msgid "Thumbnail Image"
-msgstr "Obraz miniatury"
+#: src/nikonmn.cpp:600
+msgid "AF Response"
+msgstr "Odpowiedź AF"
 
-#: src/olympusmn.cpp:128
-msgid "Thumbnail image"
-msgstr "Obraz miniatury"
+#: src/nikonmn.cpp:600
+msgid "AF response"
+msgstr "Odpowiedź AF"
 
-#: src/olympusmn.cpp:131
-msgid "Special Mode"
-msgstr "Tryb specjalny"
+#: src/nikonmn.cpp:601
+msgid "Multi exposure"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:132
-msgid "Picture taking mode"
-msgstr "Tryb robienia zdjęcia"
+#: src/nikonmn.cpp:602
+msgid "High ISO Noise Reduction"
+msgstr "Redukcja szumów przy wysokim ISO"
 
-#: src/olympusmn.cpp:140
-msgid "Black & White Mode"
-msgstr "Tryb czarno-biały"
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
+msgid "Toning effect"
+msgstr "Efekt tonowania"
 
-#: src/olympusmn.cpp:141
-msgid "Black and white mode"
-msgstr "Tryb czarno-biały"
+#: src/nikonmn.cpp:604
+msgid "AF info 2"
+msgstr "Informacja AF 2"
 
-#: src/olympusmn.cpp:144
-msgid "Digital zoom ratio"
-msgstr "Współczynnik powiększenia cyfrowego"
+#: src/nikonmn.cpp:605
+msgid "File info"
+msgstr "Informacja o pliku"
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
+#: src/nikonmn.cpp:608
 #, fuzzy
-msgid "Focal Plane Diagonal"
-msgstr "Rozdzielczość ogniskowej w płaszczyźnie X"
+msgid "Capture Data"
+msgstr "Przechwycone dane"
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
+#: src/nikonmn.cpp:608
 #, fuzzy
-msgid "Focal plane diagonal"
-msgstr "Rozdzielczość ogniskowej w płaszczyźnie X"
-
-#: src/olympusmn.cpp:149
-msgid "Lens Distortion Parameters"
-msgstr "Parametry dystorsji soczewki"
-
-#: src/olympusmn.cpp:150
-msgid "Lens distortion parameters"
-msgstr "Parametry dystorsji soczewki obiektywu"
-
-#: src/olympusmn.cpp:153
-msgid "Software firmware version"
-msgstr "Wersja firmware"
-
-#: src/olympusmn.cpp:156
-msgid "ASCII format data such as [PictureInfo]"
-msgstr "Dane w formacie ASCII jak w [PictureInfo]"
+msgid "Capture data"
+msgstr "Przechwycone dane"
 
-#: src/olympusmn.cpp:158
-msgid "Camera ID"
-msgstr "ID aparatu"
+#: src/nikonmn.cpp:609
+#, fuzzy
+msgid "Capture Version"
+msgstr "Wersja programu"
 
-#: src/olympusmn.cpp:159
-msgid "Camera ID data"
-msgstr "Dane identyfikacyjne aparatu"
+#: src/nikonmn.cpp:609
+#, fuzzy
+msgid "Capture version"
+msgstr "Wersja programu"
 
-#: src/olympusmn.cpp:178
-msgid "Pre Capture Frames"
-msgstr ""
+#: src/nikonmn.cpp:611
+#, fuzzy
+msgid "Capture Offsets"
+msgstr "Przesunięcia (piksele * 2)"
 
-#: src/olympusmn.cpp:179
-msgid "Pre-capture frames"
-msgstr ""
+#: src/nikonmn.cpp:611
+#, fuzzy
+msgid "Capture offsets"
+msgstr "Przesunięcia (piksele * 2)"
 
-#: src/olympusmn.cpp:184
+#: src/nikonmn.cpp:612
 #, fuzzy
-msgid "One Touch WB"
-msgstr "Automatyczna korekcja balansu bieli"
+msgid "Scan IFD"
+msgstr "Identyfikator zapisu"
 
-#: src/olympusmn.cpp:185
+#: src/nikonmn.cpp:613
 #, fuzzy
-msgid "One touch white balance"
-msgstr "Automatyczna korekcja balansu bieli"
+msgid "ICC profile"
+msgstr "Profil CC"
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
-msgid "Serial number"
-msgstr "Numer seryjny"
+#: src/nikonmn.cpp:614
+#, fuzzy
+msgid "Capture output"
+msgstr "Przechwycone dane"
 
-#: src/olympusmn.cpp:199
-msgid "Data Dump 1"
-msgstr "Zrzut danych 1"
+#: src/nikonmn.cpp:616
+msgid "Unknown Nikon3MakerNote tag"
+msgstr "Nieznany znacznik Nikon3MakerNote"
 
-#: src/olympusmn.cpp:200
-msgid "Various camera settings 1"
-msgstr "Różne ustawienia aparatu 1"
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+msgid "No"
+msgstr "Nie"
 
-#: src/olympusmn.cpp:202
-msgid "Data Dump 2"
-msgstr "Zrzut danych 2"
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
+msgid "Yes"
+msgstr "Tak"
 
-#: src/olympusmn.cpp:203
-msgid "Various camera settings 2"
-msgstr "Różne ustawienia aparatu 2"
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
+msgstr "R/M/D"
 
-#: src/olympusmn.cpp:205
-msgid "Shutter Speed"
-msgstr "Czas otwarcia migawki"
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
+msgstr "M/D/R"
 
-#: src/olympusmn.cpp:206
-msgid "Shutter speed value"
-msgstr "Czas otwarcia migawki"
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
+msgstr "D/M/R"
 
-#: src/olympusmn.cpp:209
-msgid "ISO speed value"
-msgstr "Czułość ISO"
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+msgid "Vibration Reduction"
+msgstr "Redukcja wstrząsów"
 
-#: src/olympusmn.cpp:212
-msgid "Aperture value"
-msgstr "Przysłona"
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+msgid "Vibration reduction"
+msgstr "Redukcja wstrząsów"
 
-#: src/olympusmn.cpp:215
-msgid "Brightness value"
-msgstr "Jasność"
+#: src/nikonmn.cpp:648
+msgid "Unknown Nikon Vibration Reduction Tag"
+msgstr "Nieznany znacznik Nikon Vibration Reduction"
 
-#: src/olympusmn.cpp:223
-msgid "Bracket"
-msgstr ""
+#: src/nikonmn.cpp:658
+msgid "Default Settings"
+msgstr "Ustawienia standardowe"
 
-#: src/olympusmn.cpp:224
-msgid "Exposure compensation value"
-msgstr "Wartość kompensacji ekspozycji"
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
+msgid "Quick Adjust"
+msgstr "Szybkie dopasowanie"
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
-msgid "Sensor Temperature"
-msgstr "Temperatura czujnika"
+#: src/nikonmn.cpp:660
+msgid "Full Control"
+msgstr "Pełna kontrola"
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
-msgid "Sensor temperature"
-msgstr "Temperatura czujnika"
+#: src/nikonmn.cpp:681
+#, fuzzy
+msgid "Blue-green"
+msgstr "Niebieski-zielony"
 
-#: src/olympusmn.cpp:229
-msgid "Lens Temperature"
-msgstr "Temperatura obiektywu"
+#: src/nikonmn.cpp:683
+#, fuzzy
+msgid "Purple-blue"
+msgstr "Purpurowy-niebieski"
 
-#: src/olympusmn.cpp:230
-msgid "Lens temperature"
-msgstr "Temperatura obiektywu"
+#: src/nikonmn.cpp:684
+#, fuzzy
+msgid "Red-purple"
+msgstr "Czerwony-purpurowy"
 
-#: src/olympusmn.cpp:244
-msgid "Zoom"
-msgstr "Powiększenie"
+#: src/nikonmn.cpp:691
+msgid "Name"
+msgstr "Nazwa"
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
-msgid "Zoom step count"
-msgstr "Liczba kroków powiększania"
-
-#: src/olympusmn.cpp:247
-msgid "Macro Focus"
-msgstr ""
-
-#: src/olympusmn.cpp:248
-msgid "Macro focus step count"
-msgstr ""
-
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
-msgid "Sharpness Factor"
-msgstr "Współczynnik wyostrzenia"
-
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
-msgid "Sharpness factor"
-msgstr "Współczynnik wyostrzenia"
-
-#: src/olympusmn.cpp:253
-msgid "Flash Charge Level"
-msgstr "Poziom naładowania flesza"
-
-#: src/olympusmn.cpp:254
-msgid "Flash charge level"
-msgstr "Poziom naładowania flesza"
-
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
-msgid "Color Matrix"
-msgstr "Matryca kolorów"
+#: src/nikonmn.cpp:692
+#, fuzzy
+msgid "Base"
+msgstr "Podstawa"
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
-msgid "Color matrix"
-msgstr "Matryca kolorów"
+#: src/nikonmn.cpp:693
+msgid "Adjust"
+msgstr "Dopasowanie"
 
-#: src/olympusmn.cpp:259
-msgid "BlackLevel"
-msgstr "Poziom czerni"
+#: src/nikonmn.cpp:694
+msgid "Quick adjust"
+msgstr "Szybkie dopasowanie"
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
-msgid "Black level"
-msgstr "Poziom czerni"
+#: src/nikonmn.cpp:700
+msgid "Filter effect"
+msgstr "Efekt filtra"
 
-#: src/olympusmn.cpp:269
-msgid "White balance mode"
-msgstr "Tryb balansu bieli"
+#: src/nikonmn.cpp:702
+msgid "Toning Saturation"
+msgstr "Nasycenie kolorów"
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
-msgid "Red Balance"
-msgstr "Balans czerwieni"
+#: src/nikonmn.cpp:702
+msgid "Toning saturation"
+msgstr "Nasycenie kolorów"
 
-#: src/olympusmn.cpp:275
-msgid "Red balance"
-msgstr "Balans czerwieni"
+#: src/nikonmn.cpp:704
+msgid "Unknown Nikon Picture Control Tag"
+msgstr "Nieznany znacznik Nikon Picture Control"
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
-msgid "Blue Balance"
-msgstr "Balans niebieskiego"
+#: src/nikonmn.cpp:714
+msgid "Timezone"
+msgstr "Strefa czasowa"
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
-msgid "Blue balance"
-msgstr "Balans niebieskiego"
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight Savings"
+msgstr "Światło dzienne"
 
-#: src/olympusmn.cpp:283
-msgid "Serial Number 2"
-msgstr "Numer seryjny 2"
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight savings"
+msgstr "Światło dzienne"
 
-#: src/olympusmn.cpp:284
-msgid "Serial number 2"
-msgstr "Numer seryjny 2"
+#: src/nikonmn.cpp:716
+msgid "Date Display Format"
+msgstr "Format wyświetlania daty"
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
-msgid "Flash exposure compensation"
-msgstr "Kompensacja ekspozycji błysku"
+#: src/nikonmn.cpp:716
+msgid "Date display format"
+msgstr "Formularz wyświetlania daty"
 
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
-msgid "External Flash Bounce"
-msgstr "Odbicie zewnętrznego flesza"
+#: src/nikonmn.cpp:718
+msgid "Unknown Nikon World Time Tag"
+msgstr "Nieznany znacznik Nikon World Time"
 
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
-msgid "External flash bounce"
-msgstr "Odbicie zewnętrznego flesza"
+#: src/nikonmn.cpp:729
+msgid "Hi 0.3"
+msgstr ""
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
-msgid "External Flash Zoom"
-msgstr "Pokrycie zewnętrznego flesza"
+#: src/nikonmn.cpp:730
+msgid "Hi 0.5"
+msgstr ""
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
-msgid "External flash zoom"
-msgstr "Pokrycie zewnętrznego flesza"
+#: src/nikonmn.cpp:731
+msgid "Hi 0.7"
+msgstr ""
 
-#: src/olympusmn.cpp:325
-msgid "External Flash Mode"
-msgstr "Tryb zewnętrznego flesza"
+#: src/nikonmn.cpp:732
+#, fuzzy
+msgid "Hi 1.0"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:326
-msgid "External flash mode"
-msgstr "Tryb zewnętrznego flesza"
+#: src/nikonmn.cpp:733
+msgid "Hi 1.3"
+msgstr ""
 
-#: src/olympusmn.cpp:334
-msgid "Color Control"
-msgstr "Regulacja barwy"
+#: src/nikonmn.cpp:734
+msgid "Hi 1.5"
+msgstr ""
 
-#: src/olympusmn.cpp:335
-msgid "Color control"
-msgstr "Regulacja barwy"
+#: src/nikonmn.cpp:735
+msgid "Hi 1.7"
+msgstr ""
 
-#: src/olympusmn.cpp:337
-msgid "ValidBits"
+#: src/nikonmn.cpp:736
+msgid "Hi 2.0"
 msgstr ""
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
-msgid "Valid bits"
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
 msgstr ""
 
-#: src/olympusmn.cpp:340
-msgid "CoringFilter"
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
 msgstr ""
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
-msgid "Coring filter"
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
 msgstr ""
 
-#: src/olympusmn.cpp:361
-msgid "Compression Ratio"
-msgstr "Współczynnik kompresji"
+#: src/nikonmn.cpp:740
+msgid "Lo 1.0"
+msgstr ""
 
-#: src/olympusmn.cpp:362
-msgid "Compression ratio"
-msgstr "Współczynnik kompresji"
+#: src/nikonmn.cpp:746
+msgid "ISO Expansion"
+msgstr "Rozszerzenie ISO"
 
-#: src/olympusmn.cpp:365
-msgid "Preview image embedded"
-msgstr "Osadzony obrazek podglądu"
+#: src/nikonmn.cpp:746
+msgid "ISO expansion"
+msgstr "Rozszerzenie ISO"
 
-#: src/olympusmn.cpp:368
-msgid "Offset of the preview image"
-msgstr "Przesunięcie obrazu podglądu"
+#: src/nikonmn.cpp:747
+msgid "ISO 2"
+msgstr "ISO 2"
 
-#: src/olympusmn.cpp:371
-msgid "Size of the preview image"
-msgstr "Rozmiar obrazu podglądu"
+#: src/nikonmn.cpp:748
+msgid "ISO Expansion 2"
+msgstr "Rozszerzenie ISO 2"
 
-#: src/olympusmn.cpp:373
-msgid "CCD Scan Mode"
-msgstr "Tryb skanowania CCD"
+#: src/nikonmn.cpp:748
+msgid "ISO expansion 2"
+msgstr "Rozszerzenie ISO 2"
 
-#: src/olympusmn.cpp:374
-msgid "CCD scan mode"
-msgstr "Tryb skanowania CCD"
+#: src/nikonmn.cpp:750
+msgid "Unknown Nikon Iso Info Tag"
+msgstr "Nieznany znacznik Nikon ISO Info"
 
-#: src/olympusmn.cpp:379
-msgid "Infinity Lens Step"
-msgstr ""
+#: src/nikonmn.cpp:760
+#, fuzzy
+msgid "Single Area"
+msgstr "Pojedynczy obszar"
 
-#: src/olympusmn.cpp:380
-msgid "Infinity lens step"
-msgstr ""
+#: src/nikonmn.cpp:761
+#, fuzzy
+msgid "Dynamic Area"
+msgstr "Dynamiczny obszar"
 
-#: src/olympusmn.cpp:382
-msgid "Near Lens Step"
-msgstr ""
+#: src/nikonmn.cpp:762
+#, fuzzy
+msgid "Dynamic Area, Closest Subject"
+msgstr "Dynamiczny obszar, najbliższy obiekt"
 
-#: src/olympusmn.cpp:383
-msgid "Near lens step"
-msgstr ""
+#: src/nikonmn.cpp:763
+#, fuzzy
+msgid "Group Dynamic"
+msgstr "Dynamiczna siatka"
 
-#: src/olympusmn.cpp:385
-msgid "Equipment Info"
-msgstr "Wyposażenie"
+#: src/nikonmn.cpp:764
+#, fuzzy
+msgid "Single Area (wide)"
+msgstr "Pojedynczy obszar (szeroki)"
 
-#: src/olympusmn.cpp:386
-msgid "Camera equipment sub-IFD"
-msgstr "sub-IFD wyposażenia aparatu"
+#: src/nikonmn.cpp:765
+#, fuzzy
+msgid "Dynamic Area (wide)"
+msgstr "Dynamiczny obszar (szeroki)"
 
-#: src/olympusmn.cpp:389
-msgid "Camera Settings sub-IFD"
-msgstr "sub-IFD ustawień aparatu"
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
+msgid "Mid-left"
+msgstr "Środek-lewo"
 
-#: src/olympusmn.cpp:391
-msgid "Raw Development"
-msgstr ""
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
+msgid "Mid-right"
+msgstr "Środek-prawo"
 
-#: src/olympusmn.cpp:392
-msgid "Raw development sub-IFD"
-msgstr ""
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
+#, fuzzy
+msgid "Far Left"
+msgstr "Przycięcie lewo"
 
-#: src/olympusmn.cpp:394
-msgid "Raw Development 2"
-msgstr ""
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
+#, fuzzy
+msgid "Far Right"
+msgstr "Przycięcie prawo"
 
-#: src/olympusmn.cpp:395
-msgid "Raw development 2 sub-IFD"
-msgstr ""
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
+msgid "AF area mode"
+msgstr "Tryb strefy AF"
 
-#: src/olympusmn.cpp:398
-msgid "Image processing sub-IFD"
-msgstr ""
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
+msgid "AF point"
+msgstr "Punkt AF"
 
-#: src/olympusmn.cpp:400
-msgid "Focus Info"
-msgstr "Ostrzenie"
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF Points In Focus"
+msgstr "Użyte punkty AF"
 
-#: src/olympusmn.cpp:401
-msgid "Focus sub-IFD"
-msgstr "sub-IFD ostrzenia"
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF points in focus"
+msgstr "Użyte punkty AF"
 
-#: src/olympusmn.cpp:403
-msgid "Raw Info"
-msgstr "Raw"
+#: src/nikonmn.cpp:804
+msgid "Unknown Nikon Auto Focus Tag"
+msgstr "Nieznany znacznik Nikon Auto Focus"
 
-#: src/olympusmn.cpp:404
-msgid "Raw sub-IFD"
-msgstr "Raw sub-IFD"
+#: src/nikonmn.cpp:815
+#, fuzzy
+msgid "On (51-point)"
+msgstr "Włączone (1)"
 
-#: src/olympusmn.cpp:409
-msgid "Unknown OlympusMakerNote tag"
-msgstr "Nieznany znacznik OlympusMakerNote"
+#: src/nikonmn.cpp:816
+#, fuzzy
+msgid "On (11-point)"
+msgstr "Włączone (1)"
 
-#: src/olympusmn.cpp:424
-msgid "Program-shift"
-msgstr "Program-shift"
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast Detect AF"
+msgstr "Ustawienie kontrastu"
 
-#: src/olympusmn.cpp:429
-msgid "Center-weighted average"
-msgstr "Centralnie ważony uśredniony"
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast detect AF"
+msgstr "Ustawienie kontrastu"
 
-#: src/olympusmn.cpp:431
-msgid "ESP"
-msgstr "ESP"
+#: src/nikonmn.cpp:824
+#, fuzzy
+msgid "Phase Detect AF"
+msgstr "Obszar wykrywania twarzy"
 
-#: src/olympusmn.cpp:432
-msgid "Pattern+AF"
-msgstr ""
+#: src/nikonmn.cpp:824
+#, fuzzy
+msgid "Phase detect AF"
+msgstr "Wykrywanie twarzy"
 
-#: src/olympusmn.cpp:433
-msgid "Spot+Highlight control"
-msgstr ""
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF Point"
+msgstr "Punkt szarości"
 
-#: src/olympusmn.cpp:434
-msgid "Spot+Shadow control"
-msgstr ""
-
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
-msgid "Super Macro"
-msgstr "Super Makro"
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF point"
+msgstr "Punkt szarości"
 
-#: src/olympusmn.cpp:446
-msgid "Single AF"
-msgstr "Pojedyncze zdjęcie"
+#: src/nikonmn.cpp:827
+#, fuzzy
+msgid "AF Image Width"
+msgstr "Szerokość obrazu"
 
-#: src/olympusmn.cpp:447
-msgid "Sequential shooting AF"
-msgstr "Zdjęcia seryjne"
+#: src/nikonmn.cpp:827
+#, fuzzy
+msgid "AF image width"
+msgstr "Szerokość obrazu"
 
-#: src/olympusmn.cpp:449
-msgid "Multi AF"
-msgstr "Multi AF"
+#: src/nikonmn.cpp:828
+#, fuzzy
+msgid "AF Image Height"
+msgstr "Wysokość obrazu"
 
-#: src/olympusmn.cpp:450
-msgid "MF"
-msgstr "Ręczne ostrzenie"
+#: src/nikonmn.cpp:828
+#, fuzzy
+msgid "AF image height"
+msgstr "Wysokość obrazu"
 
-#: src/olympusmn.cpp:455
-msgid "AF Not Used"
-msgstr "Nie użyto AF"
+#: src/nikonmn.cpp:829
+#, fuzzy
+msgid "AF Area X Position"
+msgstr "Pozycja AF"
 
-#: src/olympusmn.cpp:456
-msgid "AF Used"
-msgstr "Użyto AF"
+#: src/nikonmn.cpp:829
+#, fuzzy
+msgid "AF area x position"
+msgstr "Pozycja AF"
 
-#: src/olympusmn.cpp:461
-msgid "Not Ready"
-msgstr "Nie gotowy"
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF Area Y Position"
+msgstr "Pozycja AF"
 
-#: src/olympusmn.cpp:462
-msgid "Ready"
-msgstr "Gotowy"
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF area y position"
+msgstr "Pozycja AF"
 
-#: src/olympusmn.cpp:469
-msgid "Fill-in"
-msgstr "Błysk wypełniający"
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF Area Width"
+msgstr "Tryb strefy AF"
 
-#: src/olympusmn.cpp:471
-msgid "Slow-sync"
-msgstr "Synchronizacja z długimi czasami"
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF area width"
+msgstr "Tryb strefy AF"
 
-#: src/olympusmn.cpp:472
-msgid "Forced On"
-msgstr "Wymuszony"
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF Area Height"
+msgstr "Tryb strefy AF"
 
-#: src/olympusmn.cpp:473
-msgid "2nd Curtain"
-msgstr "Druga kurtyna"
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF area height"
+msgstr "Przycięcie prawo"
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
-msgstr "7500K (dobra pogoda w cieniu)"
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast Detect AF In Focus"
+msgstr "Ustawienie kontrastu"
 
-#: src/olympusmn.cpp:480
-msgid "6000K (Cloudy)"
-msgstr "6000K (pochmurno)"
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast detect AF in focus"
+msgstr "Ustawienie kontrastu"
 
-#: src/olympusmn.cpp:481
-msgid "5300K (Fine Weather)"
-msgstr "5300K (dobra pogoda)"
+#: src/nikonmn.cpp:835
+#, fuzzy
+msgid "Unknown Nikon Auto Focus 2 Tag"
+msgstr "Nieznany znacznik Nikon Auto Focus"
 
-#: src/olympusmn.cpp:482
-msgid "3000K (Tungsten light)"
-msgstr "3000K (żarówka wolframowa)"
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory Number"
+msgstr "Liczba porządkowa"
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
-msgid "3600K (Tungsten light-like)"
-msgstr "3600K (żarowka wolframopodobna)"
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory number"
+msgstr "Liczba porządkowa"
 
-#: src/olympusmn.cpp:484
-msgid "6600K (Daylight fluorescent)"
-msgstr "6600K (światło dzienne lampy fluorescencyjnej)"
+#: src/nikonmn.cpp:849
+#, fuzzy
+msgid "Unknown Nikon File Info Tag"
+msgstr "Nieznany znacznik Nikon ISO Info"
 
-#: src/olympusmn.cpp:485
-msgid "4500K (Neutral white fluorescent)"
-msgstr "4500K (neutralnie biała lampa fluorescencyjna)"
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
+msgid "Multiple Exposure"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:486
-msgid "4000K (Cool white fluorescent)"
-msgstr "4000K (chłodnobiała lampa fluorescencyjna)"
+#: src/nikonmn.cpp:861
+#, fuzzy
+msgid "Image Overlay"
+msgstr "Numer zdjęcia"
 
-#: src/olympusmn.cpp:488
-msgid "Custom WB 1"
-msgstr "Własny balans bieli 1"
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi Exposure Mode"
+msgstr "Tryb ekspozycji"
 
-#: src/olympusmn.cpp:489
-msgid "Custom WB 2"
-msgstr "Własny balans bieli 2"
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi exposure mode"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:490
-msgid "Custom WB 3"
-msgstr "Własny balans bieli 3"
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi Exposure Shots"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:491
-msgid "Custom WB 4"
-msgstr "Własny balans bieli 4"
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi exposure shots"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:492
-msgid "Custom WB 5400K"
-msgstr "Własny balans bieli 5400K"
+#: src/nikonmn.cpp:869
+#, fuzzy
+msgid "Multi Exposure Auto Gain"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:493
-msgid "Custom WB 2900K"
-msgstr "Własny balans bieli 2900K"
+#: src/nikonmn.cpp:869
+#, fuzzy
+msgid "Multi exposure auto gain"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:494
-msgid "Custom WB 8000K"
-msgstr "Własny balans bieli 8000K"
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
+#, fuzzy
+msgid "Unknown Nikon Multi Exposure Tag"
+msgstr "Nieznany znacznik Nikon Auto Focus"
 
-#: src/olympusmn.cpp:500
-msgid "CM1 (Red Enhance)"
-msgstr "CM1 (rozszerzenie czerwieni)"
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
+msgid "Internal"
+msgstr "Wewnętrzny"
 
-#: src/olympusmn.cpp:501
-msgid "CM2 (Green Enhance)"
-msgstr "CM2 (rozszerzenie zieleni)"
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
+msgstr ""
 
-#: src/olympusmn.cpp:502
-msgid "CM3 (Blue Enhance)"
-msgstr "CM3 (rozszerzenie błękitu)"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
+msgstr ""
 
-#: src/olympusmn.cpp:503
-msgid "CM4 (Skin Tones)"
-msgstr "CM4 (kolory skóry)"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
+msgstr ""
 
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
-msgid "Pro Photo RGB"
-msgstr "Pro Photo RGB"
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
+msgstr ""
 
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
-msgid "Sport"
-msgstr "Sport"
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
+msgstr ""
 
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
-msgid "Landscape+Portrait"
-msgstr "Portret na tle krajobrazu"
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
+msgstr ""
 
-#: src/olympusmn.cpp:522
-msgid "Self Portrait"
-msgstr "Autoportret"
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
+msgstr ""
 
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
-msgstr "2-w-1"
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
+msgstr ""
 
-#: src/olympusmn.cpp:527
-msgid "Night+Portrait"
-msgstr "Portret nocny"
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
+msgstr ""
 
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
-msgstr "Żywność"
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
+msgstr ""
 
-#: src/olympusmn.cpp:534
-msgid "Documents"
-msgstr "Dokumenty"
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
+msgstr ""
 
-#: src/olympusmn.cpp:536
-msgid "Shoot & Select"
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
 msgstr ""
 
-#: src/olympusmn.cpp:537
-msgid "Beach & Snow"
-msgstr "Plaża i śnieg"
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:538
-msgid "Self Portrait+Timer"
-msgstr "Autoportret z samowyzwalaczem"
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:539
-msgid "Candle"
-msgstr "Świeca"
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
+msgstr ""
 
-#: src/olympusmn.cpp:540
-msgid "Available Light"
-msgstr "Światło zastane"
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
+msgstr ""
 
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
-msgstr "Za szybą"
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:542
-msgid "My Mode"
-msgstr "Mój tryb"
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
+msgstr ""
 
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-msgid "Pet"
-msgstr "Zwierzę domowe"
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
+msgstr ""
 
-#: src/olympusmn.cpp:544
-msgid "Underwater Wide1"
-msgstr "Podwodny szeroki 1"
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
+msgstr ""
 
-#: src/olympusmn.cpp:545
-msgid "Underwater Macro"
-msgstr "Podwodne makro"
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:546
-#, fuzzy
-msgid "Shoot & Select1"
-msgstr "Strzelanie 1"
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
+msgstr ""
 
-#: src/olympusmn.cpp:547
-#, fuzzy
-msgid "Shoot & Select2"
-msgstr "Strzelanie 2"
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:549
-msgid "Digital Image Stabilization"
-msgstr "Cyfrowa stabilizacja obrazu"
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
+msgstr ""
 
-#: src/olympusmn.cpp:550
-msgid "Auction"
-msgstr "Aukcja"
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:553
-msgid "Underwater Wide2"
-msgstr "Podwodny szeroki 2"
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
+msgstr ""
 
-#: src/olympusmn.cpp:555
-msgid "Children"
-msgstr "Dzieci"
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:557
-msgid "Nature Macro"
-msgstr "Przyrodnicze makro"
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:558
-msgid "Underwater Snapshot"
-msgstr "Zdjęcie podwodne"
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
+msgstr ""
 
-#: src/olympusmn.cpp:559
-msgid "Shooting Guide"
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
-msgid "Noise Filter"
-msgstr "Filtr szumu"
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:566
-#, fuzzy
-msgid "Noise Filter (ISO Boost)"
-msgstr "Filtr szumów przy długiej ekspozycji"
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
-msgid "Muted"
-msgstr "Wyciszony"
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
-msgid "Monotone"
-msgstr "Jednotonowy"
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
+msgstr ""
 
-#: src/olympusmn.cpp:601
-msgid "SQ"
-msgstr "SQ"
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:602
-msgid "HQ"
-msgstr "HQ"
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:603
-msgid "SHQ"
-msgstr "SHQ"
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:608
-msgid "Camera Settings Version"
-msgstr "Wersja ustawień aparatu"
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
+msgstr ""
 
-#: src/olympusmn.cpp:608
-msgid "Camera settings version"
-msgstr "Wersja ustawień aparatu"
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:609
-msgid "PreviewImage Valid"
-msgstr "Obrazek podglądu prawidłowy"
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:609
-msgid "Preview image valid"
-msgstr "Obrazek podglądu prawidłowy"
+#: src/nikonmn.cpp:934
+#, fuzzy
+msgid "10.0 m"
+msgstr "100"
 
-#: src/olympusmn.cpp:610
-msgid "PreviewImage Start"
-msgstr "Początek obrazu podglądu"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:610
-msgid "Preview image start"
-msgstr "Początek obrazu podglądu"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:611
-msgid "PreviewImage Length"
-msgstr "Długość obrazu podglądu"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:611
-msgid "Preview image length"
-msgstr "Długość obrazu podglądu"
+#: src/nikonmn.cpp:938
+#, fuzzy
+msgid "16.0 m"
+msgstr "100"
 
-#: src/olympusmn.cpp:613
-msgid "AE Lock"
-msgstr "Blokada ekspozycji"
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:613
-msgid "Auto exposure lock"
-msgstr "Blokada automatycznej ekspozycji"
+#: src/nikonmn.cpp:940
+#, fuzzy
+msgid "20.0 m"
+msgstr "200"
 
-#: src/olympusmn.cpp:617
-msgid "Focus Process"
+#: src/nikonmn.cpp:947
+#, fuzzy
+msgid "iTTL-BL"
+msgstr "TTL"
+
+#: src/nikonmn.cpp:948
+#, fuzzy
+msgid "iTTL"
+msgstr "TTL"
+
+#: src/nikonmn.cpp:949
+#, fuzzy
+msgid "Auto Aperture"
+msgstr "Przysłona"
+
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
 msgstr ""
 
-#: src/olympusmn.cpp:617
-msgid "Focus process"
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
+#, fuzzy
+msgid "Repeating Flash"
+msgstr "Klasa wykonania"
+
+#: src/nikonmn.cpp:960
+#, fuzzy
+msgid "Bounce Flash"
+msgstr "Bez błysku"
+
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF Search"
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF search"
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
 msgstr ""
 
-#: src/olympusmn.cpp:619
-msgid "AF Areas"
-msgstr "Strefy AF"
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
+msgstr ""
 
-#: src/olympusmn.cpp:619
-msgid "AF areas"
-msgstr "Strefy autofokusa"
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
+msgstr ""
 
-#: src/olympusmn.cpp:622
-msgid "White Balance 2"
-msgstr "Balans bieli 2"
+#: src/nikonmn.cpp:974
+#, fuzzy
+msgid "Amber"
+msgstr "Liczba F"
 
-#: src/olympusmn.cpp:622
-msgid "White balance 2"
-msgstr "Balans bieli 2"
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
+#, fuzzy
+msgid "Flash Source"
+msgstr "Źródło pliku"
 
-#: src/olympusmn.cpp:623
-msgid "White Balance Temperature"
-msgstr "Temperatura balansu bieli"
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
+#, fuzzy
+msgid "Flash source"
+msgstr "Źródło pliku"
 
-#: src/olympusmn.cpp:623
-msgid "White balance temperature"
-msgstr "Temperatura balansu bieli"
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
+#, fuzzy
+msgid "0x0005"
+msgstr "1000"
 
-#: src/olympusmn.cpp:624
-msgid "White Balance Bracket"
-msgstr "Bracketing balansu bieli"
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
+#, fuzzy
+msgid "External Flash Firmware"
+msgstr "Pokrycie zewnętrznego flesza"
 
-#: src/olympusmn.cpp:624
-msgid "White balance bracket"
-msgstr "Bracketing balansu bieli"
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
+#, fuzzy
+msgid "External flash firmware"
+msgstr "Tryb zewnętrznego flesza"
 
-#: src/olympusmn.cpp:625
-msgid "Custom Saturation"
-msgstr "Nasycenie własne"
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External Flash Flags"
+msgstr "Zewnętrzny flesz"
 
-#: src/olympusmn.cpp:625
-msgid "Custom saturation"
-msgstr "Nasycenie własne"
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External flash flags"
+msgstr "Zewnętrzny flesz"
 
-#: src/olympusmn.cpp:626
-msgid "Modified Saturation"
-msgstr "Nasycenie zmodyfikowane"
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
+#, fuzzy
+msgid "Flash Focal Length"
+msgstr "Maksymalna ogniskowa"
 
-#: src/olympusmn.cpp:626
-msgid "Modified saturation"
-msgstr "Nasycenie zmodyfikowane"
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
+#, fuzzy
+msgid "Flash focal length"
+msgstr "Maksymalna ogniskowa"
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
-msgid "Contrast Setting"
-msgstr "Ustawienie kontrastu"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
+msgstr ""
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
-msgid "Sharpness Setting"
-msgstr "Ustawienie wyostrzenia"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+#, fuzzy
+msgid "Repeating flash rate"
+msgstr "Zmianie nazwy pliku na"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion Correction"
-msgstr "Korekcja dystorsji"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
+msgstr ""
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-msgid "Distortion correction"
-msgstr "Korekcja dystorsji"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+#, fuzzy
+msgid "Repeating flash count"
+msgstr "Ręczne sterowanie lampą"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-msgid "Shading Compensation"
-msgstr "Kompensacja cieni"
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
+#, fuzzy
+msgid "Flash GN Distance"
+msgstr "Odległość ostrzenia"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-msgid "Shading compensation"
-msgstr "Kompensacja cieni"
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
+#, fuzzy
+msgid "Flash GN distance"
+msgstr "Odległość ostrzenia"
 
-#: src/olympusmn.cpp:634
-msgid "Compression Factor"
-msgstr "Współczynnik kompresji"
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
+msgstr ""
 
-#: src/olympusmn.cpp:634
-msgid "Compression factor"
-msgstr "Współczynnik kompresji"
+#: src/nikonmn.cpp:988
+msgid "Flash group a control mode"
+msgstr ""
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
-msgid "Gradation"
-msgstr "Gradacja"
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
+msgstr ""
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
-msgid "Picture mode"
-msgstr "Styl obrazu"
+#: src/nikonmn.cpp:989
+msgid "Flash group b control mode"
+msgstr ""
 
-#: src/olympusmn.cpp:637
-msgid "Picture Mode Saturation"
-msgstr "Nasycenie stylu zdjęcia"
+#: src/nikonmn.cpp:1029
+#, fuzzy
+msgid "Flash Color Filter"
+msgstr "Filtr kolorów"
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
-msgid "Picture mode saturation"
-msgstr "Nasycenie stylu zdjęcia"
+#: src/nikonmn.cpp:1029
+#, fuzzy
+msgid "Flash color filter"
+msgstr "Filtr kolorów"
 
-#: src/olympusmn.cpp:638
-msgid "Picture Mode Hue"
-msgstr "Odcień stylu zdjęcia"
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
+msgid "Shutter count"
+msgstr "Licznik migawki"
 
-#: src/olympusmn.cpp:638
-msgid "Picture mode hue"
-msgstr "Odcień stylu zdjęcia"
+#: src/nikonmn.cpp:1044
+msgid "Unknown Nikon Shot Info D80 Tag"
+msgstr "Nieznany znacznik Nikon Shot Info D80"
 
-#: src/olympusmn.cpp:639
-msgid "Picture Mode Contrast"
-msgstr "Kontrast stylu zdjęcia"
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
+msgid "Flash Level"
+msgstr "Poziom flesza"
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
-msgid "Picture mode contrast"
-msgstr "Kontrast stylu zdjęcia"
+#: src/nikonmn.cpp:1056
+msgid "Flash level"
+msgstr "Poziom flesza"
 
-#: src/olympusmn.cpp:640
-msgid "Picture Mode Sharpness"
-msgstr "Ostrość stylu zdjęcia"
+#: src/nikonmn.cpp:1058
+msgid "Unknown Nikon Shot Info D40 Tag"
+msgstr "Nieznany znacznik Nikon Shot Info D40"
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
-msgid "Picture mode sharpness"
-msgstr "Ostrość stylu zdjęcia"
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
+msgid "0"
+msgstr "0"
 
-#: src/olympusmn.cpp:641
-msgid "Picture Mode BW Filter"
-msgstr "Filtr cz-b stylu zdjęcia"
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
+msgid "+1"
+msgstr "+1"
 
-#: src/olympusmn.cpp:641
-msgid "Picture mode BW filter"
-msgstr "Filtr cz-b stylu zdjęcia"
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
+msgid "+2"
+msgstr "+2"
 
-#: src/olympusmn.cpp:642
-msgid "Picture Mode Tone"
-msgstr "Tonowanie stylu zdjęcia"
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
+msgid "+4"
+msgstr "+4"
 
-#: src/olympusmn.cpp:642
-msgid "Picture mode tone"
-msgstr "Tonowanie stylu zdjęcia"
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
+msgid "+8"
+msgstr "+8"
 
-#: src/olympusmn.cpp:643
-msgid "Noise filter"
-msgstr "Filtr szumu"
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
+msgid "+16"
+msgstr "+16"
 
-#: src/olympusmn.cpp:645
-msgid "Panorama Mode"
-msgstr "Tryb panoramy"
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
+msgid "-16"
+msgstr "-16"
 
-#: src/olympusmn.cpp:645
-msgid "Panorama mode"
-msgstr "Tryb panoramy"
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
+msgid "-8"
+msgstr "-8"
 
-#: src/olympusmn.cpp:646
-msgid "Image Quality 2"
-msgstr "Jakość obrazu 2"
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
+msgid "-4"
+msgstr "-4"
 
-#: src/olympusmn.cpp:646
-msgid "Image quality 2"
-msgstr "Jakość obrazu 2"
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
+msgid "-2"
+msgstr "-2"
 
-#: src/olympusmn.cpp:647
-msgid "Manometer Pressure"
-msgstr "Ciśnienie manometru"
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
+msgid "-1"
+msgstr "-1"
 
-#: src/olympusmn.cpp:647
-msgid "Manometer pressure"
-msgstr "Ciśnienie manometru"
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
+msgid "+17"
+msgstr "+17"
 
-#: src/olympusmn.cpp:648
-msgid "Manometer Reading"
-msgstr "Odczyt manometru"
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
+msgid "-17"
+msgstr "-17"
 
-#: src/olympusmn.cpp:648
-msgid "Manometer reading"
-msgstr "Odczyt manometru"
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
+msgid "+9"
+msgstr "+9"
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB Detect"
-msgstr "Rozszerzona detekcja balansu bieli"
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
+msgid "+18"
+msgstr "+18"
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB detect"
-msgstr "Rozszerzona detekcja balansu bieli"
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
+msgid "-18"
+msgstr "-18"
 
-#: src/olympusmn.cpp:651
-msgid "Unknown OlympusCs tag"
-msgstr "Nieznany znacznik OlympusCs"
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
+msgid "-9"
+msgstr "-9"
 
-#: src/olympusmn.cpp:662
-msgid "Simple E-System"
-msgstr "Prosty system E"
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
+msgid "+19"
+msgstr "+19"
 
-#: src/olympusmn.cpp:663
-msgid "E-System"
-msgstr "System E"
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
+msgid "-19"
+msgstr "-19"
 
-#: src/olympusmn.cpp:679
-msgid "Equipment Version"
-msgstr "Wersja wyposażenia"
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
+msgid "+5"
+msgstr "+5"
 
-#: src/olympusmn.cpp:679
-msgid "Equipment version"
-msgstr "Wersja wyposażenia"
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
+msgid "+10"
+msgstr "+10"
 
-#: src/olympusmn.cpp:680
-msgid "Camera Type"
-msgstr "Rodzaj aparatu"
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
+msgid "+20"
+msgstr "+20"
 
-#: src/olympusmn.cpp:680
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
+msgid "-20"
+msgstr "-20"
+
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
+msgid "-10"
+msgstr "-10"
+
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
+msgid "-5"
+msgstr "-5"
+
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
+msgid "+11"
+msgstr "+11"
+
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
+msgid "-11"
+msgstr "-11"
+
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
+msgid "+3"
+msgstr "+3"
+
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
+msgid "+6"
+msgstr "+6"
+
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
+msgid "+12"
+msgstr "+12"
+
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
+msgid "-12"
+msgstr "-12"
+
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
+msgid "-6"
+msgstr "-6"
+
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
+msgid "-3"
+msgstr "-3"
+
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
+msgid "+13"
+msgstr "+13"
+
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
+msgid "-13"
+msgstr "-13"
+
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
+msgid "+7"
+msgstr "+7"
+
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
+msgid "+14"
+msgstr "+14"
+
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
+msgid "-14"
+msgstr "-14"
+
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
+msgid "-7"
+msgstr "-7"
+
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
+msgid "+15"
+msgstr "+15"
+
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
+msgid "-15"
+msgstr "-15"
+
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
+#, fuzzy
+msgid "AF Fine Tune Adj"
+msgstr "Dostrojenie AF"
+
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
+#, fuzzy
+msgid "AF fine tune adj"
+msgstr "Dostrojenie AF"
+
+#: src/nikonmn.cpp:1118
+msgid "Unknown Nikon Shot Info D300 (a) Tag"
+msgstr "Nieznany znacznik Nikon Shot Info D300 (a)"
+
+#: src/nikonmn.cpp:1178
+msgid "Unknown Nikon Shot Info D300 (b) Tag"
+msgstr "Nieznany znacznik Nikon Shot Info D300 (b)"
+
+#: src/nikonmn.cpp:1191
+msgid "On (3)"
+msgstr "Włączone (3)"
+
+#: src/nikonmn.cpp:1204
+msgid "Shutter Count 1"
+msgstr "Licznik migawki 1"
+
+#: src/nikonmn.cpp:1204
+msgid "Shutter count 1"
+msgstr "Licznik migawki 1"
+
+#: src/nikonmn.cpp:1208
+msgid "Shutter Count 2"
+msgstr "Licznik migawki 2"
+
+#: src/nikonmn.cpp:1208
+msgid "Shutter count 2"
+msgstr "Licznik migawki 2"
+
+#: src/nikonmn.cpp:1209
+msgid "Vibration Reduction 2"
+msgstr "Redukcja wstrząsów 2"
+
+#: src/nikonmn.cpp:1209
+msgid "Vibration reduction 2"
+msgstr "Redukcja wstrząsów 2"
+
+#: src/nikonmn.cpp:1213
+msgid "Unknown Nikon Shot Info Tag"
+msgstr "Nieznany znacznik Nikon Shot Info"
+
+#: src/nikonmn.cpp:1224
+msgid "WB RBGG Levels"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/nikonmn.cpp:1224
+msgid "WB RBGG levels"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/nikonmn.cpp:1226
+msgid "Unknown Nikon Color Balance 1 Tag"
+msgstr "Nieznany znacznik Nikon Color Balance 1"
+
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
+msgid "WB RGGB Levels"
+msgstr "Poziomy balansu bieli RGGB"
+
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
+msgid "WB RGGB levels"
+msgstr "Poziomy balansu bieli RGGB"
+
+#: src/nikonmn.cpp:1239
+msgid "Unknown Nikon Color Balance 2 Tag"
+msgstr "Nieznany znacznik Nikon Color Balance 2"
+
+#: src/nikonmn.cpp:1252
+msgid "Unknown Nikon Color Balance 2a Tag"
+msgstr "Nieznany znacznik Nikon Color Balance 2a"
+
+#: src/nikonmn.cpp:1265
+msgid "Unknown Nikon Color Balance 2b Tag"
+msgstr "Nieznany znacznik Nikon Color Balance 2b"
+
+#: src/nikonmn.cpp:1276
+msgid "WB RGBG Levels"
+msgstr "Poziomy balansu bieli RGBG"
+
+#: src/nikonmn.cpp:1276
+msgid "WB RGBG levels"
+msgstr "Poziomy balansu bieli RGBG"
+
+#: src/nikonmn.cpp:1278
+msgid "Unknown Nikon Color Balance 3 Tag"
+msgstr "Nieznany znacznik Nikon Color Balance 3"
+
+#: src/nikonmn.cpp:1289
+msgid "WB GRBG Levels"
+msgstr "Poziomy balansu bieli GRBG"
+
+#: src/nikonmn.cpp:1289
+msgid "WB GRBG levels"
+msgstr "Poziomy balansu bieli GRBG"
+
+#: src/nikonmn.cpp:1291
+msgid "Unknown Nikon Color Balance 4 Tag"
+msgstr "Nieznany znacznik Nikon Color Balance 4"
+
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
+msgid "Lens ID Number"
+msgstr "Numer identyfikacyjny obiektywu"
+
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
+msgid "Lens ID number"
+msgstr "Numer identyfikacyjny obiektywu"
+
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
+msgid "Lens F-Stops"
+msgstr "Apertura obiektywu"
+
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
+msgid "Lens F-stops"
+msgstr "Apertura obiektywu"
+
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+msgid "Min Focal Length"
+msgstr "Minimalna ogniskowa"
+
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+msgid "Min focal length"
+msgstr "Minimalna ogniskowa"
+
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+msgid "Max Focal Length"
+msgstr "Maksymalna ogniskowa"
+
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+msgid "Max focal length"
+msgstr "Maksymalna ogniskowa"
+
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
+msgid "Max Aperture At Min Focal"
+msgstr "Maksymalna apertura przy minimalnej ogniskowej"
+
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
+msgid "Max aperture at min focal"
+msgstr "Maksymalna apertura przy minimalnej ogniskowej"
+
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
+msgid "Max Aperture At Max Focal"
+msgstr "Maksymalna apertura przy maksymalnej ogniskowej"
+
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
+msgid "Max aperture at max focal"
+msgstr "Maksymalna apertura przy maksymalnej ogniskowej"
+
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+msgid "MCU Version"
+msgstr "Wersja MCU"
+
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+msgid "MCU version"
+msgstr "Wersja MCU"
+
+#: src/nikonmn.cpp:1310
+msgid "Unknown Nikon Lens Data 1 Tag"
+msgstr "Nieznany znacznik Nikon Lens Data 1"
+
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+#, fuzzy
+msgid "Exit Pupil Position"
+msgstr "Pozycja przełącznika DEC"
+
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+#, fuzzy
+msgid "Exit pupil position"
+msgstr "Pozycja przełącznika DEC"
+
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+#, fuzzy
+msgid "AF Aperture"
+msgstr "Przysłona"
+
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+#, fuzzy
+msgid "AF aperture"
+msgstr "Przysłona"
+
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+msgid "Effective Max Aperture"
+msgstr "Największa efektywna apertura"
+
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+msgid "Effective max aperture"
+msgstr "Największa efektywna apertura"
+
+#: src/nikonmn.cpp:1335
+msgid "Unknown Nikon Lens Data 2 Tag"
+msgstr "Nieznany znacznik Nikon Lens Data 2"
+
+#: src/nikonmn.cpp:1355
+msgid "Max aperture at min focal length"
+msgstr "Maksymalna apertura przy minimalnej ogniskowej"
+
+#: src/nikonmn.cpp:1356
+msgid "Max aperture at max focal length"
+msgstr "Maksymalna apertura przy maksymalnej ogniskowej"
+
+#: src/nikonmn.cpp:1360
+msgid "Unknown Nikon Lens Data 3 Tag"
+msgstr "Nieznany znacznik Nikon Lens Data 3"
+
+#: src/nikonmn.cpp:1540
+msgid "Closest subject"
+msgstr "Najbliższy obiekt"
+
+#: src/nikonmn.cpp:1541
+#, fuzzy
+msgid "Group dynamic-AF"
+msgstr "Dynamiczna zmiana rozmiaru siatki"
+
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
+msgid "none"
+msgstr "brak"
+
+#: src/nikonmn.cpp:1574
+msgid "used"
+msgstr "użyto"
+
+#: src/nikonmn.cpp:1600
+msgid "All 11 Points"
+msgstr "Wszystkie 11 punktów"
+
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
+msgid "Single-frame"
+msgstr ""
+
+#: src/olympusmn.cpp:71
+msgid "Standard Quality (SQ)"
+msgstr "Standardowa jakość (SQ)"
+
+#: src/olympusmn.cpp:72
+msgid "High Quality (HQ)"
+msgstr "Wysoka jakość (HQ)"
+
+#: src/olympusmn.cpp:73
+msgid "Super High Quality (SHQ)"
+msgstr "Bardzo wysoka jakość (SHQ)"
+
+#: src/olympusmn.cpp:88
+msgid "On (preset)"
+msgstr "Włączony (predefiniowany)"
+
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
+msgid "Sport"
+msgstr "Sport"
+
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
+msgid "Landscape+Portrait"
+msgstr "Portret na tle krajobrazu"
+
+#: src/olympusmn.cpp:100
+msgid "Self Portrait"
+msgstr "Autoportret"
+
+#: src/olympusmn.cpp:102
+msgid "2 in 1"
+msgstr "2-w-1"
+
+#: src/olympusmn.cpp:105
+msgid "Night+Portrait"
+msgstr "Portret nocny"
+
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
+msgstr "Żywność"
+
+#: src/olympusmn.cpp:112
+msgid "Documents"
+msgstr "Dokumenty"
+
+#: src/olympusmn.cpp:114
+#, fuzzy
+msgid "Shoot & Select"
+msgstr "Strzelanie 1"
+
+#: src/olympusmn.cpp:115
+msgid "Beach & Snow"
+msgstr "Plaża i śnieg"
+
+#: src/olympusmn.cpp:116
+msgid "Self Portrait+Timer"
+msgstr "Autoportret z samowyzwalaczem"
+
+#: src/olympusmn.cpp:117
+msgid "Candle"
+msgstr "Świeca"
+
+#: src/olympusmn.cpp:118
+msgid "Available Light"
+msgstr "Światło zastane"
+
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
+msgstr "Za szybą"
+
+#: src/olympusmn.cpp:120
+msgid "My Mode"
+msgstr "Mój tryb"
+
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
+msgid "Pet"
+msgstr "Zwierzę domowe"
+
+#: src/olympusmn.cpp:122
+msgid "Underwater Wide1"
+msgstr "Podwodny szeroki 1"
+
+#: src/olympusmn.cpp:123
+msgid "Underwater Macro"
+msgstr "Podwodne makro"
+
+#: src/olympusmn.cpp:124
+#, fuzzy
+msgid "Shoot & Select1"
+msgstr "Strzelanie 1"
+
+#: src/olympusmn.cpp:125
+#, fuzzy
+msgid "Shoot & Select2"
+msgstr "Strzelanie 2"
+
+#: src/olympusmn.cpp:127
+msgid "Digital Image Stabilization"
+msgstr "Cyfrowa stabilizacja obrazu"
+
+#: src/olympusmn.cpp:128
+msgid "Auction"
+msgstr "Aukcja"
+
+#: src/olympusmn.cpp:131
+msgid "Underwater Wide2"
+msgstr "Podwodny szeroki 2"
+
+#: src/olympusmn.cpp:133
+msgid "Children"
+msgstr "Dzieci"
+
+#: src/olympusmn.cpp:135
+msgid "Nature Macro"
+msgstr "Przyrodnicze makro"
+
+#: src/olympusmn.cpp:136
+msgid "Underwater Snapshot"
+msgstr "Zdjęcie podwodne"
+
+#: src/olympusmn.cpp:137
+#, fuzzy
+msgid "Shooting Guide"
+msgstr "Tryb robienia zdjęcia"
+
+#: src/olympusmn.cpp:145
+msgid "Internal + External"
+msgstr "Wewnętrzny + Zewnętrzny"
+
+#: src/olympusmn.cpp:176
+msgid "Interlaced"
+msgstr "Z przeplotem"
+
+#: src/olympusmn.cpp:177
+msgid "Progressive"
+msgstr "Przyrostowy"
+
+#: src/olympusmn.cpp:188
+msgid "Thumbnail Image"
+msgstr "Obraz miniatury"
+
+#: src/olympusmn.cpp:189
+msgid "Thumbnail image"
+msgstr "Obraz miniatury"
+
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+msgid "Body Firmware Version"
+msgstr "Wersja firmware korpusu"
+
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+msgid "Body firmware version"
+msgstr "Wersja firmware korpusu"
+
+#: src/olympusmn.cpp:195
+msgid "Special Mode"
+msgstr "Tryb specjalny"
+
+#: src/olympusmn.cpp:196
+msgid "Picture taking mode"
+msgstr "Tryb robienia zdjęcia"
+
+#: src/olympusmn.cpp:204
+msgid "Black & White Mode"
+msgstr "Tryb czarno-biały"
+
+#: src/olympusmn.cpp:205
+msgid "Black and white mode"
+msgstr "Tryb czarno-biały"
+
+#: src/olympusmn.cpp:208
+msgid "Digital zoom ratio"
+msgstr "Współczynnik powiększenia cyfrowego"
+
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
+#, fuzzy
+msgid "Focal Plane Diagonal"
+msgstr "Rozdzielczość ogniskowej w płaszczyźnie X"
+
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
+#, fuzzy
+msgid "Focal plane diagonal"
+msgstr "Rozdzielczość ogniskowej w płaszczyźnie X"
+
+#: src/olympusmn.cpp:213
+msgid "Lens Distortion Parameters"
+msgstr "Parametry dystorsji soczewki"
+
+#: src/olympusmn.cpp:214
+msgid "Lens distortion parameters"
+msgstr "Parametry dystorsji soczewki obiektywu"
+
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
+msgid "Camera Type"
+msgstr "Rodzaj aparatu"
+
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
 msgid "Camera type"
 msgstr "Rodzaj aparatu"
 
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
-msgid "Internal Serial Number"
-msgstr "Wewnętrzny numer seryjny"
+#: src/olympusmn.cpp:220
+msgid "ASCII format data such as [PictureInfo]"
+msgstr "Dane w formacie ASCII jak w [PictureInfo]"
+
+#: src/olympusmn.cpp:222
+msgid "Camera ID"
+msgstr "ID aparatu"
+
+#: src/olympusmn.cpp:223
+msgid "Camera ID data"
+msgstr "Dane identyfikacyjne aparatu"
+
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
+msgstr "Oprogramowanie"
+
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
+msgid "Preview Image"
+msgstr "Obraz podglądu"
+
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
+msgid "Preview image"
+msgstr "Obraz podglądu"
+
+#: src/olympusmn.cpp:237
+#, fuzzy
+msgid "Pre Capture Frames"
+msgstr "Nazwy płyt"
+
+#: src/olympusmn.cpp:238
+#, fuzzy
+msgid "Pre-capture frames"
+msgstr "Nazwy płyt"
+
+#: src/olympusmn.cpp:240
+#, fuzzy
+msgid "White Board"
+msgstr "Balans bieli"
+
+#: src/olympusmn.cpp:241
+#, fuzzy
+msgid "White board"
+msgstr "Balans bieli"
+
+#: src/olympusmn.cpp:243
+#, fuzzy
+msgid "One Touch WB"
+msgstr "Automatyczna korekcja balansu bieli"
+
+#: src/olympusmn.cpp:244
+#, fuzzy
+msgid "One touch white balance"
+msgstr "Automatyczna korekcja balansu bieli"
+
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
+msgid "White Balance Bracket"
+msgstr "Bracketing balansu bieli"
+
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
+msgid "White balance bracket"
+msgstr "Bracketing balansu bieli"
+
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+msgid "Firmware"
+msgstr "Firmware"
+
+#: src/olympusmn.cpp:256
+#, fuzzy
+msgid "Firmwarer"
+msgstr "Firmware"
+
+#: src/olympusmn.cpp:261
+msgid "Data Dump 1"
+msgstr "Zrzut danych 1"
+
+#: src/olympusmn.cpp:262
+msgid "Various camera settings 1"
+msgstr "Różne ustawienia aparatu 1"
+
+#: src/olympusmn.cpp:264
+msgid "Data Dump 2"
+msgstr "Zrzut danych 2"
+
+#: src/olympusmn.cpp:265
+msgid "Various camera settings 2"
+msgstr "Różne ustawienia aparatu 2"
+
+#: src/olympusmn.cpp:268
+msgid "Shutter speed value"
+msgstr "Czas otwarcia migawki"
+
+#: src/olympusmn.cpp:271
+msgid "ISO speed value"
+msgstr "Czułość ISO"
+
+#: src/olympusmn.cpp:274
+msgid "Aperture value"
+msgstr "Przysłona"
+
+#: src/olympusmn.cpp:277
+msgid "Brightness value"
+msgstr "Jasność"
+
+#: src/olympusmn.cpp:285
+#, fuzzy
+msgid "Bracket"
+msgstr "Bracketing"
+
+#: src/olympusmn.cpp:286
+msgid "Exposure compensation value"
+msgstr "Wartość kompensacji ekspozycji"
+
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
+msgid "Sensor Temperature"
+msgstr "Temperatura czujnika"
+
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
+msgid "Sensor temperature"
+msgstr "Temperatura czujnika"
+
+#: src/olympusmn.cpp:291
+msgid "Lens Temperature"
+msgstr "Temperatura obiektywu"
+
+#: src/olympusmn.cpp:292
+msgid "Lens temperature"
+msgstr "Temperatura obiektywu"
+
+#: src/olympusmn.cpp:294
+#, fuzzy
+msgid "Light Condition"
+msgstr "Funkcja koloru"
+
+#: src/olympusmn.cpp:295
+#, fuzzy
+msgid "Light condition"
+msgstr "Funkcja koloru"
+
+#: src/olympusmn.cpp:297
+#, fuzzy
+msgid "Focus Range"
+msgstr "Obszar ogniskowania"
+
+#: src/olympusmn.cpp:298
+#, fuzzy
+msgid "Focus range"
+msgstr "Obszar ogniskowania"
+
+#: src/olympusmn.cpp:306
+msgid "Zoom"
+msgstr "Powiększenie"
+
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
+msgid "Zoom step count"
+msgstr "Liczba kroków powiększania"
+
+#: src/olympusmn.cpp:309
+#, fuzzy
+msgid "Macro Focus"
+msgstr "Śledzące ostrzenie"
+
+#: src/olympusmn.cpp:310
+#, fuzzy
+msgid "Macro focus step count"
+msgstr "Liczba kroków ostrzenia"
+
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
+msgid "Sharpness Factor"
+msgstr "Współczynnik wyostrzenia"
+
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
+msgid "Sharpness factor"
+msgstr "Współczynnik wyostrzenia"
+
+#: src/olympusmn.cpp:315
+msgid "Flash Charge Level"
+msgstr "Poziom naładowania flesza"
+
+#: src/olympusmn.cpp:316
+msgid "Flash charge level"
+msgstr "Poziom naładowania flesza"
+
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
+msgid "Color Matrix"
+msgstr "Matryca kolorów"
+
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
+msgid "Color matrix"
+msgstr "Matryca kolorów"
+
+#: src/olympusmn.cpp:321
+msgid "BlackLevel"
+msgstr "Poziom czerni"
+
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
+msgid "Black level"
+msgstr "Poziom czerni"
+
+#: src/olympusmn.cpp:331
+msgid "White balance mode"
+msgstr "Tryb balansu bieli"
+
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
+msgid "Red Balance"
+msgstr "Balans czerwieni"
+
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
+msgid "Red balance"
+msgstr "Balans czerwieni"
+
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
+msgid "Blue Balance"
+msgstr "Balans niebieskiego"
+
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
+msgid "Blue balance"
+msgstr "Balans niebieskiego"
+
+#: src/olympusmn.cpp:342
+#, fuzzy
+msgid "Color Matrix Number"
+msgstr "Matryca kolorów 1"
+
+#: src/olympusmn.cpp:343
+#, fuzzy
+msgid "Color matrix mumber"
+msgstr "Matryca kolorów 2"
+
+#: src/olympusmn.cpp:345
+msgid "Serial Number 2"
+msgstr "Numer seryjny 2"
+
+#: src/olympusmn.cpp:346
+msgid "Serial number 2"
+msgstr "Numer seryjny 2"
+
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
+msgid "Flash exposure compensation"
+msgstr "Kompensacja ekspozycji błysku"
+
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
+msgid "External Flash Bounce"
+msgstr "Odbicie zewnętrznego flesza"
+
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
+msgid "External flash bounce"
+msgstr "Odbicie zewnętrznego flesza"
+
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
+msgid "External Flash Zoom"
+msgstr "Pokrycie zewnętrznego flesza"
+
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
+msgid "External flash zoom"
+msgstr "Pokrycie zewnętrznego flesza"
+
+#: src/olympusmn.cpp:387
+msgid "External Flash Mode"
+msgstr "Tryb zewnętrznego flesza"
+
+#: src/olympusmn.cpp:388
+msgid "External flash mode"
+msgstr "Tryb zewnętrznego flesza"
+
+#: src/olympusmn.cpp:396
+msgid "Color Control"
+msgstr "Regulacja barwy"
+
+#: src/olympusmn.cpp:397
+msgid "Color control"
+msgstr "Regulacja barwy"
+
+#: src/olympusmn.cpp:399
+msgid "ValidBits"
+msgstr ""
+
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
+msgid "Valid bits"
+msgstr ""
+
+#: src/olympusmn.cpp:402
+#, fuzzy
+msgid "CoringFilter"
+msgstr "Filtr kolorów"
+
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
+msgid "Coring filter"
+msgstr "Filtr kolorów"
+
+#: src/olympusmn.cpp:423
+msgid "Compression Ratio"
+msgstr "Współczynnik kompresji"
+
+#: src/olympusmn.cpp:424
+msgid "Compression ratio"
+msgstr "Współczynnik kompresji"
+
+#: src/olympusmn.cpp:427
+msgid "Preview image embedded"
+msgstr "Osadzony obrazek podglądu"
+
+#: src/olympusmn.cpp:430
+msgid "Offset of the preview image"
+msgstr "Przesunięcie obrazu podglądu"
+
+#: src/olympusmn.cpp:433
+msgid "Size of the preview image"
+msgstr "Rozmiar obrazu podglądu"
+
+#: src/olympusmn.cpp:435
+msgid "CCD Scan Mode"
+msgstr "Tryb skanowania CCD"
+
+#: src/olympusmn.cpp:436
+msgid "CCD scan mode"
+msgstr "Tryb skanowania CCD"
+
+#: src/olympusmn.cpp:441
+#, fuzzy
+msgid "Infinity Lens Step"
+msgstr "Nieskończoność"
+
+#: src/olympusmn.cpp:442
+#, fuzzy
+msgid "Infinity lens step"
+msgstr "Nieskończoność"
+
+#: src/olympusmn.cpp:444
+#, fuzzy
+msgid "Near Lens Step"
+msgstr "Apertura obiektywu"
+
+#: src/olympusmn.cpp:445
+msgid "Near lens step"
+msgstr ""
+
+#: src/olympusmn.cpp:447
+msgid "Equipment Info"
+msgstr "Wyposażenie"
+
+#: src/olympusmn.cpp:448
+msgid "Camera equipment sub-IFD"
+msgstr "sub-IFD wyposażenia aparatu"
+
+#: src/olympusmn.cpp:451
+msgid "Camera Settings sub-IFD"
+msgstr "sub-IFD ustawień aparatu"
+
+#: src/olympusmn.cpp:453
+msgid "Raw Development"
+msgstr ""
+
+#: src/olympusmn.cpp:454
+#, fuzzy
+msgid "Raw development sub-IFD"
+msgstr "sub-IFD wyposażenia aparatu"
+
+#: src/olympusmn.cpp:456
+msgid "Raw Development 2"
+msgstr ""
+
+#: src/olympusmn.cpp:457
+#, fuzzy
+msgid "Raw development 2 sub-IFD"
+msgstr "sub-IFD wyposażenia aparatu"
+
+#: src/olympusmn.cpp:460
+#, fuzzy
+msgid "Image processing sub-IFD"
+msgstr "Przetwarzanie obrazu"
+
+#: src/olympusmn.cpp:462
+msgid "Focus Info"
+msgstr "Ostrzenie"
+
+#: src/olympusmn.cpp:463
+msgid "Focus sub-IFD"
+msgstr "sub-IFD ostrzenia"
+
+#: src/olympusmn.cpp:465
+msgid "Raw Info"
+msgstr "Raw"
+
+#: src/olympusmn.cpp:466
+msgid "Raw sub-IFD"
+msgstr "Raw sub-IFD"
+
+#: src/olympusmn.cpp:470
+msgid "Unknown OlympusMakerNote tag"
+msgstr "Nieznany znacznik OlympusMakerNote"
+
+#: src/olympusmn.cpp:486
+msgid "Program-shift"
+msgstr "Program-shift"
+
+#: src/olympusmn.cpp:491
+msgid "Center-weighted average"
+msgstr "Centralnie ważony uśredniony"
+
+#: src/olympusmn.cpp:493
+msgid "ESP"
+msgstr "ESP"
+
+#: src/olympusmn.cpp:494
+#, fuzzy
+msgid "Pattern+AF"
+msgstr "Wzór CFA"
+
+#: src/olympusmn.cpp:495
+msgid "Spot+Highlight control"
+msgstr ""
+
+#: src/olympusmn.cpp:496
+#, fuzzy
+msgid "Spot+Shadow control"
+msgstr "Regulacja barwy"
+
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
+msgid "Single AF"
+msgstr "Pojedyncze zdjęcie"
+
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
+msgid "Sequential shooting AF"
+msgstr "Zdjęcia seryjne"
+
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
+msgid "Multi AF"
+msgstr "Multi AF"
+
+#: src/olympusmn.cpp:517
+msgid "AF Not Used"
+msgstr "Nie użyto AF"
+
+#: src/olympusmn.cpp:518
+msgid "AF Used"
+msgstr "Użyto AF"
+
+#: src/olympusmn.cpp:523
+msgid "Not Ready"
+msgstr "Nie gotowy"
+
+#: src/olympusmn.cpp:524
+msgid "Ready"
+msgstr "Gotowy"
+
+#: src/olympusmn.cpp:531
+msgid "Fill-in"
+msgstr "Błysk wypełniający"
+
+#: src/olympusmn.cpp:533
+msgid "Slow-sync"
+msgstr "Synchronizacja z długimi czasami"
+
+#: src/olympusmn.cpp:534
+msgid "Forced On"
+msgstr "Wymuszony"
+
+#: src/olympusmn.cpp:535
+msgid "2nd Curtain"
+msgstr "Druga kurtyna"
+
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
+msgstr ""
+
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
+msgstr ""
+
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
+msgstr ""
+
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
+msgstr ""
+
+#: src/olympusmn.cpp:566
+msgid "7500K (Fine Weather with Shade)"
+msgstr "7500K (dobra pogoda w cieniu)"
+
+#: src/olympusmn.cpp:567
+msgid "6000K (Cloudy)"
+msgstr "6000K (pochmurno)"
+
+#: src/olympusmn.cpp:568
+msgid "5300K (Fine Weather)"
+msgstr "5300K (dobra pogoda)"
+
+#: src/olympusmn.cpp:569
+msgid "3000K (Tungsten light)"
+msgstr "3000K (żarówka wolframowa)"
+
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
+msgid "3600K (Tungsten light-like)"
+msgstr "3600K (żarowka wolframopodobna)"
+
+#: src/olympusmn.cpp:571
+msgid "6600K (Daylight fluorescent)"
+msgstr "6600K (światło dzienne lampy fluorescencyjnej)"
+
+#: src/olympusmn.cpp:572
+msgid "4500K (Neutral white fluorescent)"
+msgstr "4500K (neutralnie biała lampa fluorescencyjna)"
+
+#: src/olympusmn.cpp:573
+msgid "4000K (Cool white fluorescent)"
+msgstr "4000K (chłodnobiała lampa fluorescencyjna)"
+
+#: src/olympusmn.cpp:575
+msgid "Custom WB 1"
+msgstr "Własny balans bieli 1"
+
+#: src/olympusmn.cpp:576
+msgid "Custom WB 2"
+msgstr "Własny balans bieli 2"
+
+#: src/olympusmn.cpp:577
+msgid "Custom WB 3"
+msgstr "Własny balans bieli 3"
+
+#: src/olympusmn.cpp:578
+msgid "Custom WB 4"
+msgstr "Własny balans bieli 4"
+
+#: src/olympusmn.cpp:579
+msgid "Custom WB 5400K"
+msgstr "Własny balans bieli 5400K"
+
+#: src/olympusmn.cpp:580
+msgid "Custom WB 2900K"
+msgstr "Własny balans bieli 2900K"
+
+#: src/olympusmn.cpp:581
+msgid "Custom WB 8000K"
+msgstr "Własny balans bieli 8000K"
+
+#: src/olympusmn.cpp:587
+msgid "CM1 (Red Enhance)"
+msgstr "CM1 (rozszerzenie czerwieni)"
+
+#: src/olympusmn.cpp:588
+msgid "CM2 (Green Enhance)"
+msgstr "CM2 (rozszerzenie zieleni)"
+
+#: src/olympusmn.cpp:589
+msgid "CM3 (Blue Enhance)"
+msgstr "CM3 (rozszerzenie błękitu)"
+
+#: src/olympusmn.cpp:590
+msgid "CM4 (Skin Tones)"
+msgstr "CM4 (kolory skóry)"
+
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
+msgid "Pro Photo RGB"
+msgstr "Pro Photo RGB"
+
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
+msgid "Noise Filter"
+msgstr "Filtr szumu"
+
+#: src/olympusmn.cpp:604
+#, fuzzy
+msgid "Noise Filter (ISO Boost)"
+msgstr "Filtr szumów przy długiej ekspozycji"
+
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
+msgid "Muted"
+msgstr "Wyciszony"
+
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
+msgid "Monotone"
+msgstr "Jednotonowy"
+
+#: src/olympusmn.cpp:640
+msgid "SQ"
+msgstr "SQ"
+
+#: src/olympusmn.cpp:641
+msgid "HQ"
+msgstr "HQ"
+
+#: src/olympusmn.cpp:642
+msgid "SHQ"
+msgstr "SHQ"
+
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
+msgid "On, Mode 1"
+msgstr "Włączony, tryb 1"
+
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
+msgid "On, Mode 2"
+msgstr "Włączony, tryb 2"
+
+#: src/olympusmn.cpp:651
+#, fuzzy
+msgid "On, Mode 3"
+msgstr "Włączony, tryb 1"
+
+#: src/olympusmn.cpp:655
+msgid "Camera Settings Version"
+msgstr "Wersja ustawień aparatu"
+
+#: src/olympusmn.cpp:655
+msgid "Camera settings version"
+msgstr "Wersja ustawień aparatu"
+
+#: src/olympusmn.cpp:656
+msgid "PreviewImage Valid"
+msgstr "Obrazek podglądu prawidłowy"
+
+#: src/olympusmn.cpp:656
+msgid "Preview image valid"
+msgstr "Obrazek podglądu prawidłowy"
+
+#: src/olympusmn.cpp:657
+msgid "PreviewImage Start"
+msgstr "Początek obrazu podglądu"
+
+#: src/olympusmn.cpp:657
+msgid "Preview image start"
+msgstr "Początek obrazu podglądu"
+
+#: src/olympusmn.cpp:658
+msgid "PreviewImage Length"
+msgstr "Długość obrazu podglądu"
+
+#: src/olympusmn.cpp:658
+msgid "Preview image length"
+msgstr "Długość obrazu podglądu"
+
+#: src/olympusmn.cpp:660
+msgid "Auto exposure lock"
+msgstr "Blokada automatycznej ekspozycji"
+
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure Shift"
+msgstr "Czas ekspozycji"
+
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure shift"
+msgstr "Czas ekspozycji"
+
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus Process"
+msgstr "Tryb ogniskowania"
+
+#: src/olympusmn.cpp:665
+#, fuzzy
+msgid "Focus process"
+msgstr "Proces własny"
+
+#: src/olympusmn.cpp:666
+msgid "AF Search"
+msgstr ""
+
+#: src/olympusmn.cpp:666
+#, fuzzy
+msgid "AF search"
+msgstr "Użyto AF"
+
+#: src/olympusmn.cpp:667
+msgid "AF Areas"
+msgstr "Strefy AF"
+
+#: src/olympusmn.cpp:667
+msgid "AF areas"
+msgstr "Strefy autofokusa"
+
+#: src/olympusmn.cpp:668
+#, fuzzy
+msgid "AFPointSelected"
+msgstr "Wybrany punkt AF"
+
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF Fine Tune Adjust"
+msgstr "Dostrojenie AF"
+
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF fine tune adjust"
+msgstr "Dostrojenie AF"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash Remote Control"
+msgstr "Sterowanie podczerwienią"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash remote control"
+msgstr "Sterowanie podczerwienią"
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash Control Mode"
+msgstr "Tryb flesza"
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash control mode"
+msgstr "Tryb flesza"
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash Intensity"
+msgstr "Aktywność flesza"
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash intensity"
+msgstr "Aktywność flesza"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual Flash Strength"
+msgstr "Siła błysku"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual flash strength"
+msgstr "Ręczne sterowanie lampą"
+
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
+msgid "White Balance 2"
+msgstr "Balans bieli 2"
+
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
+msgid "White balance 2"
+msgstr "Balans bieli 2"
+
+#: src/olympusmn.cpp:677
+msgid "White Balance Temperature"
+msgstr "Temperatura balansu bieli"
+
+#: src/olympusmn.cpp:677
+msgid "White balance temperature"
+msgstr "Temperatura balansu bieli"
+
+#: src/olympusmn.cpp:679
+msgid "Custom Saturation"
+msgstr "Nasycenie własne"
+
+#: src/olympusmn.cpp:679
+msgid "Custom saturation"
+msgstr "Nasycenie własne"
+
+#: src/olympusmn.cpp:680
+msgid "Modified Saturation"
+msgstr "Nasycenie zmodyfikowane"
+
+#: src/olympusmn.cpp:680
+msgid "Modified saturation"
+msgstr "Nasycenie zmodyfikowane"
+
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
+msgid "Contrast Setting"
+msgstr "Ustawienie kontrastu"
+
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
+msgid "Sharpness Setting"
+msgstr "Ustawienie wyostrzenia"
+
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+msgid "Distortion Correction"
+msgstr "Korekcja dystorsji"
+
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+msgid "Distortion correction"
+msgstr "Korekcja dystorsji"
+
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+msgid "Shading Compensation"
+msgstr "Kompensacja cieni"
+
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+msgid "Shading compensation"
+msgstr "Kompensacja cieni"
+
+#: src/olympusmn.cpp:688
+msgid "Compression Factor"
+msgstr "Współczynnik kompresji"
+
+#: src/olympusmn.cpp:688
+msgid "Compression factor"
+msgstr "Współczynnik kompresji"
+
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
+msgid "Gradation"
+msgstr "Gradacja"
+
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
+msgid "Picture mode"
+msgstr "Styl obrazu"
+
+#: src/olympusmn.cpp:691
+msgid "Picture Mode Saturation"
+msgstr "Nasycenie stylu zdjęcia"
+
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
+msgid "Picture mode saturation"
+msgstr "Nasycenie stylu zdjęcia"
+
+#: src/olympusmn.cpp:692
+msgid "Picture Mode Hue"
+msgstr "Odcień stylu zdjęcia"
+
+#: src/olympusmn.cpp:692
+msgid "Picture mode hue"
+msgstr "Odcień stylu zdjęcia"
+
+#: src/olympusmn.cpp:693
+msgid "Picture Mode Contrast"
+msgstr "Kontrast stylu zdjęcia"
+
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
+msgid "Picture mode contrast"
+msgstr "Kontrast stylu zdjęcia"
+
+#: src/olympusmn.cpp:694
+msgid "Picture Mode Sharpness"
+msgstr "Ostrość stylu zdjęcia"
+
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
+msgid "Picture mode sharpness"
+msgstr "Ostrość stylu zdjęcia"
+
+#: src/olympusmn.cpp:695
+msgid "Picture Mode BW Filter"
+msgstr "Filtr cz-b stylu zdjęcia"
+
+#: src/olympusmn.cpp:695
+msgid "Picture mode BW filter"
+msgstr "Filtr cz-b stylu zdjęcia"
+
+#: src/olympusmn.cpp:696
+msgid "Picture Mode Tone"
+msgstr "Tonowanie stylu zdjęcia"
+
+#: src/olympusmn.cpp:696
+msgid "Picture mode tone"
+msgstr "Tonowanie stylu zdjęcia"
+
+#: src/olympusmn.cpp:697
+msgid "Noise filter"
+msgstr "Filtr szumu"
+
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art Filter"
+msgstr "Filtr"
+
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art filter"
+msgstr "Filtr kolorów"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic Filter"
+msgstr "Filtr cyfrowy"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic filter"
+msgstr "Filtr cyfrowy"
+
+#: src/olympusmn.cpp:701
+msgid "Panorama Mode"
+msgstr "Tryb panoramy"
+
+#: src/olympusmn.cpp:701
+msgid "Panorama mode"
+msgstr "Tryb panoramy"
+
+#: src/olympusmn.cpp:702
+msgid "Image Quality 2"
+msgstr "Jakość obrazu 2"
+
+#: src/olympusmn.cpp:702
+msgid "Image quality 2"
+msgstr "Jakość obrazu 2"
+
+#: src/olympusmn.cpp:704
+msgid "Manometer Pressure"
+msgstr "Ciśnienie manometru"
+
+#: src/olympusmn.cpp:704
+msgid "Manometer pressure"
+msgstr "Ciśnienie manometru"
+
+#: src/olympusmn.cpp:705
+msgid "Manometer Reading"
+msgstr "Odczyt manometru"
+
+#: src/olympusmn.cpp:705
+msgid "Manometer reading"
+msgstr "Odczyt manometru"
+
+#: src/olympusmn.cpp:706
+msgid "Extended WB Detect"
+msgstr "Rozszerzona detekcja balansu bieli"
+
+#: src/olympusmn.cpp:706
+msgid "Extended WB detect"
+msgstr "Rozszerzona detekcja balansu bieli"
+
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
+msgstr ""
+
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:710
+msgid "Unknown OlympusCs tag"
+msgstr "Nieznany znacznik OlympusCs"
+
+#: src/olympusmn.cpp:721
+msgid "Simple E-System"
+msgstr "Prosty system E"
+
+#: src/olympusmn.cpp:722
+msgid "E-System"
+msgstr "System E"
+
+#: src/olympusmn.cpp:739
+msgid "Equipment Version"
+msgstr "Wersja wyposażenia"
+
+#: src/olympusmn.cpp:739
+msgid "Equipment version"
+msgstr "Wersja wyposażenia"
+
+#: src/olympusmn.cpp:741
+msgid "Serial number"
+msgstr "Numer seryjny"
+
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+msgid "Lens Serial Number"
+msgstr "Numer seryjny obiektywu"
+
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+msgid "Lens serial number"
+msgstr "Numer seryjny obiektywu"
+
+#: src/olympusmn.cpp:747 src/properties.cpp:374
+msgid "Lens Model"
+msgstr "Model obiektywu"
+
+#: src/olympusmn.cpp:747
+#, fuzzy
+msgid "Lens model"
+msgstr "Model obiektywu"
+
+#: src/olympusmn.cpp:748
+msgid "Lens Firmware Version"
+msgstr "Wersja firmware obiektywu"
+
+#: src/olympusmn.cpp:748
+msgid "Lens firmware version"
+msgstr "Wersja firmware obiektywu"
+
+#: src/olympusmn.cpp:753
+msgid "Max Aperture At Current Focal"
+msgstr "Maksymalna apertura przy bieżącej ogniskowej"
+
+#: src/olympusmn.cpp:753
+msgid "Max aperture at current focal"
+msgstr "Maksymalna apertura przy bieżącej ogniskowej"
+
+#: src/olympusmn.cpp:754
+msgid "Lens Properties"
+msgstr "Właściwości obiektywu"
+
+#: src/olympusmn.cpp:754
+msgid "Lens properties"
+msgstr "Właściwości obiektywu"
+
+#: src/olympusmn.cpp:755
+msgid "Extender"
+msgstr "Ekstender"
+
+#: src/olympusmn.cpp:756
+msgid "Extender Serial Number"
+msgstr "Numer seryjny ekstendera"
+
+#: src/olympusmn.cpp:756
+msgid "Extender serial number"
+msgstr "Numer seryjny ekstendera"
+
+#: src/olympusmn.cpp:757
+msgid "Extender Model"
+msgstr "Model ekstendera"
+
+#: src/olympusmn.cpp:757
+msgid "Extender model"
+msgstr "Model ekstendera"
+
+#: src/olympusmn.cpp:758
+msgid "Extender Firmware Version"
+msgstr "Wersja firmware ekstendera"
+
+#: src/olympusmn.cpp:758
+msgid "Extender firmwareversion"
+msgstr "Wersja firmware ekstendera"
+
+#: src/olympusmn.cpp:760 src/properties.cpp:370
+msgid "Flash Model"
+msgstr "Model flesza"
+
+#: src/olympusmn.cpp:760
+msgid "Flash model"
+msgstr "Model flesza"
+
+#: src/olympusmn.cpp:761
+msgid "Flash Firmware Version"
+msgstr "Wersja firmware flesza"
+
+#: src/olympusmn.cpp:761
+msgid "Flash firmware version"
+msgstr "Wersja firmware flesza"
+
+#: src/olympusmn.cpp:762
+msgid "FlashSerialNumber"
+msgstr "Numer seryjny flesza"
+
+#: src/olympusmn.cpp:764
+msgid "Unknown OlympusEq tag"
+msgstr "Nieznany znacznik OlympusEq"
+
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
+#, fuzzy
+msgid "High Speed"
+msgstr "Duża szybkość"
+
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
+#, fuzzy
+msgid "High Function"
+msgstr "Funkcja koloru"
+
+#: src/olympusmn.cpp:783
+#, fuzzy
+msgid "Advanced High Speed"
+msgstr "Duża szybkość"
+
+#: src/olympusmn.cpp:784
+#, fuzzy
+msgid "Advanced High Function"
+msgstr "Funkcja koloru"
+
+#: src/olympusmn.cpp:789
+msgid "Original"
+msgstr "Oryginał"
+
+#: src/olympusmn.cpp:790
+msgid "Edited (Landscape)"
+msgstr "Edytowany (krajobraz)"
+
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
+msgid "Edited (Portrait)"
+msgstr "Edytowany (portret)"
+
+#: src/olympusmn.cpp:797
+msgid "WB Color Temp"
+msgstr "Temperatura koloru balansu bieli"
+
+#: src/olympusmn.cpp:798
+msgid "WB Gray Point"
+msgstr "Szary punktu balansu bieli"
+
+#: src/olympusmn.cpp:808
+#, fuzzy
+msgid "Raw Development Version"
+msgstr "Wersja informacji Raw"
+
+#: src/olympusmn.cpp:808
+#, fuzzy
+msgid "Raw development version"
+msgstr "Wersja informacji Raw"
+
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
+msgid "Exposure Bias Value"
+msgstr "Korekta ekspozycji"
+
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
+#, fuzzy
+msgid "Exposure bias value"
+msgstr "Korekta ekspozycji (APEX)"
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+msgid "White Balance Value"
+msgstr "Wartość balansu bieli"
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+msgid "White balance value"
+msgstr "Wartość balansu bieli"
+
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
+msgid "WB Fine Adjustment"
+msgstr "Poprawka balansu bieli"
+
+#: src/olympusmn.cpp:811
+msgid "WB fine adjustment"
+msgstr "Poprawka balansu bieli"
+
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
+msgid "Gray Point"
+msgstr "Punkt szarości"
+
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
+msgid "Gray point"
+msgstr "Punkt szarości"
+
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+msgid "Saturation Emphasis"
+msgstr "Wzmocnienie nasycenia"
+
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+msgid "Saturation emphasis"
+msgstr "Wzmocnienie nasycenia"
+
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
+msgid "Memory Color Emphasis"
+msgstr "Moje kolory"
+
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+msgid "Memory color emphasis"
+msgstr ""
+
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+msgid "Contrast Value"
+msgstr "Kontrast"
+
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+msgid "Contrast value"
+msgstr "Kontrast"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+msgid "Sharpness Value"
+msgstr "Ostrość"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+msgid "Sharpness value"
+msgstr "Kontrast"
+
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
+msgid "Engine"
+msgstr "Silnik"
+
+#: src/olympusmn.cpp:820
+msgid "Edit status"
+msgstr "Stan edycji"
+
+#: src/olympusmn.cpp:821
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: src/olympusmn.cpp:823
+msgid "Unknown OlympusRd tag"
+msgstr "Nieznany znacznik OlympusRd"
+
+#: src/olympusmn.cpp:878
+#, fuzzy
+msgid "Raw Development 2 Version"
+msgstr "Wersja informacji Raw"
+
+#: src/olympusmn.cpp:878
+#, fuzzy
+msgid "Raw development 2 version"
+msgstr "Wersja informacji Raw"
+
+#: src/olympusmn.cpp:882
+msgid "White balance fine adjustment"
+msgstr "Poprawka balansu bieli"
+
+#: src/olympusmn.cpp:892
+msgid "PM Saturation"
+msgstr "PM Nasycenie"
+
+#: src/olympusmn.cpp:893
+msgid "PM Contrast"
+msgstr "PM Kontrast"
+
+#: src/olympusmn.cpp:894
+msgid "PM Sharpness"
+msgstr "PM Ostrość"
+
+#: src/olympusmn.cpp:895
+msgid "PM BW Filter"
+msgstr "PM Filtr czarno-biały"
+
+#: src/olympusmn.cpp:895
+msgid "PM BW filter"
+msgstr "PM Filtr czarno-biały"
+
+#: src/olympusmn.cpp:896
+msgid "PM Picture Tone"
+msgstr "PM Tonowanie"
+
+#: src/olympusmn.cpp:896
+msgid "PM picture tone"
+msgstr "PM Tonowanie"
+
+#: src/olympusmn.cpp:899
+msgid "Auto Gradation"
+msgstr "Automatyczna gradacja"
+
+#: src/olympusmn.cpp:899
+msgid "Auto gradation"
+msgstr "Automatyczna gradacja"
+
+#: src/olympusmn.cpp:900
+msgid "PM Noise Filter"
+msgstr "PM Filtr szumu"
+
+#: src/olympusmn.cpp:900
+msgid "Picture mode noise filter"
+msgstr "Filtr szumów stylu zdjęcia"
+
+#: src/olympusmn.cpp:902
+msgid "Unknown OlympusRd2 tag"
+msgstr "Nieznany znacznik Olympus Rd2"
+
+#: src/olympusmn.cpp:913
+#, fuzzy
+msgid "On (2 frames)"
+msgstr "Włączony (predefiniowany)"
+
+#: src/olympusmn.cpp:914
+#, fuzzy
+msgid "On (3 frames)"
+msgstr "Włączony (predefiniowany)"
+
+#: src/olympusmn.cpp:919
+msgid "4:3"
+msgstr ""
+
+#: src/olympusmn.cpp:920
+#, fuzzy
+msgid "3:2"
+msgstr "320"
+
+#: src/olympusmn.cpp:921
+msgid "16:9"
+msgstr ""
+
+#: src/olympusmn.cpp:922
+msgid "6:6"
+msgstr ""
+
+#: src/olympusmn.cpp:923
+msgid "5:4"
+msgstr ""
+
+#: src/olympusmn.cpp:924
+msgid "7:6"
+msgstr ""
+
+#: src/olympusmn.cpp:925
+#, fuzzy
+msgid "6:5"
+msgstr "D65"
+
+#: src/olympusmn.cpp:926
+#, fuzzy
+msgid "7:5"
+msgstr "D75"
+
+#: src/olympusmn.cpp:927
+msgid "3:4"
+msgstr ""
+
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image Processing Version"
+msgstr "Przetwarzanie obrazu"
+
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image processing version"
+msgstr "Przetwarzanie obrazu"
+
+#: src/olympusmn.cpp:933
+#, fuzzy
+msgid "WB RB Levels 3000K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:933
+#, fuzzy
+msgid "WB RB levels 3000K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:934
+#, fuzzy
+msgid "WB RB Levels 3300K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:934
+#, fuzzy
+msgid "WB RB levels 3300K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:935
+#, fuzzy
+msgid "WB RB Levels 3600K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:935
+#, fuzzy
+msgid "WB RB levels 3600K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:936
+#, fuzzy
+msgid "WB RB Levels 3900K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:936
+#, fuzzy
+msgid "WB RB levels 3900K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:937
+#, fuzzy
+msgid "WB RB Levels 4000K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:937
+#, fuzzy
+msgid "WB RB levels 4000K"
+msgstr "Poziomy balansu bieli RB"
+
+#: src/olympusmn.cpp:938
+#, fuzzy
+msgid "WB RB Levels 4300K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:682
-msgid "Internal serial number"
-msgstr "Wewnętrzny numer seryjny"
+#: src/olympusmn.cpp:938
+#, fuzzy
+msgid "WB RB levels 4300K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-msgid "Body Firmware Version"
-msgstr "Wersja firmware korpusu"
+#: src/olympusmn.cpp:939
+#, fuzzy
+msgid "WB RB Levels 4500K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-msgid "Body firmware version"
-msgstr "Wersja firmware korpusu"
+#: src/olympusmn.cpp:939
+#, fuzzy
+msgid "WB RB levels 4500K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
-msgid "Lens Serial Number"
-msgstr "Numer seryjny obiektywu"
+#: src/olympusmn.cpp:940
+#, fuzzy
+msgid "WB RB Levels 4800K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
-msgid "Lens serial number"
-msgstr "Numer seryjny obiektywu"
+#: src/olympusmn.cpp:940
+#, fuzzy
+msgid "WB RB levels 4800K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:687
-msgid "Lens Firmware Version"
-msgstr "Wersja firmware obiektywu"
+#: src/olympusmn.cpp:941
+#, fuzzy
+msgid "WB RB Levels 5300K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:687
-msgid "Lens firmware version"
-msgstr "Wersja firmware obiektywu"
+#: src/olympusmn.cpp:941
+#, fuzzy
+msgid "WB RB levels 5300K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:692
-msgid "Max Aperture At Current Focal"
-msgstr "Maksymalna apertura przy bieżącej ogniskowej"
+#: src/olympusmn.cpp:942
+#, fuzzy
+msgid "WB RB Levels 6000K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:692
-msgid "Max aperture at current focal"
-msgstr "Maksymalna apertura przy bieżącej ogniskowej"
+#: src/olympusmn.cpp:942
+#, fuzzy
+msgid "WB RB levels 6000K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:693
-msgid "Lens Properties"
-msgstr "Właściwości obiektywu"
+#: src/olympusmn.cpp:943
+#, fuzzy
+msgid "WB RB Levels 6600K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:693
-msgid "Lens properties"
-msgstr "Właściwości obiektywu"
+#: src/olympusmn.cpp:943
+#, fuzzy
+msgid "WB RB levels 6600K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:694
-msgid "Extender"
-msgstr "Ekstender"
+#: src/olympusmn.cpp:944
+#, fuzzy
+msgid "WB RB Levels 7500K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:695
-msgid "Extender Serial Number"
-msgstr "Numer seryjny ekstendera"
+#: src/olympusmn.cpp:944
+#, fuzzy
+msgid "WB RB levels 7500K"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:695
-msgid "Extender serial number"
-msgstr "Numer seryjny ekstendera"
+#: src/olympusmn.cpp:945
+#, fuzzy
+msgid "WB RB Levels CWB1"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:696
-msgid "Extender Model"
-msgstr "Model ekstendera"
+#: src/olympusmn.cpp:945
+#, fuzzy
+msgid "WB RB levels CWB1"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:696
-msgid "Extender model"
-msgstr "Model ekstendera"
+#: src/olympusmn.cpp:946
+#, fuzzy
+msgid "WB RB Levels CWB2"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:697
-msgid "Extender Firmware Version"
-msgstr "Wersja firmware ekstendera"
+#: src/olympusmn.cpp:946
+#, fuzzy
+msgid "WB RB levels CWB2"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:697
-msgid "Extender firmwareversion"
-msgstr "Wersja firmware ekstendera"
+#: src/olympusmn.cpp:947
+#, fuzzy
+msgid "WB RB Levels CWB3"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:698
-msgid "Flash Type"
-msgstr "Rodzaj flesza"
+#: src/olympusmn.cpp:947
+#, fuzzy
+msgid "WB RB levels CWB3"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:698
-msgid "Flash type"
-msgstr "Rodzaj flesza"
+#: src/olympusmn.cpp:948
+#, fuzzy
+msgid "WB RB Levels CWB4"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:699 src/properties.cpp:354
-msgid "Flash Model"
-msgstr "Model flesza"
+#: src/olympusmn.cpp:948
+#, fuzzy
+msgid "WB RB levels CWB4"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:699
-msgid "Flash model"
-msgstr "Model flesza"
+#: src/olympusmn.cpp:949
+#, fuzzy
+msgid "WB G Level 3000K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:700
-msgid "Flash Firmware Version"
-msgstr "Wersja firmware flesza"
+#: src/olympusmn.cpp:949
+#, fuzzy
+msgid "WB G level 3000K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:700
-msgid "Flash firmware version"
-msgstr "Wersja firmware flesza"
+#: src/olympusmn.cpp:950
+#, fuzzy
+msgid "WB G Level 3300K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:701
-msgid "FlashSerialNumber"
-msgstr "Numer seryjny flesza"
+#: src/olympusmn.cpp:950
+#, fuzzy
+msgid "WB G level 3300K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:703
-msgid "Unknown OlympusEq tag"
-msgstr "Nieznany znacznik OlympusEq"
+#: src/olympusmn.cpp:951
+#, fuzzy
+msgid "WB G Level 3600K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
+#: src/olympusmn.cpp:951
 #, fuzzy
-msgid "High Speed"
-msgstr "Duża szybkość"
+msgid "WB G level 3600K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
+#: src/olympusmn.cpp:952
 #, fuzzy
-msgid "High Function"
-msgstr "Funkcja koloru"
+msgid "WB G Level 3900K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:722
-msgid "Advanced High Speed"
-msgstr ""
+#: src/olympusmn.cpp:952
+#, fuzzy
+msgid "WB G level 3900K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:723
-msgid "Advanced High Function"
-msgstr ""
+#: src/olympusmn.cpp:953
+#, fuzzy
+msgid "WB G Level 4000K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:728
-msgid "Original"
-msgstr "Oryginał"
+#: src/olympusmn.cpp:953
+#, fuzzy
+msgid "WB G level 4000K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:729
-msgid "Edited (Landscape)"
-msgstr "Edytowany (krajobraz)"
+#: src/olympusmn.cpp:954
+#, fuzzy
+msgid "WB G Level 4300K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
-msgid "Edited (Portrait)"
-msgstr "Edytowany (portret)"
+#: src/olympusmn.cpp:954
+#, fuzzy
+msgid "WB G level 4300K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:736
-msgid "WB Color Temp"
-msgstr "Temperatura koloru balansu bieli"
+#: src/olympusmn.cpp:955
+#, fuzzy
+msgid "WB G Level 4500K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:737
-msgid "WB Gray Point"
-msgstr "Szary punktu balansu bieli"
+#: src/olympusmn.cpp:955
+#, fuzzy
+msgid "WB G level 4500K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:747
-msgid "Raw Development Version"
-msgstr ""
+#: src/olympusmn.cpp:956
+#, fuzzy
+msgid "WB G Level 4800K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:747
-msgid "Raw development version"
-msgstr ""
+#: src/olympusmn.cpp:956
+#, fuzzy
+msgid "WB G level 4800K"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
-msgid "Exposure Bias Value"
-msgstr "Korekta ekspozycji"
+#: src/olympusmn.cpp:957
+#, fuzzy
+msgid "WB G Level 5300K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:957
+#, fuzzy
+msgid "WB G level 5300K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:958
+#, fuzzy
+msgid "WB G Level 6000K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:958
+#, fuzzy
+msgid "WB G level 6000K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:959
+#, fuzzy
+msgid "WB G Level 6600K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:959
+#, fuzzy
+msgid "WB G level 6600K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:960
+#, fuzzy
+msgid "WB G Level 7500K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:960
+#, fuzzy
+msgid "WB G level 7500K"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:961
+#, fuzzy
+msgid "WB G Level"
+msgstr "Poziomy balansu bieli RBGG"
+
+#: src/olympusmn.cpp:961
+#, fuzzy
+msgid "WB G level"
+msgstr "Poziomy balansu bieli RBGG"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
+#: src/olympusmn.cpp:963
 #, fuzzy
-msgid "Exposure bias value"
-msgstr "Korekta ekspozycji (APEX)"
+msgid "Enhancer"
+msgstr "Programista"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
-msgid "White Balance Value"
-msgstr "Wartość balansu bieli"
+#: src/olympusmn.cpp:964
+#, fuzzy
+msgid "Enhancer Values"
+msgstr "Ostrość"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
-msgid "White balance value"
-msgstr "Wartość balansu bieli"
+#: src/olympusmn.cpp:964
+#, fuzzy
+msgid "Enhancer values"
+msgstr "Kontrast"
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
-msgid "WB Fine Adjustment"
-msgstr "Poprawka balansu bieli"
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
+msgid "Coring Filter"
+msgstr "Filtr kolorów"
 
-#: src/olympusmn.cpp:750
-msgid "WB fine adjustment"
-msgstr "Poprawka balansu bieli"
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring Values"
+msgstr "Kontrast"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
-msgid "Gray Point"
-msgstr "Punkt szarości"
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring values"
+msgstr "Kontrast"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
-msgid "Gray point"
-msgstr "Punkt szarości"
+#: src/olympusmn.cpp:967 src/tags.cpp:913
+msgid "Black Level"
+msgstr "Poziom czerni"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
-msgid "Saturation Emphasis"
-msgstr "Wzmocnienie nasycenia"
+#: src/olympusmn.cpp:968
+msgid "Gain Base"
+msgstr "Podstawa wzmocnienia"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
-msgid "Saturation emphasis"
-msgstr "Wzmocnienie nasycenia"
+#: src/olympusmn.cpp:968
+msgid "Gain base"
+msgstr "Automatyczna gradacja"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory Color Emphasis"
+#: src/olympusmn.cpp:969
+msgid "Valid Bits"
 msgstr ""
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory color emphasis"
-msgstr ""
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
+msgid "Crop Left"
+msgstr "Przycięcie lewo"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
-msgid "Contrast Value"
-msgstr "Kontrast"
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
+msgid "Crop left"
+msgstr "Przycięcie lewo"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
-msgid "Contrast value"
-msgstr "Kontrast"
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
+msgid "Crop Top"
+msgstr "Przycięcie góra"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
-msgid "Sharpness Value"
-msgstr "Ostrość"
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
+msgid "Crop top"
+msgstr "Przycięcie góra"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
-msgid "Sharpness value"
-msgstr "Kontrast"
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
+msgid "Crop Width"
+msgstr "Przycięcie szerokość"
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
-msgid "Engine"
-msgstr "Silnik"
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
+msgid "Crop width"
+msgstr "Przycięcie szerokość"
 
-#: src/olympusmn.cpp:759
-msgid "Edit status"
-msgstr "Stan edycji"
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
+msgid "Crop Height"
+msgstr "Przycięcie wysokość"
 
-#: src/olympusmn.cpp:760
-msgid "Settings"
-msgstr "Ustawienia"
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
+msgid "Crop height"
+msgstr "Przycięcie wysokość"
 
-#: src/olympusmn.cpp:762
-msgid "Unknown OlympusRd tag"
-msgstr "Nieznany znacznik OlympusRd"
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple Exposure Mode"
+msgstr "Tryb ekspozycji"
 
-#: src/olympusmn.cpp:817
-msgid "Raw Development 2 Version"
-msgstr ""
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple exposure mode"
+msgstr "Wielokrotna ekspozycja"
 
-#: src/olympusmn.cpp:817
-msgid "Raw development 2 version"
-msgstr ""
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+#, fuzzy
+msgid "Aspect Ratio"
+msgstr "Proporcje pikseli wideo"
 
-#: src/olympusmn.cpp:821
-msgid "White balance fine adjustment"
-msgstr "Poprawka balansu bieli"
+#: src/olympusmn.cpp:978
+#, fuzzy
+msgid "Aspect ratio"
+msgstr "Proporcje pikseli wideo"
 
-#: src/olympusmn.cpp:831
-msgid "PM Saturation"
-msgstr "PM Nasycenie"
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect Frame"
+msgstr "Proporcje pikseli wideo"
 
-#: src/olympusmn.cpp:832
-msgid "PM Contrast"
-msgstr "PM Kontrast"
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect frame"
+msgstr "Proporcje pikseli wideo"
 
-#: src/olympusmn.cpp:833
-msgid "PM Sharpness"
-msgstr "PM Ostrość"
+#: src/olympusmn.cpp:980
+msgid "Face Detect"
+msgstr "Wykrywanie twarzy"
 
-#: src/olympusmn.cpp:834
-msgid "PM BW Filter"
-msgstr "PM Filtr czarno-biały"
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+msgid "Face detect"
+msgstr "Wykrywanie twarzy"
 
-#: src/olympusmn.cpp:834
-msgid "PM BW filter"
-msgstr "PM Filtr czarno-biały"
+#: src/olympusmn.cpp:981
+msgid "Face Detect Area"
+msgstr "Obszar wykrywania twarzy"
 
-#: src/olympusmn.cpp:835
-msgid "PM Picture Tone"
-msgstr "PM Tonowanie"
+#: src/olympusmn.cpp:981
+msgid "Face detect area"
+msgstr "Obszar wykrywania twarzy"
 
-#: src/olympusmn.cpp:835
-msgid "PM picture tone"
-msgstr "PM Tonowanie"
+#: src/olympusmn.cpp:983
+msgid "Unknown OlympusIp tag"
+msgstr "Nieznany znacznik OlympusIp"
 
-#: src/olympusmn.cpp:838
-msgid "Auto Gradation"
-msgstr "Automatyczna gradacja"
+#: src/olympusmn.cpp:993
+#, fuzzy
+msgid "Bounce or Off"
+msgstr "Odbicie lub nie"
 
-#: src/olympusmn.cpp:838
-msgid "Auto gradation"
-msgstr "Automatyczna gradacja"
+#: src/olympusmn.cpp:994
+msgid "Direct"
+msgstr "Bezpośredni"
 
-#: src/olympusmn.cpp:839
-msgid "PM Noise Filter"
-msgstr "PM Filtr szumu"
+#: src/olympusmn.cpp:998
+msgid "Focus Info Version"
+msgstr "Wersja informacji focusa"
 
-#: src/olympusmn.cpp:839
-msgid "Picture mode noise filter"
-msgstr "Filtr szumów stylu zdjęcia"
+#: src/olympusmn.cpp:998
+msgid "Focus info version"
+msgstr "Wersja informacji o ostrzeniu (fokusie)"
 
-#: src/olympusmn.cpp:841
-msgid "Unknown OlympusRd2 tag"
-msgstr "Nieznany znacznik Olympus Rd2"
+#: src/olympusmn.cpp:999
+msgid "Auto Focus"
+msgstr "Automatyczne ostrzenie"
 
-#: src/olympusmn.cpp:850
-msgid "Image Processing Version"
-msgstr ""
+#: src/olympusmn.cpp:1000
+msgid "Scene Detect"
+msgstr "Wykrywanie sceny"
 
-#: src/olympusmn.cpp:850
-msgid "Image processing version"
-msgstr ""
+#: src/olympusmn.cpp:1000
+msgid "Scene detect"
+msgstr "Wykrywanie sceny"
 
-#: src/olympusmn.cpp:852
-msgid "WB RB Levels 3000K"
-msgstr ""
+#: src/olympusmn.cpp:1001
+msgid "Scene Area"
+msgstr "Obszar sceny"
 
-#: src/olympusmn.cpp:852
-msgid "WB RB levels 3000K"
-msgstr ""
+#: src/olympusmn.cpp:1001
+msgid "Scene area"
+msgstr "Obszar sceny"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB Levels 3300K"
-msgstr ""
+#: src/olympusmn.cpp:1002
+msgid "Scene Detect Data"
+msgstr "Dane wykrywania sceny"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB levels 3300K"
-msgstr ""
+#: src/olympusmn.cpp:1002
+msgid "Scene detect data"
+msgstr "Dane wykrywania sceny"
 
-#: src/olympusmn.cpp:854
-msgid "WB RB Levels 3600K"
-msgstr ""
+#: src/olympusmn.cpp:1003
+msgid "Zoom Step Count"
+msgstr "Liczba kroków powiększania"
 
-#: src/olympusmn.cpp:854
-msgid "WB RB levels 3600K"
-msgstr ""
+#: src/olympusmn.cpp:1004
+msgid "Focus Step Count"
+msgstr "Liczba kroków ostrzenia"
 
-#: src/olympusmn.cpp:855
-msgid "WB RB Levels 3900K"
-msgstr ""
+#: src/olympusmn.cpp:1004
+msgid "Focus step count"
+msgstr "Liczba kroków ostrzenia"
 
-#: src/olympusmn.cpp:855
-msgid "WB RB levels 3900K"
-msgstr ""
+#: src/olympusmn.cpp:1005
+#, fuzzy
+msgid "Focus Step Infinity"
+msgstr "Krok ostrzenia - nieskończoność"
 
-#: src/olympusmn.cpp:856
-msgid "WB RB Levels 4000K"
-msgstr ""
+#: src/olympusmn.cpp:1005
+#, fuzzy
+msgid "Focus step infinity"
+msgstr "Krok ostrzenia - nieskończoność"
 
-#: src/olympusmn.cpp:856
-msgid "WB RB levels 4000K"
-msgstr ""
+#: src/olympusmn.cpp:1006
+#, fuzzy
+msgid "Focus Step Near"
+msgstr "Krok ostrzenia - blisko"
 
-#: src/olympusmn.cpp:857
-msgid "WB RB Levels 4300K"
-msgstr ""
+#: src/olympusmn.cpp:1006
+#, fuzzy
+msgid "Focus step near"
+msgstr "Krok ostrzenia - blisko"
 
-#: src/olympusmn.cpp:857
-msgid "WB RB levels 4300K"
-msgstr ""
+#: src/olympusmn.cpp:1009
+msgid "External Flash"
+msgstr "Zewnętrzny flesz"
 
-#: src/olympusmn.cpp:858
-msgid "WB RB Levels 4500K"
-msgstr ""
+#: src/olympusmn.cpp:1010
+msgid "External Flash Guide Number"
+msgstr "Liczba przewodnia zewnętrznego flesza"
 
-#: src/olympusmn.cpp:858
-msgid "WB RB levels 4500K"
-msgstr ""
+#: src/olympusmn.cpp:1010
+msgid "External flash guide number"
+msgstr "Liczba przewodnia zewnętrznego flesza"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB Levels 4800K"
-msgstr ""
+#: src/olympusmn.cpp:1014
+msgid "Manual Flash"
+msgstr "Flesz ręczny"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB levels 4800K"
-msgstr ""
+#: src/olympusmn.cpp:1014
+msgid "Manual flash"
+msgstr "Flesz ręczny"
 
-#: src/olympusmn.cpp:860
-msgid "WB RB Levels 5300K"
-msgstr ""
+#: src/olympusmn.cpp:1018
+msgid "Unknown OlympusFi tag"
+msgstr "Nieznany znacznik OlympusFi"
 
-#: src/olympusmn.cpp:860
-msgid "WB RB levels 5300K"
-msgstr ""
+#: src/olympusmn.cpp:1029
+msgid "Unknown OlympusFe tag"
+msgstr "Nieznany znacznik OlympusFe"
 
-#: src/olympusmn.cpp:861
-msgid "WB RB Levels 6000K"
-msgstr ""
+#: src/olympusmn.cpp:1042
+msgid "Fine Weather"
+msgstr "Dobra pogoda"
 
-#: src/olympusmn.cpp:861
-msgid "WB RB levels 6000K"
-msgstr ""
+#: src/olympusmn.cpp:1043
+#, fuzzy
+msgid "Tungsten (incandescent)"
+msgstr "Żarówka wolframowa"
 
-#: src/olympusmn.cpp:862
-msgid "WB RB Levels 6600K"
-msgstr ""
+#: src/olympusmn.cpp:1044
+msgid "Evening Sunlight"
+msgstr "Wieczorne światło słońca"
 
-#: src/olympusmn.cpp:862
-msgid "WB RB levels 6600K"
-msgstr ""
+#: src/olympusmn.cpp:1045
+#, fuzzy
+msgid "Daylight Fluorescent (D 5700 - 7100K)"
+msgstr "Lampy fluorescencyjna, światło dzienne (D 5700 - 7100K)"
 
-#: src/olympusmn.cpp:863
-msgid "WB RB Levels 7500K"
-msgstr ""
+#: src/olympusmn.cpp:1046
+#, fuzzy
+msgid "Day White Fluorescent (N 4600 - 5400K)"
+msgstr "Lampa fluorescencyjna, biel dnia (N 4600 - 5400K)"
 
-#: src/olympusmn.cpp:863
-msgid "WB RB levels 7500K"
-msgstr ""
+#: src/olympusmn.cpp:1047
+#, fuzzy
+msgid "Cool White Fluorescent (W 3900 - 4500K)"
+msgstr "Lampa fluorescencyjna chłodnobiała (W 3900 - 4500K)"
 
-#: src/olympusmn.cpp:864
-msgid "WB RB Levels CWB1"
-msgstr ""
+#: src/olympusmn.cpp:1048
+#, fuzzy
+msgid "White Fluorescent (WW 3200 - 3700K)"
+msgstr "Lampa fluorescencyjna biała (WW 3200 - 3700K)"
 
-#: src/olympusmn.cpp:864
-msgid "WB RB levels CWB1"
-msgstr ""
+#: src/olympusmn.cpp:1049
+#, fuzzy
+msgid "One Touch White Balance"
+msgstr "Automatyczna korekcja balansu bieli"
 
-#: src/olympusmn.cpp:865
-msgid "WB RB Levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:1050
+msgid "Custom 1-4"
+msgstr "Użytkownika 1-4"
 
-#: src/olympusmn.cpp:865
-msgid "WB RB levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:1054
+msgid "Raw Info Version"
+msgstr "Wersja informacji Raw"
 
-#: src/olympusmn.cpp:866
-msgid "WB RB Levels CWB3"
-msgstr ""
+#: src/olympusmn.cpp:1054
+msgid "Raw info version"
+msgstr "Wersja informacji Raw"
 
-#: src/olympusmn.cpp:866
-msgid "WB RB levels CWB3"
-msgstr ""
+#: src/olympusmn.cpp:1055
+#, fuzzy
+msgid "WB_RB Levels Used"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:867
-msgid "WB RB Levels CWB4"
-msgstr ""
+#: src/olympusmn.cpp:1055
+#, fuzzy
+msgid "WB_RB levels used"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:867
-msgid "WB RB levels CWB4"
-msgstr ""
+#: src/olympusmn.cpp:1056
+#, fuzzy
+msgid "WB_RB Levels Auto"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:868
-msgid "WB G Level 3000K"
-msgstr ""
+#: src/olympusmn.cpp:1056
+#, fuzzy
+msgid "WB_RB levels auto"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:868
-msgid "WB G level 3000K"
-msgstr ""
+#: src/olympusmn.cpp:1057
+#, fuzzy
+msgid "WB_RB Levels Shade"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:869
-msgid "WB G Level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:1057
+#, fuzzy
+msgid "WB_RB levels shade"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:869
-msgid "WB G level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:1058
+#, fuzzy
+msgid "WB_RB Levels Cloudy"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:870
-msgid "WB G Level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:1058
+#, fuzzy
+msgid "WB_RB levels cloudy"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:870
-msgid "WB G level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:1059
+#, fuzzy
+msgid "WB_RB Levels Fine Weather"
+msgstr "Dobra pogoda"
 
-#: src/olympusmn.cpp:871
-msgid "WB G Level 3900K"
+#: src/olympusmn.cpp:1059
+msgid "WB_RB levels fine weather"
 msgstr ""
 
-#: src/olympusmn.cpp:871
-msgid "WB G level 3900K"
-msgstr ""
+#: src/olympusmn.cpp:1060
+#, fuzzy
+msgid "WB_RB Levels Tungsten"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:872
-msgid "WB G Level 4000K"
-msgstr ""
+#: src/olympusmn.cpp:1060
+#, fuzzy
+msgid "WB_RB levels tungsten"
+msgstr "Poziomy balansu bieli RB"
 
-#: src/olympusmn.cpp:872
-msgid "WB G level 4000K"
-msgstr ""
+#: src/olympusmn.cpp:1061
+#, fuzzy
+msgid "WB_RB Levels Evening Sunlight"
+msgstr "Wieczorne światło słońca"
 
-#: src/olympusmn.cpp:873
-msgid "WB G Level 4300K"
-msgstr ""
+#: src/olympusmn.cpp:1061
+#, fuzzy
+msgid "WB_RB levels evening sunlight"
+msgstr "Wieczorne światło słońca"
 
-#: src/olympusmn.cpp:873
-msgid "WB G level 4300K"
+#: src/olympusmn.cpp:1062
+msgid "WB_RB Levels Daylight Fluor"
 msgstr ""
 
-#: src/olympusmn.cpp:874
-msgid "WB G Level 4500K"
+#: src/olympusmn.cpp:1062
+msgid "WB_RB levels daylight fluor"
 msgstr ""
 
-#: src/olympusmn.cpp:874
-msgid "WB G level 4500K"
+#: src/olympusmn.cpp:1063
+msgid "WB_RB Levels Day White Fluor"
 msgstr ""
 
-#: src/olympusmn.cpp:875
-msgid "WB G Level 4800K"
+#: src/olympusmn.cpp:1063
+msgid "WB_RB levels day white fluor"
 msgstr ""
 
-#: src/olympusmn.cpp:875
-msgid "WB G level 4800K"
+#: src/olympusmn.cpp:1064
+msgid "WB_RB Levels Cool White Fluor"
 msgstr ""
 
-#: src/olympusmn.cpp:876
-msgid "WB G Level 5300K"
+#: src/olympusmn.cpp:1064
+msgid "WB_RB levels cool white fluor"
 msgstr ""
 
-#: src/olympusmn.cpp:876
-msgid "WB G level 5300K"
-msgstr ""
+#: src/olympusmn.cpp:1065
+#, fuzzy
+msgid "WB_RB Levels White Fluorescent"
+msgstr "Fluorescencja biała"
 
-#: src/olympusmn.cpp:877
-msgid "WB G Level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:1065
+#, fuzzy
+msgid "WB_RB levels white fluorescent"
+msgstr "4500K (neutralnie biała lampa fluorescencyjna)"
 
-#: src/olympusmn.cpp:877
-msgid "WB G level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:1066
+msgid "Color Matrix2"
+msgstr "Matryca kolorów 2"
 
-#: src/olympusmn.cpp:878
-msgid "WB G Level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:1066
+msgid "Color matrix 2"
+msgstr "Matryca kolorów 2"
 
-#: src/olympusmn.cpp:878
-msgid "WB G level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:1069
+msgid "Black Level 2"
+msgstr "Poziom czerni 2"
 
-#: src/olympusmn.cpp:879
-msgid "WB G Level 7500K"
-msgstr ""
+#: src/olympusmn.cpp:1069
+msgid "Black level 2"
+msgstr "Poziom czerni 2"
 
-#: src/olympusmn.cpp:879
-msgid "WB G level 7500K"
-msgstr ""
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
+msgid "YCbCr Coefficients"
+msgstr "Współczynniki YCbCr"
 
-#: src/olympusmn.cpp:880
-msgid "WB G Level"
-msgstr ""
+#: src/olympusmn.cpp:1070
+msgid "YCbCr coefficients"
+msgstr "Współczynniki YCbCr"
 
-#: src/olympusmn.cpp:880
-msgid "WB G level"
-msgstr ""
+#: src/olympusmn.cpp:1071
+msgid "Valid Pixel Depth"
+msgstr "Prawidłowa głębia pikseli"
 
-#: src/olympusmn.cpp:882
-msgid "Enhancer"
-msgstr ""
+#: src/olympusmn.cpp:1071
+msgid "Valid pixel depth"
+msgstr "Prawidłowa głębia pikseli"
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer Values"
-msgstr ""
+#: src/olympusmn.cpp:1077
+msgid "White Balance Comp"
+msgstr "Kompensacja balansu bieli"
 
-#: src/olympusmn.cpp:883
-msgid "Enhancer values"
-msgstr ""
+#: src/olympusmn.cpp:1077
+msgid "White balance comp"
+msgstr "Kompensacja balansu bieli"
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
-msgid "Coring Filter"
-msgstr ""
+#: src/olympusmn.cpp:1078
+msgid "Saturation Setting"
+msgstr "Ustawienie nasycenia"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
-msgid "Coring Values"
-msgstr ""
+#: src/olympusmn.cpp:1079
+msgid "Hue Setting"
+msgstr "Ustawienie odcieni"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
-msgid "Coring values"
-msgstr ""
+#: src/olympusmn.cpp:1079
+msgid "Hue setting"
+msgstr "Ustawienie odcieni"
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
-msgid "Black Level"
-msgstr "Poziom czerni"
+#: src/olympusmn.cpp:1082
+msgid "CM Exposure Compensation"
+msgstr "CM Kompensacja ekspozycji"
 
-#: src/olympusmn.cpp:887
-msgid "Gain Base"
-msgstr "Podstawa wzmocnienia"
+#: src/olympusmn.cpp:1082
+msgid "CM exposure compensation"
+msgstr "CM Kompensacja ekspozycji"
 
-#: src/olympusmn.cpp:887
-msgid "Gain base"
-msgstr "Automatyczna gradacja"
+#: src/olympusmn.cpp:1083
+msgid "CM White Balance"
+msgstr "CM Balans bieli"
 
-#: src/olympusmn.cpp:888
-msgid "Valid Bits"
-msgstr ""
+#: src/olympusmn.cpp:1083
+msgid "CM white balance"
+msgstr "CM Balans bieli"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
-msgid "Crop Left"
-msgstr "Przycięcie lewo"
+#: src/olympusmn.cpp:1084
+msgid "CM White Balance Comp"
+msgstr "CM Kompensacja balansu bieli"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
-msgid "Crop left"
-msgstr "Przycięcie lewo"
+#: src/olympusmn.cpp:1084
+msgid "CM white balance comp"
+msgstr "CM Kompensacja balansu bieli"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
-msgid "Crop Top"
-msgstr "Przycięcie góra"
+#: src/olympusmn.cpp:1085
+msgid "CM White Balance Gray Point"
+msgstr "CM Punkt szarości balansu bieli"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
-msgid "Crop top"
-msgstr "Przycięcie góra"
+#: src/olympusmn.cpp:1085
+msgid "CM white balance gray point"
+msgstr "CM Punkt szarości balansu bieli"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
-msgid "Crop Width"
-msgstr "Przycięcie szerokość"
+#: src/olympusmn.cpp:1086
+msgid "CM Saturation"
+msgstr "CM Nasycenie"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
-msgid "Crop width"
-msgstr "Przycięcie szerokość"
+#: src/olympusmn.cpp:1086
+msgid "CM saturation"
+msgstr "CM Nasycenie"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
-msgid "Crop Height"
-msgstr "Przycięcie wysokość"
+#: src/olympusmn.cpp:1087
+msgid "CM Hue"
+msgstr "CM Odcień"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
-msgid "Crop height"
-msgstr "Przycięcie wysokość"
+#: src/olympusmn.cpp:1087
+msgid "CM hue"
+msgstr "CM Odcień"
 
-#: src/olympusmn.cpp:896
-msgid "Face Detect"
-msgstr "Wykrywanie twarzy"
+#: src/olympusmn.cpp:1088
+msgid "CM Contrast"
+msgstr "CM Kontrast"
 
-#: src/olympusmn.cpp:896
-msgid "Face detect"
-msgstr "Wykrywanie twarzy"
+#: src/olympusmn.cpp:1088
+msgid "CM contrast"
+msgstr "CM Kontrastowość"
 
-#: src/olympusmn.cpp:897
-msgid "Face Detect Area"
-msgstr "Obszar wykrywania twarzy"
+#: src/olympusmn.cpp:1089
+msgid "CM Sharpness"
+msgstr "CM Ostrość"
 
-#: src/olympusmn.cpp:897
-msgid "Face detect area"
-msgstr "Obszar wykrywania twarzy"
+#: src/olympusmn.cpp:1089
+msgid "CM sharpness"
+msgstr "CM Ostrość"
 
-#: src/olympusmn.cpp:899
-msgid "Unknown OlympusIp tag"
-msgstr "Nieznany znacznik OlympusIp"
+#: src/olympusmn.cpp:1091
+msgid "Unknown OlympusRi tag"
+msgstr "Nieznany znacznik OlympusRi"
 
-#: src/olympusmn.cpp:909
-#, fuzzy
-msgid "Bounce or Off"
-msgstr "Odbicie lub nie"
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
+msgid "User-Selected"
+msgstr "Wybrane przez użytkownika"
 
-#: src/olympusmn.cpp:910
-msgid "Direct"
-msgstr "Bezpośredni"
+#: src/olympusmn.cpp:1115
+msgid "Auto-Override"
+msgstr "Automatyczne wymuszenie"
 
-#: src/olympusmn.cpp:914
-msgid "Focus Info Version"
-msgstr "Wersja informacji focusa"
+#: src/olympusmn.cpp:1151
+msgid "Fast"
+msgstr "Szybki"
 
-#: src/olympusmn.cpp:914
-msgid "Focus info version"
-msgstr "Wersja informacji o ostrzeniu (fokusie)"
+#: src/olympusmn.cpp:1208
+msgid "3000 Kelvin"
+msgstr "3000 K"
 
-#: src/olympusmn.cpp:915
-msgid "Auto Focus"
-msgstr "Automatyczne ostrzenie"
+#: src/olympusmn.cpp:1209
+msgid "3700 Kelvin"
+msgstr "3700 K"
 
-#: src/olympusmn.cpp:916
-msgid "Scene Detect"
-msgstr "Wykrywanie sceny"
+#: src/olympusmn.cpp:1210
+msgid "4000 Kelvin"
+msgstr "4000 K"
 
-#: src/olympusmn.cpp:916
-msgid "Scene detect"
-msgstr "Wykrywanie sceny"
+#: src/olympusmn.cpp:1211
+msgid "4500 Kelvin"
+msgstr "4500 K"
 
-#: src/olympusmn.cpp:917
-msgid "Scene Area"
-msgstr "Obszar sceny"
+#: src/olympusmn.cpp:1212
+msgid "5500 Kelvin"
+msgstr "5500 K"
 
-#: src/olympusmn.cpp:917
-msgid "Scene area"
-msgstr "Obszar sceny"
+#: src/olympusmn.cpp:1213
+msgid "6500 Kelvin"
+msgstr "6500 K"
 
-#: src/olympusmn.cpp:918
-msgid "Scene Detect Data"
-msgstr "Dane wykrywania sceny"
+#: src/olympusmn.cpp:1214
+msgid "7500 Kelvin"
+msgstr "7500 K"
 
-#: src/olympusmn.cpp:918
-msgid "Scene detect data"
-msgstr "Dane wykrywania sceny"
+#: src/olympusmn.cpp:1220
+msgid "One-touch"
+msgstr "One-touch"
 
-#: src/olympusmn.cpp:919
-msgid "Zoom Step Count"
-msgstr "Liczba kroków powiększania"
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
+msgstr ""
 
-#: src/olympusmn.cpp:920
-msgid "Focus Step Count"
-msgstr "Liczba kroków ostrzenia"
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
+msgstr ""
 
-#: src/olympusmn.cpp:920
-msgid "Focus step count"
-msgstr "Liczba kroków ostrzenia"
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:921
-#, fuzzy
-msgid "Focus Step Infinity"
-msgstr "Krok ostrzenia - nieskończoność"
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
+msgstr ""
 
-#: src/olympusmn.cpp:921
-#, fuzzy
-msgid "Focus step infinity"
-msgstr "Krok ostrzenia - nieskończoność"
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
+msgstr ""
 
-#: src/olympusmn.cpp:922
-#, fuzzy
-msgid "Focus Step Near"
-msgstr "Krok ostrzenia - blisko"
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
+msgstr ""
 
-#: src/olympusmn.cpp:922
-#, fuzzy
-msgid "Focus step near"
-msgstr "Krok ostrzenia - blisko"
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
+msgstr ""
 
-#: src/olympusmn.cpp:925
-msgid "External Flash"
-msgstr "Zewnętrzny flesz"
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
+msgstr ""
 
-#: src/olympusmn.cpp:926
-msgid "External Flash Guide Number"
-msgstr "Liczba przewodnia zewnętrznego flesza"
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
+msgstr ""
 
-#: src/olympusmn.cpp:926
-msgid "External flash guide number"
-msgstr "Liczba przewodnia zewnętrznego flesza"
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
+msgstr ""
 
-#: src/olympusmn.cpp:930
-msgid "Manual Flash"
-msgstr "Flesz ręczny"
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
+msgstr ""
 
-#: src/olympusmn.cpp:930
-msgid "Manual flash"
-msgstr "Flesz ręczny"
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
+msgstr ""
 
-#: src/olympusmn.cpp:934
-msgid "Unknown OlympusFi tag"
-msgstr "Nieznany znacznik OlympusFi"
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:945
-msgid "Unknown OlympusFe tag"
-msgstr "Nieznany znacznik OlympusFe"
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
+msgstr ""
 
-#: src/olympusmn.cpp:958
-msgid "Fine Weather"
-msgstr "Dobra pogoda"
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
+msgstr ""
 
-#: src/olympusmn.cpp:959
-#, fuzzy
-msgid "Tungsten (incandescent)"
-msgstr "Żarówka wolframowa"
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:960
-msgid "Evening Sunlight"
-msgstr "Wieczorne światło słońca"
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
+msgstr ""
 
-#: src/olympusmn.cpp:961
-#, fuzzy
-msgid "Daylight Fluorescent (D 5700 - 7100K)"
-msgstr "Lampy fluorescencyjna, światło dzienne (D 5700 - 7100K)"
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:962
-#, fuzzy
-msgid "Day White Fluorescent (N 4600 - 5400K)"
-msgstr "Lampa fluorescencyjna, biel dnia (N 4600 - 5400K)"
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:963
-#, fuzzy
-msgid "Cool White Fluorescent (W 3900 - 4500K)"
-msgstr "Lampa fluorescencyjna chłodnobiała (W 3900 - 4500K)"
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
+msgstr ""
 
-#: src/olympusmn.cpp:964
-#, fuzzy
-msgid "White Fluorescent (WW 3200 - 3700K)"
-msgstr "Lampa fluorescencyjna biała (WW 3200 - 3700K)"
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
+msgstr ""
 
-#: src/olympusmn.cpp:965
-#, fuzzy
-msgid "One Touch White Balance"
-msgstr "Automatyczna korekcja balansu bieli"
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
+msgstr ""
 
-#: src/olympusmn.cpp:966
-msgid "Custom 1-4"
-msgstr "Użytkownika 1-4"
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
+msgstr ""
 
-#: src/olympusmn.cpp:970
-msgid "Raw Info Version"
-msgstr "Wersja informacji Raw"
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
+msgstr ""
 
-#: src/olympusmn.cpp:970
-msgid "Raw info version"
-msgstr "Wersja informacji Raw"
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
+msgstr ""
 
-#: src/olympusmn.cpp:971
-msgid "WB_RB Levels Used"
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
 msgstr ""
 
-#: src/olympusmn.cpp:971
-msgid "WB_RB levels used"
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
 msgstr ""
 
-#: src/olympusmn.cpp:972
-msgid "WB_RB Levels Auto"
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
 msgstr ""
 
-#: src/olympusmn.cpp:972
-msgid "WB_RB levels auto"
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
 msgstr ""
 
-#: src/olympusmn.cpp:973
-msgid "WB_RB Levels Shade"
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
 msgstr ""
 
-#: src/olympusmn.cpp:973
-msgid "WB_RB levels shade"
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
 msgstr ""
 
-#: src/olympusmn.cpp:974
-msgid "WB_RB Levels Cloudy"
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
 msgstr ""
 
-#: src/olympusmn.cpp:974
-msgid "WB_RB levels cloudy"
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
 msgstr ""
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB Levels Fine Weather"
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
 msgstr ""
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB levels fine weather"
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
 msgstr ""
 
-#: src/olympusmn.cpp:976
-msgid "WB_RB Levels Tungsten"
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
 msgstr ""
 
-#: src/olympusmn.cpp:976
-msgid "WB_RB levels tungsten"
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
 msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB Levels Evening Sunlight"
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB levels evening sunlight"
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
 msgstr ""
 
-#: src/olympusmn.cpp:978
-msgid "WB_RB Levels Daylight Fluor"
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:978
-msgid "WB_RB levels daylight fluor"
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
 msgstr ""
 
-#: src/olympusmn.cpp:979
-msgid "WB_RB Levels Day White Fluor"
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:979
-msgid "WB_RB levels day white fluor"
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB Levels Cool White Fluor"
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
 msgstr ""
 
-#: src/olympusmn.cpp:980
-msgid "WB_RB levels cool white fluor"
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:981
-msgid "WB_RB Levels White Fluorescent"
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
 msgstr ""
 
-#: src/olympusmn.cpp:981
-msgid "WB_RB levels white fluorescent"
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
 msgstr ""
 
-#: src/olympusmn.cpp:982
-msgid "Color Matrix2"
-msgstr "Matryca kolorów 2"
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
+msgstr ""
 
-#: src/olympusmn.cpp:982
-msgid "Color matrix 2"
-msgstr "Matryca kolorów 2"
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
+msgstr ""
 
-#: src/olympusmn.cpp:985
-msgid "Black Level 2"
-msgstr "Poziom czerni 2"
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
+msgstr ""
 
-#: src/olympusmn.cpp:985
-msgid "Black level 2"
-msgstr "Poziom czerni 2"
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
+msgstr ""
 
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
-msgid "YCbCr Coefficients"
-msgstr "Współczynniki YCbCr"
+#: src/olympusmn.cpp:1386
+#, fuzzy
+msgid "Imager AF"
+msgstr "Unikalny identyfikator obrazu"
 
-#: src/olympusmn.cpp:986
-msgid "YCbCr coefficients"
-msgstr "Współczynniki YCbCr"
+#: src/olympusmn.cpp:1387
+#, fuzzy
+msgid "AF sensor"
+msgstr "Użyto AF"
 
-#: src/olympusmn.cpp:987
-msgid "Valid Pixel Depth"
-msgstr "Prawidłowa głębia pikseli"
+#: src/olympusmn.cpp:1433
+#, fuzzy
+msgid "Soft Focus"
+msgstr "Ostrzenie punktowe"
 
-#: src/olympusmn.cpp:987
-msgid "Valid pixel depth"
-msgstr "Prawidłowa głębia pikseli"
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
+msgstr ""
 
-#: src/olympusmn.cpp:993
-msgid "White Balance Comp"
-msgstr "Kompensacja balansu bieli"
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
+msgstr ""
 
-#: src/olympusmn.cpp:993
-msgid "White balance comp"
-msgstr "Kompensacja balansu bieli"
+#: src/olympusmn.cpp:1436
+#, fuzzy
+msgid "Light Tone"
+msgstr "Strefa prawa"
 
-#: src/olympusmn.cpp:994
-msgid "Saturation Setting"
-msgstr "Ustawienie nasycenia"
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
+msgstr ""
 
-#: src/olympusmn.cpp:995
-msgid "Hue Setting"
-msgstr "Ustawienie odcieni"
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
+msgstr ""
 
-#: src/olympusmn.cpp:995
-msgid "Hue setting"
-msgstr "Ustawienie odcieni"
+#: src/olympusmn.cpp:1439
+#, fuzzy
+msgid "Diorama"
+msgstr "panorama"
 
-#: src/olympusmn.cpp:998
-msgid "CM Exposure Compensation"
-msgstr "CM Kompensacja ekspozycji"
+#: src/olympusmn.cpp:1440
+#, fuzzy
+msgid "Cross Process"
+msgstr "Tryb ogniskowania"
 
-#: src/olympusmn.cpp:998
-msgid "CM exposure compensation"
-msgstr "CM Kompensacja ekspozycji"
+#: src/olympusmn.cpp:1441
+#, fuzzy
+msgid "Fish Eye"
+msgstr "Energia błysku"
+
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
+msgstr ""
 
-#: src/olympusmn.cpp:999
-msgid "CM White Balance"
-msgstr "CM Balans bieli"
+#: src/olympusmn.cpp:1489
+#, fuzzy
+msgid "Left (or n/a)"
+msgstr "Strefa lewa"
 
-#: src/olympusmn.cpp:999
-msgid "CM white balance"
-msgstr "CM Balans bieli"
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
+#, fuzzy
+msgid "Center (horizontal)"
+msgstr "Strefa środkowa (układ poziomy)"
 
-#: src/olympusmn.cpp:1000
-msgid "CM White Balance Comp"
-msgstr "CM Kompensacja balansu bieli"
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
+#, fuzzy
+msgid "Center (vertical)"
+msgstr "Strefa środkowa (układ pionowa)"
 
-#: src/olympusmn.cpp:1000
-msgid "CM white balance comp"
-msgstr "CM Kompensacja balansu bieli"
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1001
-msgid "CM White Balance Gray Point"
-msgstr "CM Punkt szarości balansu bieli"
+#: src/olympusmn.cpp:1504
+#, fuzzy
+msgid "Top-center (horizontal)"
+msgstr "Strefa środkowa (układ poziomy)"
 
-#: src/olympusmn.cpp:1001
-msgid "CM white balance gray point"
-msgstr "CM Punkt szarości balansu bieli"
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1002
-msgid "CM Saturation"
-msgstr "CM Nasycenie"
+#: src/olympusmn.cpp:1506
+#, fuzzy
+msgid "Left (horizontal)"
+msgstr "Poziome (normalne)"
 
-#: src/olympusmn.cpp:1002
-msgid "CM saturation"
-msgstr "CM Nasycenie"
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1003
-msgid "CM Hue"
-msgstr "CM Odcień"
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
+msgstr ""
 
-#: src/olympusmn.cpp:1003
-msgid "CM hue"
-msgstr "CM Odcień"
+#: src/olympusmn.cpp:1510
+#, fuzzy
+msgid "Right (horizontal)"
+msgstr "Poziome (normalne)"
 
-#: src/olympusmn.cpp:1004
-msgid "CM Contrast"
-msgstr "CM Kontrast"
+#: src/olympusmn.cpp:1511
+#, fuzzy
+msgid "Bottom-left (horizontal)"
+msgstr "Dolny lewy"
 
-#: src/olympusmn.cpp:1004
-msgid "CM contrast"
-msgstr "CM Kontrastowość"
+#: src/olympusmn.cpp:1512
+#, fuzzy
+msgid "Bottom-center (horizontal)"
+msgstr "Dolny lewy"
 
-#: src/olympusmn.cpp:1005
-msgid "CM Sharpness"
-msgstr "CM Ostrość"
+#: src/olympusmn.cpp:1513
+#, fuzzy
+msgid "Bottom-right (horizontal)"
+msgstr "Dolny prawy"
 
-#: src/olympusmn.cpp:1005
-msgid "CM sharpness"
-msgstr "CM Ostrość"
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1007
-msgid "Unknown OlympusRi tag"
-msgstr "Nieznany znacznik OlympusRi"
+#: src/olympusmn.cpp:1515
+#, fuzzy
+msgid "Top-center (vertical)"
+msgstr "Środek"
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
-msgid "User-Selected"
-msgstr "Wybrane przez użytkownika"
+#: src/olympusmn.cpp:1516
+#, fuzzy
+msgid "Top-right (vertical)"
+msgstr "Górny prawy"
 
-#: src/olympusmn.cpp:1031
-msgid "Auto-Override"
-msgstr "Automatyczne wymuszenie"
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1067
-msgid "Fast"
-msgstr "Szybki"
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
-msgstr "3000 K"
+#: src/olympusmn.cpp:1520
+#, fuzzy
+msgid "Mid-right (vertical)"
+msgstr "Środek-prawo"
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
-msgstr "3700 K"
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
+msgstr ""
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
-msgstr "4000 K"
+#: src/olympusmn.cpp:1522
+#, fuzzy
+msgid "Bottom-left (vertical)"
+msgstr "Dolny lewy"
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
-msgstr "4500 K"
+#: src/olympusmn.cpp:1523
+#, fuzzy
+msgid "Bottom-center (vertical)"
+msgstr "Dolny lewy"
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
-msgstr "5500 K"
+#: src/olympusmn.cpp:1524
+#, fuzzy
+msgid "Bottom-right (vertical)"
+msgstr "Dolny prawy"
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
-msgstr "6500 K"
+#: src/olympusmn.cpp:1561
+#, fuzzy
+msgid "Single Target"
+msgstr "Pojedynczy obszar"
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
-msgstr "7500 K"
+#: src/olympusmn.cpp:1562
+#, fuzzy
+msgid "All Target"
+msgstr "cel"
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
-msgstr "One-touch"
+#: src/olympusmn.cpp:1563
+#, fuzzy
+msgid "Dynamic Single Target"
+msgstr "Ustawienia trybu dynamicznego"
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
 msgid "Very High"
 msgstr "Bardzo wysoki"
 
-#: src/panasonicmn.cpp:57
+#: src/panasonicmn.cpp:59
 msgid "Motion Picture"
 msgstr "Ruchomy obraz"
 
-#: src/panasonicmn.cpp:65
+#: src/panasonicmn.cpp:67
 msgid "Halogen"
 msgstr "Halogen"
 
-#: src/panasonicmn.cpp:76
+#: src/panasonicmn.cpp:79
+#, fuzzy
 msgid "Auto, focus button"
-msgstr ""
+msgstr "Ostrzenie automatyczne"
 
-#: src/panasonicmn.cpp:77
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
+#, fuzzy
 msgid "Auto, continuous"
-msgstr ""
-
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
-msgstr "Włączony, tryb 1"
-
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
-msgstr "Włączony, tryb 2"
+msgstr "Gradient ciągły"
 
-#: src/panasonicmn.cpp:91
+#: src/panasonicmn.cpp:95
 msgid "Tele-macro"
 msgstr "Tele-makro"
 
-#: src/panasonicmn.cpp:99
+#: src/panasonicmn.cpp:103
 msgid "Scenery"
 msgstr "Sceneria"
 
-#: src/panasonicmn.cpp:104
+#: src/panasonicmn.cpp:108
 msgid "Shutter-speed priority"
 msgstr "Priorytet szybkości migawki"
 
-#: src/panasonicmn.cpp:108
+#: src/panasonicmn.cpp:112
 msgid "Movie preview"
 msgstr "Podgląd filmu"
 
-#: src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:113
 #, fuzzy
 msgid "Panning"
 msgstr "Śledzenie"
 
-#: src/panasonicmn.cpp:110
+#: src/panasonicmn.cpp:114
 #, fuzzy
 msgid "Simple"
 msgstr "Pojedynczy"
 
-#: src/panasonicmn.cpp:111
+#: src/panasonicmn.cpp:115
 msgid "Color effects"
 msgstr "Efekty kolorystyczne"
 
-#: src/panasonicmn.cpp:115
+#: src/panasonicmn.cpp:119
 msgid "Night scenery"
 msgstr "Scena nocna"
 
-#: src/panasonicmn.cpp:117
+#: src/panasonicmn.cpp:121
 msgid "Baby"
 msgstr "Dziecko"
 
-#: src/panasonicmn.cpp:118
+#: src/panasonicmn.cpp:122
 msgid "Soft skin"
 msgstr "Gładka skóra"
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
 msgid "Candlelight"
 msgstr "Światło świecy"
 
-#: src/panasonicmn.cpp:120
+#: src/panasonicmn.cpp:124
 msgid "Starry night"
 msgstr "Gwiaździste niebo"
 
-#: src/panasonicmn.cpp:121
+#: src/panasonicmn.cpp:125
 msgid "High sensitivity"
 msgstr "Wysoka czułość"
 
-#: src/panasonicmn.cpp:122
+#: src/panasonicmn.cpp:126
 msgid "Panorama assist"
 msgstr "Asystent panoramy"
 
-#: src/panasonicmn.cpp:125
+#: src/panasonicmn.cpp:129
 msgid "Aerial photo"
 msgstr "Fotografia powietrzna"
 
-#: src/panasonicmn.cpp:128
+#: src/panasonicmn.cpp:132
 msgid "Intelligent ISO"
 msgstr "Inteligentne ISO"
 
-#: src/panasonicmn.cpp:129
+#: src/panasonicmn.cpp:133
 msgid "High speed continuous shooting"
 msgstr "Ciągłe zdjęcia w wysokiej czułości"
 
-#: src/panasonicmn.cpp:130
+#: src/panasonicmn.cpp:134
 msgid "Intelligent auto"
 msgstr "Inteligentna automatyka"
 
-#: src/panasonicmn.cpp:142
+#: src/panasonicmn.cpp:146
 msgid "Warm"
 msgstr "Ciepły"
 
-#: src/panasonicmn.cpp:143
+#: src/panasonicmn.cpp:147
 msgid "Cool"
 msgstr "Zimny"
 
-#: src/panasonicmn.cpp:151
+#: src/panasonicmn.cpp:155
 msgid "Low/High quality"
 msgstr "Niska/Wysoka jakość"
 
-#: src/panasonicmn.cpp:152
+#: src/panasonicmn.cpp:156
 msgid "Infinite"
 msgstr "Nieskończony"
 
-#: src/panasonicmn.cpp:160
+#: src/panasonicmn.cpp:164
 #, fuzzy
 msgid "Medium low"
 msgstr "Średnie niskie"
 
-#: src/panasonicmn.cpp:161
+#: src/panasonicmn.cpp:165
 #, fuzzy
 msgid "Medium high"
 msgstr "Średnie wysokie"
 
-#: src/panasonicmn.cpp:170
+#: src/panasonicmn.cpp:175
 msgid "Low (-1)"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
+#: src/panasonicmn.cpp:176
+#, fuzzy
 msgid "High (+1)"
-msgstr ""
+msgstr "Dużo"
 
-#: src/panasonicmn.cpp:172
+#: src/panasonicmn.cpp:177
 msgid "Lowest (-2)"
 msgstr ""
 
-#: src/panasonicmn.cpp:173
+#: src/panasonicmn.cpp:178
 msgid "Highest (+2)"
 msgstr ""
 
-#: src/panasonicmn.cpp:179
+#: src/panasonicmn.cpp:184
 msgid "10s"
 msgstr "10s"
 
-#: src/panasonicmn.cpp:180
+#: src/panasonicmn.cpp:185
 msgid "2s"
 msgstr "2s"
 
-#: src/panasonicmn.cpp:200
+#: src/panasonicmn.cpp:205
 msgid "EX optics"
 msgstr "Optyka EX"
 
-#: src/panasonicmn.cpp:207
+#: src/panasonicmn.cpp:212
 msgid "Telephoto"
 msgstr "Teleobiektyw"
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
+#, fuzzy
 msgid "Home"
-msgstr ""
+msgstr "Rzym"
 
-#: src/panasonicmn.cpp:219
+#: src/panasonicmn.cpp:225
 msgid "Standard (color)"
 msgstr "Standardowy (kolorowy)"
 
-#: src/panasonicmn.cpp:220
+#: src/panasonicmn.cpp:226
 msgid "Dynamic (color)"
 msgstr "Dynamiczny (kolorowy)"
 
-#: src/panasonicmn.cpp:221
+#: src/panasonicmn.cpp:227
 msgid "Nature (color)"
 msgstr "Naturalny (kolorowy)"
 
-#: src/panasonicmn.cpp:222
+#: src/panasonicmn.cpp:228
 msgid "Smooth (color)"
 msgstr "Gładki (kolorowy)"
 
-#: src/panasonicmn.cpp:223
+#: src/panasonicmn.cpp:229
 msgid "Standard (B&W)"
 msgstr "Standardowy (czarno-biały)"
 
-#: src/panasonicmn.cpp:224
+#: src/panasonicmn.cpp:230
 msgid "Dynamic (B&W)"
 msgstr "Dynamiczny (czarno-biały)"
 
-#: src/panasonicmn.cpp:225
+#: src/panasonicmn.cpp:231
 msgid "Smooth (B&W)"
 msgstr "Gładki (czarno-biały)"
 
-#: src/panasonicmn.cpp:239
+#: src/panasonicmn.cpp:245
 msgid "Audio"
 msgstr "Audio"
 
-#: src/panasonicmn.cpp:242
+#: src/panasonicmn.cpp:248
 msgid "White balance adjustment"
 msgstr "Poprawka balansu bieli"
 
-#: src/panasonicmn.cpp:243
+#: src/panasonicmn.cpp:249
 msgid "FlashBias"
 msgstr "Odchylenie błysku"
 
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
 msgid "Exif version"
 msgstr "Wersja Exif"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color Effect"
 msgstr "Efekt kolorystyczny"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color effect"
 msgstr "Efekt kolorystyczny"
 
-#: src/panasonicmn.cpp:248
+#: src/panasonicmn.cpp:254
 msgid ""
 "Time in 1/100 s from when the camera was powered on to when the image is "
 "written to memory card"
@@ -8924,1771 +11858,2026 @@
 "Czas w setnych sekundy od momentu włączenia aparatu do momentu zapisania "
 "zdjęcia na karcie pamięci"
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst Mode"
 msgstr "Tryb zdjęć seryjnych"
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst mode"
 msgstr "Tryb zdjęć seryjnych"
 
-#: src/panasonicmn.cpp:252
+#: src/panasonicmn.cpp:258
 msgid "NoiseReduction"
 msgstr "Redukcja szumów"
 
-#: src/panasonicmn.cpp:253
+#: src/panasonicmn.cpp:259
 msgid "Self Timer"
 msgstr "Samowyzwalacz"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+#, fuzzy
 msgid "Baby Age"
-msgstr ""
+msgstr "Dziecko"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
 msgid "Baby (or pet) age"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 msgid "Optical Zoom Mode"
 msgstr "Tryb powiększenia optycznego"
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 msgid "Optical zoom mode"
 msgstr "Tryb powiększenia optycznego"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 msgid "Conversion Lens"
 msgstr "Konwerter"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 msgid "Conversion lens"
 msgstr "Konwerter"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel Day"
 msgstr "Dzień podróży"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel day"
 msgstr "Dzień podróży"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World Time Location"
 msgstr "Lokalizacja zdjęcia"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World time location"
 msgstr "Lokalizacja zdjęcia"
 
-#: src/panasonicmn.cpp:264
+#: src/panasonicmn.cpp:270
 msgid "Program ISO"
 msgstr "Program ISO"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
+#, fuzzy
 msgid "WB Adjust AB"
-msgstr ""
+msgstr "Dopasowanie"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 msgid "WB adjust AB. Positive is a shift toward blue."
 msgstr ""
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
+#, fuzzy
 msgid "WB Adjust GM"
-msgstr ""
+msgstr "Dopasowanie"
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 msgid "WBAdjustGM. Positive is a shift toward green."
 msgstr ""
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 msgid "Accessory Type"
 msgstr "Rodzaj akcesorium"
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 msgid "Accessory type"
 msgstr "Rodzaj akcesorium"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 msgid "MakerNote Version"
 msgstr "Wersja MakerNote"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 msgid "MakerNote version"
 msgstr "Wersja MakerNote"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 msgid "WB Red Level"
 msgstr "WB poziom czerwieni"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 msgid "WB red level"
 msgstr "WB poziom czerwieni"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 msgid "WB Green Level"
 msgstr "WB poziom zieleni"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 msgid "WB green level"
 msgstr "WB poziom zieleni"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 msgid "WB Blue Level"
 msgstr "WB poziom błękitu"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 msgid "WB blue level"
 msgstr "WB poziom błękitu"
 
-#: src/panasonicmn.cpp:282
+#: src/panasonicmn.cpp:288
 msgid "Unknown PanasonicMakerNote tag"
 msgstr "Nieznany znacznik PanasonicMakerNote"
 
-#: src/panasonicmn.cpp:299
+#: src/panasonicmn.cpp:305
 msgid "Spot mode on"
 msgstr "Tryb punktowy włączony"
 
-#: src/panasonicmn.cpp:300
+#: src/panasonicmn.cpp:306
 msgid "Spot mode off or 3-area (high speed)"
 msgstr "Tryb punktowy wyłączony lub 3-strefowy (wysoka czułość)"
 
-#: src/panasonicmn.cpp:301
+#: src/panasonicmn.cpp:307
 msgid "Spot focussing"
 msgstr "Ostrzenie punktowe"
 
-#: src/panasonicmn.cpp:302
+#: src/panasonicmn.cpp:308
 msgid "5-area"
 msgstr "5-strefowy"
 
-#: src/panasonicmn.cpp:303
+#: src/panasonicmn.cpp:309
 msgid "1-area"
 msgstr "1-strefowy"
 
-#: src/panasonicmn.cpp:304
+#: src/panasonicmn.cpp:310
 msgid "1-area (high speed)"
 msgstr "1-strefowy (wysoka czułość)"
 
-#: src/panasonicmn.cpp:305
+#: src/panasonicmn.cpp:311
 msgid "3-area (auto)"
 msgstr "3-strefowy (auto)"
 
-#: src/panasonicmn.cpp:306
+#: src/panasonicmn.cpp:312
 msgid "3-area (left)"
 msgstr "3-strefowy (lewa)"
 
-#: src/panasonicmn.cpp:307
+#: src/panasonicmn.cpp:313
 msgid "3-area (center)"
 msgstr "3-strefowy (środek)"
 
-#: src/panasonicmn.cpp:308
+#: src/panasonicmn.cpp:314
 msgid "3-area (right)"
 msgstr "3-strefowy (prawa)"
 
-#: src/panasonicmn.cpp:320
+#: src/panasonicmn.cpp:326
 msgid " EV"
 msgstr " EV"
 
-#: src/panasonicmn.cpp:329
+#: src/panasonicmn.cpp:335
 msgid "Panasonic raw version"
 msgstr "Wersja Panasonic raw"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 msgid "Sensor Width"
 msgstr "Szerokość sensora"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 msgid "Sensor width"
 msgstr "Szerokość sensora"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 msgid "Sensor Height"
 msgstr "Wysokość sensora"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 msgid "Sensor height"
 msgstr "Wysokość sensora"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 msgid "Sensor Top Border"
 msgstr "Górna granica sensora"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 msgid "Sensor top border"
 msgstr "Górna granica sensora"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 msgid "Sensor Left Border"
 msgstr "Lewa granica sensora"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 msgid "Sensor left border"
 msgstr "Lewa granica sensora"
 
-#: src/panasonicmn.cpp:336
+#: src/panasonicmn.cpp:342
 msgid "Red balance (found in Digilux 2 RAW images)"
 msgstr "Balans czerwieni (w obrazach RAW Digilux 2)"
 
-#: src/panasonicmn.cpp:342
-msgid "Preview Image"
-msgstr "Obraz podglądu"
-
-#: src/panasonicmn.cpp:342
-msgid "Preview image"
-msgstr "Obraz podglądu"
-
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
 msgid "Manufacturer"
 msgstr "Producent"
 
-#: src/panasonicmn.cpp:343
+#: src/panasonicmn.cpp:349
 msgid "The manufacturer of the recording equipment"
 msgstr "Producent wyposażenia nagrywającego"
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
 msgid "Model"
 msgstr "Model"
 
-#: src/panasonicmn.cpp:344
+#: src/panasonicmn.cpp:350
 msgid "The model name or model number of the equipment"
 msgstr "Nazwa lub numer modelu wyposażenia"
 
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
 msgid "Strip Offsets"
 msgstr "Przesunięcia pasów"
 
-#: src/panasonicmn.cpp:345
+#: src/panasonicmn.cpp:351
 msgid "Strip offsets"
 msgstr "Przesunięcia pasów"
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
 msgid "Orientation"
 msgstr "Orientacja"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 msgid "Rows Per Strip"
 msgstr "Wierszy na pas"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 msgid "The number of rows per strip"
 msgstr "Liczba wierszy na pas"
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip Byte Counts"
 msgstr "Liczba bajtów na pas"
 
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip byte counts"
 msgstr "Liczba bajtów na pas"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 msgid "Raw Data Offset"
 msgstr "Przesunięcie danych Raw"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 msgid "Raw data offset"
 msgstr "Przesunięcie danych Raw"
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
 msgid "Exif IFD Pointer"
 msgstr "Wskaźnik Exif IFD"
 
-#: src/panasonicmn.cpp:350
+#: src/panasonicmn.cpp:356
 msgid "A pointer to the Exif IFD"
 msgstr "Wskaźnik do EXIF IFD"
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
 msgid "GPS Info IFD Pointer"
 msgstr "Wskaźnik GPS Info IFD"
 
-#: src/panasonicmn.cpp:351
+#: src/panasonicmn.cpp:357
 msgid "A pointer to the GPS Info IFD"
 msgstr "Wskaźnik do GPS Info IFD"
 
-#: src/panasonicmn.cpp:353
+#: src/panasonicmn.cpp:359
 msgid "Unknown PanasonicRaw tag"
 msgstr "Nieznany znacznik PanasonicRaw"
 
-#: src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:57
 msgid "Night-Scene"
 msgstr "Scena nocna"
 
-#: src/pentaxmn.cpp:62
+#: src/pentaxmn.cpp:63
 msgid "Optio 330/430"
 msgstr "Optio 330/430"
 
-#: src/pentaxmn.cpp:63
+#: src/pentaxmn.cpp:64
 msgid "Optio 230"
 msgstr "Optio 230"
 
-#: src/pentaxmn.cpp:64
+#: src/pentaxmn.cpp:65
 msgid "Optio 330GS"
 msgstr "Optio 330GS"
 
-#: src/pentaxmn.cpp:65
+#: src/pentaxmn.cpp:66
 msgid "Optio 450/550"
 msgstr "Optio 450/550"
 
-#: src/pentaxmn.cpp:66
+#: src/pentaxmn.cpp:67
 msgid "Optio S"
 msgstr "Optio S"
 
-#: src/pentaxmn.cpp:67
+#: src/pentaxmn.cpp:68
 msgid "*ist D"
 msgstr "*ist D"
 
-#: src/pentaxmn.cpp:68
+#: src/pentaxmn.cpp:69
 msgid "Optio 33L"
 msgstr "Optio 33L"
 
-#: src/pentaxmn.cpp:69
+#: src/pentaxmn.cpp:70
 msgid "Optio 33LF"
 msgstr "Optio 33LF"
 
-#: src/pentaxmn.cpp:70
+#: src/pentaxmn.cpp:71
 msgid "Optio 33WR/43WR/555"
 msgstr "Optio 33WR/43WR/555"
 
-#: src/pentaxmn.cpp:71
+#: src/pentaxmn.cpp:72
 msgid "Optio S4"
 msgstr "Optio S4"
 
-#: src/pentaxmn.cpp:72
+#: src/pentaxmn.cpp:73
 msgid "Optio MX"
 msgstr "Optio MX"
 
-#: src/pentaxmn.cpp:73
+#: src/pentaxmn.cpp:74
 msgid "Optio S40"
 msgstr "Optio S40"
 
-#: src/pentaxmn.cpp:74
+#: src/pentaxmn.cpp:75
 msgid "Optio S4i"
 msgstr "Optio S4i"
 
-#: src/pentaxmn.cpp:75
+#: src/pentaxmn.cpp:76
 msgid "Optio 30"
 msgstr "Optio 30"
 
-#: src/pentaxmn.cpp:76
+#: src/pentaxmn.cpp:77
 msgid "Optio S30"
 msgstr "Optio S30"
 
-#: src/pentaxmn.cpp:77
+#: src/pentaxmn.cpp:78
 msgid "Optio 750Z"
 msgstr "Optio 750Z"
 
-#: src/pentaxmn.cpp:78
+#: src/pentaxmn.cpp:79
 msgid "Optio SV"
 msgstr "Optio SV"
 
-#: src/pentaxmn.cpp:79
+#: src/pentaxmn.cpp:80
 msgid "Optio SVi"
 msgstr "Optio SVi"
 
-#: src/pentaxmn.cpp:80
+#: src/pentaxmn.cpp:81
 msgid "Optio X"
 msgstr "Optio X"
 
-#: src/pentaxmn.cpp:81
+#: src/pentaxmn.cpp:82
 msgid "Optio S5i"
 msgstr "Optio S5i"
 
-#: src/pentaxmn.cpp:82
+#: src/pentaxmn.cpp:83
 msgid "Optio S50"
 msgstr "Optio S50"
 
-#: src/pentaxmn.cpp:83
+#: src/pentaxmn.cpp:84
 msgid "*ist DS"
 msgstr "*ist DS"
 
-#: src/pentaxmn.cpp:84
+#: src/pentaxmn.cpp:85
 msgid "Optio MX4"
 msgstr "Optio MX4"
 
-#: src/pentaxmn.cpp:85
+#: src/pentaxmn.cpp:86
 msgid "Optio S5n"
 msgstr "Optio S5n"
 
-#: src/pentaxmn.cpp:86
+#: src/pentaxmn.cpp:87
 msgid "Optio WP"
 msgstr "Optio WP"
 
-#: src/pentaxmn.cpp:87
+#: src/pentaxmn.cpp:88
 msgid "Optio S55"
 msgstr "Optio S55"
 
-#: src/pentaxmn.cpp:88
+#: src/pentaxmn.cpp:89
 msgid "Optio S5z"
 msgstr "Optio S5z"
 
-#: src/pentaxmn.cpp:89
+#: src/pentaxmn.cpp:90
 msgid "*ist DL"
 msgstr "*ist DL"
 
-#: src/pentaxmn.cpp:90
+#: src/pentaxmn.cpp:91
 msgid "Optio S60"
 msgstr "Optio S60"
 
-#: src/pentaxmn.cpp:91
+#: src/pentaxmn.cpp:92
 msgid "Optio S45"
 msgstr "Optio S45"
 
-#: src/pentaxmn.cpp:92
+#: src/pentaxmn.cpp:93
 msgid "Optio S6"
 msgstr "Optio S6"
 
-#: src/pentaxmn.cpp:93
+#: src/pentaxmn.cpp:94
 msgid "Optio WPi"
 msgstr "Optio WPi"
 
-#: src/pentaxmn.cpp:94
+#: src/pentaxmn.cpp:95
 msgid "BenQ DC X600"
 msgstr "BenQ DC X600"
 
-#: src/pentaxmn.cpp:95
+#: src/pentaxmn.cpp:96
 msgid "*ist DS2"
 msgstr "*ist DS2"
 
-#: src/pentaxmn.cpp:96
+#: src/pentaxmn.cpp:97
 msgid "Samsung GX-1S"
 msgstr "Samsung GX-1S"
 
-#: src/pentaxmn.cpp:97
+#: src/pentaxmn.cpp:98
 msgid "Optio A10"
 msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:98
+#: src/pentaxmn.cpp:99
 msgid "*ist DL2"
 msgstr "*ist DL2"
 
-#: src/pentaxmn.cpp:99
+#: src/pentaxmn.cpp:100
 msgid "Samsung GX-1L"
 msgstr "Samsung GX-1L"
 
-#: src/pentaxmn.cpp:100
+#: src/pentaxmn.cpp:101
 msgid "K100D"
 msgstr "K100D"
 
-#: src/pentaxmn.cpp:101
+#: src/pentaxmn.cpp:102
 msgid "K110D"
 msgstr "K110D"
 
-#: src/pentaxmn.cpp:102
+#: src/pentaxmn.cpp:103
 msgid "K100D Super"
 msgstr "K100D Super"
 
-#: src/pentaxmn.cpp:103
-msgid "Optio T10"
+#: src/pentaxmn.cpp:104
+#, fuzzy
+msgid "Optio T10/T20"
 msgstr "Optio T10"
 
-#: src/pentaxmn.cpp:104
+#: src/pentaxmn.cpp:105
 msgid "Optio W10"
 msgstr "Optio W10"
 
-#: src/pentaxmn.cpp:105
+#: src/pentaxmn.cpp:106
 msgid "Optio M10"
 msgstr "Optio M10"
 
-#: src/pentaxmn.cpp:106
+#: src/pentaxmn.cpp:107
 msgid "K10D"
 msgstr "K10D"
 
-#: src/pentaxmn.cpp:107
+#: src/pentaxmn.cpp:108
 msgid "Samsung GX10"
 msgstr "Samsung GX10"
 
-#: src/pentaxmn.cpp:108
+#: src/pentaxmn.cpp:109
 msgid "Optio S7"
 msgstr "Optio S7"
 
-#: src/pentaxmn.cpp:109
+#: src/pentaxmn.cpp:110
+#, fuzzy
+msgid "Optio L20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:111
 msgid "Optio M20"
 msgstr "Optio M20"
 
-#: src/pentaxmn.cpp:110
+#: src/pentaxmn.cpp:112
 msgid "Optio W20"
 msgstr "Optio W20"
 
-#: src/pentaxmn.cpp:111
+#: src/pentaxmn.cpp:113
 msgid "Optio A20"
 msgstr "Optio A20"
 
-#: src/pentaxmn.cpp:112
+#: src/pentaxmn.cpp:114
 msgid "Optio M30"
 msgstr "Optio M30"
 
-#: src/pentaxmn.cpp:113
+#: src/pentaxmn.cpp:115
 msgid "Optio E30"
 msgstr "Optio E30"
 
-#: src/pentaxmn.cpp:114
+#: src/pentaxmn.cpp:116
+#, fuzzy
+msgid "Optio E35"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:117
 msgid "Optio T30"
 msgstr "Optio T30"
 
-#: src/pentaxmn.cpp:115
+#: src/pentaxmn.cpp:118
 msgid "Optio W30"
 msgstr "Optio W30"
 
-#: src/pentaxmn.cpp:116
+#: src/pentaxmn.cpp:119
 msgid "Optio A30"
 msgstr "Optio A30"
 
-#: src/pentaxmn.cpp:117
+#: src/pentaxmn.cpp:120
 msgid "Optio E40"
 msgstr "Optio E40"
 
-#: src/pentaxmn.cpp:118
+#: src/pentaxmn.cpp:121
 msgid "Optio M40"
 msgstr "Optio M40"
 
-#: src/pentaxmn.cpp:119
+#: src/pentaxmn.cpp:122
 msgid "Optio Z10"
 msgstr "Optio Z10"
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
+#: src/pentaxmn.cpp:123
+msgid "K20D"
+msgstr "K20D"
+
+#: src/pentaxmn.cpp:124
+#, fuzzy
+msgid "Samsung GX20"
+msgstr "Samsung GX10"
+
+#: src/pentaxmn.cpp:125
 msgid "Optio S10"
 msgstr "Optio S10"
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
+#: src/pentaxmn.cpp:126
 msgid "Optio A40"
 msgstr "Optio A40"
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
+#: src/pentaxmn.cpp:127
 msgid "Optio V10"
 msgstr "Optio V10"
 
-#: src/pentaxmn.cpp:123
-msgid "K20D"
-msgstr "K20D"
-
-#: src/pentaxmn.cpp:127
+#: src/pentaxmn.cpp:128
 msgid "K200D"
 msgstr "K200D"
 
-#: src/pentaxmn.cpp:128
+#: src/pentaxmn.cpp:129
+#, fuzzy
+msgid "Optio S12"
+msgstr "Optio S10"
+
+#: src/pentaxmn.cpp:130
 msgid "Optio E50"
 msgstr "Optio E50"
 
-#: src/pentaxmn.cpp:129
+#: src/pentaxmn.cpp:131
 msgid "Optio M50"
 msgstr "Optio M50"
 
+#: src/pentaxmn.cpp:132
+#, fuzzy
+msgid "Optio V20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:133
+#, fuzzy
+msgid "Optio W60"
+msgstr "Optio S60"
+
 #: src/pentaxmn.cpp:134
+#, fuzzy
+msgid "Optio M60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:135
+#, fuzzy
+msgid "Optio E60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:136
+#, fuzzy
+msgid "K2000"
+msgstr "K200D"
+
+#: src/pentaxmn.cpp:137
+msgid "K-m"
+msgstr ""
+
+#: src/pentaxmn.cpp:138
+#, fuzzy
+msgid "Optio P70"
+msgstr "Optio 750Z"
+
+#: src/pentaxmn.cpp:139
+#, fuzzy
+msgid "Optio E70"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:140
+msgid "X70"
+msgstr ""
+
+#: src/pentaxmn.cpp:141
+#, fuzzy
+msgid "K-7"
+msgstr "-7"
+
+#: src/pentaxmn.cpp:142
+#, fuzzy
+msgid "Optio W80"
+msgstr "Optio W10"
+
+#: src/pentaxmn.cpp:143
+#, fuzzy
+msgid "Optio P80"
+msgstr "Optio 30"
+
+#: src/pentaxmn.cpp:144
+#, fuzzy
+msgid "Optio WS80"
+msgstr "Optio S40"
+
+#: src/pentaxmn.cpp:145
+msgid "K-x"
+msgstr ""
+
+#: src/pentaxmn.cpp:146
+#, fuzzy
+msgid "645D"
+msgstr "64"
+
+#: src/pentaxmn.cpp:147
+#, fuzzy
+msgid "Optio I-10"
+msgstr "Optio A10"
+
+#: src/pentaxmn.cpp:152
 msgid "Good"
 msgstr "Dobra"
 
-#: src/pentaxmn.cpp:135
+#: src/pentaxmn.cpp:153
 msgid "Better"
 msgstr "Lepsza"
 
-#: src/pentaxmn.cpp:136
+#: src/pentaxmn.cpp:154
 msgid "Best"
 msgstr "Najlepsza"
 
-#: src/pentaxmn.cpp:137
+#: src/pentaxmn.cpp:155
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/pentaxmn.cpp:139
+#: src/pentaxmn.cpp:157
 msgid "Premium"
 msgstr "Premium"
 
-#: src/pentaxmn.cpp:144
+#: src/pentaxmn.cpp:162
 msgid "640x480"
 msgstr "640x480"
 
-#: src/pentaxmn.cpp:145
-msgid "Full"
-msgstr "Pełny"
-
-#: src/pentaxmn.cpp:146
+#: src/pentaxmn.cpp:164
 msgid "1024x768"
 msgstr "1024x768"
 
-#: src/pentaxmn.cpp:147
+#: src/pentaxmn.cpp:165
 msgid "1280x960"
 msgstr "1280x960"
 
-#: src/pentaxmn.cpp:148
+#: src/pentaxmn.cpp:166
 msgid "1600x1200"
 msgstr "1600x1200"
 
-#: src/pentaxmn.cpp:149
+#: src/pentaxmn.cpp:167
 msgid "2048x1536"
 msgstr "2048x1536"
 
-#: src/pentaxmn.cpp:150
+#: src/pentaxmn.cpp:168
 msgid "2560x1920 or 2304x1728"
 msgstr "2560x1920 lub 2304x1728"
 
-#: src/pentaxmn.cpp:151
+#: src/pentaxmn.cpp:169
 msgid "3072x2304"
 msgstr "3072x2304"
 
-#: src/pentaxmn.cpp:152
+#: src/pentaxmn.cpp:170
 msgid "3264x2448"
 msgstr "3264x2448"
 
-#: src/pentaxmn.cpp:153
+#: src/pentaxmn.cpp:171
 msgid "320x240"
 msgstr "320x240"
 
-#: src/pentaxmn.cpp:154
+#: src/pentaxmn.cpp:172
 msgid "2288x1712"
 msgstr "2288x1712"
 
-#: src/pentaxmn.cpp:155
+#: src/pentaxmn.cpp:173
 msgid "2592x1944"
 msgstr "2592x1944"
 
-#: src/pentaxmn.cpp:156
+#: src/pentaxmn.cpp:174
 msgid "2304x1728 or 2592x1944"
 msgstr "2304x1728 lub 2592x1944"
 
-#: src/pentaxmn.cpp:157
+#: src/pentaxmn.cpp:175
 msgid "3056x2296"
 msgstr "3056x2296"
 
-#: src/pentaxmn.cpp:158
+#: src/pentaxmn.cpp:176
 msgid "2816x2212 or 2816x2112"
 msgstr "2816x2212 lub 2816x2112"
 
-#: src/pentaxmn.cpp:159
+#: src/pentaxmn.cpp:177
 msgid "3648x2736"
 msgstr "3648x2736"
 
-#: src/pentaxmn.cpp:164
+#: src/pentaxmn.cpp:182
 msgid "Auto, Did not fire"
 msgstr "Nie, automatycznie"
 
-#: src/pentaxmn.cpp:166
+#: src/pentaxmn.cpp:184
 msgid "Auto, Did not fire, Red-eye reduction"
 msgstr "Nie, automatycznie, redukcja czerwonych oczu"
 
-#: src/pentaxmn.cpp:167
+#: src/pentaxmn.cpp:185
 msgid "Auto, Fired"
 msgstr "Tak, automatycznie"
 
-#: src/pentaxmn.cpp:169
+#: src/pentaxmn.cpp:187
 msgid "Auto, Fired, Red-eye reduction"
 msgstr "Tak, automatycznie, redukcja czerwonych oczu"
 
-#: src/pentaxmn.cpp:170
+#: src/pentaxmn.cpp:188
 msgid "On, Red-eye reduction"
 msgstr "Tak, automatycznie, redukcja czerwonych oczu"
 
-#: src/pentaxmn.cpp:171
+#: src/pentaxmn.cpp:189
 msgid "On, Wireless"
 msgstr "Tak, bezprzewodowo"
 
-#: src/pentaxmn.cpp:172
+#: src/pentaxmn.cpp:190
 msgid "On, Soft"
 msgstr "Tak, miękkie światło"
 
-#: src/pentaxmn.cpp:173
+#: src/pentaxmn.cpp:191
 msgid "On, Slow-sync"
 msgstr "Tak, synchronizacja z długimi czasami"
 
-#: src/pentaxmn.cpp:174
+#: src/pentaxmn.cpp:192
 msgid "On, Slow-sync, Red-eye reduction"
 msgstr "Tak, synchronizacja długimi czasami, redukcja czerwonych oczu"
 
-#: src/pentaxmn.cpp:175
+#: src/pentaxmn.cpp:193
 msgid "On, Trailing-curtain Sync"
 msgstr "Tak, synchronizacja na otwarcie migawki"
 
-#: src/pentaxmn.cpp:184
+#: src/pentaxmn.cpp:203
 msgid "Pan Focus"
 msgstr "Śledzące ostrzenie"
 
-#: src/pentaxmn.cpp:185
+#: src/pentaxmn.cpp:204
 msgid "AF-S"
 msgstr "AF-S"
 
-#: src/pentaxmn.cpp:186
+#: src/pentaxmn.cpp:205
 msgid "AF-C"
 msgstr "AF-C"
 
-#: src/pentaxmn.cpp:192
+#: src/pentaxmn.cpp:206
+#, fuzzy
+msgid "AF-A"
+msgstr "AF-S"
+
+#: src/pentaxmn.cpp:212
 #, fuzzy
 msgid "Fixed Center"
 msgstr "Przytwierdzony pośrodku"
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
+#: src/pentaxmn.cpp:213
+#, fuzzy
+msgid "Automatic Tracking AF"
+msgstr "Automatycznie"
+
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
+msgstr ""
+
+#: src/pentaxmn.cpp:231
+#, fuzzy
+msgid "Fixed Center or multiple"
+msgstr "Przytwierdzony pośrodku"
+
+#: src/pentaxmn.cpp:233
+#, fuzzy
+msgid "Top-center"
+msgstr "Środek"
+
+#: src/pentaxmn.cpp:239
+#, fuzzy
+msgid "Bottom-center"
+msgstr "Dolny lewy"
+
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
 msgid "50"
 msgstr "50"
 
-#: src/pentaxmn.cpp:209
+#: src/pentaxmn.cpp:246
 msgid "64"
 msgstr "64"
 
-#: src/pentaxmn.cpp:210
+#: src/pentaxmn.cpp:247
 msgid "80"
 msgstr "80"
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
 msgid "100"
 msgstr "100"
 
-#: src/pentaxmn.cpp:212
+#: src/pentaxmn.cpp:249
 msgid "125"
 msgstr "125"
 
-#: src/pentaxmn.cpp:213
+#: src/pentaxmn.cpp:250
 msgid "160"
 msgstr "100"
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
 msgid "200"
 msgstr "200"
 
-#: src/pentaxmn.cpp:215
+#: src/pentaxmn.cpp:252
 msgid "250"
 msgstr "50"
 
-#: src/pentaxmn.cpp:216
+#: src/pentaxmn.cpp:253
 msgid "320"
 msgstr "320"
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
 msgid "400"
 msgstr "400"
 
-#: src/pentaxmn.cpp:218
+#: src/pentaxmn.cpp:255
 msgid "500"
 msgstr "50"
 
-#: src/pentaxmn.cpp:219
+#: src/pentaxmn.cpp:256
 msgid "640"
 msgstr "640"
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
-msgid "800"
-msgstr "800"
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
+msgid "800"
+msgstr "800"
+
+#: src/pentaxmn.cpp:258
+msgid "1000"
+msgstr "1000"
+
+#: src/pentaxmn.cpp:259
+msgid "1250"
+msgstr "1250"
+
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
+msgid "1600"
+msgstr "1600"
+
+#: src/pentaxmn.cpp:261
+#, fuzzy
+msgid "2000"
+msgstr "200"
+
+#: src/pentaxmn.cpp:262
+#, fuzzy
+msgid "2500"
+msgstr "200"
+
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
+msgid "3200"
+msgstr "3200"
+
+#: src/pentaxmn.cpp:264
+#, fuzzy
+msgid "4000"
+msgstr "400"
+
+#: src/pentaxmn.cpp:265
+#, fuzzy
+msgid "5000"
+msgstr "50"
+
+#: src/pentaxmn.cpp:266
+#, fuzzy
+msgid "6400"
+msgstr "400"
+
+#: src/pentaxmn.cpp:276
+#, fuzzy
+msgid "70"
+msgstr "0"
+
+#: src/pentaxmn.cpp:278
+#, fuzzy
+msgid "140"
+msgstr "+10"
 
-#: src/pentaxmn.cpp:221
-msgid "1000"
-msgstr "1000"
+#: src/pentaxmn.cpp:280
+#, fuzzy
+msgid "280"
+msgstr "80"
 
-#: src/pentaxmn.cpp:222
-msgid "1250"
-msgstr "1250"
+#: src/pentaxmn.cpp:282
+#, fuzzy
+msgid "560"
+msgstr "50"
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
-msgid "1600"
-msgstr "1600"
+#: src/pentaxmn.cpp:284
+#, fuzzy
+msgid "1100"
+msgstr "100"
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
-msgid "3200"
-msgstr "3200"
+#: src/pentaxmn.cpp:286
+#, fuzzy
+msgid "2200"
+msgstr "200"
 
-#: src/pentaxmn.cpp:249
+#: src/pentaxmn.cpp:304
 msgid "Multi Segment"
 msgstr "Wielopolowy"
 
-#: src/pentaxmn.cpp:250
+#: src/pentaxmn.cpp:305
 msgid "Center Weighted"
 msgstr "Centralnie ważony"
 
-#: src/pentaxmn.cpp:262
+#: src/pentaxmn.cpp:317
 #, fuzzy
 msgid "DaylightFluorescent"
 msgstr "Fluorescencja światło dzienne"
 
-#: src/pentaxmn.cpp:263
+#: src/pentaxmn.cpp:318
 #, fuzzy
 msgid "DaywhiteFluorescent"
 msgstr "Fluorescencja biała dzienna"
 
-#: src/pentaxmn.cpp:264
+#: src/pentaxmn.cpp:319
 #, fuzzy
 msgid "WhiteFluorescent"
 msgstr "Fluorescencja biała"
 
-#: src/pentaxmn.cpp:268
+#: src/pentaxmn.cpp:324
 msgid "User Selected"
 msgstr "Wybrany przez użytkownika"
 
-#: src/pentaxmn.cpp:273
+#: src/pentaxmn.cpp:329
 #, fuzzy
 msgid "Auto (Daylight)"
 msgstr "Auto (Światło dzienne)"
 
-#: src/pentaxmn.cpp:274
+#: src/pentaxmn.cpp:330
 #, fuzzy
 msgid "Auto (Shade)"
 msgstr "Auto (Cień)"
 
-#: src/pentaxmn.cpp:275
+#: src/pentaxmn.cpp:331
 msgid "Auto (Flash)"
 msgstr "Auto (Błysk)"
 
-#: src/pentaxmn.cpp:276
+#: src/pentaxmn.cpp:332
 #, fuzzy
 msgid "Auto (Tungsten)"
 msgstr "Auto (Lampa tungstenowa)"
 
-#: src/pentaxmn.cpp:277
+#: src/pentaxmn.cpp:333
 #, fuzzy
 msgid "Auto (DaywhiteFluorescent)"
 msgstr "Auto (Fluorescencja biała dzienna)"
 
-#: src/pentaxmn.cpp:278
+#: src/pentaxmn.cpp:334
 #, fuzzy
 msgid "Auto (WhiteFluorescent)"
 msgstr "Auto (Fluorescencja biała)"
 
-#: src/pentaxmn.cpp:279
+#: src/pentaxmn.cpp:335
 #, fuzzy
 msgid "Auto (Cloudy)"
 msgstr "Auto (Pochmurno)"
 
-#: src/pentaxmn.cpp:281
+#: src/pentaxmn.cpp:337
 msgid "Preset (Fireworks?)"
 msgstr "Ustawienie (Fajerwerki?)"
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
 #, fuzzy
 msgid "Med Low"
 msgstr "Niski zakres"
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
 #, fuzzy
 msgid "Med High"
 msgstr "Wysoki zakres"
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-#, fuzzy
-msgid "Very Low"
-msgstr "Bardzo niski"
-
-#: src/pentaxmn.cpp:311
+#: src/pentaxmn.cpp:369
 #, fuzzy
 msgid "Med Soft"
 msgstr "Miękkie światło"
 
-#: src/pentaxmn.cpp:312
+#: src/pentaxmn.cpp:370
 #, fuzzy
 msgid "Med Hard"
 msgstr "Twarda krawędź"
 
-#: src/pentaxmn.cpp:313
+#: src/pentaxmn.cpp:371
 #, fuzzy
 msgid "Very Soft"
 msgstr "Miękkie światło"
 
-#: src/pentaxmn.cpp:314
+#: src/pentaxmn.cpp:372
 #, fuzzy
 msgid "Very Hard"
 msgstr "Bardzo trudne"
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
 msgid "Home town"
 msgstr "Miasto zamieszkania"
 
-#: src/pentaxmn.cpp:325
+#: src/pentaxmn.cpp:383
 msgid "Pago Pago"
 msgstr "Pago Pago"
 
-#: src/pentaxmn.cpp:326
+#: src/pentaxmn.cpp:384
 msgid "Honolulu"
 msgstr "Honolulu"
 
-#: src/pentaxmn.cpp:327
+#: src/pentaxmn.cpp:385
 msgid "Anchorage"
 msgstr "Anchorage"
 
-#: src/pentaxmn.cpp:328
+#: src/pentaxmn.cpp:386
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: src/pentaxmn.cpp:329
+#: src/pentaxmn.cpp:387
 msgid "San Fransisco"
 msgstr "San Fransisco"
 
-#: src/pentaxmn.cpp:330
+#: src/pentaxmn.cpp:388
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: src/pentaxmn.cpp:331
+#: src/pentaxmn.cpp:389
 msgid "Calgary"
 msgstr "Calgary"
 
-#: src/pentaxmn.cpp:332
+#: src/pentaxmn.cpp:390
 msgid "Denver"
 msgstr "Denver"
 
-#: src/pentaxmn.cpp:333
+#: src/pentaxmn.cpp:391
 msgid "Mexico City"
 msgstr "Meksyk"
 
-#: src/pentaxmn.cpp:334
+#: src/pentaxmn.cpp:392
 msgid "Chicago"
 msgstr "Chicago"
 
-#: src/pentaxmn.cpp:335
+#: src/pentaxmn.cpp:393
 msgid "Miami"
 msgstr "Miami"
 
-#: src/pentaxmn.cpp:336
+#: src/pentaxmn.cpp:394
 msgid "Toronto"
 msgstr "Toronto"
 
-#: src/pentaxmn.cpp:337
+#: src/pentaxmn.cpp:395
 msgid "New York"
 msgstr "Nowy Jork"
 
-#: src/pentaxmn.cpp:338
+#: src/pentaxmn.cpp:396
 msgid "Santiago"
 msgstr "Santiago"
 
-#: src/pentaxmn.cpp:339
+#: src/pentaxmn.cpp:397
 msgid "Caracus"
 msgstr "Caracas"
 
-#: src/pentaxmn.cpp:340
+#: src/pentaxmn.cpp:398
 msgid "Halifax"
 msgstr "Halifax"
 
-#: src/pentaxmn.cpp:341
+#: src/pentaxmn.cpp:399
 msgid "Buenos Aires"
 msgstr "Buenos Aires"
 
-#: src/pentaxmn.cpp:342
+#: src/pentaxmn.cpp:400
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: src/pentaxmn.cpp:343
+#: src/pentaxmn.cpp:401
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
-#: src/pentaxmn.cpp:344
+#: src/pentaxmn.cpp:402
 msgid "Madrid"
 msgstr "Madryt"
 
-#: src/pentaxmn.cpp:345
+#: src/pentaxmn.cpp:403
 msgid "London"
 msgstr "Londyn"
 
-#: src/pentaxmn.cpp:346
+#: src/pentaxmn.cpp:404
 msgid "Paris"
 msgstr "Paryż"
 
-#: src/pentaxmn.cpp:347
+#: src/pentaxmn.cpp:405
 msgid "Milan"
 msgstr "Mediolan"
 
-#: src/pentaxmn.cpp:348
+#: src/pentaxmn.cpp:406
 msgid "Rome"
 msgstr "Rzym"
 
-#: src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:407
 msgid "Berlin"
 msgstr "Berlin"
 
-#: src/pentaxmn.cpp:350
+#: src/pentaxmn.cpp:408
 msgid "Johannesburg"
 msgstr "Johannesburg"
 
-#: src/pentaxmn.cpp:351
+#: src/pentaxmn.cpp:409
 msgid "Istanbul"
 msgstr "Stambuł"
 
-#: src/pentaxmn.cpp:352
+#: src/pentaxmn.cpp:410
 msgid "Cairo"
 msgstr "Kair"
 
-#: src/pentaxmn.cpp:353
+#: src/pentaxmn.cpp:411
 msgid "Jerusalem"
 msgstr "Jerozolima"
 
-#: src/pentaxmn.cpp:354
+#: src/pentaxmn.cpp:412
 msgid "Moscow"
 msgstr "Moskwa"
 
-#: src/pentaxmn.cpp:355
+#: src/pentaxmn.cpp:413
 msgid "Jeddah"
 msgstr "Dżudda"
 
-#: src/pentaxmn.cpp:356
+#: src/pentaxmn.cpp:414
 msgid "Tehran"
 msgstr "Teheran"
 
-#: src/pentaxmn.cpp:357
+#: src/pentaxmn.cpp:415
 msgid "Dubai"
 msgstr "Dubaj"
 
-#: src/pentaxmn.cpp:358
+#: src/pentaxmn.cpp:416
 msgid "Karachi"
 msgstr "Karaczi"
 
-#: src/pentaxmn.cpp:359
+#: src/pentaxmn.cpp:417
 msgid "Kabul"
 msgstr "Kabul"
 
-#: src/pentaxmn.cpp:360
+#: src/pentaxmn.cpp:418
 msgid "Male"
 msgstr "Male"
 
-#: src/pentaxmn.cpp:361
+#: src/pentaxmn.cpp:419
 msgid "Delhi"
 msgstr "Delhi"
 
-#: src/pentaxmn.cpp:362
+#: src/pentaxmn.cpp:420
 msgid "Colombo"
 msgstr "Kolombo"
 
-#: src/pentaxmn.cpp:363
+#: src/pentaxmn.cpp:421
 msgid "Kathmandu"
 msgstr "Katmandu"
 
-#: src/pentaxmn.cpp:364
+#: src/pentaxmn.cpp:422
 msgid "Dacca"
 msgstr "Dacca"
 
-#: src/pentaxmn.cpp:365
+#: src/pentaxmn.cpp:423
 msgid "Yangon"
 msgstr "Rangun"
 
-#: src/pentaxmn.cpp:366
+#: src/pentaxmn.cpp:424
 msgid "Bangkok"
 msgstr "Bangkok"
 
-#: src/pentaxmn.cpp:367
+#: src/pentaxmn.cpp:425
 msgid "Kuala Lumpur"
 msgstr "Kuala Lumpur"
 
-#: src/pentaxmn.cpp:368
+#: src/pentaxmn.cpp:426
 msgid "Vientiane"
 msgstr "Wientian"
 
-#: src/pentaxmn.cpp:369
+#: src/pentaxmn.cpp:427
 msgid "Singapore"
 msgstr "Singapur"
 
-#: src/pentaxmn.cpp:370
+#: src/pentaxmn.cpp:428
 msgid "Phnom Penh"
 msgstr "Phnom Penh"
 
-#: src/pentaxmn.cpp:371
+#: src/pentaxmn.cpp:429
 msgid "Ho Chi Minh"
 msgstr "Ho Chi Minh"
 
-#: src/pentaxmn.cpp:372
+#: src/pentaxmn.cpp:430
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: src/pentaxmn.cpp:373
+#: src/pentaxmn.cpp:431
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: src/pentaxmn.cpp:374
+#: src/pentaxmn.cpp:432
 msgid "Perth"
 msgstr "Perth"
 
-#: src/pentaxmn.cpp:375
+#: src/pentaxmn.cpp:433
 msgid "Beijing"
 msgstr "Pekin"
 
-#: src/pentaxmn.cpp:376
+#: src/pentaxmn.cpp:434
 msgid "Shanghai"
 msgstr "Szanghaj"
 
-#: src/pentaxmn.cpp:377
+#: src/pentaxmn.cpp:435
 msgid "Manila"
 msgstr "Manila"
 
-#: src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:436
 msgid "Taipei"
 msgstr "Tajpej"
 
-#: src/pentaxmn.cpp:379
+#: src/pentaxmn.cpp:437
 msgid "Seoul"
 msgstr "Seul"
 
-#: src/pentaxmn.cpp:380
+#: src/pentaxmn.cpp:438
 msgid "Adelaide"
 msgstr "Adelajda"
 
-#: src/pentaxmn.cpp:381
+#: src/pentaxmn.cpp:439
 msgid "Tokyo"
 msgstr "Tokio"
 
-#: src/pentaxmn.cpp:382
+#: src/pentaxmn.cpp:440
 msgid "Guam"
 msgstr "Guam"
 
-#: src/pentaxmn.cpp:383
+#: src/pentaxmn.cpp:441
 msgid "Sydney"
 msgstr "Sydney"
 
-#: src/pentaxmn.cpp:384
+#: src/pentaxmn.cpp:442
 msgid "Noumea"
 msgstr "Numea"
 
-#: src/pentaxmn.cpp:385
+#: src/pentaxmn.cpp:443
 msgid "Wellington"
 msgstr "Wellington"
 
-#: src/pentaxmn.cpp:386
+#: src/pentaxmn.cpp:444
 msgid "Auckland"
 msgstr "Auckland"
 
-#: src/pentaxmn.cpp:387
+#: src/pentaxmn.cpp:445
 msgid "Lima"
 msgstr "Lima"
 
-#: src/pentaxmn.cpp:388
+#: src/pentaxmn.cpp:446
 msgid "Dakar"
 msgstr "Dakar"
 
-#: src/pentaxmn.cpp:389
+#: src/pentaxmn.cpp:447
 msgid "Algiers"
 msgstr "Algier"
 
-#: src/pentaxmn.cpp:390
+#: src/pentaxmn.cpp:448
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: src/pentaxmn.cpp:391
+#: src/pentaxmn.cpp:449
 msgid "Athens"
 msgstr "Ateny"
 
-#: src/pentaxmn.cpp:392
+#: src/pentaxmn.cpp:450
 msgid "Nairobi"
 msgstr "Nairobi"
 
-#: src/pentaxmn.cpp:393
+#: src/pentaxmn.cpp:451
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
-#: src/pentaxmn.cpp:394
+#: src/pentaxmn.cpp:452
 msgid "Stockholm"
 msgstr "Sztokholm"
 
-#: src/pentaxmn.cpp:395
+#: src/pentaxmn.cpp:453
 msgid "Lisbon"
 msgstr "Lizbona"
 
-#: src/pentaxmn.cpp:400
+#: src/pentaxmn.cpp:454
+#, fuzzy
+msgid "Copenhagen"
+msgstr "Tematyka"
+
+#: src/pentaxmn.cpp:459
 msgid "Unprocessed"
 msgstr "Nieprzetworzony"
 
-#: src/pentaxmn.cpp:401
+#: src/pentaxmn.cpp:460
 msgid "Digital Filter"
 msgstr "Filtr cyfrowy"
 
-#: src/pentaxmn.cpp:402
+#: src/pentaxmn.cpp:461
 msgid "Cropped"
 msgstr "Wykadrowany"
 
-#: src/pentaxmn.cpp:404
+#: src/pentaxmn.cpp:463
 msgid "Frame Synthesis?"
 msgstr ""
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
 msgid "MTF Program"
 msgstr "Program MTF"
 
-#: src/pentaxmn.cpp:416
+#: src/pentaxmn.cpp:475
 msgid "Night Scene Portrait"
 msgstr "Portret nocny"
 
-#: src/pentaxmn.cpp:417
+#: src/pentaxmn.cpp:476
 msgid "No Flash"
 msgstr "Bez błysku"
 
-#: src/pentaxmn.cpp:420
+#: src/pentaxmn.cpp:479
 msgid "Surf & Snow"
 msgstr "Surfing i śnieg"
 
-#: src/pentaxmn.cpp:423
+#: src/pentaxmn.cpp:482
 msgid "Kids"
 msgstr "Dzieci"
 
-#: src/pentaxmn.cpp:428
+#: src/pentaxmn.cpp:487
+#, fuzzy
+msgid "Stage Lighting"
+msgstr "D-Lighting"
+
+#: src/pentaxmn.cpp:488
+#, fuzzy
+msgid "Night Snap"
+msgstr "Nocne zdjęcie"
+
+#: src/pentaxmn.cpp:490
+#, fuzzy
 msgid "Auto PICT (Standard)"
-msgstr ""
+msgstr "Auto (Cień)"
 
-#: src/pentaxmn.cpp:429
+#: src/pentaxmn.cpp:491
+#, fuzzy
 msgid "Auto PICT (Portrait)"
-msgstr ""
+msgstr "Automatyczna regulacja kontrastu"
 
-#: src/pentaxmn.cpp:430
+#: src/pentaxmn.cpp:492
+#, fuzzy
 msgid "Auto PICT (Landscape)"
-msgstr ""
+msgstr "Edytowany (krajobraz)"
 
-#: src/pentaxmn.cpp:431
+#: src/pentaxmn.cpp:493
 msgid "Auto PICT (Macro)"
 msgstr ""
 
-#: src/pentaxmn.cpp:432
+#: src/pentaxmn.cpp:494
+#, fuzzy
 msgid "Auto PICT (Sport)"
-msgstr ""
+msgstr "Automatyczna regulacja kontrastu"
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
 #, fuzzy
 msgid "Green Mode"
 msgstr "Tryb zieleni"
 
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
 msgid "Shutter Speed Priority"
 msgstr "Priorytet migawki"
 
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
 msgid "Aperture Priority"
 msgstr "Priorytet przysłony"
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
 msgid "Bulb"
 msgstr "Bulb"
 
-#: src/pentaxmn.cpp:442
+#: src/pentaxmn.cpp:504
 msgid "Hi-speed Program"
 msgstr "Program Hi-speed"
 
-#: src/pentaxmn.cpp:443
+#: src/pentaxmn.cpp:505
 msgid "DOF Program"
 msgstr "Program DOF"
 
-#: src/pentaxmn.cpp:448
+#: src/pentaxmn.cpp:510
 msgid "Program Tv Shift"
 msgstr "Program Tv Shift"
 
-#: src/pentaxmn.cpp:449
+#: src/pentaxmn.cpp:511
 msgid "Program Av Shift"
 msgstr "Program Av Shift"
 
-#: src/pentaxmn.cpp:452
+#: src/pentaxmn.cpp:514
 msgid "Aperture Priority (Off-Auto-Aperture)"
 msgstr "Priorytet przysłony (wyłączona automatyczna przysłona)"
 
-#: src/pentaxmn.cpp:453
+#: src/pentaxmn.cpp:515
 msgid "Manual (Off-Auto-Aperture)"
 msgstr "Manualny (wyłączona automatyczna przysłona)"
 
-#: src/pentaxmn.cpp:454
+#: src/pentaxmn.cpp:516
 msgid "Bulb (Off-Auto-Aperture)"
 msgstr "Bulb (wyłączona automatyczna przysłona)"
 
-#: src/pentaxmn.cpp:456
+#: src/pentaxmn.cpp:518
 msgid "Shutter Priority"
 msgstr "Priorytet migawki"
 
-#: src/pentaxmn.cpp:457
+#: src/pentaxmn.cpp:519
 msgid "Shutter & Aperture Priority AE"
 msgstr "Priorytet migawki i przysłony AE"
 
-#: src/pentaxmn.cpp:458
+#: src/pentaxmn.cpp:520
 msgid "Shutter & Aperture Priority AE (1)"
 msgstr "Priorytet migawki i przysłony AE (1)"
 
-#: src/pentaxmn.cpp:459
+#: src/pentaxmn.cpp:521
 msgid "Sensitivity Priority AE"
 msgstr "Priorytet czułości AE"
 
-#: src/pentaxmn.cpp:460
+#: src/pentaxmn.cpp:522
 msgid "Sensitivity Priority AE (1)"
 msgstr "Priorytet czułości AE (1)"
 
-#: src/pentaxmn.cpp:461
+#: src/pentaxmn.cpp:523
+#, fuzzy
 msgid "Flash X-Sync Speed AE"
-msgstr ""
+msgstr "Synchronizacja flesza Av"
 
-#: src/pentaxmn.cpp:462
+#: src/pentaxmn.cpp:524
+#, fuzzy
 msgid "Flash X-Sync Speed AE (1)"
+msgstr "Synchronizacja flesza Av"
+
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
 msgstr ""
 
-#: src/pentaxmn.cpp:471
+#: src/pentaxmn.cpp:535
 #, fuzzy
 msgid "Continuous (Hi)"
 msgstr "Ciągły (Hi)"
 
-#: src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
 msgid "Burst"
 msgstr "Seria"
 
-#: src/pentaxmn.cpp:473
+#: src/pentaxmn.cpp:538
 msgid "Self-timer (12 sec)"
 msgstr "Samowyzwalacz (12 s)"
 
-#: src/pentaxmn.cpp:474
+#: src/pentaxmn.cpp:539
 msgid "Self-timer (2 sec)"
 msgstr "Samowyzwalacz (2 s)"
 
-#: src/pentaxmn.cpp:475
+#: src/pentaxmn.cpp:540
 msgid "Remote Control (3 sec)"
 msgstr "Sterowanie podczerwienią (3 s)"
 
-#: src/pentaxmn.cpp:476
+#: src/pentaxmn.cpp:541
 msgid "Remote Control"
 msgstr "Sterowanie podczerwienią"
 
-#: src/pentaxmn.cpp:477
-msgid "Multiple Exposure"
-msgstr "Wielokrotna ekspozycja"
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
+#, fuzzy
+msgid "Video"
+msgstr "Szeroki"
 
-#: src/pentaxmn.cpp:488
+#: src/pentaxmn.cpp:554
 msgid "M-42 or No Lens"
 msgstr "M-42 lub brak obiektywu"
 
-#: src/pentaxmn.cpp:489
+#: src/pentaxmn.cpp:555
 msgid "K,M Lens"
 msgstr "Obiektyw K,M"
 
-#: src/pentaxmn.cpp:490
+#: src/pentaxmn.cpp:556
 msgid "A Series Lens"
 msgstr "Obiektyw serii A"
 
-#: src/pentaxmn.cpp:625
+#: src/pentaxmn.cpp:703
 msgid "Bright"
 msgstr "Jasny"
 
-#: src/pentaxmn.cpp:628
+#: src/pentaxmn.cpp:706
 msgid "Vibrant"
 msgstr "Jaskrawy"
 
-#: src/pentaxmn.cpp:641
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
+msgstr ""
+
+#: src/pentaxmn.cpp:720
 #, fuzzy
 msgid "Weakest"
 msgstr "Najsłabsze"
 
-#: src/pentaxmn.cpp:642
+#: src/pentaxmn.cpp:721
 msgid "Weak"
 msgstr "Słabe"
 
-#: src/pentaxmn.cpp:643
+#: src/pentaxmn.cpp:722
 msgid "Strong"
 msgstr "Silne"
 
-#: src/pentaxmn.cpp:752
+#: src/pentaxmn.cpp:832
 msgid "No extended bracketing"
 msgstr ""
 
-#: src/pentaxmn.cpp:758
+#: src/pentaxmn.cpp:838
 msgid "WB-BA"
 msgstr "WB-BA"
 
-#: src/pentaxmn.cpp:761
+#: src/pentaxmn.cpp:841
 msgid "WB-GM"
 msgstr "WB-GM"
 
-#: src/pentaxmn.cpp:773
+#: src/pentaxmn.cpp:853
 msgid "Unknown "
 msgstr "Nieznane"
 
-#: src/pentaxmn.cpp:786
+#: src/pentaxmn.cpp:866
 msgid "Pentax Makernote version"
 msgstr "Wersja Pentax Makernote"
 
-#: src/pentaxmn.cpp:789
+#: src/pentaxmn.cpp:869
 msgid "Camera shooting mode"
 msgstr "Tryb pracy aparatu"
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
 msgid "Resolution of a preview image"
 msgstr "Rozdzielczość obrazu podglądu"
 
-#: src/pentaxmn.cpp:794
+#: src/pentaxmn.cpp:874
 msgid "Length of a preview image"
 msgstr "Długość obrazu podglądu"
 
-#: src/pentaxmn.cpp:795
+#: src/pentaxmn.cpp:875
 msgid "Size of an IFD containing a preview image"
 msgstr "Rozmiar IFD zawierającego obrazu podglądu"
 
-#: src/pentaxmn.cpp:800
+#: src/pentaxmn.cpp:880
 msgid "Model identification"
 msgstr "Identyfikacja modelu"
 
-#: src/pentaxmn.cpp:801
+#: src/pentaxmn.cpp:881
 msgid "Pentax model idenfication"
 msgstr "Identyfikacja modelu Pentax"
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
 msgid "Date"
 msgstr "Data"
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
 msgid "Time"
 msgstr "Czas"
 
-#: src/pentaxmn.cpp:810
+#: src/pentaxmn.cpp:890
 msgid "Image quality settings"
 msgstr "Ustawienia jakości obrazu"
 
-#: src/pentaxmn.cpp:813
+#: src/pentaxmn.cpp:893
 msgid "Image size settings"
 msgstr "Ustawienia rozmiaru obrazu"
 
-#: src/pentaxmn.cpp:817
+#: src/pentaxmn.cpp:897
 msgid "Flash mode settings"
 msgstr "Ustawienia trybu flesza"
 
-#: src/pentaxmn.cpp:820
+#: src/pentaxmn.cpp:900
 msgid "Focus mode settings"
 msgstr "Ustawienia trybu ostrzenia"
 
-#: src/pentaxmn.cpp:823
+#: src/pentaxmn.cpp:903
 msgid "Selected AF point"
 msgstr "Wybrany punkt AF"
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+#, fuzzy
+msgid "AF point in focus"
+msgstr "Użyte punkty AF"
+
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
 msgid "F-Number"
 msgstr "Liczba F"
 
-#: src/pentaxmn.cpp:832
+#: src/pentaxmn.cpp:915
 msgid "ISO sensitivity"
 msgstr "Czułość ISO"
 
-#: src/pentaxmn.cpp:833
+#: src/pentaxmn.cpp:916
 msgid "ISO sensitivity settings"
 msgstr "Ustawienia czułości ISO"
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
 msgid "MeteringMode"
 msgstr "Tryb pomiaru"
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
 msgid "AutoBracketing"
 msgstr "Auto bracketing"
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
 msgid "White ballance"
 msgstr "Balans bieli"
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
 msgid "White ballance mode"
 msgstr "Tryb balansu bieli"
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
+#: src/pentaxmn.cpp:936
+#, fuzzy
+msgid "Blue color balance"
+msgstr "Balans niebieskiego"
+
+#: src/pentaxmn.cpp:939
+#, fuzzy
+msgid "Red color balance"
+msgstr "Balans kolorów"
+
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
 msgid "FocalLength"
 msgstr "Długość ogniskowej"
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
 msgid "Location"
 msgstr "Położenie"
 
-#: src/pentaxmn.cpp:869
+#: src/pentaxmn.cpp:959
 #, fuzzy
 msgid "Hometown"
 msgstr "Miasto"
 
-#: src/pentaxmn.cpp:875
+#: src/pentaxmn.cpp:965
 msgid "Hometown DST"
 msgstr "Miasto - czas letni"
 
-#: src/pentaxmn.cpp:876
+#: src/pentaxmn.cpp:966
 msgid "Whether day saving time is active in home town"
 msgstr "Określa czy czas letni jest aktywny w mieście"
 
-#: src/pentaxmn.cpp:878
+#: src/pentaxmn.cpp:968
 msgid "Destination DST"
 msgstr "Cel - czas letni"
 
-#: src/pentaxmn.cpp:879
+#: src/pentaxmn.cpp:969
 msgid "Whether day saving time is active in destination"
 msgstr "Określa czy czas letni jest aktywny w celu"
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
 msgid "DSPFirmwareVersion"
 msgstr "Wersja firmware DSP"
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
 msgid "CPUFirmwareVersion"
 msgstr "Wersja firmware CPU"
 
-#: src/pentaxmn.cpp:891
+#: src/pentaxmn.cpp:981
 msgid "Light value"
 msgstr "Wartość światła"
 
-#: src/pentaxmn.cpp:892
+#: src/pentaxmn.cpp:982
 msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 "Wartość światła obliczona przez aparat, uwzględnia kompensację ekspozycji"
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+#, fuzzy
+msgid "Image area offset"
+msgstr "Rozmiar danych obrazu"
+
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+#, fuzzy
+msgid "Raw image size"
+msgstr "Rozmiar obrazu"
+
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
 msgid "Preview image borders"
 msgstr "Granice obrazu podglądu"
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
 msgid "Sensitivity adjust"
 msgstr "Poprawka czułości"
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
 msgid "Digital filter"
 msgstr "Filtr cyfrowy"
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: src/pentaxmn.cpp:923
+#: src/pentaxmn.cpp:1019
 msgid "Camera temperature"
 msgstr "Temperatura aparatu"
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
 msgid "Image tone"
 msgstr "Tonacja obrazu"
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
 msgid "Colort temperature"
 msgstr "Temperatura koloru"
 
-#: src/pentaxmn.cpp:943
+#: src/pentaxmn.cpp:1039
 msgid "Shake reduction"
 msgstr "Redukcja wstrząsów"
 
-#: src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:1040
 msgid "Shake reduction information"
 msgstr "Informacja o redukcji wstrząsów"
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
 msgid "Dynamic range expansion"
 msgstr "Rozszerzenie dynamiczny zakresu"
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
 msgid "High ISO noise reduction"
 msgstr "Redukcja szumów przy długiej ekspozycji"
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+#, fuzzy
+msgid "AF Adjustment"
+msgstr "Dopasowanie odcieni"
+
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
 msgid "Black point"
 msgstr "Punkt czerni"
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
 msgid "White point"
 msgstr "Punkt bieli"
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
+#, fuzzy
 msgid "ShotInfo"
-msgstr ""
+msgstr "Informacje o zdjęciu"
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
 msgid "AEInfo"
 msgstr "Informacja o automatycznej ekspozycji"
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
 msgid "LensInfo"
 msgstr "Informacja o obiektywie"
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
 msgid "FlashInfo"
 msgstr "Informacja o fleszu"
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
 msgid "AEMeteringSegments"
 msgstr "Pola Pomiaru AE"
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
+#, fuzzy
 msgid "FlashADump"
-msgstr ""
+msgstr "Kompensacja błysku"
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
+#, fuzzy
 msgid "FlashBDump"
-msgstr ""
+msgstr "Kompensacja błysku"
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
+#, fuzzy
 msgid "WB_RGGBLevelsDaylight"
-msgstr ""
+msgstr "Poziomy balansu bieli RGGB"
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
+#, fuzzy
 msgid "WB_RGGBLevelsShade"
-msgstr ""
+msgstr "Poziomy balansu bieli RGGB"
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
+#, fuzzy
 msgid "WB_RGGBLevelsCloudy"
-msgstr ""
+msgstr "Poziomy balansu bieli RGGB"
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
+#, fuzzy
 msgid "WB_RGGBLevelsTungsten"
-msgstr ""
+msgstr "Poziomy balansu bieli RGGB"
 
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
+#, fuzzy
 msgid "WB_RGGBLevelsFluorescentD"
-msgstr ""
+msgstr "Fluorescencja biała"
 
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
+#, fuzzy
 msgid "WB_RGGBLevelsFluorescentN"
-msgstr ""
+msgstr "Fluorescencja biała"
 
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
+#, fuzzy
 msgid "WB_RGGBLevelsFluorescentW"
-msgstr ""
+msgstr "Fluorescencja biała"
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
+#, fuzzy
 msgid "WB_RGGBLevelsFlash"
-msgstr ""
+msgstr "Poziomy balansu bieli RGGB"
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
 msgid "CameraInfo"
 msgstr "Informacja o aparacie"
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
 msgid "BatteryInfo"
 msgstr "Informacja o baterii"
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
 msgid "AFInfo"
 msgstr "Tryb ogniskowania"
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
 msgid "ColorInfo"
 msgstr "Informacja o kolorze"
 
-#: src/pentaxmn.cpp:1023
+#: src/pentaxmn.cpp:1125
 msgid "Unknown PentaxMakerNote tag"
 msgstr "Nieznany znacznik PentaxMakerNote"
 
-#: src/properties.cpp:92
+#: src/properties.cpp:97
 msgid "Dublin Core schema"
 msgstr "Schemat Dublin Core"
 
-#: src/properties.cpp:93
+#: src/properties.cpp:98
 msgid "digiKam Photo Management schema"
 msgstr "Schemat digiKam Photo Management"
 
-#: src/properties.cpp:94
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
+msgstr ""
+
+#: src/properties.cpp:100
 msgid "XMP Basic schema"
 msgstr "Schemat Basic XMP"
 
-#: src/properties.cpp:95
+#: src/properties.cpp:101
 msgid "XMP Rights Management schema"
 msgstr "Schemat XMP Rights Management"
 
-#: src/properties.cpp:96
+#: src/properties.cpp:102
 msgid "XMP Media Management schema"
 msgstr "Schemat XMP Media Management"
 
-#: src/properties.cpp:97
+#: src/properties.cpp:103
 msgid "XMP Basic Job Ticket schema"
 msgstr "Schemat XMP Basic Job Ticket"
 
-#: src/properties.cpp:98
+#: src/properties.cpp:104
 msgid "XMP Paged-Text schema"
 msgstr "Schemat XMP Paged-Text"
 
-#: src/properties.cpp:99
+#: src/properties.cpp:105
 msgid "XMP Dynamic Media schema"
 msgstr "Schemat XMP Dynamic Media"
 
-#: src/properties.cpp:100
+#: src/properties.cpp:106
 msgid "Microsoft Photo schema"
 msgstr "Schemat Microsoft Photo"
 
-#: src/properties.cpp:101
+#: src/properties.cpp:107
 msgid "Adobe PDF schema"
 msgstr "Schemat Adobe PDF"
 
-#: src/properties.cpp:102
+#: src/properties.cpp:108
 msgid "Adobe photoshop schema"
 msgstr "Schemat Adobe Photoshop"
 
-#: src/properties.cpp:103
+#: src/properties.cpp:109
 msgid "Camera Raw schema"
 msgstr "Schemat Camera RAW"
 
-#: src/properties.cpp:104
+#: src/properties.cpp:110
 msgid "Exif Schema for TIFF Properties"
 msgstr "Schemat Exif dla właściwości TIFF"
 
-#: src/properties.cpp:105
+#: src/properties.cpp:111
 msgid "Exif schema for Exif-specific Properties"
 msgstr "Schemat Exif dla właściwości specyficznych dla Exif"
 
-#: src/properties.cpp:106
+#: src/properties.cpp:112
 msgid "Exif schema for Additional Exif Properties"
 msgstr "Schemat Exif dla dodatkowych właściwości TIFF"
 
-#: src/properties.cpp:107
+#: src/properties.cpp:113
 msgid "IPTC Core schema"
 msgstr "Schemat IPTC Core"
 
-#: src/properties.cpp:109
+#: src/properties.cpp:115
 msgid "IPTC Extension schema"
 msgstr "Schemat IPTC Extension"
 
-#: src/properties.cpp:111
+#: src/properties.cpp:117
 msgid "PLUS License Data Format schema"
 msgstr "Schemat PLUS License Data Format"
 
-#: src/properties.cpp:114
+#: src/properties.cpp:118
+#, fuzzy
+msgid "iView Media Pro schema"
+msgstr "Schemat XMP Dynamic Media"
+
+#: src/properties.cpp:119
+#, fuzzy
+msgid "Expression Media schema"
+msgstr "Schemat IPTC Extension"
+
+#: src/properties.cpp:122
 msgid "Colorant structure"
 msgstr "Struktura barwnika"
 
-#: src/properties.cpp:115
+#: src/properties.cpp:123
 msgid "Dimensions structure"
 msgstr "Struktura wymiarów"
 
-#: src/properties.cpp:116
+#: src/properties.cpp:124
 msgid "Font structure"
 msgstr "Struktura czcionki"
 
-#: src/properties.cpp:117
+#: src/properties.cpp:125
 msgid "Thumbnail structure"
 msgstr "Struktura miniatury"
 
-#: src/properties.cpp:118
+#: src/properties.cpp:126
+#, fuzzy
 msgid "Resource Event structure"
-msgstr ""
+msgstr "Struktura kolekcji"
 
-#: src/properties.cpp:119
+#: src/properties.cpp:127
 #, fuzzy
 msgid "ResourceRef structure"
 msgstr "Struktura kolekcji"
 
-#: src/properties.cpp:120
+#: src/properties.cpp:128
 msgid "Version structure"
 msgstr "Struktura wersji"
 
-#: src/properties.cpp:121
+#: src/properties.cpp:129
 #, fuzzy
 msgid "Basic Job/Workflow structure"
 msgstr "Struktura sposobu pracy"
 
-#: src/properties.cpp:124
+#: src/properties.cpp:132
 #, fuzzy
 msgid "Qualifier for xmp:Identifier"
 msgstr "Kwalifikator dla xmp:Identifier"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributor"
 msgstr "Współpraca"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributors to the resource (other than the authors)."
 msgstr ""
 "Współpracownicy i inne osoby które przyczyniły się do powstania zasobu (inne "
 "niż autorzy)."
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid "Coverage"
 msgstr "Tematyka"
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid ""
 "The spatial or temporal topic of the resource, the spatial applicability of "
 "the resource, or the jurisdiction under which the resource is relevant."
 msgstr ""
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid "Creator"
 msgstr "Autor"
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid ""
 "The authors of the resource (listed in order of precedence, if significant)."
 msgstr ""
 "Autor(zy) zasobu (wymienieni w kolejności ich ważności, jeśli to ma "
 "znaczenie)."
 
-#: src/properties.cpp:132
+#: src/properties.cpp:140
 msgid "Date(s) that something interesting happened to the resource."
 msgstr "Data (daty) kiedy zdarzyło się coś interesującego w związku z zasobem."
 
-#: src/properties.cpp:133
+#: src/properties.cpp:141
 msgid ""
 "A textual description of the content of the resource. Multiple values may be "
 "present for different languages."
@@ -10696,11 +13885,11 @@
 "Tekstowy opis zawartości zasobu. Może zawierać wiele wartości dla różnych "
 "języków."
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid "Format"
 msgstr "Format"
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid ""
 "The file format used when saving the resource. Tools and applications should "
 "set this property to the save format of the data. It may include appropriate "
@@ -10710,11 +13899,11 @@
 "tą właściwość na format zapisu danych. Może zawierać odpowiednie "
 "kwalifikatory."
 
-#: src/properties.cpp:137 src/properties.cpp:180
+#: src/properties.cpp:145 src/properties.cpp:196
 msgid "Identifier"
 msgstr "Identyfikator"
 
-#: src/properties.cpp:137
+#: src/properties.cpp:145
 msgid ""
 "Unique identifier of the resource. Recommended best practice is to identify "
 "the resource by means of a string conforming to a formal identification "
@@ -10723,15 +13912,15 @@
 "Unikalny identyfikator zasobu. Zalecane jest identyfikowanie zasobu za "
 "pomocą wyrażeń zgodnych z konwencjonalnym systemem identyfikacji."
 
-#: src/properties.cpp:139
+#: src/properties.cpp:147
 msgid "An unordered array specifying the languages used in the resource."
 msgstr "Nieuporządkowana tablica określająca języki użyte w zasobie."
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 #, fuzzy
 msgid ""
 "An entity responsible for making the resource available. Examples of a "
@@ -10741,44 +13930,47 @@
 "Organ odpowiedzialny za udostępnienie zasobu. Przykładowo może zawierać "
 "osobę, organizację lub usługę. Zazwyczaj podaje się nazwę wydawcy."
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid "Relation"
 msgstr "Powiązanie"
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
+#, fuzzy
 msgid ""
 "Relationships to other documents. Recommended best practice is to identify "
 "the related resource by means of a string conforming to a formal "
 "identification system."
 msgstr ""
+"Unikalny identyfikator zasobu. Zalecane jest identyfikowanie zasobu za "
+"pomocą wyrażeń zgodnych z konwencjonalnym systemem identyfikacji."
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 #, fuzzy
 msgid "Rights"
 msgstr "Własność"
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid ""
 "Informal rights statement, selected by language. Typically, rights "
 "information includes a statement about various property rights associated "
 "with the resource, including intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:148
+#: src/properties.cpp:156
 msgid "Unique identifier of the work from which this resource was derived."
 msgstr "Unikalny identyfikator pracy, z której pochodzi ten zasób."
 
-#: src/properties.cpp:149
+#: src/properties.cpp:157
 msgid ""
 "An unordered array of descriptive phrases or keywords that specify the topic "
 "of the content of the resource."
 msgstr ""
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid ""
 "The title of the document, or the name given to the resource. Typically, it "
 "will be a name by which the resource is formally known."
@@ -10786,63 +13978,104 @@
 "Tytuł dokumentu lub nazwa nadana zasobowi. Zazwyczaj będzie to nazwa pod "
 "którą zasób jest oficjalnie znany."
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "Type"
 msgstr "Typ"
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "A document type; for example, novel, poem, or working paper."
 msgstr "Typ dokumentu, na przykład: powieść, wiersz, dokument techniczny."
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid "Tags List"
 msgstr "Lista znaczników"
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid ""
 "The list of complete tags path as string. The path hierarchy is separated by "
 "'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
 msgstr ""
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 #, fuzzy
 msgid "Captions Author Names"
 msgstr "Nazwa państwa"
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 msgid ""
 "The list of all captions author names for each language alternative captions "
 "set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 #, fuzzy
 msgid "Captions Date Time Stamps"
 msgstr "Aktualizacja znacznika czasu"
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 msgid ""
 "The list of all captions date time stamps for each language alternative "
 "captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:168
+#: src/properties.cpp:170 src/tags.cpp:842
+#, fuzzy
+msgid "Image History"
+msgstr "Wysokość obrazu"
+
+#: src/properties.cpp:170
+msgid ""
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
+msgstr ""
+
+#: src/properties.cpp:171
+#, fuzzy
+msgid "Lens Correction Settings"
+msgstr "Ustawienia danych obiektywu"
+
+#: src/properties.cpp:171
+msgid ""
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
+msgstr ""
+
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
+msgstr ""
+
+#: src/properties.cpp:177
+msgid ""
+"The list of files processed with Enfuse program through ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:178
+#, fuzzy
+msgid "Enfuse Settings"
+msgstr "Ustawienie odcieni"
+
+#: src/properties.cpp:178
+msgid ""
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:184
 #, fuzzy
 msgid "Advisory"
 msgstr "Pomocniczy"
 
-#: src/properties.cpp:168
+#: src/properties.cpp:184
 msgid ""
 "An unordered array specifying properties that were edited outside the "
 "authoring application. Each item should contain a single namespace and XPath "
 "separated by one ASCII space (U+0020)."
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid "Base URL"
 msgstr "Bazowy URL"
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid ""
 "The base URL for relative URLs in the document content. If this document "
 "contains Internet links, and those links are relative, they are relative to "
@@ -10851,20 +14084,20 @@
 "based on their notion of where URLs will be interpreted."
 msgstr ""
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 #, fuzzy
 msgid "The date and time the resource was originally created."
 msgstr "Data i czas zapisania obrazu jako danych cyfrowych."
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid "Creator Tool"
 msgstr "Narzędzie tworzące"
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid ""
 "The name of the first known tool used to create the resource. If history is "
 "present in the metadata, this value should be equivalent to that of xmpMM:"
@@ -10874,7 +14107,7 @@
 "metadanych jest zawarta historia, wartość ta powinna być równa właściwości "
 "xmpMM:History's softwareAgent."
 
-#: src/properties.cpp:180
+#: src/properties.cpp:196
 msgid ""
 "An unordered array of text strings that unambiguously identify the resource "
 "within a given context. An array item may be qualified with xmpidq:Scheme to "
@@ -10884,11 +14117,11 @@
 "(single-valued) property."
 msgstr ""
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid "Label"
 msgstr "Etykieta"
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid ""
 "A word or short phrase that identifies a document as a member of a user-"
 "defined collection. Used to organize documents in a file browser."
@@ -10897,11 +14130,11 @@
 "(grupy) zdefiniowanej przez użytkownika. Jest to pomocne do porządkowania "
 "dokumentów w przeglądarce plików."
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid "Metadata Date"
 msgstr "Data metadanych"
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid ""
 "The date and time that any metadata for this resource was last changed. It "
 "should be the same as or more recent than xmp:ModifyDate."
@@ -10909,11 +14142,11 @@
 "Data i czas kiedy metadane tego zasobu zostały ostatnio zmienione. Powinny "
 "być takie same lub młodsze niż te w xmp:ModifyDate."
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid "Modify Date"
 msgstr "Data modyfikacji"
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid ""
 "The date and time the resource was last modified. Note: The value of this "
 "property is not necessarily the same as the file's system modification date "
@@ -10923,30 +14156,30 @@
 "musi być taka sama jak systemowa data modyfikacji pliku, ponieważ jest ona "
 "ustawiana przed zapisem pliku."
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "A short informal name for the resource."
 msgstr "Krótka nazwa zasobu."
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid "Rating"
 msgstr "Ocena"
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid ""
 "A number that indicates a document's status relative to other documents, "
 "used to organize documents in a file browser. Values are user-defined within "
 "an application-defined range."
 msgstr ""
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid "Thumbnails"
 msgstr "Miniatury"
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 #, fuzzy
 msgid ""
 "An alternative array of thumbnail images for a file, which can differ in "
@@ -10955,46 +14188,47 @@
 "Alternatywna tablica obrazów miniatur dla pliku, które mogą różnić się "
 "swoimi charakterystykami, np. rozmiarem lub kodowaniem obrazu."
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Certificate"
 msgstr "Certyfikat"
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 #, fuzzy
 msgid "Online rights management certificate."
 msgstr "Certyfikat praw zarządzania online."
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 msgid "Marked"
 msgstr "Zaznaczone"
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
+#, fuzzy
 msgid "Indicates that this is a rights-managed resource."
-msgstr ""
+msgstr "Data (daty) kiedy zdarzyło się coś interesującego w związku z zasobem."
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "Owner"
 msgstr "Właściciel"
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "An unordered array specifying the legal owner(s) of a resource."
 msgstr ""
 "Nieuporządkowana tablica określająca prawnego właściciela (właścicieli) "
 "zasobu."
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Usage Terms"
 msgstr "Warunki użytkowania"
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Text instructions on how a resource can be legally used."
 msgstr "Instrukcje tekstowe o sposobie legalnego użycia zasobu."
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid "Web Statement"
 msgstr "Strona oświadczenia"
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid ""
 "The location of a web page describing the owner and/or rights statement for "
 "this resource."
@@ -11002,11 +14236,11 @@
 "Lokalizacja strony internetowej określającej prawa użytkowania i właściciela "
 "tego zasobu."
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid "Derived From"
 msgstr "Pochodzenie"
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid ""
 "A reference to the original document from which this one is derived. It is a "
 "minimal reference; missing components can be assumed to be unchanged. For "
@@ -11015,21 +14249,21 @@
 "specify the instance ID and rendition class of the original."
 msgstr ""
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid "Document ID"
 msgstr "Identyfikator dokumentu"
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid ""
 "The common identifier for all versions and renditions of a document. It "
 "should be based on a UUID; see Document and Instance IDs below."
 msgstr ""
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid "History"
 msgstr "Historia"
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid ""
 "An ordered array of high-level user actions that resulted in this resource. "
 "It is intended to give human readers a general indication of the steps taken "
@@ -11038,24 +14272,24 @@
 "other detailed history."
 msgstr ""
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 #, fuzzy
 msgid "Instance ID"
 msgstr "Identyfikator ikony"
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid ""
 "An identifier for a specific incarnation of a document, updated each time a "
 "file is saved. It should be based on a UUID; see Document and Instance IDs "
 "below."
 msgstr ""
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 #, fuzzy
 msgid "Managed From"
 msgstr "Odczytywanie z"
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid ""
 "A reference to the document as it was prior to becoming managed. It is set "
 "when a managed document is introduced to an asset management system that "
@@ -11063,24 +14297,24 @@
 "management systems."
 msgstr ""
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 #, fuzzy
 msgid "Manager"
 msgstr "Menedżer"
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid ""
 "The name of the asset management system that manages this resource. Along "
 "with xmpMM: ManagerVariant, it tells applications which asset management "
 "system to contact concerning this document."
 msgstr ""
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 #, fuzzy
 msgid "Manage To"
 msgstr "Zarządzanie"
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 msgid ""
 "A URI identifying the managed resource to the asset management system; the "
 "presence of this property is the formal indication that this resource is "
@@ -11088,53 +14322,53 @@
 "system."
 msgstr ""
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 #, fuzzy
 msgid "Manage UI"
 msgstr "Obiekt kontrolujący"
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 msgid ""
 "A URI that can be used to access information about the managed resource "
 "through a web browser. It might require a custom browser plug-in."
 msgstr ""
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 #, fuzzy
 msgid "Manager Variant"
 msgstr "Wariant zarządzania"
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 msgid ""
 "Specifies a particular variant of the asset management system. The format of "
 "this property is private to the specific asset management system."
 msgstr ""
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid "Rendition Class"
 msgstr "Klasa wykonania"
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid ""
 "The rendition class name for this resource. This property should be absent "
 "or set to default for a document version that is not a derived rendition."
 msgstr ""
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid "Rendition Params"
 msgstr "Parametry wykonania"
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid ""
 "Can be used to provide additional rendition parameters that are too complex "
 "or verbose to encode in xmpMM: RenditionClass."
 msgstr ""
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid "Version ID"
 msgstr "Identyfikator wersji"
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid ""
 "The document version identifier for this resource. Each version of a "
 "document gets a new identifier, usually simply by incrementing integers 1, "
@@ -11142,11 +14376,11 @@
 "support branching which requires a more complex scheme."
 msgstr ""
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid "Versions"
 msgstr "Wersje"
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid ""
 "The version history associated with this resource. Entry [1] is the oldest "
 "known version for this document, entry [last()] is the most recent version. "
@@ -11157,39 +14391,39 @@
 "the version history can be truncated at some point."
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Last URL"
 msgstr "Bazowy URL"
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 #, fuzzy
 msgid "Deprecated for privacy protection."
 msgstr "Zdeprecjonowane dla ochrony prywatności."
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid "Rendition Of"
 msgstr "Wykonanie"
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid ""
 "Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
 "which this is a rendition."
 msgstr ""
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Save ID"
 msgstr "Identyfikator zapisu"
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
 msgstr ""
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 #, fuzzy
 msgid "Job Reference"
 msgstr "Odnośnik pracy"
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 msgid ""
 "References an external job management file for a job process in which the "
 "document is being used. Use of job names is under user control. Typical use "
@@ -11199,30 +14433,31 @@
 "historical information about what jobs a document was part of previously."
 msgstr ""
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid "Maximum Page Size"
 msgstr "Maksymalny rozmiar strony"
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
+#, fuzzy
 msgid ""
 "The size of the largest page in the document (including any in contained "
 "documents)."
-msgstr ""
+msgstr "Liczba stron w dokumencie (uwzględniająca również dokumenty zawarte)."
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid "Number of Pages"
 msgstr "Liczba stron"
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid ""
 "The number of pages in the document (including any in contained documents)."
 msgstr "Liczba stron w dokumencie (uwzględniająca również dokumenty zawarte)."
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid ""
 "An unordered array of fonts that are used in the document (including any in "
 "contained documents)."
@@ -11230,73 +14465,79 @@
 "Nieuporządkowana tablica czcionek użytych w dokumencie (zawierająca również "
 "czcionki z dokumentów zawartych)."
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid "Colorants"
 msgstr "Barwniki"
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
+#, fuzzy
 msgid ""
 "An ordered array of colorants (swatches) that are used in the document "
 "(including any in contained documents)."
 msgstr ""
+"Nieuporządkowana tablica czcionek użytych w dokumencie (zawierająca również "
+"czcionki z dokumentów zawartych)."
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid "Plate Names"
 msgstr "Nazwy płyt"
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
+#, fuzzy
 msgid ""
 "An ordered array of plate names that are needed to print the document "
 "(including any in contained documents)."
 msgstr ""
+"Nieuporządkowana tablica czcionek użytych w dokumencie (zawierająca również "
+"czcionki z dokumentów zawartych)."
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "Project Reference"
 msgstr "Odniesienie do projektu"
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "A reference to the project that created this file."
 msgstr "Odnośnik do projektu w ramach którego utworzono ten plik."
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "Video Frame Rate"
 msgstr "Klatek na sekundę"
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "The video frame rate. One of: 24, NTSC, PAL."
 msgstr "Liczba klatek na sekundę. Jedno z: 24, NTSC, PAL."
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "Video Frame Size"
 msgstr "Rozmiar ramki wideo"
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "The frame size. For example: w:720, h: 480, unit:pixels"
 msgstr "Rozmiar ramki, na przykład: w:720, h:480, units:pixels"
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "Video Pixel Aspect Ratio"
 msgstr "Proporcje pikseli wideo"
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
 msgstr ""
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid "Video Pixel Depth"
 msgstr "Głębia pikseli wideo"
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid ""
 "The size in bits of each color component of a pixel. Standard Windows 32-bit "
 "pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid "Video Color Space"
 msgstr "Przestrzeń kolorów wideo"
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid ""
 "The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
 "CCIR-709 (used for HD)."
@@ -11304,453 +14545,455 @@
 "Przestrzeń kolorów. Jedna z: sRGB (używana przez Photoshop), CCIR-601 "
 "(używana dla NTSC), CCIR-709 (używana dla  HD)."
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
+#, fuzzy
 msgid "Video Alpha Mode"
-msgstr ""
+msgstr "Minolta model"
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 msgid "The alpha mode. One of: straight, pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid "Video Alpha Premultiple Color"
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid ""
 "A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
 "is pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "Video Alpha Unity Is Transparent"
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "When true, unity is clear, when false, it is opaque."
 msgstr ""
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video Compressor"
 msgstr "Kompresja wideo"
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video compression used. For example, jpeg."
 msgstr "Użyta kompresja wideo, na przykład JPEG."
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 #, fuzzy
 msgid "Video Field Order"
 msgstr "Kolejność warstw wideo"
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "The field order for video. One of: Upper, Lower, Progressive."
 msgstr ""
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 #, fuzzy
 msgid "Pull Down"
 msgstr "Poklatkowość"
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid ""
 "The sampling phase of film to be converted to video (pull-down). One of: "
 "WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
 "WWWSS_24p, WWSSW_24p."
 msgstr ""
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid "Audio Sample Rate"
 msgstr "Częstotliwość próbkowania dźwięku"
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid ""
 "The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
 msgstr ""
 "Częstotliwość próbkowania dźwięku. Może być dowolną wartością, ale zwykle "
 "wynosi 32000, 41100 lub 48000."
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "Audio Sample Type"
 msgstr "Typ próbkowania dźwięku"
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr "Typ próbkowania dźwięku. Jeden z: 8Int, 16Int, 32Int, 32Float."
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "Audio Channel Type"
 msgstr "Rodzaj kanału dźwięku"
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
 msgstr "Typ kanału dźwięku, jeden z: mono, stereo, 5.1, 7.1."
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "Audio Compressor"
 msgstr "Kompresja dźwięku"
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "The audio compression used. For example, MP3."
 msgstr "Użyta kompresja dźwięku, na przykład MP3."
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid "Speaker Placement"
 msgstr "Położenie głośników"
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid ""
 "A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
 msgstr ""
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 #, fuzzy
 msgid "File Data Rate"
 msgstr "Szybkość transmisji"
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 msgid ""
 "The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
 "sec"
 msgstr ""
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid "Tape Name"
 msgstr "Nazwa taśmy"
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid ""
 "The name of the tape from which the clip was captured, as set during the "
 "capture process."
 msgstr ""
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid "Alternative Tape Name"
 msgstr "Inna nazwa taśmy"
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid ""
 "An alternative tape name, set via the project window or timecode dialog in "
 "Premiere. If an alternative name has been set and has not been reverted, "
 "that name is displayed."
 msgstr ""
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid "Start Time Code"
 msgstr "Początkowy kod czasu"
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid ""
 "The timecode of the first frame of video in the file, as obtained from the "
 "device control."
 msgstr ""
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid "Alternative Time code"
 msgstr "Dodatkowy kod czasu"
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid ""
 "A timecode set by the user. When specified, it is used instead of the "
 "startTimecode."
 msgstr ""
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 msgid "The duration of the media file."
 msgstr "Czas trwania pliku mediów."
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 msgid "Scene"
 msgstr "Scena"
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 msgid "The name of the scene."
 msgstr "Nazwa sceny."
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 msgid "Shot Name"
 msgstr "Nazwa ujęcia"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 #, fuzzy
 msgid "The name of the shot or take."
 msgstr "Nazwa ujęcia."
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 msgid "Shot Date"
 msgstr "Data zrobienia"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 msgid "The date and time when the video was shot."
 msgstr "Data i czas zrobienia wideo."
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid "Shot Location"
 msgstr "Lokalizacja"
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid ""
 "The name of the location where the video was shot. For example: "
 "\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
 "GPS values."
 msgstr ""
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "Log Comment"
 msgstr "Dziennik komentarzy"
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "User's log comments."
 msgstr "Komentarze użytkownika."
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "Markers"
 msgstr "Znaczniki"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 #, fuzzy
 msgid "An ordered list of markers"
 msgstr "Uporządkowana lista znaczników"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 #, fuzzy
 msgid "Contributed Media"
 msgstr "Media składowe"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 msgid "An unordered list of all media used to create this media."
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid "Absolute Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid ""
 "The absolute path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid "Relative Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid ""
 "The relative path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 msgid "Video Modified Date"
 msgstr "Data modyfikacji wideo"
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 msgid "The date and time when the video was last modified."
 msgstr "Data i czas ostatniej modyfikacji wideo."
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 msgid "Audio Modified Date"
 msgstr "Data modyfikacji dźwięku"
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 msgid "The date and time when the audio was last modified."
 msgstr "Data i czas ostatniej modyfikacji dźwięku."
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 msgid "Metadata Modified Date"
 msgstr "Data modyfikacji metadanych"
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 msgid "The date and time when the metadata was last modified."
 msgstr "Data i czas ostatniej modyfikacji metadanych."
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
 msgid "Artist"
 msgstr "Artysta"
 
-#: src/properties.cpp:323
+#: src/properties.cpp:339
 msgid "The name of the artist or artists."
 msgstr "Nazwa artysty lub artystów."
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 msgid "Album"
 msgstr "Album"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 msgid "The name of the album."
 msgstr "Nazwa albumu."
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid "Track Number"
 msgstr "Numer ścieżki"
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid ""
 "A numeric value indicating the order of the audio file within its original "
 "recording."
 msgstr ""
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 msgid "Genre"
 msgstr "Gatunek"
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 msgid "The name of the genre."
 msgstr "Nazwa gatunku."
 
-#: src/properties.cpp:327
+#: src/properties.cpp:343
 msgid "The copyright information."
 msgstr "Informacja o prawach własności."
 
-#: src/properties.cpp:328
+#: src/properties.cpp:344
 msgid "The date the title was released."
 msgstr "Data wydania utworu."
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "The composer's name."
 msgstr "Nazwa (imię i nazwisko) kompozytora."
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "Engineer"
 msgstr "Programista"
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "The engineer's name."
 msgstr "Nazwa (imię i nazwisko) programisty."
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "Tempo"
 msgstr "Tempo"
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "The audio's tempo."
 msgstr "Tempo dźwięku."
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "Instrument"
 msgstr "Instrument"
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "The musical instrument."
 msgstr "Instrument muzyczny."
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 msgid "Intro Time"
 msgstr "Czas wstępu"
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
+#, fuzzy
 msgid "The duration of lead time for queuing music."
-msgstr ""
+msgstr "Czas trwania pliku mediów."
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "Out Cue"
 msgstr "Wyciszenie"
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 #, fuzzy
 msgid "The time at which to fade out."
 msgstr "Czas w którym następuje wyciszenie."
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "Relative Timestamp"
 msgstr "Względny znacznik czasowy"
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "The start time of the media inside the audio project."
 msgstr ""
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "Loop"
 msgstr "Powtarzanie"
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "When true, the clip can be looped seemlessly."
 msgstr ""
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 msgid "Number Of Beats"
 msgstr "Liczba uderzeń"
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 msgid "The number of beats."
 msgstr "Liczba uderzeń."
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid "Key"
 msgstr "Tonacja"
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid ""
 "The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
 msgstr ""
 "Tonacja muzyczna dźwięku. Jeden z: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 #, fuzzy
 msgid "Stretch Mode"
 msgstr "Tryb rozciągnięcia"
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid ""
 "The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
 "Splice, Hybrid."
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 #, fuzzy
 msgid "Time Scale Parameters"
 msgstr "Parametry skali czasowej"
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Additional parameters for Time-Scale stretch mode."
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 #, fuzzy
 msgid "Resample Parameters"
 msgstr "Parametry resamplingu"
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Additional parameters for Resample stretch mode."
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 #, fuzzy
 msgid "Beat Splice Parameters"
 msgstr "Parametry Beat Splice"
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Additional parameters for Beat Splice stretch mode."
 msgstr ""
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid "Time Signature"
 msgstr "Tempo muzyczne"
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid ""
 "The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
 "12/8, other."
 msgstr ""
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid "Scale Type"
 msgstr "Skala muzyczna"
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 #, fuzzy
 msgid ""
 "The musical scale used in the music. One of: Major, Minor, Both, Neither. "
@@ -11758,132 +15001,128 @@
 "drums."
 msgstr "Skala muzyczna użyta w utworze."
 
-#: src/properties.cpp:351 src/tags.cpp:889
+#: src/properties.cpp:367 src/tags.cpp:1076
 msgid "Camera Serial Number"
 msgstr "Numer seryjny aparatu"
 
-#: src/properties.cpp:351
+#: src/properties.cpp:367
 msgid "Camera Serial Number."
 msgstr "Numer seryjny aparatu."
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired"
 msgstr "Data zgrania"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired."
 msgstr "Data zgrania."
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 msgid "Flash Manufacturer"
 msgstr "Producent flesza"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 msgid "Flash Manufacturer."
 msgstr "Producent lampy błyskowej."
 
-#: src/properties.cpp:354
+#: src/properties.cpp:370
 msgid "Flash Model."
 msgstr "Model flesza."
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
 msgid "Last Keyword IPTC"
 msgstr "Ostatnie słowo kluczowe IPTC"
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
 msgid "Last Keyword IPTC."
 msgstr "Ostatnie słowo kluczowe IPTC."
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 msgid "Last Keyword XMP"
 msgstr "Ostatnie słowo kluczowe XMP"
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 msgid "Last Keyword XMP."
 msgstr "Ostatnie słowo kluczowe XMP."
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 #, fuzzy
 msgid "Lens Manufacturer"
 msgstr "Producent obiektywu"
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 msgid "Lens Manufacturer."
 msgstr "Producent obiektywu."
 
-#: src/properties.cpp:358
-msgid "Lens Model"
-msgstr "Model obiektywu"
-
-#: src/properties.cpp:358
+#: src/properties.cpp:374
 msgid "Lens Model."
 msgstr "Model obiektywu."
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 msgid "Rating Percent"
 msgstr "Ocena procentowa"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 msgid "Rating Percent."
 msgstr "Ocena procentowa."
 
-#: src/properties.cpp:365
+#: src/properties.cpp:381
 msgid "Keywords."
 msgstr "Słowa kluczowe."
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "PDF Version"
 msgstr "Wersja PDF"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
 msgstr "Wersja pliku PDF (np. 1.0, 1.3, itd.)."
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "Producer"
 msgstr "Producent"
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "The name of the tool that created the PDF document."
 msgstr "Nazwa narzędzia, które utworzyło dokument PDF."
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 msgid "Authors Position"
 msgstr "Pozycja autora"
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 msgid "By-line title."
 msgstr "Tytuł."
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 msgid "Caption Writer"
 msgstr "Autor tytułu"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 #, fuzzy
 msgid "Writer/editor."
 msgstr "Twórca/edytor."
 
-#: src/properties.cpp:375
+#: src/properties.cpp:391
 msgid "Category. Limited to 3 7-bit ASCII characters."
 msgstr "Kategoria. Ograniczone do 3 siedmiobitowych znaków ASCII."
 
-#: src/properties.cpp:376
+#: src/properties.cpp:392
 msgid "City."
 msgstr "Miasto."
 
-#: src/properties.cpp:377
+#: src/properties.cpp:393
 msgid "Country/primary location."
 msgstr "Państwo/lokalizacja."
 
-#: src/properties.cpp:378
+#: src/properties.cpp:394
 #, fuzzy
 msgid "Credit."
 msgstr "Wyrazy uznania."
 
-#: src/properties.cpp:379
+#: src/properties.cpp:395
 msgid ""
 "The date the intellectual content of the document was created (rather than "
 "the creation date of the physical representation), following IIM "
@@ -11892,376 +15131,377 @@
 "photo was digitized for archiving."
 msgstr ""
 
-#: src/properties.cpp:383
+#: src/properties.cpp:399
 msgid "Headline."
 msgstr "Nagłówek."
 
-#: src/properties.cpp:384
+#: src/properties.cpp:400
 msgid "Special instructions."
 msgstr "Specjalne instrukcje."
 
-#: src/properties.cpp:385
+#: src/properties.cpp:401
 msgid "Source."
 msgstr "Źródło."
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "State"
 msgstr "Stan"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "Province/state."
 msgstr "Prowincja/stan."
 
-#: src/properties.cpp:387
+#: src/properties.cpp:403
 msgid "Supplemental category."
 msgstr "Kategoria dodatkowa."
 
-#: src/properties.cpp:388
+#: src/properties.cpp:404
 #, fuzzy
 msgid "Original transmission reference."
 msgstr "Oryginalne miejsce transmisji."
 
-#: src/properties.cpp:389
+#: src/properties.cpp:405
 msgid "Urgency. Valid range is 1-8."
 msgstr "Pilność, zakres wartości od 1 do 8."
 
-#: src/properties.cpp:397
+#: src/properties.cpp:413
 msgid "inches"
 msgstr "cale"
 
-#: src/properties.cpp:398 src/tags.cpp:227
+#: src/properties.cpp:414 src/tags.cpp:247
 msgid "cm"
 msgstr "cm"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "Auto Brightness"
 msgstr "Automatyczna regulacja jasności"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "When true, \"Brightness\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "Auto Contrast"
 msgstr "Automatyczna regulacja kontrastu"
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "When true, \"Contrast\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "Auto Exposure"
 msgstr "Automatyczna ekspozycja"
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "When true, \"Exposure\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "Auto Shadows"
 msgstr "Automatyczne regulacja cieni"
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "When true,\"Shadows\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 msgid "Blue Hue"
 msgstr "Odcień błękitu"
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 msgid "\"Blue Hue\" setting. Range -100 to 100."
 msgstr "Odcień błękitu, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 msgid "Blue Saturation"
 msgstr "Nasycenie błękitu"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 msgid "\"Blue Saturation\" setting. Range -100 to +100."
 msgstr "Nasycenie błękitu, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:408
+#: src/properties.cpp:424
 msgid "\"Brightness\" setting. Range 0 to +150."
 msgstr "Jasność, zakres wartość od 0 do +150."
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 msgid "Camera Profile"
 msgstr "Profil aparatu"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 msgid "\"Camera Profile\" setting."
 msgstr "Ustawienie \"Profil aparatu\"."
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 msgid "Chromatic Aberration Blue"
 msgstr "Aberracja chromatyczna błękitu"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 msgid ""
 "\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
 msgstr ""
 "Aberracja chromatyczna, korekcja niebieskiej/żółtej obwódki, zakres wartości "
 "od -100 do +100."
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 msgid "Chromatic Aberration Red"
 msgstr "Aberracja chromatyczna czerwieni"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 msgid ""
 "\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
 msgstr ""
 "Aberracja chromatyczna, korekcja czerwonej/niebieskozielonej obwódki, zakres "
 "wartości od -100 do +100."
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 msgid "Color Noise Reduction"
 msgstr "Redukcja szumów kolorów"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
 msgstr "Redukcja szumów kolorów, zakres wartości od 0 do +100."
 
-#: src/properties.cpp:413
+#: src/properties.cpp:429
 msgid "\"Contrast\" setting. Range -50 to +100."
 msgstr "Kontrast, zakres wartości od -50 do +100."
 
-#: src/properties.cpp:414
+#: src/properties.cpp:430
 msgid "When \"Has Crop\" is true, top of crop rectangle"
 msgstr ""
 
-#: src/properties.cpp:415
+#: src/properties.cpp:431
 msgid "When \"Has Crop\" is true, left of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "Crop Bottom"
 msgstr "Przycięcie dół"
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "When \"Has Crop\" is true, bottom of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "Crop Right"
 msgstr "Przycięcie prawo"
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "When \"Has Crop\" is true, right of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "Crop Angle"
 msgstr "Kąt przycięcia"
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "When \"Has Crop\" is true, angle of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:419
+#: src/properties.cpp:435
 msgid "Width of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:420
+#: src/properties.cpp:436
 msgid "Height of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Crop Units"
 msgstr "Jednostki przycięcia"
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
 msgstr ""
 
-#: src/properties.cpp:422
+#: src/properties.cpp:438
 msgid "\"Exposure\" setting. Range -4.0 to +4.0."
 msgstr "Ekspozycja, zakres wartości od -4.0 do +4.0."
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 msgid "GreenHue"
 msgstr "Odcień zieleni"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 msgid "\"Green Hue\" setting. Range -100 to +100."
 msgstr "Odcień zieleni, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 msgid "Green Saturation"
 msgstr "Nasycenie zieleni"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 msgid "\"Green Saturation\" setting. Range -100 to +100."
 msgstr "Nasycenie zieleni, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "Has Crop"
 msgstr "Przycięty"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "When true, image has a cropping rectangle."
 msgstr ""
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "Has Settings"
 msgstr "Ustawienia niestandardowe"
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "When true, non-default camera raw settings."
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 #, fuzzy
 msgid "Luminance Smoothing"
 msgstr "Wygładzenie luminancji"
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
+#, fuzzy
 msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Nasycenie błękitu, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "Raw File Name"
 msgstr "Nazwa pliku Raw"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "File name of raw file (not a complete path)."
 msgstr "Nazwa pliku Raw (nie zawiera ścieżki dostępu)."
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 msgid "Red Hue"
 msgstr "Odcień czerwieni"
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 msgid "\"Red Hue\" setting. Range -100 to +100."
 msgstr "Odcień czerwieni, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 msgid "Red Saturation"
 msgstr "Nasycenie czerwieni"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 msgid "\"Red Saturation\" setting. Range -100 to +100."
 msgstr "Nasycenie czerwieni, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:431
+#: src/properties.cpp:447
 msgid "\"Saturation\" setting. Range -100 to +100."
 msgstr "Nasycenie, zakres wartości od -100 do 100."
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 msgid "Shadows"
 msgstr "Cienie"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 msgid "\"Shadows\" setting. Range 0 to +100."
 msgstr "Cienie, wartości od 0 do +100."
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 msgid "Shadow Tint"
 msgstr "Zabarwienie cieni"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 msgid "\"Shadow Tint\" setting. Range -100 to +100."
 msgstr "Zabarwienie cieni, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:434
+#: src/properties.cpp:450
 msgid "\"Sharpness\" setting. Range 0 to +100."
 msgstr "Ostrość, zakres wartości od 0 do +100."
 
-#: src/properties.cpp:435
+#: src/properties.cpp:451
 msgid "\"Temperature\" setting. Range 2000 to 50000."
 msgstr "Temperatura, zakres wartości od 2000 do 50000."
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 msgid "Tint"
 msgstr "Zabarwienie"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 msgid "\"Tint\" setting. Range -150 to +150."
 msgstr "Zabarwienie, zakres wartości od -150 do +150."
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Tone Curve"
 msgstr "Krzywa tonalna"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
 msgstr ""
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid "Tone Curve Name"
 msgstr "Nazwa krzywej tonalnej"
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid ""
 "The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
 "Contrast, Strong Contrast, Custom or a user-defined preset name."
 msgstr ""
 
-#: src/properties.cpp:440
+#: src/properties.cpp:456
 msgid "Version of Camera Raw plugin."
 msgstr "Wersja wtyczki RAW aparatu."
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 msgid "Vignette Amount"
 msgstr "Wielkość winietowania"
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
 msgid "\"Vignetting Amount\" setting. Range -100 to +100."
 msgstr "Wielkość winietowania, zakres wartości od -100 do +100."
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 msgid "Vignette Midpoint"
 msgstr "Środek winietowania"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
 msgstr "Środek winietowania, zakres wartości od 0 do +100."
 
-#: src/properties.cpp:443
+#: src/properties.cpp:459
 msgid ""
 "\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
 "Tungsten, Fluorescent, Flash, Custom"
 msgstr ""
 
-#: src/properties.cpp:450
+#: src/properties.cpp:466
 msgid "TIFF tag 256, 0x100. Image width in pixels."
 msgstr "Znacznik TIFF 256, 0x100. Szerokość obrazu w pikselach."
 
-#: src/properties.cpp:451 src/tags.cpp:354
+#: src/properties.cpp:467 src/tags.cpp:425
 msgid "Image Length"
 msgstr "Długość obrazu"
 
-#: src/properties.cpp:451
+#: src/properties.cpp:467
 msgid "TIFF tag 257, 0x101. Image height in pixels."
 msgstr "Znacznik TIFF 257, 0x101. Wysokość obrazu w pikselach."
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "Bits Per Sample"
 msgstr "Bitów na próbkę"
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
 msgstr ""
 
-#: src/properties.cpp:453 src/tags.cpp:364
+#: src/properties.cpp:469 src/tags.cpp:435
 msgid "Compression"
 msgstr "Kompresja"
 
-#: src/properties.cpp:453
+#: src/properties.cpp:469
 msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
 msgstr ""
 "Znacznik TIFF 259, 0x103. Schemat kompresji: 1 = nieskompresowany; 6 = JPEG."
 
-#: src/properties.cpp:454 src/tags.cpp:370
+#: src/properties.cpp:470 src/tags.cpp:441
 msgid "Photometric Interpretation"
 msgstr "Interpretacja fotometryczna"
 
-#: src/properties.cpp:454
+#: src/properties.cpp:470
 msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
 msgstr "Znacznik TIFF 262, 0x106. Układ pikseli: 2 = RGB; 6 = YCbCr."
 
-#: src/properties.cpp:455
+#: src/properties.cpp:471
 msgid ""
 "TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
 "0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
@@ -12270,65 +15510,66 @@
 "0th column at bottom 8 = 0th row at left, 0th column at bottom"
 msgstr ""
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 msgid "Samples Per Pixel"
 msgstr "Próbek na piksel"
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
+#, fuzzy
 msgid "TIFF tag 277, 0x115. Number of components per pixel."
-msgstr ""
+msgstr "Znacznik TIFF 257, 0x101. Wysokość obrazu w pikselach."
 
-#: src/properties.cpp:465 src/tags.cpp:432
+#: src/properties.cpp:481 src/tags.cpp:515
 msgid "Planar Configuration"
 msgstr "Konfiguracja powierzchni"
 
-#: src/properties.cpp:465
+#: src/properties.cpp:481
 msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
 msgstr ""
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid "YCbCr Sub Sampling"
 msgstr "Podpróbkowanie YCbCr"
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid ""
 "TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
 "YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
+#: src/properties.cpp:484 src/tags.cpp:718
 msgid "YCbCr Positioning"
 msgstr "Rozmieszczenie YCbCr"
 
-#: src/properties.cpp:468
+#: src/properties.cpp:484
 msgid ""
 "TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
 "centered; 2 = co-sited."
 msgstr ""
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "X Resolution"
 msgstr "Rozdzielczość Y"
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
 msgstr ""
 "Znacznik TIFF 282, 0x11A. Rozdzielczość pozioma w pikselach na jednostkę."
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "Y Resolution"
 msgstr "Rozdzielczość Y"
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
 msgstr ""
 "Znacznik TIFF 283, 0x11B. Rozdzielczość pionowa w pikselach na jednostkę."
 
-#: src/properties.cpp:472 src/tags.cpp:438
+#: src/properties.cpp:488 src/tags.cpp:533
 msgid "Resolution Unit"
 msgstr "Jednostka rozdzielczości"
 
-#: src/properties.cpp:472
+#: src/properties.cpp:488
 msgid ""
 "TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
 "of: 2 = inches; 3 = centimeters."
@@ -12337,50 +15578,50 @@
 "(XResolution) oraz Rozdzielczość Y (YResolution). Wartości: 2 = cale; 3 = "
 "centymetry."
 
-#: src/properties.cpp:474 src/tags.cpp:443
+#: src/properties.cpp:490 src/tags.cpp:538
 msgid "Transfer Function"
 msgstr "Funkcja przejścia"
 
-#: src/properties.cpp:474
+#: src/properties.cpp:490
 msgid ""
 "TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
 "with 3 * 256 entries."
 msgstr ""
 
-#: src/properties.cpp:476 src/tags.cpp:471
+#: src/properties.cpp:492 src/tags.cpp:570
 msgid "White Point"
 msgstr "Biały punkt"
 
-#: src/properties.cpp:476
+#: src/properties.cpp:492
 msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
 msgstr ""
 
-#: src/properties.cpp:477 src/tags.cpp:476
+#: src/properties.cpp:493 src/tags.cpp:575
 msgid "Primary Chromaticities"
 msgstr "Barwy główne"
 
-#: src/properties.cpp:477
+#: src/properties.cpp:493
 msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
 msgstr ""
 
-#: src/properties.cpp:478
+#: src/properties.cpp:494
 msgid ""
 "TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
 msgstr ""
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "Reference Black White"
 msgstr "Czerń/biel odniesienia"
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "TIFF tag 532, 0x214. Reference black and white point values."
 msgstr ""
 
-#: src/properties.cpp:480 src/tags.cpp:455
+#: src/properties.cpp:496 src/tags.cpp:550
 msgid "Date and Time"
 msgstr "Data i czas"
 
-#: src/properties.cpp:480
+#: src/properties.cpp:496
 msgid ""
 "TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
 "and time of image creation (no time zone in EXIF), stored in ISO 8601 "
@@ -12389,11 +15630,11 @@
 "ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
+#: src/properties.cpp:502 src/tags.cpp:463
 msgid "Image Description"
 msgstr "Opis obrazu"
 
-#: src/properties.cpp:486
+#: src/properties.cpp:502
 msgid ""
 "TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
 "in XMP as dc:description."
@@ -12401,25 +15642,20 @@
 "Znacznik TIFF 270, 0x10E. Opis obrazu. Uwaga: ta właściwość jest "
 "przechowywana w XMP jako dc:description."
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 #, fuzzy
 msgid "Make"
 msgstr "Wytwórca"
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
 msgstr "Znacznik TIFF 271, 0x10F. Producent wyposażenia nagrywającego."
 
-#: src/properties.cpp:488
+#: src/properties.cpp:504
 msgid "TIFF tag 272, 0x110. Model name or number of equipment."
 msgstr "Znacznik TIFF 272, 0x110. Nazwa lub numer modelu wyposażenia."
 
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
-msgstr "Oprogramowanie"
-
-#: src/properties.cpp:489
+#: src/properties.cpp:505
 msgid ""
 "TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
 "property is stored in XMP as xmp:CreatorTool. "
@@ -12427,53 +15663,59 @@
 "Znacznik TIFF 305, 0x131. Oprogramowanie lub firmware użyte do utworzenia "
 "obrazu. Uwaga: ta właściwość jest przechowywana w XMP jako xmp:CreatorTool. "
 
-#: src/properties.cpp:491
+#: src/properties.cpp:507
+#, fuzzy
 msgid ""
 "TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
 "property is stored in XMP as the first item in the dc:creator array."
 msgstr ""
+"Znacznik TIFF 305, 0x131. Oprogramowanie lub firmware użyte do utworzenia "
+"obrazu. Uwaga: ta właściwość jest przechowywana w XMP jako xmp:CreatorTool. "
 
-#: src/properties.cpp:493
+#: src/properties.cpp:509
+#, fuzzy
 msgid ""
 "TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
 "in XMP as dc:rights."
 msgstr ""
+"Znacznik TIFF 270, 0x10E. Opis obrazu. Uwaga: ta właściwość jest "
+"przechowywana w XMP jako dc:description."
 
-#: src/properties.cpp:500 src/tags.cpp:1198
+#: src/properties.cpp:516 src/tags.cpp:1388
 msgid "Exif Version"
 msgstr "Wersja Exif"
 
-#: src/properties.cpp:500
+#: src/properties.cpp:516
 msgid "EXIF tag 36864, 0x9000. EXIF version number."
 msgstr "Znacznik EXIF 36864, 0x9000. Numer wersji EXIF."
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "Flashpix Version"
 msgstr "Wersja FlashPix"
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
 msgstr "Znacznik EXIF 40960, 0xA000. Wersja FlashPix."
 
-#: src/properties.cpp:502
+#: src/properties.cpp:518
 msgid "EXIF tag 40961, 0xA001. Color space information"
 msgstr "Znacznik EXIF 40961, 0xA001. Informacja o przestrzeni kolorów"
 
-#: src/properties.cpp:503 src/tags.cpp:1209
+#: src/properties.cpp:519 src/tags.cpp:1399
 msgid "Components Configuration"
 msgstr "Konfiguracja komponentów"
 
-#: src/properties.cpp:503
+#: src/properties.cpp:519
 msgid ""
 "EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
 "compressed data), 1 2 3 0 (other cases)."
 msgstr ""
 
-#: src/properties.cpp:505 src/tags.cpp:636
+#: src/properties.cpp:521 src/tags.cpp:823
 msgid "Compressed Bits Per Pixel"
 msgstr "Skompresowane bity na piksel"
 
-#: src/properties.cpp:505
+#: src/properties.cpp:521
 msgid ""
 "EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
 "indicated in unit bits per pixel."
@@ -12481,57 +15723,57 @@
 "Informacja specyficzna dla skompresowanych danych. Rodzaj kompresji użyty "
 "dla skompresowanego obrazu jest określony w jednostkach bitów na piksel."
 
-#: src/properties.cpp:507 src/tags.cpp:1293
+#: src/properties.cpp:523 src/tags.cpp:1483
 msgid "Pixel X Dimension"
 msgstr "Rozmiar X "
 
-#: src/properties.cpp:507
+#: src/properties.cpp:523
 msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
 msgstr "Znacznik EXIF 40962, 0xA002. Prawidłowa szerokość obrazu w pikselach."
 
-#: src/properties.cpp:508 src/tags.cpp:1300
+#: src/properties.cpp:524 src/tags.cpp:1490
 msgid "Pixel Y Dimension"
 msgstr "Rozmiar Y"
 
-#: src/properties.cpp:508
+#: src/properties.cpp:524
 msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
 msgstr "Znacznik EXIF 40963, 0xA003. Prawidłowa wysokość obrazu w pikselach."
 
-#: src/properties.cpp:509 src/tags.cpp:1267
+#: src/properties.cpp:525 src/tags.cpp:1457
 msgid "User Comment"
 msgstr "Komentarz użytkownika"
 
-#: src/properties.cpp:509
+#: src/properties.cpp:525
 msgid "EXIF tag 37510, 0x9286. Comments from user."
 msgstr "Znacznik EXIF 37510, 0x9286. Komentarze użytkownika."
 
-#: src/properties.cpp:510 src/tags.cpp:1309
+#: src/properties.cpp:526 src/tags.cpp:1499
 msgid "Related Sound File"
 msgstr "Powiązany plik dźwiękowy"
 
-#: src/properties.cpp:510
+#: src/properties.cpp:526
 msgid ""
 "EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
 msgstr ""
 "Znacznik EXIF 40964, 0xA004. Nazwa powiązanego pliku dźwiękowego w formacie "
 "\"8.3\"."
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid "Date and Time Original"
 msgstr "Data i czas (oryginału)"
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid ""
 "EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
 "time when original image was generated, in ISO 8601 format. Includes the "
 "EXIF SubSecTimeOriginal data."
 msgstr ""
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid "Date and Time Digitized"
 msgstr "Data i czas (obrazu cyfrowego)"
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid ""
 "EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
 "time when image was stored as digital data, can be the same as "
@@ -12539,37 +15781,37 @@
 "format. Includes the EXIF SubSecTimeDigitized data."
 msgstr ""
 
-#: src/properties.cpp:518
+#: src/properties.cpp:534
 msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
 msgstr "Znacznik EXIF 33434, 0x829A. Czas ekspozycji w sekundach."
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "F Number"
 msgstr "Liczba F"
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "EXIF tag 33437, 0x829D. F number."
 msgstr "Znacznik EXIF 33437, 0x829D. Liczba F."
 
-#: src/properties.cpp:520
+#: src/properties.cpp:536
 msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
 msgstr ""
 "Znacznik EXIF 34850, 0x8822. Rodzaj programu użyty do określenia ekspozycji."
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
 msgid "Spectral Sensitivity"
 msgstr "Czułość widmowa"
 
-#: src/properties.cpp:521
+#: src/properties.cpp:537
 msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
 msgstr "Znacznik EXIF 34852, 0x8824. Czułość widmowa każdego kanału."
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 #, fuzzy
 msgid "ISOSpeedRatings"
 msgstr "Oszacowania szybkości ISO"
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 msgid ""
 "EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
 "specified in ISO 12232."
@@ -12577,11 +15819,11 @@
 "Znacznik EXIF 34855, 0x8827. Czułość ISO i zakres ISO aparatu lub urządzenia "
 "wejściowego zgodne ze specyfikacją ISO 12232."
 
-#: src/properties.cpp:524 src/tags.cpp:625
+#: src/properties.cpp:540 src/tags.cpp:812
 msgid "OECF"
 msgstr "OECF"
 
-#: src/properties.cpp:524
+#: src/properties.cpp:540
 msgid ""
 "EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
 "ISO 14524."
@@ -12589,7 +15831,7 @@
 "Znacznik EXIF 34856, 0x8828. Funkcja konwersji optoelektrycznej, "
 "zdefiniowana w dokumencie SO 14524."
 
-#: src/properties.cpp:525
+#: src/properties.cpp:541
 msgid ""
 "EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
 "specification."
@@ -12597,58 +15839,58 @@
 "Znacznik EXIF 37377, 0x9201. Czas otwarcia migawki, w jednostkach APEX. "
 "Zobacz Dodatek C w specyfikacji EXIF."
 
-#: src/properties.cpp:526
+#: src/properties.cpp:542
 msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
 msgstr "Znacznik EXIF 37378, 0x9202. Przysłona obiektywu, w jednostkach APEX."
 
-#: src/properties.cpp:527 src/tags.cpp:639
+#: src/properties.cpp:543 src/tags.cpp:826
 msgid "Brightness Value"
 msgstr "Jasność"
 
-#: src/properties.cpp:527
+#: src/properties.cpp:543
 msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
 msgstr "Znacznik EXIF 37379, 0x9203. Jasność w jednostkach APEX."
 
-#: src/properties.cpp:528
+#: src/properties.cpp:544
 msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
 msgstr "Znacznik EXIF 37380, 0x9204. Odchylenie ekspozycji w jednostkach APEX."
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 msgid "Maximum Aperture Value"
 msgstr "Największa wartość przysłony"
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
 msgstr ""
 "Znacznik EXIF 37381, 0x9205. Najmniejsza liczba F obiektywu, w jednostkach "
 "APEX."
 
-#: src/properties.cpp:530
+#: src/properties.cpp:546
 msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
 msgstr "Znacznik EXIF 37382, 0x9206. Odległość do obiektu podana w metrach."
 
-#: src/properties.cpp:531
+#: src/properties.cpp:547
 msgid "EXIF tag 37383, 0x9207. Metering mode."
 msgstr "Znacznik EXIF 37383, 0x9207. Tryb pomiaru."
 
-#: src/properties.cpp:532
+#: src/properties.cpp:548
 msgid "EXIF tag 37384, 0x9208. Light source."
 msgstr "Znacznik EXIF 37384, 0x9208. Źródło światła."
 
-#: src/properties.cpp:533
+#: src/properties.cpp:549
 msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
 msgstr "Znacznik EXIF 37385, 0x9209. Dane źródła światła błyskowego (flesza)."
 
-#: src/properties.cpp:534
+#: src/properties.cpp:550
 msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
 msgstr ""
 "Znacznik EXIF 37386, 0x920A. Długość ogniskowej obiektywu, w milimetrach."
 
-#: src/properties.cpp:535 src/tags.cpp:1259
+#: src/properties.cpp:551 src/tags.cpp:1449
 msgid "Subject Area"
 msgstr "Obszar obiektu"
 
-#: src/properties.cpp:535
+#: src/properties.cpp:551
 msgid ""
 "EXIF tag 37396, 0x9214. The location and area of the main subject in the "
 "overall scene."
@@ -12656,21 +15898,21 @@
 "Znacznik EXIF 37396, 0x9214. Położenie i obszar głównego obiektu na całej "
 "scenie."
 
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
 msgid "Flash Energy"
 msgstr "Energia błysku"
 
-#: src/properties.cpp:536
+#: src/properties.cpp:552
 msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
 msgstr ""
 "Znacznik EXIF 41483, 0xA20B. Określa energię światła błyskowego podczas "
 "wykonywania zdjęcia."
 
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
 msgid "Spatial Frequency Response"
 msgstr "Odpowiedź częstotliwości przestrzennej"
 
-#: src/properties.cpp:537
+#: src/properties.cpp:553
 msgid ""
 "EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
 "as specified in ISO 12233."
@@ -12678,94 +15920,98 @@
 "Znacznik EXIF 41484, 0xA20C. Określa tablicę częstotliwości przestrzennej i "
 "wartości SFR w sposób określony w dokumencie ISO 12233."
 
-#: src/properties.cpp:539 src/tags.cpp:650
+#: src/properties.cpp:555 src/tags.cpp:837
 msgid "Focal Plane X Resolution"
 msgstr "Rozdzielczość ogniskowej w płaszczyźnie X"
 
-#: src/properties.cpp:539
+#: src/properties.cpp:555
+#, fuzzy
 msgid ""
 "EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
 "unit."
 msgstr ""
+"Znacznik TIFF 282, 0x11A. Rozdzielczość pozioma w pikselach na jednostkę."
 
-#: src/properties.cpp:540 src/tags.cpp:651
+#: src/properties.cpp:556 src/tags.cpp:838
 msgid "Focal Plane Y Resolution"
 msgstr "Rozdzielczość ogniskowej w płaszczyźnie Y"
 
-#: src/properties.cpp:540
+#: src/properties.cpp:556
+#, fuzzy
 msgid ""
 "EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
 "unit."
 msgstr ""
+"Znacznik TIFF 283, 0x11B. Rozdzielczość pionowa w pikselach na jednostkę."
 
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
 msgid "Focal Plane Resolution Unit"
 msgstr "Jednostka rozdzielczości płaszczyzny ogniskowej"
 
-#: src/properties.cpp:541
+#: src/properties.cpp:557
 msgid ""
 "EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
 "FocalPlaneYResolution."
 msgstr ""
 
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
 msgid "Subject Location"
 msgstr "Położenie obiektu"
 
-#: src/properties.cpp:542
+#: src/properties.cpp:558
 msgid ""
 "EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
 "value is the horizontal pixel and the second value is the vertical pixel at "
 "which the main subject appears."
 msgstr ""
 
-#: src/properties.cpp:545 src/tags.cpp:657
+#: src/properties.cpp:561 src/tags.cpp:844
 msgid "Exposure Index"
 msgstr "Indeks ekspozycji"
 
-#: src/properties.cpp:545
+#: src/properties.cpp:561
 msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
 msgstr ""
 "Znacznik EXIF 41493, 0xA215. Indeks ekspozycji w aparacie lub urządzeniu "
 "wejściowym."
 
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
 msgid "Sensing Method"
 msgstr "Rodzaj czujnika"
 
-#: src/properties.cpp:546
+#: src/properties.cpp:562
 msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
 msgstr ""
 "Znacznik EXIF 41495, 0xA217. Rodzaj czujnika obrazu w aparacie lub "
 "urządzeniu wejściowym."
 
-#: src/properties.cpp:547
+#: src/properties.cpp:563
 msgid "EXIF tag 41728, 0xA300. Indicates image source."
 msgstr "Znacznik EXIF 41728, 0xA300. Określa źródło obrazu."
 
-#: src/properties.cpp:548 src/tags.cpp:1364
+#: src/properties.cpp:564 src/tags.cpp:1554
 msgid "Scene Type"
 msgstr "Rodzaj sceny"
 
-#: src/properties.cpp:548
+#: src/properties.cpp:564
 msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
 msgstr "Znacznik EXIF 41729, 0xA301. Określenie rodzaju sceny."
 
-#: src/properties.cpp:549 src/tags.cpp:572
+#: src/properties.cpp:565 src/tags.cpp:759
 msgid "CFA Pattern"
 msgstr "Wzór CFA"
 
-#: src/properties.cpp:549
+#: src/properties.cpp:565
 msgid ""
 "EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
 "sense."
 msgstr ""
 
-#: src/properties.cpp:550 src/tags.cpp:1374
+#: src/properties.cpp:566 src/tags.cpp:1564
 msgid "Custom Rendered"
 msgstr "Własny rendering"
 
-#: src/properties.cpp:550
+#: src/properties.cpp:566
 msgid ""
 "EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
 "data."
@@ -12773,7 +16019,7 @@
 "Znacznik EXIF 41985, 0xA401. Ten znacznik określa użycie specjalnego "
 "przetwarzania danych obrazu."
 
-#: src/properties.cpp:551
+#: src/properties.cpp:567
 msgid ""
 "EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
 "shot."
@@ -12781,7 +16027,7 @@
 "Znacznik EXIF 41986, 0xA402. Ten znacznik określa tryb ekspozycji ustawiony "
 "przy robieniu zdjęcia."
 
-#: src/properties.cpp:552
+#: src/properties.cpp:568
 msgid ""
 "EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
 "was shot."
@@ -12789,11 +16035,11 @@
 "Znacznik EXIF 41987, 0xA403. Określa tryb balansu bieli ustawiony przy "
 "robieniu zdjęcia."
 
-#: src/properties.cpp:553 src/tags.cpp:1388
+#: src/properties.cpp:569 src/tags.cpp:1578
 msgid "Digital Zoom Ratio"
 msgstr "Współczynnik powiększenia cyfrowego"
 
-#: src/properties.cpp:553
+#: src/properties.cpp:569
 msgid ""
 "EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
 "shot."
@@ -12801,11 +16047,11 @@
 "Znacznik EXIF 41988, 0xA404. Określa współczynnik cyfrowego powiększenia "
 "ustawiony przy robieniu zdjęcia."
 
-#: src/properties.cpp:554 src/tags.cpp:1393
+#: src/properties.cpp:570 src/tags.cpp:1583
 msgid "Focal Length In 35mm Film"
 msgstr "Ogniskowa dla filmu 35mm"
 
-#: src/properties.cpp:554
+#: src/properties.cpp:570
 msgid ""
 "EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
 "35mm film camera, in mm. A value of 0 means the focal length is unknown. "
@@ -12816,26 +16062,27 @@
 "nieznana. Należy zauważyć, że ten znacznik różni się od znacznika "
 "FocalLength."
 
-#: src/properties.cpp:557 src/tags.cpp:1399
+#: src/properties.cpp:573 src/tags.cpp:1589
 msgid "Scene Capture Type"
 msgstr "Rodzaj uchwycenia sceny"
 
-#: src/properties.cpp:557
+#: src/properties.cpp:573
+#, fuzzy
 msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
-msgstr ""
+msgstr "Znacznik EXIF 41729, 0xA301. Określenie rodzaju sceny."
 
-#: src/properties.cpp:558 src/tags.cpp:1404
+#: src/properties.cpp:574 src/tags.cpp:1594
 msgid "Gain Control"
 msgstr "Regulacja wzmocnienia"
 
-#: src/properties.cpp:558
+#: src/properties.cpp:574
 msgid ""
 "EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
 "adjustment."
 msgstr ""
 "Znacznik EXIF 41991, 0xA407. Określa stopień wzmocnienia całego obrazu."
 
-#: src/properties.cpp:559
+#: src/properties.cpp:575
 msgid ""
 "EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
 "applied by the camera."
@@ -12843,7 +16090,7 @@
 "Znacznik EXIF 41992, 0xA408. Określa kierunek przetwarzania kontrastu "
 "wykonanego przez aparat przy robieniu zdjęcia."
 
-#: src/properties.cpp:560
+#: src/properties.cpp:576
 msgid ""
 "EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
 "applied by the camera."
@@ -12851,7 +16098,7 @@
 "Znacznik EXIF 41993, 0xA409. Określa kierunek przetwarzania nasycenia "
 "wykonanego przez aparat przy robieniu zdjęcia."
 
-#: src/properties.cpp:561
+#: src/properties.cpp:577
 msgid ""
 "EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
 "applied by the camera."
@@ -12859,11 +16106,11 @@
 "Znacznik EXIF 41994, 0xA40A. Określa kierunek przetwarzania ostrości "
 "wykonanego przez aparat przy robieniu zdjęcia."
 
-#: src/properties.cpp:562 src/tags.cpp:1419
+#: src/properties.cpp:578 src/tags.cpp:1609
 msgid "Device Setting Description"
 msgstr "Opis ustawień urządzenia"
 
-#: src/properties.cpp:562
+#: src/properties.cpp:578
 msgid ""
 "EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
 "conditions of a particular camera model."
@@ -12871,19 +16118,19 @@
 "Znacznik EXIF 41995, 0xA40B. Określa informacje o warunkach robienia zdjęcia "
 "dla konkretnego modelu aparatu."
 
-#: src/properties.cpp:563 src/tags.cpp:1424
+#: src/properties.cpp:579 src/tags.cpp:1614
 msgid "Subject Distance Range"
 msgstr "Zakres odległości obiektu"
 
-#: src/properties.cpp:563
+#: src/properties.cpp:579
 msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
 msgstr "Znacznik EXIF 41996, 0xA40C. Określa odległość od obiektu."
 
-#: src/properties.cpp:564 src/tags.cpp:1427
+#: src/properties.cpp:580 src/tags.cpp:1617
 msgid "Image Unique ID"
 msgstr "Unikalny identyfikator obrazu"
 
-#: src/properties.cpp:564
+#: src/properties.cpp:580
 msgid ""
 "EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
 "recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
@@ -12893,11 +16140,11 @@
 "przypisany każdemu zdjęciu. Jest on zapisany jako 32 znakowy łańcuch ASCII "
 "odpowiadający notacji szesnastkowej o stałej długości 128 bitów."
 
-#: src/properties.cpp:566 src/tags.cpp:1501
+#: src/properties.cpp:582 src/tags.cpp:1691
 msgid "GPS Version ID"
 msgstr "GPS Wersja znacznika"
 
-#: src/properties.cpp:566
+#: src/properties.cpp:582
 msgid ""
 "GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
 "period separators. The current value is \"2.0.0.0\"."
@@ -12905,33 +16152,33 @@
 "Znacznik GPS 0, 0x00. Zakodowany dziesiętnie każdy z czterech bajtów EXIF. "
 "Bieżąca wartość to \"2.0.0.0\"."
 
-#: src/properties.cpp:568 src/tags.cpp:1512
+#: src/properties.cpp:584 src/tags.cpp:1702
 msgid "GPS Latitude"
 msgstr "GPS Szerokość"
 
-#: src/properties.cpp:568
+#: src/properties.cpp:584
 msgid ""
 "GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
 msgstr ""
 "Znacznik GPS 2, 0x02 (pozycja) i 1, 0x01 (oznaczenie). Określa szerokość "
 "geograficzną i jej oznaczenie (północna/południowa)."
 
-#: src/properties.cpp:569 src/tags.cpp:1524
+#: src/properties.cpp:585 src/tags.cpp:1714
 msgid "GPS Longitude"
 msgstr "GPS Długość"
 
-#: src/properties.cpp:569
+#: src/properties.cpp:585
 msgid ""
 "GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
 msgstr ""
 "Znacznik GPS 4, 0x04 (pozycja) i 3, 0x03 (oznaczenie). Określa długość "
 "geograficzną i jej oznaczenie (wschodnia/zachodnia)."
 
-#: src/properties.cpp:570 src/tags.cpp:1532
+#: src/properties.cpp:586 src/tags.cpp:1722
 msgid "GPS Altitude Reference"
 msgstr "GPS Oznaczenie wysokości"
 
-#: src/properties.cpp:570
+#: src/properties.cpp:586
 #, fuzzy
 msgid ""
 "GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
@@ -12939,19 +16186,19 @@
 "Znacznik GPS 5, 0x05. Określa czy wyniesienie jest powyżej czy poniżej "
 "poziomu morza (n.p.m. czy p.p.m.)."
 
-#: src/properties.cpp:571 src/tags.cpp:1540
+#: src/properties.cpp:587 src/tags.cpp:1730
 msgid "GPS Altitude"
 msgstr "GPS Wysokość"
 
-#: src/properties.cpp:571
+#: src/properties.cpp:587
 msgid "GPS tag 6, 0x06. Indicates altitude in meters."
 msgstr "Znacznik GPS 6, 0x06. Wysokość (wyniesienie) w metrach."
 
-#: src/properties.cpp:572 src/tags.cpp:1544
+#: src/properties.cpp:588 src/tags.cpp:1734
 msgid "GPS Time Stamp"
 msgstr "GPS Znacznik czasu"
 
-#: src/properties.cpp:572
+#: src/properties.cpp:588
 msgid ""
 "GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
 "data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
@@ -12969,98 +16216,98 @@
 "DateTimeDigitized. Jeśli data jest niedostępna, exif:GPSTimeStamp nie jest "
 "zapisywany do XMP."
 
-#: src/properties.cpp:578 src/tags.cpp:1549
+#: src/properties.cpp:594 src/tags.cpp:1739
 msgid "GPS Satellites"
 msgstr "GPS Satelity"
 
-#: src/properties.cpp:578
+#: src/properties.cpp:594
 msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
 msgstr ""
 "Znacznik GPS 8, 0x08. Informacja o satelitach użytych do pomiaru, format "
 "jest nieokreślony."
 
-#: src/properties.cpp:579 src/tags.cpp:1556
+#: src/properties.cpp:595 src/tags.cpp:1746
 msgid "GPS Status"
 msgstr "GPS Stan"
 
-#: src/properties.cpp:579
+#: src/properties.cpp:595
 msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
 msgstr ""
 "Znacznik GPS 9, 0x09. Stan odbiornika GPS w momencie utworzenia obrazu."
 
-#: src/properties.cpp:580 src/tags.cpp:1561
+#: src/properties.cpp:596 src/tags.cpp:1751
 msgid "GPS Measure Mode"
 msgstr "GPS Tryb pomiaru"
 
-#: src/properties.cpp:580
+#: src/properties.cpp:596
 msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
 msgstr ""
 "Znacznik GPS 10, 0x0A. Tryb pomiaru GPS. Wartości tekstowe: \"2\" oznacza "
 "pomiar dwuwymiarowy, a \"3\" pomiar trójwymiarowy."
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 msgid "GPS DOP"
 msgstr "GPS DOP"
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
 msgstr "Znacznik GPS 11, 0x0B. Stopień precyzji danych GPS."
 
-#: src/properties.cpp:582 src/tags.cpp:1569
+#: src/properties.cpp:598 src/tags.cpp:1759
 msgid "GPS Speed Reference"
 msgstr "GPS Oznaczenie prędkości"
 
-#: src/properties.cpp:582
+#: src/properties.cpp:598
 msgid "GPS tag 12, 0x0C. Units used to speed measurement."
 msgstr ""
 "Znacznik GPS 12, 0x0C. Jednostki użyte do pomiaru prędkości ruchu odbiornika "
 "GPS. \"K\", \"M\" i \"N\" oznaczają kilometry, mile i węzły."
 
-#: src/properties.cpp:583 src/tags.cpp:1573
+#: src/properties.cpp:599 src/tags.cpp:1763
 msgid "GPS Speed"
 msgstr "GPS Prędkość"
 
-#: src/properties.cpp:583
+#: src/properties.cpp:599
 msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
 msgstr "Znacznik GPS 13, 0x0D. Prędkość ruchu odbiornika GPS."
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
 msgid "GPS Track Reference"
 msgstr "GPS Oznaczenie kierunku"
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
 msgid "GPS tag 14, 0x0E. Reference for movement direction."
 msgstr ""
 "Znacznik GPS 14, 0x0E. Oznaczenie kierunku ruchu odbiornika GPS.  \"T\" "
 "oznacza kierunek rzeczywisty, a \"M\" kierunek magnetyczny."
 
-#: src/properties.cpp:585 src/tags.cpp:1580
+#: src/properties.cpp:601 src/tags.cpp:1770
 msgid "GPS Track"
 msgstr "GPS Kierunek"
 
-#: src/properties.cpp:585
+#: src/properties.cpp:601
 msgid ""
 "GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
 msgstr ""
 "Znacznik GPS 15, 0x0F. Kierunek ruchu odbiornika GPS, przyjmuje wartości z "
 "zakresu od 0 do 359.99."
 
-#: src/properties.cpp:586 src/tags.cpp:1584
+#: src/properties.cpp:602 src/tags.cpp:1774
 msgid "GPS Image Direction Reference"
 msgstr "GPS Oznaczenie kierunku obrazu"
 
-#: src/properties.cpp:586
+#: src/properties.cpp:602
 #, fuzzy
 msgid "GPS tag 16, 0x10. Reference for image direction."
 msgstr ""
 "Znacznik GPS 16, 0x10. Oznaczenie rodzaju kierunku obrazu. \"T\" oznacza "
 "kierunek rzeczywisty, a \"M\" kierunek magnetyczny."
 
-#: src/properties.cpp:587 src/tags.cpp:1588
+#: src/properties.cpp:603 src/tags.cpp:1778
 msgid "GPS Image Direction"
 msgstr "GPS Kierunek obrazu"
 
-#: src/properties.cpp:587
+#: src/properties.cpp:603
 msgid ""
 "GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
 "359.99."
@@ -13068,21 +16315,21 @@
 "Znacznik GPS 17, 0x11. Określa kierunek obrazu podczas wykonywania zdjęcia, "
 "przyjmuje wartości z zakresu od 0 do 359.99."
 
-#: src/properties.cpp:588 src/tags.cpp:1592
+#: src/properties.cpp:604 src/tags.cpp:1782
 msgid "GPS Map Datum"
 msgstr "GPS Układ odniesienia"
 
-#: src/properties.cpp:588
+#: src/properties.cpp:604
 msgid "GPS tag 18, 0x12. Geodetic survey data."
 msgstr ""
 "Znacznik GPS 18, 0x12. Określa układ odniesienia współrzędnych użyty przez "
 "odbiornik GPS."
 
-#: src/properties.cpp:589 src/tags.cpp:1600
+#: src/properties.cpp:605 src/tags.cpp:1790
 msgid "GPS Destination Latitude"
 msgstr "GPS Docelowa szerokość"
 
-#: src/properties.cpp:589
+#: src/properties.cpp:605
 msgid ""
 "GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
 "destination latitude."
@@ -13091,11 +16338,11 @@
 "geograficzną i oznaczenie szerokości punktu docelowego (\"N\" oznacza "
 "szerokość geograficzną północną, a \"S\" południową)."
 
-#: src/properties.cpp:590 src/tags.cpp:1612
+#: src/properties.cpp:606 src/tags.cpp:1802
 msgid "GPS Destination Longitude"
 msgstr "GPS Docelowa długość"
 
-#: src/properties.cpp:590
+#: src/properties.cpp:606
 msgid ""
 "GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
 "longitude."
@@ -13104,49 +16351,49 @@
 "geograficzną i oznaczenie długości punktu docelowego (\"E\" oznacza długość "
 "geograficzną wschodnią, a \"W\" zachodnią)."
 
-#: src/properties.cpp:591 src/tags.cpp:1619
+#: src/properties.cpp:607 src/tags.cpp:1809
 msgid "GPS Destination Bearing Reference"
 msgstr "GPS Oznaczenie kierunku docelowego"
 
-#: src/properties.cpp:591
+#: src/properties.cpp:607
 msgid "GPS tag 23, 0x17. Reference for movement direction."
 msgstr ""
 "Znacznik GPS 23, 0x17. Oznaczenie kierunku ruchu do punktu docelowego. \"T\" "
 "oznacza kierunek rzeczywisty, a \"M\" kierunek magnetyczny."
 
-#: src/properties.cpp:592 src/tags.cpp:1623
+#: src/properties.cpp:608 src/tags.cpp:1813
 msgid "GPS Destination Bearing"
 msgstr "GPS Kierunek docelowy"
 
-#: src/properties.cpp:592
+#: src/properties.cpp:608
 msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
 msgstr ""
 "Znacznik GPS 24, 0x18. Określa kierunek (namiar) do celu, wartości od 0 do "
 "359.99."
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
 msgid "GPS Destination Distance Refefrence"
 msgstr "GPS Oznaczenie odległości obiektu"
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
 msgid "GPS tag 25, 0x19. Units used for speed measurement."
 msgstr ""
 "Znacznik GPS 25, 0x19. Jednostki użyte do pomiaru prędkości. \"K\", \"M\" i "
 "\"N\" oznaczają kilometry, mile i węzły."
 
-#: src/properties.cpp:594 src/tags.cpp:1631
+#: src/properties.cpp:610 src/tags.cpp:1821
 msgid "GPS Destination Distance"
 msgstr "GPS Odległość obiektu"
 
-#: src/properties.cpp:594
+#: src/properties.cpp:610
 msgid "GPS tag 26, 0x1A. Distance to destination."
 msgstr "Znacznik GPS 26, 0x1A. Odległość do obiektu podana w metrach."
 
-#: src/properties.cpp:595 src/tags.cpp:1634
+#: src/properties.cpp:611 src/tags.cpp:1824
 msgid "GPS Processing Method"
 msgstr "GPS Metoda lokalizacji"
 
-#: src/properties.cpp:595
+#: src/properties.cpp:611
 msgid ""
 "GPS tag 27, 0x1B. A character string recording the name of the method used "
 "for location finding."
@@ -13154,20 +16401,20 @@
 "Znacznik GPS 27, 0x1B. Łańcuch tekstowy określający metodę użytą do "
 "znalezienia lokalizacji."
 
-#: src/properties.cpp:596 src/tags.cpp:1639
+#: src/properties.cpp:612 src/tags.cpp:1829
 msgid "GPS Area Information"
 msgstr "GPS Informacja o obszarze"
 
-#: src/properties.cpp:596
+#: src/properties.cpp:612
 msgid ""
 "GPS tag 28, 0x1C. A character string recording the name of the GPS area."
 msgstr "Znacznik GPS 28, 0x1C. Określa nazwę obszaru GPS."
 
-#: src/properties.cpp:597 src/tags.cpp:1647
+#: src/properties.cpp:613 src/tags.cpp:1837
 msgid "GPS Differential"
 msgstr "GPS Korekcja"
 
-#: src/properties.cpp:597
+#: src/properties.cpp:613
 msgid ""
 "GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
 "the GPS receiver."
@@ -13175,44 +16422,44 @@
 "Znacznik GPS 30, 0x1E. Określa czy dla odbiornika GPS zastosowana została "
 "korekcja różnicowa."
 
-#: src/properties.cpp:603
+#: src/properties.cpp:619
 msgid ""
 "A description of the lens used to take the photograph. For example, \"70-200 "
 "mm f/2.8-4.0\"."
 msgstr ""
-"Opis obiektywu użytego do zrobienia zdjęcia. Na przykład \"70-200 mm f/2.8-"
-"4.0\"."
+"Opis obiektywu użytego do zrobienia zdjęcia. Na przykład \"70-200 mm "
+"f/2.8-4.0\"."
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid "SerialNumber"
 msgstr "Numer seryjny"
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid ""
 "The serial number of the camera or camera body used to take the photograph."
 msgstr "Numer seryjny aparatu lub korpusu aparatu użyty do zrobienia zdjęcia."
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
 msgid "Contact Info-City"
 msgstr "Kontakt-Miasto"
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
 msgid "The contact information city part."
 msgstr "Część informacji kontaktowej określająca miasto."
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 msgid "Contact Info-Country"
 msgstr "Kontakt-Państwo"
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 msgid "The contact information country part."
 msgstr "Część informacji kontaktowej określająca państwo."
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid "Contact Info-Address"
 msgstr "Kontakt-Adres"
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid ""
 "The contact information address part. Comprises an optional company name and "
 "all required information to locate the building or postbox to which mail "
@@ -13222,19 +16469,19 @@
 "firmy i wszelkie wymagane informacje umożliwiające lokalizację budynku lub "
 "skrzynki pocztowej na którą ma być wysyłana korespondencja."
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
 msgid "Contact Info-Postal Code"
 msgstr "Kontakt-Kod pocztowy"
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
 msgid "The contact information part denoting the local postal code."
 msgstr "Część informacji kontaktowej określająca lokalny kod pocztowy."
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid "Contact Info-State/Province"
 msgstr "Kontakt-Stan/prowincja"
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid ""
 "The contact information part denoting regional information like state or "
 "province."
@@ -13242,33 +16489,33 @@
 "Cześć informacji kontaktowej oznaczająca informację regionalną, jak na "
 "przykład stan, prowincja lub województwo."
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
 msgid "Contact Info-Email"
 msgstr "Kontakt-Email"
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
 msgid "The contact information email address part."
 msgstr "Część informacji kontaktowej określająca adres e-mail."
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
 msgid "Contact Info-Phone"
 msgstr "Kontakt-Telefon"
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
 msgid "The contact information phone number part."
 msgstr "Część informacji kontaktowej określająca numer telefonu."
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
 msgid "Contact Info-Web URL"
 msgstr "Kontakt-URL"
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
 msgid "The contact information web address part."
 msgstr ""
 "Część informacji kontaktowej określająca adres internetowy, np. witryny "
 "internetowej."
 
-#: src/properties.cpp:619
+#: src/properties.cpp:635
 msgid ""
 "Code of the country the content is focussing on -- either the country shown "
 "in visual media or referenced in text or audio media. This element is at the "
@@ -13277,11 +16524,11 @@
 "should go to the \"Country\" element."
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid "Creator's Contact Info"
 msgstr "Informacje kontaktowe twórcy"
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid ""
 "The creator's contact information provides all necessary information to get "
 "in contact with the creator of this news object and comprises a set of sub-"
@@ -13292,17 +16539,17 @@
 "Informacje te składają się z zestawu właściwości umożliwiających prawidłowe "
 "zaadresowanie."
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid "Intellectual Genre"
 msgstr "Intelektualny rodzaj obiektu"
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid ""
 "Describes the nature, intellectual or journalistic characteristic of a news "
 "object, not specifically its content."
 msgstr ""
 
-#: src/properties.cpp:627
+#: src/properties.cpp:643
 msgid ""
 "Name of a location the content is focussing on -- either the location shown "
 "in visual media or referenced by text or audio media. This location name "
@@ -13312,11 +16559,11 @@
 "geographical hierarchy."
 msgstr ""
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid "IPTC Scene"
 msgstr "Scena IPTC"
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid ""
 "Describes the scene of a photo content. Specifies one or more terms from the "
 "IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
@@ -13326,11 +16573,11 @@
 "z \"Scene-NewsCodes\" IPTC. Każda scena jest reprezentowana przez łańcuch 6 "
 "cyfr w nieuporządkowanej liście."
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid "IPTC Subject Code"
 msgstr "Kod tematu IPTC"
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid ""
 "Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
 "to categorize the content. Each Subject is represented as a string of 8 "
@@ -13340,251 +16587,259 @@
 "hierarchii \"Subject-News Codes\" IPTC. Każdy temat jest reprezentowany "
 "przez łańcuch 8 cyfr w nieuporządkowanej liście."
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
+#, fuzzy
 msgid "Additional model info"
-msgstr ""
+msgstr "Informacja o pozycji AF"
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
 msgid ""
 "Information about the ethnicity and other facts of the model(s) in a model-"
 "released image."
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid "Code of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid ""
 "Code from controlled vocabulary for identyfing the organisation or company "
 "which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid "Controlled Vocabulary Term"
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid ""
 "A term to describe the content of the image by a value from a Controlled "
 "Vocabulary."
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 #, fuzzy
 msgid "Model age"
 msgstr "Model"
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 msgid ""
 "Age of the human model(s) at the time this image was taken in a model "
 "released image."
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of the organisation or company which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 #, fuzzy
 msgid "Person shown"
 msgstr "Wersje"
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 msgid "Name of a person shown in the image."
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 #, fuzzy
 msgid "Digital Image Identifier"
 msgstr "Cyfrowa stabilizacja obrazu"
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 msgid ""
 "Globally unique identifier for this digital image. It is created and applied "
 "by the creator of the digital image at the time of its creation. this value "
 "shall not be changed after that time."
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 msgid "Physical type of original photo"
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 #, fuzzy
 msgid "The type of the source digital file."
 msgstr "Czas trwania pliku mediów."
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
 #, fuzzy
 msgid "Event"
 msgstr "Wieczór"
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665
 msgid "Names or describes the specific event at which the photo was taken."
 msgstr ""
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 #, fuzzy
 msgid "Maximum available height"
 msgstr "Światło zastane"
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 msgid ""
 "The maximum available height in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 #, fuzzy
 msgid "Maximum available width"
 msgstr "Maksymalna długość ogniskowej"
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 msgid ""
 "The maximum available width in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid "Registry Entry"
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid ""
 "Both a Registry Item Id and a Registry Organisation Id to record any "
 "registration of this digital image with a registry."
 msgstr ""
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
+#, fuzzy
 msgid "Registry Entry-Item Identifier"
-msgstr ""
+msgstr "Cyfrowa stabilizacja obrazu"
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
 msgid ""
 "A unique identifier created by a registry and applied by the creator of the "
 "digital image. This value shall not be changed after being applied. This "
 "identifier is linked to a corresponding Registry Organisation Identifier."
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid "Registry Entry-Organisation Identifier"
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid ""
 "An identifier for the registry which issued the corresponding Registry Image "
 "Id."
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 msgid "IPTC Fields Last Edited"
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 #, fuzzy
 msgid ""
 "The date and optionally time when any of the IPTC photo metadata fields has "
 "been last edited."
 msgstr "Data i czas ostatniej modyfikacji metadanych."
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
 #, fuzzy
 msgid "Location shown"
 msgstr "Kod lokalizacji"
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
+#, fuzzy
 msgid "A location shown in the image."
-msgstr ""
+msgstr "Przesunięcie obrazu podglądu"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "Location Created"
 msgstr "Kod lokalizacji"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "The location the photo was taken."
 msgstr "Nazwa ujęcia."
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Location-City"
 msgstr "Położenie"
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Name of the city of a location."
 msgstr "Nazwa artysty lub artystów."
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
 #, fuzzy
 msgid "Location-Country ISO-Code"
 msgstr "Kod lokalizacji"
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
+#, fuzzy
 msgid "The ISO code of a country of a location."
-msgstr ""
+msgstr "Nazwa ujęcia."
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "Location-Country Name"
 msgstr "Nazwa lokalizacji"
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "The name of a country of a location."
 msgstr "Nazwa ujęcia."
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
 #, fuzzy
 msgid "Location-Province/State"
 msgstr "Prowincja/stan"
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
+#, fuzzy
 msgid ""
 "The name of a subregion of a country - a province or state - of a location."
-msgstr ""
+msgstr "Nazwa ujęcia."
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 #, fuzzy
 msgid "Location-Sublocation"
 msgstr "Szczegółowa lokalizacja"
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 msgid ""
 "Name of a sublocation. This sublocation name could either be the name of a "
 "sublocation to a city or the name of a well known location or (natural) "
 "monument outside a city."
 msgstr ""
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
 #, fuzzy
 msgid "Location-World Region"
 msgstr "Kod lokalizacji"
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
+#, fuzzy
 msgid "The name of a world region of a location."
-msgstr ""
+msgstr "Nazwa ujęcia."
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
+#, fuzzy
 msgid "Artwork or object in the image"
-msgstr ""
+msgstr "Odnośnik do projektu w ramach którego utworzono ten plik."
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
+#, fuzzy
 msgid "A set of metadata about artwork or an object in the image."
-msgstr ""
+msgstr "Odnośnik do projektu w ramach którego utworzono ten plik."
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 #, fuzzy
 msgid "Artwork or object-Copyright notice"
 msgstr "Uwaga o prawach autorskich"
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 msgid ""
 "Contains any necessary copyright notice for claiming the intellectual "
 "property for artwork or an object in the image and should identify the "
@@ -13592,1652 +16847,2189 @@
 "property rights."
 msgstr ""
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
+#, fuzzy
 msgid "Artwork or object-Creator"
-msgstr ""
+msgstr "Uwaga o prawach autorskich"
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
 msgid ""
 "Contains the name of the artist who has created artwork or an object in the "
 "image. In cases where the artist could or should not be identified the name "
 "of a company or organisation may be appropriate."
 msgstr ""
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
+#, fuzzy
 msgid "Artwork or object-Date Created"
-msgstr ""
+msgstr "Uwaga o prawach autorskich"
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
 msgid ""
 "Designates the date and optionally the time the artwork or object in the "
 "image was created. This relates to artwork or objects with associated "
 "intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
+#, fuzzy
 msgid "Artwork or object-Source"
-msgstr ""
+msgstr "Uwaga o prawach autorskich"
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
 msgid ""
 "The organisation or body holding and registering the artwork or object in "
 "the image for inventory purposes."
 msgstr ""
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
+#, fuzzy
 msgid "Artwork or object-Source inventory number"
-msgstr ""
+msgstr "Uwaga o prawach autorskich"
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
 msgid ""
 "The inventory number issued by the organisation or body holding and "
 "registering the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
+#, fuzzy
 msgid "Artwork or object-Title"
-msgstr ""
+msgstr "Uwaga o prawach autorskich"
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
 #, fuzzy
 msgid "A reference for the artwork or object in the image."
 msgstr "Odnośnik do projektu w ramach którego utworzono ten plik."
 
-#: src/properties.cpp:677
+#: src/properties.cpp:693
 msgid "Scan from film"
 msgstr ""
 
-#: src/properties.cpp:678
+#: src/properties.cpp:694
 msgid "Scan from transparency (including slide)"
 msgstr ""
 
-#: src/properties.cpp:679
+#: src/properties.cpp:695
 msgid "Scan from print"
 msgstr ""
 
-#: src/properties.cpp:680
+#: src/properties.cpp:696
 #, fuzzy
 msgid "Camera RAW"
 msgstr "ID aparatu"
 
-#: src/properties.cpp:681
+#: src/properties.cpp:697
 #, fuzzy
 msgid "Camera TIFF"
 msgstr "ID aparatu"
 
-#: src/properties.cpp:682
+#: src/properties.cpp:698
 #, fuzzy
 msgid "Camera JPEG"
 msgstr "ID aparatu"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 #, fuzzy
 msgid "PLUS Version"
 msgstr "Wersja PDF"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 msgid ""
 "The version number of the PLUS standards in place at the time of the "
 "transaction."
 msgstr ""
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 #, fuzzy
 msgid "Licensee"
 msgstr "Obiektyw"
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 msgid ""
 "Party or parties to whom the license is granted by the Licensor/s under the "
 "license transaction."
 msgstr ""
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 #, fuzzy
 msgid "Licensee ID"
 msgstr "ID obiektywu"
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 msgid "Optional PLUS-ID identifying each Licensee."
 msgstr ""
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Licensee Name"
 msgstr "Nazwa lokalizacji"
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Name of each Licensee."
 msgstr "Nazwa sceny."
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 #, fuzzy
 msgid "End User"
 msgstr "Ekstender"
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 msgid "Party or parties ultimately making use of the image under the license."
 msgstr ""
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
+#, fuzzy
 msgid "End User ID"
-msgstr ""
+msgstr "Ekstender"
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
 msgid "Optional PLUS-ID identifying each End User."
 msgstr ""
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
 #, fuzzy
 msgid "End User Name"
 msgstr "Nazwa właściciela"
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
+#, fuzzy
 msgid "Name of each End User."
-msgstr ""
+msgstr "Nazwa sceny."
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 #, fuzzy
 msgid "Licensor"
 msgstr "Obiektyw"
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 msgid "Party or parties granting the license to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 #, fuzzy
 msgid "Licensor ID"
 msgstr "ID obiektywu"
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 msgid "Optional PLUS-ID identifying each Licensor."
 msgstr ""
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
 #, fuzzy
 msgid "Licensor Name"
 msgstr "Nazwa lokalizacji"
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
+#, fuzzy
 msgid "Name of each Licensor."
-msgstr ""
+msgstr "Nazwa sceny."
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor Address"
-msgstr ""
+msgstr "Właściwości obiektywu"
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor street address."
-msgstr ""
+msgstr "Nazwa państwa"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
+#, fuzzy
 msgid "Licensor Address Detail"
-msgstr ""
+msgstr "Kontakt-Kod pocztowy"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
+#, fuzzy
 msgid "Additional Licensor mailing address details."
-msgstr ""
+msgstr "Informacja o pozycji AF"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
 #, fuzzy
 msgid "Licensor City"
 msgstr "Meksyk"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
+#, fuzzy
 msgid "Licensor City name."
-msgstr ""
+msgstr "Nazwa państwa"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
 #, fuzzy
 msgid "Licensor State or Province"
 msgstr "Stan/Prowincja"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
+#, fuzzy
 msgid "Licensor State or Province name."
-msgstr ""
+msgstr "Stan/Prowincja"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
 #, fuzzy
 msgid "Licensor Postal Code"
 msgstr "Kontakt-Kod pocztowy"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
+#, fuzzy
 msgid "Licensor Postal Code or Zip Code."
-msgstr ""
+msgstr "Kontakt-Kod pocztowy"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country"
 msgstr "Państwo"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country name."
 msgstr "Nazwa państwa"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1"
-msgstr ""
+msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1."
-msgstr ""
+msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
+#, fuzzy
 msgid "Licensor Telephone 1"
-msgstr ""
+msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
 #, fuzzy
 msgid "Licensor Telephone number 1."
 msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2"
-msgstr ""
+msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2."
-msgstr ""
+msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
+#, fuzzy
 msgid "Licensor Telephone 2"
-msgstr ""
+msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
 #, fuzzy
 msgid "Licensor Telephone number 2."
 msgstr "Numer seryjny obiektywu"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email"
-msgstr ""
+msgstr "Nazwa lokalizacji"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email address."
-msgstr ""
+msgstr "Kontakt-Kod pocztowy"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 #, fuzzy
 msgid "Licensor URL"
 msgstr "Bazowy URL"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 msgid "Licensor world wide web address."
 msgstr ""
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 #, fuzzy
 msgid "Licensor Notes"
 msgstr "Właściwości obiektywu"
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 msgid ""
 "Supplemental information for use in identifying and contacting the Licensor/"
 "s."
 msgstr ""
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 #, fuzzy
 msgid "PLUS Media Summary Code"
 msgstr "GPS Tryb pomiaru"
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 msgid ""
 "A PLUS-standardized alphanumeric code string summarizing the media usages "
 "included in the license."
 msgstr ""
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "License Start Date"
 msgstr "Dane wykrywania sceny"
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "The date on which the license takes effect."
 msgstr "Data i czas zrobienia wideo."
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "License End Date"
 msgstr "Dane obiektywu"
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "The date on which the license expires."
 msgstr "Nazwa sceny."
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 #, fuzzy
 msgid "Media Constraints"
 msgstr "PM Kontrast"
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 msgid ""
 "Constraints limiting the scope of PLUS Media Usage/s included in the license "
 "to particular named media or to media not yet specifically defined in the "
 "PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
+#, fuzzy
 msgid "Region Constraints"
-msgstr ""
+msgstr "PM Kontrast"
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
 msgid ""
 "Constraints limiting the scope of geographic distribution to specific "
 "cities, states, provinces or other areas to be included in or excluded from "
 "the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
+#, fuzzy
 msgid "Product or Service Constraints"
-msgstr ""
+msgstr "Automatyczna regulacja kontrastu"
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
 msgid ""
 "Constraints limiting usage of the image to promotion of/association with a "
 "named product or service."
 msgstr ""
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 #, fuzzy
 msgid "Image File Constraints"
 msgstr "Ustawienia rozmiaru obrazu"
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 msgid ""
 "Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
+#, fuzzy
 msgid "Image Alteration Constraints"
-msgstr ""
+msgstr "Ustawienia jakości obrazu"
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
 msgid ""
 "Constraints on alteration of the image by cropping, flipping, retouching, "
 "colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 #, fuzzy
 msgid "Image Duplication Constraints"
 msgstr "Ustawienia jakości obrazu"
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 #, fuzzy
 msgid "Model Release Status"
 msgstr "Data udostępnienia"
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 msgid ""
 "Summarizes the availability and scope of model releases authorizing usage of "
 "the likenesses of persons appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 #, fuzzy
 msgid "Model Release ID"
 msgstr "Identyfikator modelu"
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid ""
 "Age of the youngest model pictured in the image, at the time that the image "
 "was made."
 msgstr ""
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
+#, fuzzy
 msgid "Property Release Status"
-msgstr ""
+msgstr "Data udostępnienia"
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
 msgid ""
 "Summarizes the availability and scope of property releases authorizing usage "
 "of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
+#, fuzzy
 msgid "Property Release ID"
-msgstr ""
+msgstr "Identyfikator modelu"
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
 msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
 #, fuzzy
 msgid "Other Constraints"
 msgstr "Automatyczna regulacja kontrastu"
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
+#, fuzzy
 msgid "Additional constraints on the license."
-msgstr ""
+msgstr "Informacja o pozycji AF"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
+#, fuzzy
 msgid "Credit Line Required"
-msgstr ""
+msgstr "Nie używany"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
 msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Other License Requirements"
-msgstr ""
+msgstr "Obiektyw"
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Additional license requirements."
-msgstr ""
+msgstr "Informacja o pozycji AF"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
+#, fuzzy
 msgid "Terms and Conditions Text"
-msgstr ""
+msgstr "Warunki robienia zdjęcia"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
 msgid "Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
+#, fuzzy
 msgid "Terms and Conditions URL"
-msgstr ""
+msgstr "Warunki robienia zdjęcia"
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
 msgid "URL for Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
 #, fuzzy
 msgid "Other License Conditions"
 msgstr "Warunki robienia zdjęcia"
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
+#, fuzzy
 msgid "Additional license conditions."
-msgstr ""
+msgstr "Informacja o pozycji AF"
 
-#: src/properties.cpp:731
+#: src/properties.cpp:747
 #, fuzzy
 msgid "Identifies the type of image delivered."
 msgstr "Określa dostawcę i produkt"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
+#, fuzzy
 msgid "Licensor Image ID"
-msgstr ""
+msgstr "ID obiektywu"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
 msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
+#, fuzzy
 msgid "Image File Name As Delivered"
-msgstr ""
+msgstr "Powiązany format pliku obrazu"
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
 msgid ""
 "Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 #, fuzzy
 msgid "Image File Format As Delivered"
 msgstr "Powiązany format pliku obrazu"
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 msgid ""
 "File format of the image file delivered to the Licensee for use under the "
 "license."
 msgstr ""
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
+#, fuzzy
 msgid "Image File Size As Delivered"
-msgstr ""
+msgstr "Powiązany format pliku obrazu"
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
 msgid "Size of the image file delivered to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright Status"
 msgstr "Prawa autorskie"
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright status of the image."
 msgstr "Uwaga o prawach autorskich"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
+#, fuzzy
 msgid "Copyright Registration Number"
-msgstr ""
+msgstr "Nazwa właściciela"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
 msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "First Publication Date"
 msgstr "Data utworzenia postaci cyfrowej"
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "The date on which the image was first published."
 msgstr "Data wydania utworu."
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 #, fuzzy
 msgid "Copyright Owner"
 msgstr "Prawa autorskie"
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 #, fuzzy
 msgid "Copyright Owner ID"
 msgstr "Prawa autorskie"
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
 #, fuzzy
 msgid "Copyright Owner Name"
 msgstr "Nazwa właściciela"
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
+#, fuzzy
 msgid "Name of Copyright Owner."
-msgstr ""
+msgstr "Prawa autorskie"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
+#, fuzzy
 msgid "Copyright Owner Image ID"
-msgstr ""
+msgstr "Prawa autorskie"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
 msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Image Creator"
 msgstr "Orientacja obrazu"
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Creator/s of the image."
 msgstr "Przesunięcie obrazu podglądu"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 #, fuzzy
 msgid "Image Creator ID"
 msgstr "Orientacja obrazu"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 msgid "Optional PLUS-ID identifying each Image Creator."
 msgstr ""
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Image Creator Name"
 msgstr "Tonacja obrazu"
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Name of Image Creator."
 msgstr "Środek obrazu Raw"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
+#, fuzzy
 msgid "Image Creator Image ID"
-msgstr ""
+msgstr "Orientacja obrazu"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
 msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 #, fuzzy
 msgid "Image Supplier ID"
 msgstr "Unikalny identyfikator obrazu"
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
 #, fuzzy
 msgid "Image Supplier Name"
 msgstr "Rozmiar obrazu"
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
+#, fuzzy
 msgid "Name of Image Supplier."
-msgstr ""
+msgstr "Środek obrazu Raw"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
+#, fuzzy
 msgid "Image Supplier Image ID"
-msgstr ""
+msgstr "Unikalny identyfikator obrazu"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
 msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
+#, fuzzy
 msgid "Licensee Image ID"
-msgstr ""
+msgstr "Licznik usuniętych zdjęć"
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
 msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
 #, fuzzy
 msgid "Licensee Image Notes"
 msgstr "Licznik usuniętych zdjęć"
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
+#, fuzzy
 msgid "Notes added by Licensee."
-msgstr ""
+msgstr "Nazwa sceny."
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
+#, fuzzy
 msgid "Other Image Info"
-msgstr ""
+msgstr "Obiektyw"
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
 #, fuzzy
 msgid "Additional image information."
 msgstr "Informacja o pozycji AF"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 #, fuzzy
 msgid "License ID"
 msgstr "ID obiektywu"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
+#, fuzzy
 msgid "Licensor Transaction ID"
-msgstr ""
+msgstr "Data ważności"
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
 msgid ""
 "Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
+#, fuzzy
 msgid "Licensee Transaction ID"
-msgstr ""
+msgstr "Data ważności"
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
 msgid ""
 "Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 #, fuzzy
 msgid "Licensee Project Reference"
 msgstr "Odniesienie do projektu"
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "License Transaction Date"
 msgstr "Data ważności"
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "The date of the License Transaction."
 msgstr "Nazwa sceny."
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 #, fuzzy
 msgid "Reuse"
 msgstr "użyto"
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 msgid ""
 "Indicates whether a license is a repeat or an initial license.  Reuse may "
 "require that licenses stored in files previously delivered to the customer "
 "be updated."
 msgstr ""
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
+#, fuzzy
 msgid "Other License Documents"
-msgstr ""
+msgstr "Warunki robienia zdjęcia"
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
 msgid ""
 "Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Other License Info"
 msgstr "Obiektyw"
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Additional license information."
 msgstr "Informacja o pozycji AF"
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
 msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:764
+#: src/properties.cpp:780
 #, fuzzy
 msgid "Custom 4"
 msgstr "Użytkownika 1-4"
 
-#: src/properties.cpp:765
+#: src/properties.cpp:781
 #, fuzzy
 msgid "Custom 5"
 msgstr "Użytkownika 1"
 
-#: src/properties.cpp:766
+#: src/properties.cpp:782
 #, fuzzy
 msgid "Custom 6"
 msgstr "Użytkownika 1"
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
 msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:767
+#: src/properties.cpp:783
 #, fuzzy
 msgid "Custom 7"
 msgstr "Użytkownika 1"
 
-#: src/properties.cpp:768
+#: src/properties.cpp:784
 #, fuzzy
 msgid "Custom 8"
 msgstr "Użytkownika 1"
 
-#: src/properties.cpp:769
+#: src/properties.cpp:785
 #, fuzzy
 msgid "Custom 9"
 msgstr "Użytkownika 1"
 
-#: src/properties.cpp:770
+#: src/properties.cpp:786
 #, fuzzy
 msgid "Custom 10"
 msgstr "Użytkownika 1"
 
-#: src/properties.cpp:777
+#: src/properties.cpp:793
 msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:778
+#: src/properties.cpp:794
 #, fuzzy
 msgid "Not Required"
 msgstr "Nie używany"
 
-#: src/properties.cpp:784
+#: src/properties.cpp:800
 #, fuzzy
 msgid "Protected"
 msgstr "ID produktu"
 
-#: src/properties.cpp:785
+#: src/properties.cpp:801
 #, fuzzy
 msgid "Public Domain"
 msgstr "Poklatkowość"
 
-#: src/properties.cpp:791
+#: src/properties.cpp:807
+#, fuzzy
 msgid "Credit Adjacent To Image"
-msgstr ""
+msgstr "Obraz podglądu"
 
-#: src/properties.cpp:792
+#: src/properties.cpp:808
 msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:793
+#: src/properties.cpp:809
 #, fuzzy
 msgid "Credit on Image"
 msgstr "Obraz podglądu"
 
-#: src/properties.cpp:794
+#: src/properties.cpp:810
 #, fuzzy
 msgid "Not Require"
 msgstr "Nieokreślony"
 
-#: src/properties.cpp:799
+#: src/properties.cpp:815
 #, fuzzy
 msgid "No Colorization"
 msgstr "Solaryzacja"
 
-#: src/properties.cpp:800
+#: src/properties.cpp:816
 msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:801
+#: src/properties.cpp:817
 #, fuzzy
 msgid "No De-Colorization"
 msgstr "Solaryzacja"
 
-#: src/properties.cpp:802
+#: src/properties.cpp:818
 msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:803
+#: src/properties.cpp:819
+#, fuzzy
 msgid "No Merging"
-msgstr ""
+msgstr "Redukcja szumów"
 
-#: src/properties.cpp:804
+#: src/properties.cpp:820
 #, fuzzy
 msgid "No Retouching"
 msgstr "Redukcja szumów"
 
-#: src/properties.cpp:809
+#: src/properties.cpp:825
 msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:810
+#: src/properties.cpp:826
+#, fuzzy
 msgid "No Duplication Constraints"
-msgstr ""
+msgstr "Ustawienia jakości obrazu"
 
-#: src/properties.cpp:811
+#: src/properties.cpp:827
 #, fuzzy
 msgid "No Duplication"
 msgstr "Czas trwania"
 
-#: src/properties.cpp:816
+#: src/properties.cpp:832
 #, fuzzy
 msgid "Maintain File Name"
 msgstr "Nazwa pliku Raw"
 
-#: src/properties.cpp:817
+#: src/properties.cpp:833
+#, fuzzy
 msgid "Maintain File Type"
-msgstr ""
+msgstr "Nazwa pliku Raw"
 
-#: src/properties.cpp:818
+#: src/properties.cpp:834
 #, fuzzy
 msgid "Maintain ID in File Name"
 msgstr "Oryginalna nazwa pliku Raw"
 
-#: src/properties.cpp:819
+#: src/properties.cpp:835
 #, fuzzy
 msgid "Maintain Metadata"
 msgstr "Minolta data"
 
-#: src/properties.cpp:824
+#: src/properties.cpp:840
 #, fuzzy
 msgid "Windows Bitmap (BMP)"
 msgstr "Windows Tytuł"
 
-#: src/properties.cpp:825
+#: src/properties.cpp:841
 msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:826
+#: src/properties.cpp:842
 msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
-#: src/properties.cpp:827
+#: src/properties.cpp:843
 #, fuzzy
 msgid "Graphics Interchange Format (GIF)"
 msgstr "Format JPEG"
 
-#: src/properties.cpp:828
+#: src/properties.cpp:844
 #, fuzzy
 msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
 msgstr "Format JPEG"
 
-#: src/properties.cpp:830
+#: src/properties.cpp:846
 msgid "Macintosh Picture (PICT)"
 msgstr ""
 
-#: src/properties.cpp:831
+#: src/properties.cpp:847
 msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:832
+#: src/properties.cpp:848
 msgid "Photoshop Document (PSD)"
 msgstr ""
 
-#: src/properties.cpp:833
+#: src/properties.cpp:849
 msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:834
+#: src/properties.cpp:850
 #, fuzzy
 msgid "Tagged Image File Format (TIFF)"
 msgstr "Powiązany format pliku obrazu"
 
-#: src/properties.cpp:835
+#: src/properties.cpp:851
 msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:840
+#: src/properties.cpp:856
 msgid "Greater than 50 MB"
 msgstr ""
 
-#: src/properties.cpp:841
+#: src/properties.cpp:857
+#, fuzzy
 msgid "Up to 1 MB"
-msgstr ""
+msgstr "Optio A10"
 
-#: src/properties.cpp:842
+#: src/properties.cpp:858
 #, fuzzy
 msgid "Up to 10 MB"
 msgstr "Optio A10"
 
-#: src/properties.cpp:843
+#: src/properties.cpp:859
 #, fuzzy
 msgid "Up to 30 MB"
 msgstr "Optio 30"
 
-#: src/properties.cpp:844
+#: src/properties.cpp:860
 #, fuzzy
 msgid "Up to 50 MB"
 msgstr "Optio S50"
 
-#: src/properties.cpp:849
+#: src/properties.cpp:865
 #, fuzzy
 msgid "Illustrated Image"
 msgstr "Powiązana szerokość obrazu"
 
-#: src/properties.cpp:850
+#: src/properties.cpp:866
 msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:852
+#: src/properties.cpp:868
 msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:853
-#, fuzzy
-msgid "Video"
-msgstr "Szeroki"
-
-#: src/properties.cpp:858
+#: src/properties.cpp:874
 #, fuzzy
 msgid "Cell"
 msgstr "Żółty"
 
-#: src/properties.cpp:859
+#: src/properties.cpp:875
 msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:861
+#: src/properties.cpp:877
 #, fuzzy
 msgid "Pager"
 msgstr "Menedżer"
 
-#: src/properties.cpp:862
+#: src/properties.cpp:878
 msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:867
+#: src/properties.cpp:883
 #, fuzzy
 msgid "Age Unknown"
 msgstr "Brak informacji"
 
-#: src/properties.cpp:868
+#: src/properties.cpp:884
 msgid "Age 25 or Over"
 msgstr ""
 
-#: src/properties.cpp:869
+#: src/properties.cpp:885
 msgid "Age 24"
 msgstr ""
 
-#: src/properties.cpp:870
+#: src/properties.cpp:886
 msgid "Age 23"
 msgstr ""
 
-#: src/properties.cpp:871
+#: src/properties.cpp:887
 msgid "Age 22"
 msgstr ""
 
-#: src/properties.cpp:872
+#: src/properties.cpp:888
 msgid "Age 21"
 msgstr ""
 
-#: src/properties.cpp:873
+#: src/properties.cpp:889
 msgid "Age 20"
 msgstr ""
 
-#: src/properties.cpp:874
+#: src/properties.cpp:890
 msgid "Age 19"
 msgstr ""
 
-#: src/properties.cpp:875
+#: src/properties.cpp:891
 msgid "Age 18"
 msgstr ""
 
-#: src/properties.cpp:876
+#: src/properties.cpp:892
 msgid "Age 17"
 msgstr ""
 
-#: src/properties.cpp:877
+#: src/properties.cpp:893
 msgid "Age 16"
 msgstr ""
 
-#: src/properties.cpp:878
+#: src/properties.cpp:894
 msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:879
+#: src/properties.cpp:895
 msgid "Age 14 or Under"
 msgstr ""
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
 msgid "Not Applicable"
 msgstr ""
 
-#: src/properties.cpp:886
+#: src/properties.cpp:902
+#, fuzzy
 msgid "Unlimited Model Releases"
-msgstr ""
+msgstr "Identyfikator modelu"
 
-#: src/properties.cpp:887
+#: src/properties.cpp:903
 msgid "Limited or Incomplete Model Releases"
 msgstr ""
 
-#: src/properties.cpp:894
+#: src/properties.cpp:910
 msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:895
+#: src/properties.cpp:911
 msgid "Limited or Incomplete Property Releases"
 msgstr ""
 
-#: src/properties.cpp:901
+#: src/properties.cpp:917
 msgid "Repeat Use"
 msgstr ""
 
-#: src/sigmamn.cpp:60
+#: src/properties.cpp:921 src/properties.cpp:930
+#, fuzzy
+msgid "Fixture Identification"
+msgstr "Identyfikacja modelu"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+#, fuzzy
+msgid "Status"
+msgstr "GPS Stan"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
+msgstr ""
+
+#: src/properties.cpp:923 src/properties.cpp:932
+#, fuzzy
+msgid "People"
+msgstr "Purpurowy"
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
+msgstr ""
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
+msgstr ""
+
+#: src/sigmamn.cpp:62
 msgid "Resolution Mode"
 msgstr "Tryb rozdzielczości"
 
-#: src/sigmamn.cpp:61
+#: src/sigmamn.cpp:63
 msgid "Resolution mode"
 msgstr "Tryb rozdzielczości"
 
-#: src/sigmamn.cpp:62
+#: src/sigmamn.cpp:65
 msgid "Autofocus Mode"
 msgstr "Tryb ogniskowania"
 
-#: src/sigmamn.cpp:63
+#: src/sigmamn.cpp:66
 msgid "Autofocus mode"
 msgstr "Tryb ogniskowania"
 
-#: src/sigmamn.cpp:65
+#: src/sigmamn.cpp:68
 msgid "Focus Setting"
 msgstr "Ustawienie ogniskowania"
 
-#: src/sigmamn.cpp:66
-msgid "Focus setting"
-msgstr "Ustawienie ogniskowania"
+#: src/sigmamn.cpp:69
+msgid "Focus setting"
+msgstr "Ustawienie ogniskowania"
+
+#: src/sigmamn.cpp:80
+msgid "Lens Range"
+msgstr "Zakres obiektywu"
+
+#: src/sigmamn.cpp:81
+msgid "Lens focal length range"
+msgstr "Zakres ogniskowych obiektywu"
+
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+msgid "Shadow"
+msgstr "Cień"
+
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
+#, fuzzy
+msgid "Highlight"
+msgstr "Światło"
+
+#: src/sigmamn.cpp:104
+#, fuzzy
+msgid "Fill Light"
+msgstr "Światło wypełniające"
+
+#: src/sigmamn.cpp:105
+msgid "X3 Fill light"
+msgstr "Światło wypełniające X3"
+
+#: src/sigmamn.cpp:107
+msgid "Color Adjustment"
+msgstr "Regulacja koloru"
+
+#: src/sigmamn.cpp:108
+msgid "Color adjustment"
+msgstr "Regulacja koloru"
+
+#: src/sigmamn.cpp:110
+msgid "Adjustment Mode"
+msgstr "Tryb regulacji"
+
+#: src/sigmamn.cpp:111
+msgid "Adjustment mode"
+msgstr "Tryb regulacji"
+
+#: src/sigmamn.cpp:122
+#, fuzzy
+msgid "Auto Bracket"
+msgstr "Auto bracketing"
+
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
+#, fuzzy
+msgid "Auto bracket"
+msgstr "Auto bracketing"
+
+#: src/sigmamn.cpp:127
+msgid "Unknown SigmaMakerNote tag"
+msgstr "Nieznany znacznik SigmaMakerNote"
+
+#: src/sigmamn.cpp:170
+msgid "8-Segment"
+msgstr "8-polowy"
+
+#: src/sonymn.cpp:88
+#, fuzzy
+msgid "Standard "
+msgstr "Standardowy"
+
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
+msgstr ""
+
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
+msgstr ""
+
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
+msgstr ""
+
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
+msgstr ""
+
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
+msgstr ""
+
+#: src/sonymn.cpp:109
+#, fuzzy
+msgid "Landscape "
+msgstr "Pejzaż"
+
+#: src/sonymn.cpp:113
+#, fuzzy
+msgid "Night Scene / Twilight"
+msgstr "Scena nocna"
+
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
+msgstr ""
+
+#: src/sonymn.cpp:115
+#, fuzzy
+msgid "Twilight Portrait"
+msgstr "Portret nocny"
+
+#: src/sonymn.cpp:116
+#, fuzzy
+msgid "Soft Snap"
+msgstr "Gładka skóra"
+
+#: src/sonymn.cpp:118
+#, fuzzy
+msgid "Smile Shutter"
+msgstr "Wolna migawka"
+
+#: src/sonymn.cpp:120
+#, fuzzy
+msgid "High Sensitivity"
+msgstr "Wysoka czułość"
+
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
+msgstr ""
+
+#: src/sonymn.cpp:123
+#, fuzzy
+msgid "Gourmet"
+msgstr "Dokumenty"
+
+#: src/sonymn.cpp:125
+#, fuzzy
+msgid "Handheld Twilight"
+msgstr "Światło świecy"
+
+#: src/sonymn.cpp:126
+#, fuzzy
+msgid "Anti Motion Blur"
+msgstr "Ruchomy obraz"
+
+#: src/sonymn.cpp:128
+#, fuzzy
+msgid "Backlight Correction HDR"
+msgstr "Bez korekcji"
+
+#: src/sonymn.cpp:142
+#, fuzzy
+msgid "On (Continuous)"
+msgstr "Ciągły"
+
+#: src/sonymn.cpp:143
+#, fuzzy
+msgid "On (Shooting)"
+msgstr "Tryb robienia zdjęcia"
+
+#: src/sonymn.cpp:151
+msgid "Plus"
+msgstr ""
+
+#: src/sonymn.cpp:167
+#, fuzzy
+msgid "White Flourescent"
+msgstr "Fluorescencja biała"
+
+#: src/sonymn.cpp:168
+#, fuzzy
+msgid "Cool White Flourescent"
+msgstr "Fluorescencja biała"
+
+#: src/sonymn.cpp:169
+#, fuzzy
+msgid "Day White Flourescent"
+msgstr "Fluorescencja biała dzienna"
+
+#: src/sonymn.cpp:172
+#, fuzzy
+msgid "Underwater 1 (Blue Water)"
+msgstr "Podwodny szeroki 1"
+
+#: src/sonymn.cpp:173
+#, fuzzy
+msgid "Underwater 2 (Green Water)"
+msgstr "Zdjęcie podwodne"
+
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
+msgstr ""
+
+#: src/sonymn.cpp:188
+#, fuzzy
+msgid "Center AF"
+msgstr "Środkowy"
+
+#: src/sonymn.cpp:189
+#, fuzzy
+msgid "Spot AF"
+msgstr "Punktowy"
+
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
+msgstr ""
+
+#: src/sonymn.cpp:191
+#, fuzzy
+msgid "Touch AF"
+msgstr "Automatyczna korekcja balansu bieli"
+
+#: src/sonymn.cpp:192
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Ręczne ostrzenie"
+
+#: src/sonymn.cpp:193
+#, fuzzy
+msgid "Face Detected"
+msgstr "Wykrywanie twarzy"
+
+#: src/sonymn.cpp:208
+#, fuzzy
+msgid "Close Focus"
+msgstr "Automatyczne ostrzenie"
+
+#: src/sonymn.cpp:224
+#, fuzzy
+msgid "Exposure Bracketing"
+msgstr "Bracketing ekspozycji"
+
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+#, fuzzy
+msgid "Multi Burst Mode"
+msgstr "Tryb zdjęć seryjnych"
+
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+#, fuzzy
+msgid "Multi Burst Image Width"
+msgstr "Powiązana szerokość obrazu"
+
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+#, fuzzy
+msgid "Multi Burst Image Height"
+msgstr "Wysokość obrazu"
+
+#: src/sonymn.cpp:315
+#, fuzzy
+msgid "JPEG preview image"
+msgstr "Obraz podglądu"
+
+#: src/sonymn.cpp:341
+#, fuzzy
+msgid "Auto HDR"
+msgstr "Wysoki zakres"
+
+#: src/sonymn.cpp:342
+msgid "High Definition Range Mode"
+msgstr ""
+
+#: src/sonymn.cpp:346
+#, fuzzy
+msgid "Shot Information"
+msgstr "Informacje o zdjęciu"
+
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+#, fuzzy
+msgid "Sony Model ID"
+msgstr "Identyfikator modelu"
+
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+#, fuzzy
+msgid "Color Reproduction"
+msgstr "Redukcja szumów kolorów"
+
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+#, fuzzy
+msgid "Dynamic Range Optimizer"
+msgstr "Ustawienia trybu dynamicznego"
+
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+#, fuzzy
+msgid "Minolta MakerNote"
+msgstr "Minolta data"
+
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+#, fuzzy
+msgid "Full Image Size"
+msgstr "Rozmiar obrazu"
+
+#: src/sonymn.cpp:387
+#, fuzzy
+msgid "Preview Image Size"
+msgstr "Obraz podglądu"
+
+#: src/sonymn.cpp:388
+#, fuzzy
+msgid "Preview image size"
+msgstr "Obraz podglądu"
+
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
+msgstr ""
+
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Jakość"
+
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
+#, fuzzy
+msgid "Release Mode"
+msgstr "Data udostępnienia"
+
+#: src/sonymn.cpp:415
+#, fuzzy
+msgid "Shot number in continous burst mode"
+msgstr "Numer sekwencji (jeśli w serii)"
+
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+#, fuzzy
+msgid "Anti-Blur"
+msgstr "Anti-blur"
+
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
+#, fuzzy
+msgid "Long Exposure Noise Reduction"
+msgstr "Redukcja szumów przy długiej ekspozycji"
 
-#: src/sigmamn.cpp:77
-msgid "Lens Range"
-msgstr "Zakres obiektywu"
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
+#, fuzzy
+msgid "Intelligent Auto"
+msgstr "Inteligentna automatyka"
 
-#: src/sigmamn.cpp:78
-msgid "Lens focal length range"
-msgstr "Zakres ogniskowych obiektywu"
+#: src/sonymn.cpp:434
+#, fuzzy
+msgid "Unknown Sony1MakerNote tag"
+msgstr "Nieznany znacznik SonyMakerNote"
 
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
-msgid "Shadow"
-msgstr "Cień"
+#: src/sonymn.cpp:448
+#, fuzzy
+msgid "Continuous High"
+msgstr "Ciągły, wysoki"
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+#: src/sonymn.cpp:452
 #, fuzzy
-msgid "Highlight"
-msgstr "Światło"
+msgid "Continuous Low"
+msgstr "Ciągły, niski"
 
-#: src/sigmamn.cpp:101
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
 #, fuzzy
-msgid "Fill Light"
-msgstr "Światło wypełniające"
+msgid "D-Range Optimizer Bracketing Low"
+msgstr "Optymalizacja obrazu"
 
-#: src/sigmamn.cpp:102
-msgid "X3 Fill light"
-msgstr "Światło wypełniające X3"
+#: src/sonymn.cpp:487
+#, fuzzy
+msgid "Autumn"
+msgstr "Aukcja"
 
-#: src/sigmamn.cpp:104
-msgid "Color Adjustment"
-msgstr "Regulacja koloru"
+#: src/sonymn.cpp:493
+msgid "ADI"
+msgstr ""
 
-#: src/sigmamn.cpp:105
-msgid "Color adjustment"
-msgstr "Regulacja koloru"
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
+msgstr ""
 
-#: src/sigmamn.cpp:107
-msgid "Adjustment Mode"
-msgstr "Tryb regulacji"
+#: src/sonymn.cpp:529
+#, fuzzy
+msgid "Auto No Flash"
+msgstr "Auto (Błysk)"
 
-#: src/sigmamn.cpp:108
-msgid "Adjustment mode"
-msgstr "Tryb regulacji"
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
+#, fuzzy
+msgid "Dynamic Range Optimizer Level"
+msgstr "Ustawienia trybu dynamicznego"
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
-msgstr "Firmware"
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
+#, fuzzy
+msgid "Creative Style"
+msgstr "Data utworzenia"
 
-#: src/sigmamn.cpp:119
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
 #, fuzzy
-msgid "Auto Bracket"
-msgstr "Auto bracketing"
+msgid "Zone Matching Value"
+msgstr "Pasująca strefa"
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
 #, fuzzy
-msgid "Auto bracket"
-msgstr "Auto bracketing"
+msgid "AF With Shutter"
+msgstr "Szybka migawka"
 
-#: src/sigmamn.cpp:124
-msgid "Unknown SigmaMakerNote tag"
-msgstr "Nieznany znacznik SigmaMakerNote"
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+#, fuzzy
+msgid "High ISO NoiseReduction"
+msgstr "Redukcja szumów przy wysokim ISO"
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
-msgstr "8-polowy"
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
+#, fuzzy
+msgid "Image Style"
+msgstr "Rodzaj obrazu"
 
-#: src/sonymn.cpp:80
-msgid "Unknown SonyMakerNote tag"
-msgstr "Nieznany znacznik SonyMakerNote"
+#: src/sonymn.cpp:655
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings tag"
+msgstr "Nieznany znacznik Canon Camera Settings 1"
+
+#: src/sonymn.cpp:719
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings 2 tag"
+msgstr "Nieznany znacznik Canon Camera Settings 2"
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
 msgid "Unknown section"
 msgstr "Nieznana sekcja"
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
 msgid "Image data structure"
 msgstr "Struktura danych obrazu"
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
 msgid "Recording offset"
 msgstr "Przesunięcie zapisu"
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
 msgid "Image data characteristics"
 msgstr "Charakterystyka danych obrazu"
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 msgid "Other data"
 msgstr "Inne dane"
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
 msgid "Exif data structure"
 msgstr "Struktura danych Exif"
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
 msgid "Image configuration"
 msgstr "Konfiguracja obrazu"
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
 msgid "User information"
 msgstr "Dane użytkownika"
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
 msgid "Related file"
 msgstr "Powiązany plik"
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 msgid "Date and time"
 msgstr "Data i czas"
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
 msgid "Picture taking conditions"
 msgstr "Warunki robienia zdjęcia"
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
 msgid "GPS information"
 msgstr "Informacja GPS"
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
 msgid "Interoperability information"
 msgstr "Informacje o wymienialności"
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
 msgid "Vendor specific information"
 msgstr "Informacje zależna od dostawcy"
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 msgid "Adobe DNG tags"
 msgstr "Znaczniki Adobe DNG"
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
 msgid "Panasonic RAW tags"
 msgstr "Znaczniki Panasonic RAW"
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 #, fuzzy
 msgid "TIFF/EP tags"
 msgstr "Standardowy ID TIFF/EP"
 
-#: src/tags.cpp:193
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
+msgstr ""
+
+#: src/tags.cpp:208
+#, fuzzy
+msgid "Adobe OPI tags"
+msgstr "Znaczniki Adobe DNG"
+
+#: src/tags.cpp:209
 msgid "Last section"
 msgstr "Ostatnia sekcja"
 
-#: src/tags.cpp:213
+#: src/tags.cpp:225
 msgid "Primary image"
 msgstr "Główny obraz"
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
 msgid "Thumbnail/Preview image"
 msgstr "Podgląd/miniatura"
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
 msgid "Primary image, Multi page file"
 msgstr "Główny obraz, plik wielostronnicowy"
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
 msgid "Thumbnail/Preview image, Multi page file"
 msgstr "Podgląd/miniatura, plik wielostronnicowy"
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
 msgid "Primary image, Transparency mask"
 msgstr "Główny obraz, maska przezroczystości"
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
 msgid "Thumbnail/Preview image, Transparency mask"
 msgstr "Podgląd/miniatura, maska przezroczystości"
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
 msgstr "Główny obraz, obraz wielostronnicowy, maska przezroczystości"
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr "Podgląd/miniatura, obraz wielostronnicowy, maska przezroczystości"
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+#, fuzzy
+msgid "Full-resolution image data"
+msgstr "Nie można było odczytać danych obrazu"
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr ""
+
+#: src/tags.cpp:246
 msgid "inch"
 msgstr "cal"
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr "CCITT RLE"
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr "T4/Group 3 Fax"
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr "T6/Group 4 Fax"
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
 msgstr "LZW"
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
 msgstr "JPEG (stary format)"
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr "JPEG"
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
 msgid "Adobe Deflate"
 msgstr "Adobe Deflate"
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
 msgstr "JBIG B&W"
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 msgid "JBIG Color"
 msgstr "JBIG Color"
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr "2-bitowe RLE NeXT"
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 msgid "Epson ERF Compressed"
 msgstr "Epson ERF Compressed"
 
-#: src/tags.cpp:244
+#: src/tags.cpp:264
+#, fuzzy
+msgid "Samsung SRW Compressed"
+msgstr "Epson ERF Compressed"
+
+#: src/tags.cpp:265
 msgid "CCITT RLE 1-word"
 msgstr "CCITT RLE 1-word"
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr "PackBits (Macintosh RLE)"
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr "Thunderscan RLE"
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr "IT8 CT Padding"
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr "IT8 Linework RLE"
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
 msgid "IT8 Monochrome Picture"
 msgstr "IT8 Monochrome Picture"
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr "IT8 Binary Lineart"
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr "Pixar Film (LZW, 10-bitowe)"
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr "Pixar Log (ZIP, 11-bitowe)"
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
 msgid "Pixar Deflate"
 msgstr "Pixar Deflate"
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr "Kodak DCS Encoding"
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
 msgid "ISO JBIG"
 msgstr "ISO JBIG"
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr "SGI Log Luminance RLE"
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr "SGI Log 24-bitowy upakowany"
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr "Leadtools JPEG 2000"
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 msgid "Nikon NEF Compressed"
 msgstr "Nikon NEF Compressed"
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
 msgid "Kodak DCR Compressed"
 msgstr "Kodak DCR Compressed"
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 msgid "Pentax PEF Compressed"
 msgstr "Pentax PEF Compressed"
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
 #, fuzzy
 msgid "White Is Zero"
 msgstr "Biel wynosi zero"
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
 #, fuzzy
 msgid "Black Is Zero"
 msgstr "Czerń wynosi zero"
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr "RGB"
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
 msgstr "Paleta RGB"
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
 msgstr "Maska przezroczystości"
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr "CIELab"
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr "ICCLab"
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr "ITULab"
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
 msgid "Color Filter Array"
 msgstr "Tablica filtra koloru"
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr "Pixar LogL"
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr "Pixar LogLuv"
 
-#: src/tags.cpp:279
+#: src/tags.cpp:300
 msgid "Linear Raw"
 msgstr "Liniowy Raw"
 
-#: src/tags.cpp:284
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
+msgstr ""
+
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+#, fuzzy
+msgid "Randomized process"
+msgstr "Proces zwykły"
+
+#: src/tags.cpp:312
 #, fuzzy
 msgid "top, left"
 msgstr "Górny, lewy"
 
-#: src/tags.cpp:285
+#: src/tags.cpp:313
 #, fuzzy
 msgid "top, right"
 msgstr "Górny, prawy"
 
-#: src/tags.cpp:286
+#: src/tags.cpp:314
 #, fuzzy
 msgid "bottom, right"
 msgstr "Dolny, prawy"
 
-#: src/tags.cpp:287
+#: src/tags.cpp:315
 #, fuzzy
 msgid "bottom, left"
 msgstr "Dolny, lewy"
 
-#: src/tags.cpp:288
+#: src/tags.cpp:316
 #, fuzzy
 msgid "left, top"
 msgstr "Lewy, górny"
 
-#: src/tags.cpp:289
+#: src/tags.cpp:317
 #, fuzzy
 msgid "right, top"
 msgstr "Prawy, górny"
 
-#: src/tags.cpp:290
+#: src/tags.cpp:318
 #, fuzzy
 msgid "right, bottom"
 msgstr "Prawy, dolny"
 
-#: src/tags.cpp:291
+#: src/tags.cpp:319 src/tags.cpp:320
 #, fuzzy
 msgid "left, bottom"
 msgstr "Lewy, dolny"
 
-#: src/tags.cpp:296
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
+msgstr ""
+
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+#, fuzzy
+msgid "not CMYK"
+msgstr "CMYK"
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr ""
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
+msgstr ""
+
+#: src/tags.cpp:340 src/tags.cpp:341
+#, fuzzy
+msgid "Undefined data format"
+msgstr "Nieobsługiwany format daty"
+
+#: src/tags.cpp:346
+#, fuzzy
+msgid "Not indexed"
+msgstr "Nieokreślony"
+
+#: src/tags.cpp:347 src/tags.cpp:653
+msgid "Indexed"
+msgstr ""
+
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
+
+#: src/tags.cpp:353
+#, fuzzy
+msgid "B"
+msgstr "Balans bieli"
+
+#: src/tags.cpp:354
+msgid "C"
+msgstr ""
+
+#: src/tags.cpp:355
+#, fuzzy
+msgid "A+B-C"
+msgstr "AF-C"
+
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:358
+msgid "(A+B)/2"
+msgstr ""
+
+#: src/tags.cpp:363
 msgid "Centered"
 msgstr "Wyśrodkowany"
 
-#: src/tags.cpp:297
+#: src/tags.cpp:364
 msgid "Co-sited"
 msgstr "Położone razem"
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
 msgid "No flash"
 msgstr "Brak flesza"
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 msgid "Fired, strobe return light not detected"
 msgstr "Z lampą, błysk zwrotny nie wykryty"
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 msgid "Fired, strobe return light detected"
 msgstr "Z lampą, błysk zwrotny wykryty"
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
 msgid "Yes, did not fire"
 msgstr "Tak, nie uruchomił się"
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
 msgid "Yes, compulsory"
 msgstr "Tak, wymuszony"
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 msgid "Yes, compulsory, return light not detected"
 msgstr "Tak, wymuszony, światło zwrotne nie wykryte"
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 msgid "Yes, compulsory, return light detected"
 msgstr "Tak, wymuszony, światło zwrotne wykryte"
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
 msgstr "Nie, wymuszony"
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 msgid "No, did not fire, return not detected"
 msgstr "Nie, nie uruchomił się, światło zwrotne nie wykryte"
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 msgid "No, auto"
 msgstr "Nie, automatycznie"
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 msgid "Yes, auto"
 msgstr "Tak, automatycznie"
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 msgid "Yes, auto, return light not detected"
 msgstr "Tak, automatycznie, światło zwrotne nie wykryte"
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 msgid "Yes, auto, return light detected"
 msgstr "Tak, automatycznie, światło zwrotne wykryte"
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 msgid "No flash function"
 msgstr "Brak funkcji flesza"
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 msgid "No, no flash function"
 msgstr "Nie, brak funkcji flesza"
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
 msgid "Yes, red-eye reduction"
 msgstr "Tak, redukcja czerwonych oczu"
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 msgid "Yes, red-eye reduction, return light not detected"
 msgstr "Tak, redukcja czerwonych oczu, światło zwrotne nie wykryte"
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 msgid "Yes, red-eye reduction, return light detected"
 msgstr "Tak, redukcja czerwonych oczu, światło zwrotne wykryte"
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
 msgid "Yes, compulsory, red-eye reduction"
 msgstr "Tak, wymuszony, redukcja czerwonych oczu"
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr "Tak, wymuszony, redukcja czerwonych oczu, światło zwrotne nie wykryte"
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr "Tak, wymuszony, redukcja czerwonych oczu, światło zwrotne wykryte"
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
 msgid "No, red-eye reduction"
 msgstr "Nie, redukcja czerwonych oczu"
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
 msgid "No, auto, red-eye reduction"
 msgstr "Nie, automatycznie, redukcja czerwonych oczu"
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
 msgid "Yes, auto, red-eye reduction"
 msgstr "Tak, automatycznie, redukcja czerwonych oczu"
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr ""
 "Tak, automatycznie, redukcja czerwonych oczu, światło zwrotne nie wykryte"
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr "Tak, automatycznie, redukcja czerwonych oczu, światło zwrotne wykryte"
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
 msgstr "Układ prostokątny (lub kwadratowy)"
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 msgid "Processing Software"
 msgstr "Program"
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
 msgstr "Nazwa i wersja oprogramowania użytego do obróbki obrazu."
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
 msgid "New Subfile Type"
 msgstr "Nowy typ podpliku"
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "Ogólne oznaczenie rodzaju danych zawartych w tym podpliku."
 
-#: src/tags.cpp:350
+#: src/tags.cpp:416
+#, fuzzy
+msgid "Subfile Type"
+msgstr "Nowy typ podpliku"
+
+#: src/tags.cpp:417
+#, fuzzy
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
+msgstr "Ogólne oznaczenie rodzaju danych zawartych w tym podpliku."
+
+#: src/tags.cpp:421
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -15246,7 +19038,7 @@
 "skompresowanych algorytmem JPEG zamiast tego znacznika używany jest znacznik "
 "JPEG."
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -15254,11 +19046,11 @@
 "Liczba wierszy danych obrazu. W danych skompresowanych algorytmem JPEG "
 "zamiast tego znacznika używany jest znacznik JPEG."
 
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr "Bitów na próbkę"
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 msgid ""
 "The number of bits per image component. In this standard each component of "
 "the image is 8 bits, so the value for this tag is 8. See also "
@@ -15270,7 +19062,7 @@
 "danych skompresowanych algorytmem JPEG zamiast tego znacznika używany jest "
 "znacznik JPEG."
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
 msgid ""
 "The compression scheme used for the image data. When a primary image is JPEG "
 "compressed, this designation is not necessary and is omitted. When "
@@ -15280,7 +19072,7 @@
 "skompresowany algorytmem JPEG, to oznaczenie nie jest potrzebne i jest "
 "pomijane. Jeśli miniaturki używają kompresji JPEG, ten znacznik ma wartość 6."
 
-#: src/tags.cpp:371
+#: src/tags.cpp:442
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -15288,23 +19080,55 @@
 "Składowe pikseli. W danych skompresowanych algorytmem JPEG zamiast tego "
 "znacznika używany jest znacznik JPEG."
 
-#: src/tags.cpp:374
+#: src/tags.cpp:445
+msgid "Threshholding"
+msgstr ""
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+
+#: src/tags.cpp:449
+#, fuzzy
+msgid "Cell Width"
+msgstr "Przycięcie szerokość"
+
+#: src/tags.cpp:450
+msgid ""
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:453
+#, fuzzy
+msgid "Cell Length"
+msgstr "Długość kafelka"
+
+#: src/tags.cpp:454
+msgid ""
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr "Kolejność wypełniania"
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
 msgstr "Logiczny porządek bitów wewnątrz bajta"
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
 msgid "Document Name"
 msgstr "Nazwa dokumentu"
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
 msgid "The name of the document from which this image was scanned"
 msgstr "Nazwa dokumentu, z którego obraz został zeskanowany"
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -15316,7 +19140,7 @@
 "znaków. Jeśli dwubajtowe kody znaków są potrzebne, należy użyć znacznika "
 "Exif Private <UserComment>."
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -15326,7 +19150,7 @@
 "digitalizera albo innego urządzenia, które wygenerowało obraz. Jeśli to pole "
 "jest puste, jest traktowane jako nieznane."
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
@@ -15336,7 +19160,7 @@
 "skanera, digitalizera albo innego urządzenia, które wygenerowało obraz. "
 "Jeśli to pole jest puste, jest traktowane jako nieznane."
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -15348,15 +19172,15 @@
 "skompresowanych algorytmem JPEG to oznaczenie nie jest potrzebne i jest "
 "pomijane. Patrz także <RowsPerStrip> i <StripByteCount>."
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Orientacja obrazu widziana w kategoriach wierszy i kolumn."
 
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr "Próbek na piksel"
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
@@ -15366,11 +19190,11 @@
 "i YCbCr, wartość tego znacznika wynosi 3. W danych skompresowanych "
 "algorytmem JPEG zamiast tego znacznika używany jest znacznik JPEG."
 
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr "Wierszy na pas"
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
 "strip when an image is divided into strips. With JPEG compressed data this "
@@ -15382,11 +19206,11 @@
 "oznaczenie nie jest potrzebne i jest pomijane. Patrz także <StripOffsets> i "
 "<StripByteCounts>."
 
-#: src/tags.cpp:420
+#: src/tags.cpp:503
 msgid "Strip Byte Count"
 msgstr "Liczba bajtów na pas"
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -15394,11 +19218,11 @@
 "Całkowita liczba bajtów w każdym pasie. W danych skompresowanych algorytmem "
 "JPEG to oznaczenie nie jest potrzebne i jest pomijane."
 
-#: src/tags.cpp:424
+#: src/tags.cpp:507
 msgid "X-Resolution"
 msgstr "Rozdzielczość Y"
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -15407,11 +19231,11 @@
 "szerokości (<ImageWidth>). Kiedy rozdzielczość obrazu jest nieznana, "
 "przyjmuje się 72 [dpi]."
 
-#: src/tags.cpp:428
+#: src/tags.cpp:511
 msgid "Y-Resolution"
 msgstr "Rozdzielczość Y"
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -15419,7 +19243,7 @@
 "Liczba pikseli na jednostkę rozdzielczości (<ResolutionUnit>) w kierunku "
 "długości (<ImageLength>). Zakładana jest taka sama wartość jak <XResolution>."
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
@@ -15430,7 +19254,43 @@
 "używany jest znacznik JPEG. Jeśli to pole nie istnieje, domyślne dla TIFF "
 "jest 1 (blokowy)."
 
-#: src/tags.cpp:439
+#: src/tags.cpp:521
+#, fuzzy
+msgid "Gray Response Unit"
+msgstr "Limit odpowiedzi linearnej"
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr ""
+
+#: src/tags.cpp:524
+#, fuzzy
+msgid "Gray Response Curve"
+msgstr "Krzywa tonalna"
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+
+#: src/tags.cpp:527
+#, fuzzy
+msgid "T4 Options"
+msgstr "Opcja"
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+#, fuzzy
+msgid "T6 Options"
+msgstr "Opcja"
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -15440,7 +19300,7 @@
 "używana jest ta sama jednostka. Jeśli rozdzielczość jest nieznana, "
 "przyjmowane jest 2 (cale)."
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
@@ -15450,7 +19310,7 @@
 "znacznik nie jest potrzebny, ponieważ przestrzeń kolorów podana jest w "
 "znaczniku informacji o przestrzeni kolorów (<ColorSpace>)."
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -15462,7 +19322,7 @@
 "Szczegółowy format nie jest określony, ale zaleca się naśladowanie "
 "poniższego przykładu. Jeśli pole jest puste, jest traktowane jako nieznane."
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
 "time the file was changed."
@@ -15470,7 +19330,7 @@
 "Data i czas utworzenia obrazu. W standardzie Exif jest to data i czas zmiany "
 "pliku."
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
 "creator. The detailed format is not specified, but it is recommended that "
@@ -15485,18 +19345,30 @@
 "jest traktowane jako nieznane. Przykład: \"Camera owner, John Smith; "
 "Photographer, Michael Brown; Image creator, Ken James\""
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+#, fuzzy
+msgid "Host Computer"
 msgstr "Komputer "
 
-#: src/tags.cpp:468
+#: src/tags.cpp:563
 msgid ""
 "This tag records information about the host computer used to generate the "
 "image."
 msgstr ""
 "Ten znacznik zawiera informację o komputerze użytym do utworzenia obrazu."
 
-#: src/tags.cpp:472
+#: src/tags.cpp:566
+#, fuzzy
+msgid "Predictor"
+msgstr "Wyrazy uznania"
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+
+#: src/tags.cpp:571
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the colorspace information tag "
@@ -15506,7 +19378,7 @@
 "ponieważ przestrzeń kolorów podana jest w znaczniku informacji o przestrzeni "
 "kolorów (<ColorSpace>)."
 
-#: src/tags.cpp:477
+#: src/tags.cpp:576
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since colorspace is specified in the colorspace "
@@ -15516,31 +19388,54 @@
 "potrzebny, ponieważ przestrzeń kolorów podana jest w znaczniku informacji o "
 "przestrzeni kolorów (<ColorSpace>)."
 
-#: src/tags.cpp:481
+#: src/tags.cpp:580
+#, fuzzy
+msgid "Color Map"
+msgstr "Matryca kolorów"
+
+#: src/tags.cpp:581
+msgid ""
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
+msgstr ""
+
+#: src/tags.cpp:586
+msgid "Halftone Hints"
+msgstr ""
+
+#: src/tags.cpp:587
+msgid ""
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
+msgstr ""
+
+#: src/tags.cpp:591
 msgid "Tile Width"
 msgstr "Szerokość kafelka"
 
-#: src/tags.cpp:482
+#: src/tags.cpp:592
 msgid "The tile width in pixels. This is the number of columns in each tile."
 msgstr ""
 "Szerokość kafelka w pikselach. Jest to liczba kolumna w każdym kafelku."
 
-#: src/tags.cpp:484
+#: src/tags.cpp:594
 msgid "Tile Length"
 msgstr "Długość kafelka"
 
-#: src/tags.cpp:485
+#: src/tags.cpp:595
 msgid ""
 "The tile length (height) in pixels. This is the number of rows in each tile."
 msgstr ""
 "Długość (wysokość) kafelka w pikselach. Jest to liczba wierszy w każdym "
 "kafelku."
 
-#: src/tags.cpp:487
+#: src/tags.cpp:597
 msgid "Tile Offsets"
 msgstr "Przesunięcia kafelków"
 
-#: src/tags.cpp:488
+#: src/tags.cpp:598
 msgid ""
 "For each tile, the byte offset of that tile, as compressed and stored on "
 "disk. The offset is specified with respect to the beginning of the TIFF "
@@ -15552,11 +19447,11 @@
 "pliku TIFF. Uwaga: powoduje to że każdy plik posiada położenie niezależne od "
 "położeń innych plików."
 
-#: src/tags.cpp:493
+#: src/tags.cpp:603
 msgid "Tile Byte Counts"
 msgstr "Liczby bajtów kafelków"
 
-#: src/tags.cpp:494
+#: src/tags.cpp:604
 msgid ""
 "For each tile, the number of (compressed) bytes in that tile. See "
 "TileOffsets for a description of how the byte counts are ordered."
@@ -15565,75 +19460,275 @@
 "opis, w jaki sposób liczby bajtów są uporządkowane w opisie znacznika "
 "\"Przesunięcia kafelków\"."
 
-#: src/tags.cpp:497
+#: src/tags.cpp:607
 msgid "SubIFD Offsets"
 msgstr "Przesunięcia SubIFD"
 
-#: src/tags.cpp:498
+#: src/tags.cpp:608
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr ""
 "Zdefiniowane przez Adobe Corporation, aby pozwolić na drzewa TIFF w pliku "
 "TIFF."
 
-#: src/tags.cpp:500
+#: src/tags.cpp:610
+#, fuzzy
+msgid "Ink Set"
+msgstr "Ustaw"
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:613
+#, fuzzy
+msgid "Ink Names"
+msgstr "Nazwa właściciela"
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+#, fuzzy
+msgid "Number Of Inks"
+msgstr "Liczba uderzeń"
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+#, fuzzy
+msgid "Dot Range"
+msgstr "Dynamiczny zakres"
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
+
+#: src/tags.cpp:622
+#, fuzzy
+msgid "Target Printer"
+msgstr "Docelowa przysłona"
+
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
+msgstr ""
+
+#: src/tags.cpp:625
+#, fuzzy
+msgid "Extra Samples"
+msgstr "Bitów na próbkę"
+
+#: src/tags.cpp:626
+msgid ""
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
+msgstr ""
+
+#: src/tags.cpp:629
+#, fuzzy
+msgid "Sample Format"
+msgstr "Format pliku"
+
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr ""
+
+#: src/tags.cpp:632
+#, fuzzy
+msgid "SMin Sample Value"
+msgstr "Częstotliwość próbkowania dźwięku"
+
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr ""
+
+#: src/tags.cpp:635
+#, fuzzy
+msgid "SMax Sample Value"
+msgstr "Największa wartość przysłony"
+
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr ""
+
+#: src/tags.cpp:638
 msgid "Transfer Range"
 msgstr "Zakres przejścia"
 
-#: src/tags.cpp:501
+#: src/tags.cpp:639
 #, fuzzy
 msgid "Expands the range of the TransferFunction"
 msgstr "Rozszerza zasięg funkcji zakresu przejścia"
 
-#: src/tags.cpp:503
+#: src/tags.cpp:641
+msgid "Clip Path"
+msgstr ""
+
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
+#, fuzzy
+msgid "JPEG tables"
+msgstr "Proces JPEG"
+
+#: src/tags.cpp:659
+msgid ""
+"This optional tag may be used to encode the JPEG quantization andHuffman "
+"tables for subsequent use by the JPEG decompression process."
+msgstr ""
+
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
+msgid "JPEG Process"
+msgstr "Proces JPEG"
+
+#: src/tags.cpp:667
+msgid "This field indicates the process used to produce the compressed data"
+msgstr "Pole to określa proces użyty do wyprodukowania skompresowanych danych"
+
+#: src/tags.cpp:669
+msgid "JPEG Interchange Format"
+msgstr "Format JPEG"
+
+#: src/tags.cpp:670
+msgid ""
+"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
+"is not used for primary image JPEG data."
+msgstr ""
+"Położenie początkowego bajta (SOI) danych skompresowanej miniaturki JPEG. "
+"Nie jest używane dla danych JPEG głównego obrazu."
+
+#: src/tags.cpp:673
+msgid "JPEG Interchange Format Length"
+msgstr "Długość formatu JPEG"
+
+#: src/tags.cpp:674
+msgid ""
+"The number of bytes of JPEG compressed thumbnail data. This is not used for "
+"primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
+"a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not "
+"be recorded. Compressed thumbnails must be recorded in no more than 64 "
+"Kbytes, including all other data to be recorded in APP1."
+msgstr ""
+"Liczba bajtów danych skompresowanej miniaturki JPEG. Nie jest używana dla "
+"danych JPEG głównego obrazu. Miniaturki JPEG nie są dzielone, ale zapisywane "
+"jako ciągły strumień JPEG od SOI do EOI. Znaczniki Appn i COM nie powinny "
+"być używane. Skompresowane miniaturki muszą być zapisane w co najwyżej 64 "
+"kB, włącznie ze wszystkimi innymi danymi zapisanymi w APP1."
+
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
+msgstr ""
+
+#: src/tags.cpp:682
+#, fuzzy
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
+msgstr "Pole to określa proces użyty do wyprodukowania skompresowanych danych"
+
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
+msgstr ""
+
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
+msgstr ""
+
+#: src/tags.cpp:690
+msgid ""
+"This Field points to a list of point transform values, one per component."
+msgstr ""
+
+#: src/tags.cpp:692
 #, fuzzy
-msgid "JPEG tables"
+msgid "JPEG Q-Tables"
 msgstr "Proces JPEG"
 
-#: src/tags.cpp:504
+#: src/tags.cpp:693
 msgid ""
-"This optional tag may be used to encode the JPEG quantization andHuffman "
-"tables for subsequent use by the JPEG decompression process."
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
 msgstr ""
 
-#: src/tags.cpp:507
-msgid "JPEG Process"
+#: src/tags.cpp:696
+#, fuzzy
+msgid "JPEG DC-Tables"
 msgstr "Proces JPEG"
 
-#: src/tags.cpp:508
-msgid "This field indicates the process used to produce the compressed data"
-msgstr "Pole to określa proces użyty do wyprodukowania skompresowanych danych"
-
-#: src/tags.cpp:510
-msgid "JPEG Interchange Format"
-msgstr "Format JPEG"
-
-#: src/tags.cpp:511
+#: src/tags.cpp:697
 msgid ""
-"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
-"is not used for primary image JPEG data."
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
 msgstr ""
-"Położenie początkowego bajta (SOI) danych skompresowanej miniaturki JPEG. "
-"Nie jest używane dla danych JPEG głównego obrazu."
 
-#: src/tags.cpp:514
-msgid "JPEG Interchange Format Length"
-msgstr "Długość formatu JPEG"
+#: src/tags.cpp:700
+#, fuzzy
+msgid "JPEG AC-Tables"
+msgstr "Proces JPEG"
 
-#: src/tags.cpp:515
+#: src/tags.cpp:701
 msgid ""
-"The number of bytes of JPEG compressed thumbnail data. This is not used for "
-"primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
-"a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not "
-"be recorded. Compressed thumbnails must be recorded in no more than 64 "
-"Kbytes, including all other data to be recorded in APP1."
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
 msgstr ""
-"Liczba bajtów danych skompresowanej miniaturki JPEG. Nie jest używana dla "
-"danych JPEG głównego obrazu. Miniaturki JPEG nie są dzielone, ale zapisywane "
-"jako ciągły strumień JPEG od SOI do EOI. Znaczniki Appn i COM nie powinny "
-"być używane. Skompresowane miniaturki muszą być zapisane w co najwyżej 64 "
-"kB, włącznie ze wszystkimi innymi danymi zapisanymi w APP1."
 
-#: src/tags.cpp:523
+#: src/tags.cpp:705
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in Appendix E, \"Color "
@@ -15647,11 +19742,11 @@
 "określona w znaczniku informacji o przestrzeni kolorów z wartością domyślną "
 "będącą tą, która daje optymalną charakterystykę obrazu w danym przypadku."
 
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr "Podpróbkowanie YCbCr"
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
 "component. In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -15660,7 +19755,7 @@
 "luminancji. W danych skompresowanych algorytmem JPEG zamiast tego znacznika "
 "używany jest znacznik JPEG."
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -15686,11 +19781,11 @@
 "wartości tego pola. Zaleca się, żeby czytający byli w stanie obsłużyć oba "
 "rodzaje rozmieszczenia."
 
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr "Czerń/biel odniesienia"
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -15704,43 +19799,55 @@
 "wartością domyślną dającą optymalną charakterystykę obrazu w danych "
 "warunkach."
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr "Pakiet XML"
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr "Metadane XMP (Adobe technote 9-14-02)"
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 msgid "Windows Rating"
 msgstr "Windows Ocena"
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr "Znacznik oceny używany przez Windows"
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
 msgid "Windows Rating Percent"
 msgstr "Windows Ocena procentowa"
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr "Znacznik oceny używany przez Windows, wartość podana w procentach"
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+#, fuzzy
+msgid "Image ID"
+msgstr "Unikalny identyfikator obrazu"
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr ""
 "Rozmiary wzoru geometrycznego CFA (color filter array - tablicy filtrów "
 "kolorów)"
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
@@ -15750,11 +19857,7 @@
 "kolorów) czujnika obrazu w przypadku użycia jednoukładowego czujnika obszaru "
 "koloru. Nie odnosi się to do wszystkich metod próbkowania"
 
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr "Poziom baterii"
-
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
 "photographer and editor copyrights. It is the copyright notice of the person "
@@ -15789,32 +19892,32 @@
 "redaktora (patrz przykład 3). Jeśli pole jest puste, jest traktowane jako "
 "nieznane."
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 #, fuzzy
 msgid "Exposure time, given in seconds."
 msgstr "Czas ekspozycji podany w sekundach (s)."
 
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
 msgid "The F number."
 msgstr "Liczba F."
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr "IPTC/NAA"
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr "Zawiera rekord IPTC/NAA"
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr "Blok zasobów obrazu"
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr "Zawiera informację osadzoną przez program Adobe Photoshop"
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
@@ -15823,11 +19926,11 @@
 "Wskaźnik do Exif IFD. Exif IFD ma tę samą strukturę co IFD określone w TIFF, "
 "oczywiście nie zawiera jednak danych obrazu jak w przypadku pliku TIFF."
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
 msgid "Inter Color Profile"
 msgstr "Profil kolorów ICC"
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
@@ -15835,7 +19938,7 @@
 "Zawiera profil/charakterystykę przestrzeni kolorów ICC (InterColor "
 "Consortium)"
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -15843,11 +19946,11 @@
 "Rodzaj programu użytego przez aparat do ustawienia ekspozycji przy robieniu "
 "zdjęcia."
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
 msgstr "Określa czułość widmową każdego kanału."
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
@@ -15855,11 +19958,11 @@
 "Wskaźnik do GPS Info IFD. Struktura wymienialności GPS Info IFD, podobnie "
 "jak Exif IFD, nie zawiera danych obrazu."
 
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
 msgid "ISO Speed Ratings"
 msgstr "Oszacowania szybkości ISO"
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -15867,29 +19970,29 @@
 "Określenie szybkości ISO i szerokości ISO aparatu lub urządzenia wejściowego "
 "zgodne ze specyfikacją ISO 12232."
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
 "14524."
 msgstr ""
 "Funkcja konwersji optoelektrycznej, zdefiniowana w dokumencie SO 14524."
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Interlace"
 msgstr "Z przeplotem"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Indicates the field number of multifield images."
 msgstr "Określa układ obrazu."
 
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 #, fuzzy
 msgid "Time Zone Offset"
 msgstr "Przesunięcia kafelków"
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -15897,98 +20000,98 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Self Timer Mode"
 msgstr "Samowyzwalacz"
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr "Liczba sekund od naciśnięcia przycisku migawki do zrobienia zdjęcia."
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "Date Time Original"
 msgstr "Data i czas (oryginału)"
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "The date and time when the original image data was generated."
 msgstr "Data i czas ostatniej modyfikacji metadanych."
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 #, fuzzy
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
 "Informacja specyficzna dla skompresowanych danych. Rodzaj kompresji użyty "
 "dla skompresowanego obrazu jest określony w jednostkach bitów na piksel."
 
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 #, fuzzy
 msgid "Shutter speed."
 msgstr "Szybkość migawki"
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
 #, fuzzy
 msgid "The lens aperture."
 msgstr "Najmniejsza wartość przysłony"
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 #, fuzzy
 msgid "The value of brightness."
 msgstr "Liczba uderzeń."
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 #, fuzzy
 msgid "The exposure bias."
 msgstr "Odchylenie ekspozycji"
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
 msgid "Max Aperture Value"
 msgstr "Największa wartość przysłony"
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 #, fuzzy
 msgid "The smallest F number of the lens."
 msgstr "Nazwa sceny."
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr "Odległość obiektu podana w metrach."
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
 msgid "The metering mode."
 msgstr "Tryb pomiaru."
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr "Rodzaj źródła światła."
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 msgid "Indicates the status of flash when the image was shot."
 msgstr "Ten znacznik określa stan flesza w trakcie robieniu zdjęcia."
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 msgid "The actual focal length of the lens, in mm."
 msgstr "Długość ogniskowej obiektywu, w milimetrach."
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 #, fuzzy
 msgid "Amount of flash energy (BCPS)."
 msgstr "Wielkość energii flesza (BCPS)"
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise"
 msgstr "Szum"
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr "Wartości pomiaru szumu."
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
@@ -15997,7 +20100,7 @@
 "Liczba pikseli na jednostkę rozdzielczości (<ResolutionUnit>) w kierunku "
 "długości (<ImageLength>). Zakładana jest taka sama wartość jak <XResolution>."
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
@@ -16006,53 +20109,49 @@
 "Liczba pikseli na jednostkę rozdzielczości (<ResolutionUnit>) w kierunku "
 "długości (<ImageLength>). Zakładana jest taka sama wartość jak <XResolution>."
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
 "FocalPlaneYResolution(37391)."
 msgstr ""
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 #, fuzzy
 msgid "Security Classification"
 msgstr "Powiększenie elektroniczne"
 
-#: src/tags.cpp:654
-msgid "Security classification assigned to the image."
-msgstr ""
-
-#: src/tags.cpp:655
+#: src/tags.cpp:841
 #, fuzzy
-msgid "Image History"
-msgstr "Wysokość obrazu"
+msgid "Security classification assigned to the image."
+msgstr "Powiększenie elektroniczne"
 
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 #, fuzzy
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
 msgstr ""
 "Ten znacznik określa położenie i obszar głównego obiektu na całej scenie."
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 #, fuzzy
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 "Określenie indeksu ekspozycji wybranego przez aparat lub urządzenie "
 "wejściowe w czasie robienia zdjęcia."
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
 msgid "TIFF/EP Standard ID"
 msgstr "Standardowy ID TIFF/EP"
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
@@ -16060,63 +20159,66 @@
 "Zawiera cztery znaki ASCII określające wersję standardu TIFF/EP pliku TIFF/"
 "EP, np. 1, 1, 0, 0."
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
+#, fuzzy
 msgid "Type of image sensor."
-msgstr ""
+msgstr "Środek obrazu Raw"
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
 msgid "Windows Title"
 msgstr "Windows Tytuł"
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr "Znacznik tytułu, używany przez Windows, zakodowany w UCS2"
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
 msgid "Windows Comment"
 msgstr "Windows Komentarz"
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr "Znacznik komentarza, używany przez Windows, zakodowany w UCS2"
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 msgid "Windows Author"
 msgstr "Windows Autor"
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr "Znacznik autora, używany przez Windows, zakodowany w UCS2"
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
 msgid "Windows Keywords"
 msgstr "Windows Słowa kluczowe"
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr "Znacznik słów kluczowych, używany przez Windows, zakodowany w UCS2"
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 msgid "Windows Subject"
 msgstr "Windows Temat"
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
 msgid "Subject tag used by Windows, encoded in UCS2"
 msgstr "Znacznik tematu, używany przez Windows, zakodowany w UCS2"
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
+#, fuzzy
 msgid "Print Image Matching"
-msgstr ""
+msgstr "Pasująca strefa"
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
-msgstr ""
+#: src/tags.cpp:866
+#, fuzzy
+msgid "Print Image Matching, description needed."
+msgstr "Pasująca strefa"
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
 msgid "DNG version"
 msgstr "Wersja DNG"
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
@@ -16126,11 +20228,11 @@
 "zgodnych z wersją 1.1.0.0 specyfikacji DNG, znacznik ten powinien zawierać "
 "bajty: 1, 1, 0, 0."
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
 msgid "DNG backward version"
 msgstr "Wersja wsteczna DNG"
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -16146,11 +20248,11 @@
 "dla wszystkich znaczników sprawdzić typy, liczby i wartości aby sprawdzić, "
 "czy są zdolne do poprawnego odczytania danego pliku."
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
 msgid "Unique Camera Model"
 msgstr "Unikalny model aparatu"
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -16166,11 +20268,11 @@
 "łańcuch może być użyty przez oprogramowanie czytnika do zindeksowania "
 "ustawień zależnych od modelu aparatu."
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
 msgid "Localized Camera Model"
 msgstr "Lokalny model aparatu"
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
@@ -16178,25 +20280,26 @@
 "Zawiera lokalną nazwę aparatu. Podobne do \"Unikalny model aparatu\", ale "
 "nazwa może być dostosowana do różnych rynków."
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
+#, fuzzy
 msgid "CFA Plane Color"
-msgstr ""
+msgstr "Kolor FinePix"
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr "Układ CFA"
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr "Określa układ przestrzenny CFA."
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -16205,18 +20308,18 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
 #, fuzzy
 msgid "Black Level Repeat Dim"
 msgstr ""
 "Rozmiary wzoru geometrycznego CFA (color filter array - tablicy filtrów "
 "kolorów)"
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -16224,11 +20327,11 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 msgid "Black Level Delta H"
 msgstr "Poziom czerni Delta H"
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -16237,11 +20340,11 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 msgid "Black Level Delta V"
 msgstr "Poziom czerni Delta V"
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -16249,22 +20352,22 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
 msgid "White Level"
 msgstr "Poziom bieli"
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
 msgid "Default Scale"
 msgstr "Domyślna skala"
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -16274,11 +20377,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr "Domyślny początek kadru"
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16287,11 +20390,11 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
 msgid "Default Crop Size"
 msgstr "Domyślny rozmiar kadru"
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16299,11 +20402,11 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 msgid "Color Matrix 1"
 msgstr "Matryca kolorów 1"
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -16311,22 +20414,22 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 msgid "Color Matrix 2"
 msgstr "Matryca kolorów 2"
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 msgid "Camera Calibration 1"
 msgstr "Kalibracja aparatu 1"
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16337,11 +20440,11 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
 msgid "Camera Calibration 2"
 msgstr "Kalibracja aparatu 2"
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16352,11 +20455,11 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
 msgid "Reduction Matrix 1"
 msgstr "Macierz redukcji 1"
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16364,11 +20467,11 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
 msgid "Reduction Matrix 2"
 msgstr "Macierz redukcji 2"
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16376,11 +20479,11 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
 msgid "Analog Balance"
 msgstr "Analogowy balans bieli"
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -16391,35 +20494,35 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
 #, fuzzy
 msgid "As Shot Neutral"
 msgstr "Balans bieli neutralny (as shot)"
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 #, fuzzy
 msgid "As Shot White XY"
 msgstr "Balans bieli XY (as shot)"
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
 msgid "Baseline Exposure"
 msgstr "Ekspozycja podstawowa"
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -16434,11 +20537,11 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
 msgid "Baseline Noise"
 msgstr "Szum podstawowy"
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -16447,11 +20550,11 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
 msgid "Baseline Sharpness"
 msgstr "Ostrość podstawowa"
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -16459,12 +20562,12 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 #, fuzzy
 msgid "Bayer Green Split"
 msgstr "Podział zieleni filtru Bayer"
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -16474,11 +20577,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr "Limit odpowiedzi linearnej"
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -16488,7 +20591,7 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
 "that captured the image."
@@ -16496,11 +20599,11 @@
 "CameraSerialNumber zawiera numer seryjny aparatu lub korpusu aparatu którym "
 "wykonano zdjęcie."
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
 msgid "Lens Info"
 msgstr "Obiektyw"
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 #, fuzzy
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
@@ -16509,11 +20612,11 @@
 "Zawiera informację o obiektywie którym zrobiono zdjęcie. Jeśli minimalna "
 "przysłona jest nieznana, powinna być zakodowana jako 0/0."
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr "Promień rozmycia kolorów"
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -16524,11 +20627,11 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
 msgid "Anti Alias Strength"
 msgstr "Siła antyaliasingu"
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -16537,11 +20640,11 @@
 "artifacts)."
 msgstr ""
 
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 msgid "Shadow Scale"
 msgstr "Skala cieni"
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
@@ -16549,11 +20652,11 @@
 "Ten znacznik jest używany przez program Adobe Camera Raw do kontrolowania "
 "czułości jego suwaka \"Shadows\"."
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 msgid "DNG Private Data"
 msgstr "Prywatne dane DNG"
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
@@ -16563,11 +20666,11 @@
 "Dane te mogą być użyte w ich własnych konwerterach RAW oraz do "
 "przechowywania danych zapisanych przez programy do edycji plików DNG."
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
 msgid "MakerNote Safety"
 msgstr "Bezpieczeństwo MakerNote"
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -16576,22 +20679,22 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr "Oświetlenie kalibracji 1"
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
 msgid "Calibration Illuminant 2"
 msgstr "Oświetlenie kalibracji 2"
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -16600,11 +20703,11 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
 msgid "Best Quality Scale"
 msgstr "Mnożnik najwyżej jakości"
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -16619,11 +20722,11 @@
 "pomnożyć wartości znacznika DefaultScale aby osiągnąć najwyższą jakość "
 "obrazu."
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 msgid "Raw Data Unique ID"
 msgstr "Unikalny ID danych Raw"
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -16633,21 +20736,21 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 msgid "Original Raw File Name"
 msgstr "Oryginalna nazwa pliku Raw"
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
 msgid "Original Raw File Data"
 msgstr "Oryginalne dane pliku Raw"
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -16660,11 +20763,11 @@
 "data blocks."
 msgstr ""
 
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 msgid "Active Area"
 msgstr "Obszar aktywny"
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
@@ -16672,11 +20775,11 @@
 "Prostokąt ten definiuje aktywne (nie zamaskowane) piksele matrycy. Kolejność "
 "współrzędnych wierzchołków prostokąta to: góra, lewo, dół, prawo."
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 msgid "Masked Areas"
 msgstr "Obszary nieaktywne"
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -16693,12 +20796,12 @@
 "ten znacznik nie powinien zostać użyty, ponieważ zamaskowane piksele nie są "
 "użyteczne."
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
 #, fuzzy
 msgid "As-Shot ICC Profile"
 msgstr "Profil ICC w trakcie wykonywania zdjęcia"
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -16711,12 +20814,12 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
 #, fuzzy
 msgid "As-Shot Pre-Profile Matrix"
 msgstr "Macierz pre-profilu w trakcie wykonywania zdjęcia"
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -16728,11 +20831,11 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 msgid "Current ICC Profile"
 msgstr "Bieżący profil ICC"
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -16740,11 +20843,11 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
 msgid "Current Pre-Profile Matrix"
 msgstr "Bieżąca macierz pre-profilu"
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -16752,183 +20855,179 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
 msgid "Unknown IFD tag"
 msgstr "Nieznany znacznik IFD"
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr "Nieokreślony"
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 msgid "Creative program"
 msgstr "Program twórczy"
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 msgid "Action program"
 msgstr "Program akcji"
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
 msgid "Portrait mode"
 msgstr "Portret"
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
 msgid "Landscape mode"
 msgstr "Pejzaż"
 
-#: src/tags.cpp:1051
-msgid "Center weighted average"
-msgstr "Centralnie ważony uśredniony"
-
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 msgid "Multi-spot"
 msgstr "Wielopunktowy"
 
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 msgid "Tungsten (incandescent light)"
 msgstr "Żarówka wolframowa"
 
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
 msgstr "Dobra pogoda"
 
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
 msgid "Cloudy weather"
 msgstr "Pochmurna pogoda"
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 msgid "Daylight fluorescent (D 5700 - 7100K)"
 msgstr "Światło dzienne lampy fluorescencyjnej (D 5700 - 7100K)"
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
 msgid "Day white fluorescent (N 4600 - 5400K)"
 msgstr "Biel dnia lampy fluorescencyjnej (N 4600 - 5400K)"
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
 msgid "Cool white fluorescent (W 3900 - 4500K)"
 msgstr "Chłodnobiała lampa fluorescencyjna (W 3900 - 4500K)"
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
 msgid "White fluorescent (WW 3200 - 3700K)"
 msgstr "Biała lampa fluorescencyjna (WW 3200 - 3700K)"
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr "Światło standardowe A"
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr "Światło standardowe B"
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr "Światło standardowe C"
 
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr "D55"
 
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr "D65"
 
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr "D75"
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 msgid "D50"
 msgstr "D50"
 
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
 msgid "ISO studio tungsten"
 msgstr "Wolframowe oświetlenie studyjne ISO"
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 msgid "Other light source"
 msgstr "Inne źródło światła"
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr "Nieskalibrowana"
 
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 msgid "One-chip color area"
 msgstr "Jednoukładowy czujnik obszaru koloru"
 
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 msgid "Two-chip color area"
 msgstr "Dwuukładowy czujnik obszaru koloru"
 
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 msgid "Three-chip color area"
 msgstr "Trzyukładowy czujnik obszaru koloru"
 
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 msgid "Color sequential area"
 msgstr "Sekwencyjny obszar koloru"
 
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr "Czujnik trzyliniowy"
 
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 msgid "Color sequential linear"
 msgstr "Liniowa sekwencja koloru"
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
 msgid "Film scanner"
 msgstr "Skaner negatywów"
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr "Skaner druku odblaskowego"
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
 msgid "Digital still camera"
 msgstr "Aparat cyfrowy"
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr "Bezpośrednio sfotografowane"
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
 msgid "Normal process"
 msgstr "Proces zwykły"
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
 msgid "Custom process"
 msgstr "Proces własny"
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr "Niskie wzmocnienie na górze"
 
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr "Wysokie wzmocnienie na górze"
 
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
 msgid "Low gain down"
 msgstr "Niskie wzmocnienie na dole"
 
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr "Wysokie wzmocnienie na górze"
 
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr "Widok bliski"
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr "Widok daleki"
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Czas ekspozycji podany w sekundach (s)."
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
 "tag value is an ASCII string compatible with the standard developed by the "
@@ -16938,11 +21037,11 @@
 "znacznika to łańcuch znaków ASCII kompatybilny ze standardem utworzonym "
 "przez ASTM Technical Committee."
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr "Funkcja konwersji optoelektrycznej"
 
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -16952,7 +21051,7 @@
 "Conversion Function) opisanej w ISO 14524. <OECF> określa zależność między "
 "wejściem optycznym aparatu a wartościami obrazu."
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -16960,11 +21059,11 @@
 "Obsługiwana wersja tego standardu. Brak tego pola jest uznawany za "
 "niezgodność ze standardem."
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
 msgid "Date and Time (original)"
 msgstr "Data i czas (oryginału)"
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
@@ -16972,15 +21071,15 @@
 "Data i czas wygenerowania oryginalnych danych obrazu. Dla aparatu cyfrowego "
 "zapisywana jest data i czas zrobienia zdjęcia."
 
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
 msgid "Date and Time (digitized)"
 msgstr "Data i czas (obrazu cyfrowego)"
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 msgid "The date and time when the image was stored as digital data."
 msgstr "Data i czas zapisania obrazu jako danych cyfrowych."
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -16996,11 +21095,11 @@
 "znacznik został dodany dla przypadków, kiedy skompresowane dane używają "
 "składowych innych niż Y, Cb i Cr oraz aby umożliwić obsługę innych sekwencji."
 
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr "Skompresowane bity na piksel"
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -17008,7 +21107,7 @@
 "Informacja specyficzna dla skompresowanych danych. Rodzaj kompresji użyty "
 "dla skompresowanego obrazu jest określony w jednostkach bitów na piksel."
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -17016,11 +21115,11 @@
 "Czas otwarcia migawki. Jednostką jest ustawienie APEX (Additive System of "
 "Photographic EXposure)."
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Przysłona obiektywu. Jednostką jest wartość APEX."
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -17028,11 +21127,11 @@
 "Wartość jasności. Jednostką jest wartość APEX. Zwykle jest podana w "
 "przedziale od -99.99 do 99.99."
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr "Odchylenie ekspozycji"
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -17040,7 +21139,7 @@
 "Odchylenie ekspozycji. Jednostką jest wartość APEX. Zwykle jest podana w "
 "przedziale od -99.99 do 99.99."
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
@@ -17049,14 +21148,14 @@
 "podana w przedziale od -99.99 do 99.99, ale nie ma ograniczenia do tego "
 "zakresu."
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "Ten znacznik jest zapisywany kiedy zdjęcie było robione z użyciem światła "
 "błyskowego (flesza)."
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -17064,18 +21163,18 @@
 "Rzeczywista ogniskowa obiektywu w milimetrach, bez przekształcenia do "
 "ogniskowej dla aparatu na film 35 mm."
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 "Ten znacznik określa położenie i obszar głównego obiektu na całej scenie."
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
 msgid "Maker Note"
 msgstr "Uwaga producenta"
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -17083,53 +21182,53 @@
 "Znacznik dla producentów urządzeń zapisujących Exif do zapisywania dowolnie "
 "wybranych informacji. Zawartość zależy od producenta."
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
 msgid "Sub-seconds Time"
 msgstr "Czas ekspozycji (ułamki sekund)"
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 "Znacznik używany do zapisywania ułamków sekund dla znacznika <DateTime>."
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 msgid "Sub-seconds Time Original"
 msgstr "Data i czas oryginału (ułamki sekund)"
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Znacznik używany do zapisywania ułamków sekund dla znacznika "
 "<DateTimeOriginal>."
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 msgid "Sub-seconds Time Digitized"
 msgstr "Data i czas digitalizacji (ułamki sekund)"
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Znacznik używany do zapisywania ułamków sekund dla znacznika "
 "<DateTimeDigitized>."
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
 msgid "FlashPix Version"
 msgstr "Wersja FlashPix"
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Wersja formatu FlashPix obsługiwana przez plik FPXR."
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB is used to define the color space based on the PC "
@@ -17144,7 +21243,7 @@
 "Nieskalibrowana. Dane obrazu zapisane jako nieskalibrowane mogą być "
 "traktowane jako sRGB przy konwersji do FlashPix."
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -17157,7 +21256,7 @@
 "znacznika restartu. Ten znacznik nie powinien istnieć w pliku "
 "nieskompresowanym."
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
@@ -17174,7 +21273,7 @@
 "potrzebne, liczba linii zapisana w tym polu będzie w praktyce równa tej "
 "zapisanej w SOF."
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
@@ -17187,11 +21286,11 @@
 "znaków + \".\" + 3 znaków rozszerzenia). Ścieżka do pliku nie jest "
 "zapisywana."
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
 msgid "Interoperability IFD Pointer"
 msgstr "Wskaźnik IFD wymienialności"
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -17205,7 +21304,7 @@
 "struktura IFD zdefiniowana w TIFF, ale w porównaniu do normalnego TIFF IFD "
 "nie zawiera danych obrazu."
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -17213,7 +21312,7 @@
 "Określenie energii błysku w czasie robienia zdjęcia mierzonej w jednostkach "
 "BCPS (Beam Candle Power Seconds)."
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
@@ -17223,11 +21322,11 @@
 "urządzenia wejściowego oraz wartości SFR w kierunku szerokości obrazu, "
 "wysokości obrazu i przekątnej zgodnie ze specyfikacją ISO 12233."
 
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 msgid "Focal Plane X-Resolution"
 msgstr "Rozdzielczość ogniskowej w płaszczyźnie X"
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17235,11 +21334,11 @@
 "Określenie liczby pikseli w kierunku szerokości obrazu (X) na "
 "<FocalPlaneResolutionUnit> w płaszczyźnie ogniskowej aparatu."
 
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 msgid "Focal Plane Y-Resolution"
 msgstr "Rozdzielczość ogniskowej w płaszczyźnie Y"
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17247,7 +21346,7 @@
 "Określenie liczby pikseli w kierunku wysokości obrazu (Y) na "
 "<FocalPlaneResolutionUnit> w płaszczyźnie ogniskowej aparatu."
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -17255,7 +21354,7 @@
 "Określenie jednostki miary <FocalPlaneXResolution> i "
 "<FocalPlaneYResolution>. Ta wartość jest taka sama jak <ResolutionUnit>."
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -17267,11 +21366,11 @@
 "wykonaniem obrotu opisanego znacznikiem <Rotation>. Pierwsza wartość określa "
 "numer kolumny X, a druga numer wiersza Y."
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
 msgid "Exposure index"
 msgstr "Indeks ekspozycji"
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -17279,12 +21378,12 @@
 "Określenie indeksu ekspozycji wybranego przez aparat lub urządzenie "
 "wejściowe w czasie robienia zdjęcia."
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 "Określenie rodzaju czujnika obrazu w aparacie lub urządzeniu wejściowym."
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -17292,7 +21391,7 @@
 "Określenie źródła obrazu. Jeśli obraz był zapisany przez DSC, wartość tego "
 "znacznika zawsze wynosi 3, oznaczając, że obraz był zapisany przez DSC."
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
@@ -17301,11 +21400,11 @@
 "znacznika zawsze musi być ustawiona na 1, oznaczając, że obraz był "
 "bezpośrednio sfotografowany."
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
 msgid "Color Filter Array Pattern"
 msgstr "Wzór filtra kolorów"
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
@@ -17315,7 +21414,7 @@
 "kolorów) czujnika obrazu w przypadku użycia jednoukładowego czujnika obszaru "
 "koloru. Nie odnosi się to do wszystkich metod próbkowania."
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
@@ -17326,7 +21425,7 @@
 "przetwarzanie, czytający powinien wyłączyć albo zminimalizować dalsze "
 "przetwarzanie."
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
@@ -17336,12 +21435,12 @@
 "trybie automatycznego bracketingu aparat wykonuje serię klatek tej samej "
 "sceny z różnymi ustawieniami ekspozycji."
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 "Ten znacznik określa tryb balansu bieli ustawiony przy robieniu zdjęcia."
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
@@ -17351,7 +21450,7 @@
 "zdjęcia. Jeśli licznik wartości znacznika jest równy 0, oznacza to, że nie "
 "użyto cyfrowego powiększenia."
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
@@ -17361,7 +21460,7 @@
 "aparatu dla filmów 35 mm. Wartość 0 oznacza nieznaną ogniskową. Uwaga: "
 "znacznik ten różni się od znacznika <FocalLength>."
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
 "record the mode in which the image was shot. Note that this differs from the "
@@ -17371,11 +21470,11 @@
 "zapisania trybu, w którym było robione zdjęcie. Należy zaznaczyć, że ten "
 "znacznik różni się od znacznika <SceneType>."
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Ten znacznik określa stopień wzmocnienia całego obrazu."
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -17383,7 +21482,7 @@
 "Ten znacznik określa kierunek przetwarzania kontrastu zastosowanego przez "
 "aparat przy robieniu zdjęcia."
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -17391,7 +21490,7 @@
 "Ten znacznik określa kierunek przetwarzania nasycenia zastosowanego przez "
 "aparat przy robieniu zdjęcia."
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -17399,7 +21498,7 @@
 "Ten znacznik określa kierunek przetwarzania ostrości zastosowanego przez "
 "aparat przy robieniu zdjęcia."
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
@@ -17409,11 +21508,11 @@
 "modelu aparatu. Jest on używany tylko do określenia warunków robienia "
 "zdjęcia przy odczycie."
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
 msgid "This tag indicates the distance to the subject."
 msgstr "Ten znacznik określa odległość od obiektu."
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
@@ -17423,91 +21522,91 @@
 "on zapisany jako łańcuch ASCII odpowiadający notacji szesnastkowej o stałej "
 "długości 128 bitów."
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
 msgid "Unknown Exif tag"
 msgstr "Nieznany znacznik Exif"
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
 msgid "North"
 msgstr "Północ"
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
 msgid "South"
 msgstr "Południe"
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
 msgid "East"
 msgstr "Wschód"
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
 msgid "West"
 msgstr "Zachód"
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr "Powyżej poziomu morza"
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
 msgid "Below sea level"
 msgstr "Poniżej poziomu morza"
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
 msgid "Measurement in progress"
 msgstr "Pomiar w toku"
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
 msgid "Measurement Interoperability"
 msgstr "Pomiar gotowy"
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr "Pomiar dwuwymiarowy"
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr "Pomiar trójwymiarowy"
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr "km/h"
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr "mph"
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
 msgid "knots"
 msgstr "węzły"
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 msgid "True direction"
 msgstr "Kierunek rzeczywisty"
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 msgid "Magnetic direction"
 msgstr "Kierunek magnetyczny"
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 msgid "Kilometers"
 msgstr "Kilometry"
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 msgid "Miles"
 msgstr "Mile"
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 msgid "Knots"
 msgstr "Węzły"
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
 msgid "Without correction"
 msgstr "Bez korekcji"
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 msgid "Correction applied"
 msgstr "Z korekcją"
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
 "tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
@@ -17520,11 +21619,11 @@
 "znacznika <ExifVersion>. Kiedy wersja to 2.0.0.0, znacznik ma wartość "
 "02000000.H)."
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
 msgid "GPS Latitude Reference"
 msgstr "GPS Oznaczenie szerokości"
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -17532,7 +21631,7 @@
 "Oznaczenie, czy szerokość geograficzna jest północna, czy południowa. "
 "Wartość ASCII \"N\" oznacza szerokość północną, a \"S\" południową."
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17546,11 +21645,11 @@
 "są wyrażone stopnie i minuty oraz np. ułamki minut są podane z dokładnością "
 "do dwóch miejsc po przecinku, format to dd/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
 msgid "GPS Longitude Reference"
 msgstr "GPS Oznaczenie długości"
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -17558,7 +21657,7 @@
 "Określenie, czy długość geograficzna jest wschodnia, czy zachodnia. Wartość "
 "ASCII \"E\" oznacza długość wschodnią, a \"W\" zachodnią."
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17572,7 +21671,7 @@
 "są wyrażone stopnie i minuty oraz np. ułamki minut są podane z dokładnością "
 "do dwóch miejsc po przecinku, format to dd/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -17586,7 +21685,7 @@
 "bezwzględną w znaczniku GPSAltitude. Jednostką odniesienia są metry. Ten "
 "znacznik jest typu BYTE w przeciwieństwie do innych znaczników odniesienia."
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -17595,7 +21694,7 @@
 "GPSAltitudeRef. Wysokość jest wyrażona jako jedna wartość RATIONAL "
 "(wymierna). Jednostką odniesienia są metry."
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
@@ -17605,7 +21704,7 @@
 "wyrażony jako trzy wartości wymierne (RATIONAL) podające godzinę, minutę i "
 "sekundę (zegar atomowy)."
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -17619,7 +21718,7 @@
 "jest określony. Jeśli odbiornik GPS nie jest zdolny do wykonania pomiaru, "
 "znacznik jest ustawiany na NULL."
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
@@ -17628,7 +21727,7 @@
 "Określa stan odbiornika GPS w momencie zapisania obrazu. \"A\" oznacza że "
 "pomiar jest w toku, a \"V\" oznacza gotowość pomiaru."
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
@@ -17636,11 +21735,11 @@
 "Określa tryb pomiaru w odbiorniku GPS. Wartości tekstowe: \"2\" oznacza "
 "pomiar dwuwymiarowy, a \"3\" pomiar trójwymiarowy."
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 msgid "GPS Data Degree of Precision"
 msgstr "GPS Stopień precyzji danych"
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
@@ -17650,7 +21749,7 @@
 "podczas pomiaru dwuwymiarowego, natomiast PDOP podczas pomiaru "
 "dwuwymiarowego."
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
@@ -17658,15 +21757,15 @@
 "Jednostka użyta do pomiaru prędkości ruchu odbiornika GPS. \"K\", \"M\" i \"N"
 "\" oznaczają kilometry, mile i węzły."
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Określa prędkość ruchu odbiornika GPS."
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
 msgid "GPS Track Ref"
 msgstr "GPS Kierunek"
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
@@ -17674,14 +21773,14 @@
 "Oznacza rodzaj kierunku ruchu odbiornika GPS. \"T\" oznacza kierunek "
 "rzeczywisty, a \"M\" kierunek magnetyczny."
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 "Określa kierunek ruchu odbiornika GPS. Zakres wartości to od 0.00 do 359.99."
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
@@ -17689,7 +21788,7 @@
 "Oznaczenie rodzaju kierunku (namiaru) do obrazu podczas jego wykonywania. \"T"
 "\" oznacza kierunek rzeczywisty, a \"M\" kierunek magnetyczny."
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
@@ -17697,21 +21796,21 @@
 "Określa kierunek obrazu podczas wykonywania zdjęcia, zakres wartości to od "
 "0.00 do 359.99."
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 "Określa układ odniesienia współrzędnych geograficznych użytych przez "
 "odbiornik GPS. Jeśli układ odniesienia jest ograniczony do Japonii, wartość "
 "tego znacznika to \"TOKYO\" lub \"WGS-84\"."
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
 msgid "GPS Destination Latitude Refeference"
 msgstr "GPS Określenie szerokości celu"
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
 "latitude. The ASCII value \"N\" indicates north latitude, and \"S\" is south "
@@ -17721,7 +21820,7 @@
 "południowa. Wartość ASCII \"N\" oznacza szerokość geograficzną północną, a "
 "\"S\" południową."
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -17737,11 +21836,11 @@
 "ułamki minut są podane z dokładnością do dwóch miejsc po przecinku, format "
 "to dd/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
 msgid "GPS Destination Longitude Reference"
 msgstr "GPS Określenie długości celu"
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII \"E\" indicates east longitude, and \"W\" is west longitude."
@@ -17750,7 +21849,7 @@
 "zachodnia. Wartość ASCII \"E\" oznacza długość geograficzną wschodnią, a \"W"
 "\" zachodnią."
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -17766,7 +21865,7 @@
 "podane z dokładnością do dwóch miejsc po przecinku, format to dd/1,"
 "mmmm/100,0/1."
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
@@ -17774,7 +21873,7 @@
 "Oznaczenie rodzaju kierunku (namiaru) do punktu docelowego. \"T\" oznacza "
 "kierunek rzeczywisty, a \"M\" kierunek magnetyczny."
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
@@ -17782,11 +21881,11 @@
 "Określa kierunek (namiar) do punktu docelowego. Przyjmuje zakres wartości od "
 "0.00 do 359.99."
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
 msgid "GPS Destination Distance Reference"
 msgstr "GPS Jednostki odległości do celu"
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
@@ -17794,11 +21893,11 @@
 "Jednostki użyte do wyrażenia odległości do punktu docelowego. \"K\", \"M\" i "
 "\"N\" oznaczają kilometry, mile i węzły."
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
 msgid "Indicates the distance to the destination point."
 msgstr "Określa odległość do punktu docelowego."
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
@@ -17807,7 +21906,7 @@
 "Łańcuch tekstowy określający metodę użytą do znalezienia lokalizacji. "
 "Pierwszy bajt określa użyte kodowanie, po nim następuje nazwa metody."
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
@@ -17816,11 +21915,11 @@
 "Łańcuch tekstowy, w którym jest zapisana nazwa obszaru GPS. Pierwszy bajt "
 "określa użyte kodowanie, po nim następuje nazwa obszaru GPS."
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
 msgid "GPS Date Stamp"
 msgstr "GPS Znacznik czasu"
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
@@ -17828,20 +21927,20 @@
 "Łańcuch tekstowy, który zawiera informację o dacie i czasie w odniesieniu do "
 "UTC (uniwersalnego czasu koordynowanego). Format to \"RRRR:MM:DD.\"."
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr "Określa czy dla odbiornika GPS zastosowano korekcję różnicową."
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 msgid "Unknown GPSInfo tag"
 msgstr "Nieznany znacznik GPSInfo"
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
 msgid "Interoperability Index"
 msgstr "Indeks wymienialności"
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -17853,47 +21952,47 @@
 "(NULL). Inne znaczniki ExifR98 są opisane w pozycji Recommended Exif "
 "Interoperability Rules (ExifR98)."
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
 msgid "Interoperability Version"
 msgstr "Wersja wymienialności"
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr "Wersja wymienialności"
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
 msgid "Related Image File Format"
 msgstr "Powiązany format pliku obrazu"
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
 msgid "File format of image file"
 msgstr "Format pliku obrazu"
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 msgid "Related Image Width"
 msgstr "Powiązana szerokość obrazu"
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 msgid "Related Image Length"
 msgstr "Powiązana długość obrazu"
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 msgid "Unknown Exif Interoperability tag"
 msgstr "Nieznany znacznik Exif Interoperability"
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
 msgid "Offset"
 msgstr "Przesunięcie"
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr "Przesunięcie Makernote od początku nagłówka TIFF."
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 msgid "Byte Order"
 msgstr "Kolejność bajtów"
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
@@ -17901,26 +22000,36 @@
 "Kolejność bajtów użyta do zakodowania znaczników MakerNote, \"MM\" (big-"
 "endian) lub \"II\" (little-endian)."
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr "Nieznany znacznik informacyjny Exiv2 Makernote"
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
 msgid "Unknown tag"
 msgstr "Nieznany znacznik"
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 msgid "Digital zoom not used"
 msgstr "Nie użyto cyfrowego zoomu"
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 msgid "TIFF header, offset"
 msgstr "Przesunięcie nagłówka TIFF"
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr "zakodowane jako little endian"
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr "zakodowane jako big endian"
+
+#~ msgid "Software firmware version"
+#~ msgstr "Wersja firmware"
+
+#, fuzzy
+#~ msgid "White Balance Bracketing "
+#~ msgstr "Bracketing balansu bieli"
+
+#~ msgid "(Unknown Error)"
+#~ msgstr "(Nieznany błąd)"
Binary files /tmp/TId3M1M1Ks/exiv2-0.19/po/ru.gmo and /tmp/B4Gg93MYI9/exiv2-0.21/po/ru.gmo differ
diff -Nru exiv2-0.19/po/ru.po exiv2-0.21/po/ru.po
--- exiv2-0.19/po/ru.po	2009-12-29 10:51:25.000000000 +0000
+++ exiv2-0.21/po/ru.po	2010-11-22 15:13:38.000000000 +0000
@@ -3,2497 +3,3146 @@
 # Copyright (C) 2007 Lutz Müller and others.
 # Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2006.
 #
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\n"
 "PO-Revision-Date: 2008-05-26 04:03+0300\n"
 "Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\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"
+"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"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
 msgstr "Не удалось открыть файл\n"
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 msgid "File size"
 msgstr "Размер файла"
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 msgid "Bytes"
 msgstr "Байт"
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 msgid "MIME type"
 msgstr "Тип MIME"
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 msgid "Image size"
 msgstr "Размер изображения"
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
 msgstr "В этом файле не найдено данных Exif\n"
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 msgid "Camera make"
 msgstr ""
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 msgid "Camera model"
 msgstr "Модель камеры"
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 msgid "Image timestamp"
 msgstr "Отметка времени снимка"
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 msgid "Image number"
 msgstr "Номер снимка"
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 msgid "Exposure time"
 msgstr "Время экспозиции"
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr "Диафрагма"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 msgid "Exposure bias"
 msgstr "Смещение экспозиции"
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr "Вспышка"
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 #, fuzzy
 msgid "Flash bias"
 msgstr "Вспышка сработала"
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 msgid "Focal length"
 msgstr "Фокусное расстояние"
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 msgid "35 mm equivalent"
 msgstr " (35мм эквивалент)"
 
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 msgid "Subject distance"
 msgstr "Расстояние до объекта"
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 msgid "ISO speed"
 msgstr "Светочувствительность"
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 msgid "Exposure mode"
 msgstr "Режим экспозиции"
 
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 msgid "Metering mode"
 msgstr "Режим замера"
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 msgid "Macro mode"
 msgstr "Режим макросъёмки"
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 msgid "Image quality"
 msgstr "Качество изображения"
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 msgid "Exif Resolution"
 msgstr "Разрешение Exif"
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 msgid "White balance"
 msgstr "Баланс белого"
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
 msgstr "Эскиз"
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr "Ничего"
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr "Авторские права"
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
 msgstr "Комментарий Exif"
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 msgid "No IPTC data found in the file\n"
 msgstr "В файле не найдено данных IPTC\n"
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 msgid "No XMP data found in the file\n"
 msgstr "В этом файле не найдено данных XMP\n"
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
 msgstr ""
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 msgid "JPEG comment"
 msgstr "Комментарий JPEG"
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 #, fuzzy
 msgid "Preview"
 msgstr "Данные эскиза"
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
 msgstr ""
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 msgid "bytes"
 msgstr "байт"
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 msgid "Neither tag"
 msgstr "Ни поле"
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 msgid "nor"
 msgstr "ни"
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 msgid "found in the file"
 msgstr "найдены в этом файле"
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
 msgstr "Отметка времени создания снимка в файле отсутствует"
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
 msgstr "Не удалось произвести синтаксический разбор отметки времени"
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 msgid "in the file"
 msgstr "в файле"
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
 msgstr "Отметка времени обновляется до"
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 #, fuzzy
 msgid "Erasing thumbnail data"
 msgstr "Байт данных эскиза"
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
 msgstr "Данные Exif удаляются из файла"
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
 msgstr "Данные IPTC удаляются из файла"
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
 msgstr "Комментарий JPEG удаляется из файла"
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
 msgstr "Данные XMP удаляются из файла"
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
 msgstr "В снимке нет Exif-эскиза\n"
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 #, fuzzy
 msgid "Writing thumbnail"
 msgstr "эскиз"
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 msgid "to file"
 msgstr "в файл"
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
 msgstr "В данных Exif нет эскиза\n"
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
 msgstr ""
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 #, fuzzy
 msgid "Writing preview"
 msgstr "Выполняется запись"
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 msgid "Setting JPEG comment"
 msgstr "Вставляется комментарий JPEG"
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
 msgstr "Добавить"
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 msgid "Failed to read"
 msgstr "Не удалось прочитать"
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 msgid "value"
 msgstr "значение"
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 msgid "Set"
 msgstr "Установить"
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr "Удалить"
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr ""
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
 msgstr ""
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
 msgstr "не установлено\n"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
 msgstr "Коррекция"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
 msgstr ""
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 msgid "years"
 msgstr "лет"
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
 msgstr ""
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 msgid "months"
 msgstr "месяцев"
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 msgid "month"
 msgstr "месяц"
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
 msgstr ""
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
 msgstr ""
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
 msgstr "с"
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 #, fuzzy
 msgid "Can't adjust timestamp by"
 msgstr "Не удалось произвести синтаксический разбор отметки времени"
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 msgid "to"
 msgstr "в"
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr ""
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
 msgstr ""
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1671
+#, fuzzy
+msgid "No Exif user comment found"
+msgstr "Комментарий Exif"
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:1692
+#, fuzzy
+msgid "Setting Exif UNICODE user comment to"
+msgstr "Вставляется комментарий JPEG"
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
 msgstr "Запись данных Exif из"
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
 msgstr "Запись данных IPTC из"
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
 msgstr "Запись данных XMP из"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
 msgstr "Запись комментария JPEG из"
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
 msgstr "Не удалось записать метаданные в файл"
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr ""
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
 msgstr "У этого файла уже правильное имя"
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 msgid "File"
 msgstr "Файл"
 
-#: src/actions.cpp:1909
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
 msgstr "существует. Перезаписать [O], переименовать [r] или пропустить [s]?"
 
-#: src/actions.cpp:1937
+#: src/actions.cpp:1970
 msgid "Renaming file to"
 msgstr "Файл переименовывается в"
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
 msgstr "обновляется отметка времени"
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
 msgstr "Не удалось переименовать"
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr "Выкл"
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr "Вкл"
+
+#: src/canonmn.cpp:69
 msgid "PowerShot A30"
 msgstr "PowerShot A30"
 
-#: src/canonmn.cpp:61
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
 msgid "PowerShot A20"
 msgstr "PowerShot A20"
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
 msgid "PowerShot A10"
 msgstr "PowerShot A10"
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 msgid "PowerShot G2"
 msgstr "PowerShot G2"
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
 msgid "PowerShot S40"
 msgstr "PowerShot S40"
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
 msgid "PowerShot S30"
 msgstr "PowerShot S30"
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
 msgid "PowerShot A40"
 msgstr "PowerShot A40"
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr "EOS D30"
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
 msgid "PowerShot A100"
 msgstr "PowerShot A100"
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
 msgid "PowerShot A200"
 msgstr "PowerShot A200"
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 msgid "PowerShot G3"
 msgstr "PowerShot G3"
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
 msgid "PowerShot S45"
 msgstr "PowerShot S45"
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
 msgid "PowerShot A70"
 msgstr "PowerShot A70"
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
 msgid "PowerShot A60"
 msgstr "PowerShot A60"
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 msgid "PowerShot G5"
 msgstr "PowerShot G5"
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
 msgid "PowerShot A300"
 msgstr "PowerShot A300"
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
 msgid "PowerShot S50"
 msgstr "PowerShot S50"
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
 msgid "PowerShot A80"
 msgstr "PowerShot A80"
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
 msgid "PowerShot S1 IS"
 msgstr "PowerShot S1 IS"
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
 msgid "PowerShot Pro1"
 msgstr "PowerShot Pro1"
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
 msgid "PowerShot S70"
 msgstr "PowerShot S70"
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
 msgid "PowerShot S60"
 msgstr "PowerShot S60"
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 msgid "PowerShot G6"
 msgstr "PowerShot G6"
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
 msgid "PowerShot A75"
 msgstr "PowerShot A75"
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
 msgid "PowerShot A400"
 msgstr "PowerShot A400"
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
 msgid "PowerShot A310"
 msgstr "PowerShot A310"
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
 msgid "PowerShot A85"
 msgstr "PowerShot A85"
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
 msgid "PowerShot A95"
 msgstr "PowerShot A95"
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
 msgid "PowerShot A520"
 msgstr "PowerShot A520"
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
 msgid "PowerShot A510"
 msgstr "PowerShot A510"
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
 msgid "PowerShot S2 IS"
 msgstr "PowerShot S2 IS"
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr "EOS D60"
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
 msgid "PowerShot A430"
 msgstr "PowerShot A430"
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
 msgid "PowerShot A410"
 msgstr "PowerShot A410"
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
 msgid "PowerShot S80"
 msgstr "PowerShot S80"
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
 msgid "PowerShot A620"
 msgstr "PowerShot A620"
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
 msgid "PowerShot A610"
 msgstr "PowerShot A610"
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
 msgid "PowerShot TX1"
 msgstr "PowerShot TX1"
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
 msgid "PowerShot A420"
 msgstr "PowerShot A420"
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
 msgid "PowerShot A700"
 msgstr "PowerShot A700"
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
 msgid "PowerShot S3 IS"
 msgstr "PowerShot S3 IS"
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
 msgid "PowerShot A540"
 msgstr "PowerShot A540"
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 msgid "PowerShot G7"
 msgstr "PowerShot G7"
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
 msgid "PowerShot A530"
 msgstr "PowerShot A530"
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
 msgid "PowerShot A710 IS"
 msgstr "PowerShot A710 IS"
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
 msgid "PowerShot A640"
 msgstr "PowerShot A640"
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
 msgid "PowerShot A630"
 msgstr "PowerShot A630"
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
 msgid "PowerShot S5 IS"
 msgstr "PowerShot S5 IS"
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
 msgid "PowerShot A460"
 msgstr "PowerShot A460"
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr "PowerShot SD850 IS / Digital IXUS 950 IS"
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
 msgid "PowerShot A570 IS"
 msgstr "PowerShot A570 IS"
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
 msgid "PowerShot A560"
 msgstr "PowerShot A560"
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
 msgid "PowerShot A550"
 msgstr "PowerShot A550"
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
 msgid "PowerShot A450"
 msgstr "PowerShot A450"
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
 msgid "PowerShot Pro90 IS"
 msgstr "PowerShot Pro90 IS"
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 msgid "PowerShot G1"
 msgstr "PowerShot G1"
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr "PowerShot S100 / Digital IXUS / IXY Digital"
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr "HV10"
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr "iVIS DC50"
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr "iVIS HV20"
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr "EOS-1D"
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr "EOS-1DS"
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr "EOS 10D"
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr "EOS-1D Mark III"
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr "EOS Digital Rebel / 300D / Kiss Digital"
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr "EOS-1D Mark II"
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr "EOS 20D"
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr "EOS-1Ds Mark II"
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr "EOS Digital Rebel XT / 350D / Kiss Digital N"
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr "EOS 5D"
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr "EOS-1D Mark II N"
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr "EOS 30D"
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
-msgid "Camera Settings"
-msgstr "Настройки камеры"
-
-#: src/canonmn.cpp:166
-msgid "Various camera settings"
-msgstr "Различные настройки камеры"
-
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
-msgid "Focal Length"
-msgstr "Фокусное расстояние"
-
-#: src/canonmn.cpp:169
-msgid "Shot Info"
-msgstr "О снимке"
-
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:170
 #, fuzzy
-msgid "Shot information"
-msgstr "Способ фокусировки"
-
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
-msgid "Panorama"
-msgstr "Панорама"
-
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
-msgid "Image Type"
-msgstr "Тип изображения"
+msgid "EOS 7D"
+msgstr "EOS 5D"
 
 #: src/canonmn.cpp:171
-msgid "Image type"
-msgstr "Тип изображения"
-
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
-msgid "Firmware Version"
-msgstr "Версия прошивки"
-
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
-msgid "Firmware version"
-msgstr "Версия прошивки"
+#, fuzzy
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:172
 #, fuzzy
-msgid "File Number"
-msgstr "Число F"
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr "EOS Digital Rebel / 300D / Kiss Digital"
 
 #: src/canonmn.cpp:173
 #, fuzzy
-msgid "File number"
-msgstr "Имя файла"
+msgid "EOS 50D"
+msgstr "EOS 5D"
 
 #: src/canonmn.cpp:174
+#, fuzzy
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
+
+#: src/canonmn.cpp:175
+#, fuzzy
+msgid "EOS-1D Mark IV"
+msgstr "EOS-1D Mark II"
+
+#: src/canonmn.cpp:180
+#, fuzzy
+msgid "Format 1"
+msgstr "Формат"
+
+#: src/canonmn.cpp:181
+#, fuzzy
+msgid "Format 2"
+msgstr "Формат"
+
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+#, fuzzy
+msgid "On (1)"
+msgstr "Вкл"
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+#, fuzzy
+msgid "On (2)"
+msgstr "Вкл"
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr "Adobe RGB"
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
+msgid "Camera Settings"
+msgstr "Настройки камеры"
+
+#: src/canonmn.cpp:200
+msgid "Various camera settings"
+msgstr "Различные настройки камеры"
+
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
+msgid "Focal Length"
+msgstr "Фокусное расстояние"
+
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
+msgid "Shot Info"
+msgstr "О снимке"
+
+#: src/canonmn.cpp:203
+#, fuzzy
+msgid "Shot information"
+msgstr "Способ фокусировки"
+
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
+msgid "Panorama"
+msgstr "Панорама"
+
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
+msgid "Image Type"
+msgstr "Тип изображения"
+
+#: src/canonmn.cpp:205
+msgid "Image type"
+msgstr "Тип изображения"
+
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
+msgid "Firmware Version"
+msgstr "Версия прошивки"
+
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
+msgid "Firmware version"
+msgstr "Версия прошивки"
+
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
+#, fuzzy
+msgid "File Number"
+msgstr "Число F"
+
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
+#, fuzzy
+msgid "File number"
+msgstr "Имя файла"
+
+#: src/canonmn.cpp:208
 msgid "Owner Name"
 msgstr "Имя владельца"
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 msgid "Serial Number"
 msgstr "Серийный номер"
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 msgid "Camera serial number"
 msgstr "Серийный номер камеры"
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera Info"
+msgstr "ID камеры"
+
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera info"
+msgstr "ID камеры"
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 #, fuzzy
 msgid "Custom Functions"
 msgstr "Инструкции"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 #, fuzzy
 msgid "ModelID"
 msgstr "Модель"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "Model ID"
 msgstr "ID модели"
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
+#, fuzzy
 msgid "Picture Info"
-msgstr ""
+msgstr "Режим захвата"
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 #, fuzzy
 msgid "Picture info"
 msgstr "Режим захвата"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail Image Valid Area"
+msgstr "Эскиз"
+
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail image valid area"
+msgstr "Эскиз"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial Number Format"
+msgstr "Серийный номер"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial number format"
+msgstr "Серийный номер"
+
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+#, fuzzy
+msgid "Super Macro"
+msgstr "Супермакро"
+
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+msgid "Super macro"
+msgstr "Супермакро"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF Info"
+msgstr "Способ фокусировки"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF info"
+msgstr "Способ фокусировки"
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
 msgid "White Balance Table"
 msgstr "Таблица баланса белого"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:219
 msgid "White balance table"
 msgstr "Таблица баланса белого"
 
-#: src/canonmn.cpp:185
-msgid "Unknown CanonMakerNote tag"
-msgstr "Неизвестный тэг CanonMakerNote"
+#: src/canonmn.cpp:220
+#, fuzzy
+msgid "LensModel"
+msgstr "Тип сцены"
 
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
-msgstr "Вкл"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+#, fuzzy
+msgid "Internal Serial Number"
+msgstr "Серийный номер камеры"
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
-msgstr "Выкл"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+#, fuzzy
+msgid "Internal serial number"
+msgstr "Серийный номер камеры"
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
+msgstr ""
+
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
+
+#: src/canonmn.cpp:223
+#, fuzzy
+msgid "Custom functions"
+msgstr "Инструкции"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing Info"
+msgstr "По обработки"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing info"
+msgstr "По обработки"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured Color"
+msgstr "Естественный цвет"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured color"
+msgstr "Естественный цвет"
+
+#: src/canonmn.cpp:226
+#, fuzzy
+msgid "ColorSpace"
+msgstr "Цветовое пространство"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD Offset"
+msgstr "быстрый"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD offset"
+msgstr "быстрый"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor Info"
+msgstr "Объектив"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor info"
+msgstr "О снимке"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color Data"
+msgstr "Цветовое пространство"
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color data"
+msgstr "Цвет"
+
+#: src/canonmn.cpp:234
+msgid "Unknown CanonMakerNote tag"
+msgstr "Неизвестный тэг CanonMakerNote"
+
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
 msgid "Economy"
 msgstr "Экономичный"
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
 msgid "Normal"
 msgstr ""
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
 #, fuzzy
 msgid "Fine"
 msgstr "in"
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
 msgid "RAW"
 msgstr "RAW"
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:254
 #, fuzzy
 msgid "Superfine"
 msgstr "SXGA Fine"
 
-#: src/canonmn.cpp:206
+#: src/canonmn.cpp:255
 #, fuzzy
 msgid "Normal Movie"
 msgstr "Обычный процесс проявки"
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 msgid "Auto"
 msgstr "Авто"
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
 msgid "Red-eye"
 msgstr ""
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 #, fuzzy
 msgid "Slow sync"
 msgstr "медленная синхронизация"
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
 #, fuzzy
 msgid "Auto + red-eye"
 msgstr "Автобрекетирование"
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
+#, fuzzy
 msgid "On + red-eye"
-msgstr ""
+msgstr "Автобрекетирование"
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
 #, fuzzy
 msgid "External"
 msgstr "внешняя"
 
-#: src/canonmn.cpp:223
+#: src/canonmn.cpp:273
 #, fuzzy
 msgid "Single / timer"
 msgstr "Серийный номер"
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
+#, fuzzy
 msgid "Continuous"
-msgstr ""
+msgstr "Продолжительный ведущий режим"
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
 #, fuzzy
 msgid "Movie"
 msgstr "Кино"
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 #, fuzzy
 msgid "Continuous, speed priority"
 msgstr "Приоритет выдержки"
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
 #, fuzzy
 msgid "Continuous, low"
 msgstr "Продолжительный ведущий режим"
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
 #, fuzzy
 msgid "Continuous, high"
 msgstr "Продолжительный ведущий режим"
 
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 #, fuzzy
 msgid "One shot AF"
 msgstr "One-Shot"
 
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
+#, fuzzy
 msgid "AI servo AF"
-msgstr ""
+msgstr "AI Focus"
 
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
 #, fuzzy
 msgid "AI focus AF"
 msgstr "AI Focus"
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 #, fuzzy
 msgid "Manual focus"
 msgstr "Ручная фокусировка"
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
+#, fuzzy
 msgid "Single"
-msgstr ""
+msgstr "One-Shot"
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
 #, fuzzy
 msgid "Pan focus"
 msgstr "Ручная фокусировка"
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
+#, fuzzy
 msgid "Large"
-msgstr ""
+msgstr "Язык"
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
+#, fuzzy
 msgid "Medium"
-msgstr ""
+msgstr "Низкий"
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
+#, fuzzy
 msgid "Small"
-msgstr ""
+msgstr "Кино"
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
+#, fuzzy
 msgid "Medium 1"
-msgstr ""
+msgstr "Низкий"
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
+#, fuzzy
 msgid "Medium 2"
-msgstr ""
+msgstr "Низкий"
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
+#, fuzzy
 msgid "Medium 3"
-msgstr ""
+msgstr "Низкий"
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
+#, fuzzy
 msgid "Full auto"
-msgstr ""
+msgstr "Режим захвата"
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr "Ручная"
 
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr "Альбом"
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
+#, fuzzy
 msgid "Fast shutter"
-msgstr ""
+msgstr "Скорость срабатывания затвора"
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 msgid "Slow shutter"
 msgstr ""
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 #, fuzzy
 msgid "Night Scene"
 msgstr "Ночная съёмка"
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
 msgid "Gray scale"
 msgstr ""
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
 msgstr "Сепия"
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr "Портрет"
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 msgid "Sports"
 msgstr "Спорт"
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 msgid "Macro / close-up"
 msgstr "Макросъёмка"
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 #, fuzzy
 msgid "Black & white"
 msgstr "Чёрно-белый"
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 #, fuzzy
 msgid "Vivid"
 msgstr "Цвет"
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 #, fuzzy
 msgid "Neutral"
 msgstr "внешняя"
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
 msgid "Flash off"
 msgstr "Без вспышки"
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 msgid "Long shutter"
 msgstr ""
 
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr "Супермакро"
-
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
+#, fuzzy
 msgid "Foliage"
-msgstr ""
+msgstr "Модель"
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
+#, fuzzy
 msgid "Indoor"
-msgstr ""
+msgstr "ни"
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
 msgstr "Фейерверк"
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
 msgstr "Пляж"
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 msgid "Underwater"
 msgstr "Подводная съемка"
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
 msgid "Snow"
 msgstr "Снег"
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
 msgstr "Дети и домашние животные"
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 #, fuzzy
 msgid "Night SnapShot"
 msgstr "Ночная съёмка"
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 msgid "Digital macro"
 msgstr "Цифровой макрорежим"
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
 #, fuzzy
 msgid "My Colors"
 msgstr "Цвет"
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
+#, fuzzy
 msgid "Still image"
-msgstr ""
+msgstr "Эскиз"
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
+#, fuzzy
 msgid "Other"
-msgstr ""
+msgstr "Север"
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
 msgstr "Низкий"
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 msgid "High"
 msgstr "Высокий"
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr "н/д"
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
 #, fuzzy
 msgid "Auto High"
 msgstr "Авторские и смежные права"
 
-#: src/canonmn.cpp:322
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
 #, fuzzy
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
+#, fuzzy
 msgid "Spot"
-msgstr ""
+msgstr "Спорт"
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr "Средний"
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
+#, fuzzy
 msgid "Evaluative"
-msgstr ""
+msgstr "значение"
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
+#, fuzzy
 msgid "Partial"
-msgstr ""
+msgstr "Вечеринка"
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 #, fuzzy
 msgid "Center weighted"
 msgstr "Центровзвешенный"
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 #, fuzzy
 msgid "Not known"
 msgstr "Неизвестно"
 
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr "Макро"
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 msgid "Very close"
 msgstr ""
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
 #, fuzzy
 msgid "Close"
 msgstr "Крупный план"
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
+#, fuzzy
 msgid "Middle range"
-msgstr ""
+msgstr "Модель"
 
-#: src/canonmn.cpp:339
+#: src/canonmn.cpp:391
 #, fuzzy
 msgid "Far range"
 msgstr "Динамический диапазон"
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 #, fuzzy
 msgid "Infinity"
 msgstr "Бесконечный"
 
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
 msgid "Manual AF point selection"
 msgstr "Ручной выбор точки фокусировки"
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 #, fuzzy
 msgid "None (MF)"
 msgstr "Ничего"
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 #, fuzzy
 msgid "Auto-selected"
 msgstr "Автобрекетирование"
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 #, fuzzy
 msgid "Right"
 msgstr "Ночной портрет"
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 msgid "Center"
 msgstr "Центральный"
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
 #, fuzzy
 msgid "Left"
 msgstr "Левая"
 
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
+#, fuzzy
 msgid "Auto AF point selection"
-msgstr ""
+msgstr "Ручной выбор точки фокусировки"
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
+#, fuzzy
 msgid "Easy shooting (Auto)"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 msgid "Program (P)"
 msgstr "Программа (P)"
 
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 msgid "Shutter priority (Tv)"
 msgstr "Приоритет выдержки (Tv)"
 
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 msgid "Aperture priority (Av)"
 msgstr "Приоритет диафрагмы (Av)"
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 msgid "Manual (M)"
 msgstr "Ручной (M)"
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 msgid "Did not fire"
 msgstr "Вспышка не сработала"
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
 msgid "Fired"
 msgstr "Сработала"
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 msgid "External flash"
 msgstr "Внешняя вспышка"
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
 msgid "Internal flash"
 msgstr "Встроенная вспышка"
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
 msgstr "TTL"
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr ""
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr ""
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
+#, fuzzy
 msgid "FP sync used"
-msgstr ""
+msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:625
+#: src/canonmn.cpp:707
 #, fuzzy
 msgid "Normal AE"
 msgstr "VGA Normal"
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
 msgid "Exposure compensation"
 msgstr "Компенсация экспозиции"
 
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
 msgstr "Фиксация экспозиции"
 
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 #, fuzzy
 msgid "AE lock + exposure compensation"
 msgstr "Фиксация + компенсация экспозиции"
 
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
+#, fuzzy
 msgid "No AE"
-msgstr ""
+msgstr "VGA Normal"
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
+#, fuzzy
 msgid "On, shot only"
-msgstr ""
+msgstr "One-Shot"
+
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+#, fuzzy
+msgid "AF Point"
+msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:644
+#: src/canonmn.cpp:732
+#, fuzzy
 msgid "Smooth"
-msgstr ""
+msgstr "месяц"
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
 msgstr "Ч/Б"
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 msgid "Custom"
 msgstr "Свой"
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
+#, fuzzy
 msgid "My color data"
+msgstr "Цвет"
+
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+#, fuzzy
+msgid "Full"
+msgstr "Полный"
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
 msgstr ""
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:759
 #, fuzzy
 msgid "Selftimer"
 msgstr "Серийный номер"
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
 #, fuzzy
 msgid "Self timer"
 msgstr "Серийный номер"
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 msgid "Quality"
 msgstr "Качество"
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 msgid "Flash Mode"
 msgstr "Режим вспышки"
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
 #, fuzzy
 msgid "Flash mode setting"
 msgstr "Вспышка сработала"
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
 #, fuzzy
 msgid "Drive Mode"
 msgstr "Режим замера"
 
-#: src/canonmn.cpp:657
+#: src/canonmn.cpp:762
 #, fuzzy
 msgid "Drive mode setting"
 msgstr "Режим макросъёмки"
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 msgid "Focus Mode"
 msgstr "Способ фокусировки"
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
 #, fuzzy
 msgid "Focus mode setting"
 msgstr "Способ фокусировки"
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 msgid "Image Size"
 msgstr "Размер изображения"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 #, fuzzy
 msgid "Easy Mode"
 msgstr "Режим вспышки"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 #, fuzzy
 msgid "Easy shooting mode"
 msgstr "Режим замера"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 msgid "Digital Zoom"
 msgstr "Цифровой трансфокатор"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 msgid "Digital zoom"
 msgstr "Цифровой трансфокатор"
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr "Контраст"
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
 #, fuzzy
 msgid "Contrast setting"
 msgstr "Настройка контраста"
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr "Насыщенность"
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
 #, fuzzy
 msgid "Saturation setting"
 msgstr "Настройка контраста"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr "Резкость"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
 #, fuzzy
 msgid "Sharpness setting"
 msgstr "Настройка резкости"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 #, fuzzy
 msgid "ISO Speed Mode"
 msgstr "Скорость ISO"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
+#, fuzzy
 msgid "ISO speed setting"
-msgstr ""
+msgstr "Скорость ISO"
 
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
 msgstr "Режим замера"
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
 #, fuzzy
 msgid "Metering mode setting"
 msgstr "Режим макросъёмки"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 #, fuzzy
 msgid "Focus Type"
 msgstr "Способ фокусировки"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 #, fuzzy
 msgid "Focus type setting"
 msgstr "Способ фокусировки"
 
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-#, fuzzy
-msgid "AF Point"
-msgstr "Использованная точка AF"
-
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 #, fuzzy
 msgid "AF point selected"
 msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 msgid "Exposure Program"
 msgstr "Программа экспозиции"
 
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
 #, fuzzy
 msgid "Exposure mode setting"
 msgstr "Режим экспозиции"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 msgid "Lens Type"
 msgstr "Тип объектива"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 msgid "Lens type"
 msgstr "Тип объектива"
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 msgid "Lens"
 msgstr "Объектив"
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
 msgstr ""
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
+#: src/canonmn.cpp:781
+msgid "Short Focal"
+msgstr ""
+
+#: src/canonmn.cpp:781
+#, fuzzy
+msgid "Short focal"
+msgstr "Ручная фокусировка"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal Units"
+msgstr "Фокусное расстояние"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal units"
+msgstr "Фокусное расстояние"
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
 #, fuzzy
 msgid "Max Aperture"
 msgstr "Диафрагма"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
 #, fuzzy
 msgid "Max aperture"
 msgstr "Максимально открытая диафрагма"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min Aperture"
 msgstr "Диафрагма"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min aperture"
 msgstr "Максимально открытая диафрагма"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 #, fuzzy
 msgid "Flash Activity"
 msgstr "Вспышка сработала"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 #, fuzzy
 msgid "Flash activity"
 msgstr "Вспышка сработала"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 #, fuzzy
 msgid "Flash Details"
 msgstr "Вспышка сработала"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 #, fuzzy
 msgid "Flash details"
 msgstr "Режим вспышки"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 #, fuzzy
 msgid "Focus Continuous"
 msgstr "Продолжительный ведущий режим"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 #, fuzzy
 msgid "Focus continuous setting"
 msgstr "Способ фокусировки"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 #, fuzzy
 msgid "AESetting"
 msgstr "Настройка резкости"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 #, fuzzy
 msgid "AE setting"
 msgstr "Способ фокусировки"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 msgid "Image Stabilization"
 msgstr "Стабилизация снимка"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 msgid "Image stabilization"
 msgstr "Стабилизация снимка"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 #, fuzzy
 msgid "Display Aperture"
 msgstr "Диафрагма"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 #, fuzzy
 msgid "Display aperture"
 msgstr "Максимально открытая диафрагма"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom Source Width"
-msgstr ""
+msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
+#, fuzzy
 msgid "Zoom source width"
-msgstr ""
+msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 #, fuzzy
 msgid "Zoom Target Width"
 msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 #, fuzzy
 msgid "Zoom target width"
 msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot Metering Mode"
+msgstr "Режим замера"
+
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot metering mode"
+msgstr "Режим замера"
+
+#: src/canonmn.cpp:797
 #, fuzzy
 msgid "Photo Effect"
 msgstr "Цветовое пространство"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 #, fuzzy
 msgid "Photo effect"
 msgstr "Цветовое пространство"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual Flash Output"
+msgstr "Ручная экспозиция"
+
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual flash output"
+msgstr "Ручная экспозиция"
+
+#: src/canonmn.cpp:799
 #, fuzzy
 msgid "Color Tone"
 msgstr "Цветовое пространство"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
 #, fuzzy
 msgid "Color tone"
 msgstr "Цветовое пространство"
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
+msgstr ""
+
+#: src/canonmn.cpp:800
+#, fuzzy
+msgid "SRAW quality"
+msgstr "Качество изображения"
+
+#: src/canonmn.cpp:802
 #, fuzzy
 msgid "Unknown Canon Camera Settings 1 tag"
 msgstr "Настройка контраста"
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 msgid "Sunny"
 msgstr "Солнечно"
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 msgid "Cloudy"
 msgstr "Облачно"
 
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 msgid "Tungsten"
 msgstr "Лампа накаливания"
 
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
 msgstr "Флуоресцентная лампа"
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
 msgid "Black & White"
 msgstr "Чёрно-белый"
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr "Тень"
 
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 msgid "Manual Temperature (Kelvin)"
 msgstr ""
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
 msgstr ""
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
 msgstr ""
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
 msgstr ""
 
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
 #, fuzzy
 msgid "Daylight Fluorescent"
 msgstr "Флуоресцентная лампа"
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 msgid "Custom 1"
 msgstr "Свой 1"
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 msgid "Custom 2"
 msgstr "Свой 2"
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+#, fuzzy
+msgid "Custom 3"
+msgstr "Свой"
+
+#: src/canonmn.cpp:831
+msgid "PC Set 4"
+msgstr ""
+
+#: src/canonmn.cpp:832
+msgid "PC Set 5"
+msgstr ""
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 #, fuzzy
 msgid "left"
 msgstr "Левая"
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 #, fuzzy
 msgid "center"
 msgstr "Центральный"
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
 #, fuzzy
 msgid "right"
 msgstr "Яркость+"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 #, fuzzy
 msgid "ISO Speed Used"
 msgstr "Скорость ISO"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 #, fuzzy
 msgid "ISO speed used"
 msgstr "Скорость ISO"
 
-#: src/canonmn.cpp:758
+#: src/canonmn.cpp:867
+msgid "Measured EV"
+msgstr ""
+
+#: src/canonmn.cpp:868
 #, fuzzy
 msgid "Target Aperture"
 msgstr "Диафрагма"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 #, fuzzy
 msgid "Target Shutter Speed"
 msgstr "Скорость срабатывания затвора"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 #, fuzzy
 msgid "Target shutter speed"
 msgstr "Скорость срабатывания затвора"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr "Баланс белого"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
 #, fuzzy
 msgid "White balance setting"
 msgstr "Настройка баланса белого"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 #, fuzzy
 msgid "Sequence"
 msgstr "Номер последовательности"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
 msgstr ""
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 #, fuzzy
 msgid "AF Point Used"
 msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 #, fuzzy
 msgid "AF point used"
 msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 #, fuzzy
 msgid "Flash Bias"
 msgstr "Вспышка сработала"
 
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
 msgstr "Расстояние до объекта"
 
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 msgid "Subject distance (units are not clear)"
 msgstr ""
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 #, fuzzy
 msgid "Aperture Value"
 msgstr "Диафрагма"
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 #, fuzzy
 msgid "Shutter Speed Value"
 msgstr "Скорость срабатывания затвора"
 
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr "Скорость срабатывания затвора"
 
-#: src/canonmn.cpp:782
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
+msgstr ""
+
+#: src/canonmn.cpp:892
 #, fuzzy
 msgid "Unknown Canon Camera Settings 2 tag"
 msgstr "Настройка контраста"
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 #, fuzzy
 msgid "Left to right"
 msgstr "слева направо"
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 #, fuzzy
 msgid "Right to left"
 msgstr "справа налево"
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 #, fuzzy
 msgid "Bottom to top"
 msgstr "снизу вверх"
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 #, fuzzy
 msgid "Top to bottom"
 msgstr "сверху вниз"
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
 msgstr ""
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama Frame"
 msgstr "Кадр панорамы"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama frame number"
 msgstr "Номер кадра панорамы"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama Direction"
 msgstr "направление панорамы"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama direction"
 msgstr "Направление съёмки панорамы"
 
-#: src/canonmn.cpp:804
+#: src/canonmn.cpp:914
 msgid "Unknown Canon Panorama tag"
 msgstr "Неизвестный панорамный тэг Canon"
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 msgid "Noise Reduction"
 msgstr "Подавление шума"
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
 msgid "Long exposure noise reduction"
 msgstr "Подавление шума при длительной выдержке"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 #, fuzzy
 msgid "Shutter Ae Lock"
 msgstr "Скорость срабатывания затвора"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 #, fuzzy
 msgid "Shutter/AE lock buttons"
 msgstr "Выдержка"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr ""
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr ""
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
 #, fuzzy
 msgid "Exposure Level Increments"
 msgstr "Режим экспозиции"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
+#, fuzzy
 msgid "AF Assist"
-msgstr ""
+msgstr "Тип сцены"
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
 msgstr ""
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
+#, fuzzy
 msgid "Flash Sync Speed Av"
-msgstr ""
+msgstr "Режим вспышки"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 #, fuzzy
 msgid "Shutter speed in Av mode"
 msgstr "Скорость срабатывания затвора"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
+#, fuzzy
 msgid "AEB Sequence"
-msgstr ""
+msgstr "Номер последовательности"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB sequence/auto cancellation"
 msgstr ""
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 #, fuzzy
 msgid "Shutter Curtain Sync"
 msgstr "Выдержка"
 
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 #, fuzzy
 msgid "Shutter curtain sync"
 msgstr "Приоритет выдержки"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 #, fuzzy
 msgid "Lens AF Stop Button"
 msgstr "Тип объектива"
 
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
+#, fuzzy
 msgid "Lens AF stop button Fn. Switch"
-msgstr ""
+msgstr "Тип объектива"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 #, fuzzy
 msgid "Fill Flash Auto Reduction"
 msgstr "Подавление шума"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
 msgstr ""
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu button return position"
 msgstr ""
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
+#, fuzzy
 msgid "Set Button Function"
-msgstr ""
+msgstr "Инструкции"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor Cleaning"
 msgstr "Очистка сенсора"
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor cleaning"
 msgstr "Очистка сенсора"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
 msgstr ""
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr ""
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
+#, fuzzy
 msgid "Unknown Canon Custom Function tag"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/canonmn.cpp:841
+#: src/canonmn.cpp:951
 #, fuzzy
 msgid "mid-right"
 msgstr "слева направо"
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 #, fuzzy
 msgid "bottom"
 msgstr "снизу вверх"
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 #, fuzzy
 msgid "top"
 msgstr "в"
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
+#, fuzzy
 msgid "mid-left"
-msgstr ""
+msgstr "Левая"
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
+#, fuzzy
 msgid "upper-left"
-msgstr ""
+msgstr "Правая"
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
 #, fuzzy
 msgid "upper-right"
 msgstr "Правая"
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
+#, fuzzy
 msgid "lower-left"
-msgstr ""
+msgstr "Правая"
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
 #, fuzzy
 msgid "lower-right"
 msgstr "Правая"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
 msgid "Image Width"
 msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
 msgid "Image width"
 msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
 #, fuzzy
 msgid "Image Height"
 msgstr "Длина изображения"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
 msgid "Image height"
 msgstr "Высота изображения"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 #, fuzzy
 msgid "Image Width As Shot"
 msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 #, fuzzy
 msgid "Image width (as shot)"
 msgstr "Ширина изображения"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 #, fuzzy
 msgid "Image Height As Shot"
 msgstr "Длина изображения"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 #, fuzzy
 msgid "Image height (as shot)"
 msgstr "Высота изображения"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 #, fuzzy
 msgid "AF Points Used"
 msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 #, fuzzy
 msgid "AF points used"
 msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 #, fuzzy
 msgid "AF Points Used 20D"
 msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 #, fuzzy
 msgid "AF points used (20D)"
 msgstr "Использованная точка AF"
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 #, fuzzy
 msgid "Unknown Canon Picture Info tag"
 msgstr "Неизвестный тэг"
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
+#, fuzzy
 msgid "ISO"
-msgstr ""
+msgstr "О снимке"
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 msgid "WB"
 msgstr ""
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
 msgstr ""
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
 msgstr ""
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 #, fuzzy
 msgid "Medium Movie"
 msgstr "Низкий"
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 #, fuzzy
 msgid "Small Movie"
 msgstr "Кино"
 
-#: src/canonmn.cpp:905
+#: src/canonmn.cpp:1015
 #, fuzzy
 msgid "On 1"
 msgstr "Вкл"
 
-#: src/canonmn.cpp:906
+#: src/canonmn.cpp:1016
 #, fuzzy
 msgid "On 2"
 msgstr "Вкл"
 
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 #, fuzzy
 msgid "On (shift AB)"
 msgstr "One-Shot"
 
-#: src/canonmn.cpp:915
+#: src/canonmn.cpp:1025
+#, fuzzy
 msgid "On (shift GM)"
-msgstr ""
+msgstr "One-Shot"
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
 msgstr ""
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 #, fuzzy
 msgid "Orange"
 msgstr "Динамический диапазон"
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 msgid "Red"
 msgstr ""
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 #, fuzzy
 msgid "Green"
 msgstr "Режим замера"
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
 #, fuzzy
 msgid "Blue"
 msgstr "значение"
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
 msgstr ""
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Брекетинг"
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
 #, fuzzy
 msgid "Bracket Value"
 msgstr "Брекетинг"
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
 #, fuzzy
 msgid "Bracket Shot Number"
 msgstr "Брекетинг"
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 #, fuzzy
 msgid "Raw Jpg Quality"
 msgstr "Качество"
 
-#: src/canonmn.cpp:943
+#: src/canonmn.cpp:1053
 #, fuzzy
 msgid "Raw Jpg Size"
 msgstr "Размер изображения"
 
-#: src/canonmn.cpp:945
+#: src/canonmn.cpp:1055
 #, fuzzy
 msgid "WB Bracket Mode"
 msgstr "Брекетинг"
 
-#: src/canonmn.cpp:946
+#: src/canonmn.cpp:1056
 #, fuzzy
 msgid "WB Bracket Value AB"
 msgstr "Таблица баланса белого"
 
-#: src/canonmn.cpp:947
+#: src/canonmn.cpp:1057
 #, fuzzy
 msgid "WB Bracket Value GM"
 msgstr "Таблица баланса белого"
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 #, fuzzy
 msgid "Filter Effect"
 msgstr "Цветовой эффект"
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 #, fuzzy
 msgid "Toning Effect"
 msgstr "Цветовое пространство"
 
-#: src/canonmn.cpp:951
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro Magnification"
+msgstr "Версия модели"
+
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro magnification"
+msgstr "Версия модели"
+
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
+msgstr ""
+
+#: src/canonmn.cpp:1061
+#, fuzzy
+msgid "Live view shooting"
+msgstr "Режим макросъёмки"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash Exposure Lock"
+msgstr "Компенсация вспышки ?"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash exposure lock"
+msgstr "Компенсация вспышки ?"
+
+#: src/canonmn.cpp:1064
 #, fuzzy
 msgid "Unknown Canon File Info tag"
 msgstr "Неизвестный тэг"
 
-#: src/crwimage.cpp:663
-msgid "Header, offset"
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
 msgstr ""
 
-#: src/crwimage.cpp:680
-msgid "tag"
-msgstr "поле"
+#: src/canonmn.cpp:1082
+#, fuzzy
+msgid "Lowest"
+msgstr "Правая"
 
-#: src/crwimage.cpp:682
-msgid "dir"
-msgstr "каталог"
+#: src/canonmn.cpp:1086
+#, fuzzy
+msgid "Highest"
+msgstr "Высокий"
 
-#: src/crwimage.cpp:684
-msgid "type"
-msgstr "тип"
+#: src/canonmn.cpp:1094
+#, fuzzy
+msgid "High Saturation"
+msgstr "Насыщенность"
 
-#: src/crwimage.cpp:685
-msgid "size"
-msgstr "размер"
+#: src/canonmn.cpp:1096
+#, fuzzy
+msgid "Low Saturation"
+msgstr "Насыщенность"
 
-#: src/crwimage.cpp:686
-msgid "offset"
-msgstr "быстрый"
+#: src/canonmn.cpp:1097
+msgid "CM Set 1"
+msgstr ""
 
-#: src/datasets.cpp:79
-msgid "(invalid)"
+#: src/canonmn.cpp:1098
+msgid "CM Set 2"
 msgstr ""
 
-#: src/datasets.cpp:80
-msgid "IIM envelope record"
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
 msgstr ""
 
-#: src/datasets.cpp:81
-msgid "IIM application record 2"
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
 msgstr ""
 
-#: src/datasets.cpp:85
-msgid "Model Version"
-msgstr "Версия модели"
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
+msgstr ""
 
-#: src/datasets.cpp:86
-msgid ""
-"A binary number identifying the version of the Information Interchange "
-"Model, Part I, utilised by the provider. Version numbers are assigned by "
-"IPTC and NAA organizations."
+#: src/canonmn.cpp:1102
+msgid "PC 1"
 msgstr ""
 
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
-#, fuzzy
-msgid "Destination"
-msgstr "Ориентация"
+#: src/canonmn.cpp:1103
+msgid "PC 2"
+msgstr ""
 
-#: src/datasets.cpp:91
-msgid ""
-"This DataSet is to accommodate some providers who require routing "
-"information above the appropriate OSI layers."
+#: src/canonmn.cpp:1104
+msgid "PC 3"
 msgstr ""
 
-#: src/datasets.cpp:94
-msgid "File Format"
+#: src/canonmn.cpp:1109
+msgid "Faithful"
+msgstr ""
+
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+msgid "Monochrome"
+msgstr "Монохромный"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "ToneCurve"
+msgstr "Кривая тонкоррекции"
+
+#: src/canonmn.cpp:1115
+msgid "Tone curve"
+msgstr "Тональная кривая"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "SharpnessFrequency"
+msgstr "Резкость"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "Sharpness frequency"
+msgstr "Резкость"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "SensorRedLevel"
+msgstr "Заряд батареи"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "Sensor red level"
+msgstr "Под уровнем моря"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "SensorBlueLevel"
+msgstr "Заряд батареи"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "Sensor blue level"
+msgstr "Под уровнем моря"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "WhiteBalanceRed"
+msgstr "Баланс белого"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "White balance red"
+msgstr "Баланс белого"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "WhiteBalanceBlue"
+msgstr "Таблица баланса белого"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "White balance blue"
+msgstr "Таблица баланса белого"
+
+#: src/canonmn.cpp:1122
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Баланс белого"
+
+#: src/canonmn.cpp:1123
+#, fuzzy
+msgid "ColorTemperature"
+msgstr "Температура цвета"
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+msgid "Color Temperature"
+msgstr "Температура цвета"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "PictureStyle"
+msgstr "Портретный режим"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "Picture style"
+msgstr "Портретный режим"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "DigitalGain"
+msgstr "Цифровой макрорежим"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "Digital gain"
+msgstr "Цифровой макрорежим"
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+#: src/canonmn.cpp:1126
+#, fuzzy
+msgid "WBShift AB"
+msgstr "One-Shot"
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+#: src/canonmn.cpp:1127
+#, fuzzy
+msgid "WB Shift GM"
+msgstr "One-Shot"
+
+#: src/canonmn.cpp:1128
+#, fuzzy
+msgid "Unknown Canon Processing Info tag"
+msgstr "Неизвестный тэг"
+
+#: src/crwimage.cpp:664
+msgid "Header, offset"
+msgstr ""
+
+#: src/crwimage.cpp:681
+msgid "tag"
+msgstr "поле"
+
+#: src/crwimage.cpp:683
+msgid "dir"
+msgstr "каталог"
+
+#: src/crwimage.cpp:685
+msgid "type"
+msgstr "тип"
+
+#: src/crwimage.cpp:686
+msgid "size"
+msgstr "размер"
+
+#: src/crwimage.cpp:687
+msgid "offset"
+msgstr "быстрый"
+
+#: src/datasets.cpp:79
+msgid "(invalid)"
+msgstr ""
+
+#: src/datasets.cpp:80
+#, fuzzy
+msgid "IIM envelope record"
+msgstr "Приоритет выдержки (Tv)"
+
+#: src/datasets.cpp:81
+msgid "IIM application record 2"
+msgstr ""
+
+#: src/datasets.cpp:85
+msgid "Model Version"
+msgstr "Версия модели"
+
+#: src/datasets.cpp:86
+msgid ""
+"A binary number identifying the version of the Information Interchange "
+"Model, Part I, utilised by the provider. Version numbers are assigned by "
+"IPTC and NAA organizations."
+msgstr ""
+
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
+#, fuzzy
+msgid "Destination"
+msgstr "Ориентация"
+
+#: src/datasets.cpp:91
+msgid ""
+"This DataSet is to accommodate some providers who require routing "
+"information above the appropriate OSI layers."
+msgstr ""
+
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
+msgid "File Format"
 msgstr "Формат файла"
 
 #: src/datasets.cpp:95
@@ -2523,8 +3172,9 @@
 msgstr ""
 
 #: src/datasets.cpp:108
+#, fuzzy
 msgid "Envelope Number"
-msgstr ""
+msgstr "Число F"
 
 #: src/datasets.cpp:109
 msgid ""
@@ -2561,8 +3211,9 @@
 msgstr ""
 
 #: src/datasets.cpp:129
+#, fuzzy
 msgid "Date Sent"
-msgstr ""
+msgstr "Время отправки"
 
 #: src/datasets.cpp:130
 msgid ""
@@ -2595,8 +3246,9 @@
 msgstr ""
 
 #: src/datasets.cpp:145
+#, fuzzy
 msgid "Unique Name Object"
-msgstr ""
+msgstr "Модель камеры"
 
 #: src/datasets.cpp:146
 msgid ""
@@ -2682,7 +3334,7 @@
 msgid "Document Title"
 msgstr "Имя документа"
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
 msgid "Edit Status"
 msgstr "Статус правки"
 
@@ -2701,18 +3353,18 @@
 "<ARMVersion>, according to the practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
 msgstr "Срочность"
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
 msgid "Subject"
 msgstr "Предмет съёмки"
 
@@ -2720,7 +3372,7 @@
 msgid "The Subject Reference is a structured definition of the subject matter."
 msgstr ""
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
 msgid "Category"
 msgstr "Категория"
 
@@ -2743,13 +3395,14 @@
 "to the provider."
 msgstr ""
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
 msgstr "Дополнительные категории"
 
 #: src/datasets.cpp:229
+#, fuzzy
 msgid "Fixture Id"
-msgstr ""
+msgstr "Сработала"
 
 #: src/datasets.cpp:230
 msgid ""
@@ -2757,7 +3410,7 @@
 "immediately find or recall such an object."
 msgstr ""
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
 msgstr "Ключевые слова"
 
@@ -2770,8 +3423,9 @@
 msgstr ""
 
 #: src/datasets.cpp:240
+#, fuzzy
 msgid "Location Code"
-msgstr ""
+msgstr "Имя местоположения"
 
 #: src/datasets.cpp:241
 msgid ""
@@ -2794,7 +3448,7 @@
 "provider."
 msgstr ""
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
 msgid "Release Date"
 msgstr "Дата пубикации"
 
@@ -2825,8 +3479,9 @@
 msgstr ""
 
 #: src/datasets.cpp:265
+#, fuzzy
 msgid "ExpirationTime"
-msgstr ""
+msgstr "Истечение срока"
 
 #: src/datasets.cpp:266
 msgid ""
@@ -2844,7 +3499,7 @@
 "embargoes and warnings."
 msgstr ""
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 msgid "Instructions"
 msgstr "Инструкции"
 
@@ -2891,7 +3546,7 @@
 "object refers."
 msgstr ""
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
 msgid "Date Created"
 msgstr "Дата создания объекта съёмки"
 
@@ -2933,9 +3588,10 @@
 "representation of the object data was created. Follows ISO 8601 standard."
 msgstr ""
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 msgid "Program"
 msgstr "Программа"
 
@@ -2952,16 +3608,18 @@
 msgstr ""
 
 #: src/datasets.cpp:316
+#, fuzzy
 msgid "Object Cycle"
-msgstr ""
+msgstr "Тип объекта"
 
 #: src/datasets.cpp:317
 msgid "Used to identify the editorial cycle of object data."
 msgstr ""
 
 #: src/datasets.cpp:319
+#, fuzzy
 msgid "By-line"
-msgstr ""
+msgstr "строка"
 
 #: src/datasets.cpp:320
 msgid ""
@@ -2974,8 +3632,9 @@
 msgstr "Автор"
 
 #: src/datasets.cpp:324
+#, fuzzy
 msgid "By-line Title"
-msgstr ""
+msgstr "Название (Windows)"
 
 #: src/datasets.cpp:325
 msgid ""
@@ -2983,7 +3642,7 @@
 "Where used, a by-line title should follow the by-line it modifies."
 msgstr ""
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr "Город"
 
@@ -3005,8 +3664,9 @@
 msgstr ""
 
 #: src/datasets.cpp:337
+#, fuzzy
 msgid "Province State"
-msgstr ""
+msgstr "Данные эскиза"
 
 #: src/datasets.cpp:338
 msgid ""
@@ -3018,7 +3678,7 @@
 msgid "State/Province"
 msgstr "Штат/провинция"
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
 msgid "Country Code"
 msgstr "Код страны"
 
@@ -3044,13 +3704,14 @@
 "guidelines of the provider."
 msgstr ""
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
 msgid "Country"
 msgstr "Страна"
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
+#, fuzzy
 msgid "Transmission Reference"
-msgstr ""
+msgstr "Эталонный Чёрный/Белый"
 
 #: src/datasets.cpp:359
 msgid ""
@@ -3058,7 +3719,7 @@
 "practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
 msgid "Headline"
 msgstr "Заголовок"
 
@@ -3067,9 +3728,10 @@
 "A publishable entry providing a synopsis of the contents of the object data."
 msgstr ""
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
+#, fuzzy
 msgid "Credit"
-msgstr ""
+msgstr "Монохромный"
 
 #: src/datasets.cpp:368
 msgid ""
@@ -3077,8 +3739,8 @@
 "creator."
 msgstr ""
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
 msgid "Source"
 msgstr "Источник"
 
@@ -3096,7 +3758,7 @@
 msgid "Copyright Notice"
 msgstr "Уведомление об авторских правах"
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
 msgid "Contact"
 msgstr "Контакт"
 
@@ -3114,7 +3776,7 @@
 msgid "A textual description of the object data."
 msgstr "Текстовое описание объекта снимка"
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 msgid "Description"
 msgstr "Описание"
 
@@ -3150,7 +3812,7 @@
 msgid "Indicates the layout of an image."
 msgstr "Показывает макет изображения"
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
 msgid "Language"
 msgstr "Язык"
 
@@ -3166,8 +3828,9 @@
 msgstr "Тип звуковых данных"
 
 #: src/datasets.cpp:409
+#, fuzzy
 msgid "Indicates the type of an audio content."
-msgstr ""
+msgstr "Показывает длительность звукозаписи"
 
 #: src/datasets.cpp:411
 msgid "Audio Rate"
@@ -3183,8 +3846,9 @@
 msgstr "Разрешение по X"
 
 #: src/datasets.cpp:415
+#, fuzzy
 msgid "Indicates the sampling resolution of an audio content."
-msgstr ""
+msgstr "Показывает частоту сэмплирования звукозаписи в Герцах"
 
 #: src/datasets.cpp:417
 msgid "Audio Duration"
@@ -3195,8 +3859,9 @@
 msgstr "Показывает длительность звукозаписи"
 
 #: src/datasets.cpp:420
+#, fuzzy
 msgid "Audio Outcue"
-msgstr ""
+msgstr "Частота сэмплирования звукозаписи"
 
 #: src/datasets.cpp:421
 msgid ""
@@ -3241,217 +3906,228 @@
 msgid "Unknown dataset"
 msgstr "Неизвестный набор данных"
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr ""
 
-#: src/error.cpp:50
+#: src/error.cpp:56
+#, fuzzy
 msgid "Success"
-msgstr ""
+msgstr "Источник"
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr ""
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr ""
 
-#: src/error.cpp:55
+#: src/error.cpp:61
+#, fuzzy
 msgid "Invalid record name `%1'"
-msgstr ""
+msgstr "Серийный номер"
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr ""
 
-#: src/error.cpp:57
+#: src/error.cpp:63
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
 msgstr ""
 
-#: src/error.cpp:58
+#: src/error.cpp:64
+#, fuzzy
 msgid "Value not set"
-msgstr ""
+msgstr "не установлено\n"
 
-#: src/error.cpp:59
+#: src/error.cpp:65
+#, fuzzy
 msgid "%1: Failed to open the data source: %2"
-msgstr ""
+msgstr "Не удалось открыть файл\n"
 
-#: src/error.cpp:60
+#: src/error.cpp:66
+#, fuzzy
 msgid "%1: Failed to open file (%2): %3"
-msgstr ""
+msgstr "Не удалось открыть файл\n"
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr ""
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr ""
 
-#: src/error.cpp:64
+#: src/error.cpp:70
+#, fuzzy
 msgid "Failed to read image data"
-msgstr ""
+msgstr "Не удалось переименовать"
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr ""
 
-#: src/error.cpp:67
-msgid "%1: Failed to rename file to %2: %3"
+#: src/error.cpp:72
+msgid "%1: Failed to map file for reading and writing: %2"
 msgstr ""
 
-#: src/error.cpp:68
+#: src/error.cpp:73
+#, fuzzy
+msgid "%1: Failed to rename file to %2: %3"
+msgstr "Не удалось открыть файл\n"
+
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr ""
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr ""
 
-#: src/error.cpp:70
+#: src/error.cpp:76
+#, fuzzy
 msgid "Failed to read input data"
-msgstr ""
+msgstr "Не удалось прочитать"
 
-#: src/error.cpp:71
+#: src/error.cpp:77
+#, fuzzy
 msgid "Failed to write image"
-msgstr ""
+msgstr "Не удалось переименовать"
 
-#: src/error.cpp:72
+#: src/error.cpp:78
+#, fuzzy
 msgid "Input data does not contain a valid image"
-msgstr ""
+msgstr "В снимке нет Exif-эскиза\n"
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 msgid "Invalid ifdId %1"
 msgstr ""
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr ""
 
-#: src/error.cpp:77
+#: src/error.cpp:83
+#, fuzzy
 msgid "Unsupported data area offset type"
-msgstr ""
+msgstr "Неподдерживаемый формат даты"
 
-#: src/error.cpp:78
+#: src/error.cpp:84
 msgid "Invalid charset: `%1'"
 msgstr ""
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr "Неподдерживаемый формат даты"
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr "Неподдерживаемый формат времени"
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 msgid "Writing to %1 images is not supported"
 msgstr ""
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr ""
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr ""
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr ""
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr ""
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr ""
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr ""
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr ""
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr ""
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr ""
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr ""
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr ""
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 
-#: src/error.cpp:98
+#: src/error.cpp:104
 msgid "Invalid XmpText type `%1'"
 msgstr ""
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr ""
 
-#: src/error.cpp:100
+#: src/error.cpp:106
 msgid "Multiple TIFF array element tags %1 in one directory"
 msgstr ""
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr ""
 
-#: src/error.cpp:103
-msgid "(Unknown Error)"
-msgstr "(Неизвестная ошибка)"
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
 msgstr "Авторские права (C) 2004-2008 Andreas Huggel.\n"
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3459,7 +4135,7 @@
 "of the License, or (at your option) any later version.\n"
 msgstr ""
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3467,7 +4143,7 @@
 "GNU General Public License for more details.\n"
 msgstr ""
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3475,11 +4151,11 @@
 "Boston, MA 02110-1301 USA\n"
 msgstr ""
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr "Использование:"
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
@@ -3487,11 +4163,11 @@
 "[ ключи ] [ действие ] файл ...\n"
 "\n"
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr "Работа с метаданными изображений.\n"
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
@@ -3499,7 +4175,7 @@
 "\n"
 "Действия:\n"
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
@@ -3507,15 +4183,15 @@
 "  ad | adjust   Заменить отметки времени Exif на заданное время.\n"
 "  Этому действию нужен ключ -a time.\n"
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr "  pr | print    Вывести на экран метаданные изображения.\n"
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr "  rm | delete   Удалить метаданные изображений из их файлов.\n"
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
@@ -3523,13 +4199,13 @@
 "  in | insert   Вставить метаданные из соответствующих файлов *.exv.\n"
 "                Используйте ключ -S для смены суффикса входящих файлов.\n"
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 "  ex | extract  Извлечь метаданные в файлы *.exv, *.xmp и файлы эскизов.\n"
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
@@ -3541,7 +4217,7 @@
 "                Формат файла можно установить ключом -r, параметры отметки\n"
 "                времени контролируются ключами -t и -T.\n"
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
@@ -3552,7 +4228,7 @@
 "комментарий JPEG.\n"
 "                Необходимо использовать в паре с ключом -c, -m или -M.\n"
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
@@ -3560,7 +4236,13 @@
 "  fi | fixiso   Скопировать значение ISO из Nikon Makernote \n"
 "                в обычное поле Exif.\n"
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
@@ -3568,53 +4250,68 @@
 "\n"
 "Параметры:\n"
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr "   -h      Показать эту справку и выйти.\n"
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr "   -V      Показать версию программы и выйти.\n"
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr "   -v      Выводить подробную информацию при выполнении действий.\n"
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+#, fuzzy
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr "   -v      Выводить подробную информацию при выполнении действий.\n"
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr "   -b      Показать большие двоичные значения.\n"
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 #, fuzzy
 msgid "   -u      Show unknown tags.\n"
 msgstr "   -u      Не показывать неизвестные тэги.\n"
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr "   -k      Сохранять временные отметки файлов (keep).\n"
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
 msgstr ""
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr ""
 "   -F      Не запрашивать подтверждение на перезапись файлов (force).\n"
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr ""
 "   -F      Не запрашивать подтверждение на переименование файлов (Force).\n"
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
@@ -3622,28 +4319,28 @@
 "   -a время Новое значение времени в формате [-]ЧЧ[:ММ[:СС]]. Этот ключ\n"
 "           используется только с действием 'adjust'.\n"
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr "   -Y год  Новое значение года для действия 'adjust'.\n"
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr "   -O месяц  Новое значение месяца для действия 'adjust'.\n"
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr "   -D день  Новое значение дня для действия 'adjust'.\n"
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr ""
 "   -p режим Print -- режим для действия 'вывод' (print). Возможные режимы:\n"
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr "             s : вывести сводку метаданных Exif (по умолчанию)\n"
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 #, fuzzy
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
@@ -3651,47 +4348,47 @@
 "             v : обычные значения данных Exif (короткий вариант комбинации -"
 "Pxgnycv)\n"
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 #, fuzzy
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 "             t : интерпретированные данные Exif (короткий вариант комбинации "
 "-Pkyct)\n"
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 #, fuzzy
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr ""
 "             v : обычные значения данных Exif (короткий вариант комбинации -"
 "Pxgnycv)\n"
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 #, fuzzy
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr ""
 "             h : шестнадцатеричный дамп данных Exif (краткий вариант для -"
 "Pxgnycsh)\n"
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 #, fuzzy
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr "             i : значения данных IPTC\n"
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 #, fuzzy
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr "             x : свойства XMP\n"
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr "             c : комментарий JPEG\n"
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 #, fuzzy
 msgid "             p : list available previews\n"
 msgstr "             l : метка тэга\n"
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 #, fuzzy
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
@@ -3699,92 +4396,92 @@
 "   -P столбцы Вывести на экран список тегов Exif в виде таблицы (действие "
 "'print'). Допустимы столбцы:\n"
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 #, fuzzy
 msgid "             E : include Exif tags in the list\n"
 msgstr "             s : размер в байтах\n"
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 #, fuzzy
 msgid "             I : IPTC datasets\n"
 msgstr "             i : данные IPTC\n"
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 #, fuzzy
 msgid "             X : XMP properties\n"
 msgstr "             x : свойства XMP\n"
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 #, fuzzy
 msgid "             x : print a column with the tag number\n"
 msgstr "             x : вывести столбец со значениями тэгов\n"
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr "             g : имя группы\n"
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr "             k : ключ\n"
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr "             l : метка тэга\n"
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr "             n : имя тэга\n"
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr "             y : тип\n"
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr "             c : количество компонентов (count)\n"
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr "             s : размер в байтах\n"
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr "             v : обычное значение данных\n"
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr "             t : интерпретированные (переведенные) данные\n"
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr "             h : шестнадцатеричный дамп данных\n"
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr "   -d tgt  Удаляемые цели для действия 'delete'. Возможные цели:\n"
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr "             a : все поддерживаемые метаданные (по умолчанию)\n"
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr "             e : раздел Exif\n"
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr "             t : только Exif-эскиз\n"
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr "             i : данные IPTC\n"
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr "             x : пакет XMP\n"
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
 "           the same as those for the -d option, plus a modifier:\n"
@@ -3799,7 +4496,7 @@
 "иметь вид\n"
 "           <file>-thumb.jpg\n"
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 #, fuzzy
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
@@ -3813,7 +4510,7 @@
 "           те же, что и для ключа  -d плюс модификатор:\n"
 "             X : Извлечь метаданные из сопутствующего файла XMP <файл>.xmp\n"
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
@@ -3822,48 +4519,48 @@
 "           следует правилам из strftime(3). Поддерживаются следующие "
 "ключевые слова:\n"
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr "             :basename:   - оригинальное имя файла без расширения\n"
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 "             :dirname:    - имя каталога, содержащего оригинальный файл\n"
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr "             :parentname: - имя родительского каталога\n"
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr "           Форматом файлов по умолчанию является "
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr ""
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
 msgstr ""
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
 msgstr ""
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
 msgstr ""
 "   -l каталог  Расположение (каталог) вставляемых или извлекаемых файлов.\n"
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
@@ -3872,7760 +4569,10482 @@
 "insert.\n"
 "\n"
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 msgid "Option"
 msgstr "Параметр"
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr "требует аргумент\n"
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr "Неизвестный ключ"
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr ""
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr ""
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr ""
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr ""
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 msgid "Error parsing"
 msgstr "Ошибка при синтаксическом разборе"
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 #, fuzzy
 msgid "option argument"
 msgstr "Имя местоположения"
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr ""
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr ""
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr ""
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr ""
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr ""
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr ""
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr ""
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr "должно быть указано действие\n"
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr ""
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr ""
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr "нужно указать хотя бы один файл\n"
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr ""
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr ""
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr ""
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr ""
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr ""
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 msgid "target"
 msgstr ""
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 #, fuzzy
 msgid "Invalid preview number"
 msgstr "Серийный номер"
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr ""
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 msgid "line"
 msgstr "строка"
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 msgid "-M option"
 msgstr ""
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr ""
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr ""
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
 msgstr ""
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
+#, fuzzy
 msgid "Soft mode 1"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
+#, fuzzy
 msgid "Soft mode 2"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
 #, fuzzy
 msgid "Hard mode 1"
 msgstr "Режим макросъёмки"
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
 #, fuzzy
 msgid "Hard mode 2"
 msgstr "Режим макросъёмки"
 
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr "Дневной свет"
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
 msgid "Fluorescent (daylight)"
 msgstr "Флуоресцентная лампа (дневной свет)"
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
 msgid "Fluorescent (warm white)"
 msgstr "Флуоресцентная лампа (тёплый белый)"
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
 msgid "Fluorescent (cool white)"
 msgstr "Флуоресцентная лампа (прохладный белый)"
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
+#, fuzzy
 msgid "Incandescent"
-msgstr ""
+msgstr "Яркая лампа накаливания"
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
 #, fuzzy
 msgid "None (black & white)"
 msgstr "Чёрно-белый"
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
 msgid "Red-eye reduction"
 msgstr "Подавление эффекта красных глаз"
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr "Ночная съёмка"
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
 #, fuzzy
 msgid "Program AE"
 msgstr "Программа экспозиции"
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 msgid "Natural light"
 msgstr "Естественный свет"
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
 msgid "Anti-blur"
 msgstr "Антиразмывание"
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
 msgid "Sunset"
 msgstr "Закат"
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
 msgid "Museum"
 msgstr "Музей"
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
 msgid "Party"
 msgstr "Вечеринка"
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 msgid "Flower"
 msgstr "Цветок"
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
 msgstr "Текст"
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
+#, fuzzy
 msgid "Natural light & flash"
-msgstr ""
+msgstr "Естественный свет"
 
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
 msgid "Aperture-priority AE"
 msgstr "Замер с приоритетом диафрагмы"
 
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
 msgid "Shutter speed priority AE"
 msgstr "Замер с приоритетом выдержки"
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
+#, fuzzy
 msgid "No flash & flash"
-msgstr ""
-
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr ""
+msgstr "Без вспышки"
 
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
 #, fuzzy
 msgid "Chrome"
 msgstr "Монохромный"
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
+#, fuzzy
 msgid "Wide"
-msgstr ""
+msgstr "Цвет"
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
+#, fuzzy
 msgid "F0/Standard"
-msgstr ""
+msgstr "Стандартный свет A"
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 msgid "F1/Studio portrait"
 msgstr "F1/Студийный портрет"
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
 msgstr "F2/Fujichrome"
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
+#, fuzzy
 msgid "F3/Studio portrait Ex"
-msgstr ""
+msgstr "F1/Студийный портрет"
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr "F4/Velvia"
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr "Авто (100-400%)"
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr "Raw"
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
+#, fuzzy
 msgid "Standard (100%)"
-msgstr ""
+msgstr "Стандартный свет A"
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
 msgstr ""
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
 msgstr ""
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
+#, fuzzy
 msgid "Film simulation mode"
-msgstr ""
+msgstr "Разрешение по X"
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
 msgid "Version"
 msgstr "Версия"
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
 msgid "Fujifilm Makernote version"
 msgstr "Версия Fujifilm Makernote"
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
 msgstr ""
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
 #, fuzzy
 msgid "Image quality setting"
 msgstr "Описание снимка"
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
 msgid "Color"
 msgstr "Цвет"
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 #, fuzzy
 msgid "Chroma saturation setting"
 msgstr "Настройка контраста"
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
 #, fuzzy
 msgid "Tone"
 msgstr "Ничего"
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
+#, fuzzy
 msgid "Flash firing mode setting"
-msgstr ""
+msgstr "Вспышка сработала"
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
 #, fuzzy
 msgid "Flash Strength"
 msgstr "Фокусное расстояние"
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
 #, fuzzy
 msgid "Flash firing strength compensation setting"
 msgstr "Компенсация вспышки ?"
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
 #, fuzzy
 msgid "Macro mode setting"
 msgstr "Режим макросъёмки"
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 #, fuzzy
 msgid "Focusing mode setting"
 msgstr "Способ фокусировки"
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
 msgstr "Медленная синхронизация"
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
 #, fuzzy
 msgid "Slow synchro mode setting"
 msgstr "медленная синхронизация"
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
 #, fuzzy
 msgid "Picture Mode"
 msgstr "Портретный режим"
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
+#, fuzzy
 msgid "Picture mode setting"
-msgstr ""
+msgstr "Портретный режим"
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr ""
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
 #, fuzzy
 msgid "Sequence Number"
 msgstr "Номер последовательности"
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 msgid "Sequence number"
 msgstr "Номер последовательности"
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
+#, fuzzy
 msgid "FinePix Color"
-msgstr ""
+msgstr "Цвет"
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
 msgstr ""
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
+#, fuzzy
 msgid "Blur Warning"
-msgstr ""
+msgstr "Предупреждение"
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
+#, fuzzy
 msgid "Blur warning status"
-msgstr ""
+msgstr "Автоэкспозиция"
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
 #, fuzzy
 msgid "Focus Warning"
 msgstr "Способ фокусировки"
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
+#, fuzzy
 msgid "Auto Focus warning status"
-msgstr ""
+msgstr "Автоэкспозиция"
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
 #, fuzzy
 msgid "Exposure Warning"
 msgstr "Время экспозиции"
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
 #, fuzzy
 msgid "Auto exposure warning status"
 msgstr "Автоэкспозиция"
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
 msgid "Dynamic Range"
 msgstr "Динамический диапазон"
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
 msgid "Dynamic range"
 msgstr "Динамический диапазон"
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
 #, fuzzy
 msgid "Film Mode"
 msgstr "Режим вспышки"
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
 #, fuzzy
 msgid "Film mode"
 msgstr "Режим вспышки"
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
 #, fuzzy
 msgid "Dynamic Range Setting"
 msgstr "Настройка баланса белого"
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
+#, fuzzy
 msgid "Dynamic range settings"
-msgstr ""
+msgstr "Настройка баланса белого"
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
+#, fuzzy
 msgid "Development Dynamic Range"
-msgstr ""
+msgstr "Динамический диапазон"
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
+#, fuzzy
 msgid "Development dynamic range"
-msgstr ""
+msgstr "Динамический диапазон"
 
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
 #, fuzzy
 msgid "Minimum Focal Length"
 msgstr "Фокусное расстояние"
 
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
 #, fuzzy
 msgid "Minimum focal length"
 msgstr "Фокусное расстояние"
 
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
 #, fuzzy
 msgid "Maximum Focal Length"
 msgstr "Фокусное расстояние"
 
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
 msgid "Maximum focal length"
 msgstr "Максимальное фокусное расстояние"
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
+#, fuzzy
 msgid "Maximum Aperture at Mininimum Focal"
-msgstr ""
+msgstr "Максимально открытая диафрагма"
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
+#, fuzzy
 msgid "Maximum aperture at mininimum focal"
-msgstr ""
+msgstr "Максимально открытая диафрагма"
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
+#, fuzzy
 msgid "Maximum Aperture at Maxinimum Focal"
-msgstr ""
+msgstr "Максимально открытая диафрагма"
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
+#, fuzzy
 msgid "Maximum aperture at maxinimum focal"
-msgstr ""
+msgstr "Максимально открытая диафрагма"
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr "Источник файла"
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 #, fuzzy
 msgid "File source"
 msgstr "Источник файла"
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
 msgid "Order Number"
 msgstr "Номер заказа"
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
 msgid "Order number"
 msgstr "Номер заказа"
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
 #, fuzzy
 msgid "Frame Number"
 msgstr "Число F"
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
 #, fuzzy
 msgid "Frame number"
 msgstr "Номер изображения"
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
+#, fuzzy
 msgid "Unknown FujiMakerNote tag"
-msgstr ""
+msgstr "Неизвестный тэг CanonMakerNote"
 
 #: src/minoltamn.cpp:56
 msgid "Natural Color"
 msgstr "Естественный цвет"
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
 #, fuzzy
 msgid "Vivid Color"
 msgstr "Цвет"
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
 #, fuzzy
 msgid "Solarization"
 msgstr "Насыщенность"
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr "Adobe RGB"
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
 #, fuzzy
 msgid "Natural"
 msgstr "внешняя"
 
 #: src/minoltamn.cpp:64
+#, fuzzy
 msgid "Natural sRGB"
-msgstr ""
+msgstr "внешняя"
 
 #: src/minoltamn.cpp:65
+#, fuzzy
 msgid "Natural+ sRGB"
-msgstr ""
+msgstr "внешняя"
 
 #: src/minoltamn.cpp:67
 msgid "Evening"
 msgstr "Вечер"
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
 msgid "Night Portrait"
 msgstr "Ночной портрет"
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
 #, fuzzy
 msgid "Super Fine"
 msgstr "SXGA Fine"
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
+#, fuzzy
 msgid "Extra Fine"
-msgstr ""
-
-#: src/minoltamn.cpp:84
-msgid "ISO Setting Used"
-msgstr ""
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr "Высокий ключ"
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr "Низкий ключ"
+msgstr "SXGA Fine"
 
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
 #, fuzzy
 msgid "Makernote Version"
 msgstr "Версия прошивки"
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr ""
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
+#, fuzzy
 msgid "Camera Settings (Std Old)"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
+#, fuzzy
 msgid "Camera Settings (Std New)"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
+#, fuzzy
 msgid "Camera Settings (7D)"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
+#, fuzzy
 msgid "Camera Settings (for Dynax 7D model)"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
 #, fuzzy
 msgid "Image Stabilization Data"
 msgstr "Описание снимка"
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
 #, fuzzy
 msgid "Image stabilization data"
 msgstr "Описание снимка"
 
-#: src/minoltamn.cpp:247
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
+msgstr ""
+
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:111
 #, fuzzy
 msgid "Compressed Image Size"
 msgstr "Сжатых битов на пиксел"
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:112
 #, fuzzy
 msgid "Compressed image size"
 msgstr "Сжатых битов на пиксел"
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
 msgstr ""
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
+#, fuzzy
 msgid "Thumbnail Offset"
-msgstr ""
+msgstr "Эскизы"
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr ""
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
 #, fuzzy
 msgid "Thumbnail Length"
 msgstr "Длина изображения"
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
+#, fuzzy
 msgid "Size of the thumbnail"
-msgstr ""
+msgstr "эскиз"
+
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+#, fuzzy
+msgid "Scene Mode"
+msgstr "Тип сцены"
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
 #, fuzzy
 msgid "Color Mode"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
 #, fuzzy
 msgid "Color mode"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
 #, fuzzy
 msgid "Image Quality"
 msgstr "Качество"
 
-#: src/minoltamn.cpp:271
-msgid "Zone Matching"
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
 msgstr ""
 
-#: src/minoltamn.cpp:272
-msgid "Zone matching"
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+#, fuzzy
+msgid "Flash Exposure Compensation"
+msgstr "Компенсация вспышки ?"
+
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+#, fuzzy
+msgid "Flash exposure compensation in EV"
+msgstr "Компенсация вспышки ?"
+
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+#, fuzzy
+msgid "Teleconverter Model"
+msgstr "Тип сцены"
+
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
 msgstr ""
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
-msgid "Color Temperature"
-msgstr "Температура цвета"
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
+msgstr ""
 
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
+#, fuzzy
+msgid "Zone Matching"
+msgstr "Подавление шума"
+
+#: src/minoltamn.cpp:154
+#, fuzzy
+msgid "Zone matching"
+msgstr "Подавление шума"
+
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
 msgid "Color temperature"
 msgstr "Температура цвета"
 
-#: src/minoltamn.cpp:277
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
 msgid "Lens ID"
 msgstr "ID объектива"
 
-#: src/minoltamn.cpp:278
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
+#, fuzzy
 msgid "Lens identifier"
+msgstr "Идентификатор ARM"
+
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+#, fuzzy
+msgid "Color Compensation Filter"
+msgstr "Тонкомпенсация"
+
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
 msgstr ""
 
-#: src/minoltamn.cpp:280
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+#, fuzzy
+msgid "White Balance Fine Tune"
+msgstr "Таблица баланса белого"
+
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+#, fuzzy
+msgid "White Balance Fine Tune Value"
+msgstr "Таблица баланса белого"
+
+#: src/minoltamn.cpp:168
+#, fuzzy
+msgid "Image Stabilization A100"
+msgstr "Стабилизация снимка"
+
+#: src/minoltamn.cpp:169
+#, fuzzy
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr "Описание снимка"
+
+#: src/minoltamn.cpp:173
 #, fuzzy
 msgid "Camera Settings (5D)"
 msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:281
+#: src/minoltamn.cpp:174
+#, fuzzy
 msgid "Camera Settings (for Dynax 5D model)"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
 msgid "Print IM"
 msgstr ""
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
 #, fuzzy
 msgid "PrintIM information"
 msgstr "Ориентация"
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:183
 #, fuzzy
 msgid "Camera Settings (Z1)"
 msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr ""
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
+#, fuzzy
 msgid "Unknown Minolta MakerNote tag"
-msgstr ""
+msgstr "Неизвестный тег PentaxMakerNote"
 
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr "Приоритет диафрагмы"
 
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr "Приоритет выдержки"
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
 msgid "Fill flash"
 msgstr "Заполняющая вспышка"
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
+#, fuzzy
 msgid "Rear flash sync"
-msgstr ""
+msgstr "Встроенная вспышка"
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
+#, fuzzy
 msgid "Wireless"
-msgstr ""
+msgstr "Файл"
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
 #, fuzzy
 msgid "Fluorescent 2"
 msgstr "Флуоресцентная лампа"
 
-#: src/minoltamn.cpp:329 src/properties.cpp:763
-#, fuzzy
-msgid "Custom 3"
-msgstr "Свой"
-
-#: src/minoltamn.cpp:334
+#: src/minoltamn.cpp:231
 #, fuzzy
 msgid "Full size"
 msgstr "Полный"
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
+#, fuzzy
 msgid "Super fine"
-msgstr ""
+msgstr "SXGA Fine"
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr ""
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+#, fuzzy
+msgid "Single Frame"
+msgstr "Серийный номер"
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
+#, fuzzy
 msgid "Self-timer"
-msgstr ""
+msgstr "Серийный номер"
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
 msgid "Bracketing"
 msgstr "Брекетинг"
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
 msgid "Interval"
 msgstr "Интервал"
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
 #, fuzzy
 msgid "UHS continuous"
 msgstr "Продолжительный ведущий режим"
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
 #, fuzzy
 msgid "HS continuous"
 msgstr "Продолжительный ведущий режим"
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
 msgid "Multi-segment"
 msgstr ""
 
-#: src/minoltamn.cpp:380
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+#, fuzzy
+msgid "Center weighted average"
+msgstr "Центрально-взвешенный средний"
+
+#: src/minoltamn.cpp:271
 msgid "Electronic magnification"
 msgstr ""
 
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
+#, fuzzy
 msgid "Top"
-msgstr ""
+msgstr "в"
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
 #, fuzzy
 msgid "Top-right"
 msgstr "Авторские и смежные права"
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 #, fuzzy
 msgid "Bottom-right"
 msgstr "слева направо"
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
 #, fuzzy
 msgid "Bottom"
 msgstr "снизу вверх"
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
+#, fuzzy
 msgid "Bottom-left"
-msgstr ""
+msgstr "справа налево"
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
+#, fuzzy
 msgid "Top-left"
-msgstr ""
+msgstr "справа налево"
 
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
+#, fuzzy
 msgid "Hard"
-msgstr ""
+msgstr "Высокий"
 
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
+#, fuzzy
 msgid "Soft"
-msgstr ""
+msgstr "Спорт"
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
 #, fuzzy
 msgid "Night portrait"
 msgstr "Ночная съёмка"
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
 #, fuzzy
 msgid "Sports action"
 msgstr "Спорт"
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr ""
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 #, fuzzy
 msgid "Standard form"
 msgstr "Стандартный свет A"
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
+#, fuzzy
 msgid "Data form"
-msgstr ""
+msgstr "Стандартный свет A"
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
+#, fuzzy
 msgid "Natural color"
-msgstr ""
+msgstr "Естественный цвет"
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
 #, fuzzy
 msgid "Black and white"
 msgstr "Чёрно-белый"
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
+#, fuzzy
 msgid "Vivid color"
-msgstr ""
-
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr "Adobe RGB"
+msgstr "Цвет"
 
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
 #, fuzzy
 msgid "No zone"
 msgstr "Ничего"
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr ""
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
 #, fuzzy
 msgid "Left zone"
 msgstr "Левая"
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 #, fuzzy
 msgid "Right zone"
 msgstr "справа налево"
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
 #, fuzzy
 msgid "Auto focus"
 msgstr "AI Focus"
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
+#, fuzzy
 msgid "Wide focus (normal)"
-msgstr ""
+msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
 #, fuzzy
 msgid "Spot focus"
 msgstr "Ручная фокусировка"
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
 #, fuzzy
 msgid "Exposure"
 msgstr "Режим экспозиции"
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 #, fuzzy
 msgid "Filter"
 msgstr "Порядок заполнения"
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 #, fuzzy
 msgid "Not embedded"
 msgstr "Не определено"
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
+#, fuzzy
 msgid "Embedded"
-msgstr ""
+msgstr "Не определено"
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr ""
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr ""
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr ""
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
+#, fuzzy
 msgid "Manual flash control"
-msgstr ""
+msgstr "Ручная экспозиция"
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr "Режим экспозиции"
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
 msgid "Flash mode"
 msgstr "Режим вспышки"
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
 #, fuzzy
 msgid "Drive mode"
 msgstr "Режим замера"
 
-#: src/minoltamn.cpp:631
-#, fuzzy
-msgid "Exposure Speed"
-msgstr "Режим экспозиции"
-
-#: src/minoltamn.cpp:632
+#: src/minoltamn.cpp:512
 #, fuzzy
-msgid "Exposure speed"
-msgstr "Режим экспозиции"
+msgid "ISO Value"
+msgstr "Чувствительность (ISO)"
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr "Время экспозиции"
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 msgid "FNumber"
 msgstr "Число F"
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 #, fuzzy
 msgid "The F-Number"
 msgstr "Число F"
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 #, fuzzy
 msgid "Macro Mode"
 msgstr "Режим макросъёмки"
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
 #, fuzzy
 msgid "Exposure Compensation"
 msgstr "Тонкомпенсация"
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
 #, fuzzy
 msgid "Bracket Step"
 msgstr "Брекетинг"
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
 #, fuzzy
 msgid "Bracket step"
 msgstr "Брекетинг"
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
 #, fuzzy
 msgid "Interval Length"
 msgstr "Длина изображения"
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
 #, fuzzy
 msgid "Interval length"
 msgstr "Фокусное расстояние"
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
 #, fuzzy
 msgid "Interval Number"
 msgstr "Серийный номер"
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
 #, fuzzy
 msgid "Interval number"
 msgstr "Серийный номер"
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
 #, fuzzy
 msgid "Focus Distance"
 msgstr "Расстояние ручного фокуса"
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
 #, fuzzy
 msgid "Focus distance"
 msgstr "Расстояние ручного фокуса"
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+#, fuzzy
+msgid "Flash Fired"
+msgstr "Вспышка сработала"
+
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+#, fuzzy
+msgid "Flash fired"
+msgstr "Без вспышки"
+
+#: src/minoltamn.cpp:547
+#, fuzzy
 msgid "Minolta Date"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
+#, fuzzy
 msgid "Minolta date"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
+#, fuzzy
 msgid "Minolta Time"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
+#, fuzzy
 msgid "Minolta time"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
+#, fuzzy
 msgid "File Number Memory"
-msgstr ""
+msgstr "Число F"
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
+#, fuzzy
 msgid "File number memory"
-msgstr ""
+msgstr "Имя файла"
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
-msgid "Image Number"
+#: src/minoltamn.cpp:559
+#, fuzzy
+msgid "Last Image Number"
 msgstr "Номер изображения"
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:560
+#, fuzzy
+msgid "Last image number"
+msgstr "Номер снимка"
+
+#: src/minoltamn.cpp:562
 #, fuzzy
 msgid "Color Balance Red"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
 #, fuzzy
 msgid "Color balance red"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
 #, fuzzy
 msgid "Color Balance Green"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
 #, fuzzy
 msgid "Color balance green"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
 #, fuzzy
 msgid "Color Balance Blue"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
 #, fuzzy
 msgid "Color balance blue"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
 #, fuzzy
 msgid "Subject Program"
 msgstr "Область объекта съёмки"
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
 #, fuzzy
 msgid "Subject program"
 msgstr "Область объекта съёмки"
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
 #, fuzzy
-msgid "Flash Exposure Compensation"
-msgstr "Компенсация вспышки ?"
+msgid "ISO Settings"
+msgstr "Настройка резкости"
 
-#: src/minoltamn.cpp:704
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
 #, fuzzy
-msgid "Flash exposure compensation in EV"
-msgstr "Компенсация вспышки ?"
+msgid "ISO setting"
+msgstr "Настройка резкости"
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
 #, fuzzy
 msgid "Minolta Model"
 msgstr "Режим замера"
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
 #, fuzzy
 msgid "Minolta model"
 msgstr "Режим замера"
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
 #, fuzzy
 msgid "Interval Mode"
 msgstr "Intel"
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
 #, fuzzy
 msgid "Interval mode"
 msgstr "Intel"
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
+#, fuzzy
 msgid "Folder Name"
-msgstr ""
+msgstr "Имя владельца"
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
 #, fuzzy
 msgid "Folder name"
 msgstr "Имя владельца"
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
 #, fuzzy
 msgid "ColorMode"
 msgstr "Цвет"
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
 #, fuzzy
 msgid "Color Filter"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
 #, fuzzy
 msgid "Color filter"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
 #, fuzzy
 msgid "Black and White Filter"
 msgstr "Чёрно-белый"
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
 #, fuzzy
 msgid "Black and white filter"
 msgstr "Чёрно-белый"
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
 #, fuzzy
 msgid "Internal Flash"
 msgstr "Встроенная вспышка"
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr "Яркость"
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
+#, fuzzy
 msgid "Spot Focus Point X"
-msgstr ""
+msgstr "Ручная фокусировка"
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
+#, fuzzy
 msgid "Spot focus point X"
-msgstr ""
+msgstr "Ручная фокусировка"
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
+#, fuzzy
 msgid "Spot Focus Point Y"
-msgstr ""
+msgstr "Ручная фокусировка"
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
+#, fuzzy
 msgid "Spot focus point Y"
-msgstr ""
+msgstr "Ручная фокусировка"
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
 #, fuzzy
 msgid "Wide Focus Zone"
 msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
+#, fuzzy
 msgid "Wide focus zone"
-msgstr ""
+msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
 msgid "Focus mode"
 msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
 #, fuzzy
 msgid "Focus area"
 msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
 msgid "DEC Switch Position"
 msgstr ""
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
 msgid "DEC switch position"
 msgstr ""
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
+#, fuzzy
 msgid "Color Profile"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
 #, fuzzy
 msgid "Color profile"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
 msgid "Data Imprint"
 msgstr ""
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
 #, fuzzy
 msgid "Flash Metering"
 msgstr "Внешняя вспышка"
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
 #, fuzzy
 msgid "Flash metering"
 msgstr "Внешняя вспышка"
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
+#, fuzzy
 msgid "Unknown Minolta Camera Settings tag"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
 #, fuzzy
 msgid "Program-shift A"
 msgstr "Программа"
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
 #, fuzzy
 msgid "Program-shift S"
 msgstr "Программа"
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
+#, fuzzy
 msgid "Raw+Jpeg"
-msgstr ""
+msgstr "Размер изображения"
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
+#, fuzzy
 msgid "Kelvin"
-msgstr ""
+msgstr "3000 K"
 
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
 #, fuzzy
 msgid "Single-shot AF"
 msgstr "One-Shot"
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
 #, fuzzy
 msgid "Continuous AF"
 msgstr "Продолжительный ведущий режим"
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
 #, fuzzy
 msgid "Automatic AF"
 msgstr "Автоматический"
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
+#, fuzzy
 msgid "sRGB (Natural)"
-msgstr ""
+msgstr "внешняя"
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
+#, fuzzy
 msgid "sRGB (Natural+)"
-msgstr ""
+msgstr "внешняя"
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr ""
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr ""
 
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
 #, fuzzy
 msgid "AF Points"
 msgstr "Использованная точка AF"
 
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
 #, fuzzy
 msgid "AF points"
 msgstr "Использованная точка AF"
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 #, fuzzy
 msgid "Color space"
 msgstr "Цветовое пространство"
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 msgid "Free Memory Card Images"
 msgstr ""
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 msgid "Free memory card images"
 msgstr ""
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
 msgid "Hue"
 msgstr ""
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
 #, fuzzy
 msgid "Rotation"
 msgstr "Насыщенность"
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+msgid "Image Number"
+msgstr "Номер изображения"
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
 #, fuzzy
 msgid "Noise reduction"
 msgstr "Подавление шума"
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
 msgid "Zone Matching On"
 msgstr ""
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
+#, fuzzy
 msgid "Zone matching on"
-msgstr ""
+msgstr "Тонкомпенсация"
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
+#, fuzzy
 msgid "Unknown Minolta Camera Settings 7D tag"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
-msgstr ""
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+#, fuzzy
+msgid "Program Shift A"
+msgstr "Программа"
+
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+#, fuzzy
+msgid "Program Shift S"
+msgstr "Программа"
+
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+#, fuzzy
+msgid "Night View/Portrait"
+msgstr "Ночной портрет"
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:895
 msgid "200 (Zone Matching High)"
 msgstr ""
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
 msgid "80 (Zone Matching Low)"
 msgstr ""
 
-#: src/minoltamn.cpp:1065
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+#, fuzzy
+msgid "Adobe RGB (ICC)"
+msgstr "Adobe RGB"
+
+#: src/minoltamn.cpp:918
 #, fuzzy
 msgid "Central"
 msgstr "Центральная"
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:919
 msgid "Up"
 msgstr ""
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
 #, fuzzy
 msgid "Up right"
 msgstr "Правая"
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
 #, fuzzy
 msgid "Down right"
 msgstr "Правая"
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
 #, fuzzy
 msgid "Down"
 msgstr "вкл"
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
+#, fuzzy
 msgid "Down left"
-msgstr ""
+msgstr "справа налево"
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
+#, fuzzy
 msgid "Up left"
-msgstr ""
+msgstr "справа налево"
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 #, fuzzy
 msgid "Selection"
 msgstr "Выбор ISO"
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+#, fuzzy
+msgid "Natural+"
+msgstr "внешняя"
+
+#: src/minoltamn.cpp:949
+#, fuzzy
+msgid "Wind Scene"
+msgstr "Ночная съёмка"
+
+#: src/minoltamn.cpp:950
+#, fuzzy
+msgid "Evening Scene"
+msgstr "Вечер"
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
+#, fuzzy
 msgid "Focus Position"
-msgstr ""
+msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
+#, fuzzy
 msgid "Focus position"
-msgstr ""
+msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
 #, fuzzy
 msgid "Focus Area"
 msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
 #, fuzzy
 msgid "Exposure Revision"
 msgstr "Тонкомпенсация"
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
 #, fuzzy
 msgid "Exposure revision"
 msgstr "Тонкомпенсация"
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+#, fuzzy
+msgid "Rotation2"
+msgstr "Насыщенность"
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+#, fuzzy
+msgid "Picture Finish"
+msgstr "Режим захвата"
+
+#: src/minoltamn.cpp:1059
 #, fuzzy
 msgid "Exposure Manual Bias"
 msgstr "Смещение экспозиции"
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
 #, fuzzy
 msgid "Exposure manual bias"
 msgstr "Смещение экспозиции"
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
 #, fuzzy
 msgid "AF Mode"
 msgstr "Способ фокусировки"
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
 #, fuzzy
 msgid "AF mode"
 msgstr "Режим вспышки"
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
+#, fuzzy
 msgid "Unknown Minolta Camera Settings 5D tag"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
-msgid "Single area"
-msgstr ""
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
+#, fuzzy
+msgid "Self-timer 10 sec"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
-msgid "Dynamic area"
-msgstr ""
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
+#, fuzzy
+msgid "Self-timer 2 sec"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
-msgstr ""
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+#, fuzzy
+msgid "White Balance Bracketing Low"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:77
-msgid "Group dynamic"
-msgstr ""
+#: src/minoltamn.cpp:1101
+#, fuzzy
+msgid "White Balance Bracketing High"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr ""
+#: src/minoltamn.cpp:1102
+#, fuzzy
+msgid "Single-frame Bracketing Low"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
-msgstr ""
+#: src/minoltamn.cpp:1103
+#, fuzzy
+msgid "Continous Bracketing Low"
+msgstr "Автобрекетирование"
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
-msgid "Upper-left"
-msgstr ""
+#: src/minoltamn.cpp:1104
+#, fuzzy
+msgid "Single-frame Bracketing High"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
+#: src/minoltamn.cpp:1105
 #, fuzzy
-msgid "Upper-right"
-msgstr "Правая"
+msgid "Continous Bracketing High"
+msgstr "Продолжительный ведущий режим"
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
-msgid "Lower-left"
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
 msgstr ""
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
 #, fuzzy
-msgid "Lower-right"
-msgstr "Правая"
+msgid "Continuous Bracketing"
+msgstr "Продолжительный ведущий режим"
 
-#: src/nikonmn.cpp:96
+#: src/minoltamn.cpp:1152
 #, fuzzy
-msgid "Left-most"
-msgstr "Левая"
+msgid "Single-Frame Bracketing"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:97
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
 #, fuzzy
-msgid "Right-most"
-msgstr "Ночной портрет"
+msgid "White Balance Bracketing"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
-msgstr "sRGB"
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
+msgid "Preset"
+msgstr "Пресет"
 
-#: src/nikonmn.cpp:131
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
 #, fuzzy
-msgid "Fire, manual"
-msgstr "Ручная"
+msgid "Color Temperature/Color Filter"
+msgstr "Температура цвета"
 
-#: src/nikonmn.cpp:132
-#, fuzzy
-msgid "Fire, external"
-msgstr "Внешняя вспышка"
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
+msgid "Temperature"
+msgstr "Температура"
 
-#: src/nikonmn.cpp:133
-msgid "Fire, commander mode"
-msgstr ""
+#: src/minoltamn.cpp:1209
+#, fuzzy
+msgid "Setup"
+msgstr "Установить"
 
-#: src/nikonmn.cpp:134
-msgid "Fire, TTL mode"
+#: src/minoltamn.cpp:1210
+msgid "Recall"
 msgstr ""
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
 msgstr ""
 
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
-msgid "PC control"
+#: src/minoltamn.cpp:1216
+msgid "Error"
 msgstr ""
 
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
+#: src/minoltamn.cpp:1228
 #, fuzzy
-msgid "Exposure bracketing"
-msgstr "Брекетинг"
+msgid "Image and Information"
+msgstr "Планарная конфигурация"
 
-#: src/nikonmn.cpp:143
+#: src/minoltamn.cpp:1229
 #, fuzzy
-msgid "Auto ISO"
-msgstr "Авто"
+msgid "Image Only"
+msgstr "Тип изображения"
 
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
+#: src/minoltamn.cpp:1230
 #, fuzzy
-msgid "White balance bracketing"
-msgstr "Настройка баланса белого"
-
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
-msgid "IR control"
-msgstr ""
-
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
-msgstr ""
+msgid "Image and Histogram"
+msgstr "Длина изображения"
 
-#: src/nikonmn.cpp:162
+#: src/minoltamn.cpp:1236
 #, fuzzy
-msgid "Auto release"
-msgstr "Автобрекетирование"
+msgid "Fill Flash"
+msgstr "Заполняющая вспышка"
 
-#: src/nikonmn.cpp:163
+#: src/minoltamn.cpp:1247
 #, fuzzy
-msgid "Manual release"
-msgstr "Ручная экспозиция"
+msgid "Focus Hold"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:168
+#: src/minoltamn.cpp:1248
 #, fuzzy
-msgid "Lossy (type 1)"
-msgstr "Тип объектива"
-
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
-msgstr "Несжатый"
+msgid "DOF Preview"
+msgstr "Данные эскиза"
 
-#: src/nikonmn.cpp:170
-msgid "Lossless"
+#: src/minoltamn.cpp:1253
+msgid "Hold"
 msgstr ""
 
-#: src/nikonmn.cpp:171
+#: src/minoltamn.cpp:1254
 #, fuzzy
-msgid "Lossy (type 2)"
-msgstr "Тип объектива"
+msgid "Toggle"
+msgstr "Ничего"
 
-#: src/nikonmn.cpp:177
+#: src/minoltamn.cpp:1255
 #, fuzzy
-msgid "B & W"
-msgstr "Ч/Б"
+msgid "Spot Hold"
+msgstr "Режим замера"
 
-#: src/nikonmn.cpp:179
+#: src/minoltamn.cpp:1256
 #, fuzzy
-msgid "Trim"
-msgstr "Время отправки"
+msgid "Spot Toggle"
+msgstr "Режим замера"
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+msgid "Shutter Speed"
+msgstr "Скорость срабатывания затвора"
+
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:181
-msgid "D-Lighting"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
 msgstr ""
 
-#: src/nikonmn.cpp:182
-msgid "Red eye"
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
 msgstr ""
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
-#, fuzzy
-msgid "Cyanotype"
-msgstr "тип"
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
+msgstr ""
 
-#: src/nikonmn.cpp:184
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
 #, fuzzy
-msgid "Sky light"
-msgstr "Дневной свет"
+msgid "Automatic"
+msgstr "Автоматический"
 
-#: src/nikonmn.cpp:185
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
 #, fuzzy
-msgid "Warm tone"
-msgstr "Цветовое пространство"
+msgid "Auto-rotate"
+msgstr "Автоматический контраст"
 
-#: src/nikonmn.cpp:186
-#, fuzzy
-msgid "Color custom"
-msgstr "Цветовое пространство"
+#: src/minoltamn.cpp:1287
+msgid "Horizontal"
+msgstr ""
 
-#: src/nikonmn.cpp:187
+#: src/minoltamn.cpp:1293
 #, fuzzy
-msgid "Image overlay"
-msgstr "Тип изображения"
+msgid "Manual Rotate"
+msgstr "Ручная экспозиция"
 
-#: src/nikonmn.cpp:193
+#: src/minoltamn.cpp:1298
 #, fuzzy
-msgid "Minimal"
-msgstr "Ручная"
+msgid "Within Range"
+msgstr "Фокусный диапазон"
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
+#: src/minoltamn.cpp:1299
 #, fuzzy
-msgid "Nikon Makernote version"
-msgstr "Версия прошивки"
+msgid "Under/Over Range"
+msgstr "Область передачи"
 
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
-#, fuzzy
-msgid "ISO Speed"
-msgstr "Скорость ISO"
+#: src/minoltamn.cpp:1300
+msgid "Out of Range"
+msgstr ""
 
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
+#: src/minoltamn.cpp:1305
 #, fuzzy
-msgid "Sharpening"
-msgstr "Резкость изображения"
+msgid "Not Indicated"
+msgstr "Не определено"
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
+#: src/minoltamn.cpp:1306
 #, fuzzy
-msgid "Image sharpening setting"
-msgstr "Резкость изображения"
-
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
-msgid "Focus"
-msgstr "Фокус"
-
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
-msgid "Flash Setting"
-msgstr ""
+msgid "Under Scale"
+msgstr "Подводная съемка"
 
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
+#: src/minoltamn.cpp:1307
 #, fuzzy
-msgid "Flash setting"
-msgstr "Вспышка сработала"
+msgid "Bottom of Scale"
+msgstr "снизу вверх"
 
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
-#, fuzzy
-msgid "ISO Selection"
-msgstr "Выбор ISO"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
+msgstr ""
 
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
+#: src/minoltamn.cpp:1326
 #, fuzzy
-msgid "ISO selection"
-msgstr "Выбор ISO"
+msgid "Over Scale"
+msgstr "По умолчанию"
 
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data Dump"
+#: src/minoltamn.cpp:1331
+msgid "AM"
 msgstr ""
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data dump"
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
 msgstr ""
 
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
-msgid "Image Adjustment"
-msgstr "Коррекция изображения"
+#: src/minoltamn.cpp:1338
+msgid "Built-in"
+msgstr ""
 
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
 #, fuzzy
-msgid "Image adjustment setting"
-msgstr "Подстройка изображения"
+msgid "Very Low"
+msgstr "Низкий"
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
-msgid "Auxiliary Lens"
-msgstr ""
+#: src/minoltamn.cpp:1346
+#, fuzzy
+msgid "Half Full"
+msgstr "Полный"
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
 msgstr ""
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
+#: src/minoltamn.cpp:1355
 #, fuzzy
-msgid "Manual focus distance"
-msgstr "Расстояние ручного фокуса"
+msgid "Exposure Compensation Setting"
+msgstr "Тонкомпенсация"
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
+#: src/minoltamn.cpp:1356
 #, fuzzy
-msgid "Digital zoom setting"
-msgstr "Цифровой трансфокатор"
+msgid "Exposure compensation setting"
+msgstr "Компенсация экспозиции"
 
-#: src/nikonmn.cpp:246
-msgid "AF Focus Position"
-msgstr ""
+#: src/minoltamn.cpp:1358
+#, fuzzy
+msgid "High Speed Sync"
+msgstr "Ночная съёмка"
 
-#: src/nikonmn.cpp:247
-msgid "AF focus position information"
-msgstr ""
+#: src/minoltamn.cpp:1359
+#, fuzzy
+msgid "High speed sync"
+msgstr "Ночная съёмка"
 
-#: src/nikonmn.cpp:252
-msgid "Unknown Nikon1MakerNote tag"
-msgstr ""
+#: src/minoltamn.cpp:1361
+#, fuzzy
+msgid "Manual Exposure Time"
+msgstr "Ручная экспозиция"
 
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
+#: src/minoltamn.cpp:1362
 #, fuzzy
-msgid "Continuous autofocus"
-msgstr "Продолжительный ведущий режим"
+msgid "Manual exposure time"
+msgstr "Ручная экспозиция"
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
-msgstr ""
-
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
 #, fuzzy
-msgid "Not used"
-msgstr "Не определено"
-
-#: src/nikonmn.cpp:353
-msgid "guess"
-msgstr ""
-
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
-msgstr "VGA Basic"
-
-#: src/nikonmn.cpp:401
-msgid "VGA Normal"
-msgstr "VGA Normal"
+msgid "Manual FNumber"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:402
-msgid "VGA Fine"
-msgstr "VGA Fine"
+#: src/minoltamn.cpp:1373
+#, fuzzy
+msgid "Drive Mode 2"
+msgstr "Режим замера"
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
-msgstr "SXGA Basic"
+#: src/minoltamn.cpp:1374
+#, fuzzy
+msgid "Drive mode 2"
+msgstr "Режим замера"
 
-#: src/nikonmn.cpp:404
-msgid "SXGA Normal"
-msgstr "SXGA Normal"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
+msgstr ""
 
-#: src/nikonmn.cpp:405
-msgid "SXGA Fine"
-msgstr "SXGA Fine"
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
+#, fuzzy
+msgid "AF Area Mode"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
-msgid "Monochrome"
-msgstr "Монохромный"
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
+#, fuzzy
+msgid "FlashMode"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:417
-msgid "Bright+"
-msgstr "Яркость+"
+#: src/minoltamn.cpp:1391
+#, fuzzy
+msgid "Flash Exposure Comp Setting"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:418
-msgid "Bright-"
-msgstr "Яркость-"
+#: src/minoltamn.cpp:1392
+#, fuzzy
+msgid "Flash exposure compensation setting"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:419
-msgid "Contrast+"
-msgstr "Контраст+"
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
+#, fuzzy
+msgid "ISO Setting"
+msgstr "Настройка резкости"
 
-#: src/nikonmn.cpp:420
-msgid "Contrast-"
-msgstr "Контраст-"
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
+#, fuzzy
+msgid "Zone Matching Mode"
+msgstr "Подавление шума"
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
-msgstr "Пресет"
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
+#, fuzzy
+msgid "Dynamic Range Optimizer Mode"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
-msgstr ""
+#: src/minoltamn.cpp:1404
+#, fuzzy
+msgid "Dynamic range optimizer mode"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:479
-msgid "Unknown Nikon2MakerNote tag"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
 msgstr ""
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
+#: src/minoltamn.cpp:1430
 #, fuzzy
-msgid "Flash Device"
-msgstr "Вспышка сработала"
+msgid "Self Timer Time"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
+#: src/minoltamn.cpp:1431
 #, fuzzy
-msgid "Flash device"
-msgstr "Режим вспышки"
+msgid "Self timer time"
+msgstr "Серийный номер"
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
+#: src/minoltamn.cpp:1434
 #, fuzzy
-msgid "White Balance Bias"
-msgstr "Баланс белого"
+msgid "Continuous bracketing"
+msgstr "Продолжительный ведущий режим"
 
-#: src/nikonmn.cpp:522
+#: src/minoltamn.cpp:1436
 #, fuzzy
-msgid "White balance bias"
-msgstr "Баланс белого"
+msgid "Single Frame Bracketing"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1437
 #, fuzzy
-msgid "WB RB Levels"
-msgstr "Заряд батареи"
+msgid "Single frame bracketing"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
-msgid "WB RB levels"
-msgstr ""
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
+#, fuzzy
+msgid "White balance bracketing"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:524
+#: src/minoltamn.cpp:1442
 #, fuzzy
-msgid "Program Shift"
-msgstr "Программа"
+msgid "White Balance Setting"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:524
+#: src/minoltamn.cpp:1445
 #, fuzzy
-msgid "Program shift"
-msgstr "Программа"
+msgid "Preset White Balance"
+msgstr "Баланс белого"
 
-#: src/nikonmn.cpp:525
+#: src/minoltamn.cpp:1446
 #, fuzzy
-msgid "Exposure Difference"
-msgstr "Время экспозиции"
+msgid "Preset white balance"
+msgstr "Автомат. баланс белого"
 
-#: src/nikonmn.cpp:525
+#: src/minoltamn.cpp:1448
 #, fuzzy
-msgid "Exposure difference"
-msgstr "Режим экспозиции"
+msgid "Color Temperature Setting"
+msgstr "Температура цвета"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
-msgstr ""
+#: src/minoltamn.cpp:1449
+#, fuzzy
+msgid "Color temperature setting"
+msgstr "Температура цвета"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
-msgstr ""
+#: src/minoltamn.cpp:1451
+#, fuzzy
+msgid "Custom WB Setting"
+msgstr "Свой 1"
 
-#: src/nikonmn.cpp:529
+#: src/minoltamn.cpp:1452
 #, fuzzy
-msgid "Flash Comp"
-msgstr "Режим вспышки"
+msgid "Custom WB setting"
+msgstr "Свой 1"
 
-#: src/nikonmn.cpp:529
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
 #, fuzzy
-msgid "Flash compensation setting"
-msgstr "Компенсация вспышки ?"
+msgid "Dynamic Range Optimizer Settings"
+msgstr "Настройка баланса белого"
 
-#: src/nikonmn.cpp:530
+#: src/minoltamn.cpp:1460
 #, fuzzy
-msgid "ISO Settings"
-msgstr "Настройка резкости"
+msgid "Custom WB Red Level"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:530
-msgid "ISO setting"
-msgstr ""
+#: src/minoltamn.cpp:1461
+#, fuzzy
+msgid "Custom WB red level"
+msgstr "Под уровнем моря"
 
-#: src/nikonmn.cpp:531
+#: src/minoltamn.cpp:1463
 #, fuzzy
-msgid "Image Boundary"
-msgstr "Номер изображения"
+msgid "Custom WB Green Level"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:531
+#: src/minoltamn.cpp:1464
 #, fuzzy
-msgid "Image boundary"
-msgstr "Номер изображения"
+msgid "Custom WB green level"
+msgstr "Под уровнем моря"
 
-#: src/nikonmn.cpp:533
-msgid "Flash Bracket Comp"
-msgstr ""
+#: src/minoltamn.cpp:1466
+#, fuzzy
+msgid "Custom WB Blue Level"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:533
+#: src/minoltamn.cpp:1467
 #, fuzzy
-msgid "Flash bracket compensation applied"
-msgstr "Компенсация вспышки ?"
+msgid "CustomWB blue level"
+msgstr "Под уровнем моря"
 
-#: src/nikonmn.cpp:534
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
 #, fuzzy
-msgid "Exposure Bracket Comp"
-msgstr "Время экспозиции"
+msgid "Custom WB Error"
+msgstr "Свой 1"
 
-#: src/nikonmn.cpp:534
+#: src/minoltamn.cpp:1473
 #, fuzzy
-msgid "AE bracket compensation applied"
-msgstr "Тонкомпенсация"
+msgid "White balance fine tune"
+msgstr "Точная подстройка баланса белого"
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
+#: src/minoltamn.cpp:1479
 #, fuzzy
-msgid "Image Processing"
-msgstr "Резкость изображения"
+msgid "Color compensation filter"
+msgstr "Тонкомпенсация"
 
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
 #, fuzzy
-msgid "Image processing"
-msgstr "Резкость изображения"
+msgid "Sony Image Size"
+msgstr "Размер изображения"
 
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
 msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
 msgstr ""
 
-#: src/nikonmn.cpp:539
-#, fuzzy
-msgid "VR Info"
-msgstr "Инфо"
-
-#: src/nikonmn.cpp:539
-#, fuzzy
-msgid "VR info"
-msgstr "Инфо"
-
-#: src/nikonmn.cpp:540
-#, fuzzy
-msgid "Image Authentication"
-msgstr "Ориентация изображения"
-
-#: src/nikonmn.cpp:540
-#, fuzzy
-msgid "Image authentication"
-msgstr "Ориентация изображения"
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
+msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
 msgstr ""
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
 msgstr ""
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1497
 #, fuzzy
-msgid "Picture Control"
-msgstr "Режим захвата"
+msgid "Eye start AF"
+msgstr "One-Shot"
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1499
 #, fuzzy
-msgid " Picture control"
-msgstr "Режим захвата"
+msgid "Red Eye Reduction"
+msgstr "Подавление эффекта красных глаз"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1500
 #, fuzzy
-msgid "World Time"
-msgstr "Время экспозиции"
+msgid "Red eye reduction"
+msgstr "Подавление эффекта красных глаз"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1502
 #, fuzzy
-msgid "World time"
-msgstr "Время экспозиции"
+msgid "Flash Default"
+msgstr "Вспышка сработала"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1503
 #, fuzzy
-msgid "ISO Info"
-msgstr "О снимке"
+msgid "Flash default"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1505
 #, fuzzy
-msgid "ISO info"
-msgstr "Настройка резкости"
+msgid "Auto Bracket Order"
+msgstr "Автобрекетирование"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1506
 #, fuzzy
-msgid "Vignette Control"
-msgstr "Пульт Д/У?"
+msgid "Auto bracket order"
+msgstr "Автобрекетирование"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1508
 #, fuzzy
-msgid "Vignette control"
-msgstr "Белая точка"
-
-#: src/nikonmn.cpp:547
-msgid "Tone Compensation"
-msgstr "Тонкомпенсация"
-
-#: src/nikonmn.cpp:547
-msgid "Tone compensation"
-msgstr "Тонкомпенсация"
+msgid "Focus Hold Button"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:553
+#: src/minoltamn.cpp:1509
 #, fuzzy
-msgid "Mode of flash used"
-msgstr "Вспышка сработала"
+msgid "Focus hold button"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1511
 #, fuzzy
-msgid "AF Info"
+msgid "AEL Button"
 msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1512
 #, fuzzy
-msgid "AF info"
+msgid "AEL button"
 msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
-msgid "Shooting Mode"
-msgstr "Режим съемки"
-
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
-msgid "Shooting mode"
-msgstr "Режим съемки"
-
-#: src/nikonmn.cpp:556
+#: src/minoltamn.cpp:1514
 #, fuzzy
-msgid "Auto Bracket Release"
-msgstr "Автобрекетирование"
+msgid "Control Dial Set"
+msgstr "Настройка контраста"
 
-#: src/nikonmn.cpp:556
+#: src/minoltamn.cpp:1515
 #, fuzzy
-msgid "Auto bracket release"
-msgstr "Автобрекетирование"
+msgid "Control dial set"
+msgstr "Контраст"
 
-#: src/nikonmn.cpp:557
+#: src/minoltamn.cpp:1517
 #, fuzzy
-msgid "Lens FStops"
-msgstr "Тип объектива"
+msgid "Exposure Compensation Mode"
+msgstr "Тонкомпенсация"
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1518
 #, fuzzy
-msgid "Contrast Curve"
-msgstr "Контраст"
+msgid "Exposure compensation mode"
+msgstr "Компенсация экспозиции"
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1521
 #, fuzzy
-msgid "Contrast curve"
-msgstr "Контраст"
+msgid "AF assist"
+msgstr "Тип сцены"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1523
 #, fuzzy
-msgid "Color Hue"
-msgstr "Цветовое пространство"
+msgid "Card Shutter Lock"
+msgstr "Скорость срабатывания затвора"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1524
 #, fuzzy
-msgid "Color hue"
-msgstr "Цветовое пространство"
+msgid "Card shutter lock"
+msgstr "Скорость срабатывания затвора"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
+#: src/minoltamn.cpp:1526
 #, fuzzy
-msgid "Scene Mode"
-msgstr "Тип сцены"
+msgid "Lens Shutter Lock"
+msgstr "Скорость срабатывания затвора"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
+#: src/minoltamn.cpp:1527
 #, fuzzy
-msgid "Scene mode"
-msgstr "Тип сцены"
-
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
-msgstr "Источник света"
+msgid "Lens shutter lock"
+msgstr "Скорость срабатывания затвора"
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
-msgid "Light source"
-msgstr "Источник света"
+#: src/minoltamn.cpp:1529
+msgid "AF Area Illumination"
+msgstr ""
 
-#: src/nikonmn.cpp:562
+#: src/minoltamn.cpp:1530
 #, fuzzy
-msgid "Shot info"
-msgstr "О снимке"
+msgid "AF area illumination"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue Adjustment"
-msgstr "Подстройка оттенка"
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
+msgstr ""
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue adjustment"
-msgstr "Коррекция тона"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
+msgstr ""
 
-#: src/nikonmn.cpp:564
-#, fuzzy
-msgid "NEF Compression"
-msgstr "Сжатие"
+#: src/minoltamn.cpp:1535
+msgid "Record Display"
+msgstr ""
 
-#: src/nikonmn.cpp:564
-#, fuzzy
-msgid "NEF compression"
-msgstr "Сжатие"
+#: src/minoltamn.cpp:1536
+msgid "Record display"
+msgstr ""
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
-#, fuzzy
-msgid "Linearization Table"
-msgstr "Дата оцифровки"
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
+msgstr ""
 
-#: src/nikonmn.cpp:567
-#, fuzzy
-msgid "Linearization table"
-msgstr "Дата оцифровки"
+#: src/minoltamn.cpp:1539
+msgid "Play display"
+msgstr ""
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1541
 #, fuzzy
-msgid "Color Balance"
-msgstr "Цветовое пространство"
+msgid "Exposure Indicator"
+msgstr "Режим экспозиции"
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1542
 #, fuzzy
-msgid "Color balance"
-msgstr "Цветовое пространство"
+msgid "Exposure indicator"
+msgstr "Смещение экспозиции"
 
-#: src/nikonmn.cpp:569
-msgid "Lens Data"
-msgstr "Данные объектива"
+#: src/minoltamn.cpp:1544
+#, fuzzy
+msgid "AEL Exposure Indicator"
+msgstr "Режим экспозиции"
 
-#: src/nikonmn.cpp:569
-msgid "Lens data settings"
-msgstr "Параметры объектива"
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:570
+#: src/minoltamn.cpp:1547
 #, fuzzy
-msgid "Raw Image Center"
-msgstr "Номер изображения"
+msgid "Exposure Bracketing Indicator Last"
+msgstr "Брекетинг"
 
-#: src/nikonmn.cpp:570
-#, fuzzy
-msgid "Raw image center"
-msgstr "Версия эскиза"
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
 msgstr ""
 
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
 msgstr ""
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:1553
 #, fuzzy
-msgid "Scene Assist"
-msgstr "Тип сцены"
+msgid "Flash Exposure Indicator"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:1554
 #, fuzzy
-msgid "Scene assist"
-msgstr "Тип сцены"
+msgid "Flash exposure indicator"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch History"
-msgstr ""
+#: src/minoltamn.cpp:1556
+#, fuzzy
+msgid "Flash Exposure Indicator Next"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:576
+#: src/minoltamn.cpp:1559
 #, fuzzy
-msgid "Serial NO"
-msgstr "Серийный номер"
+msgid "Flash Exposure Indicator Last"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
 msgstr ""
 
-#: src/nikonmn.cpp:577
+#: src/minoltamn.cpp:1565
 #, fuzzy
-msgid "Image Data Size"
-msgstr "Размер изображения"
+msgid "Focus Mode Switch"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:577
+#: src/minoltamn.cpp:1566
 #, fuzzy
-msgid "Image data size"
-msgstr "Размер изображения"
+msgid "Focus mode switch"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:579
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
 #, fuzzy
-msgid "Image Count"
-msgstr "Номер изображения"
+msgid "Flash Type"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:579
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
 #, fuzzy
-msgid "Image count"
-msgstr "Номер изображения"
+msgid "Flash type"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
 #, fuzzy
-msgid "Deleted Image Count"
-msgstr "Номер изображения"
+msgid "AE Lock"
+msgstr "Фиксация экспозиции"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
-#, fuzzy
-msgid "Deleted image count"
-msgstr "Номер изображения"
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
+msgstr ""
+
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
+#: src/minoltamn.cpp:1584
 #, fuzzy
-msgid "Shutter Count"
-msgstr "Выдержка"
+msgid "Battery level"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
-msgstr ""
+#: src/minoltamn.cpp:1588
+#, fuzzy
+msgid "Unknown Sony Camera Settings A100 tag"
+msgstr "Настройка контраста"
 
-#: src/nikonmn.cpp:582
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
 #, fuzzy
-msgid "Flash info"
-msgstr "Вспышка"
+msgid "Clear"
+msgstr "Категория"
 
-#: src/nikonmn.cpp:583
-msgid "Image Optimization"
-msgstr "Оптимизация изображения"
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
+#, fuzzy
+msgid "Deep"
+msgstr "Центральный"
 
-#: src/nikonmn.cpp:583
-msgid "Image optimization"
-msgstr "Оптимизация изображения"
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
+#, fuzzy
+msgid "Light"
+msgstr "Ночной портрет"
 
-#: src/nikonmn.cpp:585
-msgid "Program Variation"
-msgstr ""
+#: src/minoltamn.cpp:1897
+#, fuzzy
+msgid "Night View"
+msgstr "Ночная съёмка"
 
-#: src/nikonmn.cpp:585
-msgid "Program variation"
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
 msgstr ""
 
-#: src/nikonmn.cpp:587
-#, fuzzy
-msgid "AF Response"
-msgstr "Использованная точка AF"
-
-#: src/nikonmn.cpp:587
+#: src/minoltamn.cpp:1937
 #, fuzzy
-msgid "AF response"
-msgstr "Использованная точка AF"
+msgid "Local"
+msgstr "Местоположение объекта съёмки"
 
-#: src/nikonmn.cpp:588
+#: src/minoltamn.cpp:1952
 #, fuzzy
-msgid "Multi exposure"
-msgstr "Режим экспозиции"
+msgid "Top-Right"
+msgstr "Авторские и смежные права"
 
-#: src/nikonmn.cpp:589
+#: src/minoltamn.cpp:1954
 #, fuzzy
-msgid "High ISO Noise Reduction"
-msgstr "Подавление шума"
+msgid "Bottom-Right"
+msgstr "слева направо"
 
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
+#: src/minoltamn.cpp:1956
 #, fuzzy
-msgid "Toning effect"
-msgstr "Цветовое пространство"
+msgid "Bottom-Left"
+msgstr "снизу вверх"
 
-#: src/nikonmn.cpp:591
+#: src/minoltamn.cpp:1958
 #, fuzzy
-msgid "AF info 2"
-msgstr "Способ фокусировки"
+msgid "Top-Left"
+msgstr "справа налево"
 
-#: src/nikonmn.cpp:592
+#: src/minoltamn.cpp:1959
 #, fuzzy
-msgid "File info"
-msgstr "Имя файла"
+msgid "Far-Right"
+msgstr "Авторские права"
 
-#: src/nikonmn.cpp:595
+#: src/minoltamn.cpp:1960
 #, fuzzy
-msgid "Capture Data"
-msgstr "Режим захвата"
+msgid "Far-Left"
+msgstr "справа налево"
 
-#: src/nikonmn.cpp:595
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
 #, fuzzy
-msgid "Capture data"
-msgstr "Режим захвата"
+msgid "Advanced Auto"
+msgstr "Функция передачи"
 
-#: src/nikonmn.cpp:596
+#: src/minoltamn.cpp:1975
 #, fuzzy
-msgid "Capture Version"
-msgstr "Режим захвата"
+msgid "Advanced Level"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:596
-#, fuzzy
-msgid "Capture version"
-msgstr "Версия прошивки"
+#: src/minoltamn.cpp:1988
+msgid "AF"
+msgstr ""
 
-#: src/nikonmn.cpp:598
+#: src/minoltamn.cpp:1989
 #, fuzzy
-msgid "Capture Offsets"
-msgstr "Режим захвата"
+msgid "Release"
+msgstr "Дата пубикации"
 
-#: src/nikonmn.cpp:598
+#: src/minoltamn.cpp:2001
 #, fuzzy
-msgid "Capture offsets"
-msgstr "Режим захвата"
+msgid "RAW "
+msgstr "RAW"
 
-#: src/nikonmn.cpp:599
+#: src/minoltamn.cpp:2002
 #, fuzzy
-msgid "Scan IFD"
-msgstr "ID камеры"
+msgid "CRAW "
+msgstr "RAW"
 
-#: src/nikonmn.cpp:600
+#: src/minoltamn.cpp:2005
 #, fuzzy
-msgid "ICC profile"
-msgstr "Цветовое пространство"
+msgid "RAW+JPEG"
+msgstr "JPEG"
 
-#: src/nikonmn.cpp:601
+#: src/minoltamn.cpp:2006
 #, fuzzy
-msgid "Capture output"
-msgstr "Режим захвата"
+msgid "CRAW+JPEG"
+msgstr "JPEG"
 
-#: src/nikonmn.cpp:603
-msgid "Unknown Nikon3MakerNote tag"
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
 msgstr ""
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
-msgstr "Нет"
+#: src/minoltamn.cpp:2063
+#, fuzzy
+msgid "Compressed Raw"
+msgstr "Уровень сжатия"
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
-msgid "Yes"
-msgstr "Да"
+#: src/minoltamn.cpp:2064
+#, fuzzy
+msgid "Compressed Raw + JPEG"
+msgstr "Сжатых битов на пиксел"
 
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-#, fuzzy
-msgid "Vibration Reduction"
-msgstr "Без коррекции"
-
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-#, fuzzy
-msgid "Vibration reduction"
-msgstr "Без коррекции"
-
-#: src/nikonmn.cpp:635
-msgid "Unknown Nikon Vibration Reduction Tag"
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
 msgstr ""
 
-#: src/nikonmn.cpp:645
+#: src/minoltamn.cpp:2110
 #, fuzzy
-msgid "Default Settings"
+msgid "ISO Setting Used"
 msgstr "Настройка резкости"
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
-#, fuzzy
-msgid "Quick Adjust"
-msgstr "Подстройка оттенка"
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
+msgid "High Key"
+msgstr "Высокий ключ"
+
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
+msgstr "Низкий ключ"
 
-#: src/nikonmn.cpp:647
+#: src/nikonmn.cpp:80
 #, fuzzy
-msgid "Full Control"
-msgstr "Режим захвата"
+msgid "Extra High"
+msgstr "Авторские и смежные права"
 
-#: src/nikonmn.cpp:668
-msgid "Blue-green"
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
+msgid "Single area"
 msgstr ""
 
-#: src/nikonmn.cpp:670
-msgid "Purple-blue"
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
+msgid "Dynamic area"
 msgstr ""
 
-#: src/nikonmn.cpp:671
-msgid "Red-purple"
+#: src/nikonmn.cpp:88
+msgid "Dynamic area, closest subject"
 msgstr ""
 
-#: src/nikonmn.cpp:678
-#, fuzzy
-msgid "Name"
-msgstr "Имя владельца"
+#: src/nikonmn.cpp:89
+msgid "Group dynamic"
+msgstr ""
 
-#: src/nikonmn.cpp:679
-msgid "Base"
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
+msgstr ""
+
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
+msgid "Dynamic area (wide)"
 msgstr ""
 
-#: src/nikonmn.cpp:680
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
 #, fuzzy
-msgid "Adjust"
-msgstr "Коррекция"
+msgid "Upper-left"
+msgstr "Правая"
 
-#: src/nikonmn.cpp:681
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
 #, fuzzy
-msgid "Quick adjust"
-msgstr "Коррекция тона"
+msgid "Upper-right"
+msgstr "Правая"
 
-#: src/nikonmn.cpp:687
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
 #, fuzzy
-msgid "Filter effect"
-msgstr "Цветовой эффект"
+msgid "Lower-left"
+msgstr "Правая"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
 #, fuzzy
-msgid "Toning Saturation"
-msgstr "Насыщенность"
+msgid "Lower-right"
+msgstr "Правая"
 
-#: src/nikonmn.cpp:689
+#: src/nikonmn.cpp:108
 #, fuzzy
-msgid "Toning saturation"
-msgstr "Насыщенность"
+msgid "Left-most"
+msgstr "Левая"
 
-#: src/nikonmn.cpp:691
+#: src/nikonmn.cpp:109
 #, fuzzy
-msgid "Unknown Nikon Picture Control Tag"
-msgstr "Неизвестный тэг"
-
-#: src/nikonmn.cpp:701
-#, fuzzy
-msgid "Timezone"
-msgstr "Ничего"
-
-#: src/nikonmn.cpp:702
-#, fuzzy
-msgid "Daylight Savings"
-msgstr "Дневной свет"
+msgid "Right-most"
+msgstr "Ночной портрет"
 
-#: src/nikonmn.cpp:702
+#: src/nikonmn.cpp:143
 #, fuzzy
-msgid "Daylight savings"
-msgstr "Дневной свет"
+msgid "Fire, manual"
+msgstr "Ручная"
 
-#: src/nikonmn.cpp:703
+#: src/nikonmn.cpp:144
 #, fuzzy
-msgid "Date Display Format"
-msgstr "Формат файла"
+msgid "Fire, external"
+msgstr "Внешняя вспышка"
 
-#: src/nikonmn.cpp:703
-msgid "Date display format"
+#: src/nikonmn.cpp:145
+msgid "Fire, commander mode"
 msgstr ""
 
-#: src/nikonmn.cpp:705
+#: src/nikonmn.cpp:146
 #, fuzzy
-msgid "Unknown Nikon World Time Tag"
-msgstr "Неизвестный панорамный тэг Canon"
-
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
-msgstr ""
-
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
-msgstr ""
-
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
-msgstr ""
+msgid "Fire, TTL mode"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:719
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
 #, fuzzy
-msgid "Hi 1.0"
-msgstr "HV10"
-
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
-msgstr ""
-
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
-msgstr ""
-
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
-msgstr ""
+msgid "Delay"
+msgstr "Удалить"
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
-msgstr ""
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
+#, fuzzy
+msgid "PC control"
+msgstr "Режим захвата"
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
-msgstr ""
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
+#, fuzzy
+msgid "Exposure bracketing"
+msgstr "Брекетинг"
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
-msgstr ""
+#: src/nikonmn.cpp:155
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Авто"
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
-msgstr ""
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
+#, fuzzy
+msgid "IR control"
+msgstr "Пульт Д/У?"
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
 msgstr ""
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:174
 #, fuzzy
-msgid "ISO Expansion"
-msgstr "Выбор ISO"
+msgid "Auto release"
+msgstr "Автобрекетирование"
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:175
 #, fuzzy
-msgid "ISO expansion"
-msgstr "Выбор ISO"
+msgid "Manual release"
+msgstr "Ручная экспозиция"
 
-#: src/nikonmn.cpp:734
+#: src/nikonmn.cpp:180
 #, fuzzy
-msgid "ISO 2"
-msgstr "О снимке"
+msgid "Lossy (type 1)"
+msgstr "Тип объектива"
 
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
-msgstr ""
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+msgid "Uncompressed"
+msgstr "Несжатый"
 
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
+#: src/nikonmn.cpp:182
+msgid "Lossless"
 msgstr ""
 
-#: src/nikonmn.cpp:737
+#: src/nikonmn.cpp:183
 #, fuzzy
-msgid "Unknown Nikon Iso Info Tag"
-msgstr "Неизвестный тэг"
+msgid "Lossy (type 2)"
+msgstr "Тип объектива"
 
-#: src/nikonmn.cpp:747
+#: src/nikonmn.cpp:189
 #, fuzzy
-msgid "Single Area"
-msgstr "One-Shot"
+msgid "B & W"
+msgstr "Ч/Б"
 
-#: src/nikonmn.cpp:748
+#: src/nikonmn.cpp:191
 #, fuzzy
-msgid "Dynamic Area"
-msgstr "Динамический диапазон"
-
-#: src/nikonmn.cpp:749
-msgid "Dynamic Area, Closest Subject"
-msgstr ""
-
-#: src/nikonmn.cpp:750
-msgid "Group Dynamic"
-msgstr ""
+msgid "Trim"
+msgstr "Время отправки"
 
-#: src/nikonmn.cpp:751
+#: src/nikonmn.cpp:192
 #, fuzzy
-msgid "Single Area (wide)"
-msgstr "Серийный номер"
+msgid "Small picture"
+msgstr "Кино"
 
-#: src/nikonmn.cpp:752
+#: src/nikonmn.cpp:193
 #, fuzzy
-msgid "Dynamic Area (wide)"
-msgstr "Динамический диапазон"
+msgid "D-Lighting"
+msgstr "Дневной свет"
 
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
+#: src/nikonmn.cpp:194
 #, fuzzy
-msgid "Mid-left"
-msgstr "Левая"
+msgid "Red eye"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
 #, fuzzy
-msgid "Mid-right"
-msgstr "слева направо"
+msgid "Cyanotype"
+msgstr "тип"
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
+#: src/nikonmn.cpp:196
 #, fuzzy
-msgid "Far Left"
-msgstr "справа налево"
+msgid "Sky light"
+msgstr "Дневной свет"
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
+#: src/nikonmn.cpp:197
 #, fuzzy
-msgid "Far Right"
-msgstr "Авторские права"
+msgid "Warm tone"
+msgstr "Цветовое пространство"
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:198
 #, fuzzy
-msgid "AF Area Mode"
-msgstr "Способ фокусировки"
+msgid "Color custom"
+msgstr "Цветовое пространство"
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:199
 #, fuzzy
-msgid "AF area mode"
-msgstr "Режим вспышки"
+msgid "Image overlay"
+msgstr "Тип изображения"
 
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
+#: src/nikonmn.cpp:205
 #, fuzzy
-msgid "AF point"
-msgstr "Использованная точка AF"
+msgid "Minimal"
+msgstr "Ручная"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
 #, fuzzy
-msgid "AF Points In Focus"
-msgstr "Использованная точка AF"
+msgid "Nikon Makernote version"
+msgstr "Версия прошивки"
 
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
 #, fuzzy
-msgid "AF points in focus"
-msgstr "Использованная точка AF"
-
-#: src/nikonmn.cpp:791
-msgid "Unknown Nikon Auto Focus Tag"
-msgstr ""
+msgid "ISO Speed"
+msgstr "Скорость ISO"
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
 #, fuzzy
-msgid "Shutter count"
-msgstr "Выдержка"
+msgid "Sharpening"
+msgstr "Резкость изображения"
 
-#: src/nikonmn.cpp:804
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
 #, fuzzy
-msgid "Unknown Nikon Shot Info D80 Tag"
-msgstr "Неизвестный тэг"
+msgid "Image sharpening setting"
+msgstr "Резкость изображения"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
+msgid "Focus"
+msgstr "Фокус"
+
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
 #, fuzzy
-msgid "Flash Level"
+msgid "Flash Setting"
 msgstr "Вспышка сработала"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
 #, fuzzy
-msgid "Flash level"
+msgid "Flash setting"
 msgstr "Вспышка сработала"
 
-#: src/nikonmn.cpp:818
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
 #, fuzzy
-msgid "Unknown Nikon Shot Info D40 Tag"
-msgstr "Неизвестный тэг"
+msgid "ISO Selection"
+msgstr "Выбор ISO"
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
 #, fuzzy
-msgid "0"
-msgstr "50"
+msgid "ISO selection"
+msgstr "Выбор ISO"
 
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
-msgid "+1"
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data Dump"
 msgstr ""
 
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
-msgid "+2"
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+msgid "Data dump"
 msgstr ""
 
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
-msgid "+4"
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+msgid "Image Adjustment"
+msgstr "Коррекция изображения"
+
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+#, fuzzy
+msgid "Image adjustment setting"
+msgstr "Подстройка изображения"
+
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+msgid "Auxiliary Lens"
 msgstr ""
 
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
-msgid "+8"
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+msgid "Auxiliary lens (adapter)"
 msgstr ""
 
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
 #, fuzzy
-msgid "+16"
-msgstr "160"
+msgid "Manual focus distance"
+msgstr "Расстояние ручного фокуса"
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
 #, fuzzy
-msgid "-16"
-msgstr "160"
+msgid "Digital zoom setting"
+msgstr "Цифровой трансфокатор"
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
-msgid "-8"
-msgstr ""
+#: src/nikonmn.cpp:258
+#, fuzzy
+msgid "AF Focus Position"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
-msgid "-4"
-msgstr ""
+#: src/nikonmn.cpp:259
+#, fuzzy
+msgid "AF focus position information"
+msgstr "Способ фокусировки"
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
-msgid "-2"
-msgstr ""
+#: src/nikonmn.cpp:263
+#, fuzzy
+msgid "Unknown Nikon1MakerNote tag"
+msgstr "Неизвестный тэг CanonMakerNote"
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
-msgid "-1"
-msgstr ""
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+#, fuzzy
+msgid "Continuous autofocus"
+msgstr "Продолжительный ведущий режим"
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
-msgid "+17"
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
+msgid "Single autofocus"
 msgstr ""
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
-msgid "-17"
-msgstr ""
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
+#, fuzzy
+msgid "Not used"
+msgstr "Не определено"
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
-msgid "+9"
+#: src/nikonmn.cpp:365
+msgid "guess"
 msgstr ""
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
-msgid "+18"
-msgstr ""
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
+msgstr "VGA Basic"
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
-msgid "-18"
-msgstr ""
+#: src/nikonmn.cpp:413
+msgid "VGA Normal"
+msgstr "VGA Normal"
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
-msgid "-9"
-msgstr ""
-
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
-msgid "+19"
-msgstr ""
-
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
-msgid "-19"
-msgstr ""
-
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
-msgid "+5"
-msgstr ""
-
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
-#, fuzzy
-msgid "+10"
-msgstr "10с"
-
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
-#, fuzzy
-msgid "+20"
-msgstr "250"
-
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
-#, fuzzy
-msgid "-20"
-msgstr "250"
-
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
-#, fuzzy
-msgid "-10"
-msgstr "10с"
-
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
-msgid "-5"
-msgstr ""
-
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
-msgid "+11"
-msgstr ""
-
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
-msgid "-11"
-msgstr ""
+#: src/nikonmn.cpp:414
+msgid "VGA Fine"
+msgstr "VGA Fine"
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
-msgid "+3"
-msgstr ""
+#: src/nikonmn.cpp:415
+msgid "SXGA Basic"
+msgstr "SXGA Basic"
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
-msgid "+6"
-msgstr ""
+#: src/nikonmn.cpp:416
+msgid "SXGA Normal"
+msgstr "SXGA Normal"
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
-msgid "+12"
-msgstr ""
+#: src/nikonmn.cpp:417
+msgid "SXGA Fine"
+msgstr "SXGA Fine"
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
-msgid "-12"
-msgstr ""
+#: src/nikonmn.cpp:429
+msgid "Bright+"
+msgstr "Яркость+"
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
-msgid "-6"
-msgstr ""
+#: src/nikonmn.cpp:430
+msgid "Bright-"
+msgstr "Яркость-"
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
-msgid "-3"
-msgstr ""
+#: src/nikonmn.cpp:431
+msgid "Contrast+"
+msgstr "Контраст+"
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
-msgid "+13"
-msgstr ""
+#: src/nikonmn.cpp:432
+msgid "Contrast-"
+msgstr "Контраст-"
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
-msgid "-13"
-msgstr ""
+#: src/nikonmn.cpp:451
+#, fuzzy
+msgid "Speedlight"
+msgstr "Дневной свет"
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
-msgid "+7"
-msgstr ""
+#: src/nikonmn.cpp:491
+#, fuzzy
+msgid "Unknown Nikon2MakerNote tag"
+msgstr "Неизвестный тэг CanonMakerNote"
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
-msgid "+14"
-msgstr ""
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
+#, fuzzy
+msgid "Flash Device"
+msgstr "Вспышка сработала"
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
-msgid "-14"
-msgstr ""
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
+#, fuzzy
+msgid "Flash device"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
-msgid "-7"
-msgstr ""
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
+#, fuzzy
+msgid "White Balance Bias"
+msgstr "Баланс белого"
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
-msgid "+15"
-msgstr ""
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
+#, fuzzy
+msgid "White balance bias"
+msgstr "Баланс белого"
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
-msgid "-15"
-msgstr ""
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB Levels"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
 #, fuzzy
-msgid "AF Fine Tune Adj"
-msgstr "Использованная точка AF"
+msgid "WB RB levels"
+msgstr "Заряд батареи"
 
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:536
 #, fuzzy
-msgid "AF fine tune adj"
-msgstr "Использованная точка AF"
+msgid "Program Shift"
+msgstr "Программа"
 
-#: src/nikonmn.cpp:878
+#: src/nikonmn.cpp:536
 #, fuzzy
-msgid "Unknown Nikon Shot Info D300 (a) Tag"
-msgstr "Неизвестный тэг"
+msgid "Program shift"
+msgstr "Программа"
 
-#: src/nikonmn.cpp:938
+#: src/nikonmn.cpp:537
 #, fuzzy
-msgid "Unknown Nikon Shot Info D300 (b) Tag"
-msgstr "Неизвестный тэг"
+msgid "Exposure Difference"
+msgstr "Время экспозиции"
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
-msgstr ""
+#: src/nikonmn.cpp:537
+#, fuzzy
+msgid "Exposure difference"
+msgstr "Режим экспозиции"
 
-#: src/nikonmn.cpp:950
-msgid "On (2)"
-msgstr ""
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+#, fuzzy
+msgid "Pointer to a preview image"
+msgstr "Версия эскиза"
 
-#: src/nikonmn.cpp:951
-msgid "On (3)"
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+msgid "Offset to an IFD containing a preview image"
 msgstr ""
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:541
 #, fuzzy
-msgid "Shutter Count 1"
-msgstr "Выдержка"
+msgid "Flash Comp"
+msgstr "Режим вспышки"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:541
 #, fuzzy
-msgid "Shutter count 1"
-msgstr "Выдержка"
+msgid "Flash compensation setting"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:543
 #, fuzzy
-msgid "Shutter Count 2"
-msgstr "Выдержка"
+msgid "Image Boundary"
+msgstr "Номер изображения"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:543
 #, fuzzy
-msgid "Shutter count 2"
-msgstr "Выдержка"
+msgid "Image boundary"
+msgstr "Номер изображения"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:544
 #, fuzzy
-msgid "Vibration Reduction 2"
-msgstr "Без коррекции"
+msgid "Flash exposure comp"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:545
 #, fuzzy
-msgid "Vibration reduction 2"
-msgstr "Без коррекции"
+msgid "Flash Bracket Comp"
+msgstr "Время экспозиции"
 
-#: src/nikonmn.cpp:973
+#: src/nikonmn.cpp:545
 #, fuzzy
-msgid "Unknown Nikon Shot Info Tag"
-msgstr "Неизвестный тэг"
+msgid "Flash bracket compensation applied"
+msgstr "Компенсация вспышки ?"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:546
 #, fuzzy
-msgid "WB RBGG Levels"
-msgstr "Заряд батареи"
+msgid "Exposure Bracket Comp"
+msgstr "Время экспозиции"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:546
 #, fuzzy
-msgid "WB RBGG levels"
-msgstr "Заряд батареи"
+msgid "AE bracket compensation applied"
+msgstr "Тонкомпенсация"
 
-#: src/nikonmn.cpp:986
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
 #, fuzzy
-msgid "Unknown Nikon Color Balance 1 Tag"
-msgstr "Цветовое пространство"
+msgid "Image Processing"
+msgstr "Резкость изображения"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
 #, fuzzy
-msgid "WB RGGB Levels"
-msgstr "Заряд батареи"
+msgid "Image processing"
+msgstr "Резкость изображения"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:548
 #, fuzzy
-msgid "WB RGGB levels"
-msgstr "Заряд батареи"
+msgid "Crop High Speed"
+msgstr "Ночная съёмка"
 
-#: src/nikonmn.cpp:999
+#: src/nikonmn.cpp:548
 #, fuzzy
-msgid "Unknown Nikon Color Balance 2 Tag"
-msgstr "Цветовое пространство"
+msgid "Crop high speed"
+msgstr "Авторские права"
 
-#: src/nikonmn.cpp:1012
+#: src/nikonmn.cpp:549
 #, fuzzy
-msgid "Unknown Nikon Color Balance 2a Tag"
-msgstr "Цветовое пространство"
+msgid "Exposure Tuning"
+msgstr "Время экспозиции"
 
-#: src/nikonmn.cpp:1025
+#: src/nikonmn.cpp:549
 #, fuzzy
-msgid "Unknown Nikon Color Balance 2b Tag"
-msgstr "Цветовое пространство"
+msgid "Exposure tuning"
+msgstr "Время экспозиции"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:552
 #, fuzzy
-msgid "WB RGBG Levels"
-msgstr "Заряд батареи"
+msgid "VR Info"
+msgstr "Инфо"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:552
 #, fuzzy
-msgid "WB RGBG levels"
-msgstr "Заряд батареи"
+msgid "VR info"
+msgstr "Инфо"
 
-#: src/nikonmn.cpp:1038
+#: src/nikonmn.cpp:553
 #, fuzzy
-msgid "Unknown Nikon Color Balance 3 Tag"
-msgstr "Неизвестный панорамный тэг Canon"
+msgid "Image Authentication"
+msgstr "Ориентация изображения"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:553
 #, fuzzy
-msgid "WB GRBG Levels"
-msgstr "Заряд батареи"
+msgid "Image authentication"
+msgstr "Ориентация изображения"
 
-#: src/nikonmn.cpp:1049
-#, fuzzy
-msgid "WB GRBG levels"
-msgstr "Заряд батареи"
+#: src/nikonmn.cpp:554
+msgid "ActiveD-Lighting"
+msgstr ""
 
-#: src/nikonmn.cpp:1051
-#, fuzzy
-msgid "Unknown Nikon Color Balance 4 Tag"
-msgstr "Неизвестный панорамный тэг Canon"
+#: src/nikonmn.cpp:554
+msgid "ActiveD-lighting"
+msgstr ""
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:555
 #, fuzzy
-msgid "Lens ID Number"
-msgstr "Серийный номер"
+msgid "Picture Control"
+msgstr "Режим захвата"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:555
 #, fuzzy
-msgid "Lens ID number"
-msgstr "Серийный номер камеры"
+msgid " Picture control"
+msgstr "Режим захвата"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:556
 #, fuzzy
-msgid "Lens F-Stops"
-msgstr "Тип объектива"
+msgid "World Time"
+msgstr "Время экспозиции"
 
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:556
 #, fuzzy
-msgid "Lens F-stops"
-msgstr "Тип объектива"
+msgid "World time"
+msgstr "Время экспозиции"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:557
 #, fuzzy
-msgid "Min Focal Length"
-msgstr "Фокусное расстояние"
+msgid "ISO Info"
+msgstr "О снимке"
 
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:557
 #, fuzzy
-msgid "Min focal length"
-msgstr "Фокусное расстояние"
+msgid "ISO info"
+msgstr "Настройка резкости"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:558
 #, fuzzy
-msgid "Max Focal Length"
-msgstr "Фокусное расстояние"
+msgid "Vignette Control"
+msgstr "Пульт Д/У?"
 
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:558
 #, fuzzy
-msgid "Max focal length"
-msgstr "Максимальное фокусное расстояние"
+msgid "Vignette control"
+msgstr "Белая точка"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
-#, fuzzy
-msgid "Max Aperture At Min Focal"
-msgstr "Максимально открытая диафрагма"
+#: src/nikonmn.cpp:560
+msgid "Tone Compensation"
+msgstr "Тонкомпенсация"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
-#, fuzzy
-msgid "Max aperture at min focal"
-msgstr "Максимально открытая диафрагма"
+#: src/nikonmn.cpp:560
+msgid "Tone compensation"
+msgstr "Тонкомпенсация"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
+#: src/nikonmn.cpp:566
 #, fuzzy
-msgid "Max Aperture At Max Focal"
-msgstr "Максимально открытая диафрагма"
+msgid "Mode of flash used"
+msgstr "Вспышка сработала"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
-#, fuzzy
-msgid "Max aperture at max focal"
-msgstr "Максимально открытая диафрагма"
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
+msgid "Shooting Mode"
+msgstr "Режим съемки"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
+msgid "Shooting mode"
+msgstr "Режим съемки"
+
+#: src/nikonmn.cpp:569
 #, fuzzy
-msgid "MCU Version"
-msgstr "Версия ARM"
+msgid "Auto Bracket Release"
+msgstr "Автобрекетирование"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:569
 #, fuzzy
-msgid "MCU version"
-msgstr "Версия ARM"
+msgid "Auto bracket release"
+msgstr "Автобрекетирование"
 
-#: src/nikonmn.cpp:1070
+#: src/nikonmn.cpp:570
 #, fuzzy
-msgid "Unknown Nikon Lens Data 1 Tag"
-msgstr "Неизвестный панорамный тэг Canon"
+msgid "Lens FStops"
+msgstr "Тип объектива"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-msgid "Exit Pupil Position"
-msgstr ""
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast Curve"
+msgstr "Контраст"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
-msgid "Exit pupil position"
-msgstr ""
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast curve"
+msgstr "Контраст"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:572
 #, fuzzy
-msgid "AF Aperture"
-msgstr "Диафрагма"
+msgid "Color Hue"
+msgstr "Цветовое пространство"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:572
 #, fuzzy
-msgid "AF aperture"
-msgstr "Диафрагма"
+msgid "Color hue"
+msgstr "Цветовое пространство"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
 #, fuzzy
-msgid "Effective Max Aperture"
-msgstr "Диафрагма"
+msgid "Scene mode"
+msgstr "Тип сцены"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
+msgid "Light Source"
+msgstr "Источник света"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
+msgid "Light source"
+msgstr "Источник света"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:575
 #, fuzzy
-msgid "Effective max aperture"
-msgstr "Максимально открытая диафрагма"
+msgid "Shot info"
+msgstr "О снимке"
+
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue Adjustment"
+msgstr "Подстройка оттенка"
 
-#: src/nikonmn.cpp:1095
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue adjustment"
+msgstr "Коррекция тона"
+
+#: src/nikonmn.cpp:577
 #, fuzzy
-msgid "Unknown Nikon Lens Data 2 Tag"
-msgstr "Неизвестный панорамный тэг Canon"
+msgid "NEF Compression"
+msgstr "Сжатие"
 
-#: src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:577
 #, fuzzy
-msgid "Max aperture at min focal length"
-msgstr "Максимально открытая диафрагма"
+msgid "NEF compression"
+msgstr "Сжатие"
 
-#: src/nikonmn.cpp:1116
+#: src/nikonmn.cpp:580 src/tags.cpp:903
 #, fuzzy
-msgid "Max aperture at max focal length"
-msgstr "Максимально открытая диафрагма"
+msgid "Linearization Table"
+msgstr "Дата оцифровки"
 
-#: src/nikonmn.cpp:1120
+#: src/nikonmn.cpp:580
 #, fuzzy
-msgid "Unknown Nikon Lens Data 3 Tag"
-msgstr "Неизвестный панорамный тэг Canon"
+msgid "Linearization table"
+msgstr "Дата оцифровки"
 
-#: src/nikonmn.cpp:1299
-msgid "Closest subject"
-msgstr ""
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color Balance"
+msgstr "Цветовое пространство"
 
-#: src/nikonmn.cpp:1300
-msgid "Group dynamic-AF"
-msgstr ""
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color balance"
+msgstr "Цветовое пространство"
 
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
-msgid "none"
-msgstr "ничего"
+#: src/nikonmn.cpp:582
+msgid "Lens Data"
+msgstr "Данные объектива"
 
-#: src/nikonmn.cpp:1333
-msgid "used"
-msgstr ""
+#: src/nikonmn.cpp:582
+msgid "Lens data settings"
+msgstr "Параметры объектива"
 
-#: src/nikonmn.cpp:1359
+#: src/nikonmn.cpp:583
 #, fuzzy
-msgid "All 11 Points"
-msgstr "Использованная точка AF"
+msgid "Raw Image Center"
+msgstr "Номер изображения"
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
+#: src/nikonmn.cpp:583
 #, fuzzy
-msgid "Single-frame"
-msgstr "Серийный номер"
+msgid "Raw image center"
+msgstr "Версия эскиза"
 
-#: src/olympusmn.cpp:68
+#: src/nikonmn.cpp:584
 #, fuzzy
-msgid "Standard Quality (SQ)"
-msgstr "Стандартный свет A"
-
-#: src/olympusmn.cpp:69
-msgid "High Quality (HQ)"
-msgstr ""
-
-#: src/olympusmn.cpp:70
-msgid "Super High Quality (SHQ)"
-msgstr ""
+msgid "Sensor Pixel Size"
+msgstr "Очистка сенсора"
 
-#: src/olympusmn.cpp:85
-msgid "On (preset)"
-msgstr ""
+#: src/nikonmn.cpp:584
+#, fuzzy
+msgid "Sensor pixel size"
+msgstr "Очистка сенсора"
 
-#: src/olympusmn.cpp:91
+#: src/nikonmn.cpp:586
 #, fuzzy
-msgid "Internal"
-msgstr "Intel"
+msgid "Scene Assist"
+msgstr "Тип сцены"
 
-#: src/olympusmn.cpp:93
+#: src/nikonmn.cpp:586
 #, fuzzy
-msgid "Internal + External"
-msgstr "Встроенная вспышка"
+msgid "Scene assist"
+msgstr "Тип сцены"
 
-#: src/olympusmn.cpp:118
+#: src/nikonmn.cpp:587
 #, fuzzy
-msgid "Interlaced"
-msgstr "Intel"
+msgid "Retouch History"
+msgstr "Длина изображения"
 
-#: src/olympusmn.cpp:119
-msgid "Progressive"
+#: src/nikonmn.cpp:587
+msgid "Retouch history"
 msgstr ""
 
-#: src/olympusmn.cpp:127
-#, fuzzy
-msgid "Thumbnail Image"
-msgstr "Эскиз"
-
-#: src/olympusmn.cpp:128
+#: src/nikonmn.cpp:589
 #, fuzzy
-msgid "Thumbnail image"
-msgstr "Эскиз"
+msgid "Serial NO"
+msgstr "Серийный номер"
 
-#: src/olympusmn.cpp:131
-msgid "Special Mode"
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
 msgstr ""
 
-#: src/olympusmn.cpp:132
+#: src/nikonmn.cpp:590
 #, fuzzy
-msgid "Picture taking mode"
-msgstr "Режим замера"
+msgid "Image Data Size"
+msgstr "Размер изображения"
 
-#: src/olympusmn.cpp:140
+#: src/nikonmn.cpp:590
 #, fuzzy
-msgid "Black & White Mode"
-msgstr "Чёрно-белый"
+msgid "Image data size"
+msgstr "Размер изображения"
 
-#: src/olympusmn.cpp:141
+#: src/nikonmn.cpp:592
 #, fuzzy
-msgid "Black and white mode"
-msgstr "Чёрно-белый"
+msgid "Image Count"
+msgstr "Номер изображения"
 
-#: src/olympusmn.cpp:144
+#: src/nikonmn.cpp:592
 #, fuzzy
-msgid "Digital zoom ratio"
-msgstr "Коэффициент цифрового трансфокатора"
+msgid "Image count"
+msgstr "Номер изображения"
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
-msgid "Focal Plane Diagonal"
-msgstr ""
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted Image Count"
+msgstr "Номер изображения"
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
-msgid "Focal plane diagonal"
-msgstr ""
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted image count"
+msgstr "Номер изображения"
 
-#: src/olympusmn.cpp:149
-msgid "Lens Distortion Parameters"
-msgstr ""
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
+#, fuzzy
+msgid "Shutter Count"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:150
-msgid "Lens distortion parameters"
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
 msgstr ""
 
-#: src/olympusmn.cpp:153
+#: src/nikonmn.cpp:595
 #, fuzzy
-msgid "Software firmware version"
-msgstr "Версия прошивки"
+msgid "Flash info"
+msgstr "Вспышка"
 
-#: src/olympusmn.cpp:156
-msgid "ASCII format data such as [PictureInfo]"
-msgstr ""
+#: src/nikonmn.cpp:596
+msgid "Image Optimization"
+msgstr "Оптимизация изображения"
 
-#: src/olympusmn.cpp:158
-msgid "Camera ID"
-msgstr "ID камеры"
+#: src/nikonmn.cpp:596
+msgid "Image optimization"
+msgstr "Оптимизация изображения"
 
-#: src/olympusmn.cpp:159
+#: src/nikonmn.cpp:598
 #, fuzzy
-msgid "Camera ID data"
-msgstr "ID камеры"
+msgid "Program Variation"
+msgstr "Версия программы"
 
-#: src/olympusmn.cpp:178
+#: src/nikonmn.cpp:598
 #, fuzzy
-msgid "Pre Capture Frames"
-msgstr "Режим захвата"
-
-#: src/olympusmn.cpp:179
-msgid "Pre-capture frames"
-msgstr ""
+msgid "Program variation"
+msgstr "Версия программы"
 
-#: src/olympusmn.cpp:184
+#: src/nikonmn.cpp:600
 #, fuzzy
-msgid "One Touch WB"
-msgstr "One-touch"
+msgid "AF Response"
+msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:185
+#: src/nikonmn.cpp:600
 #, fuzzy
-msgid "One touch white balance"
-msgstr "Автомат. баланс белого"
+msgid "AF response"
+msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
-msgid "Serial number"
-msgstr "Серийный номер"
+#: src/nikonmn.cpp:601
+#, fuzzy
+msgid "Multi exposure"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:199
-msgid "Data Dump 1"
-msgstr ""
+#: src/nikonmn.cpp:602
+#, fuzzy
+msgid "High ISO Noise Reduction"
+msgstr "Подавление шума"
 
-#: src/olympusmn.cpp:200
-msgid "Various camera settings 1"
-msgstr ""
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
+#, fuzzy
+msgid "Toning effect"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:202
-msgid "Data Dump 2"
-msgstr ""
+#: src/nikonmn.cpp:604
+#, fuzzy
+msgid "AF info 2"
+msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:203
-msgid "Various camera settings 2"
-msgstr ""
+#: src/nikonmn.cpp:605
+#, fuzzy
+msgid "File info"
+msgstr "Имя файла"
 
-#: src/olympusmn.cpp:205
-msgid "Shutter Speed"
-msgstr "Скорость срабатывания затвора"
+#: src/nikonmn.cpp:608
+#, fuzzy
+msgid "Capture Data"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:206
-msgid "Shutter speed value"
-msgstr "Скорость срабатывания затвора"
+#: src/nikonmn.cpp:608
+#, fuzzy
+msgid "Capture data"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:209
-msgid "ISO speed value"
-msgstr "Чувствительность (ISO)"
+#: src/nikonmn.cpp:609
+#, fuzzy
+msgid "Capture Version"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:212
+#: src/nikonmn.cpp:609
 #, fuzzy
-msgid "Aperture value"
-msgstr "Диафрагма"
+msgid "Capture version"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:215
+#: src/nikonmn.cpp:611
 #, fuzzy
-msgid "Brightness value"
-msgstr "Яркость"
+msgid "Capture Offsets"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:223
+#: src/nikonmn.cpp:611
 #, fuzzy
-msgid "Bracket"
-msgstr "Брекетинг"
+msgid "Capture offsets"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:224
+#: src/nikonmn.cpp:612
 #, fuzzy
-msgid "Exposure compensation value"
-msgstr "Тонкомпенсация"
+msgid "Scan IFD"
+msgstr "ID камеры"
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
-msgid "Sensor Temperature"
-msgstr ""
+#: src/nikonmn.cpp:613
+#, fuzzy
+msgid "ICC profile"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
-msgid "Sensor temperature"
-msgstr ""
+#: src/nikonmn.cpp:614
+#, fuzzy
+msgid "Capture output"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:229
-msgid "Lens Temperature"
-msgstr ""
+#: src/nikonmn.cpp:616
+#, fuzzy
+msgid "Unknown Nikon3MakerNote tag"
+msgstr "Неизвестный тэг CanonMakerNote"
 
-#: src/olympusmn.cpp:230
-msgid "Lens temperature"
-msgstr "Температура объектива"
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+msgid "No"
+msgstr "Нет"
 
-#: src/olympusmn.cpp:244
-msgid "Zoom"
-msgstr "Трансфокатор"
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
+msgid "Yes"
+msgstr "Да"
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
-msgid "Zoom step count"
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
 msgstr ""
 
-#: src/olympusmn.cpp:247
-#, fuzzy
-msgid "Macro Focus"
-msgstr "Ручная фокусировка"
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
+msgstr ""
 
-#: src/olympusmn.cpp:248
-msgid "Macro focus step count"
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
 msgstr ""
 
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
 #, fuzzy
-msgid "Sharpness Factor"
-msgstr "Резкость"
+msgid "Vibration Reduction"
+msgstr "Без коррекции"
 
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
 #, fuzzy
-msgid "Sharpness factor"
-msgstr "Резкость"
-
-#: src/olympusmn.cpp:253
-msgid "Flash Charge Level"
-msgstr ""
+msgid "Vibration reduction"
+msgstr "Без коррекции"
 
-#: src/olympusmn.cpp:254
-msgid "Flash charge level"
-msgstr ""
+#: src/nikonmn.cpp:648
+#, fuzzy
+msgid "Unknown Nikon Vibration Reduction Tag"
+msgstr "Без коррекции"
 
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
+#: src/nikonmn.cpp:658
 #, fuzzy
-msgid "Color Matrix"
-msgstr "Цветовое пространство"
+msgid "Default Settings"
+msgstr "Настройка резкости"
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
 #, fuzzy
-msgid "Color matrix"
-msgstr "Цветовое пространство"
+msgid "Quick Adjust"
+msgstr "Подстройка оттенка"
 
-#: src/olympusmn.cpp:259
+#: src/nikonmn.cpp:660
 #, fuzzy
-msgid "BlackLevel"
-msgstr "Заряд батареи"
+msgid "Full Control"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
-msgid "Black level"
+#: src/nikonmn.cpp:681
+msgid "Blue-green"
 msgstr ""
 
-#: src/olympusmn.cpp:269
-msgid "White balance mode"
-msgstr "Баланс белого"
+#: src/nikonmn.cpp:683
+msgid "Purple-blue"
+msgstr ""
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
-#, fuzzy
-msgid "Red Balance"
-msgstr "Баланс белого"
+#: src/nikonmn.cpp:684
+msgid "Red-purple"
+msgstr ""
 
-#: src/olympusmn.cpp:275
+#: src/nikonmn.cpp:691
 #, fuzzy
-msgid "Red balance"
-msgstr "Баланс белого"
+msgid "Name"
+msgstr "Имя владельца"
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
-#, fuzzy
-msgid "Blue Balance"
-msgstr "Баланс белого"
+#: src/nikonmn.cpp:692
+msgid "Base"
+msgstr ""
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
+#: src/nikonmn.cpp:693
 #, fuzzy
-msgid "Blue balance"
-msgstr "Баланс белого"
+msgid "Adjust"
+msgstr "Коррекция"
 
-#: src/olympusmn.cpp:283
+#: src/nikonmn.cpp:694
 #, fuzzy
-msgid "Serial Number 2"
-msgstr "Серийный номер"
+msgid "Quick adjust"
+msgstr "Коррекция тона"
 
-#: src/olympusmn.cpp:284
+#: src/nikonmn.cpp:700
 #, fuzzy
-msgid "Serial number 2"
-msgstr "Серийный номер"
+msgid "Filter effect"
+msgstr "Цветовой эффект"
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
+#: src/nikonmn.cpp:702
 #, fuzzy
-msgid "Flash exposure compensation"
-msgstr "Компенсация вспышки ?"
+msgid "Toning Saturation"
+msgstr "Насыщенность"
 
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
+#: src/nikonmn.cpp:702
 #, fuzzy
-msgid "External Flash Bounce"
-msgstr "Встроенная вспышка"
+msgid "Toning saturation"
+msgstr "Насыщенность"
 
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
+#: src/nikonmn.cpp:704
 #, fuzzy
-msgid "External flash bounce"
-msgstr "Встроенная вспышка"
+msgid "Unknown Nikon Picture Control Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
+#: src/nikonmn.cpp:714
 #, fuzzy
-msgid "External Flash Zoom"
-msgstr "Встроенная вспышка"
+msgid "Timezone"
+msgstr "Ничего"
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
+#: src/nikonmn.cpp:715
 #, fuzzy
-msgid "External flash zoom"
-msgstr "Встроенная вспышка"
+msgid "Daylight Savings"
+msgstr "Дневной свет"
 
-#: src/olympusmn.cpp:325
+#: src/nikonmn.cpp:715
 #, fuzzy
-msgid "External Flash Mode"
-msgstr "Встроенная вспышка"
+msgid "Daylight savings"
+msgstr "Дневной свет"
 
-#: src/olympusmn.cpp:326
+#: src/nikonmn.cpp:716
 #, fuzzy
-msgid "External flash mode"
-msgstr "Встроенная вспышка"
+msgid "Date Display Format"
+msgstr "Формат файла"
 
-#: src/olympusmn.cpp:334
-msgid "Color Control"
-msgstr ""
+#: src/nikonmn.cpp:716
+#, fuzzy
+msgid "Date display format"
+msgstr "Формат файла"
 
-#: src/olympusmn.cpp:335
-msgid "Color control"
-msgstr ""
+#: src/nikonmn.cpp:718
+#, fuzzy
+msgid "Unknown Nikon World Time Tag"
+msgstr "Неизвестный панорамный тэг Canon"
 
-#: src/olympusmn.cpp:337
-msgid "ValidBits"
-msgstr ""
+#: src/nikonmn.cpp:729
+#, fuzzy
+msgid "Hi 0.3"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
-msgid "Valid bits"
-msgstr ""
+#: src/nikonmn.cpp:730
+#, fuzzy
+msgid "Hi 0.5"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:340
-msgid "CoringFilter"
-msgstr ""
+#: src/nikonmn.cpp:731
+#, fuzzy
+msgid "Hi 0.7"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
-msgid "Coring filter"
-msgstr ""
+#: src/nikonmn.cpp:732
+#, fuzzy
+msgid "Hi 1.0"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:361
-msgid "Compression Ratio"
-msgstr "Уровень сжатия"
+#: src/nikonmn.cpp:733
+#, fuzzy
+msgid "Hi 1.3"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:362
-msgid "Compression ratio"
-msgstr "Уровень сжатия"
+#: src/nikonmn.cpp:734
+#, fuzzy
+msgid "Hi 1.5"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:365
-msgid "Preview image embedded"
-msgstr ""
+#: src/nikonmn.cpp:735
+#, fuzzy
+msgid "Hi 1.7"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:368
-msgid "Offset of the preview image"
-msgstr ""
+#: src/nikonmn.cpp:736
+#, fuzzy
+msgid "Hi 2.0"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:371
-msgid "Size of the preview image"
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
 msgstr ""
 
-#: src/olympusmn.cpp:373
-msgid "CCD Scan Mode"
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
 msgstr ""
 
-#: src/olympusmn.cpp:374
-msgid "CCD scan mode"
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
 msgstr ""
 
-#: src/olympusmn.cpp:379
+#: src/nikonmn.cpp:740
 #, fuzzy
-msgid "Infinity Lens Step"
-msgstr "Бесконечный"
+msgid "Lo 1.0"
+msgstr "HV10"
 
-#: src/olympusmn.cpp:380
+#: src/nikonmn.cpp:746
 #, fuzzy
-msgid "Infinity lens step"
-msgstr "Бесконечный"
+msgid "ISO Expansion"
+msgstr "Выбор ISO"
 
-#: src/olympusmn.cpp:382
+#: src/nikonmn.cpp:746
 #, fuzzy
-msgid "Near Lens Step"
-msgstr "Тип объектива"
-
-#: src/olympusmn.cpp:383
-msgid "Near lens step"
-msgstr ""
-
-#: src/olympusmn.cpp:385
-msgid "Equipment Info"
-msgstr ""
-
-#: src/olympusmn.cpp:386
-msgid "Camera equipment sub-IFD"
-msgstr ""
+msgid "ISO expansion"
+msgstr "Выбор ISO"
 
-#: src/olympusmn.cpp:389
+#: src/nikonmn.cpp:747
 #, fuzzy
-msgid "Camera Settings sub-IFD"
-msgstr "Настройка контраста"
-
-#: src/olympusmn.cpp:391
-msgid "Raw Development"
-msgstr ""
-
-#: src/olympusmn.cpp:392
-msgid "Raw development sub-IFD"
-msgstr ""
-
-#: src/olympusmn.cpp:394
-msgid "Raw Development 2"
-msgstr ""
-
-#: src/olympusmn.cpp:395
-msgid "Raw development 2 sub-IFD"
-msgstr ""
+msgid "ISO 2"
+msgstr "О снимке"
 
-#: src/olympusmn.cpp:398
+#: src/nikonmn.cpp:748
 #, fuzzy
-msgid "Image processing sub-IFD"
-msgstr "Резкость изображения"
+msgid "ISO Expansion 2"
+msgstr "Выбор ISO"
 
-#: src/olympusmn.cpp:400
+#: src/nikonmn.cpp:748
 #, fuzzy
-msgid "Focus Info"
-msgstr "Способ фокусировки"
+msgid "ISO expansion 2"
+msgstr "Выбор ISO"
 
-#: src/olympusmn.cpp:401
+#: src/nikonmn.cpp:750
 #, fuzzy
-msgid "Focus sub-IFD"
-msgstr "Способ фокусировки"
+msgid "Unknown Nikon Iso Info Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:403
+#: src/nikonmn.cpp:760
 #, fuzzy
-msgid "Raw Info"
-msgstr "Инфо"
+msgid "Single Area"
+msgstr "One-Shot"
 
-#: src/olympusmn.cpp:404
+#: src/nikonmn.cpp:761
 #, fuzzy
-msgid "Raw sub-IFD"
-msgstr "Sub-IFD"
+msgid "Dynamic Area"
+msgstr "Динамический диапазон"
 
-#: src/olympusmn.cpp:409
-msgid "Unknown OlympusMakerNote tag"
+#: src/nikonmn.cpp:762
+msgid "Dynamic Area, Closest Subject"
 msgstr ""
 
-#: src/olympusmn.cpp:424
-#, fuzzy
-msgid "Program-shift"
-msgstr "Программа"
-
-#: src/olympusmn.cpp:429
-#, fuzzy
-msgid "Center-weighted average"
-msgstr "Центрально-взвешенный средний"
-
-#: src/olympusmn.cpp:431
-msgid "ESP"
+#: src/nikonmn.cpp:763
+msgid "Group Dynamic"
 msgstr ""
 
-#: src/olympusmn.cpp:432
+#: src/nikonmn.cpp:764
 #, fuzzy
-msgid "Pattern+AF"
-msgstr "Паттерн CFA"
+msgid "Single Area (wide)"
+msgstr "Серийный номер"
 
-#: src/olympusmn.cpp:433
-msgid "Spot+Highlight control"
-msgstr ""
+#: src/nikonmn.cpp:765
+#, fuzzy
+msgid "Dynamic Area (wide)"
+msgstr "Динамический диапазон"
 
-#: src/olympusmn.cpp:434
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
 #, fuzzy
-msgid "Spot+Shadow control"
-msgstr "Тень"
+msgid "Mid-left"
+msgstr "Левая"
 
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
 #, fuzzy
-msgid "Super Macro"
-msgstr "Супермакро"
+msgid "Mid-right"
+msgstr "слева направо"
 
-#: src/olympusmn.cpp:446
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
 #, fuzzy
-msgid "Single AF"
-msgstr "One-Shot"
+msgid "Far Left"
+msgstr "справа налево"
 
-#: src/olympusmn.cpp:447
-msgid "Sequential shooting AF"
-msgstr ""
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
+#, fuzzy
+msgid "Far Right"
+msgstr "Авторские права"
 
-#: src/olympusmn.cpp:449
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
 #, fuzzy
-msgid "Multi AF"
-msgstr "Автоматический"
+msgid "AF area mode"
+msgstr "Режим вспышки"
 
-#: src/olympusmn.cpp:450
-msgid "MF"
-msgstr ""
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
+#, fuzzy
+msgid "AF point"
+msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:455
+#: src/nikonmn.cpp:802
 #, fuzzy
-msgid "AF Not Used"
+msgid "AF Points In Focus"
 msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:456
+#: src/nikonmn.cpp:802
 #, fuzzy
-msgid "AF Used"
+msgid "AF points in focus"
 msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:461
+#: src/nikonmn.cpp:804
 #, fuzzy
-msgid "Not Ready"
-msgstr "Не определено"
+msgid "Unknown Nikon Auto Focus Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:462
-msgid "Ready"
+#: src/nikonmn.cpp:815
+msgid "On (51-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:469
-msgid "Fill-in"
+#: src/nikonmn.cpp:816
+msgid "On (11-point)"
 msgstr ""
 
-#: src/olympusmn.cpp:471
+#: src/nikonmn.cpp:822
 #, fuzzy
-msgid "Slow-sync"
-msgstr "медленная синхронизация"
+msgid "Contrast Detect AF"
+msgstr "Настройка контраста"
 
-#: src/olympusmn.cpp:472
+#: src/nikonmn.cpp:822
 #, fuzzy
-msgid "Forced On"
-msgstr "Флуоресцентная лампа"
-
-#: src/olympusmn.cpp:473
-msgid "2nd Curtain"
-msgstr ""
+msgid "Contrast detect AF"
+msgstr "Настройка контраста"
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
-msgstr ""
+#: src/nikonmn.cpp:824
+#, fuzzy
+msgid "Phase Detect AF"
+msgstr "Не удалось прочитать"
 
-#: src/olympusmn.cpp:480
+#: src/nikonmn.cpp:824
 #, fuzzy
-msgid "6000K (Cloudy)"
-msgstr "Облачно"
+msgid "Phase detect AF"
+msgstr "Не удалось прочитать"
 
-#: src/olympusmn.cpp:481
+#: src/nikonmn.cpp:825
 #, fuzzy
-msgid "5300K (Fine Weather)"
-msgstr "Ясная погода"
+msgid "Primary AF Point"
+msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:482
-msgid "3000K (Tungsten light)"
-msgstr ""
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF point"
+msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
-msgid "3600K (Tungsten light-like)"
-msgstr ""
+#: src/nikonmn.cpp:827
+#, fuzzy
+msgid "AF Image Width"
+msgstr "Ширина изображения"
 
-#: src/olympusmn.cpp:484
+#: src/nikonmn.cpp:827
 #, fuzzy
-msgid "6600K (Daylight fluorescent)"
-msgstr "Флуоресцентная лампа"
+msgid "AF image width"
+msgstr "Ширина изображения"
 
-#: src/olympusmn.cpp:485
+#: src/nikonmn.cpp:828
 #, fuzzy
-msgid "4500K (Neutral white fluorescent)"
-msgstr "Флуоресцентная лампа"
+msgid "AF Image Height"
+msgstr "Длина изображения"
 
-#: src/olympusmn.cpp:486
+#: src/nikonmn.cpp:828
 #, fuzzy
-msgid "4000K (Cool white fluorescent)"
-msgstr "Флуоресцентная лампа"
+msgid "AF image height"
+msgstr "Высота изображения"
 
-#: src/olympusmn.cpp:488
+#: src/nikonmn.cpp:829
 #, fuzzy
-msgid "Custom WB 1"
-msgstr "Свой 1"
+msgid "AF Area X Position"
+msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:489
+#: src/nikonmn.cpp:829
 #, fuzzy
-msgid "Custom WB 2"
-msgstr "Свой 2"
+msgid "AF area x position"
+msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:490
+#: src/nikonmn.cpp:830
 #, fuzzy
-msgid "Custom WB 3"
-msgstr "Свой"
+msgid "AF Area Y Position"
+msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:491
+#: src/nikonmn.cpp:830
 #, fuzzy
-msgid "Custom WB 4"
-msgstr "Свой 1"
+msgid "AF area y position"
+msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:492
+#: src/nikonmn.cpp:831
 #, fuzzy
-msgid "Custom WB 5400K"
-msgstr "Свой 1"
+msgid "AF Area Width"
+msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:493
+#: src/nikonmn.cpp:831
 #, fuzzy
-msgid "Custom WB 2900K"
-msgstr "Свой 2"
+msgid "AF area width"
+msgstr "Режим вспышки"
 
-#: src/olympusmn.cpp:494
+#: src/nikonmn.cpp:832
 #, fuzzy
-msgid "Custom WB 8000K"
-msgstr "Свой 1"
+msgid "AF Area Height"
+msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:500
-msgid "CM1 (Red Enhance)"
-msgstr ""
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF area height"
+msgstr "Авторские права"
 
-#: src/olympusmn.cpp:501
-msgid "CM2 (Green Enhance)"
-msgstr ""
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast Detect AF In Focus"
+msgstr "Настройка контраста"
 
-#: src/olympusmn.cpp:502
+#: src/nikonmn.cpp:833
 #, fuzzy
-msgid "CM3 (Blue Enhance)"
-msgstr "Баланс белого"
+msgid "Contrast detect AF in focus"
+msgstr "Настройка контраста"
 
-#: src/olympusmn.cpp:503
-msgid "CM4 (Skin Tones)"
-msgstr ""
+#: src/nikonmn.cpp:835
+#, fuzzy
+msgid "Unknown Nikon Auto Focus 2 Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
-msgid "Pro Photo RGB"
-msgstr ""
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory Number"
+msgstr "Номер заказа"
 
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
+#: src/nikonmn.cpp:846
 #, fuzzy
-msgid "Sport"
-msgstr "Спорт"
+msgid "Directory number"
+msgstr "Номер заказа"
 
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
+#: src/nikonmn.cpp:849
 #, fuzzy
-msgid "Landscape+Portrait"
-msgstr "Альбом"
+msgid "Unknown Nikon File Info Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:522
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
 #, fuzzy
-msgid "Self Portrait"
-msgstr "Портрет"
+msgid "Multiple Exposure"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
-msgstr ""
+#: src/nikonmn.cpp:861
+#, fuzzy
+msgid "Image Overlay"
+msgstr "Тип изображения"
 
-#: src/olympusmn.cpp:527
+#: src/nikonmn.cpp:867
 #, fuzzy
-msgid "Night+Portrait"
-msgstr "Ночной портрет"
+msgid "Multi Exposure Mode"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
-msgstr "Пища"
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi exposure mode"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:534
+#: src/nikonmn.cpp:868
 #, fuzzy
-msgid "Documents"
-msgstr "ID документа"
+msgid "Multi Exposure Shots"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:536
+#: src/nikonmn.cpp:868
 #, fuzzy
-msgid "Shoot & Select"
-msgstr "Цветовое пространство"
+msgid "Multi exposure shots"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:537
-msgid "Beach & Snow"
-msgstr ""
+#: src/nikonmn.cpp:869
+#, fuzzy
+msgid "Multi Exposure Auto Gain"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:538
+#: src/nikonmn.cpp:869
 #, fuzzy
-msgid "Self Portrait+Timer"
-msgstr "Серийный номер"
+msgid "Multi exposure auto gain"
+msgstr "Режим экспозиции"
 
-#: src/olympusmn.cpp:539
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
 #, fuzzy
-msgid "Candle"
-msgstr "Дневной свет"
+msgid "Unknown Nikon Multi Exposure Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:540
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
 #, fuzzy
-msgid "Available Light"
-msgstr "Заполняющий свет"
+msgid "Internal"
+msgstr "Intel"
 
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
 msgstr ""
 
-#: src/olympusmn.cpp:542
-#, fuzzy
-msgid "My Mode"
-msgstr "Режим вспышки"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
+msgstr ""
 
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-#, fuzzy
-msgid "Pet"
-msgstr "Установить"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
+msgstr ""
 
-#: src/olympusmn.cpp:544
-#, fuzzy
-msgid "Underwater Wide1"
-msgstr "Подводная съемка"
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
+msgstr ""
 
-#: src/olympusmn.cpp:545
-#, fuzzy
-msgid "Underwater Macro"
-msgstr "Подводная съемка"
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
+msgstr ""
 
-#: src/olympusmn.cpp:546
-msgid "Shoot & Select1"
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
 msgstr ""
 
-#: src/olympusmn.cpp:547
-msgid "Shoot & Select2"
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
 msgstr ""
 
-#: src/olympusmn.cpp:549
-#, fuzzy
-msgid "Digital Image Stabilization"
-msgstr "Стабилизация снимка"
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
+msgstr ""
 
-#: src/olympusmn.cpp:550
-#, fuzzy
-msgid "Auction"
-msgstr "Авто"
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
+msgstr ""
 
-#: src/olympusmn.cpp:553
-#, fuzzy
-msgid "Underwater Wide2"
-msgstr "Подводная съемка"
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
+msgstr ""
 
-#: src/olympusmn.cpp:555
-msgid "Children"
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
 msgstr ""
 
-#: src/olympusmn.cpp:557
-#, fuzzy
-msgid "Nature Macro"
-msgstr "внешняя"
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
+msgstr ""
 
-#: src/olympusmn.cpp:558
-#, fuzzy
-msgid "Underwater Snapshot"
-msgstr "Подводная съемка"
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:559
-#, fuzzy
-msgid "Shooting Guide"
-msgstr "Режим съемки"
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
-#, fuzzy
-msgid "Noise Filter"
-msgstr "Порядок заполнения"
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
+msgstr ""
 
-#: src/olympusmn.cpp:566
-msgid "Noise Filter (ISO Boost)"
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
-msgid "Muted"
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
 msgstr ""
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
-#, fuzzy
-msgid "Monotone"
-msgstr "Цветовое пространство"
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
+msgstr ""
 
-#: src/olympusmn.cpp:601
-msgid "SQ"
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
 msgstr ""
 
-#: src/olympusmn.cpp:602
-msgid "HQ"
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
 msgstr ""
 
-#: src/olympusmn.cpp:603
-msgid "SHQ"
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:608
-#, fuzzy
-msgid "Camera Settings Version"
-msgstr "Настройки камеры"
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
+msgstr ""
 
-#: src/olympusmn.cpp:608
-#, fuzzy
-msgid "Camera settings version"
-msgstr "Настройки камеры"
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:609
-#, fuzzy
-msgid "PreviewImage Valid"
-msgstr "Версия эскиза"
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
+msgstr ""
 
-#: src/olympusmn.cpp:609
-#, fuzzy
-msgid "Preview image valid"
-msgstr "Версия эскиза"
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:610
-#, fuzzy
-msgid "PreviewImage Start"
-msgstr "Данные эскиза"
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
+msgstr ""
 
-#: src/olympusmn.cpp:610
-#, fuzzy
-msgid "Preview image start"
-msgstr "Версия эскиза"
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:611
-#, fuzzy
-msgid "PreviewImage Length"
-msgstr "Длина изображения"
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:611
-#, fuzzy
-msgid "Preview image length"
-msgstr "Версия эскиза"
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
+msgstr ""
 
-#: src/olympusmn.cpp:613
-#, fuzzy
-msgid "AE Lock"
-msgstr "Фиксация экспозиции"
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
+msgstr ""
 
-#: src/olympusmn.cpp:613
-#, fuzzy
-msgid "Auto exposure lock"
-msgstr "Режим экспозиции"
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
+msgstr ""
 
-#: src/olympusmn.cpp:617
-#, fuzzy
-msgid "Focus Process"
-msgstr "Способ фокусировки"
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:617
-#, fuzzy
-msgid "Focus process"
-msgstr "Другой процесс проявки"
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF Search"
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
 msgstr ""
 
-#: src/olympusmn.cpp:618
-msgid "AF search"
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
 msgstr ""
 
-#: src/olympusmn.cpp:619
-#, fuzzy
-msgid "AF Areas"
-msgstr "Способ фокусировки"
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
+msgstr ""
 
-#: src/olympusmn.cpp:619
-#, fuzzy
-msgid "AF areas"
-msgstr "Способ фокусировки"
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
+msgstr ""
 
-#: src/olympusmn.cpp:622
-#, fuzzy
-msgid "White Balance 2"
-msgstr "Баланс белого"
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
+msgstr ""
 
-#: src/olympusmn.cpp:622
-#, fuzzy
-msgid "White balance 2"
-msgstr "Баланс белого"
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:623
-#, fuzzy
-msgid "White Balance Temperature"
-msgstr "Таблица баланса белого"
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:623
+#: src/nikonmn.cpp:934
 #, fuzzy
-msgid "White balance temperature"
-msgstr "Таблица баланса белого"
+msgid "10.0 m"
+msgstr "100"
 
-#: src/olympusmn.cpp:624
-#, fuzzy
-msgid "White Balance Bracket"
-msgstr "Настройка баланса белого"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:624
-#, fuzzy
-msgid "White balance bracket"
-msgstr "Настройка баланса белого"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:625
-#, fuzzy
-msgid "Custom Saturation"
-msgstr "Насыщенность"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:625
+#: src/nikonmn.cpp:938
 #, fuzzy
-msgid "Custom saturation"
-msgstr "Насыщенность"
+msgid "16.0 m"
+msgstr "160"
 
-#: src/olympusmn.cpp:626
-#, fuzzy
-msgid "Modified Saturation"
-msgstr "Насыщенность"
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:626
-#, fuzzy
-msgid "Modified saturation"
-msgstr "Насыщенность"
+#: src/nikonmn.cpp:940
+msgid "20.0 m"
+msgstr ""
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
+#: src/nikonmn.cpp:947
 #, fuzzy
-msgid "Contrast Setting"
-msgstr "Настройка контраста"
+msgid "iTTL-BL"
+msgstr "TTL"
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
+#: src/nikonmn.cpp:948
 #, fuzzy
-msgid "Sharpness Setting"
-msgstr "Настройка резкости"
+msgid "iTTL"
+msgstr "TTL"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
+#: src/nikonmn.cpp:949
 #, fuzzy
-msgid "Distortion Correction"
-msgstr "Без коррекции"
+msgid "Auto Aperture"
+msgstr "Диафрагма"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
-#, fuzzy
-msgid "Distortion correction"
-msgstr "Без коррекции"
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
+msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
-#, fuzzy
-msgid "Shading Compensation"
-msgstr "Тонкомпенсация"
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
+msgid "Repeating Flash"
+msgstr ""
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/nikonmn.cpp:960
 #, fuzzy
-msgid "Shading compensation"
-msgstr "Тонкомпенсация"
+msgid "Bounce Flash"
+msgstr "Без вспышки"
 
-#: src/olympusmn.cpp:634
-#, fuzzy
-msgid "Compression Factor"
-msgstr "Уровень сжатия"
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
+msgstr ""
 
-#: src/olympusmn.cpp:634
-#, fuzzy
-msgid "Compression factor"
-msgstr "Уровень сжатия"
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
+msgstr ""
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
-#, fuzzy
-msgid "Gradation"
-msgstr "Длительность"
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
+msgstr ""
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
-#, fuzzy
-msgid "Picture mode"
-msgstr "Портретный режим"
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
+msgstr ""
 
-#: src/olympusmn.cpp:637
-#, fuzzy
-msgid "Picture Mode Saturation"
-msgstr "Насыщенность"
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
+msgstr ""
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
+#: src/nikonmn.cpp:974
 #, fuzzy
-msgid "Picture mode saturation"
-msgstr "Портретный режим"
+msgid "Amber"
+msgstr "Число F"
 
-#: src/olympusmn.cpp:638
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "Picture Mode Hue"
-msgstr "Портретный режим"
+msgid "Flash Source"
+msgstr "Источник файла"
 
-#: src/olympusmn.cpp:638
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "Picture mode hue"
-msgstr "Портретный режим"
+msgid "Flash source"
+msgstr "Источник файла"
 
-#: src/olympusmn.cpp:639
-#, fuzzy
-msgid "Picture Mode Contrast"
-msgstr "Портретный режим"
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
+msgid "0x0005"
+msgstr ""
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Picture mode contrast"
-msgstr "Портретный режим"
+msgid "External Flash Firmware"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:640
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Picture Mode Sharpness"
-msgstr "Портретный режим"
+msgid "External flash firmware"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
 #, fuzzy
-msgid "Picture mode sharpness"
-msgstr "Портретный режим"
+msgid "External Flash Flags"
+msgstr "Внешняя вспышка"
 
-#: src/olympusmn.cpp:641
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
 #, fuzzy
-msgid "Picture Mode BW Filter"
-msgstr "Портретный режим"
+msgid "External flash flags"
+msgstr "Внешняя вспышка"
 
-#: src/olympusmn.cpp:641
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Picture mode BW filter"
-msgstr "Портретный режим"
+msgid "Flash Focal Length"
+msgstr "Фокусное расстояние"
 
-#: src/olympusmn.cpp:642
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Picture Mode Tone"
-msgstr "Портретный режим"
+msgid "Flash focal length"
+msgstr "Максимальное фокусное расстояние"
 
-#: src/olympusmn.cpp:642
-#, fuzzy
-msgid "Picture mode tone"
-msgstr "Портретный режим"
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
+msgstr ""
 
-#: src/olympusmn.cpp:643
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
 #, fuzzy
-msgid "Noise filter"
-msgstr "Цветовое пространство"
+msgid "Repeating flash rate"
+msgstr "Файл переименовывается в"
 
-#: src/olympusmn.cpp:645
-#, fuzzy
-msgid "Panorama Mode"
-msgstr "Панорама"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
+msgstr ""
 
-#: src/olympusmn.cpp:645
-#, fuzzy
-msgid "Panorama mode"
-msgstr "Кадр панорамы"
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating flash count"
+msgstr ""
 
-#: src/olympusmn.cpp:646
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "Image Quality 2"
-msgstr "Качество"
+msgid "Flash GN Distance"
+msgstr "Расстояние ручного фокуса"
 
-#: src/olympusmn.cpp:646
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "Image quality 2"
-msgstr "Качество изображения"
-
-#: src/olympusmn.cpp:647
-msgid "Manometer Pressure"
-msgstr ""
-
-#: src/olympusmn.cpp:647
-#, fuzzy
-msgid "Manometer pressure"
-msgstr "Несжатый"
+msgid "Flash GN distance"
+msgstr "Расстояние ручного фокуса"
 
-#: src/olympusmn.cpp:648
-msgid "Manometer Reading"
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:648
-msgid "Manometer reading"
+#: src/nikonmn.cpp:988
+msgid "Flash group a control mode"
 msgstr ""
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB Detect"
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
 msgstr ""
 
-#: src/olympusmn.cpp:649
-msgid "Extended WB detect"
+#: src/nikonmn.cpp:989
+msgid "Flash group b control mode"
 msgstr ""
 
-#: src/olympusmn.cpp:651
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "Unknown OlympusCs tag"
-msgstr "Неизвестное поле"
-
-#: src/olympusmn.cpp:662
-msgid "Simple E-System"
-msgstr ""
-
-#: src/olympusmn.cpp:663
-msgid "E-System"
-msgstr ""
+msgid "Flash Color Filter"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:679
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "Equipment Version"
-msgstr "Версия файла"
+msgid "Flash color filter"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:679
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
 #, fuzzy
-msgid "Equipment version"
-msgstr "Версия Exif"
+msgid "Shutter count"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:680
+#: src/nikonmn.cpp:1044
 #, fuzzy
-msgid "Camera Type"
-msgstr "ID камеры"
+msgid "Unknown Nikon Shot Info D80 Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:680
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
 #, fuzzy
-msgid "Camera type"
-msgstr "ID камеры"
+msgid "Flash Level"
+msgstr "Вспышка сработала"
 
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
+#: src/nikonmn.cpp:1056
 #, fuzzy
-msgid "Internal Serial Number"
-msgstr "Серийный номер камеры"
+msgid "Flash level"
+msgstr "Вспышка сработала"
 
-#: src/olympusmn.cpp:682
+#: src/nikonmn.cpp:1058
 #, fuzzy
-msgid "Internal serial number"
-msgstr "Серийный номер камеры"
+msgid "Unknown Nikon Shot Info D40 Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
 #, fuzzy
-msgid "Body Firmware Version"
-msgstr "Версия прошивки"
+msgid "0"
+msgstr "50"
 
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
 #, fuzzy
-msgid "Body firmware version"
-msgstr "Версия прошивки"
+msgid "+1"
+msgstr "160"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
 #, fuzzy
-msgid "Lens Serial Number"
-msgstr "Серийный номер"
+msgid "+2"
+msgstr "250"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
-#, fuzzy
-msgid "Lens serial number"
-msgstr "Серийный номер камеры"
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
+msgid "+4"
+msgstr ""
 
-#: src/olympusmn.cpp:687
-#, fuzzy
-msgid "Lens Firmware Version"
-msgstr "Версия прошивки"
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
+msgid "+8"
+msgstr ""
 
-#: src/olympusmn.cpp:687
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
 #, fuzzy
-msgid "Lens firmware version"
-msgstr "Версия прошивки"
+msgid "+16"
+msgstr "160"
 
-#: src/olympusmn.cpp:692
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
 #, fuzzy
-msgid "Max Aperture At Current Focal"
-msgstr "Максимально открытая диафрагма"
+msgid "-16"
+msgstr "160"
 
-#: src/olympusmn.cpp:692
-#, fuzzy
-msgid "Max aperture at current focal"
-msgstr "Максимально открытая диафрагма"
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
+msgid "-8"
+msgstr ""
 
-#: src/olympusmn.cpp:693
-#, fuzzy
-msgid "Lens Properties"
-msgstr "Температура объектива"
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
+msgid "-4"
+msgstr ""
 
-#: src/olympusmn.cpp:693
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
 #, fuzzy
-msgid "Lens properties"
-msgstr "Температура объектива"
+msgid "-2"
+msgstr "250"
 
-#: src/olympusmn.cpp:694
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
 #, fuzzy
-msgid "Extender"
-msgstr "внешняя"
+msgid "-1"
+msgstr "160"
 
-#: src/olympusmn.cpp:695
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
 #, fuzzy
-msgid "Extender Serial Number"
-msgstr "Серийный номер камеры"
+msgid "+17"
+msgstr "160"
 
-#: src/olympusmn.cpp:695
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
 #, fuzzy
-msgid "Extender serial number"
-msgstr "Серийный номер камеры"
+msgid "-17"
+msgstr "160"
 
-#: src/olympusmn.cpp:696
-#, fuzzy
-msgid "Extender Model"
-msgstr "Тип сцены"
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
+msgid "+9"
+msgstr ""
 
-#: src/olympusmn.cpp:696
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
 #, fuzzy
-msgid "Extender model"
-msgstr "Тип сцены"
+msgid "+18"
+msgstr "160"
 
-#: src/olympusmn.cpp:697
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
 #, fuzzy
-msgid "Extender Firmware Version"
-msgstr "Версия прошивки"
+msgid "-18"
+msgstr "160"
 
-#: src/olympusmn.cpp:697
-#, fuzzy
-msgid "Extender firmwareversion"
-msgstr "Версия прошивки"
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
+msgid "-9"
+msgstr ""
 
-#: src/olympusmn.cpp:698
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
 #, fuzzy
-msgid "Flash Type"
-msgstr "Режим вспышки"
+msgid "+19"
+msgstr "160"
 
-#: src/olympusmn.cpp:698
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
 #, fuzzy
-msgid "Flash type"
-msgstr "Режим вспышки"
+msgid "-19"
+msgstr "160"
 
-#: src/olympusmn.cpp:699 src/properties.cpp:354
-#, fuzzy
-msgid "Flash Model"
-msgstr "Режим вспышки"
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
+msgid "+5"
+msgstr ""
 
-#: src/olympusmn.cpp:699
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
 #, fuzzy
-msgid "Flash model"
-msgstr "Режим вспышки"
+msgid "+10"
+msgstr "10с"
 
-#: src/olympusmn.cpp:700
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
 #, fuzzy
-msgid "Flash Firmware Version"
-msgstr "Версия прошивки"
+msgid "+20"
+msgstr "250"
 
-#: src/olympusmn.cpp:700
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
 #, fuzzy
-msgid "Flash firmware version"
-msgstr "Версия прошивки"
+msgid "-20"
+msgstr "250"
 
-#: src/olympusmn.cpp:701
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
 #, fuzzy
-msgid "FlashSerialNumber"
-msgstr "Серийный номер"
+msgid "-10"
+msgstr "10с"
 
-#: src/olympusmn.cpp:703
-#, fuzzy
-msgid "Unknown OlympusEq tag"
-msgstr "Неизвестный тег Exif"
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
+msgid "-5"
+msgstr ""
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
 #, fuzzy
-msgid "High Speed"
-msgstr "Ночная съёмка"
+msgid "+11"
+msgstr "160"
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
 #, fuzzy
-msgid "High Function"
-msgstr "Насыщенность"
+msgid "-11"
+msgstr "160"
 
-#: src/olympusmn.cpp:722
-msgid "Advanced High Speed"
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
+msgid "+3"
 msgstr ""
 
-#: src/olympusmn.cpp:723
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
 #, fuzzy
-msgid "Advanced High Function"
-msgstr "Функция передачи"
-
-#: src/olympusmn.cpp:728
-#, fuzzy
-msgid "Original"
-msgstr "Исходная дата и время"
+msgid "+6"
+msgstr "160"
 
-#: src/olympusmn.cpp:729
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
 #, fuzzy
-msgid "Edited (Landscape)"
-msgstr "Альбом"
+msgid "+12"
+msgstr "160"
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
 #, fuzzy
-msgid "Edited (Portrait)"
-msgstr "Ночной портрет"
+msgid "-12"
+msgstr "160"
 
-#: src/olympusmn.cpp:736
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
 #, fuzzy
-msgid "WB Color Temp"
-msgstr "Цветовое пространство"
+msgid "-6"
+msgstr "160"
 
-#: src/olympusmn.cpp:737
-msgid "WB Gray Point"
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
+msgid "-3"
 msgstr ""
 
-#: src/olympusmn.cpp:747
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
 #, fuzzy
-msgid "Raw Development Version"
-msgstr "Версия прошивки"
-
-#: src/olympusmn.cpp:747
-msgid "Raw development version"
-msgstr ""
+msgid "+13"
+msgstr "160"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
 #, fuzzy
-msgid "Exposure Bias Value"
-msgstr "Смещение экспозиции"
+msgid "-13"
+msgstr "160"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
-#, fuzzy
-msgid "Exposure bias value"
-msgstr "Смещение экспозиции"
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
+msgid "+7"
+msgstr ""
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
 #, fuzzy
-msgid "White Balance Value"
-msgstr "Таблица баланса белого"
+msgid "+14"
+msgstr "160"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
 #, fuzzy
-msgid "White balance value"
-msgstr "Таблица баланса белого"
+msgid "-14"
+msgstr "160"
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
+msgid "-7"
+msgstr ""
+
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
 #, fuzzy
-msgid "WB Fine Adjustment"
-msgstr "Подстройка оттенка"
+msgid "+15"
+msgstr "160"
 
-#: src/olympusmn.cpp:750
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
 #, fuzzy
-msgid "WB fine adjustment"
-msgstr "Коррекция тона"
+msgid "-15"
+msgstr "160"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
-msgid "Gray Point"
+msgid "AF Fine Tune Adj"
 msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
-msgid "Gray point"
+msgid "AF fine tune adj"
 msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/nikonmn.cpp:1118
 #, fuzzy
-msgid "Saturation Emphasis"
-msgstr "Настройка контраста"
+msgid "Unknown Nikon Shot Info D300 (a) Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/nikonmn.cpp:1178
 #, fuzzy
-msgid "Saturation emphasis"
-msgstr "Настройка контраста"
+msgid "Unknown Nikon Shot Info D300 (b) Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/nikonmn.cpp:1191
 #, fuzzy
-msgid "Memory Color Emphasis"
-msgstr "Цвет"
+msgid "On (3)"
+msgstr "Вкл"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
-msgid "Memory color emphasis"
-msgstr ""
+#: src/nikonmn.cpp:1204
+#, fuzzy
+msgid "Shutter Count 1"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/nikonmn.cpp:1204
 #, fuzzy
-msgid "Contrast Value"
-msgstr "Контраст"
+msgid "Shutter count 1"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/nikonmn.cpp:1208
 #, fuzzy
-msgid "Contrast value"
-msgstr "Контраст"
+msgid "Shutter Count 2"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/nikonmn.cpp:1208
 #, fuzzy
-msgid "Sharpness Value"
-msgstr "Резкость"
+msgid "Shutter count 2"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/nikonmn.cpp:1209
 #, fuzzy
-msgid "Sharpness value"
-msgstr "Резкость"
+msgid "Vibration Reduction 2"
+msgstr "Без коррекции"
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
+#: src/nikonmn.cpp:1209
 #, fuzzy
-msgid "Engine"
-msgstr "Звукооператор"
+msgid "Vibration reduction 2"
+msgstr "Без коррекции"
 
-#: src/olympusmn.cpp:759
+#: src/nikonmn.cpp:1213
 #, fuzzy
-msgid "Edit status"
-msgstr "Статус правки"
+msgid "Unknown Nikon Shot Info Tag"
+msgstr "Неизвестный тэг"
 
-#: src/olympusmn.cpp:760
+#: src/nikonmn.cpp:1224
 #, fuzzy
-msgid "Settings"
-msgstr "Настройка резкости"
+msgid "WB RBGG Levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:762
+#: src/nikonmn.cpp:1224
 #, fuzzy
-msgid "Unknown OlympusRd tag"
-msgstr "Неизвестное поле"
+msgid "WB RBGG levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:817
-msgid "Raw Development 2 Version"
-msgstr ""
+#: src/nikonmn.cpp:1226
+#, fuzzy
+msgid "Unknown Nikon Color Balance 1 Tag"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:817
-msgid "Raw development 2 version"
-msgstr ""
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
+#, fuzzy
+msgid "WB RGGB Levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:821
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
-msgid "White balance fine adjustment"
-msgstr "Точная подстройка баланса белого"
+msgid "WB RGGB levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:831
+#: src/nikonmn.cpp:1239
 #, fuzzy
-msgid "PM Saturation"
-msgstr "Насыщенность"
+msgid "Unknown Nikon Color Balance 2 Tag"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:832
+#: src/nikonmn.cpp:1252
 #, fuzzy
-msgid "PM Contrast"
-msgstr "Контраст"
+msgid "Unknown Nikon Color Balance 2a Tag"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:833
+#: src/nikonmn.cpp:1265
 #, fuzzy
-msgid "PM Sharpness"
-msgstr "Резкость"
+msgid "Unknown Nikon Color Balance 2b Tag"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:834
+#: src/nikonmn.cpp:1276
 #, fuzzy
-msgid "PM BW Filter"
-msgstr "Порядок заполнения"
+msgid "WB RGBG Levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:834
-msgid "PM BW filter"
-msgstr ""
+#: src/nikonmn.cpp:1276
+#, fuzzy
+msgid "WB RGBG levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:835
+#: src/nikonmn.cpp:1278
 #, fuzzy
-msgid "PM Picture Tone"
-msgstr "Портретный режим"
+msgid "Unknown Nikon Color Balance 3 Tag"
+msgstr "Неизвестный панорамный тэг Canon"
 
-#: src/olympusmn.cpp:835
+#: src/nikonmn.cpp:1289
 #, fuzzy
-msgid "PM picture tone"
-msgstr "Портретный режим"
+msgid "WB GRBG Levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:838
+#: src/nikonmn.cpp:1289
 #, fuzzy
-msgid "Auto Gradation"
-msgstr "Длительность звукозаписи"
+msgid "WB GRBG levels"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:838
+#: src/nikonmn.cpp:1291
 #, fuzzy
-msgid "Auto gradation"
-msgstr "Длительность звукозаписи"
+msgid "Unknown Nikon Color Balance 4 Tag"
+msgstr "Неизвестный панорамный тэг Canon"
 
-#: src/olympusmn.cpp:839
-msgid "PM Noise Filter"
-msgstr ""
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
+#, fuzzy
+msgid "Lens ID Number"
+msgstr "Серийный номер"
 
-#: src/olympusmn.cpp:839
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
-msgid "Picture mode noise filter"
-msgstr "Портретный режим"
+msgid "Lens ID number"
+msgstr "Серийный номер камеры"
 
-#: src/olympusmn.cpp:841
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
-msgid "Unknown OlympusRd2 tag"
-msgstr "Неизвестное поле"
+msgid "Lens F-Stops"
+msgstr "Тип объектива"
 
-#: src/olympusmn.cpp:850
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
-msgid "Image Processing Version"
-msgstr "Резкость изображения"
+msgid "Lens F-stops"
+msgstr "Тип объектива"
 
-#: src/olympusmn.cpp:850
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 #, fuzzy
-msgid "Image processing version"
-msgstr "Резкость изображения"
+msgid "Min Focal Length"
+msgstr "Фокусное расстояние"
 
-#: src/olympusmn.cpp:852
-msgid "WB RB Levels 3000K"
-msgstr ""
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
+#, fuzzy
+msgid "Min focal length"
+msgstr "Фокусное расстояние"
 
-#: src/olympusmn.cpp:852
-msgid "WB RB levels 3000K"
-msgstr ""
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+#, fuzzy
+msgid "Max Focal Length"
+msgstr "Фокусное расстояние"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB Levels 3300K"
-msgstr ""
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
+#, fuzzy
+msgid "Max focal length"
+msgstr "Максимальное фокусное расстояние"
 
-#: src/olympusmn.cpp:853
-msgid "WB RB levels 3300K"
-msgstr ""
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
+#, fuzzy
+msgid "Max Aperture At Min Focal"
+msgstr "Максимально открытая диафрагма"
 
-#: src/olympusmn.cpp:854
-msgid "WB RB Levels 3600K"
-msgstr ""
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
+#, fuzzy
+msgid "Max aperture at min focal"
+msgstr "Максимально открытая диафрагма"
 
-#: src/olympusmn.cpp:854
-msgid "WB RB levels 3600K"
-msgstr ""
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
+#, fuzzy
+msgid "Max Aperture At Max Focal"
+msgstr "Максимально открытая диафрагма"
 
-#: src/olympusmn.cpp:855
-msgid "WB RB Levels 3900K"
-msgstr ""
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
+#, fuzzy
+msgid "Max aperture at max focal"
+msgstr "Максимально открытая диафрагма"
 
-#: src/olympusmn.cpp:855
-msgid "WB RB levels 3900K"
-msgstr ""
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+#, fuzzy
+msgid "MCU Version"
+msgstr "Версия ARM"
 
-#: src/olympusmn.cpp:856
-msgid "WB RB Levels 4000K"
-msgstr ""
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
+#, fuzzy
+msgid "MCU version"
+msgstr "Версия ARM"
 
-#: src/olympusmn.cpp:856
-msgid "WB RB levels 4000K"
-msgstr ""
+#: src/nikonmn.cpp:1310
+#, fuzzy
+msgid "Unknown Nikon Lens Data 1 Tag"
+msgstr "Неизвестный панорамный тэг Canon"
 
-#: src/olympusmn.cpp:857
-msgid "WB RB Levels 4300K"
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+msgid "Exit Pupil Position"
 msgstr ""
 
-#: src/olympusmn.cpp:857
-msgid "WB RB levels 4300K"
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
+msgid "Exit pupil position"
 msgstr ""
 
-#: src/olympusmn.cpp:858
-msgid "WB RB Levels 4500K"
-msgstr ""
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+#, fuzzy
+msgid "AF Aperture"
+msgstr "Диафрагма"
 
-#: src/olympusmn.cpp:858
-msgid "WB RB levels 4500K"
-msgstr ""
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
+#, fuzzy
+msgid "AF aperture"
+msgstr "Диафрагма"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB Levels 4800K"
-msgstr ""
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+#, fuzzy
+msgid "Effective Max Aperture"
+msgstr "Диафрагма"
 
-#: src/olympusmn.cpp:859
-msgid "WB RB levels 4800K"
-msgstr ""
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
+#, fuzzy
+msgid "Effective max aperture"
+msgstr "Максимально открытая диафрагма"
 
-#: src/olympusmn.cpp:860
-msgid "WB RB Levels 5300K"
-msgstr ""
+#: src/nikonmn.cpp:1335
+#, fuzzy
+msgid "Unknown Nikon Lens Data 2 Tag"
+msgstr "Неизвестный панорамный тэг Canon"
 
-#: src/olympusmn.cpp:860
-msgid "WB RB levels 5300K"
-msgstr ""
+#: src/nikonmn.cpp:1355
+#, fuzzy
+msgid "Max aperture at min focal length"
+msgstr "Максимально открытая диафрагма"
 
-#: src/olympusmn.cpp:861
-msgid "WB RB Levels 6000K"
-msgstr ""
+#: src/nikonmn.cpp:1356
+#, fuzzy
+msgid "Max aperture at max focal length"
+msgstr "Максимально открытая диафрагма"
 
-#: src/olympusmn.cpp:861
-msgid "WB RB levels 6000K"
-msgstr ""
+#: src/nikonmn.cpp:1360
+#, fuzzy
+msgid "Unknown Nikon Lens Data 3 Tag"
+msgstr "Неизвестный панорамный тэг Canon"
 
-#: src/olympusmn.cpp:862
-msgid "WB RB Levels 6600K"
+#: src/nikonmn.cpp:1540
+msgid "Closest subject"
 msgstr ""
 
-#: src/olympusmn.cpp:862
-msgid "WB RB levels 6600K"
+#: src/nikonmn.cpp:1541
+msgid "Group dynamic-AF"
 msgstr ""
 
-#: src/olympusmn.cpp:863
-msgid "WB RB Levels 7500K"
-msgstr ""
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
+msgid "none"
+msgstr "ничего"
 
-#: src/olympusmn.cpp:863
-msgid "WB RB levels 7500K"
+#: src/nikonmn.cpp:1574
+msgid "used"
 msgstr ""
 
-#: src/olympusmn.cpp:864
-msgid "WB RB Levels CWB1"
-msgstr ""
+#: src/nikonmn.cpp:1600
+#, fuzzy
+msgid "All 11 Points"
+msgstr "Использованная точка AF"
 
-#: src/olympusmn.cpp:864
-msgid "WB RB levels CWB1"
-msgstr ""
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
+#, fuzzy
+msgid "Single-frame"
+msgstr "Серийный номер"
 
-#: src/olympusmn.cpp:865
-msgid "WB RB Levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:71
+#, fuzzy
+msgid "Standard Quality (SQ)"
+msgstr "Стандартный свет A"
 
-#: src/olympusmn.cpp:865
-msgid "WB RB levels CWB2"
-msgstr ""
+#: src/olympusmn.cpp:72
+#, fuzzy
+msgid "High Quality (HQ)"
+msgstr "Стандартный свет A"
 
-#: src/olympusmn.cpp:866
-msgid "WB RB Levels CWB3"
-msgstr ""
+#: src/olympusmn.cpp:73
+#, fuzzy
+msgid "Super High Quality (SHQ)"
+msgstr "Стандартный свет A"
 
-#: src/olympusmn.cpp:866
-msgid "WB RB levels CWB3"
+#: src/olympusmn.cpp:88
+msgid "On (preset)"
 msgstr ""
 
-#: src/olympusmn.cpp:867
-msgid "WB RB Levels CWB4"
-msgstr ""
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
+#, fuzzy
+msgid "Sport"
+msgstr "Спорт"
 
-#: src/olympusmn.cpp:867
-msgid "WB RB levels CWB4"
-msgstr ""
-
-#: src/olympusmn.cpp:868
-msgid "WB G Level 3000K"
-msgstr ""
-
-#: src/olympusmn.cpp:868
-msgid "WB G level 3000K"
-msgstr ""
-
-#: src/olympusmn.cpp:869
-msgid "WB G Level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
+#, fuzzy
+msgid "Landscape+Portrait"
+msgstr "Альбом"
 
-#: src/olympusmn.cpp:869
-msgid "WB G level 3300K"
-msgstr ""
+#: src/olympusmn.cpp:100
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Портрет"
 
-#: src/olympusmn.cpp:870
-msgid "WB G Level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:102
+#, fuzzy
+msgid "2 in 1"
+msgstr "Вкл"
 
-#: src/olympusmn.cpp:870
-msgid "WB G level 3600K"
-msgstr ""
+#: src/olympusmn.cpp:105
+#, fuzzy
+msgid "Night+Portrait"
+msgstr "Ночной портрет"
 
-#: src/olympusmn.cpp:871
-msgid "WB G Level 3900K"
-msgstr ""
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
+msgstr "Пища"
 
-#: src/olympusmn.cpp:871
-msgid "WB G level 3900K"
-msgstr ""
+#: src/olympusmn.cpp:112
+#, fuzzy
+msgid "Documents"
+msgstr "ID документа"
 
-#: src/olympusmn.cpp:872
-msgid "WB G Level 4000K"
-msgstr ""
+#: src/olympusmn.cpp:114
+#, fuzzy
+msgid "Shoot & Select"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:872
-msgid "WB G level 4000K"
+#: src/olympusmn.cpp:115
+msgid "Beach & Snow"
 msgstr ""
 
-#: src/olympusmn.cpp:873
-msgid "WB G Level 4300K"
-msgstr ""
+#: src/olympusmn.cpp:116
+#, fuzzy
+msgid "Self Portrait+Timer"
+msgstr "Серийный номер"
 
-#: src/olympusmn.cpp:873
-msgid "WB G level 4300K"
-msgstr ""
+#: src/olympusmn.cpp:117
+#, fuzzy
+msgid "Candle"
+msgstr "Дневной свет"
 
-#: src/olympusmn.cpp:874
-msgid "WB G Level 4500K"
-msgstr ""
+#: src/olympusmn.cpp:118
+#, fuzzy
+msgid "Available Light"
+msgstr "Заполняющий свет"
 
-#: src/olympusmn.cpp:874
-msgid "WB G level 4500K"
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
 msgstr ""
 
-#: src/olympusmn.cpp:875
-msgid "WB G Level 4800K"
-msgstr ""
+#: src/olympusmn.cpp:120
+#, fuzzy
+msgid "My Mode"
+msgstr "Режим вспышки"
 
-#: src/olympusmn.cpp:875
-msgid "WB G level 4800K"
-msgstr ""
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
+#, fuzzy
+msgid "Pet"
+msgstr "Установить"
 
-#: src/olympusmn.cpp:876
-msgid "WB G Level 5300K"
-msgstr ""
+#: src/olympusmn.cpp:122
+#, fuzzy
+msgid "Underwater Wide1"
+msgstr "Подводная съемка"
 
-#: src/olympusmn.cpp:876
-msgid "WB G level 5300K"
-msgstr ""
+#: src/olympusmn.cpp:123
+#, fuzzy
+msgid "Underwater Macro"
+msgstr "Подводная съемка"
 
-#: src/olympusmn.cpp:877
-msgid "WB G Level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:124
+#, fuzzy
+msgid "Shoot & Select1"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:877
-msgid "WB G level 6000K"
-msgstr ""
+#: src/olympusmn.cpp:125
+#, fuzzy
+msgid "Shoot & Select2"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:878
-msgid "WB G Level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:127
+#, fuzzy
+msgid "Digital Image Stabilization"
+msgstr "Стабилизация снимка"
 
-#: src/olympusmn.cpp:878
-msgid "WB G level 6600K"
-msgstr ""
+#: src/olympusmn.cpp:128
+#, fuzzy
+msgid "Auction"
+msgstr "Авто"
 
-#: src/olympusmn.cpp:879
-msgid "WB G Level 7500K"
-msgstr ""
+#: src/olympusmn.cpp:131
+#, fuzzy
+msgid "Underwater Wide2"
+msgstr "Подводная съемка"
 
-#: src/olympusmn.cpp:879
-msgid "WB G level 7500K"
+#: src/olympusmn.cpp:133
+msgid "Children"
 msgstr ""
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:135
 #, fuzzy
-msgid "WB G Level"
-msgstr "Заряд батареи"
+msgid "Nature Macro"
+msgstr "внешняя"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:136
 #, fuzzy
-msgid "WB G level"
-msgstr "Под уровнем моря"
+msgid "Underwater Snapshot"
+msgstr "Подводная съемка"
 
-#: src/olympusmn.cpp:882
+#: src/olympusmn.cpp:137
 #, fuzzy
-msgid "Enhancer"
-msgstr "Звукооператор"
-
-#: src/olympusmn.cpp:883
-msgid "Enhancer Values"
-msgstr ""
-
-#: src/olympusmn.cpp:883
-msgid "Enhancer values"
-msgstr ""
+msgid "Shooting Guide"
+msgstr "Режим съемки"
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:145
 #, fuzzy
-msgid "Coring Filter"
-msgstr "Цветовое пространство"
+msgid "Internal + External"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:176
 #, fuzzy
-msgid "Coring Values"
-msgstr "Яркость"
+msgid "Interlaced"
+msgstr "Intel"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:177
 #, fuzzy
-msgid "Coring values"
-msgstr "Яркость"
+msgid "Progressive"
+msgstr "Версия программы"
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
+#: src/olympusmn.cpp:188
 #, fuzzy
-msgid "Black Level"
-msgstr "Заряд батареи"
-
-#: src/olympusmn.cpp:887
-msgid "Gain Base"
-msgstr ""
+msgid "Thumbnail Image"
+msgstr "Эскиз"
 
-#: src/olympusmn.cpp:887
-msgid "Gain base"
-msgstr ""
+#: src/olympusmn.cpp:189
+#, fuzzy
+msgid "Thumbnail image"
+msgstr "Эскиз"
 
-#: src/olympusmn.cpp:888
-msgid "Valid Bits"
-msgstr ""
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body Firmware Version"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
 #, fuzzy
-msgid "Crop Left"
-msgstr "справа налево"
+msgid "Body firmware version"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
+#: src/olympusmn.cpp:195
 #, fuzzy
-msgid "Crop left"
-msgstr "справа налево"
+msgid "Special Mode"
+msgstr "Режим вспышки"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
+#: src/olympusmn.cpp:196
 #, fuzzy
-msgid "Crop Top"
-msgstr "Монохромный"
+msgid "Picture taking mode"
+msgstr "Режим замера"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
+#: src/olympusmn.cpp:204
 #, fuzzy
-msgid "Crop top"
-msgstr "Монохромный"
+msgid "Black & White Mode"
+msgstr "Чёрно-белый"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
-msgid "Crop Width"
-msgstr ""
+#: src/olympusmn.cpp:205
+#, fuzzy
+msgid "Black and white mode"
+msgstr "Чёрно-белый"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
+#: src/olympusmn.cpp:208
 #, fuzzy
-msgid "Crop width"
-msgstr "Авторские права"
+msgid "Digital zoom ratio"
+msgstr "Коэффициент цифрового трансфокатора"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
 #, fuzzy
-msgid "Crop Height"
-msgstr "Авторские права"
+msgid "Focal Plane Diagonal"
+msgstr "Разрешение по X"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
 #, fuzzy
-msgid "Crop height"
-msgstr "Авторские права"
+msgid "Focal plane diagonal"
+msgstr "Разрешение по X"
 
-#: src/olympusmn.cpp:896
-msgid "Face Detect"
+#: src/olympusmn.cpp:213
+msgid "Lens Distortion Parameters"
 msgstr ""
 
-#: src/olympusmn.cpp:896
-msgid "Face detect"
+#: src/olympusmn.cpp:214
+msgid "Lens distortion parameters"
 msgstr ""
 
-#: src/olympusmn.cpp:897
-#, fuzzy
-msgid "Face Detect Area"
-msgstr "Не удалось прочитать"
-
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
 #, fuzzy
-msgid "Face detect area"
-msgstr "Не удалось прочитать"
+msgid "Camera Type"
+msgstr "ID камеры"
 
-#: src/olympusmn.cpp:899
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
 #, fuzzy
-msgid "Unknown OlympusIp tag"
-msgstr "Неизвестное поле IFD"
+msgid "Camera type"
+msgstr "ID камеры"
 
-#: src/olympusmn.cpp:909
-msgid "Bounce or Off"
+#: src/olympusmn.cpp:220
+msgid "ASCII format data such as [PictureInfo]"
 msgstr ""
 
-#: src/olympusmn.cpp:910
-msgid "Direct"
-msgstr ""
+#: src/olympusmn.cpp:222
+msgid "Camera ID"
+msgstr "ID камеры"
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:223
 #, fuzzy
-msgid "Focus Info Version"
-msgstr "Способ фокусировки"
+msgid "Camera ID data"
+msgstr "ID камеры"
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
+msgstr "Программное обеспечение"
+
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
 #, fuzzy
-msgid "Focus info version"
-msgstr "Способ фокусировки"
+msgid "Preview Image"
+msgstr "Версия эскиза"
 
-#: src/olympusmn.cpp:915
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
 #, fuzzy
-msgid "Auto Focus"
-msgstr "AI Focus"
+msgid "Preview image"
+msgstr "Версия эскиза"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:237
 #, fuzzy
-msgid "Scene Detect"
-msgstr "Тип сцены"
+msgid "Pre Capture Frames"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:238
 #, fuzzy
-msgid "Scene detect"
-msgstr "Тип сцены"
+msgid "Pre-capture frames"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:240
 #, fuzzy
-msgid "Scene Area"
-msgstr "Тип сцены"
+msgid "White Board"
+msgstr "Баланс белого"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:241
 #, fuzzy
-msgid "Scene area"
-msgstr "Тип сцены"
+msgid "White board"
+msgstr "Баланс белого"
 
-#: src/olympusmn.cpp:918
-msgid "Scene Detect Data"
-msgstr ""
-
-#: src/olympusmn.cpp:918
-msgid "Scene detect data"
-msgstr ""
-
-#: src/olympusmn.cpp:919
-#, fuzzy
-msgid "Zoom Step Count"
-msgstr "Выдержка"
-
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:243
 #, fuzzy
-msgid "Focus Step Count"
-msgstr "Продолжительный ведущий режим"
+msgid "One Touch WB"
+msgstr "One-touch"
 
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:244
 #, fuzzy
-msgid "Focus step count"
-msgstr "Выдержка"
+msgid "One touch white balance"
+msgstr "Автомат. баланс белого"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
 #, fuzzy
-msgid "Focus Step Infinity"
-msgstr "Настройка контраста"
+msgid "White Balance Bracket"
+msgstr "Настройка баланса белого"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
 #, fuzzy
-msgid "Focus step infinity"
-msgstr "Способ фокусировки"
+msgid "White balance bracket"
+msgstr "Настройка баланса белого"
 
-#: src/olympusmn.cpp:922
-#, fuzzy
-msgid "Focus Step Near"
-msgstr "Способ фокусировки"
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+msgid "Firmware"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:922
+#: src/olympusmn.cpp:256
 #, fuzzy
-msgid "Focus step near"
-msgstr "Расстояние ручного фокуса"
+msgid "Firmwarer"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:925
-#, fuzzy
-msgid "External Flash"
-msgstr "Внешняя вспышка"
+#: src/olympusmn.cpp:261
+msgid "Data Dump 1"
+msgstr ""
 
-#: src/olympusmn.cpp:926
+#: src/olympusmn.cpp:262
 #, fuzzy
-msgid "External Flash Guide Number"
-msgstr "Встроенная вспышка"
+msgid "Various camera settings 1"
+msgstr "Различные настройки камеры"
 
-#: src/olympusmn.cpp:926
-#, fuzzy
-msgid "External flash guide number"
-msgstr "Встроенная вспышка"
+#: src/olympusmn.cpp:264
+msgid "Data Dump 2"
+msgstr ""
 
-#: src/olympusmn.cpp:930
+#: src/olympusmn.cpp:265
 #, fuzzy
-msgid "Manual Flash"
-msgstr "Ручная экспозиция"
+msgid "Various camera settings 2"
+msgstr "Различные настройки камеры"
 
-#: src/olympusmn.cpp:930
-#, fuzzy
-msgid "Manual flash"
-msgstr "Ручная экспозиция"
+#: src/olympusmn.cpp:268
+msgid "Shutter speed value"
+msgstr "Скорость срабатывания затвора"
 
-#: src/olympusmn.cpp:934
-#, fuzzy
-msgid "Unknown OlympusFi tag"
-msgstr "Неизвестное поле IFD"
+#: src/olympusmn.cpp:271
+msgid "ISO speed value"
+msgstr "Чувствительность (ISO)"
 
-#: src/olympusmn.cpp:945
+#: src/olympusmn.cpp:274
 #, fuzzy
-msgid "Unknown OlympusFe tag"
-msgstr "Неизвестное поле IFD"
+msgid "Aperture value"
+msgstr "Диафрагма"
 
-#: src/olympusmn.cpp:958
+#: src/olympusmn.cpp:277
 #, fuzzy
-msgid "Fine Weather"
-msgstr "Ясная погода"
+msgid "Brightness value"
+msgstr "Яркость"
 
-#: src/olympusmn.cpp:959
+#: src/olympusmn.cpp:285
 #, fuzzy
-msgid "Tungsten (incandescent)"
-msgstr "Яркая лампа накаливания"
+msgid "Bracket"
+msgstr "Брекетинг"
 
-#: src/olympusmn.cpp:960
+#: src/olympusmn.cpp:286
 #, fuzzy
-msgid "Evening Sunlight"
-msgstr "Вечер"
+msgid "Exposure compensation value"
+msgstr "Тонкомпенсация"
 
-#: src/olympusmn.cpp:961
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
 #, fuzzy
-msgid "Daylight Fluorescent (D 5700 - 7100K)"
-msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+msgid "Sensor Temperature"
+msgstr "Температура объектива"
 
-#: src/olympusmn.cpp:962
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
 #, fuzzy
-msgid "Day White Fluorescent (N 4600 - 5400K)"
-msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+msgid "Sensor temperature"
+msgstr "Температура объектива"
 
-#: src/olympusmn.cpp:963
+#: src/olympusmn.cpp:291
 #, fuzzy
-msgid "Cool White Fluorescent (W 3900 - 4500K)"
-msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+msgid "Lens Temperature"
+msgstr "Температура объектива"
 
-#: src/olympusmn.cpp:964
-#, fuzzy
-msgid "White Fluorescent (WW 3200 - 3700K)"
-msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+#: src/olympusmn.cpp:292
+msgid "Lens temperature"
+msgstr "Температура объектива"
 
-#: src/olympusmn.cpp:965
+#: src/olympusmn.cpp:294
 #, fuzzy
-msgid "One Touch White Balance"
-msgstr "Автомат. баланс белого"
+msgid "Light Condition"
+msgstr "Насыщенность"
 
-#: src/olympusmn.cpp:966
+#: src/olympusmn.cpp:295
 #, fuzzy
-msgid "Custom 1-4"
-msgstr "Свой 1"
+msgid "Light condition"
+msgstr "Насыщенность"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:297
 #, fuzzy
-msgid "Raw Info Version"
+msgid "Focus Range"
 msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:298
 #, fuzzy
-msgid "Raw info version"
+msgid "Focus range"
 msgstr "Способ фокусировки"
 
-#: src/olympusmn.cpp:971
-#, fuzzy
-msgid "WB_RB Levels Used"
-msgstr "Заряд батареи"
+#: src/olympusmn.cpp:306
+msgid "Zoom"
+msgstr "Трансфокатор"
 
-#: src/olympusmn.cpp:971
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
 #, fuzzy
-msgid "WB_RB levels used"
-msgstr "Заряд батареи"
+msgid "Zoom step count"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:309
 #, fuzzy
-msgid "WB_RB Levels Auto"
-msgstr "Заряд батареи"
+msgid "Macro Focus"
+msgstr "Ручная фокусировка"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:310
 #, fuzzy
-msgid "WB_RB levels auto"
-msgstr "Заряд батареи"
+msgid "Macro focus step count"
+msgstr "Выдержка"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
 #, fuzzy
-msgid "WB_RB Levels Shade"
-msgstr "Заряд батареи"
+msgid "Sharpness Factor"
+msgstr "Резкость"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
 #, fuzzy
-msgid "WB_RB levels shade"
-msgstr "Заряд батареи"
+msgid "Sharpness factor"
+msgstr "Резкость"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:315
 #, fuzzy
-msgid "WB_RB Levels Cloudy"
-msgstr "Заряд батареи"
+msgid "Flash Charge Level"
+msgstr "Вспышка сработала"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:316
 #, fuzzy
-msgid "WB_RB levels cloudy"
-msgstr "Заряд батареи"
+msgid "Flash charge level"
+msgstr "Вспышка сработала"
 
-#: src/olympusmn.cpp:975
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
 #, fuzzy
-msgid "WB_RB Levels Fine Weather"
-msgstr "Флуоресцентная лампа"
+msgid "Color Matrix"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:975
-msgid "WB_RB levels fine weather"
-msgstr ""
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
+#, fuzzy
+msgid "Color matrix"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:321
 #, fuzzy
-msgid "WB_RB Levels Tungsten"
+msgid "BlackLevel"
 msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
 #, fuzzy
-msgid "WB_RB levels tungsten"
-msgstr "Флуоресцентная лампа"
-
-#: src/olympusmn.cpp:977
-msgid "WB_RB Levels Evening Sunlight"
-msgstr ""
+msgid "Black level"
+msgstr "Заряд батареи"
 
-#: src/olympusmn.cpp:977
-msgid "WB_RB levels evening sunlight"
-msgstr ""
+#: src/olympusmn.cpp:331
+msgid "White balance mode"
+msgstr "Баланс белого"
 
-#: src/olympusmn.cpp:978
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
 #, fuzzy
-msgid "WB_RB Levels Daylight Fluor"
-msgstr "Флуоресцентная лампа"
-
-#: src/olympusmn.cpp:978
-msgid "WB_RB levels daylight fluor"
-msgstr ""
+msgid "Red Balance"
+msgstr "Баланс белого"
 
-#: src/olympusmn.cpp:979
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
 #, fuzzy
-msgid "WB_RB Levels Day White Fluor"
-msgstr "Флуоресцентная лампа"
-
-#: src/olympusmn.cpp:979
-msgid "WB_RB levels day white fluor"
-msgstr ""
-
-#: src/olympusmn.cpp:980
-msgid "WB_RB Levels Cool White Fluor"
-msgstr ""
-
-#: src/olympusmn.cpp:980
-msgid "WB_RB levels cool white fluor"
-msgstr ""
+msgid "Red balance"
+msgstr "Баланс белого"
 
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
 #, fuzzy
-msgid "WB_RB Levels White Fluorescent"
-msgstr "Флуоресцентная лампа"
+msgid "Blue Balance"
+msgstr "Баланс белого"
 
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
 #, fuzzy
-msgid "WB_RB levels white fluorescent"
-msgstr "Флуоресцентная лампа"
+msgid "Blue balance"
+msgstr "Баланс белого"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:342
 #, fuzzy
-msgid "Color Matrix2"
+msgid "Color Matrix Number"
 msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:343
 #, fuzzy
-msgid "Color matrix 2"
+msgid "Color matrix mumber"
 msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:345
 #, fuzzy
-msgid "Black Level 2"
-msgstr "Заряд батареи"
+msgid "Serial Number 2"
+msgstr "Серийный номер"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:346
 #, fuzzy
-msgid "Black level 2"
-msgstr "Заряд батареи"
-
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
-msgid "YCbCr Coefficients"
-msgstr "Коэффициенты YCbCr"
+msgid "Serial number 2"
+msgstr "Серийный номер"
 
-#: src/olympusmn.cpp:986
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
 #, fuzzy
-msgid "YCbCr coefficients"
-msgstr "Коэффициенты YCbCr"
-
-#: src/olympusmn.cpp:987
-msgid "Valid Pixel Depth"
-msgstr ""
+msgid "Flash exposure compensation"
+msgstr "Компенсация вспышки ?"
 
-#: src/olympusmn.cpp:987
-msgid "Valid pixel depth"
-msgstr ""
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
+#, fuzzy
+msgid "External Flash Bounce"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
 #, fuzzy
-msgid "White Balance Comp"
-msgstr "Баланс белого"
+msgid "External flash bounce"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
 #, fuzzy
-msgid "White balance comp"
-msgstr "Баланс белого"
+msgid "External Flash Zoom"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:994
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
 #, fuzzy
-msgid "Saturation Setting"
-msgstr "Настройка контраста"
+msgid "External flash zoom"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:387
 #, fuzzy
-msgid "Hue Setting"
-msgstr "Настройка резкости"
+msgid "External Flash Mode"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:388
 #, fuzzy
-msgid "Hue setting"
-msgstr "Способ фокусировки"
+msgid "External flash mode"
+msgstr "Встроенная вспышка"
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:396
 #, fuzzy
-msgid "CM Exposure Compensation"
-msgstr "Тонкомпенсация"
+msgid "Color Control"
+msgstr "Режим захвата"
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:397
 #, fuzzy
-msgid "CM exposure compensation"
-msgstr "Компенсация экспозиции"
+msgid "Color control"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:999
-#, fuzzy
-msgid "CM White Balance"
-msgstr "Баланс белого"
+#: src/olympusmn.cpp:399
+msgid "ValidBits"
+msgstr ""
 
-#: src/olympusmn.cpp:999
-#, fuzzy
-msgid "CM white balance"
-msgstr "Автомат. баланс белого"
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
+msgid "Valid bits"
+msgstr ""
 
-#: src/olympusmn.cpp:1000
+#: src/olympusmn.cpp:402
 #, fuzzy
-msgid "CM White Balance Comp"
-msgstr "Баланс белого"
+msgid "CoringFilter"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:1000
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
 #, fuzzy
-msgid "CM white balance comp"
-msgstr "Автомат. баланс белого"
+msgid "Coring filter"
+msgstr "Цветовое пространство"
 
-#: src/olympusmn.cpp:1001
-#, fuzzy
-msgid "CM White Balance Gray Point"
-msgstr "Настройка баланса белого"
+#: src/olympusmn.cpp:423
+msgid "Compression Ratio"
+msgstr "Уровень сжатия"
 
-#: src/olympusmn.cpp:1001
-#, fuzzy
-msgid "CM white balance gray point"
-msgstr "Настройка баланса белого"
+#: src/olympusmn.cpp:424
+msgid "Compression ratio"
+msgstr "Уровень сжатия"
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:427
 #, fuzzy
-msgid "CM Saturation"
-msgstr "Насыщенность"
+msgid "Preview image embedded"
+msgstr "Версия эскиза"
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:430
 #, fuzzy
-msgid "CM saturation"
-msgstr "Насыщенность"
-
-#: src/olympusmn.cpp:1003
-msgid "CM Hue"
-msgstr ""
-
-#: src/olympusmn.cpp:1003
-msgid "CM hue"
-msgstr ""
+msgid "Offset of the preview image"
+msgstr "Версия эскиза"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:433
 #, fuzzy
-msgid "CM Contrast"
-msgstr "Контраст"
+msgid "Size of the preview image"
+msgstr "Версия эскиза"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:435
 #, fuzzy
-msgid "CM contrast"
-msgstr "Контраст"
+msgid "CCD Scan Mode"
+msgstr "Тип сцены"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:436
 #, fuzzy
-msgid "CM Sharpness"
-msgstr "Резкость"
+msgid "CCD scan mode"
+msgstr "Тип сцены"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:441
 #, fuzzy
-msgid "CM sharpness"
-msgstr "Резкость"
+msgid "Infinity Lens Step"
+msgstr "Бесконечный"
 
-#: src/olympusmn.cpp:1007
+#: src/olympusmn.cpp:442
 #, fuzzy
-msgid "Unknown OlympusRi tag"
-msgstr "Неизвестное поле"
+msgid "Infinity lens step"
+msgstr "Бесконечный"
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
+#: src/olympusmn.cpp:444
 #, fuzzy
-msgid "User-Selected"
-msgstr "Автобрекетирование"
+msgid "Near Lens Step"
+msgstr "Тип объектива"
 
-#: src/olympusmn.cpp:1031
+#: src/olympusmn.cpp:445
 #, fuzzy
-msgid "Auto-Override"
-msgstr "Перезаписать"
+msgid "Near lens step"
+msgstr "Тип объектива"
 
-#: src/olympusmn.cpp:1067
+#: src/olympusmn.cpp:447
 #, fuzzy
-msgid "Fast"
-msgstr "быстрый"
+msgid "Equipment Info"
+msgstr "Версия файла"
 
-#: src/olympusmn.cpp:1124
-msgid "3000 Kelvin"
-msgstr "3000 K"
+#: src/olympusmn.cpp:448
+#, fuzzy
+msgid "Camera equipment sub-IFD"
+msgstr "Настройка контраста"
 
-#: src/olympusmn.cpp:1125
-msgid "3700 Kelvin"
-msgstr "3700 K"
+#: src/olympusmn.cpp:451
+#, fuzzy
+msgid "Camera Settings sub-IFD"
+msgstr "Настройка контраста"
 
-#: src/olympusmn.cpp:1126
-msgid "4000 Kelvin"
-msgstr "4000 K"
+#: src/olympusmn.cpp:453
+#, fuzzy
+msgid "Raw Development"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:1127
-msgid "4500 Kelvin"
-msgstr "4500 K"
+#: src/olympusmn.cpp:454
+#, fuzzy
+msgid "Raw development sub-IFD"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:1128
-msgid "5500 Kelvin"
-msgstr "5500 K"
+#: src/olympusmn.cpp:456
+#, fuzzy
+msgid "Raw Development 2"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:1129
-msgid "6500 Kelvin"
-msgstr "6500 K"
+#: src/olympusmn.cpp:457
+#, fuzzy
+msgid "Raw development 2 sub-IFD"
+msgstr "Версия прошивки"
 
-#: src/olympusmn.cpp:1130
-msgid "7500 Kelvin"
-msgstr "7500 K"
+#: src/olympusmn.cpp:460
+#, fuzzy
+msgid "Image processing sub-IFD"
+msgstr "Резкость изображения"
 
-#: src/olympusmn.cpp:1136
-msgid "One-touch"
-msgstr "One-touch"
+#: src/olympusmn.cpp:462
+#, fuzzy
+msgid "Focus Info"
+msgstr "Способ фокусировки"
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
+#: src/olympusmn.cpp:463
 #, fuzzy
-msgid "Very High"
-msgstr "Высокий"
+msgid "Focus sub-IFD"
+msgstr "Способ фокусировки"
 
-#: src/panasonicmn.cpp:57
+#: src/olympusmn.cpp:465
 #, fuzzy
-msgid "Motion Picture"
-msgstr "Портретный режим"
+msgid "Raw Info"
+msgstr "Инфо"
 
-#: src/panasonicmn.cpp:65
-msgid "Halogen"
-msgstr ""
+#: src/olympusmn.cpp:466
+#, fuzzy
+msgid "Raw sub-IFD"
+msgstr "Sub-IFD"
 
-#: src/panasonicmn.cpp:76
-msgid "Auto, focus button"
-msgstr ""
+#: src/olympusmn.cpp:470
+#, fuzzy
+msgid "Unknown OlympusMakerNote tag"
+msgstr "Неизвестное поле IFD"
 
-#: src/panasonicmn.cpp:77
-msgid "Auto, continuous"
-msgstr ""
+#: src/olympusmn.cpp:486
+#, fuzzy
+msgid "Program-shift"
+msgstr "Программа"
 
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
-msgstr ""
+#: src/olympusmn.cpp:491
+#, fuzzy
+msgid "Center-weighted average"
+msgstr "Центрально-взвешенный средний"
 
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
+#: src/olympusmn.cpp:493
+msgid "ESP"
 msgstr ""
 
-#: src/panasonicmn.cpp:91
-msgid "Tele-macro"
-msgstr "Теле-макро"
+#: src/olympusmn.cpp:494
+#, fuzzy
+msgid "Pattern+AF"
+msgstr "Паттерн CFA"
 
-#: src/panasonicmn.cpp:99
-msgid "Scenery"
-msgstr "Тип сцены"
+#: src/olympusmn.cpp:495
+#, fuzzy
+msgid "Spot+Highlight control"
+msgstr "Тень"
 
-#: src/panasonicmn.cpp:104
-msgid "Shutter-speed priority"
-msgstr "Приоритет выдержки"
+#: src/olympusmn.cpp:496
+#, fuzzy
+msgid "Spot+Shadow control"
+msgstr "Тень"
 
-#: src/panasonicmn.cpp:108
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
 #, fuzzy
-msgid "Movie preview"
-msgstr "Выполняется запись"
+msgid "Single AF"
+msgstr "One-Shot"
 
-#: src/panasonicmn.cpp:109
-msgid "Panning"
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
+msgid "Sequential shooting AF"
 msgstr ""
 
-#: src/panasonicmn.cpp:110
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
 #, fuzzy
-msgid "Simple"
-msgstr "Файл"
+msgid "Multi AF"
+msgstr "Автоматический"
 
-#: src/panasonicmn.cpp:111
+#: src/olympusmn.cpp:517
 #, fuzzy
-msgid "Color effects"
-msgstr "Цветовой эффект"
-
-#: src/panasonicmn.cpp:115
-msgid "Night scenery"
-msgstr "Ночная съёмка"
+msgid "AF Not Used"
+msgstr "Использованная точка AF"
 
-#: src/panasonicmn.cpp:117
-msgid "Baby"
-msgstr ""
+#: src/olympusmn.cpp:518
+#, fuzzy
+msgid "AF Used"
+msgstr "Использованная точка AF"
 
-#: src/panasonicmn.cpp:118
-msgid "Soft skin"
-msgstr ""
+#: src/olympusmn.cpp:523
+#, fuzzy
+msgid "Not Ready"
+msgstr "Не определено"
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
+#: src/olympusmn.cpp:524
 #, fuzzy
-msgid "Candlelight"
-msgstr "Дневной свет"
+msgid "Ready"
+msgstr "Не определено"
 
-#: src/panasonicmn.cpp:120
+#: src/olympusmn.cpp:531
 #, fuzzy
-msgid "Starry night"
-msgstr "Стандартный свет A"
+msgid "Fill-in"
+msgstr "Имя файла"
 
-#: src/panasonicmn.cpp:121
+#: src/olympusmn.cpp:533
 #, fuzzy
-msgid "High sensitivity"
-msgstr "Спектральная чувствительность"
+msgid "Slow-sync"
+msgstr "медленная синхронизация"
 
-#: src/panasonicmn.cpp:122
+#: src/olympusmn.cpp:534
 #, fuzzy
-msgid "Panorama assist"
-msgstr "Панорама"
+msgid "Forced On"
+msgstr "Флуоресцентная лампа"
 
-#: src/panasonicmn.cpp:125
-msgid "Aerial photo"
+#: src/olympusmn.cpp:535
+msgid "2nd Curtain"
 msgstr ""
 
-#: src/panasonicmn.cpp:128
-#, fuzzy
-msgid "Intelligent ISO"
-msgstr "Фокусное расстояние"
-
-#: src/panasonicmn.cpp:129
-#, fuzzy
-msgid "High speed continuous shooting"
-msgstr "Способ фокусировки"
-
-#: src/panasonicmn.cpp:130
-msgid "Intelligent auto"
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
 msgstr ""
 
-#: src/panasonicmn.cpp:142
-msgid "Warm"
-msgstr "Тёплый"
-
-#: src/panasonicmn.cpp:143
-#, fuzzy
-msgid "Cool"
-msgstr "Цвет"
-
-#: src/panasonicmn.cpp:151
-msgid "Low/High quality"
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
 msgstr ""
 
-#: src/panasonicmn.cpp:152
-msgid "Infinite"
-msgstr "Бесконечный"
-
-#: src/panasonicmn.cpp:160
-#, fuzzy
-msgid "Medium low"
-msgstr "Низкий"
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
+msgstr ""
 
-#: src/panasonicmn.cpp:161
-#, fuzzy
-msgid "Medium high"
-msgstr "Высокий"
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
+msgstr ""
 
-#: src/panasonicmn.cpp:170
-msgid "Low (-1)"
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
-#, fuzzy
-msgid "High (+1)"
-msgstr "Высокий"
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
+msgstr ""
 
-#: src/panasonicmn.cpp:172
-msgid "Lowest (-2)"
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
 msgstr ""
 
-#: src/panasonicmn.cpp:173
-msgid "Highest (+2)"
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
 msgstr ""
 
-#: src/panasonicmn.cpp:179
-msgid "10s"
-msgstr "10с"
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
+msgstr ""
 
-#: src/panasonicmn.cpp:180
-msgid "2s"
-msgstr "2с"
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
+msgstr ""
 
-#: src/panasonicmn.cpp:200
-msgid "EX optics"
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
 msgstr ""
 
-#: src/panasonicmn.cpp:207
-msgid "Telephoto"
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
 msgstr ""
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
+#: src/olympusmn.cpp:566
 #, fuzzy
-msgid "Home"
-msgstr "Рим"
+msgid "7500K (Fine Weather with Shade)"
+msgstr "Ясная погода"
 
-#: src/panasonicmn.cpp:219
+#: src/olympusmn.cpp:567
 #, fuzzy
-msgid "Standard (color)"
-msgstr "Стандартный свет A"
+msgid "6000K (Cloudy)"
+msgstr "Облачно"
 
-#: src/panasonicmn.cpp:220
+#: src/olympusmn.cpp:568
 #, fuzzy
-msgid "Dynamic (color)"
-msgstr "Динамический диапазон"
+msgid "5300K (Fine Weather)"
+msgstr "Ясная погода"
 
-#: src/panasonicmn.cpp:221
-#, fuzzy
-msgid "Nature (color)"
-msgstr "Естественный цвет"
+#: src/olympusmn.cpp:569
+msgid "3000K (Tungsten light)"
+msgstr ""
 
-#: src/panasonicmn.cpp:222
-msgid "Smooth (color)"
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
+msgid "3600K (Tungsten light-like)"
 msgstr ""
 
-#: src/panasonicmn.cpp:223
+#: src/olympusmn.cpp:571
 #, fuzzy
-msgid "Standard (B&W)"
-msgstr "Стандартный свет A"
+msgid "6600K (Daylight fluorescent)"
+msgstr "Флуоресцентная лампа"
 
-#: src/panasonicmn.cpp:224
+#: src/olympusmn.cpp:572
 #, fuzzy
-msgid "Dynamic (B&W)"
-msgstr "Динамический диапазон"
-
-#: src/panasonicmn.cpp:225
-msgid "Smooth (B&W)"
-msgstr ""
+msgid "4500K (Neutral white fluorescent)"
+msgstr "Флуоресцентная лампа"
 
-#: src/panasonicmn.cpp:239
-msgid "Audio"
-msgstr "Звук"
+#: src/olympusmn.cpp:573
+#, fuzzy
+msgid "4000K (Cool white fluorescent)"
+msgstr "Флуоресцентная лампа"
 
-#: src/panasonicmn.cpp:242
+#: src/olympusmn.cpp:575
 #, fuzzy
-msgid "White balance adjustment"
-msgstr "Точная подстройка баланса белого"
+msgid "Custom WB 1"
+msgstr "Свой 1"
 
-#: src/panasonicmn.cpp:243
+#: src/olympusmn.cpp:576
 #, fuzzy
-msgid "FlashBias"
-msgstr "Вспышка"
+msgid "Custom WB 2"
+msgstr "Свой 2"
 
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
-msgid "Exif version"
-msgstr "Версия Exif"
+#: src/olympusmn.cpp:577
+#, fuzzy
+msgid "Custom WB 3"
+msgstr "Свой"
 
-#: src/panasonicmn.cpp:247
-msgid "Color Effect"
-msgstr "Цветовой эффект"
+#: src/olympusmn.cpp:578
+#, fuzzy
+msgid "Custom WB 4"
+msgstr "Свой 1"
 
-#: src/panasonicmn.cpp:247
-msgid "Color effect"
-msgstr "Цветовой эффект"
+#: src/olympusmn.cpp:579
+#, fuzzy
+msgid "Custom WB 5400K"
+msgstr "Свой 1"
 
-#: src/panasonicmn.cpp:248
-msgid ""
-"Time in 1/100 s from when the camera was powered on to when the image is "
-"written to memory card"
-msgstr ""
+#: src/olympusmn.cpp:580
+#, fuzzy
+msgid "Custom WB 2900K"
+msgstr "Свой 2"
 
-#: src/panasonicmn.cpp:249
+#: src/olympusmn.cpp:581
 #, fuzzy
-msgid "Burst Mode"
-msgstr "Способ фокусировки"
+msgid "Custom WB 8000K"
+msgstr "Свой 1"
 
-#: src/panasonicmn.cpp:249
+#: src/olympusmn.cpp:587
 #, fuzzy
-msgid "Burst mode"
-msgstr "Способ фокусировки"
+msgid "CM1 (Red Enhance)"
+msgstr "Баланс белого"
 
-#: src/panasonicmn.cpp:252
-msgid "NoiseReduction"
-msgstr "Подавление шума"
+#: src/olympusmn.cpp:588
+#, fuzzy
+msgid "CM2 (Green Enhance)"
+msgstr "Баланс белого"
 
-#: src/panasonicmn.cpp:253
+#: src/olympusmn.cpp:589
 #, fuzzy
-msgid "Self Timer"
-msgstr "Серийный номер"
+msgid "CM3 (Blue Enhance)"
+msgstr "Баланс белого"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
-msgid "Baby Age"
+#: src/olympusmn.cpp:590
+msgid "CM4 (Skin Tones)"
 msgstr ""
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
-msgid "Baby (or pet) age"
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
+msgid "Pro Photo RGB"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
 #, fuzzy
-msgid "Optical Zoom Mode"
-msgstr "Режим вспышки"
+msgid "Noise Filter"
+msgstr "Порядок заполнения"
 
-#: src/panasonicmn.cpp:259
+#: src/olympusmn.cpp:604
 #, fuzzy
-msgid "Optical zoom mode"
-msgstr "Режим вспышки"
+msgid "Noise Filter (ISO Boost)"
+msgstr "Порядок заполнения"
 
-#: src/panasonicmn.cpp:260
-#, fuzzy
-msgid "Conversion Lens"
-msgstr "Версии"
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
+msgid "Muted"
+msgstr ""
 
-#: src/panasonicmn.cpp:260
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
 #, fuzzy
-msgid "Conversion lens"
-msgstr "Яркость"
+msgid "Monotone"
+msgstr "Цветовое пространство"
 
-#: src/panasonicmn.cpp:261
-msgid "Travel Day"
+#: src/olympusmn.cpp:640
+msgid "SQ"
 msgstr ""
 
-#: src/panasonicmn.cpp:261
-msgid "Travel day"
+#: src/olympusmn.cpp:641
+msgid "HQ"
 msgstr ""
 
-#: src/panasonicmn.cpp:263
-#, fuzzy
-msgid "World Time Location"
-msgstr "Местоположение объекта съёмки"
+#: src/olympusmn.cpp:642
+msgid "SHQ"
+msgstr ""
 
-#: src/panasonicmn.cpp:263
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
 #, fuzzy
-msgid "World time location"
-msgstr "Местоположение объекта съёмки"
+msgid "On, Mode 1"
+msgstr "Тип сцены"
 
-#: src/panasonicmn.cpp:264
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
 #, fuzzy
-msgid "Program ISO"
-msgstr "Программа"
+msgid "On, Mode 2"
+msgstr "Тип сцены"
 
-#: src/panasonicmn.cpp:268
+#: src/olympusmn.cpp:651
 #, fuzzy
-msgid "WB Adjust AB"
-msgstr "Подстройка оттенка"
+msgid "On, Mode 3"
+msgstr "Тип сцены"
 
-#: src/panasonicmn.cpp:268
-msgid "WB adjust AB. Positive is a shift toward blue."
-msgstr ""
+#: src/olympusmn.cpp:655
+#, fuzzy
+msgid "Camera Settings Version"
+msgstr "Настройки камеры"
 
-#: src/panasonicmn.cpp:269
+#: src/olympusmn.cpp:655
 #, fuzzy
-msgid "WB Adjust GM"
-msgstr "Подстройка оттенка"
+msgid "Camera settings version"
+msgstr "Настройки камеры"
 
-#: src/panasonicmn.cpp:269
-msgid "WBAdjustGM. Positive is a shift toward green."
-msgstr ""
+#: src/olympusmn.cpp:656
+#, fuzzy
+msgid "PreviewImage Valid"
+msgstr "Версия эскиза"
 
-#: src/panasonicmn.cpp:272
+#: src/olympusmn.cpp:656
 #, fuzzy
-msgid "Accessory Type"
-msgstr "Тип объектива"
+msgid "Preview image valid"
+msgstr "Версия эскиза"
 
-#: src/panasonicmn.cpp:272
+#: src/olympusmn.cpp:657
 #, fuzzy
-msgid "Accessory type"
-msgstr "Тип объектива"
+msgid "PreviewImage Start"
+msgstr "Данные эскиза"
 
-#: src/panasonicmn.cpp:275
+#: src/olympusmn.cpp:657
 #, fuzzy
-msgid "MakerNote Version"
-msgstr "Версия прошивки"
+msgid "Preview image start"
+msgstr "Версия эскиза"
 
-#: src/panasonicmn.cpp:275
+#: src/olympusmn.cpp:658
 #, fuzzy
-msgid "MakerNote version"
-msgstr "Версия прошивки"
+msgid "PreviewImage Length"
+msgstr "Длина изображения"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/olympusmn.cpp:658
 #, fuzzy
-msgid "WB Red Level"
-msgstr "Заряд батареи"
+msgid "Preview image length"
+msgstr "Версия эскиза"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/olympusmn.cpp:660
 #, fuzzy
-msgid "WB red level"
-msgstr "Под уровнем моря"
+msgid "Auto exposure lock"
+msgstr "Режим экспозиции"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/olympusmn.cpp:662
 #, fuzzy
-msgid "WB Green Level"
-msgstr "Заряд батареи"
+msgid "Exposure Shift"
+msgstr "Время экспозиции"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/olympusmn.cpp:662
 #, fuzzy
-msgid "WB green level"
-msgstr "Под уровнем моря"
+msgid "Exposure shift"
+msgstr "Время экспозиции"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/olympusmn.cpp:665
 #, fuzzy
-msgid "WB Blue Level"
-msgstr "Заряд батареи"
+msgid "Focus Process"
+msgstr "Способ фокусировки"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/olympusmn.cpp:665
 #, fuzzy
-msgid "WB blue level"
-msgstr "Под уровнем моря"
+msgid "Focus process"
+msgstr "Другой процесс проявки"
 
-#: src/panasonicmn.cpp:282
-msgid "Unknown PanasonicMakerNote tag"
+#: src/olympusmn.cpp:666
+msgid "AF Search"
 msgstr ""
 
-#: src/panasonicmn.cpp:299
+#: src/olympusmn.cpp:666
 #, fuzzy
-msgid "Spot mode on"
-msgstr "Режим замера"
-
-#: src/panasonicmn.cpp:300
-msgid "Spot mode off or 3-area (high speed)"
-msgstr ""
+msgid "AF search"
+msgstr "Использованная точка AF"
 
-#: src/panasonicmn.cpp:301
+#: src/olympusmn.cpp:667
 #, fuzzy
-msgid "Spot focussing"
-msgstr "Ручная фокусировка"
+msgid "AF Areas"
+msgstr "Способ фокусировки"
 
-#: src/panasonicmn.cpp:302
-msgid "5-area"
-msgstr ""
-
-#: src/panasonicmn.cpp:303
-msgid "1-area"
-msgstr ""
+#: src/olympusmn.cpp:667
+#, fuzzy
+msgid "AF areas"
+msgstr "Способ фокусировки"
 
-#: src/panasonicmn.cpp:304
-msgid "1-area (high speed)"
-msgstr ""
+#: src/olympusmn.cpp:668
+#, fuzzy
+msgid "AFPointSelected"
+msgstr "Использованная точка AF"
 
-#: src/panasonicmn.cpp:305
-msgid "3-area (auto)"
-msgstr ""
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF Fine Tune Adjust"
+msgstr "Использованная точка AF"
 
-#: src/panasonicmn.cpp:306
-msgid "3-area (left)"
-msgstr ""
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF fine tune adjust"
+msgstr "Использованная точка AF"
 
-#: src/panasonicmn.cpp:307
-msgid "3-area (center)"
-msgstr ""
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash Remote Control"
+msgstr "Пульт Д/У?"
 
-#: src/panasonicmn.cpp:308
-msgid "3-area (right)"
-msgstr ""
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash remote control"
+msgstr "Пульт Д/У?"
 
-#: src/panasonicmn.cpp:320
-msgid " EV"
-msgstr " EV"
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash Control Mode"
+msgstr "Режим вспышки"
 
-#: src/panasonicmn.cpp:329
+#: src/olympusmn.cpp:673
 #, fuzzy
-msgid "Panasonic raw version"
-msgstr "Версия прошивки"
+msgid "Flash control mode"
+msgstr "Режим вспышки"
 
-#: src/panasonicmn.cpp:330
+#: src/olympusmn.cpp:674
 #, fuzzy
-msgid "Sensor Width"
-msgstr "Ширина изображения"
+msgid "Flash Intensity"
+msgstr "Вспышка сработала"
 
-#: src/panasonicmn.cpp:330
+#: src/olympusmn.cpp:674
 #, fuzzy
-msgid "Sensor width"
-msgstr "Авторские права"
+msgid "Flash intensity"
+msgstr "Вспышка сработала"
 
-#: src/panasonicmn.cpp:331
+#: src/olympusmn.cpp:675
 #, fuzzy
-msgid "Sensor Height"
-msgstr "Очистка сенсора"
+msgid "Manual Flash Strength"
+msgstr "Фокусное расстояние"
 
-#: src/panasonicmn.cpp:331
+#: src/olympusmn.cpp:675
 #, fuzzy
-msgid "Sensor height"
-msgstr "Очистка сенсора"
+msgid "Manual flash strength"
+msgstr "Ручная экспозиция"
 
-#: src/panasonicmn.cpp:332
-msgid "Sensor Top Border"
-msgstr ""
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
+#, fuzzy
+msgid "White Balance 2"
+msgstr "Баланс белого"
 
-#: src/panasonicmn.cpp:332
-msgid "Sensor top border"
-msgstr ""
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
+#, fuzzy
+msgid "White balance 2"
+msgstr "Баланс белого"
 
-#: src/panasonicmn.cpp:333
-msgid "Sensor Left Border"
-msgstr ""
+#: src/olympusmn.cpp:677
+#, fuzzy
+msgid "White Balance Temperature"
+msgstr "Таблица баланса белого"
 
-#: src/panasonicmn.cpp:333
-msgid "Sensor left border"
-msgstr ""
+#: src/olympusmn.cpp:677
+#, fuzzy
+msgid "White balance temperature"
+msgstr "Таблица баланса белого"
 
-#: src/panasonicmn.cpp:336
-msgid "Red balance (found in Digilux 2 RAW images)"
-msgstr ""
+#: src/olympusmn.cpp:679
+#, fuzzy
+msgid "Custom Saturation"
+msgstr "Насыщенность"
 
-#: src/panasonicmn.cpp:342
+#: src/olympusmn.cpp:679
 #, fuzzy
-msgid "Preview Image"
-msgstr "Версия эскиза"
+msgid "Custom saturation"
+msgstr "Насыщенность"
 
-#: src/panasonicmn.cpp:342
+#: src/olympusmn.cpp:680
 #, fuzzy
-msgid "Preview image"
-msgstr "Версия эскиза"
+msgid "Modified Saturation"
+msgstr "Насыщенность"
 
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
-msgid "Manufacturer"
-msgstr "Производитель"
+#: src/olympusmn.cpp:680
+#, fuzzy
+msgid "Modified saturation"
+msgstr "Насыщенность"
 
-#: src/panasonicmn.cpp:343
-msgid "The manufacturer of the recording equipment"
-msgstr ""
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
+#, fuzzy
+msgid "Contrast Setting"
+msgstr "Настройка контраста"
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
-msgid "Model"
-msgstr "Модель"
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
+#, fuzzy
+msgid "Sharpness Setting"
+msgstr "Настройка резкости"
 
-#: src/panasonicmn.cpp:344
-msgid "The model name or model number of the equipment"
-msgstr ""
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+#, fuzzy
+msgid "Distortion Correction"
+msgstr "Без коррекции"
 
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
-msgid "Strip Offsets"
-msgstr ""
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
+#, fuzzy
+msgid "Distortion correction"
+msgstr "Без коррекции"
 
-#: src/panasonicmn.cpp:345
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
 #, fuzzy
-msgid "Strip offsets"
-msgstr "Режим захвата"
+msgid "Shading Compensation"
+msgstr "Тонкомпенсация"
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
-msgid "Orientation"
-msgstr "Ориентация"
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
+#, fuzzy
+msgid "Shading compensation"
+msgstr "Тонкомпенсация"
 
-#: src/panasonicmn.cpp:347
-msgid "Rows Per Strip"
-msgstr ""
+#: src/olympusmn.cpp:688
+#, fuzzy
+msgid "Compression Factor"
+msgstr "Уровень сжатия"
 
-#: src/panasonicmn.cpp:347
+#: src/olympusmn.cpp:688
 #, fuzzy
-msgid "The number of rows per strip"
-msgstr "Число F"
+msgid "Compression factor"
+msgstr "Уровень сжатия"
 
-#: src/panasonicmn.cpp:348
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
 #, fuzzy
-msgid "Strip Byte Counts"
-msgstr "Выдержка"
+msgid "Gradation"
+msgstr "Длительность"
 
-#: src/panasonicmn.cpp:348
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
 #, fuzzy
-msgid "Strip byte counts"
-msgstr "Выдержка"
+msgid "Picture mode"
+msgstr "Портретный режим"
 
-#: src/panasonicmn.cpp:349
+#: src/olympusmn.cpp:691
 #, fuzzy
-msgid "Raw Data Offset"
-msgstr "Уникальный ID изображения"
+msgid "Picture Mode Saturation"
+msgstr "Насыщенность"
 
-#: src/panasonicmn.cpp:349
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
 #, fuzzy
-msgid "Raw data offset"
-msgstr "Неизвестный набор данных"
+msgid "Picture mode saturation"
+msgstr "Портретный режим"
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
-msgid "Exif IFD Pointer"
-msgstr "Указатель Exif IFD"
+#: src/olympusmn.cpp:692
+#, fuzzy
+msgid "Picture Mode Hue"
+msgstr "Портретный режим"
 
-#: src/panasonicmn.cpp:350
-msgid "A pointer to the Exif IFD"
-msgstr ""
+#: src/olympusmn.cpp:692
+#, fuzzy
+msgid "Picture mode hue"
+msgstr "Портретный режим"
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
-msgid "GPS Info IFD Pointer"
-msgstr "Указатель GPS Info IFD"
+#: src/olympusmn.cpp:693
+#, fuzzy
+msgid "Picture Mode Contrast"
+msgstr "Портретный режим"
 
-#: src/panasonicmn.cpp:351
-msgid "A pointer to the GPS Info IFD"
-msgstr ""
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
+#, fuzzy
+msgid "Picture mode contrast"
+msgstr "Портретный режим"
 
-#: src/panasonicmn.cpp:353
+#: src/olympusmn.cpp:694
 #, fuzzy
-msgid "Unknown PanasonicRaw tag"
-msgstr "Неизвестный тэг"
+msgid "Picture Mode Sharpness"
+msgstr "Портретный режим"
 
-#: src/pentaxmn.cpp:56
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
 #, fuzzy
-msgid "Night-Scene"
-msgstr "Ночная съёмка"
+msgid "Picture mode sharpness"
+msgstr "Портретный режим"
 
-#: src/pentaxmn.cpp:62
-msgid "Optio 330/430"
-msgstr ""
+#: src/olympusmn.cpp:695
+#, fuzzy
+msgid "Picture Mode BW Filter"
+msgstr "Портретный режим"
 
-#: src/pentaxmn.cpp:63
-msgid "Optio 230"
-msgstr "Optio 230"
+#: src/olympusmn.cpp:695
+#, fuzzy
+msgid "Picture mode BW filter"
+msgstr "Портретный режим"
 
-#: src/pentaxmn.cpp:64
-msgid "Optio 330GS"
-msgstr ""
+#: src/olympusmn.cpp:696
+#, fuzzy
+msgid "Picture Mode Tone"
+msgstr "Портретный режим"
 
-#: src/pentaxmn.cpp:65
-msgid "Optio 450/550"
-msgstr ""
+#: src/olympusmn.cpp:696
+#, fuzzy
+msgid "Picture mode tone"
+msgstr "Портретный режим"
 
-#: src/pentaxmn.cpp:66
-msgid "Optio S"
-msgstr "Optio S"
+#: src/olympusmn.cpp:697
+#, fuzzy
+msgid "Noise filter"
+msgstr "Цветовое пространство"
 
-#: src/pentaxmn.cpp:67
-msgid "*ist D"
-msgstr ""
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art Filter"
+msgstr "Порядок заполнения"
 
-#: src/pentaxmn.cpp:68
-msgid "Optio 33L"
-msgstr "Optio 33L"
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art filter"
+msgstr "Цветовое пространство"
 
-#: src/pentaxmn.cpp:69
-msgid "Optio 33LF"
-msgstr "Optio 33LF"
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic Filter"
+msgstr "Цифровой фильтр"
 
-#: src/pentaxmn.cpp:70
-msgid "Optio 33WR/43WR/555"
-msgstr ""
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic filter"
+msgstr "Цифровой фильтр"
 
-#: src/pentaxmn.cpp:71
-msgid "Optio S4"
-msgstr "Optio S4"
+#: src/olympusmn.cpp:701
+#, fuzzy
+msgid "Panorama Mode"
+msgstr "Панорама"
 
-#: src/pentaxmn.cpp:72
+#: src/olympusmn.cpp:701
+#, fuzzy
+msgid "Panorama mode"
+msgstr "Кадр панорамы"
+
+#: src/olympusmn.cpp:702
+#, fuzzy
+msgid "Image Quality 2"
+msgstr "Качество"
+
+#: src/olympusmn.cpp:702
+#, fuzzy
+msgid "Image quality 2"
+msgstr "Качество изображения"
+
+#: src/olympusmn.cpp:704
+#, fuzzy
+msgid "Manometer Pressure"
+msgstr "Несжатый"
+
+#: src/olympusmn.cpp:704
+#, fuzzy
+msgid "Manometer pressure"
+msgstr "Несжатый"
+
+#: src/olympusmn.cpp:705
+#, fuzzy
+msgid "Manometer Reading"
+msgstr "Несжатый"
+
+#: src/olympusmn.cpp:705
+#, fuzzy
+msgid "Manometer reading"
+msgstr "Несжатый"
+
+#: src/olympusmn.cpp:706
+#, fuzzy
+msgid "Extended WB Detect"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:706
+#, fuzzy
+msgid "Extended WB detect"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
+msgstr ""
+
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:710
+#, fuzzy
+msgid "Unknown OlympusCs tag"
+msgstr "Неизвестное поле"
+
+#: src/olympusmn.cpp:721
+msgid "Simple E-System"
+msgstr ""
+
+#: src/olympusmn.cpp:722
+msgid "E-System"
+msgstr ""
+
+#: src/olympusmn.cpp:739
+#, fuzzy
+msgid "Equipment Version"
+msgstr "Версия файла"
+
+#: src/olympusmn.cpp:739
+#, fuzzy
+msgid "Equipment version"
+msgstr "Версия Exif"
+
+#: src/olympusmn.cpp:741
+msgid "Serial number"
+msgstr "Серийный номер"
+
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+#, fuzzy
+msgid "Lens Serial Number"
+msgstr "Серийный номер"
+
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
+#, fuzzy
+msgid "Lens serial number"
+msgstr "Серийный номер камеры"
+
+#: src/olympusmn.cpp:747 src/properties.cpp:374
+#, fuzzy
+msgid "Lens Model"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:747
+#, fuzzy
+msgid "Lens model"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:748
+#, fuzzy
+msgid "Lens Firmware Version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:748
+#, fuzzy
+msgid "Lens firmware version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:753
+#, fuzzy
+msgid "Max Aperture At Current Focal"
+msgstr "Максимально открытая диафрагма"
+
+#: src/olympusmn.cpp:753
+#, fuzzy
+msgid "Max aperture at current focal"
+msgstr "Максимально открытая диафрагма"
+
+#: src/olympusmn.cpp:754
+#, fuzzy
+msgid "Lens Properties"
+msgstr "Температура объектива"
+
+#: src/olympusmn.cpp:754
+#, fuzzy
+msgid "Lens properties"
+msgstr "Температура объектива"
+
+#: src/olympusmn.cpp:755
+#, fuzzy
+msgid "Extender"
+msgstr "внешняя"
+
+#: src/olympusmn.cpp:756
+#, fuzzy
+msgid "Extender Serial Number"
+msgstr "Серийный номер камеры"
+
+#: src/olympusmn.cpp:756
+#, fuzzy
+msgid "Extender serial number"
+msgstr "Серийный номер камеры"
+
+#: src/olympusmn.cpp:757
+#, fuzzy
+msgid "Extender Model"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:757
+#, fuzzy
+msgid "Extender model"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:758
+#, fuzzy
+msgid "Extender Firmware Version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:758
+#, fuzzy
+msgid "Extender firmwareversion"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:760 src/properties.cpp:370
+#, fuzzy
+msgid "Flash Model"
+msgstr "Режим вспышки"
+
+#: src/olympusmn.cpp:760
+#, fuzzy
+msgid "Flash model"
+msgstr "Режим вспышки"
+
+#: src/olympusmn.cpp:761
+#, fuzzy
+msgid "Flash Firmware Version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:761
+#, fuzzy
+msgid "Flash firmware version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:762
+#, fuzzy
+msgid "FlashSerialNumber"
+msgstr "Серийный номер"
+
+#: src/olympusmn.cpp:764
+#, fuzzy
+msgid "Unknown OlympusEq tag"
+msgstr "Неизвестный тег Exif"
+
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
+#, fuzzy
+msgid "High Speed"
+msgstr "Ночная съёмка"
+
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
+#, fuzzy
+msgid "High Function"
+msgstr "Насыщенность"
+
+#: src/olympusmn.cpp:783
+#, fuzzy
+msgid "Advanced High Speed"
+msgstr "Ночная съёмка"
+
+#: src/olympusmn.cpp:784
+#, fuzzy
+msgid "Advanced High Function"
+msgstr "Функция передачи"
+
+#: src/olympusmn.cpp:789
+#, fuzzy
+msgid "Original"
+msgstr "Исходная дата и время"
+
+#: src/olympusmn.cpp:790
+#, fuzzy
+msgid "Edited (Landscape)"
+msgstr "Альбом"
+
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
+#, fuzzy
+msgid "Edited (Portrait)"
+msgstr "Ночной портрет"
+
+#: src/olympusmn.cpp:797
+#, fuzzy
+msgid "WB Color Temp"
+msgstr "Цветовое пространство"
+
+#: src/olympusmn.cpp:798
+#, fuzzy
+msgid "WB Gray Point"
+msgstr "Использованная точка AF"
+
+#: src/olympusmn.cpp:808
+#, fuzzy
+msgid "Raw Development Version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:808
+#, fuzzy
+msgid "Raw development version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
+#, fuzzy
+msgid "Exposure Bias Value"
+msgstr "Смещение экспозиции"
+
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
+#, fuzzy
+msgid "Exposure bias value"
+msgstr "Смещение экспозиции"
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+#, fuzzy
+msgid "White Balance Value"
+msgstr "Таблица баланса белого"
+
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
+#, fuzzy
+msgid "White balance value"
+msgstr "Таблица баланса белого"
+
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
+#, fuzzy
+msgid "WB Fine Adjustment"
+msgstr "Подстройка оттенка"
+
+#: src/olympusmn.cpp:811
+#, fuzzy
+msgid "WB fine adjustment"
+msgstr "Коррекция тона"
+
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
+#, fuzzy
+msgid "Gray Point"
+msgstr "Использованная точка AF"
+
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
+#, fuzzy
+msgid "Gray point"
+msgstr "Использованная точка AF"
+
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+#, fuzzy
+msgid "Saturation Emphasis"
+msgstr "Настройка контраста"
+
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
+#, fuzzy
+msgid "Saturation emphasis"
+msgstr "Настройка контраста"
+
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
+msgid "Memory Color Emphasis"
+msgstr "Цвет"
+
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
+msgid "Memory color emphasis"
+msgstr "Цвет"
+
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+#, fuzzy
+msgid "Contrast Value"
+msgstr "Контраст"
+
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
+#, fuzzy
+msgid "Contrast value"
+msgstr "Контраст"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+#, fuzzy
+msgid "Sharpness Value"
+msgstr "Резкость"
+
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
+#, fuzzy
+msgid "Sharpness value"
+msgstr "Резкость"
+
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
+#, fuzzy
+msgid "Engine"
+msgstr "Звукооператор"
+
+#: src/olympusmn.cpp:820
+#, fuzzy
+msgid "Edit status"
+msgstr "Статус правки"
+
+#: src/olympusmn.cpp:821
+#, fuzzy
+msgid "Settings"
+msgstr "Настройка резкости"
+
+#: src/olympusmn.cpp:823
+#, fuzzy
+msgid "Unknown OlympusRd tag"
+msgstr "Неизвестное поле"
+
+#: src/olympusmn.cpp:878
+#, fuzzy
+msgid "Raw Development 2 Version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:878
+#, fuzzy
+msgid "Raw development 2 version"
+msgstr "Версия прошивки"
+
+#: src/olympusmn.cpp:882
+#, fuzzy
+msgid "White balance fine adjustment"
+msgstr "Точная подстройка баланса белого"
+
+#: src/olympusmn.cpp:892
+#, fuzzy
+msgid "PM Saturation"
+msgstr "Насыщенность"
+
+#: src/olympusmn.cpp:893
+#, fuzzy
+msgid "PM Contrast"
+msgstr "Контраст"
+
+#: src/olympusmn.cpp:894
+#, fuzzy
+msgid "PM Sharpness"
+msgstr "Резкость"
+
+#: src/olympusmn.cpp:895
+#, fuzzy
+msgid "PM BW Filter"
+msgstr "Порядок заполнения"
+
+#: src/olympusmn.cpp:895
+#, fuzzy
+msgid "PM BW filter"
+msgstr "Порядок заполнения"
+
+#: src/olympusmn.cpp:896
+#, fuzzy
+msgid "PM Picture Tone"
+msgstr "Портретный режим"
+
+#: src/olympusmn.cpp:896
+#, fuzzy
+msgid "PM picture tone"
+msgstr "Портретный режим"
+
+#: src/olympusmn.cpp:899
+#, fuzzy
+msgid "Auto Gradation"
+msgstr "Длительность звукозаписи"
+
+#: src/olympusmn.cpp:899
+#, fuzzy
+msgid "Auto gradation"
+msgstr "Длительность звукозаписи"
+
+#: src/olympusmn.cpp:900
+#, fuzzy
+msgid "PM Noise Filter"
+msgstr "Порядок заполнения"
+
+#: src/olympusmn.cpp:900
+#, fuzzy
+msgid "Picture mode noise filter"
+msgstr "Портретный режим"
+
+#: src/olympusmn.cpp:902
+#, fuzzy
+msgid "Unknown OlympusRd2 tag"
+msgstr "Неизвестное поле"
+
+#: src/olympusmn.cpp:913
+#, fuzzy
+msgid "On (2 frames)"
+msgstr "Вкл"
+
+#: src/olympusmn.cpp:914
+#, fuzzy
+msgid "On (3 frames)"
+msgstr "Вкл"
+
+#: src/olympusmn.cpp:919
+msgid "4:3"
+msgstr ""
+
+#: src/olympusmn.cpp:920
+#, fuzzy
+msgid "3:2"
+msgstr "250"
+
+#: src/olympusmn.cpp:921
+msgid "16:9"
+msgstr ""
+
+#: src/olympusmn.cpp:922
+msgid "6:6"
+msgstr ""
+
+#: src/olympusmn.cpp:923
+msgid "5:4"
+msgstr ""
+
+#: src/olympusmn.cpp:924
+msgid "7:6"
+msgstr ""
+
+#: src/olympusmn.cpp:925
+#, fuzzy
+msgid "6:5"
+msgstr "D65"
+
+#: src/olympusmn.cpp:926
+#, fuzzy
+msgid "7:5"
+msgstr "D75"
+
+#: src/olympusmn.cpp:927
+msgid "3:4"
+msgstr ""
+
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image Processing Version"
+msgstr "Резкость изображения"
+
+#: src/olympusmn.cpp:931
+#, fuzzy
+msgid "Image processing version"
+msgstr "Резкость изображения"
+
+#: src/olympusmn.cpp:933
+#, fuzzy
+msgid "WB RB Levels 3000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:933
+#, fuzzy
+msgid "WB RB levels 3000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:934
+#, fuzzy
+msgid "WB RB Levels 3300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:934
+#, fuzzy
+msgid "WB RB levels 3300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:935
+#, fuzzy
+msgid "WB RB Levels 3600K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:935
+#, fuzzy
+msgid "WB RB levels 3600K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:936
+#, fuzzy
+msgid "WB RB Levels 3900K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:936
+#, fuzzy
+msgid "WB RB levels 3900K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:937
+#, fuzzy
+msgid "WB RB Levels 4000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:937
+#, fuzzy
+msgid "WB RB levels 4000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:938
+#, fuzzy
+msgid "WB RB Levels 4300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:938
+#, fuzzy
+msgid "WB RB levels 4300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:939
+#, fuzzy
+msgid "WB RB Levels 4500K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:939
+#, fuzzy
+msgid "WB RB levels 4500K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:940
+#, fuzzy
+msgid "WB RB Levels 4800K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:940
+#, fuzzy
+msgid "WB RB levels 4800K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:941
+#, fuzzy
+msgid "WB RB Levels 5300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:941
+#, fuzzy
+msgid "WB RB levels 5300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:942
+#, fuzzy
+msgid "WB RB Levels 6000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:942
+#, fuzzy
+msgid "WB RB levels 6000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:943
+#, fuzzy
+msgid "WB RB Levels 6600K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:943
+#, fuzzy
+msgid "WB RB levels 6600K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:944
+#, fuzzy
+msgid "WB RB Levels 7500K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:944
+#, fuzzy
+msgid "WB RB levels 7500K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:945
+#, fuzzy
+msgid "WB RB Levels CWB1"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:945
+#, fuzzy
+msgid "WB RB levels CWB1"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:946
+#, fuzzy
+msgid "WB RB Levels CWB2"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:946
+#, fuzzy
+msgid "WB RB levels CWB2"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:947
+#, fuzzy
+msgid "WB RB Levels CWB3"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:947
+#, fuzzy
+msgid "WB RB levels CWB3"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:948
+#, fuzzy
+msgid "WB RB Levels CWB4"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:948
+#, fuzzy
+msgid "WB RB levels CWB4"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:949
+#, fuzzy
+msgid "WB G Level 3000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:949
+#, fuzzy
+msgid "WB G level 3000K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:950
+#, fuzzy
+msgid "WB G Level 3300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:950
+#, fuzzy
+msgid "WB G level 3300K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:951
+#, fuzzy
+msgid "WB G Level 3600K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:951
+#, fuzzy
+msgid "WB G level 3600K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:952
+#, fuzzy
+msgid "WB G Level 3900K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:952
+#, fuzzy
+msgid "WB G level 3900K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:953
+#, fuzzy
+msgid "WB G Level 4000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:953
+#, fuzzy
+msgid "WB G level 4000K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:954
+#, fuzzy
+msgid "WB G Level 4300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:954
+#, fuzzy
+msgid "WB G level 4300K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:955
+#, fuzzy
+msgid "WB G Level 4500K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:955
+#, fuzzy
+msgid "WB G level 4500K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:956
+#, fuzzy
+msgid "WB G Level 4800K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:956
+#, fuzzy
+msgid "WB G level 4800K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:957
+#, fuzzy
+msgid "WB G Level 5300K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:957
+#, fuzzy
+msgid "WB G level 5300K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:958
+#, fuzzy
+msgid "WB G Level 6000K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:958
+#, fuzzy
+msgid "WB G level 6000K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:959
+#, fuzzy
+msgid "WB G Level 6600K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:959
+#, fuzzy
+msgid "WB G level 6600K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:960
+#, fuzzy
+msgid "WB G Level 7500K"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:960
+#, fuzzy
+msgid "WB G level 7500K"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:961
+#, fuzzy
+msgid "WB G Level"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:961
+#, fuzzy
+msgid "WB G level"
+msgstr "Под уровнем моря"
+
+#: src/olympusmn.cpp:963
+#, fuzzy
+msgid "Enhancer"
+msgstr "Звукооператор"
+
+#: src/olympusmn.cpp:964
+#, fuzzy
+msgid "Enhancer Values"
+msgstr "Звукооператор"
+
+#: src/olympusmn.cpp:964
+#, fuzzy
+msgid "Enhancer values"
+msgstr "Звукооператор"
+
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
+msgid "Coring Filter"
+msgstr "Цветовое пространство"
+
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring Values"
+msgstr "Яркость"
+
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
+#, fuzzy
+msgid "Coring values"
+msgstr "Яркость"
+
+#: src/olympusmn.cpp:967 src/tags.cpp:913
+#, fuzzy
+msgid "Black Level"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:968
+msgid "Gain Base"
+msgstr ""
+
+#: src/olympusmn.cpp:968
+msgid "Gain base"
+msgstr ""
+
+#: src/olympusmn.cpp:969
+msgid "Valid Bits"
+msgstr ""
+
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
+#, fuzzy
+msgid "Crop Left"
+msgstr "справа налево"
+
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
+#, fuzzy
+msgid "Crop left"
+msgstr "справа налево"
+
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
+#, fuzzy
+msgid "Crop Top"
+msgstr "Монохромный"
+
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
+#, fuzzy
+msgid "Crop top"
+msgstr "Монохромный"
+
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
+#, fuzzy
+msgid "Crop Width"
+msgstr "Авторские права"
+
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
+#, fuzzy
+msgid "Crop width"
+msgstr "Авторские права"
+
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
+#, fuzzy
+msgid "Crop Height"
+msgstr "Авторские права"
+
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
+#, fuzzy
+msgid "Crop height"
+msgstr "Авторские права"
+
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple Exposure Mode"
+msgstr "Режим экспозиции"
+
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple exposure mode"
+msgstr "Режим экспозиции"
+
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+msgid "Aspect Ratio"
+msgstr ""
+
+#: src/olympusmn.cpp:978
+#, fuzzy
+msgid "Aspect ratio"
+msgstr "Длительность звукозаписи"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect Frame"
+msgstr "Название/имя объекта съёмки"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect frame"
+msgstr "Название/имя объекта съёмки"
+
+#: src/olympusmn.cpp:980
+#, fuzzy
+msgid "Face Detect"
+msgstr "Не удалось прочитать"
+
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+#, fuzzy
+msgid "Face detect"
+msgstr "Не удалось прочитать"
+
+#: src/olympusmn.cpp:981
+#, fuzzy
+msgid "Face Detect Area"
+msgstr "Не удалось прочитать"
+
+#: src/olympusmn.cpp:981
+#, fuzzy
+msgid "Face detect area"
+msgstr "Не удалось прочитать"
+
+#: src/olympusmn.cpp:983
+#, fuzzy
+msgid "Unknown OlympusIp tag"
+msgstr "Неизвестное поле IFD"
+
+#: src/olympusmn.cpp:993
+msgid "Bounce or Off"
+msgstr ""
+
+#: src/olympusmn.cpp:994
+msgid "Direct"
+msgstr ""
+
+#: src/olympusmn.cpp:998
+#, fuzzy
+msgid "Focus Info Version"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:998
+#, fuzzy
+msgid "Focus info version"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:999
+#, fuzzy
+msgid "Auto Focus"
+msgstr "AI Focus"
+
+#: src/olympusmn.cpp:1000
+#, fuzzy
+msgid "Scene Detect"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:1000
+#, fuzzy
+msgid "Scene detect"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:1001
+#, fuzzy
+msgid "Scene Area"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:1001
+#, fuzzy
+msgid "Scene area"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:1002
+#, fuzzy
+msgid "Scene Detect Data"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:1002
+#, fuzzy
+msgid "Scene detect data"
+msgstr "Тип сцены"
+
+#: src/olympusmn.cpp:1003
+#, fuzzy
+msgid "Zoom Step Count"
+msgstr "Выдержка"
+
+#: src/olympusmn.cpp:1004
+#, fuzzy
+msgid "Focus Step Count"
+msgstr "Продолжительный ведущий режим"
+
+#: src/olympusmn.cpp:1004
+#, fuzzy
+msgid "Focus step count"
+msgstr "Выдержка"
+
+#: src/olympusmn.cpp:1005
+#, fuzzy
+msgid "Focus Step Infinity"
+msgstr "Настройка контраста"
+
+#: src/olympusmn.cpp:1005
+#, fuzzy
+msgid "Focus step infinity"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:1006
+#, fuzzy
+msgid "Focus Step Near"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:1006
+#, fuzzy
+msgid "Focus step near"
+msgstr "Расстояние ручного фокуса"
+
+#: src/olympusmn.cpp:1009
+#, fuzzy
+msgid "External Flash"
+msgstr "Внешняя вспышка"
+
+#: src/olympusmn.cpp:1010
+#, fuzzy
+msgid "External Flash Guide Number"
+msgstr "Встроенная вспышка"
+
+#: src/olympusmn.cpp:1010
+#, fuzzy
+msgid "External flash guide number"
+msgstr "Встроенная вспышка"
+
+#: src/olympusmn.cpp:1014
+#, fuzzy
+msgid "Manual Flash"
+msgstr "Ручная экспозиция"
+
+#: src/olympusmn.cpp:1014
+#, fuzzy
+msgid "Manual flash"
+msgstr "Ручная экспозиция"
+
+#: src/olympusmn.cpp:1018
+#, fuzzy
+msgid "Unknown OlympusFi tag"
+msgstr "Неизвестное поле IFD"
+
+#: src/olympusmn.cpp:1029
+#, fuzzy
+msgid "Unknown OlympusFe tag"
+msgstr "Неизвестное поле IFD"
+
+#: src/olympusmn.cpp:1042
+#, fuzzy
+msgid "Fine Weather"
+msgstr "Ясная погода"
+
+#: src/olympusmn.cpp:1043
+#, fuzzy
+msgid "Tungsten (incandescent)"
+msgstr "Яркая лампа накаливания"
+
+#: src/olympusmn.cpp:1044
+#, fuzzy
+msgid "Evening Sunlight"
+msgstr "Вечер"
+
+#: src/olympusmn.cpp:1045
+#, fuzzy
+msgid "Daylight Fluorescent (D 5700 - 7100K)"
+msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+
+#: src/olympusmn.cpp:1046
+#, fuzzy
+msgid "Day White Fluorescent (N 4600 - 5400K)"
+msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+
+#: src/olympusmn.cpp:1047
+#, fuzzy
+msgid "Cool White Fluorescent (W 3900 - 4500K)"
+msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+
+#: src/olympusmn.cpp:1048
+#, fuzzy
+msgid "White Fluorescent (WW 3200 - 3700K)"
+msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
+
+#: src/olympusmn.cpp:1049
+#, fuzzy
+msgid "One Touch White Balance"
+msgstr "Автомат. баланс белого"
+
+#: src/olympusmn.cpp:1050
+#, fuzzy
+msgid "Custom 1-4"
+msgstr "Свой 1"
+
+#: src/olympusmn.cpp:1054
+#, fuzzy
+msgid "Raw Info Version"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:1054
+#, fuzzy
+msgid "Raw info version"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:1055
+#, fuzzy
+msgid "WB_RB Levels Used"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1055
+#, fuzzy
+msgid "WB_RB levels used"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1056
+#, fuzzy
+msgid "WB_RB Levels Auto"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1056
+#, fuzzy
+msgid "WB_RB levels auto"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1057
+#, fuzzy
+msgid "WB_RB Levels Shade"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1057
+#, fuzzy
+msgid "WB_RB levels shade"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1058
+#, fuzzy
+msgid "WB_RB Levels Cloudy"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1058
+#, fuzzy
+msgid "WB_RB levels cloudy"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1059
+#, fuzzy
+msgid "WB_RB Levels Fine Weather"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1059
+#, fuzzy
+msgid "WB_RB levels fine weather"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1060
+#, fuzzy
+msgid "WB_RB Levels Tungsten"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1060
+#, fuzzy
+msgid "WB_RB levels tungsten"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1061
+#, fuzzy
+msgid "WB_RB Levels Evening Sunlight"
+msgstr "Вечер"
+
+#: src/olympusmn.cpp:1061
+#, fuzzy
+msgid "WB_RB levels evening sunlight"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1062
+#, fuzzy
+msgid "WB_RB Levels Daylight Fluor"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1062
+#, fuzzy
+msgid "WB_RB levels daylight fluor"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1063
+#, fuzzy
+msgid "WB_RB Levels Day White Fluor"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1063
+#, fuzzy
+msgid "WB_RB levels day white fluor"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1064
+#, fuzzy
+msgid "WB_RB Levels Cool White Fluor"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1064
+#, fuzzy
+msgid "WB_RB levels cool white fluor"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1065
+#, fuzzy
+msgid "WB_RB Levels White Fluorescent"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1065
+#, fuzzy
+msgid "WB_RB levels white fluorescent"
+msgstr "Флуоресцентная лампа"
+
+#: src/olympusmn.cpp:1066
+#, fuzzy
+msgid "Color Matrix2"
+msgstr "Цветовое пространство"
+
+#: src/olympusmn.cpp:1066
+#, fuzzy
+msgid "Color matrix 2"
+msgstr "Цветовое пространство"
+
+#: src/olympusmn.cpp:1069
+#, fuzzy
+msgid "Black Level 2"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1069
+#, fuzzy
+msgid "Black level 2"
+msgstr "Заряд батареи"
+
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
+msgid "YCbCr Coefficients"
+msgstr "Коэффициенты YCbCr"
+
+#: src/olympusmn.cpp:1070
+#, fuzzy
+msgid "YCbCr coefficients"
+msgstr "Коэффициенты YCbCr"
+
+#: src/olympusmn.cpp:1071
+msgid "Valid Pixel Depth"
+msgstr ""
+
+#: src/olympusmn.cpp:1071
+msgid "Valid pixel depth"
+msgstr ""
+
+#: src/olympusmn.cpp:1077
+#, fuzzy
+msgid "White Balance Comp"
+msgstr "Баланс белого"
+
+#: src/olympusmn.cpp:1077
+#, fuzzy
+msgid "White balance comp"
+msgstr "Баланс белого"
+
+#: src/olympusmn.cpp:1078
+#, fuzzy
+msgid "Saturation Setting"
+msgstr "Настройка контраста"
+
+#: src/olympusmn.cpp:1079
+#, fuzzy
+msgid "Hue Setting"
+msgstr "Настройка резкости"
+
+#: src/olympusmn.cpp:1079
+#, fuzzy
+msgid "Hue setting"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:1082
+#, fuzzy
+msgid "CM Exposure Compensation"
+msgstr "Тонкомпенсация"
+
+#: src/olympusmn.cpp:1082
+#, fuzzy
+msgid "CM exposure compensation"
+msgstr "Компенсация экспозиции"
+
+#: src/olympusmn.cpp:1083
+#, fuzzy
+msgid "CM White Balance"
+msgstr "Баланс белого"
+
+#: src/olympusmn.cpp:1083
+#, fuzzy
+msgid "CM white balance"
+msgstr "Автомат. баланс белого"
+
+#: src/olympusmn.cpp:1084
+#, fuzzy
+msgid "CM White Balance Comp"
+msgstr "Баланс белого"
+
+#: src/olympusmn.cpp:1084
+#, fuzzy
+msgid "CM white balance comp"
+msgstr "Автомат. баланс белого"
+
+#: src/olympusmn.cpp:1085
+#, fuzzy
+msgid "CM White Balance Gray Point"
+msgstr "Настройка баланса белого"
+
+#: src/olympusmn.cpp:1085
+#, fuzzy
+msgid "CM white balance gray point"
+msgstr "Настройка баланса белого"
+
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM Saturation"
+msgstr "Насыщенность"
+
+#: src/olympusmn.cpp:1086
+#, fuzzy
+msgid "CM saturation"
+msgstr "Насыщенность"
+
+#: src/olympusmn.cpp:1087
+#, fuzzy
+msgid "CM Hue"
+msgstr "Цветовое пространство"
+
+#: src/olympusmn.cpp:1087
+#, fuzzy
+msgid "CM hue"
+msgstr "Цветовое пространство"
+
+#: src/olympusmn.cpp:1088
+#, fuzzy
+msgid "CM Contrast"
+msgstr "Контраст"
+
+#: src/olympusmn.cpp:1088
+#, fuzzy
+msgid "CM contrast"
+msgstr "Контраст"
+
+#: src/olympusmn.cpp:1089
+#, fuzzy
+msgid "CM Sharpness"
+msgstr "Резкость"
+
+#: src/olympusmn.cpp:1089
+#, fuzzy
+msgid "CM sharpness"
+msgstr "Резкость"
+
+#: src/olympusmn.cpp:1091
+#, fuzzy
+msgid "Unknown OlympusRi tag"
+msgstr "Неизвестное поле"
+
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
+#, fuzzy
+msgid "User-Selected"
+msgstr "Автобрекетирование"
+
+#: src/olympusmn.cpp:1115
+#, fuzzy
+msgid "Auto-Override"
+msgstr "Перезаписать"
+
+#: src/olympusmn.cpp:1151
+#, fuzzy
+msgid "Fast"
+msgstr "быстрый"
+
+#: src/olympusmn.cpp:1208
+msgid "3000 Kelvin"
+msgstr "3000 K"
+
+#: src/olympusmn.cpp:1209
+msgid "3700 Kelvin"
+msgstr "3700 K"
+
+#: src/olympusmn.cpp:1210
+msgid "4000 Kelvin"
+msgstr "4000 K"
+
+#: src/olympusmn.cpp:1211
+msgid "4500 Kelvin"
+msgstr "4500 K"
+
+#: src/olympusmn.cpp:1212
+msgid "5500 Kelvin"
+msgstr "5500 K"
+
+#: src/olympusmn.cpp:1213
+msgid "6500 Kelvin"
+msgstr "6500 K"
+
+#: src/olympusmn.cpp:1214
+msgid "7500 Kelvin"
+msgstr "7500 K"
+
+#: src/olympusmn.cpp:1220
+msgid "One-touch"
+msgstr "One-touch"
+
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
+msgstr ""
+
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
+msgstr ""
+
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
+msgstr ""
+
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
+msgstr ""
+
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
+msgstr ""
+
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
+msgstr ""
+
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
+msgstr ""
+
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
+msgstr ""
+
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1386
+#, fuzzy
+msgid "Imager AF"
+msgstr "Уникальный ID изображения"
+
+#: src/olympusmn.cpp:1387
+#, fuzzy
+msgid "AF sensor"
+msgstr "Использованная точка AF"
+
+#: src/olympusmn.cpp:1433
+#, fuzzy
+msgid "Soft Focus"
+msgstr "Ручная фокусировка"
+
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
+msgstr ""
+
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
+msgstr ""
+
+#: src/olympusmn.cpp:1436
+#, fuzzy
+msgid "Light Tone"
+msgstr "справа налево"
+
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
+msgstr ""
+
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
+msgstr ""
+
+#: src/olympusmn.cpp:1439
+#, fuzzy
+msgid "Diorama"
+msgstr "Панорама"
+
+#: src/olympusmn.cpp:1440
+#, fuzzy
+msgid "Cross Process"
+msgstr "Способ фокусировки"
+
+#: src/olympusmn.cpp:1441
+#, fuzzy
+msgid "Fish Eye"
+msgstr "Внешняя вспышка"
+
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
+msgstr ""
+
+#: src/olympusmn.cpp:1489
+#, fuzzy
+msgid "Left (or n/a)"
+msgstr "Левая"
+
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
+msgid "Center (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
+msgid "Center (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1504
+#, fuzzy
+msgid "Top-center (horizontal)"
+msgstr "Центральный"
+
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1506
+#, fuzzy
+msgid "Left (horizontal)"
+msgstr "Левая"
+
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1510
+#, fuzzy
+msgid "Right (horizontal)"
+msgstr "справа налево"
+
+#: src/olympusmn.cpp:1511
+#, fuzzy
+msgid "Bottom-left (horizontal)"
+msgstr "справа налево"
+
+#: src/olympusmn.cpp:1512
+#, fuzzy
+msgid "Bottom-center (horizontal)"
+msgstr "слева направо"
+
+#: src/olympusmn.cpp:1513
+#, fuzzy
+msgid "Bottom-right (horizontal)"
+msgstr "слева направо"
+
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1515
+#, fuzzy
+msgid "Top-center (vertical)"
+msgstr "Центральный"
+
+#: src/olympusmn.cpp:1516
+#, fuzzy
+msgid "Top-right (vertical)"
+msgstr "Авторские и смежные права"
+
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1520
+#, fuzzy
+msgid "Mid-right (vertical)"
+msgstr "слева направо"
+
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1522
+#, fuzzy
+msgid "Bottom-left (vertical)"
+msgstr "справа налево"
+
+#: src/olympusmn.cpp:1523
+#, fuzzy
+msgid "Bottom-center (vertical)"
+msgstr "слева направо"
+
+#: src/olympusmn.cpp:1524
+#, fuzzy
+msgid "Bottom-right (vertical)"
+msgstr "слева направо"
+
+#: src/olympusmn.cpp:1561
+#, fuzzy
+msgid "Single Target"
+msgstr "One-Shot"
+
+#: src/olympusmn.cpp:1562
+msgid "All Target"
+msgstr ""
+
+#: src/olympusmn.cpp:1563
+#, fuzzy
+msgid "Dynamic Single Target"
+msgstr "Настройка баланса белого"
+
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
+#, fuzzy
+msgid "Very High"
+msgstr "Высокий"
+
+#: src/panasonicmn.cpp:59
+#, fuzzy
+msgid "Motion Picture"
+msgstr "Портретный режим"
+
+#: src/panasonicmn.cpp:67
+msgid "Halogen"
+msgstr ""
+
+#: src/panasonicmn.cpp:79
+#, fuzzy
+msgid "Auto, focus button"
+msgstr "AI Focus"
+
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
+#, fuzzy
+msgid "Auto, continuous"
+msgstr "Продолжительный ведущий режим"
+
+#: src/panasonicmn.cpp:95
+msgid "Tele-macro"
+msgstr "Теле-макро"
+
+#: src/panasonicmn.cpp:103
+msgid "Scenery"
+msgstr "Тип сцены"
+
+#: src/panasonicmn.cpp:108
+msgid "Shutter-speed priority"
+msgstr "Приоритет выдержки"
+
+#: src/panasonicmn.cpp:112
+#, fuzzy
+msgid "Movie preview"
+msgstr "Выполняется запись"
+
+#: src/panasonicmn.cpp:113
+#, fuzzy
+msgid "Panning"
+msgstr "Предупреждение"
+
+#: src/panasonicmn.cpp:114
+#, fuzzy
+msgid "Simple"
+msgstr "Файл"
+
+#: src/panasonicmn.cpp:115
+#, fuzzy
+msgid "Color effects"
+msgstr "Цветовой эффект"
+
+#: src/panasonicmn.cpp:119
+msgid "Night scenery"
+msgstr "Ночная съёмка"
+
+#: src/panasonicmn.cpp:121
+msgid "Baby"
+msgstr ""
+
+#: src/panasonicmn.cpp:122
+#, fuzzy
+msgid "Soft skin"
+msgstr "О снимке"
+
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
+#, fuzzy
+msgid "Candlelight"
+msgstr "Дневной свет"
+
+#: src/panasonicmn.cpp:124
+#, fuzzy
+msgid "Starry night"
+msgstr "Стандартный свет A"
+
+#: src/panasonicmn.cpp:125
+#, fuzzy
+msgid "High sensitivity"
+msgstr "Спектральная чувствительность"
+
+#: src/panasonicmn.cpp:126
+#, fuzzy
+msgid "Panorama assist"
+msgstr "Панорама"
+
+#: src/panasonicmn.cpp:129
+msgid "Aerial photo"
+msgstr ""
+
+#: src/panasonicmn.cpp:132
+#, fuzzy
+msgid "Intelligent ISO"
+msgstr "Фокусное расстояние"
+
+#: src/panasonicmn.cpp:133
+#, fuzzy
+msgid "High speed continuous shooting"
+msgstr "Способ фокусировки"
+
+#: src/panasonicmn.cpp:134
+#, fuzzy
+msgid "Intelligent auto"
+msgstr "Фокусное расстояние"
+
+#: src/panasonicmn.cpp:146
+msgid "Warm"
+msgstr "Тёплый"
+
+#: src/panasonicmn.cpp:147
+#, fuzzy
+msgid "Cool"
+msgstr "Цвет"
+
+#: src/panasonicmn.cpp:155
+#, fuzzy
+msgid "Low/High quality"
+msgstr "Качество изображения"
+
+#: src/panasonicmn.cpp:156
+msgid "Infinite"
+msgstr "Бесконечный"
+
+#: src/panasonicmn.cpp:164
+#, fuzzy
+msgid "Medium low"
+msgstr "Низкий"
+
+#: src/panasonicmn.cpp:165
+#, fuzzy
+msgid "Medium high"
+msgstr "Высокий"
+
+#: src/panasonicmn.cpp:175
+msgid "Low (-1)"
+msgstr ""
+
+#: src/panasonicmn.cpp:176
+#, fuzzy
+msgid "High (+1)"
+msgstr "Высокий"
+
+#: src/panasonicmn.cpp:177
+msgid "Lowest (-2)"
+msgstr ""
+
+#: src/panasonicmn.cpp:178
+#, fuzzy
+msgid "Highest (+2)"
+msgstr "Высокий"
+
+#: src/panasonicmn.cpp:184
+msgid "10s"
+msgstr "10с"
+
+#: src/panasonicmn.cpp:185
+msgid "2s"
+msgstr "2с"
+
+#: src/panasonicmn.cpp:205
+msgid "EX optics"
+msgstr ""
+
+#: src/panasonicmn.cpp:212
+msgid "Telephoto"
+msgstr ""
+
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
+#, fuzzy
+msgid "Home"
+msgstr "Рим"
+
+#: src/panasonicmn.cpp:225
+#, fuzzy
+msgid "Standard (color)"
+msgstr "Стандартный свет A"
+
+#: src/panasonicmn.cpp:226
+#, fuzzy
+msgid "Dynamic (color)"
+msgstr "Динамический диапазон"
+
+#: src/panasonicmn.cpp:227
+#, fuzzy
+msgid "Nature (color)"
+msgstr "Естественный цвет"
+
+#: src/panasonicmn.cpp:228
+#, fuzzy
+msgid "Smooth (color)"
+msgstr "Стандартный свет A"
+
+#: src/panasonicmn.cpp:229
+#, fuzzy
+msgid "Standard (B&W)"
+msgstr "Стандартный свет A"
+
+#: src/panasonicmn.cpp:230
+#, fuzzy
+msgid "Dynamic (B&W)"
+msgstr "Динамический диапазон"
+
+#: src/panasonicmn.cpp:231
+#, fuzzy
+msgid "Smooth (B&W)"
+msgstr "Стандартный свет A"
+
+#: src/panasonicmn.cpp:245
+msgid "Audio"
+msgstr "Звук"
+
+#: src/panasonicmn.cpp:248
+#, fuzzy
+msgid "White balance adjustment"
+msgstr "Точная подстройка баланса белого"
+
+#: src/panasonicmn.cpp:249
+#, fuzzy
+msgid "FlashBias"
+msgstr "Вспышка"
+
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
+msgid "Exif version"
+msgstr "Версия Exif"
+
+#: src/panasonicmn.cpp:253
+msgid "Color Effect"
+msgstr "Цветовой эффект"
+
+#: src/panasonicmn.cpp:253
+msgid "Color effect"
+msgstr "Цветовой эффект"
+
+#: src/panasonicmn.cpp:254
+msgid ""
+"Time in 1/100 s from when the camera was powered on to when the image is "
+"written to memory card"
+msgstr ""
+
+#: src/panasonicmn.cpp:255
+#, fuzzy
+msgid "Burst Mode"
+msgstr "Способ фокусировки"
+
+#: src/panasonicmn.cpp:255
+#, fuzzy
+msgid "Burst mode"
+msgstr "Способ фокусировки"
+
+#: src/panasonicmn.cpp:258
+msgid "NoiseReduction"
+msgstr "Подавление шума"
+
+#: src/panasonicmn.cpp:259
+#, fuzzy
+msgid "Self Timer"
+msgstr "Серийный номер"
+
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+msgid "Baby Age"
+msgstr ""
+
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+msgid "Baby (or pet) age"
+msgstr ""
+
+#: src/panasonicmn.cpp:265
+#, fuzzy
+msgid "Optical Zoom Mode"
+msgstr "Режим вспышки"
+
+#: src/panasonicmn.cpp:265
+#, fuzzy
+msgid "Optical zoom mode"
+msgstr "Режим вспышки"
+
+#: src/panasonicmn.cpp:266
+#, fuzzy
+msgid "Conversion Lens"
+msgstr "Версии"
+
+#: src/panasonicmn.cpp:266
+#, fuzzy
+msgid "Conversion lens"
+msgstr "Яркость"
+
+#: src/panasonicmn.cpp:267
+msgid "Travel Day"
+msgstr ""
+
+#: src/panasonicmn.cpp:267
+msgid "Travel day"
+msgstr ""
+
+#: src/panasonicmn.cpp:269
+#, fuzzy
+msgid "World Time Location"
+msgstr "Местоположение объекта съёмки"
+
+#: src/panasonicmn.cpp:269
+#, fuzzy
+msgid "World time location"
+msgstr "Местоположение объекта съёмки"
+
+#: src/panasonicmn.cpp:270
+#, fuzzy
+msgid "Program ISO"
+msgstr "Программа"
+
+#: src/panasonicmn.cpp:274
+#, fuzzy
+msgid "WB Adjust AB"
+msgstr "Подстройка оттенка"
+
+#: src/panasonicmn.cpp:274
+msgid "WB adjust AB. Positive is a shift toward blue."
+msgstr ""
+
+#: src/panasonicmn.cpp:275
+#, fuzzy
+msgid "WB Adjust GM"
+msgstr "Подстройка оттенка"
+
+#: src/panasonicmn.cpp:275
+msgid "WBAdjustGM. Positive is a shift toward green."
+msgstr ""
+
+#: src/panasonicmn.cpp:278
+#, fuzzy
+msgid "Accessory Type"
+msgstr "Тип объектива"
+
+#: src/panasonicmn.cpp:278
+#, fuzzy
+msgid "Accessory type"
+msgstr "Тип объектива"
+
+#: src/panasonicmn.cpp:281
+#, fuzzy
+msgid "MakerNote Version"
+msgstr "Версия прошивки"
+
+#: src/panasonicmn.cpp:281
+#, fuzzy
+msgid "MakerNote version"
+msgstr "Версия прошивки"
+
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
+#, fuzzy
+msgid "WB Red Level"
+msgstr "Заряд батареи"
+
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
+#, fuzzy
+msgid "WB red level"
+msgstr "Под уровнем моря"
+
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
+#, fuzzy
+msgid "WB Green Level"
+msgstr "Заряд батареи"
+
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
+#, fuzzy
+msgid "WB green level"
+msgstr "Под уровнем моря"
+
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
+#, fuzzy
+msgid "WB Blue Level"
+msgstr "Заряд батареи"
+
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
+#, fuzzy
+msgid "WB blue level"
+msgstr "Под уровнем моря"
+
+#: src/panasonicmn.cpp:288
+#, fuzzy
+msgid "Unknown PanasonicMakerNote tag"
+msgstr "Неизвестный тэг CanonMakerNote"
+
+#: src/panasonicmn.cpp:305
+#, fuzzy
+msgid "Spot mode on"
+msgstr "Режим замера"
+
+#: src/panasonicmn.cpp:306
+msgid "Spot mode off or 3-area (high speed)"
+msgstr ""
+
+#: src/panasonicmn.cpp:307
+#, fuzzy
+msgid "Spot focussing"
+msgstr "Ручная фокусировка"
+
+#: src/panasonicmn.cpp:308
+msgid "5-area"
+msgstr ""
+
+#: src/panasonicmn.cpp:309
+msgid "1-area"
+msgstr ""
+
+#: src/panasonicmn.cpp:310
+msgid "1-area (high speed)"
+msgstr ""
+
+#: src/panasonicmn.cpp:311
+msgid "3-area (auto)"
+msgstr ""
+
+#: src/panasonicmn.cpp:312
+msgid "3-area (left)"
+msgstr ""
+
+#: src/panasonicmn.cpp:313
+msgid "3-area (center)"
+msgstr ""
+
+#: src/panasonicmn.cpp:314
+msgid "3-area (right)"
+msgstr ""
+
+#: src/panasonicmn.cpp:326
+msgid " EV"
+msgstr " EV"
+
+#: src/panasonicmn.cpp:335
+#, fuzzy
+msgid "Panasonic raw version"
+msgstr "Версия прошивки"
+
+#: src/panasonicmn.cpp:336
+#, fuzzy
+msgid "Sensor Width"
+msgstr "Ширина изображения"
+
+#: src/panasonicmn.cpp:336
+#, fuzzy
+msgid "Sensor width"
+msgstr "Авторские права"
+
+#: src/panasonicmn.cpp:337
+#, fuzzy
+msgid "Sensor Height"
+msgstr "Очистка сенсора"
+
+#: src/panasonicmn.cpp:337
+#, fuzzy
+msgid "Sensor height"
+msgstr "Очистка сенсора"
+
+#: src/panasonicmn.cpp:338
+msgid "Sensor Top Border"
+msgstr ""
+
+#: src/panasonicmn.cpp:338
+msgid "Sensor top border"
+msgstr ""
+
+#: src/panasonicmn.cpp:339
+msgid "Sensor Left Border"
+msgstr ""
+
+#: src/panasonicmn.cpp:339
+msgid "Sensor left border"
+msgstr ""
+
+#: src/panasonicmn.cpp:342
+msgid "Red balance (found in Digilux 2 RAW images)"
+msgstr ""
+
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
+msgid "Manufacturer"
+msgstr "Производитель"
+
+#: src/panasonicmn.cpp:349
+msgid "The manufacturer of the recording equipment"
+msgstr ""
+
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
+msgid "Model"
+msgstr "Модель"
+
+#: src/panasonicmn.cpp:350
+#, fuzzy
+msgid "The model name or model number of the equipment"
+msgstr "Вид источника света"
+
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
+#, fuzzy
+msgid "Strip Offsets"
+msgstr "Режим захвата"
+
+#: src/panasonicmn.cpp:351
+#, fuzzy
+msgid "Strip offsets"
+msgstr "Режим захвата"
+
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
+msgid "Orientation"
+msgstr "Ориентация"
+
+#: src/panasonicmn.cpp:353
+msgid "Rows Per Strip"
+msgstr ""
+
+#: src/panasonicmn.cpp:353
+#, fuzzy
+msgid "The number of rows per strip"
+msgstr "Число F"
+
+#: src/panasonicmn.cpp:354
+#, fuzzy
+msgid "Strip Byte Counts"
+msgstr "Выдержка"
+
+#: src/panasonicmn.cpp:354
+#, fuzzy
+msgid "Strip byte counts"
+msgstr "Выдержка"
+
+#: src/panasonicmn.cpp:355
+#, fuzzy
+msgid "Raw Data Offset"
+msgstr "Уникальный ID изображения"
+
+#: src/panasonicmn.cpp:355
+#, fuzzy
+msgid "Raw data offset"
+msgstr "Неизвестный набор данных"
+
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
+msgid "Exif IFD Pointer"
+msgstr "Указатель Exif IFD"
+
+#: src/panasonicmn.cpp:356
+msgid "A pointer to the Exif IFD"
+msgstr ""
+
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
+msgid "GPS Info IFD Pointer"
+msgstr "Указатель GPS Info IFD"
+
+#: src/panasonicmn.cpp:357
+msgid "A pointer to the GPS Info IFD"
+msgstr ""
+
+#: src/panasonicmn.cpp:359
+#, fuzzy
+msgid "Unknown PanasonicRaw tag"
+msgstr "Неизвестный тэг"
+
+#: src/pentaxmn.cpp:57
+#, fuzzy
+msgid "Night-Scene"
+msgstr "Ночная съёмка"
+
+#: src/pentaxmn.cpp:63
+#, fuzzy
+msgid "Optio 330/430"
+msgstr "Optio 30"
+
+#: src/pentaxmn.cpp:64
+msgid "Optio 230"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:65
+#, fuzzy
+msgid "Optio 330GS"
+msgstr "Optio 30"
+
+#: src/pentaxmn.cpp:66
+#, fuzzy
+msgid "Optio 450/550"
+msgstr "Optio S40"
+
+#: src/pentaxmn.cpp:67
+msgid "Optio S"
+msgstr "Optio S"
+
+#: src/pentaxmn.cpp:68
+msgid "*ist D"
+msgstr ""
+
+#: src/pentaxmn.cpp:69
+msgid "Optio 33L"
+msgstr "Optio 33L"
+
+#: src/pentaxmn.cpp:70
+msgid "Optio 33LF"
+msgstr "Optio 33LF"
+
+#: src/pentaxmn.cpp:71
+msgid "Optio 33WR/43WR/555"
+msgstr ""
+
+#: src/pentaxmn.cpp:72
+msgid "Optio S4"
+msgstr "Optio S4"
+
+#: src/pentaxmn.cpp:73
 msgid "Optio MX"
 msgstr "Optio MX"
 
-#: src/pentaxmn.cpp:73
+#: src/pentaxmn.cpp:74
 msgid "Optio S40"
 msgstr "Optio S40"
 
-#: src/pentaxmn.cpp:74
+#: src/pentaxmn.cpp:75
 msgid "Optio S4i"
 msgstr "Optio S4i"
 
-#: src/pentaxmn.cpp:75
+#: src/pentaxmn.cpp:76
 msgid "Optio 30"
 msgstr "Optio 30"
 
-#: src/pentaxmn.cpp:76
+#: src/pentaxmn.cpp:77
 msgid "Optio S30"
 msgstr "Optio S30"
 
-#: src/pentaxmn.cpp:77
+#: src/pentaxmn.cpp:78
 msgid "Optio 750Z"
 msgstr "Optio 750Z"
 
-#: src/pentaxmn.cpp:78
+#: src/pentaxmn.cpp:79
 msgid "Optio SV"
 msgstr "Optio SV"
 
-#: src/pentaxmn.cpp:79
+#: src/pentaxmn.cpp:80
 msgid "Optio SVi"
 msgstr "Optio SVi"
 
-#: src/pentaxmn.cpp:80
+#: src/pentaxmn.cpp:81
 msgid "Optio X"
 msgstr "Optio X"
 
-#: src/pentaxmn.cpp:81
+#: src/pentaxmn.cpp:82
 msgid "Optio S5i"
 msgstr "Optio S5i"
 
-#: src/pentaxmn.cpp:82
+#: src/pentaxmn.cpp:83
 msgid "Optio S50"
 msgstr "Optio S50"
 
-#: src/pentaxmn.cpp:83
+#: src/pentaxmn.cpp:84
 msgid "*ist DS"
 msgstr ""
 
-#: src/pentaxmn.cpp:84
+#: src/pentaxmn.cpp:85
 msgid "Optio MX4"
 msgstr "Optio MX4"
 
-#: src/pentaxmn.cpp:85
+#: src/pentaxmn.cpp:86
 msgid "Optio S5n"
 msgstr "Optio S5n"
 
-#: src/pentaxmn.cpp:86
+#: src/pentaxmn.cpp:87
 msgid "Optio WP"
 msgstr "Optio WP"
 
-#: src/pentaxmn.cpp:87
+#: src/pentaxmn.cpp:88
 msgid "Optio S55"
 msgstr "Optio S55"
 
-#: src/pentaxmn.cpp:88
+#: src/pentaxmn.cpp:89
 msgid "Optio S5z"
 msgstr "Optio S5z"
 
-#: src/pentaxmn.cpp:89
+#: src/pentaxmn.cpp:90
 msgid "*ist DL"
 msgstr ""
 
-#: src/pentaxmn.cpp:90
+#: src/pentaxmn.cpp:91
 msgid "Optio S60"
 msgstr "Optio S60"
 
-#: src/pentaxmn.cpp:91
+#: src/pentaxmn.cpp:92
 msgid "Optio S45"
 msgstr "Optio S45"
 
-#: src/pentaxmn.cpp:92
+#: src/pentaxmn.cpp:93
 msgid "Optio S6"
 msgstr "Optio S6"
 
-#: src/pentaxmn.cpp:93
+#: src/pentaxmn.cpp:94
 msgid "Optio WPi"
 msgstr "Optio WPi"
 
-#: src/pentaxmn.cpp:94
+#: src/pentaxmn.cpp:95
 msgid "BenQ DC X600"
 msgstr ""
 
-#: src/pentaxmn.cpp:95
+#: src/pentaxmn.cpp:96
 msgid "*ist DS2"
 msgstr ""
 
-#: src/pentaxmn.cpp:96
+#: src/pentaxmn.cpp:97
 msgid "Samsung GX-1S"
 msgstr ""
 
-#: src/pentaxmn.cpp:97
+#: src/pentaxmn.cpp:98
 msgid "Optio A10"
 msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:98
+#: src/pentaxmn.cpp:99
 msgid "*ist DL2"
 msgstr ""
 
-#: src/pentaxmn.cpp:99
+#: src/pentaxmn.cpp:100
 msgid "Samsung GX-1L"
 msgstr ""
 
-#: src/pentaxmn.cpp:100
+#: src/pentaxmn.cpp:101
+#, fuzzy
 msgid "K100D"
-msgstr ""
+msgstr "100"
 
-#: src/pentaxmn.cpp:101
+#: src/pentaxmn.cpp:102
 msgid "K110D"
 msgstr ""
 
-#: src/pentaxmn.cpp:102
+#: src/pentaxmn.cpp:103
 msgid "K100D Super"
 msgstr ""
 
-#: src/pentaxmn.cpp:103
-msgid "Optio T10"
+#: src/pentaxmn.cpp:104
+#, fuzzy
+msgid "Optio T10/T20"
 msgstr "Optio T10"
 
-#: src/pentaxmn.cpp:104
+#: src/pentaxmn.cpp:105
 msgid "Optio W10"
 msgstr "Optio W10"
 
-#: src/pentaxmn.cpp:105
+#: src/pentaxmn.cpp:106
 msgid "Optio M10"
 msgstr "Optio M10"
 
-#: src/pentaxmn.cpp:106
+#: src/pentaxmn.cpp:107
 msgid "K10D"
 msgstr ""
 
-#: src/pentaxmn.cpp:107
+#: src/pentaxmn.cpp:108
 msgid "Samsung GX10"
 msgstr ""
 
-#: src/pentaxmn.cpp:108
+#: src/pentaxmn.cpp:109
 msgid "Optio S7"
 msgstr "Optio S7"
 
-#: src/pentaxmn.cpp:109
+#: src/pentaxmn.cpp:110
+#, fuzzy
+msgid "Optio L20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:111
 msgid "Optio M20"
 msgstr "Optio M20"
 
-#: src/pentaxmn.cpp:110
+#: src/pentaxmn.cpp:112
 msgid "Optio W20"
 msgstr "Optio W20"
 
-#: src/pentaxmn.cpp:111
+#: src/pentaxmn.cpp:113
 msgid "Optio A20"
 msgstr "Optio A20"
 
-#: src/pentaxmn.cpp:112
+#: src/pentaxmn.cpp:114
 msgid "Optio M30"
 msgstr "Optio M30"
 
-#: src/pentaxmn.cpp:113
+#: src/pentaxmn.cpp:115
 msgid "Optio E30"
 msgstr "Optio E30"
 
-#: src/pentaxmn.cpp:114
+#: src/pentaxmn.cpp:116
+#, fuzzy
+msgid "Optio E35"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:117
 msgid "Optio T30"
 msgstr "Optio T30"
 
-#: src/pentaxmn.cpp:115
+#: src/pentaxmn.cpp:118
 msgid "Optio W30"
 msgstr "Optio W30"
 
-#: src/pentaxmn.cpp:116
+#: src/pentaxmn.cpp:119
 msgid "Optio A30"
 msgstr "Optio A30"
 
-#: src/pentaxmn.cpp:117
+#: src/pentaxmn.cpp:120
 msgid "Optio E40"
 msgstr "Optio E40"
 
-#: src/pentaxmn.cpp:118
+#: src/pentaxmn.cpp:121
 msgid "Optio M40"
 msgstr "Optio M40"
 
-#: src/pentaxmn.cpp:119
+#: src/pentaxmn.cpp:122
 #, fuzzy
 msgid "Optio Z10"
 msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
+#: src/pentaxmn.cpp:123
+msgid "K20D"
+msgstr ""
+
+#: src/pentaxmn.cpp:124
+msgid "Samsung GX20"
+msgstr ""
+
+#: src/pentaxmn.cpp:125
 msgid "Optio S10"
 msgstr "Optio S10"
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
+#: src/pentaxmn.cpp:126
 #, fuzzy
 msgid "Optio A40"
 msgstr "Optio S40"
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
+#: src/pentaxmn.cpp:127
 #, fuzzy
 msgid "Optio V10"
 msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:123
-msgid "K20D"
-msgstr ""
-
-#: src/pentaxmn.cpp:127
+#: src/pentaxmn.cpp:128
 msgid "K200D"
 msgstr ""
 
-#: src/pentaxmn.cpp:128
+#: src/pentaxmn.cpp:129
+#, fuzzy
+msgid "Optio S12"
+msgstr "Optio S10"
+
+#: src/pentaxmn.cpp:130
 #, fuzzy
 msgid "Optio E50"
 msgstr "Optio S50"
 
-#: src/pentaxmn.cpp:129
+#: src/pentaxmn.cpp:131
 #, fuzzy
 msgid "Optio M50"
 msgstr "Optio S50"
 
+#: src/pentaxmn.cpp:132
+#, fuzzy
+msgid "Optio V20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:133
+#, fuzzy
+msgid "Optio W60"
+msgstr "Optio S60"
+
 #: src/pentaxmn.cpp:134
 #, fuzzy
+msgid "Optio M60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:135
+#, fuzzy
+msgid "Optio E60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:136
+msgid "K2000"
+msgstr ""
+
+#: src/pentaxmn.cpp:137
+msgid "K-m"
+msgstr ""
+
+#: src/pentaxmn.cpp:138
+#, fuzzy
+msgid "Optio P70"
+msgstr "Optio 750Z"
+
+#: src/pentaxmn.cpp:139
+#, fuzzy
+msgid "Optio E70"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:140
+msgid "X70"
+msgstr ""
+
+#: src/pentaxmn.cpp:141
+msgid "K-7"
+msgstr ""
+
+#: src/pentaxmn.cpp:142
+#, fuzzy
+msgid "Optio W80"
+msgstr "Optio W10"
+
+#: src/pentaxmn.cpp:143
+#, fuzzy
+msgid "Optio P80"
+msgstr "Optio 30"
+
+#: src/pentaxmn.cpp:144
+#, fuzzy
+msgid "Optio WS80"
+msgstr "Optio S40"
+
+#: src/pentaxmn.cpp:145
+msgid "K-x"
+msgstr ""
+
+#: src/pentaxmn.cpp:146
+msgid "645D"
+msgstr ""
+
+#: src/pentaxmn.cpp:147
+#, fuzzy
+msgid "Optio I-10"
+msgstr "Optio A10"
+
+#: src/pentaxmn.cpp:152
+#, fuzzy
 msgid "Good"
 msgstr "Пища"
 
-#: src/pentaxmn.cpp:135
+#: src/pentaxmn.cpp:153
 #, fuzzy
 msgid "Better"
 msgstr "Центральный"
 
-#: src/pentaxmn.cpp:136
+#: src/pentaxmn.cpp:154
 #, fuzzy
 msgid "Best"
 msgstr "Запад"
 
-#: src/pentaxmn.cpp:137
+#: src/pentaxmn.cpp:155
 msgid "TIFF"
 msgstr ""
 
-#: src/pentaxmn.cpp:139
+#: src/pentaxmn.cpp:157
 msgid "Premium"
 msgstr ""
 
-#: src/pentaxmn.cpp:144
+#: src/pentaxmn.cpp:162
 msgid "640x480"
 msgstr ""
 
-#: src/pentaxmn.cpp:145
-#, fuzzy
-msgid "Full"
-msgstr "Полный"
-
-#: src/pentaxmn.cpp:146
+#: src/pentaxmn.cpp:164
 msgid "1024x768"
 msgstr ""
 
-#: src/pentaxmn.cpp:147
+#: src/pentaxmn.cpp:165
 msgid "1280x960"
 msgstr ""
 
-#: src/pentaxmn.cpp:148
+#: src/pentaxmn.cpp:166
 msgid "1600x1200"
 msgstr ""
 
-#: src/pentaxmn.cpp:149
+#: src/pentaxmn.cpp:167
 msgid "2048x1536"
 msgstr ""
 
-#: src/pentaxmn.cpp:150
+#: src/pentaxmn.cpp:168
 msgid "2560x1920 or 2304x1728"
 msgstr ""
 
-#: src/pentaxmn.cpp:151
+#: src/pentaxmn.cpp:169
 msgid "3072x2304"
 msgstr ""
 
-#: src/pentaxmn.cpp:152
+#: src/pentaxmn.cpp:170
 msgid "3264x2448"
 msgstr ""
 
-#: src/pentaxmn.cpp:153
+#: src/pentaxmn.cpp:171
 msgid "320x240"
 msgstr ""
 
-#: src/pentaxmn.cpp:154
+#: src/pentaxmn.cpp:172
 msgid "2288x1712"
 msgstr ""
 
-#: src/pentaxmn.cpp:155
+#: src/pentaxmn.cpp:173
 msgid "2592x1944"
 msgstr ""
 
-#: src/pentaxmn.cpp:156
+#: src/pentaxmn.cpp:174
 msgid "2304x1728 or 2592x1944"
 msgstr ""
 
-#: src/pentaxmn.cpp:157
+#: src/pentaxmn.cpp:175
 msgid "3056x2296"
 msgstr ""
 
-#: src/pentaxmn.cpp:158
+#: src/pentaxmn.cpp:176
 msgid "2816x2212 or 2816x2112"
 msgstr ""
 
-#: src/pentaxmn.cpp:159
+#: src/pentaxmn.cpp:177
 msgid "3648x2736"
 msgstr ""
 
-#: src/pentaxmn.cpp:164
+#: src/pentaxmn.cpp:182
 #, fuzzy
 msgid "Auto, Did not fire"
 msgstr "Вспышка не сработала"
 
-#: src/pentaxmn.cpp:166
+#: src/pentaxmn.cpp:184
 #, fuzzy
 msgid "Auto, Did not fire, Red-eye reduction"
 msgstr "авто + подавление эффекта красных глаз"
 
-#: src/pentaxmn.cpp:167
+#: src/pentaxmn.cpp:185
 #, fuzzy
 msgid "Auto, Fired"
 msgstr "Автобрекетирование"
 
-#: src/pentaxmn.cpp:169
+#: src/pentaxmn.cpp:187
 #, fuzzy
 msgid "Auto, Fired, Red-eye reduction"
 msgstr "авто + подавление эффекта красных глаз"
 
-#: src/pentaxmn.cpp:170
+#: src/pentaxmn.cpp:188
 #, fuzzy
 msgid "On, Red-eye reduction"
 msgstr "Подавление эффекта красных глаз"
 
-#: src/pentaxmn.cpp:171
+#: src/pentaxmn.cpp:189
 msgid "On, Wireless"
 msgstr ""
 
-#: src/pentaxmn.cpp:172
+#: src/pentaxmn.cpp:190
 msgid "On, Soft"
 msgstr ""
 
-#: src/pentaxmn.cpp:173
+#: src/pentaxmn.cpp:191
 #, fuzzy
 msgid "On, Slow-sync"
 msgstr "медленная синхронизация"
 
-#: src/pentaxmn.cpp:174
+#: src/pentaxmn.cpp:192
 #, fuzzy
 msgid "On, Slow-sync, Red-eye reduction"
 msgstr "Да, с подавлением эффекта красных глаз"
 
-#: src/pentaxmn.cpp:175
+#: src/pentaxmn.cpp:193
 msgid "On, Trailing-curtain Sync"
 msgstr ""
 
-#: src/pentaxmn.cpp:184
+#: src/pentaxmn.cpp:203
 #, fuzzy
 msgid "Pan Focus"
 msgstr "Ручная фокусировка"
 
-#: src/pentaxmn.cpp:185
+#: src/pentaxmn.cpp:204
 msgid "AF-S"
 msgstr ""
 
-#: src/pentaxmn.cpp:186
+#: src/pentaxmn.cpp:205
 msgid "AF-C"
 msgstr ""
 
-#: src/pentaxmn.cpp:192
+#: src/pentaxmn.cpp:206
+msgid "AF-A"
+msgstr ""
+
+#: src/pentaxmn.cpp:212
 #, fuzzy
 msgid "Fixed Center"
 msgstr "Ясная погода"
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
+#: src/pentaxmn.cpp:213
+#, fuzzy
+msgid "Automatic Tracking AF"
+msgstr "Автоматический"
+
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
+msgstr ""
+
+#: src/pentaxmn.cpp:231
+#, fuzzy
+msgid "Fixed Center or multiple"
+msgstr "Ясная погода"
+
+#: src/pentaxmn.cpp:233
+#, fuzzy
+msgid "Top-center"
+msgstr "Центральный"
+
+#: src/pentaxmn.cpp:239
+#, fuzzy
+msgid "Bottom-center"
+msgstr "слева направо"
+
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
 msgid "50"
 msgstr "50"
 
-#: src/pentaxmn.cpp:209
+#: src/pentaxmn.cpp:246
 msgid "64"
 msgstr ""
 
-#: src/pentaxmn.cpp:210
+#: src/pentaxmn.cpp:247
+#, fuzzy
 msgid "80"
-msgstr ""
+msgstr "50"
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
 msgid "100"
 msgstr "100"
 
-#: src/pentaxmn.cpp:212
+#: src/pentaxmn.cpp:249
+#, fuzzy
 msgid "125"
-msgstr ""
+msgstr "250"
 
-#: src/pentaxmn.cpp:213
+#: src/pentaxmn.cpp:250
 msgid "160"
 msgstr "160"
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
+#, fuzzy
 msgid "200"
-msgstr ""
+msgstr "250"
 
-#: src/pentaxmn.cpp:215
+#: src/pentaxmn.cpp:252
 msgid "250"
 msgstr "250"
 
-#: src/pentaxmn.cpp:216
+#: src/pentaxmn.cpp:253
+#, fuzzy
 msgid "320"
-msgstr ""
+msgstr "250"
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
+#, fuzzy
 msgid "400"
-msgstr ""
+msgstr "100"
 
-#: src/pentaxmn.cpp:218
+#: src/pentaxmn.cpp:255
 msgid "500"
 msgstr "500"
 
-#: src/pentaxmn.cpp:219
+#: src/pentaxmn.cpp:256
+#, fuzzy
 msgid "640"
-msgstr ""
+msgstr "160"
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
+#, fuzzy
 msgid "800"
+msgstr "100"
+
+#: src/pentaxmn.cpp:258
+#, fuzzy
+msgid "1000"
+msgstr "100"
+
+#: src/pentaxmn.cpp:259
+#, fuzzy
+msgid "1250"
+msgstr "250"
+
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
+#, fuzzy
+msgid "1600"
+msgstr "100"
+
+#: src/pentaxmn.cpp:261
+msgid "2000"
+msgstr ""
+
+#: src/pentaxmn.cpp:262
+#, fuzzy
+msgid "2500"
+msgstr "250"
+
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
+msgid "3200"
+msgstr ""
+
+#: src/pentaxmn.cpp:264
+msgid "4000"
 msgstr ""
 
-#: src/pentaxmn.cpp:221
-msgid "1000"
+#: src/pentaxmn.cpp:265
+#, fuzzy
+msgid "5000"
+msgstr "500"
+
+#: src/pentaxmn.cpp:266
+msgid "6400"
 msgstr ""
 
-#: src/pentaxmn.cpp:222
-msgid "1250"
-msgstr ""
+#: src/pentaxmn.cpp:276
+#, fuzzy
+msgid "70"
+msgstr "50"
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
-msgid "1600"
-msgstr ""
+#: src/pentaxmn.cpp:278
+#, fuzzy
+msgid "140"
+msgstr "10с"
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
-msgid "3200"
+#: src/pentaxmn.cpp:280
+#, fuzzy
+msgid "280"
+msgstr "250"
+
+#: src/pentaxmn.cpp:282
+#, fuzzy
+msgid "560"
+msgstr "50"
+
+#: src/pentaxmn.cpp:284
+#, fuzzy
+msgid "1100"
+msgstr "100"
+
+#: src/pentaxmn.cpp:286
+msgid "2200"
 msgstr ""
 
-#: src/pentaxmn.cpp:249
+#: src/pentaxmn.cpp:304
+#, fuzzy
 msgid "Multi Segment"
-msgstr ""
+msgstr "Режим замера"
 
-#: src/pentaxmn.cpp:250
+#: src/pentaxmn.cpp:305
 #, fuzzy
 msgid "Center Weighted"
 msgstr "Центровзвешенный"
 
-#: src/pentaxmn.cpp:262
+#: src/pentaxmn.cpp:317
 #, fuzzy
 msgid "DaylightFluorescent"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:263
+#: src/pentaxmn.cpp:318
 #, fuzzy
 msgid "DaywhiteFluorescent"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:264
+#: src/pentaxmn.cpp:319
 #, fuzzy
 msgid "WhiteFluorescent"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:268
+#: src/pentaxmn.cpp:324
 #, fuzzy
 msgid "User Selected"
 msgstr "Автобрекетирование"
 
-#: src/pentaxmn.cpp:273
+#: src/pentaxmn.cpp:329
 #, fuzzy
 msgid "Auto (Daylight)"
 msgstr "Дневной свет"
 
-#: src/pentaxmn.cpp:274
+#: src/pentaxmn.cpp:330
+#, fuzzy
 msgid "Auto (Shade)"
-msgstr ""
+msgstr "Тень"
 
-#: src/pentaxmn.cpp:275
+#: src/pentaxmn.cpp:331
 #, fuzzy
 msgid "Auto (Flash)"
 msgstr "Автобрекетирование"
 
-#: src/pentaxmn.cpp:276
+#: src/pentaxmn.cpp:332
 #, fuzzy
 msgid "Auto (Tungsten)"
 msgstr "Лампа накаливания"
 
-#: src/pentaxmn.cpp:277
+#: src/pentaxmn.cpp:333
 #, fuzzy
 msgid "Auto (DaywhiteFluorescent)"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:278
+#: src/pentaxmn.cpp:334
 #, fuzzy
 msgid "Auto (WhiteFluorescent)"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:279
+#: src/pentaxmn.cpp:335
 #, fuzzy
 msgid "Auto (Cloudy)"
 msgstr "Облачно"
 
-#: src/pentaxmn.cpp:281
+#: src/pentaxmn.cpp:337
 #, fuzzy
 msgid "Preset (Fireworks?)"
 msgstr "Фейерверк"
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
 #, fuzzy
 msgid "Med Low"
 msgstr "Низкий"
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
 #, fuzzy
 msgid "Med High"
 msgstr "Высокий"
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-msgid "Very Low"
-msgstr ""
-
-#: src/pentaxmn.cpp:311
+#: src/pentaxmn.cpp:369
+#, fuzzy
 msgid "Med Soft"
-msgstr ""
+msgstr "Низкий"
 
-#: src/pentaxmn.cpp:312
+#: src/pentaxmn.cpp:370
+#, fuzzy
 msgid "Med Hard"
-msgstr ""
+msgstr "Высокий"
 
-#: src/pentaxmn.cpp:313
+#: src/pentaxmn.cpp:371
 msgid "Very Soft"
 msgstr ""
 
-#: src/pentaxmn.cpp:314
+#: src/pentaxmn.cpp:372
 #, fuzzy
 msgid "Very Hard"
 msgstr "Высокий"
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
+#, fuzzy
 msgid "Home town"
-msgstr ""
+msgstr "Тип изображения"
 
-#: src/pentaxmn.cpp:325
+#: src/pentaxmn.cpp:383
 msgid "Pago Pago"
 msgstr ""
 
-#: src/pentaxmn.cpp:326
+#: src/pentaxmn.cpp:384
 msgid "Honolulu"
 msgstr "Гонолулу"
 
-#: src/pentaxmn.cpp:327
+#: src/pentaxmn.cpp:385
 #, fuzzy
 msgid "Anchorage"
 msgstr "Средний"
 
-#: src/pentaxmn.cpp:328
+#: src/pentaxmn.cpp:386
 msgid "Vancouver"
 msgstr "Ванкувер"
 
-#: src/pentaxmn.cpp:329
+#: src/pentaxmn.cpp:387
 msgid "San Fransisco"
 msgstr ""
 
-#: src/pentaxmn.cpp:330
+#: src/pentaxmn.cpp:388
 msgid "Los Angeles"
 msgstr ""
 
-#: src/pentaxmn.cpp:331
+#: src/pentaxmn.cpp:389
 #, fuzzy
 msgid "Calgary"
 msgstr "Категория"
 
-#: src/pentaxmn.cpp:332
+#: src/pentaxmn.cpp:390
 #, fuzzy
 msgid "Denver"
 msgstr "Центральный"
 
-#: src/pentaxmn.cpp:333
+#: src/pentaxmn.cpp:391
 msgid "Mexico City"
 msgstr "Мехико"
 
-#: src/pentaxmn.cpp:334
+#: src/pentaxmn.cpp:392
 msgid "Chicago"
 msgstr "Чикаго"
 
-#: src/pentaxmn.cpp:335
+#: src/pentaxmn.cpp:393
 msgid "Miami"
 msgstr "Майами"
 
-#: src/pentaxmn.cpp:336
+#: src/pentaxmn.cpp:394
 msgid "Toronto"
 msgstr "Торонто"
 
-#: src/pentaxmn.cpp:337
+#: src/pentaxmn.cpp:395
 msgid "New York"
 msgstr "Нью-Йорк"
 
-#: src/pentaxmn.cpp:338
+#: src/pentaxmn.cpp:396
 msgid "Santiago"
 msgstr "Сантьяго"
 
-#: src/pentaxmn.cpp:339
+#: src/pentaxmn.cpp:397
 msgid "Caracus"
 msgstr ""
 
-#: src/pentaxmn.cpp:340
+#: src/pentaxmn.cpp:398
 msgid "Halifax"
 msgstr "Галифакс"
 
-#: src/pentaxmn.cpp:341
+#: src/pentaxmn.cpp:399
 msgid "Buenos Aires"
 msgstr "Буэнос-Айрэс"
 
-#: src/pentaxmn.cpp:342
+#: src/pentaxmn.cpp:400
 msgid "Sao Paulo"
 msgstr ""
 
-#: src/pentaxmn.cpp:343
+#: src/pentaxmn.cpp:401
 msgid "Rio de Janeiro"
 msgstr ""
 
-#: src/pentaxmn.cpp:344
+#: src/pentaxmn.cpp:402
 msgid "Madrid"
 msgstr "Мадрид"
 
-#: src/pentaxmn.cpp:345
+#: src/pentaxmn.cpp:403
 msgid "London"
 msgstr "Лондон"
 
-#: src/pentaxmn.cpp:346
+#: src/pentaxmn.cpp:404
 msgid "Paris"
 msgstr "Париж"
 
-#: src/pentaxmn.cpp:347
+#: src/pentaxmn.cpp:405
 msgid "Milan"
 msgstr "Милан"
 
-#: src/pentaxmn.cpp:348
+#: src/pentaxmn.cpp:406
 msgid "Rome"
 msgstr "Рим"
 
-#: src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:407
 msgid "Berlin"
 msgstr "Берлин"
 
-#: src/pentaxmn.cpp:350
+#: src/pentaxmn.cpp:408
 msgid "Johannesburg"
 msgstr ""
 
-#: src/pentaxmn.cpp:351
+#: src/pentaxmn.cpp:409
+#, fuzzy
 msgid "Istanbul"
-msgstr ""
+msgstr "Кабул"
 
-#: src/pentaxmn.cpp:352
+#: src/pentaxmn.cpp:410
 msgid "Cairo"
 msgstr "Каир"
 
-#: src/pentaxmn.cpp:353
+#: src/pentaxmn.cpp:411
 msgid "Jerusalem"
 msgstr "Иерусалим"
 
-#: src/pentaxmn.cpp:354
+#: src/pentaxmn.cpp:412
 msgid "Moscow"
 msgstr "Москва"
 
-#: src/pentaxmn.cpp:355
+#: src/pentaxmn.cpp:413
 msgid "Jeddah"
 msgstr ""
 
-#: src/pentaxmn.cpp:356
+#: src/pentaxmn.cpp:414
 msgid "Tehran"
 msgstr "Тегеран"
 
-#: src/pentaxmn.cpp:357
+#: src/pentaxmn.cpp:415
 msgid "Dubai"
 msgstr "Дубаи"
 
-#: src/pentaxmn.cpp:358
+#: src/pentaxmn.cpp:416
 msgid "Karachi"
 msgstr "Карачи"
 
-#: src/pentaxmn.cpp:359
+#: src/pentaxmn.cpp:417
 msgid "Kabul"
 msgstr "Кабул"
 
-#: src/pentaxmn.cpp:360
+#: src/pentaxmn.cpp:418
 #, fuzzy
 msgid "Male"
 msgstr "Ручная"
 
-#: src/pentaxmn.cpp:361
+#: src/pentaxmn.cpp:419
 msgid "Delhi"
 msgstr "Дели"
 
-#: src/pentaxmn.cpp:362
+#: src/pentaxmn.cpp:420
 #, fuzzy
 msgid "Colombo"
 msgstr "Цветовое пространство"
 
-#: src/pentaxmn.cpp:363
+#: src/pentaxmn.cpp:421
 msgid "Kathmandu"
 msgstr "Катманду"
 
-#: src/pentaxmn.cpp:364
+#: src/pentaxmn.cpp:422
+#, fuzzy
 msgid "Dacca"
-msgstr ""
+msgstr "Дакар"
 
-#: src/pentaxmn.cpp:365
+#: src/pentaxmn.cpp:423
 #, fuzzy
 msgid "Yangon"
 msgstr "ничего"
 
-#: src/pentaxmn.cpp:366
+#: src/pentaxmn.cpp:424
 msgid "Bangkok"
 msgstr "Бангкок"
 
-#: src/pentaxmn.cpp:367
+#: src/pentaxmn.cpp:425
 msgid "Kuala Lumpur"
 msgstr ""
 
-#: src/pentaxmn.cpp:368
+#: src/pentaxmn.cpp:426
 #, fuzzy
 msgid "Vientiane"
 msgstr "Ориентация"
 
-#: src/pentaxmn.cpp:369
+#: src/pentaxmn.cpp:427
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: src/pentaxmn.cpp:370
+#: src/pentaxmn.cpp:428
 msgid "Phnom Penh"
 msgstr ""
 
-#: src/pentaxmn.cpp:371
+#: src/pentaxmn.cpp:429
 msgid "Ho Chi Minh"
 msgstr ""
 
-#: src/pentaxmn.cpp:372
+#: src/pentaxmn.cpp:430
 msgid "Jakarta"
 msgstr "Джакарта"
 
-#: src/pentaxmn.cpp:373
+#: src/pentaxmn.cpp:431
 msgid "Hong Kong"
 msgstr "Гонконг"
 
-#: src/pentaxmn.cpp:374
+#: src/pentaxmn.cpp:432
 #, fuzzy
 msgid "Perth"
 msgstr "Север"
 
-#: src/pentaxmn.cpp:375
+#: src/pentaxmn.cpp:433
 msgid "Beijing"
 msgstr "Пекин"
 
-#: src/pentaxmn.cpp:376
+#: src/pentaxmn.cpp:434
 msgid "Shanghai"
 msgstr "Шанхай"
 
-#: src/pentaxmn.cpp:377
+#: src/pentaxmn.cpp:435
 #, fuzzy
 msgid "Manila"
 msgstr "Ручная"
 
-#: src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:436
+#, fuzzy
 msgid "Taipei"
-msgstr ""
+msgstr "Время отправки"
 
-#: src/pentaxmn.cpp:379
+#: src/pentaxmn.cpp:437
 msgid "Seoul"
 msgstr "Сеул"
 
-#: src/pentaxmn.cpp:380
+#: src/pentaxmn.cpp:438
 msgid "Adelaide"
 msgstr ""
 
-#: src/pentaxmn.cpp:381
+#: src/pentaxmn.cpp:439
 msgid "Tokyo"
 msgstr "Токио"
 
-#: src/pentaxmn.cpp:382
+#: src/pentaxmn.cpp:440
 msgid "Guam"
 msgstr ""
 
-#: src/pentaxmn.cpp:383
+#: src/pentaxmn.cpp:441
 msgid "Sydney"
 msgstr "Сидней"
 
-#: src/pentaxmn.cpp:384
+#: src/pentaxmn.cpp:442
 #, fuzzy
 msgid "Noumea"
 msgstr "Число F"
 
-#: src/pentaxmn.cpp:385
+#: src/pentaxmn.cpp:443
 msgid "Wellington"
 msgstr ""
 
-#: src/pentaxmn.cpp:386
+#: src/pentaxmn.cpp:444
 msgid "Auckland"
 msgstr ""
 
-#: src/pentaxmn.cpp:387
+#: src/pentaxmn.cpp:445
 msgid "Lima"
 msgstr "Лима"
 
-#: src/pentaxmn.cpp:388
+#: src/pentaxmn.cpp:446
 msgid "Dakar"
 msgstr "Дакар"
 
-#: src/pentaxmn.cpp:389
+#: src/pentaxmn.cpp:447
 msgid "Algiers"
 msgstr ""
 
-#: src/pentaxmn.cpp:390
+#: src/pentaxmn.cpp:448
 msgid "Helsinki"
 msgstr "Хельсинки"
 
-#: src/pentaxmn.cpp:391
+#: src/pentaxmn.cpp:449
 #, fuzzy
 msgid "Athens"
 msgstr "Объектив"
 
-#: src/pentaxmn.cpp:392
+#: src/pentaxmn.cpp:450
 msgid "Nairobi"
 msgstr "Найроби"
 
-#: src/pentaxmn.cpp:393
+#: src/pentaxmn.cpp:451
 msgid "Amsterdam"
 msgstr "Амстердам"
 
-#: src/pentaxmn.cpp:394
+#: src/pentaxmn.cpp:452
 msgid "Stockholm"
 msgstr "Стокгольм"
 
-#: src/pentaxmn.cpp:395
+#: src/pentaxmn.cpp:453
 msgid "Lisbon"
 msgstr ""
 
-#: src/pentaxmn.cpp:400
+#: src/pentaxmn.cpp:454
+#, fuzzy
+msgid "Copenhagen"
+msgstr "Охват"
+
+#: src/pentaxmn.cpp:459
 #, fuzzy
 msgid "Unprocessed"
 msgstr "Несжатый"
 
-#: src/pentaxmn.cpp:401
+#: src/pentaxmn.cpp:460
 msgid "Digital Filter"
 msgstr "Цифровой фильтр"
 
-#: src/pentaxmn.cpp:402
+#: src/pentaxmn.cpp:461
 #, fuzzy
 msgid "Cropped"
 msgstr "Монохромный"
 
-#: src/pentaxmn.cpp:404
+#: src/pentaxmn.cpp:463
 msgid "Frame Synthesis?"
 msgstr ""
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
 #, fuzzy
 msgid "MTF Program"
 msgstr "Программа"
 
-#: src/pentaxmn.cpp:416
+#: src/pentaxmn.cpp:475
 #, fuzzy
 msgid "Night Scene Portrait"
 msgstr "Ночной портрет"
 
-#: src/pentaxmn.cpp:417
+#: src/pentaxmn.cpp:476
 #, fuzzy
 msgid "No Flash"
 msgstr "Без вспышки"
 
-#: src/pentaxmn.cpp:420
+#: src/pentaxmn.cpp:479
 msgid "Surf & Snow"
 msgstr ""
 
-#: src/pentaxmn.cpp:423
+#: src/pentaxmn.cpp:482
 msgid "Kids"
 msgstr ""
 
-#: src/pentaxmn.cpp:428
+#: src/pentaxmn.cpp:487
+#, fuzzy
+msgid "Stage Lighting"
+msgstr "Длина изображения"
+
+#: src/pentaxmn.cpp:488
+#, fuzzy
+msgid "Night Snap"
+msgstr "Ночная съёмка"
+
+#: src/pentaxmn.cpp:490
+#, fuzzy
 msgid "Auto PICT (Standard)"
-msgstr ""
+msgstr "Альбом"
 
-#: src/pentaxmn.cpp:429
+#: src/pentaxmn.cpp:491
+#, fuzzy
 msgid "Auto PICT (Portrait)"
-msgstr ""
+msgstr "Автоматический контраст"
 
-#: src/pentaxmn.cpp:430
+#: src/pentaxmn.cpp:492
 #, fuzzy
 msgid "Auto PICT (Landscape)"
 msgstr "Альбом"
 
-#: src/pentaxmn.cpp:431
+#: src/pentaxmn.cpp:493
+#, fuzzy
 msgid "Auto PICT (Macro)"
-msgstr ""
+msgstr "Альбом"
 
-#: src/pentaxmn.cpp:432
+#: src/pentaxmn.cpp:494
+#, fuzzy
 msgid "Auto PICT (Sport)"
-msgstr ""
+msgstr "Альбом"
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
 #, fuzzy
 msgid "Green Mode"
 msgstr "Режим замера"
 
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
 #, fuzzy
 msgid "Shutter Speed Priority"
 msgstr "Приоритет выдержки"
 
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
 #, fuzzy
 msgid "Aperture Priority"
 msgstr "Приоритет диафрагмы"
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
 msgid "Bulb"
 msgstr ""
 
-#: src/pentaxmn.cpp:442
+#: src/pentaxmn.cpp:504
 #, fuzzy
 msgid "Hi-speed Program"
 msgstr "Программа экспозиции"
 
-#: src/pentaxmn.cpp:443
+#: src/pentaxmn.cpp:505
 #, fuzzy
 msgid "DOF Program"
 msgstr "Программа"
 
-#: src/pentaxmn.cpp:448
+#: src/pentaxmn.cpp:510
 #, fuzzy
 msgid "Program Tv Shift"
 msgstr "Программа"
 
-#: src/pentaxmn.cpp:449
+#: src/pentaxmn.cpp:511
 #, fuzzy
 msgid "Program Av Shift"
 msgstr "Программа"
 
-#: src/pentaxmn.cpp:452
+#: src/pentaxmn.cpp:514
 #, fuzzy
 msgid "Aperture Priority (Off-Auto-Aperture)"
 msgstr "Приоритет диафрагмы (Av)"
 
-#: src/pentaxmn.cpp:453
+#: src/pentaxmn.cpp:515
+#, fuzzy
 msgid "Manual (Off-Auto-Aperture)"
-msgstr ""
+msgstr "Приоритет диафрагмы (Av)"
 
-#: src/pentaxmn.cpp:454
+#: src/pentaxmn.cpp:516
+#, fuzzy
 msgid "Bulb (Off-Auto-Aperture)"
-msgstr ""
+msgstr "Приоритет диафрагмы (Av)"
 
-#: src/pentaxmn.cpp:456
+#: src/pentaxmn.cpp:518
 #, fuzzy
 msgid "Shutter Priority"
 msgstr "Приоритет выдержки"
 
-#: src/pentaxmn.cpp:457
+#: src/pentaxmn.cpp:519
 #, fuzzy
 msgid "Shutter & Aperture Priority AE"
 msgstr "Приоритет выдержки"
 
-#: src/pentaxmn.cpp:458
+#: src/pentaxmn.cpp:520
 #, fuzzy
 msgid "Shutter & Aperture Priority AE (1)"
 msgstr "Приоритет выдержки"
 
-#: src/pentaxmn.cpp:459
+#: src/pentaxmn.cpp:521
+#, fuzzy
 msgid "Sensitivity Priority AE"
-msgstr ""
+msgstr "Спектральная чувствительность"
 
-#: src/pentaxmn.cpp:460
+#: src/pentaxmn.cpp:522
+#, fuzzy
 msgid "Sensitivity Priority AE (1)"
-msgstr ""
+msgstr "Приоритет выдержки"
 
-#: src/pentaxmn.cpp:461
+#: src/pentaxmn.cpp:523
 msgid "Flash X-Sync Speed AE"
 msgstr ""
 
-#: src/pentaxmn.cpp:462
+#: src/pentaxmn.cpp:524
 msgid "Flash X-Sync Speed AE (1)"
 msgstr ""
 
-#: src/pentaxmn.cpp:471
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:535
 #, fuzzy
 msgid "Continuous (Hi)"
 msgstr "Продолжительный ведущий режим"
 
-#: src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
 #, fuzzy
 msgid "Burst"
 msgstr "Способ фокусировки"
 
-#: src/pentaxmn.cpp:473
+#: src/pentaxmn.cpp:538
 #, fuzzy
 msgid "Self-timer (12 sec)"
 msgstr "Серийный номер"
 
-#: src/pentaxmn.cpp:474
+#: src/pentaxmn.cpp:539
 #, fuzzy
 msgid "Self-timer (2 sec)"
 msgstr "Серийный номер"
 
-#: src/pentaxmn.cpp:475
+#: src/pentaxmn.cpp:540
 #, fuzzy
 msgid "Remote Control (3 sec)"
 msgstr "Пульт Д/У?"
 
-#: src/pentaxmn.cpp:476
+#: src/pentaxmn.cpp:541
 #, fuzzy
 msgid "Remote Control"
 msgstr "Пульт Д/У?"
 
-#: src/pentaxmn.cpp:477
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
 #, fuzzy
-msgid "Multiple Exposure"
-msgstr "Режим экспозиции"
+msgid "Video"
+msgstr "Цвет"
 
-#: src/pentaxmn.cpp:488
+#: src/pentaxmn.cpp:554
 msgid "M-42 or No Lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:489
+#: src/pentaxmn.cpp:555
 #, fuzzy
 msgid "K,M Lens"
 msgstr "Объектив"
 
-#: src/pentaxmn.cpp:490
+#: src/pentaxmn.cpp:556
 msgid "A Series Lens"
 msgstr ""
 
-#: src/pentaxmn.cpp:625
+#: src/pentaxmn.cpp:703
 #, fuzzy
 msgid "Bright"
 msgstr "Яркость+"
 
-#: src/pentaxmn.cpp:628
+#: src/pentaxmn.cpp:706
 msgid "Vibrant"
 msgstr ""
 
-#: src/pentaxmn.cpp:641
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
+msgstr ""
+
+#: src/pentaxmn.cpp:720
 #, fuzzy
 msgid "Weakest"
 msgstr "Запад"
 
-#: src/pentaxmn.cpp:642
+#: src/pentaxmn.cpp:721
+#, fuzzy
 msgid "Weak"
-msgstr ""
+msgstr "Запад"
 
-#: src/pentaxmn.cpp:643
+#: src/pentaxmn.cpp:722
 #, fuzzy
 msgid "Strong"
 msgstr "Насыщенность"
 
-#: src/pentaxmn.cpp:752
+#: src/pentaxmn.cpp:832
 #, fuzzy
 msgid "No extended bracketing"
 msgstr "Настройка баланса белого"
 
-#: src/pentaxmn.cpp:758
+#: src/pentaxmn.cpp:838
 msgid "WB-BA"
 msgstr "WB-BA"
 
-#: src/pentaxmn.cpp:761
+#: src/pentaxmn.cpp:841
 msgid "WB-GM"
 msgstr "WB-GM"
 
-#: src/pentaxmn.cpp:773
+#: src/pentaxmn.cpp:853
 #, fuzzy
 msgid "Unknown "
 msgstr "Неизвестно"
 
-#: src/pentaxmn.cpp:786
+#: src/pentaxmn.cpp:866
 #, fuzzy
 msgid "Pentax Makernote version"
 msgstr "Версия прошивки"
 
-#: src/pentaxmn.cpp:789
+#: src/pentaxmn.cpp:869
 #, fuzzy
 msgid "Camera shooting mode"
 msgstr "Режим замера"
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
 msgid "Resolution of a preview image"
 msgstr ""
 
-#: src/pentaxmn.cpp:794
+#: src/pentaxmn.cpp:874
+#, fuzzy
 msgid "Length of a preview image"
-msgstr ""
+msgstr "Версия эскиза"
 
-#: src/pentaxmn.cpp:795
+#: src/pentaxmn.cpp:875
 msgid "Size of an IFD containing a preview image"
 msgstr ""
 
-#: src/pentaxmn.cpp:800
+#: src/pentaxmn.cpp:880
 #, fuzzy
 msgid "Model identification"
 msgstr "Версия модели"
 
-#: src/pentaxmn.cpp:801
+#: src/pentaxmn.cpp:881
+#, fuzzy
 msgid "Pentax model idenfication"
-msgstr ""
+msgstr "Версия модели"
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
+#, fuzzy
 msgid "Date"
-msgstr ""
+msgstr "Программное обеспечение"
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
 #, fuzzy
 msgid "Time"
 msgstr "Время отправки"
 
-#: src/pentaxmn.cpp:810
+#: src/pentaxmn.cpp:890
 #, fuzzy
 msgid "Image quality settings"
 msgstr "Описание снимка"
 
-#: src/pentaxmn.cpp:813
+#: src/pentaxmn.cpp:893
 #, fuzzy
 msgid "Image size settings"
 msgstr "Описание снимка"
 
-#: src/pentaxmn.cpp:817
+#: src/pentaxmn.cpp:897
 #, fuzzy
 msgid "Flash mode settings"
 msgstr "Вспышка сработала"
 
-#: src/pentaxmn.cpp:820
+#: src/pentaxmn.cpp:900
 #, fuzzy
 msgid "Focus mode settings"
 msgstr "Способ фокусировки"
 
-#: src/pentaxmn.cpp:823
+#: src/pentaxmn.cpp:903
 #, fuzzy
 msgid "Selected AF point"
 msgstr "Использованная точка AF"
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+#, fuzzy
+msgid "AF point in focus"
+msgstr "Использованная точка AF"
+
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
 #, fuzzy
 msgid "F-Number"
 msgstr "Число F"
 
-#: src/pentaxmn.cpp:832
+#: src/pentaxmn.cpp:915
 #, fuzzy
 msgid "ISO sensitivity"
 msgstr "Спектральная чувствительность"
 
-#: src/pentaxmn.cpp:833
+#: src/pentaxmn.cpp:916
 #, fuzzy
 msgid "ISO sensitivity settings"
 msgstr "Параметры объектива"
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
 #, fuzzy
 msgid "MeteringMode"
 msgstr "Режим замера"
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
 #, fuzzy
 msgid "AutoBracketing"
 msgstr "Автобрекетирование"
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
 #, fuzzy
 msgid "White ballance"
 msgstr "Баланс белого"
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
 #, fuzzy
 msgid "White ballance mode"
 msgstr "Баланс белого"
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
+#: src/pentaxmn.cpp:936
+#, fuzzy
+msgid "Blue color balance"
+msgstr "Баланс белого"
+
+#: src/pentaxmn.cpp:939
+#, fuzzy
+msgid "Red color balance"
+msgstr "Цветовое пространство"
+
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
 #, fuzzy
 msgid "FocalLength"
 msgstr "Фокусное расстояние"
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
 #, fuzzy
 msgid "Location"
 msgstr "Местоположение объекта съёмки"
 
-#: src/pentaxmn.cpp:869
+#: src/pentaxmn.cpp:959
+#, fuzzy
 msgid "Hometown"
-msgstr ""
+msgstr "Рим"
 
-#: src/pentaxmn.cpp:875
+#: src/pentaxmn.cpp:965
 msgid "Hometown DST"
 msgstr ""
 
-#: src/pentaxmn.cpp:876
+#: src/pentaxmn.cpp:966
 msgid "Whether day saving time is active in home town"
 msgstr ""
 
-#: src/pentaxmn.cpp:878
+#: src/pentaxmn.cpp:968
 #, fuzzy
 msgid "Destination DST"
 msgstr "Ориентация"
 
-#: src/pentaxmn.cpp:879
+#: src/pentaxmn.cpp:969
 msgid "Whether day saving time is active in destination"
 msgstr ""
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
 #, fuzzy
 msgid "DSPFirmwareVersion"
 msgstr "Версия прошивки"
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
 #, fuzzy
 msgid "CPUFirmwareVersion"
 msgstr "Версия прошивки"
 
-#: src/pentaxmn.cpp:891
+#: src/pentaxmn.cpp:981
 #, fuzzy
 msgid "Light value"
 msgstr "Яркость"
 
-#: src/pentaxmn.cpp:892
+#: src/pentaxmn.cpp:982
 msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+#, fuzzy
+msgid "Image area offset"
+msgstr "Размер изображения"
+
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+#, fuzzy
+msgid "Raw image size"
+msgstr "Размер изображения"
+
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
 #, fuzzy
 msgid "Preview image borders"
 msgstr "Версия эскиза"
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
 #, fuzzy
 msgid "Sensitivity adjust"
 msgstr "Спектральная чувствительность"
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
 msgid "Digital filter"
 msgstr "Цифровой фильтр"
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-msgid "Temperature"
-msgstr "Температура"
-
-#: src/pentaxmn.cpp:923
+#: src/pentaxmn.cpp:1019
 #, fuzzy
 msgid "Camera temperature"
 msgstr "Температура цвета"
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
 #, fuzzy
 msgid "Image tone"
 msgstr "Тип изображения"
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
 msgid "Colort temperature"
 msgstr "Температура цвета"
 
-#: src/pentaxmn.cpp:943
+#: src/pentaxmn.cpp:1039
 #, fuzzy
 msgid "Shake reduction"
 msgstr "Подавление шума"
 
-#: src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:1040
 #, fuzzy
 msgid "Shake reduction information"
 msgstr "Способ фокусировки"
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
 #, fuzzy
 msgid "Dynamic range expansion"
 msgstr "Настройка баланса белого"
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
 msgid "High ISO noise reduction"
 msgstr "Подавление шума на высоких ISO"
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+#, fuzzy
+msgid "AF Adjustment"
+msgstr "Подстройка оттенка"
+
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
 msgid "Black point"
 msgstr "Точка черного"
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
 msgid "White point"
 msgstr "Точка белого"
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
 #, fuzzy
 msgid "ShotInfo"
 msgstr "Способ фокусировки"
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
+#, fuzzy
 msgid "AEInfo"
-msgstr ""
+msgstr "Способ фокусировки"
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
 #, fuzzy
 msgid "LensInfo"
 msgstr "Объектив"
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
 #, fuzzy
 msgid "FlashInfo"
 msgstr "Вспышка"
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
 #, fuzzy
 msgid "AEMeteringSegments"
 msgstr "Режим замера"
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
 #, fuzzy
 msgid "FlashADump"
 msgstr "Режим вспышки"
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
 #, fuzzy
 msgid "FlashBDump"
 msgstr "Режим вспышки"
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
+#, fuzzy
 msgid "WB_RGGBLevelsDaylight"
-msgstr ""
+msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
+#, fuzzy
 msgid "WB_RGGBLevelsShade"
-msgstr ""
+msgstr "Заряд батареи"
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
+#, fuzzy
 msgid "WB_RGGBLevelsCloudy"
-msgstr ""
+msgstr "Заряд батареи"
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
+#, fuzzy
 msgid "WB_RGGBLevelsTungsten"
-msgstr ""
+msgstr "Заряд батареи"
 
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentD"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentN"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
 #, fuzzy
 msgid "WB_RGGBLevelsFluorescentW"
 msgstr "Флуоресцентная лампа"
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
+#, fuzzy
 msgid "WB_RGGBLevelsFlash"
-msgstr ""
+msgstr "Заряд батареи"
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
 #, fuzzy
 msgid "CameraInfo"
 msgstr "ID камеры"
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
+#, fuzzy
 msgid "BatteryInfo"
-msgstr ""
+msgstr "ID камеры"
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
 #, fuzzy
 msgid "AFInfo"
 msgstr "Способ фокусировки"
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
 #, fuzzy
 msgid "ColorInfo"
 msgstr "Цвет"
 
-#: src/pentaxmn.cpp:1023
+#: src/pentaxmn.cpp:1125
 msgid "Unknown PentaxMakerNote tag"
 msgstr "Неизвестный тег PentaxMakerNote"
 
-#: src/properties.cpp:92
+#: src/properties.cpp:97
 msgid "Dublin Core schema"
 msgstr ""
 
-#: src/properties.cpp:93
+#: src/properties.cpp:98
 msgid "digiKam Photo Management schema"
 msgstr ""
 
-#: src/properties.cpp:94
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
+msgstr ""
+
+#: src/properties.cpp:100
 msgid "XMP Basic schema"
 msgstr ""
 
-#: src/properties.cpp:95
+#: src/properties.cpp:101
 msgid "XMP Rights Management schema"
 msgstr ""
 
-#: src/properties.cpp:96
+#: src/properties.cpp:102
 msgid "XMP Media Management schema"
 msgstr ""
 
-#: src/properties.cpp:97
+#: src/properties.cpp:103
 msgid "XMP Basic Job Ticket schema"
 msgstr ""
 
-#: src/properties.cpp:98
+#: src/properties.cpp:104
 msgid "XMP Paged-Text schema"
 msgstr ""
 
-#: src/properties.cpp:99
+#: src/properties.cpp:105
 msgid "XMP Dynamic Media schema"
 msgstr ""
 
-#: src/properties.cpp:100
+#: src/properties.cpp:106
 msgid "Microsoft Photo schema"
 msgstr ""
 
-#: src/properties.cpp:101
+#: src/properties.cpp:107
+#, fuzzy
 msgid "Adobe PDF schema"
-msgstr ""
+msgstr "Adobe RGB"
 
-#: src/properties.cpp:102
+#: src/properties.cpp:108
 msgid "Adobe photoshop schema"
 msgstr ""
 
-#: src/properties.cpp:103
+#: src/properties.cpp:109
 #, fuzzy
 msgid "Camera Raw schema"
 msgstr "ID камеры"
 
-#: src/properties.cpp:104
+#: src/properties.cpp:110
 msgid "Exif Schema for TIFF Properties"
 msgstr ""
 
-#: src/properties.cpp:105
+#: src/properties.cpp:111
 msgid "Exif schema for Exif-specific Properties"
 msgstr ""
 
-#: src/properties.cpp:106
+#: src/properties.cpp:112
 msgid "Exif schema for Additional Exif Properties"
 msgstr ""
 
-#: src/properties.cpp:107
+#: src/properties.cpp:113
 msgid "IPTC Core schema"
 msgstr ""
 
-#: src/properties.cpp:109
+#: src/properties.cpp:115
 msgid "IPTC Extension schema"
 msgstr ""
 
-#: src/properties.cpp:111
+#: src/properties.cpp:117
 msgid "PLUS License Data Format schema"
 msgstr ""
 
-#: src/properties.cpp:114
+#: src/properties.cpp:118
+msgid "iView Media Pro schema"
+msgstr ""
+
+#: src/properties.cpp:119
+msgid "Expression Media schema"
+msgstr ""
+
+#: src/properties.cpp:122
 msgid "Colorant structure"
 msgstr "Структура красителя"
 
-#: src/properties.cpp:115
+#: src/properties.cpp:123
 #, fuzzy
 msgid "Dimensions structure"
 msgstr "Размер изображения"
 
-#: src/properties.cpp:116
+#: src/properties.cpp:124
+#, fuzzy
 msgid "Font structure"
-msgstr ""
+msgstr "Структура красителя"
 
-#: src/properties.cpp:117
+#: src/properties.cpp:125
 msgid "Thumbnail structure"
 msgstr "Структура эскиза"
 
-#: src/properties.cpp:118
+#: src/properties.cpp:126
+#, fuzzy
 msgid "Resource Event structure"
-msgstr ""
+msgstr "Структура красителя"
 
-#: src/properties.cpp:119
+#: src/properties.cpp:127
+#, fuzzy
 msgid "ResourceRef structure"
-msgstr ""
+msgstr "Размер изображения"
 
-#: src/properties.cpp:120
+#: src/properties.cpp:128
+#, fuzzy
 msgid "Version structure"
-msgstr ""
+msgstr "Размер изображения"
 
-#: src/properties.cpp:121
+#: src/properties.cpp:129
 msgid "Basic Job/Workflow structure"
 msgstr ""
 
-#: src/properties.cpp:124
+#: src/properties.cpp:132
 msgid "Qualifier for xmp:Identifier"
 msgstr ""
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributor"
 msgstr "Участник"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributors to the resource (other than the authors)."
 msgstr ""
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid "Coverage"
 msgstr "Охват"
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid ""
 "The spatial or temporal topic of the resource, the spatial applicability of "
 "the resource, or the jurisdiction under which the resource is relevant."
 msgstr ""
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid "Creator"
 msgstr "Создатель"
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid ""
 "The authors of the resource (listed in order of precedence, if significant)."
 msgstr ""
 
-#: src/properties.cpp:132
+#: src/properties.cpp:140
 msgid "Date(s) that something interesting happened to the resource."
 msgstr ""
 
-#: src/properties.cpp:133
+#: src/properties.cpp:141
 msgid ""
 "A textual description of the content of the resource. Multiple values may be "
 "present for different languages."
 msgstr ""
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid "Format"
 msgstr "Формат"
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid ""
 "The file format used when saving the resource. Tools and applications should "
 "set this property to the save format of the data. It may include appropriate "
 "qualifiers."
 msgstr ""
 
-#: src/properties.cpp:137 src/properties.cpp:180
+#: src/properties.cpp:145 src/properties.cpp:196
 #, fuzzy
 msgid "Identifier"
 msgstr "Идентификатор ARM"
 
-#: src/properties.cpp:137
+#: src/properties.cpp:145
 msgid ""
 "Unique identifier of the resource. Recommended best practice is to identify "
 "the resource by means of a string conforming to a formal identification "
 "system."
 msgstr ""
 
-#: src/properties.cpp:139
+#: src/properties.cpp:147
 msgid "An unordered array specifying the languages used in the resource."
 msgstr ""
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid "Publisher"
 msgstr ""
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid ""
 "An entity responsible for making the resource available. Examples of a "
 "Publisher include a person, an organization, or a service. Typically, the "
 "name of a Publisher should be used to indicate the entity."
 msgstr ""
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 #, fuzzy
 msgid "Relation"
 msgstr "Насыщенность"
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid ""
 "Relationships to other documents. Recommended best practice is to identify "
 "the related resource by means of a string conforming to a formal "
 "identification system."
 msgstr ""
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid "Rights"
 msgstr "Права"
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid ""
 "Informal rights statement, selected by language. Typically, rights "
 "information includes a statement about various property rights associated "
 "with the resource, including intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:148
+#: src/properties.cpp:156
 #, fuzzy
 msgid "Unique identifier of the work from which this resource was derived."
 msgstr "Название отсканированного документа"
 
-#: src/properties.cpp:149
+#: src/properties.cpp:157
 msgid ""
 "An unordered array of descriptive phrases or keywords that specify the topic "
 "of the content of the resource."
 msgstr ""
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 #, fuzzy
 msgid "Title"
 msgstr "Файл"
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid ""
 "The title of the document, or the name given to the resource. Typically, it "
 "will be a name by which the resource is formally known."
 msgstr ""
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 #, fuzzy
 msgid "Type"
 msgstr "тип"
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "A document type; for example, novel, poem, or working paper."
 msgstr ""
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid "Tags List"
 msgstr ""
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid ""
 "The list of complete tags path as string. The path hierarchy is separated by "
 "'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
 msgstr ""
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 #, fuzzy
 msgid "Captions Author Names"
 msgstr "Название страны"
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 msgid ""
 "The list of all captions author names for each language alternative captions "
 "set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 #, fuzzy
 msgid "Captions Date Time Stamps"
 msgstr "обновляется отметка времени"
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 msgid ""
 "The list of all captions date time stamps for each language alternative "
 "captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:168
+#: src/properties.cpp:170 src/tags.cpp:842
+#, fuzzy
+msgid "Image History"
+msgstr "Длина изображения"
+
+#: src/properties.cpp:170
+msgid ""
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
+msgstr ""
+
+#: src/properties.cpp:171
+#, fuzzy
+msgid "Lens Correction Settings"
+msgstr "Параметры объектива"
+
+#: src/properties.cpp:171
+msgid ""
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
+msgstr ""
+
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
+msgstr ""
+
+#: src/properties.cpp:177
+msgid ""
+"The list of files processed with Enfuse program through ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:178
+#, fuzzy
+msgid "Enfuse Settings"
+msgstr "Настройка резкости"
+
+#: src/properties.cpp:178
+msgid ""
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:184
 #, fuzzy
 msgid "Advisory"
 msgstr "Звук"
 
-#: src/properties.cpp:168
+#: src/properties.cpp:184
 msgid ""
 "An unordered array specifying properties that were edited outside the "
 "authoring application. Each item should contain a single namespace and XPath "
 "separated by one ASCII space (U+0020)."
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid "Base URL"
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid ""
 "The base URL for relative URLs in the document content. If this document "
 "contains Internet links, and those links are relative, they are relative to "
@@ -11634,27 +15053,28 @@
 "based on their notion of where URLs will be interpreted."
 msgstr ""
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 msgid "Create Date"
 msgstr "Дата создания"
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 #, fuzzy
 msgid "The date and time the resource was originally created."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
+#, fuzzy
 msgid "Creator Tool"
-msgstr ""
+msgstr "Создатель"
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid ""
 "The name of the first known tool used to create the resource. If history is "
 "present in the metadata, this value should be equivalent to that of xmpMM:"
 "History's softwareAgent property."
 msgstr ""
 
-#: src/properties.cpp:180
+#: src/properties.cpp:196
 msgid ""
 "An unordered array of text strings that unambiguously identify the resource "
 "within a given context. An array item may be qualified with xmpidq:Scheme to "
@@ -11664,114 +15084,119 @@
 "(single-valued) property."
 msgstr ""
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
+#, fuzzy
 msgid "Label"
-msgstr ""
+msgstr "Кабул"
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid ""
 "A word or short phrase that identifies a document as a member of a user-"
 "defined collection. Used to organize documents in a file browser."
 msgstr ""
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
+#, fuzzy
 msgid "Metadata Date"
-msgstr ""
+msgstr "Дата создания"
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid ""
 "The date and time that any metadata for this resource was last changed. It "
 "should be the same as or more recent than xmp:ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
+#, fuzzy
 msgid "Modify Date"
-msgstr ""
+msgstr "Порядок заполнения"
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid ""
 "The date and time the resource was last modified. Note: The value of this "
 "property is not necessarily the same as the file's system modification date "
 "because it is set before the file is saved."
 msgstr ""
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
+#, fuzzy
 msgid "Nickname"
-msgstr ""
+msgstr "Имя владельца"
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "A short informal name for the resource."
 msgstr ""
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid "Rating"
 msgstr "Оценка"
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid ""
 "A number that indicates a document's status relative to other documents, "
 "used to organize documents in a file browser. Values are user-defined within "
 "an application-defined range."
 msgstr ""
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid "Thumbnails"
 msgstr "Эскизы"
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid ""
 "An alternative array of thumbnail images for a file, which can differ in "
 "characteristics such as size or image encoding."
 msgstr ""
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Certificate"
 msgstr ""
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Online rights management certificate."
 msgstr ""
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
+#, fuzzy
 msgid "Marked"
-msgstr ""
+msgstr "Ручная"
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 msgid "Indicates that this is a rights-managed resource."
 msgstr ""
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "Owner"
 msgstr "Владелец"
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "An unordered array specifying the legal owner(s) of a resource."
 msgstr ""
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Usage Terms"
 msgstr ""
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Text instructions on how a resource can be legally used."
 msgstr ""
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid "Web Statement"
 msgstr ""
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid ""
 "The location of a web page describing the owner and/or rights statement for "
 "this resource."
 msgstr ""
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 #, fuzzy
 msgid "Derived From"
 msgstr "Режим замера"
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid ""
 "A reference to the original document from which this one is derived. It is a "
 "minimal reference; missing components can be assumed to be unchanged. For "
@@ -11780,21 +15205,22 @@
 "specify the instance ID and rendition class of the original."
 msgstr ""
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid "Document ID"
 msgstr "ID документа"
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid ""
 "The common identifier for all versions and renditions of a document. It "
 "should be based on a UUID; see Document and Instance IDs below."
 msgstr ""
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
+#, fuzzy
 msgid "History"
-msgstr ""
+msgstr "Длина изображения"
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid ""
 "An ordered array of high-level user actions that resulted in this resource. "
 "It is intended to give human readers a general indication of the steps taken "
@@ -11803,22 +15229,24 @@
 "other detailed history."
 msgstr ""
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
+#, fuzzy
 msgid "Instance ID"
-msgstr ""
+msgstr "Intel"
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid ""
 "An identifier for a specific incarnation of a document, updated each time a "
 "file is saved. It should be based on a UUID; see Document and Instance IDs "
 "below."
 msgstr ""
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
+#, fuzzy
 msgid "Managed From"
-msgstr ""
+msgstr "Язык"
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid ""
 "A reference to the document as it was prior to becoming managed. It is set "
 "when a managed document is introduced to an asset management system that "
@@ -11826,23 +15254,24 @@
 "management systems."
 msgstr ""
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 #, fuzzy
 msgid "Manager"
 msgstr "Язык"
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid ""
 "The name of the asset management system that manages this resource. Along "
 "with xmpMM: ManagerVariant, it tells applications which asset management "
 "system to contact concerning this document."
 msgstr ""
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
+#, fuzzy
 msgid "Manage To"
-msgstr ""
+msgstr "Язык"
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 msgid ""
 "A URI identifying the managed resource to the asset management system; the "
 "presence of this property is the formal indication that this resource is "
@@ -11850,51 +15279,53 @@
 "system."
 msgstr ""
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
+#, fuzzy
 msgid "Manage UI"
-msgstr ""
+msgstr "Язык"
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 msgid ""
 "A URI that can be used to access information about the managed resource "
 "through a web browser. It might require a custom browser plug-in."
 msgstr ""
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
+#, fuzzy
 msgid "Manager Variant"
-msgstr ""
+msgstr "Язык"
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 msgid ""
 "Specifies a particular variant of the asset management system. The format of "
 "this property is private to the specific asset management system."
 msgstr ""
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid "Rendition Class"
 msgstr ""
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid ""
 "The rendition class name for this resource. This property should be absent "
 "or set to default for a document version that is not a derived rendition."
 msgstr ""
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid "Rendition Params"
 msgstr ""
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid ""
 "Can be used to provide additional rendition parameters that are too complex "
 "or verbose to encode in xmpMM: RenditionClass."
 msgstr ""
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid "Version ID"
 msgstr "ID версии"
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid ""
 "The document version identifier for this resource. Each version of a "
 "document gets a new identifier, usually simply by incrementing integers 1, "
@@ -11902,11 +15333,11 @@
 "support branching which requires a more complex scheme."
 msgstr ""
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid "Versions"
 msgstr "Версии"
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid ""
 "The version history associated with this resource. Entry [1] is the oldest "
 "known version for this document, entry [last()] is the most recent version. "
@@ -11917,39 +15348,40 @@
 "the version history can be truncated at some point."
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Last URL"
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Deprecated for privacy protection."
 msgstr ""
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
+#, fuzzy
 msgid "Rendition Of"
-msgstr ""
+msgstr "Насыщенность"
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid ""
 "Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
 "which this is a rendition."
 msgstr ""
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 #, fuzzy
 msgid "Save ID"
 msgstr "ID камеры"
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
 msgstr ""
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 #, fuzzy
 msgid "Job Reference"
 msgstr "Эталонный Чёрный/Белый"
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 msgid ""
 "References an external job management file for a job process in which the "
 "document is being used. Use of job names is under user control. Typical use "
@@ -11959,720 +15391,730 @@
 "historical information about what jobs a document was part of previously."
 msgstr ""
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid "Maximum Page Size"
 msgstr "Максимальный размер страницы"
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid ""
 "The size of the largest page in the document (including any in contained "
 "documents)."
 msgstr ""
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid "Number of Pages"
 msgstr "Число страниц"
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid ""
 "The number of pages in the document (including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid ""
 "An unordered array of fonts that are used in the document (including any in "
 "contained documents)."
 msgstr ""
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 #, fuzzy
 msgid "Colorants"
 msgstr "Цвет"
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid ""
 "An ordered array of colorants (swatches) that are used in the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 #, fuzzy
 msgid "Plate Names"
 msgstr "Имя владельца"
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid ""
 "An ordered array of plate names that are needed to print the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 #, fuzzy
 msgid "Project Reference"
 msgstr "Эталонный Чёрный/Белый"
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "A reference to the project that created this file."
 msgstr ""
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
+#, fuzzy
 msgid "Video Frame Rate"
-msgstr ""
+msgstr "Частота сэмплирования звукозаписи"
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "The video frame rate. One of: 24, NTSC, PAL."
 msgstr ""
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
+#, fuzzy
 msgid "Video Frame Size"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "The frame size. For example: w:720, h: 480, unit:pixels"
 msgstr ""
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "Video Pixel Aspect Ratio"
 msgstr ""
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
 msgstr ""
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
+#, fuzzy
 msgid "Video Pixel Depth"
-msgstr ""
+msgstr "Порядок заполнения"
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid ""
 "The size in bits of each color component of a pixel. Standard Windows 32-bit "
 "pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 #, fuzzy
 msgid "Video Color Space"
 msgstr "Цветовое пространство"
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid ""
 "The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
 "CCIR-709 (used for HD)."
 msgstr ""
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 #, fuzzy
 msgid "Video Alpha Mode"
 msgstr "Режим замера"
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 msgid "The alpha mode. One of: straight, pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid "Video Alpha Premultiple Color"
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid ""
 "A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
 "is pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "Video Alpha Unity Is Transparent"
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "When true, unity is clear, when false, it is opaque."
 msgstr ""
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 #, fuzzy
 msgid "Video Compressor"
 msgstr "Сжатие"
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video compression used. For example, jpeg."
 msgstr ""
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 #, fuzzy
 msgid "Video Field Order"
 msgstr "Порядок заполнения"
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "The field order for video. One of: Upper, Lower, Progressive."
 msgstr ""
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 #, fuzzy
 msgid "Pull Down"
 msgstr "вкл"
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid ""
 "The sampling phase of film to be converted to video (pull-down). One of: "
 "WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
 "WWWSS_24p, WWSSW_24p."
 msgstr ""
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 #, fuzzy
 msgid "Audio Sample Rate"
 msgstr "Частота сэмплирования звукозаписи"
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid ""
 "The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
 msgstr ""
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 #, fuzzy
 msgid "Audio Sample Type"
 msgstr "Тип звуковых данных"
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 #, fuzzy
 msgid "Audio Channel Type"
 msgstr "Тип звуковых данных"
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
 msgstr ""
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 #, fuzzy
 msgid "Audio Compressor"
 msgstr "Сжатие"
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "The audio compression used. For example, MP3."
 msgstr ""
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid "Speaker Placement"
 msgstr ""
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid ""
 "A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
 msgstr ""
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 #, fuzzy
 msgid "File Data Rate"
 msgstr "Имя файла"
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 msgid ""
 "The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
 "sec"
 msgstr ""
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 #, fuzzy
 msgid "Tape Name"
 msgstr "Имя владельца"
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid ""
 "The name of the tape from which the clip was captured, as set during the "
 "capture process."
 msgstr ""
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 #, fuzzy
 msgid "Alternative Tape Name"
 msgstr "Имя владельца"
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid ""
 "An alternative tape name, set via the project window or timecode dialog in "
 "Premiere. If an alternative name has been set and has not been reverted, "
 "that name is displayed."
 msgstr ""
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
+#, fuzzy
 msgid "Start Time Code"
-msgstr ""
+msgstr "Режим вспышки"
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid ""
 "The timecode of the first frame of video in the file, as obtained from the "
 "device control."
 msgstr ""
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 #, fuzzy
 msgid "Alternative Time code"
 msgstr "Режим вспышки"
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid ""
 "A timecode set by the user. When specified, it is used instead of the "
 "startTimecode."
 msgstr ""
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 msgid "Duration"
 msgstr "Длительность"
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
+#, fuzzy
 msgid "The duration of the media file."
-msgstr ""
+msgstr "Вид источника света"
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 #, fuzzy
 msgid "Scene"
 msgstr "Тип сцены"
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 #, fuzzy
 msgid "The name of the scene."
 msgstr "Вид источника света"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 #, fuzzy
 msgid "Shot Name"
 msgstr "Название страны"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
+#, fuzzy
 msgid "The name of the shot or take."
-msgstr ""
+msgstr "Вид источника света"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 #, fuzzy
 msgid "Shot Date"
 msgstr "Программное обеспечение"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 #, fuzzy
 msgid "The date and time when the video was shot."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 #, fuzzy
 msgid "Shot Location"
 msgstr "Местоположение объекта съёмки"
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid ""
 "The name of the location where the video was shot. For example: "
 "\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
 "GPS values."
 msgstr ""
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "Log Comment"
 msgstr "Комментарий (Windows)"
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 #, fuzzy
 msgid "User's log comments."
 msgstr "Пользовательский комментарий"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 #, fuzzy
 msgid "Markers"
 msgstr "Ручная"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "An ordered list of markers"
 msgstr ""
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 #, fuzzy
 msgid "Contributed Media"
 msgstr "Контраст"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 msgid "An unordered list of all media used to create this media."
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid "Absolute Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid ""
 "The absolute path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid "Relative Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid ""
 "The relative path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 #, fuzzy
 msgid "Video Modified Date"
 msgstr "Порядок заполнения"
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 #, fuzzy
 msgid "The date and time when the video was last modified."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 #, fuzzy
 msgid "Audio Modified Date"
 msgstr "Частота сэмплирования звукозаписи"
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 #, fuzzy
 msgid "The date and time when the audio was last modified."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
+#, fuzzy
 msgid "Metadata Modified Date"
-msgstr ""
+msgstr "Порядок заполнения"
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 #, fuzzy
 msgid "The date and time when the metadata was last modified."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/properties.cpp:323
+#: src/properties.cpp:339
+#, fuzzy
 msgid "The name of the artist or artists."
-msgstr ""
+msgstr "Вид источника света"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 msgid "Album"
 msgstr "Альбом"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
+#, fuzzy
 msgid "The name of the album."
-msgstr ""
+msgstr "Вид источника света"
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid "Track Number"
 msgstr "Номер дорожки"
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid ""
 "A numeric value indicating the order of the audio file within its original "
 "recording."
 msgstr ""
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
+#, fuzzy
 msgid "The name of the genre."
-msgstr ""
+msgstr "Вид источника света"
 
-#: src/properties.cpp:327
+#: src/properties.cpp:343
 msgid "The copyright information."
 msgstr "Данные об авторских правах"
 
-#: src/properties.cpp:328
+#: src/properties.cpp:344
 #, fuzzy
 msgid "The date the title was released."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "The composer's name."
 msgstr ""
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "Engineer"
 msgstr "Звукооператор"
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
 msgid "The engineer's name."
 msgstr ""
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "Tempo"
 msgstr ""
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "The audio's tempo."
 msgstr ""
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "Instrument"
 msgstr "Инструмент"
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "The musical instrument."
 msgstr ""
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 msgid "Intro Time"
 msgstr "Время вступления"
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 msgid "The duration of lead time for queuing music."
 msgstr ""
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "Out Cue"
 msgstr ""
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "The time at which to fade out."
 msgstr ""
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 #, fuzzy
 msgid "Relative Timestamp"
 msgstr "обновляется отметка времени"
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "The start time of the media inside the audio project."
 msgstr ""
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 #, fuzzy
 msgid "Loop"
 msgstr "Лондон"
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "When true, the clip can be looped seemlessly."
 msgstr ""
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 #, fuzzy
 msgid "Number Of Beats"
 msgstr "Число F"
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 #, fuzzy
 msgid "The number of beats."
 msgstr "Число F"
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 #, fuzzy
 msgid "Key"
 msgstr "Низкий ключ"
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid ""
 "The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
 msgstr ""
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 #, fuzzy
 msgid "Stretch Mode"
 msgstr "Режим коррекции"
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid ""
 "The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
 "Splice, Hybrid."
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Time Scale Parameters"
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Additional parameters for Time-Scale stretch mode."
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Resample Parameters"
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Additional parameters for Resample stretch mode."
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Beat Splice Parameters"
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Additional parameters for Beat Splice stretch mode."
 msgstr ""
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 #, fuzzy
 msgid "Time Signature"
 msgstr "Время отправки"
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid ""
 "The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
 "12/8, other."
 msgstr ""
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 #, fuzzy
 msgid "Scale Type"
 msgstr "Тип изображения"
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid ""
 "The musical scale used in the music. One of: Major, Minor, Both, Neither. "
 "Neither is most often used for instruments with no associated scale, such as "
 "drums."
 msgstr ""
 
-#: src/properties.cpp:351 src/tags.cpp:889
+#: src/properties.cpp:367 src/tags.cpp:1076
 #, fuzzy
 msgid "Camera Serial Number"
 msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:351
+#: src/properties.cpp:367
 #, fuzzy
 msgid "Camera Serial Number."
 msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired"
 msgstr "Дата создания объекта съёмки"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 #, fuzzy
 msgid "Date Acquired."
 msgstr "Дата создания объекта съёмки"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 #, fuzzy
 msgid "Flash Manufacturer"
 msgstr "Производитель"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 #, fuzzy
 msgid "Flash Manufacturer."
 msgstr "Производитель"
 
-#: src/properties.cpp:354
+#: src/properties.cpp:370
 #, fuzzy
 msgid "Flash Model."
 msgstr "Режим вспышки"
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
+#, fuzzy
 msgid "Last Keyword IPTC"
-msgstr ""
+msgstr "Ключевые слова"
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
+#, fuzzy
 msgid "Last Keyword IPTC."
-msgstr ""
+msgstr "Ключевые слова"
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
+#, fuzzy
 msgid "Last Keyword XMP"
-msgstr ""
+msgstr "Ключевые слова"
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 #, fuzzy
 msgid "Last Keyword XMP."
 msgstr "Ключевые слова"
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 #, fuzzy
 msgid "Lens Manufacturer"
 msgstr "Производитель"
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 #, fuzzy
 msgid "Lens Manufacturer."
 msgstr "Производитель"
 
-#: src/properties.cpp:358
-#, fuzzy
-msgid "Lens Model"
-msgstr "Тип сцены"
-
-#: src/properties.cpp:358
+#: src/properties.cpp:374
 #, fuzzy
 msgid "Lens Model."
 msgstr "Тип сцены"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 #, fuzzy
 msgid "Rating Percent"
 msgstr "Процентная оценка в Windows"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 #, fuzzy
 msgid "Rating Percent."
 msgstr "Процентная оценка в Windows"
 
-#: src/properties.cpp:365
+#: src/properties.cpp:381
 msgid "Keywords."
 msgstr "Ключевые слова"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "PDF Version"
 msgstr "Версия PDF"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
 msgstr ""
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "Producer"
 msgstr ""
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "The name of the tool that created the PDF document."
 msgstr ""
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
+#, fuzzy
 msgid "Authors Position"
-msgstr ""
+msgstr "Позиционирование YCbCr"
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 msgid "By-line title."
 msgstr ""
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 #, fuzzy
 msgid "Caption Writer"
 msgstr "Подпись"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 msgid "Writer/editor."
 msgstr "Автор/редактор."
 
-#: src/properties.cpp:375
+#: src/properties.cpp:391
 msgid "Category. Limited to 3 7-bit ASCII characters."
 msgstr ""
 
-#: src/properties.cpp:376
+#: src/properties.cpp:392
 msgid "City."
 msgstr "Город."
 
-#: src/properties.cpp:377
+#: src/properties.cpp:393
 msgid "Country/primary location."
 msgstr ""
 
-#: src/properties.cpp:378
+#: src/properties.cpp:394
+#, fuzzy
 msgid "Credit."
-msgstr ""
+msgstr "Город."
 
-#: src/properties.cpp:379
+#: src/properties.cpp:395
 msgid ""
 "The date the intellectual content of the document was created (rather than "
 "the creation date of the physical representation), following IIM "
@@ -12681,395 +16123,417 @@
 "photo was digitized for archiving."
 msgstr ""
 
-#: src/properties.cpp:383
+#: src/properties.cpp:399
 #, fuzzy
 msgid "Headline."
 msgstr "Заголовок"
 
-#: src/properties.cpp:384
+#: src/properties.cpp:400
 msgid "Special instructions."
 msgstr "Особые инструкции."
 
-#: src/properties.cpp:385
+#: src/properties.cpp:401
 msgid "Source."
 msgstr "Источник."
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 #, fuzzy
 msgid "State"
 msgstr "Программное обеспечение"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "Province/state."
 msgstr ""
 
-#: src/properties.cpp:387
+#: src/properties.cpp:403
 #, fuzzy
 msgid "Supplemental category."
 msgstr "Дополнительная категория"
 
-#: src/properties.cpp:388
+#: src/properties.cpp:404
 msgid "Original transmission reference."
 msgstr ""
 
-#: src/properties.cpp:389
+#: src/properties.cpp:405
 msgid "Urgency. Valid range is 1-8."
 msgstr ""
 
-#: src/properties.cpp:397
+#: src/properties.cpp:413
 msgid "inches"
 msgstr "дюймов"
 
-#: src/properties.cpp:398 src/tags.cpp:227
+#: src/properties.cpp:414 src/tags.cpp:247
 msgid "cm"
 msgstr "cm"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "Auto Brightness"
 msgstr "Автоматическая яркость"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "When true, \"Brightness\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "Auto Contrast"
 msgstr "Автоматический контраст"
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "When true, \"Contrast\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "Auto Exposure"
 msgstr "Автоматическая экспозиция"
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "When true, \"Exposure\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 #, fuzzy
 msgid "Auto Shadows"
 msgstr "Тень"
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "When true,\"Shadows\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 #, fuzzy
 msgid "Blue Hue"
 msgstr "Баланс белого"
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
+#, fuzzy
 msgid "\"Blue Hue\" setting. Range -100 to 100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 #, fuzzy
 msgid "Blue Saturation"
 msgstr "Насыщенность"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
+#, fuzzy
 msgid "\"Blue Saturation\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:408
+#: src/properties.cpp:424
+#, fuzzy
 msgid "\"Brightness\" setting. Range 0 to +150."
-msgstr ""
+msgstr "Настройка резкости"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 msgid "Camera Profile"
 msgstr "Профиль камеры"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 #, fuzzy
 msgid "\"Camera Profile\" setting."
 msgstr "Настройки камеры"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 #, fuzzy
 msgid "Chromatic Aberration Blue"
 msgstr "Настройка контраста"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 #, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
 msgstr "Настройка контраста"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 #, fuzzy
 msgid "Chromatic Aberration Red"
 msgstr "Настройка контраста"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
+#, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 msgid "Color Noise Reduction"
 msgstr "Подавление цветного шума"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
+#, fuzzy
 msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:413
+#: src/properties.cpp:429
+#, fuzzy
 msgid "\"Contrast\" setting. Range -50 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:414
+#: src/properties.cpp:430
 msgid "When \"Has Crop\" is true, top of crop rectangle"
 msgstr ""
 
-#: src/properties.cpp:415
+#: src/properties.cpp:431
 msgid "When \"Has Crop\" is true, left of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 #, fuzzy
 msgid "Crop Bottom"
 msgstr "снизу вверх"
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "When \"Has Crop\" is true, bottom of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 #, fuzzy
 msgid "Crop Right"
 msgstr "Авторские права"
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "When \"Has Crop\" is true, right of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
+#, fuzzy
 msgid "Crop Angle"
-msgstr ""
+msgstr "справа налево"
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "When \"Has Crop\" is true, angle of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:419
+#: src/properties.cpp:435
 msgid "Width of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:420
+#: src/properties.cpp:436
 msgid "Height of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
+#, fuzzy
 msgid "Crop Units"
-msgstr ""
+msgstr "Авторские права"
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
 msgstr ""
 
-#: src/properties.cpp:422
+#: src/properties.cpp:438
+#, fuzzy
 msgid "\"Exposure\" setting. Range -4.0 to +4.0."
-msgstr ""
+msgstr "Настройка резкости"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 #, fuzzy
 msgid "GreenHue"
 msgstr "Режим замера"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
+#, fuzzy
 msgid "\"Green Hue\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 #, fuzzy
 msgid "Green Saturation"
 msgstr "Насыщенность"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
+#, fuzzy
 msgid "\"Green Saturation\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 #, fuzzy
 msgid "Has Crop"
 msgstr "Режим вспышки"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "When true, image has a cropping rectangle."
 msgstr ""
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 #, fuzzy
 msgid "Has Settings"
 msgstr "Настройка резкости"
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "When true, non-default camera raw settings."
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 msgid "Luminance Smoothing"
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
+#, fuzzy
 msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 #, fuzzy
 msgid "Raw File Name"
 msgstr "Имя файла"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "File name of raw file (not a complete path)."
 msgstr ""
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
+#, fuzzy
 msgid "Red Hue"
-msgstr ""
+msgstr "Баланс белого"
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
+#, fuzzy
 msgid "\"Red Hue\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 #, fuzzy
 msgid "Red Saturation"
 msgstr "Насыщенность"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
+#, fuzzy
 msgid "\"Red Saturation\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:431
+#: src/properties.cpp:447
 #, fuzzy
 msgid "\"Saturation\" setting. Range -100 to +100."
 msgstr "Настройка контраста"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 #, fuzzy
 msgid "Shadows"
 msgstr "Тень"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
+#, fuzzy
 msgid "\"Shadows\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Настройка резкости"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 #, fuzzy
 msgid "Shadow Tint"
 msgstr "Тень"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
+#, fuzzy
 msgid "\"Shadow Tint\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:434
+#: src/properties.cpp:450
 #, fuzzy
 msgid "\"Sharpness\" setting. Range 0 to +100."
 msgstr "Настройка резкости"
 
-#: src/properties.cpp:435
+#: src/properties.cpp:451
+#, fuzzy
 msgid "\"Temperature\" setting. Range 2000 to 50000."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 #, fuzzy
 msgid "Tint"
 msgstr "Файл"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
+#, fuzzy
 msgid "\"Tint\" setting. Range -150 to +150."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Tone Curve"
 msgstr "Кривая тонкоррекции"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
 msgstr ""
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 #, fuzzy
 msgid "Tone Curve Name"
 msgstr "Кривая тонкоррекции"
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid ""
 "The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
 "Contrast, Strong Contrast, Custom or a user-defined preset name."
 msgstr ""
 
-#: src/properties.cpp:440
+#: src/properties.cpp:456
 msgid "Version of Camera Raw plugin."
 msgstr ""
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
+#, fuzzy
 msgid "Vignette Amount"
-msgstr ""
+msgstr "Пульт Д/У?"
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
+#, fuzzy
 msgid "\"Vignetting Amount\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
 #, fuzzy
 msgid "Vignette Midpoint"
 msgstr "Белая точка"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
+#, fuzzy
 msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:443
+#: src/properties.cpp:459
 msgid ""
 "\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
 "Tungsten, Fluorescent, Flash, Custom"
 msgstr ""
 
-#: src/properties.cpp:450
+#: src/properties.cpp:466
 msgid "TIFF tag 256, 0x100. Image width in pixels."
 msgstr ""
 
-#: src/properties.cpp:451 src/tags.cpp:354
+#: src/properties.cpp:467 src/tags.cpp:425
 msgid "Image Length"
 msgstr "Длина изображения"
 
-#: src/properties.cpp:451
+#: src/properties.cpp:467
 msgid "TIFF tag 257, 0x101. Image height in pixels."
 msgstr ""
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 #, fuzzy
 msgid "Bits Per Sample"
 msgstr "Битов на сэмпл"
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
 msgstr ""
 
-#: src/properties.cpp:453 src/tags.cpp:364
+#: src/properties.cpp:469 src/tags.cpp:435
 msgid "Compression"
 msgstr "Сжатие"
 
-#: src/properties.cpp:453
+#: src/properties.cpp:469
 msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
 msgstr ""
 
-#: src/properties.cpp:454 src/tags.cpp:370
+#: src/properties.cpp:470 src/tags.cpp:441
 msgid "Photometric Interpretation"
 msgstr "Фотометрическая интерпретация"
 
-#: src/properties.cpp:454
+#: src/properties.cpp:470
 msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
 msgstr ""
 
-#: src/properties.cpp:455
+#: src/properties.cpp:471
 msgid ""
 "TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
 "0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
@@ -13078,117 +16542,117 @@
 "0th column at bottom 8 = 0th row at left, 0th column at bottom"
 msgstr ""
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 #, fuzzy
 msgid "Samples Per Pixel"
 msgstr "Сэмплов на пиксел"
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 msgid "TIFF tag 277, 0x115. Number of components per pixel."
 msgstr ""
 
-#: src/properties.cpp:465 src/tags.cpp:432
+#: src/properties.cpp:481 src/tags.cpp:515
 msgid "Planar Configuration"
 msgstr "Планарная конфигурация"
 
-#: src/properties.cpp:465
+#: src/properties.cpp:481
 msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
 msgstr ""
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 #, fuzzy
 msgid "YCbCr Sub Sampling"
 msgstr "Субсэмплинг YCbCr"
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid ""
 "TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
 "YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
+#: src/properties.cpp:484 src/tags.cpp:718
 msgid "YCbCr Positioning"
 msgstr "Позиционирование YCbCr"
 
-#: src/properties.cpp:468
+#: src/properties.cpp:484
 msgid ""
 "TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
 "centered; 2 = co-sited."
 msgstr ""
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 #, fuzzy
 msgid "X Resolution"
 msgstr "Разрешение по X"
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
 msgstr ""
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 #, fuzzy
 msgid "Y Resolution"
 msgstr "Разрешение по Y"
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
 msgstr ""
 
-#: src/properties.cpp:472 src/tags.cpp:438
+#: src/properties.cpp:488 src/tags.cpp:533
 msgid "Resolution Unit"
 msgstr "Единица разрешения"
 
-#: src/properties.cpp:472
+#: src/properties.cpp:488
 msgid ""
 "TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
 "of: 2 = inches; 3 = centimeters."
 msgstr ""
 
-#: src/properties.cpp:474 src/tags.cpp:443
+#: src/properties.cpp:490 src/tags.cpp:538
 msgid "Transfer Function"
 msgstr "Функция передачи"
 
-#: src/properties.cpp:474
+#: src/properties.cpp:490
 msgid ""
 "TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
 "with 3 * 256 entries."
 msgstr ""
 
-#: src/properties.cpp:476 src/tags.cpp:471
+#: src/properties.cpp:492 src/tags.cpp:570
 msgid "White Point"
 msgstr "Белая точка"
 
-#: src/properties.cpp:476
+#: src/properties.cpp:492
 msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
 msgstr ""
 
-#: src/properties.cpp:477 src/tags.cpp:476
+#: src/properties.cpp:493 src/tags.cpp:575
 msgid "Primary Chromaticities"
 msgstr ""
 
-#: src/properties.cpp:477
+#: src/properties.cpp:493
 msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
 msgstr ""
 
-#: src/properties.cpp:478
+#: src/properties.cpp:494
 msgid ""
 "TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
 msgstr ""
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 #, fuzzy
 msgid "Reference Black White"
 msgstr "Эталонный Чёрный/Белый"
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "TIFF tag 532, 0x214. Reference black and white point values."
 msgstr ""
 
-#: src/properties.cpp:480 src/tags.cpp:455
+#: src/properties.cpp:496 src/tags.cpp:550
 msgid "Date and Time"
 msgstr "Дата и время"
 
-#: src/properties.cpp:480
+#: src/properties.cpp:496
 msgid ""
 "TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
 "and time of image creation (no time zone in EXIF), stored in ISO 8601 "
@@ -13197,90 +16661,85 @@
 "ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
+#: src/properties.cpp:502 src/tags.cpp:463
 msgid "Image Description"
 msgstr "Описание снимка"
 
-#: src/properties.cpp:486
+#: src/properties.cpp:502
 msgid ""
 "TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
 "in XMP as dc:description."
 msgstr ""
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 #, fuzzy
 msgid "Make"
 msgstr "Ручная"
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
 msgstr ""
 
-#: src/properties.cpp:488
+#: src/properties.cpp:504
 msgid "TIFF tag 272, 0x110. Model name or number of equipment."
 msgstr ""
 
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
-msgstr "Программное обеспечение"
-
-#: src/properties.cpp:489
+#: src/properties.cpp:505
 msgid ""
 "TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
 "property is stored in XMP as xmp:CreatorTool. "
 msgstr ""
 
-#: src/properties.cpp:491
+#: src/properties.cpp:507
 msgid ""
 "TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
 "property is stored in XMP as the first item in the dc:creator array."
 msgstr ""
 
-#: src/properties.cpp:493
+#: src/properties.cpp:509
 msgid ""
 "TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
 "in XMP as dc:rights."
 msgstr ""
 
-#: src/properties.cpp:500 src/tags.cpp:1198
+#: src/properties.cpp:516 src/tags.cpp:1388
 msgid "Exif Version"
 msgstr "Версия Exif"
 
-#: src/properties.cpp:500
+#: src/properties.cpp:516
 msgid "EXIF tag 36864, 0x9000. EXIF version number."
 msgstr ""
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 #, fuzzy
 msgid "Flashpix Version"
 msgstr "Версия FlashPix"
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
 msgstr ""
 
-#: src/properties.cpp:502
+#: src/properties.cpp:518
 msgid "EXIF tag 40961, 0xA001. Color space information"
 msgstr ""
 
-#: src/properties.cpp:503 src/tags.cpp:1209
+#: src/properties.cpp:519 src/tags.cpp:1399
 #, fuzzy
 msgid "Components Configuration"
 msgstr "Планарная конфигурация"
 
-#: src/properties.cpp:503
+#: src/properties.cpp:519
 msgid ""
 "EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
 "compressed data), 1 2 3 0 (other cases)."
 msgstr ""
 
-#: src/properties.cpp:505 src/tags.cpp:636
+#: src/properties.cpp:521 src/tags.cpp:823
 #, fuzzy
 msgid "Compressed Bits Per Pixel"
 msgstr "Сжатых битов на пиксел"
 
-#: src/properties.cpp:505
+#: src/properties.cpp:521
 #, fuzzy
 msgid ""
 "EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
@@ -13289,57 +16748,57 @@
 "Специфичная для сжатых данных информация. Использованный режим сжатия для "
 "сжатого изображения показывается в единице измерения \"битов на пиксел\""
 
-#: src/properties.cpp:507 src/tags.cpp:1293
+#: src/properties.cpp:523 src/tags.cpp:1483
 msgid "Pixel X Dimension"
 msgstr ""
 
-#: src/properties.cpp:507
+#: src/properties.cpp:523
 msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
 msgstr ""
 
-#: src/properties.cpp:508 src/tags.cpp:1300
+#: src/properties.cpp:524 src/tags.cpp:1490
 msgid "Pixel Y Dimension"
 msgstr ""
 
-#: src/properties.cpp:508
+#: src/properties.cpp:524
 msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
 msgstr ""
 
-#: src/properties.cpp:509 src/tags.cpp:1267
+#: src/properties.cpp:525 src/tags.cpp:1457
 msgid "User Comment"
 msgstr "Пользовательский комментарий"
 
-#: src/properties.cpp:509
+#: src/properties.cpp:525
 msgid "EXIF tag 37510, 0x9286. Comments from user."
 msgstr ""
 
-#: src/properties.cpp:510 src/tags.cpp:1309
+#: src/properties.cpp:526 src/tags.cpp:1499
 msgid "Related Sound File"
 msgstr "Связанный звуковой файл"
 
-#: src/properties.cpp:510
+#: src/properties.cpp:526
 msgid ""
 "EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
 msgstr ""
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 #, fuzzy
 msgid "Date and Time Original"
 msgstr "Исходная дата и время"
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid ""
 "EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
 "time when original image was generated, in ISO 8601 format. Includes the "
 "EXIF SubSecTimeOriginal data."
 msgstr ""
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 #, fuzzy
 msgid "Date and Time Digitized"
 msgstr "Дата и время оцифровки"
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid ""
 "EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
 "time when image was stored as digital data, can be the same as "
@@ -13347,110 +16806,117 @@
 "format. Includes the EXIF SubSecTimeDigitized data."
 msgstr ""
 
-#: src/properties.cpp:518
+#: src/properties.cpp:534
+#, fuzzy
 msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
-msgstr ""
+msgstr "Время экспозиции в секундах"
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 #, fuzzy
 msgid "F Number"
 msgstr "Число F"
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "EXIF tag 33437, 0x829D. F number."
 msgstr ""
 
-#: src/properties.cpp:520
+#: src/properties.cpp:536
 msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
 msgstr ""
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
 msgid "Spectral Sensitivity"
 msgstr "Спектральная чувствительность"
 
-#: src/properties.cpp:521
+#: src/properties.cpp:537
 msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
 msgstr ""
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 #, fuzzy
 msgid "ISOSpeedRatings"
 msgstr "Настройка резкости"
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 msgid ""
 "EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: src/properties.cpp:524 src/tags.cpp:625
+#: src/properties.cpp:540 src/tags.cpp:812
 msgid "OECF"
 msgstr ""
 
-#: src/properties.cpp:524
+#: src/properties.cpp:540
 msgid ""
 "EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
 "ISO 14524."
 msgstr ""
 
-#: src/properties.cpp:525
+#: src/properties.cpp:541
 msgid ""
 "EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
 "specification."
 msgstr ""
 
-#: src/properties.cpp:526
+#: src/properties.cpp:542
+#, fuzzy
 msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:527 src/tags.cpp:639
+#: src/properties.cpp:543 src/tags.cpp:826
 #, fuzzy
 msgid "Brightness Value"
 msgstr "Яркость"
 
-#: src/properties.cpp:527
+#: src/properties.cpp:543
+#, fuzzy
 msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:528
+#: src/properties.cpp:544
 msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
 msgstr ""
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 #, fuzzy
 msgid "Maximum Aperture Value"
 msgstr "Максимально открытая диафрагма"
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
+#, fuzzy
 msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:530
+#: src/properties.cpp:546
 #, fuzzy
 msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
 msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:531
+#: src/properties.cpp:547
+#, fuzzy
 msgid "EXIF tag 37383, 0x9207. Metering mode."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:532
+#: src/properties.cpp:548
+#, fuzzy
 msgid "EXIF tag 37384, 0x9208. Light source."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:533
+#: src/properties.cpp:549
 msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
 msgstr ""
 
-#: src/properties.cpp:534
+#: src/properties.cpp:550
+#, fuzzy
 msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:535 src/tags.cpp:1259
+#: src/properties.cpp:551 src/tags.cpp:1449
 msgid "Subject Area"
 msgstr "Область объекта съёмки"
 
-#: src/properties.cpp:535
+#: src/properties.cpp:551
 #, fuzzy
 msgid ""
 "EXIF tag 37396, 0x9214. The location and area of the main subject in the "
@@ -13459,2531 +16925,3126 @@
 "Это поле хранит информацию о местоположении и области объекта съёмки во всей "
 "сцене."
 
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
+#, fuzzy
 msgid "Flash Energy"
-msgstr ""
+msgstr "Внешняя вспышка"
 
-#: src/properties.cpp:536
+#: src/properties.cpp:552
 msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
 msgstr ""
 
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: src/properties.cpp:537
+#: src/properties.cpp:553
 msgid ""
 "EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
 "as specified in ISO 12233."
 msgstr ""
 
-#: src/properties.cpp:539 src/tags.cpp:650
+#: src/properties.cpp:555 src/tags.cpp:837
 #, fuzzy
 msgid "Focal Plane X Resolution"
 msgstr "Разрешение по X"
 
-#: src/properties.cpp:539
+#: src/properties.cpp:555
 msgid ""
 "EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
 "unit."
 msgstr ""
 
-#: src/properties.cpp:540 src/tags.cpp:651
+#: src/properties.cpp:556 src/tags.cpp:838
 #, fuzzy
 msgid "Focal Plane Y Resolution"
 msgstr "Разрешение по X"
 
-#: src/properties.cpp:540
+#: src/properties.cpp:556
 msgid ""
 "EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
 "unit."
 msgstr ""
 
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
+#, fuzzy
 msgid "Focal Plane Resolution Unit"
-msgstr ""
+msgstr "Разрешение по X"
 
-#: src/properties.cpp:541
+#: src/properties.cpp:557
 msgid ""
 "EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
 "FocalPlaneYResolution."
 msgstr ""
 
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
 msgid "Subject Location"
 msgstr "Местоположение объекта съёмки"
 
-#: src/properties.cpp:542
+#: src/properties.cpp:558
 msgid ""
 "EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
 "value is the horizontal pixel and the second value is the vertical pixel at "
 "which the main subject appears."
 msgstr ""
 
-#: src/properties.cpp:545 src/tags.cpp:657
+#: src/properties.cpp:561 src/tags.cpp:844
 #, fuzzy
 msgid "Exposure Index"
 msgstr "Режим экспозиции"
 
-#: src/properties.cpp:545
+#: src/properties.cpp:561
 msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
 msgstr ""
 
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
+#, fuzzy
 msgid "Sensing Method"
-msgstr ""
+msgstr "Файл переименовывается в"
 
-#: src/properties.cpp:546
+#: src/properties.cpp:562
 msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
 msgstr ""
 
-#: src/properties.cpp:547
+#: src/properties.cpp:563
+#, fuzzy
 msgid "EXIF tag 41728, 0xA300. Indicates image source."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:548 src/tags.cpp:1364
+#: src/properties.cpp:564 src/tags.cpp:1554
 msgid "Scene Type"
 msgstr "Тип сцены"
 
-#: src/properties.cpp:548
+#: src/properties.cpp:564
+#, fuzzy
 msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:549 src/tags.cpp:572
+#: src/properties.cpp:565 src/tags.cpp:759
 msgid "CFA Pattern"
 msgstr "Паттерн CFA"
 
-#: src/properties.cpp:549
+#: src/properties.cpp:565
 msgid ""
 "EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
 "sense."
 msgstr ""
 
-#: src/properties.cpp:550 src/tags.cpp:1374
+#: src/properties.cpp:566 src/tags.cpp:1564
+#, fuzzy
 msgid "Custom Rendered"
-msgstr ""
+msgstr "Другой процесс проявки"
 
-#: src/properties.cpp:550
+#: src/properties.cpp:566
+#, fuzzy
 msgid ""
 "EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
 "data."
-msgstr ""
+msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/properties.cpp:551
+#: src/properties.cpp:567
 #, fuzzy
 msgid ""
 "EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
 "shot."
 msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/properties.cpp:552
+#: src/properties.cpp:568
 #, fuzzy
 msgid ""
 "EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
 "was shot."
 msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/properties.cpp:553 src/tags.cpp:1388
+#: src/properties.cpp:569 src/tags.cpp:1578
 msgid "Digital Zoom Ratio"
 msgstr "Коэффициент цифрового трансфокатора"
 
-#: src/properties.cpp:553
+#: src/properties.cpp:569
 #, fuzzy
 msgid ""
 "EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
 "shot."
 msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/properties.cpp:554 src/tags.cpp:1393
+#: src/properties.cpp:570 src/tags.cpp:1583
 msgid "Focal Length In 35mm Film"
 msgstr "Фокусное расстояние в 35мм аналоге"
 
-#: src/properties.cpp:554
+#: src/properties.cpp:570
+#, fuzzy
+msgid ""
+"EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
+"35mm film camera, in mm. A value of 0 means the focal length is unknown. "
+"Note that this tag differs from the FocalLength tag."
+msgstr ""
+"Этот тэг отображает фокусное расстояние в 35мм плёночном эквиваленте, "
+"измеряемом миллиметрами. Если значение равно 0, то фокусное расстояние "
+"неизвестно. Обратите внимание на то, что этот тэг отличется от <FocalLength>."
+
+#: src/properties.cpp:573 src/tags.cpp:1589
+#, fuzzy
+msgid "Scene Capture Type"
+msgstr "Тип сцены"
+
+#: src/properties.cpp:573
+#, fuzzy
+msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
+msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
+
+#: src/properties.cpp:574 src/tags.cpp:1594
+#, fuzzy
+msgid "Gain Control"
+msgstr "Пульт Д/У?"
+
+#: src/properties.cpp:574
+#, fuzzy
+msgid ""
+"EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
+"adjustment."
+msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
+
+#: src/properties.cpp:575
+#, fuzzy
+msgid ""
+"EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
+"applied by the camera."
+msgstr ""
+"Этот тэг отображает направление обработки контраста при съёмке изображения"
+
+#: src/properties.cpp:576
+#, fuzzy
+msgid ""
+"EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
+"applied by the camera."
+msgstr ""
+"Этот тэг отображает направление обработки насыщенности при съёмке изображения"
+
+#: src/properties.cpp:577
+#, fuzzy
+msgid ""
+"EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
+"applied by the camera."
+msgstr ""
+"Этот тэг отображает направление обработки резкости при съёмке изображения"
+
+#: src/properties.cpp:578 src/tags.cpp:1609
+#, fuzzy
+msgid "Device Setting Description"
+msgstr "Настройки камеры"
+
+#: src/properties.cpp:578
+#, fuzzy
+msgid ""
+"EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
+"conditions of a particular camera model."
+msgstr ""
+"Этот тэг отображает направление обработки резкости при съёмке изображения"
+
+#: src/properties.cpp:579 src/tags.cpp:1614
+#, fuzzy
+msgid "Subject Distance Range"
+msgstr "Расстояние до объекта"
+
+#: src/properties.cpp:579
+#, fuzzy
+msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
+msgstr "Расстояние до объекта в метрах"
+
+#: src/properties.cpp:580 src/tags.cpp:1617
+msgid "Image Unique ID"
+msgstr "Уникальный ID изображения"
+
+#: src/properties.cpp:580
+msgid ""
+"EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
+"recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
+"and 128-bit fixed length."
+msgstr ""
+
+#: src/properties.cpp:582 src/tags.cpp:1691
+msgid "GPS Version ID"
+msgstr "ID версии GPS"
+
+#: src/properties.cpp:582
+msgid ""
+"GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
+"period separators. The current value is \"2.0.0.0\"."
+msgstr ""
+
+#: src/properties.cpp:584 src/tags.cpp:1702
+msgid "GPS Latitude"
+msgstr "Широта по GPS"
+
+#: src/properties.cpp:584
+msgid ""
+"GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
+msgstr ""
+
+#: src/properties.cpp:585 src/tags.cpp:1714
+msgid "GPS Longitude"
+msgstr "Долгота по GPS"
+
+#: src/properties.cpp:585
+msgid ""
+"GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
+msgstr ""
+
+#: src/properties.cpp:586 src/tags.cpp:1722
+#, fuzzy
+msgid "GPS Altitude Reference"
+msgstr "Высота по GPS"
+
+#: src/properties.cpp:586
+#, fuzzy
+msgid ""
+"GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
+msgstr "Расстояние до объекта в метрах"
+
+#: src/properties.cpp:587 src/tags.cpp:1730
+msgid "GPS Altitude"
+msgstr "Высота по GPS"
+
+#: src/properties.cpp:587
+#, fuzzy
+msgid "GPS tag 6, 0x06. Indicates altitude in meters."
+msgstr "Расстояние до объекта в метрах"
+
+#: src/properties.cpp:588 src/tags.cpp:1734
+msgid "GPS Time Stamp"
+msgstr "Отметка времени по GPS"
+
+#: src/properties.cpp:588
+msgid ""
+"GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
+"data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
+"EXIF 2.2. The GPS timestamp in EXIF 2.1 does not include a date. If not "
+"present, the date component for the XMP should be taken from exif:"
+"DateTimeOriginal, or if that is also lacking from exif:DateTimeDigitized. If "
+"no date is available, do not write exif:GPSTimeStamp to XMP."
+msgstr ""
+
+#: src/properties.cpp:594 src/tags.cpp:1739
+#, fuzzy
+msgid "GPS Satellites"
+msgstr "Широта по GPS"
+
+#: src/properties.cpp:594
+msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
+msgstr ""
+
+#: src/properties.cpp:595 src/tags.cpp:1746
+msgid "GPS Status"
+msgstr "Статус приёмника GPS"
+
+#: src/properties.cpp:595
+#, fuzzy
+msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
+msgstr "Скорость перемещения приёмника GPS"
+
+#: src/properties.cpp:596 src/tags.cpp:1751
+msgid "GPS Measure Mode"
+msgstr "Режим захвата данных GPS"
+
+#: src/properties.cpp:596
+#, fuzzy
+msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
+msgstr "Скорость перемещения приёмника GPS"
+
+#: src/properties.cpp:597
+msgid "GPS DOP"
+msgstr ""
+
+#: src/properties.cpp:597
+#, fuzzy
+msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
+msgstr "Версия тэга GPS"
+
+#: src/properties.cpp:598 src/tags.cpp:1759
+#, fuzzy
+msgid "GPS Speed Reference"
+msgstr "Эталонный Чёрный/Белый"
+
+#: src/properties.cpp:598
+#, fuzzy
+msgid "GPS tag 12, 0x0C. Units used to speed measurement."
+msgstr "Скорость перемещения приёмника GPS"
+
+#: src/properties.cpp:599 src/tags.cpp:1763
+msgid "GPS Speed"
+msgstr "Скорость по GPS"
+
+#: src/properties.cpp:599
+#, fuzzy
+msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
+msgstr "Скорость перемещения приёмника GPS"
+
+#: src/properties.cpp:600
+#, fuzzy
+msgid "GPS Track Reference"
+msgstr "Эталонный Чёрный/Белый"
+
+#: src/properties.cpp:600
+#, fuzzy
+msgid "GPS tag 14, 0x0E. Reference for movement direction."
+msgstr "Расстояние до объекта в метрах"
+
+#: src/properties.cpp:601 src/tags.cpp:1770
+#, fuzzy
+msgid "GPS Track"
+msgstr "Эталонный Чёрный/Белый"
+
+#: src/properties.cpp:601
+msgid ""
+"GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
+msgstr ""
+
+#: src/properties.cpp:602 src/tags.cpp:1774
+#, fuzzy
+msgid "GPS Image Direction Reference"
+msgstr "Направление снимка GPS"
+
+#: src/properties.cpp:602
 #, fuzzy
+msgid "GPS tag 16, 0x10. Reference for image direction."
+msgstr "Расстояние до объекта в метрах"
+
+#: src/properties.cpp:603 src/tags.cpp:1778
+msgid "GPS Image Direction"
+msgstr "Направление снимка GPS"
+
+#: src/properties.cpp:603
 msgid ""
-"EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
-"35mm film camera, in mm. A value of 0 means the focal length is unknown. "
-"Note that this tag differs from the FocalLength tag."
+"GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
+"359.99."
 msgstr ""
-"Этот тэг отображает фокусное расстояние в 35мм плёночном эквиваленте, "
-"измеряемом миллиметрами. Если значение равно 0, то фокусное расстояние "
-"неизвестно. Обратите внимание на то, что этот тэг отличется от <FocalLength>."
 
-#: src/properties.cpp:557 src/tags.cpp:1399
-msgid "Scene Capture Type"
-msgstr ""
+#: src/properties.cpp:604 src/tags.cpp:1782
+#, fuzzy
+msgid "GPS Map Datum"
+msgstr "Статус приёмника GPS"
 
-#: src/properties.cpp:557
-msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
-msgstr ""
+#: src/properties.cpp:604
+#, fuzzy
+msgid "GPS tag 18, 0x12. Geodetic survey data."
+msgstr "Версия тэга GPS"
 
-#: src/properties.cpp:558 src/tags.cpp:1404
-msgid "Gain Control"
-msgstr ""
+#: src/properties.cpp:605 src/tags.cpp:1790
+#, fuzzy
+msgid "GPS Destination Latitude"
+msgstr "Расстояние до объекта"
 
-#: src/properties.cpp:558
+#: src/properties.cpp:605
 msgid ""
-"EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
-"adjustment."
+"GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
+"destination latitude."
 msgstr ""
 
-#: src/properties.cpp:559
+#: src/properties.cpp:606 src/tags.cpp:1802
 #, fuzzy
+msgid "GPS Destination Longitude"
+msgstr "Расстояние до объекта"
+
+#: src/properties.cpp:606
 msgid ""
-"EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
-"applied by the camera."
+"GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
+"longitude."
 msgstr ""
-"Этот тэг отображает направление обработки контраста при съёмке изображения"
 
-#: src/properties.cpp:560
+#: src/properties.cpp:607 src/tags.cpp:1809
 #, fuzzy
-msgid ""
-"EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
-"applied by the camera."
-msgstr ""
-"Этот тэг отображает направление обработки насыщенности при съёмке изображения"
+msgid "GPS Destination Bearing Reference"
+msgstr "Расстояние до объекта"
 
-#: src/properties.cpp:561
+#: src/properties.cpp:607
 #, fuzzy
-msgid ""
-"EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
-"applied by the camera."
-msgstr ""
-"Этот тэг отображает направление обработки резкости при съёмке изображения"
+msgid "GPS tag 23, 0x17. Reference for movement direction."
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:562 src/tags.cpp:1419
-msgid "Device Setting Description"
-msgstr ""
+#: src/properties.cpp:608 src/tags.cpp:1813
+#, fuzzy
+msgid "GPS Destination Bearing"
+msgstr "Расстояние до объекта"
 
-#: src/properties.cpp:562
-msgid ""
-"EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
-"conditions of a particular camera model."
+#: src/properties.cpp:608
+msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
 msgstr ""
 
-#: src/properties.cpp:563 src/tags.cpp:1424
-msgid "Subject Distance Range"
-msgstr ""
+#: src/properties.cpp:609
+#, fuzzy
+msgid "GPS Destination Distance Refefrence"
+msgstr "Расстояние до объекта"
 
-#: src/properties.cpp:563
+#: src/properties.cpp:609
 #, fuzzy
-msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
+msgid "GPS tag 25, 0x19. Units used for speed measurement."
 msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:564 src/tags.cpp:1427
-msgid "Image Unique ID"
-msgstr "Уникальный ID изображения"
+#: src/properties.cpp:610 src/tags.cpp:1821
+#, fuzzy
+msgid "GPS Destination Distance"
+msgstr "Расстояние до объекта"
 
-#: src/properties.cpp:564
-msgid ""
-"EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
-"recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
-"and 128-bit fixed length."
-msgstr ""
+#: src/properties.cpp:610
+#, fuzzy
+msgid "GPS tag 26, 0x1A. Distance to destination."
+msgstr "Расстояние до объекта в метрах"
 
-#: src/properties.cpp:566 src/tags.cpp:1501
-msgid "GPS Version ID"
-msgstr "ID версии GPS"
+#: src/properties.cpp:611 src/tags.cpp:1824
+#, fuzzy
+msgid "GPS Processing Method"
+msgstr "Резкость изображения"
 
-#: src/properties.cpp:566
+#: src/properties.cpp:611
 msgid ""
-"GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
-"period separators. The current value is \"2.0.0.0\"."
+"GPS tag 27, 0x1B. A character string recording the name of the method used "
+"for location finding."
 msgstr ""
 
-#: src/properties.cpp:568 src/tags.cpp:1512
-msgid "GPS Latitude"
-msgstr "Широта по GPS"
+#: src/properties.cpp:612 src/tags.cpp:1829
+#, fuzzy
+msgid "GPS Area Information"
+msgstr "Информация GPS"
 
-#: src/properties.cpp:568
+#: src/properties.cpp:612
 msgid ""
-"GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
+"GPS tag 28, 0x1C. A character string recording the name of the GPS area."
 msgstr ""
 
-#: src/properties.cpp:569 src/tags.cpp:1524
-msgid "GPS Longitude"
-msgstr "Долгота по GPS"
+#: src/properties.cpp:613 src/tags.cpp:1837
+msgid "GPS Differential"
+msgstr ""
 
-#: src/properties.cpp:569
+#: src/properties.cpp:613
+#, fuzzy
 msgid ""
-"GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
+"GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
+"the GPS receiver."
 msgstr ""
+"Этот тэг отображает направление обработки насыщенности при съёмке изображения"
 
-#: src/properties.cpp:570 src/tags.cpp:1532
-msgid "GPS Altitude Reference"
+#: src/properties.cpp:619
+msgid ""
+"A description of the lens used to take the photograph. For example, \"70-200 "
+"mm f/2.8-4.0\"."
 msgstr ""
+"Описание объектива, применявшегося для съемки. Например, \"70-200 mm "
+"f/2.8-4.0\"."
 
-#: src/properties.cpp:570
+#: src/properties.cpp:620
 #, fuzzy
+msgid "SerialNumber"
+msgstr "Серийный номер"
+
+#: src/properties.cpp:620
 msgid ""
-"GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
-msgstr "Расстояние до объекта в метрах"
+"The serial number of the camera or camera body used to take the photograph."
+msgstr ""
+"Серийный номер камеры или задника камеры, использовавшегося для съемки."
 
-#: src/properties.cpp:571 src/tags.cpp:1540
-msgid "GPS Altitude"
-msgstr "Высота по GPS"
+#: src/properties.cpp:626
+#, fuzzy
+msgid "Contact Info-City"
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:571
+#: src/properties.cpp:626
 #, fuzzy
-msgid "GPS tag 6, 0x06. Indicates altitude in meters."
-msgstr "Расстояние до объекта в метрах"
+msgid "The contact information city part."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:572 src/tags.cpp:1544
-msgid "GPS Time Stamp"
-msgstr "Отметка времени по GPS"
+#: src/properties.cpp:627
+#, fuzzy
+msgid "Contact Info-Country"
+msgstr "Штат/провинция"
+
+#: src/properties.cpp:627
+#, fuzzy
+msgid "The contact information country part."
+msgstr "Способ фокусировки"
+
+#: src/properties.cpp:628
+#, fuzzy
+msgid "Contact Info-Address"
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:572
+#: src/properties.cpp:628
 msgid ""
-"GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
-"data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
-"EXIF 2.2. The GPS timestamp in EXIF 2.1 does not include a date. If not "
-"present, the date component for the XMP should be taken from exif:"
-"DateTimeOriginal, or if that is also lacking from exif:DateTimeDigitized. If "
-"no date is available, do not write exif:GPSTimeStamp to XMP."
+"The contact information address part. Comprises an optional company name and "
+"all required information to locate the building or postbox to which mail "
+"should be sent."
 msgstr ""
 
-#: src/properties.cpp:578 src/tags.cpp:1549
-msgid "GPS Satellites"
-msgstr ""
+#: src/properties.cpp:630
+#, fuzzy
+msgid "Contact Info-Postal Code"
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:578
-msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
-msgstr ""
+#: src/properties.cpp:630
+#, fuzzy
+msgid "The contact information part denoting the local postal code."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:579 src/tags.cpp:1556
-msgid "GPS Status"
-msgstr "Статус приёмника GPS"
+#: src/properties.cpp:631
+#, fuzzy
+msgid "Contact Info-State/Province"
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:579
-msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
+#: src/properties.cpp:631
+msgid ""
+"The contact information part denoting regional information like state or "
+"province."
 msgstr ""
 
-#: src/properties.cpp:580 src/tags.cpp:1561
-msgid "GPS Measure Mode"
-msgstr "Режим захвата данных GPS"
+#: src/properties.cpp:632
+#, fuzzy
+msgid "Contact Info-Email"
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:580
-msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
-msgstr ""
+#: src/properties.cpp:632
+#, fuzzy
+msgid "The contact information email address part."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:581
-msgid "GPS DOP"
+#: src/properties.cpp:633
+#, fuzzy
+msgid "Contact Info-Phone"
+msgstr "Штат/провинция"
+
+#: src/properties.cpp:633
+#, fuzzy
+msgid "The contact information phone number part."
+msgstr "Способ фокусировки"
+
+#: src/properties.cpp:634
+msgid "Contact Info-Web URL"
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:634
 #, fuzzy
-msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
-msgstr "Версия тэга GPS"
+msgid "The contact information web address part."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:582 src/tags.cpp:1569
-msgid "GPS Speed Reference"
+#: src/properties.cpp:635
+msgid ""
+"Code of the country the content is focussing on -- either the country shown "
+"in visual media or referenced in text or audio media. This element is at the "
+"top/first level of a top-down geographical hierarchy. The code should be "
+"taken from ISO 3166 two or three letter code. The full name of a country "
+"should go to the \"Country\" element."
 msgstr ""
 
-#: src/properties.cpp:582
-msgid "GPS tag 12, 0x0C. Units used to speed measurement."
+#: src/properties.cpp:639
+msgid "Creator's Contact Info"
 msgstr ""
 
-#: src/properties.cpp:583 src/tags.cpp:1573
-msgid "GPS Speed"
-msgstr "Скорость по GPS"
+#: src/properties.cpp:639
+msgid ""
+"The creator's contact information provides all necessary information to get "
+"in contact with the creator of this news object and comprises a set of sub-"
+"properties for proper addressing."
+msgstr ""
 
-#: src/properties.cpp:583
-#, fuzzy
-msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
-msgstr "Скорость перемещения приёмника GPS"
+#: src/properties.cpp:641
+msgid "Intellectual Genre"
+msgstr ""
 
-#: src/properties.cpp:584
-#, fuzzy
-msgid "GPS Track Reference"
-msgstr "Эталонный Чёрный/Белый"
+#: src/properties.cpp:641
+msgid ""
+"Describes the nature, intellectual or journalistic characteristic of a news "
+"object, not specifically its content."
+msgstr ""
 
-#: src/properties.cpp:584
-msgid "GPS tag 14, 0x0E. Reference for movement direction."
+#: src/properties.cpp:643
+msgid ""
+"Name of a location the content is focussing on -- either the location shown "
+"in visual media or referenced by text or audio media. This location name "
+"could either be the name of a sublocation to a city or the name of a well "
+"known location or (natural) monument outside a city. In the sense of a "
+"sublocation to a city this element is at the fourth level of a top-down "
+"geographical hierarchy."
 msgstr ""
 
-#: src/properties.cpp:585 src/tags.cpp:1580
-msgid "GPS Track"
-msgstr ""
+#: src/properties.cpp:648
+#, fuzzy
+msgid "IPTC Scene"
+msgstr "Тип сцены"
 
-#: src/properties.cpp:585
+#: src/properties.cpp:648
 msgid ""
-"GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
+"Describes the scene of a photo content. Specifies one or more terms from the "
+"IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
+"in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:586 src/tags.cpp:1584
-msgid "GPS Image Direction Reference"
+#: src/properties.cpp:650
+#, fuzzy
+msgid "IPTC Subject Code"
+msgstr "Область объекта съёмки"
+
+#: src/properties.cpp:650
+msgid ""
+"Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
+"to categorize the content. Each Subject is represented as a string of 8 "
+"digits in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:586
+#: src/properties.cpp:657
 #, fuzzy
-msgid "GPS tag 16, 0x10. Reference for image direction."
-msgstr "Расстояние до объекта в метрах"
-
-#: src/properties.cpp:587 src/tags.cpp:1588
-msgid "GPS Image Direction"
-msgstr "Направление снимка GPS"
+msgid "Additional model info"
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:587
+#: src/properties.cpp:657
 msgid ""
-"GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
-"359.99."
+"Information about the ethnicity and other facts of the model(s) in a model-"
+"released image."
 msgstr ""
 
-#: src/properties.cpp:588 src/tags.cpp:1592
-msgid "GPS Map Datum"
+#: src/properties.cpp:658
+msgid "Code of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:588
-msgid "GPS tag 18, 0x12. Geodetic survey data."
+#: src/properties.cpp:658
+msgid ""
+"Code from controlled vocabulary for identyfing the organisation or company "
+"which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:589 src/tags.cpp:1600
-msgid "GPS Destination Latitude"
+#: src/properties.cpp:659
+msgid "Controlled Vocabulary Term"
 msgstr ""
 
-#: src/properties.cpp:589
+#: src/properties.cpp:659
 msgid ""
-"GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
-"destination latitude."
+"A term to describe the content of the image by a value from a Controlled "
+"Vocabulary."
 msgstr ""
 
-#: src/properties.cpp:590 src/tags.cpp:1612
-msgid "GPS Destination Longitude"
-msgstr ""
+#: src/properties.cpp:660
+#, fuzzy
+msgid "Model age"
+msgstr "Модель"
 
-#: src/properties.cpp:590
+#: src/properties.cpp:660
 msgid ""
-"GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
-"longitude."
+"Age of the human model(s) at the time this image was taken in a model "
+"released image."
 msgstr ""
 
-#: src/properties.cpp:591 src/tags.cpp:1619
-msgid "GPS Destination Bearing Reference"
+#: src/properties.cpp:661
+msgid "Name of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:591
-msgid "GPS tag 23, 0x17. Reference for movement direction."
+#: src/properties.cpp:661
+msgid "Name of the organisation or company which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:592 src/tags.cpp:1623
-msgid "GPS Destination Bearing"
-msgstr ""
+#: src/properties.cpp:662
+#, fuzzy
+msgid "Person shown"
+msgstr "Версии"
 
-#: src/properties.cpp:592
-msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
+#: src/properties.cpp:662
+msgid "Name of a person shown in the image."
 msgstr ""
 
-#: src/properties.cpp:593
+#: src/properties.cpp:663
 #, fuzzy
-msgid "GPS Destination Distance Refefrence"
-msgstr "Расстояние до объекта"
+msgid "Digital Image Identifier"
+msgstr "Стабилизация снимка"
 
-#: src/properties.cpp:593
-msgid "GPS tag 25, 0x19. Units used for speed measurement."
+#: src/properties.cpp:663
+msgid ""
+"Globally unique identifier for this digital image. It is created and applied "
+"by the creator of the digital image at the time of its creation. this value "
+"shall not be changed after that time."
+msgstr ""
+
+#: src/properties.cpp:664
+msgid "Physical type of original photo"
 msgstr ""
 
-#: src/properties.cpp:594 src/tags.cpp:1631
+#: src/properties.cpp:664
 #, fuzzy
-msgid "GPS Destination Distance"
-msgstr "Расстояние до объекта"
+msgid "The type of the source digital file."
+msgstr "Вид источника света"
 
-#: src/properties.cpp:594
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
 #, fuzzy
-msgid "GPS tag 26, 0x1A. Distance to destination."
-msgstr "Расстояние до объекта в метрах"
+msgid "Event"
+msgstr "Вечер"
 
-#: src/properties.cpp:595 src/tags.cpp:1634
-msgid "GPS Processing Method"
+#: src/properties.cpp:665
+msgid "Names or describes the specific event at which the photo was taken."
 msgstr ""
 
-#: src/properties.cpp:595
+#: src/properties.cpp:666
+#, fuzzy
+msgid "Maximum available height"
+msgstr "Заполняющий свет"
+
+#: src/properties.cpp:666
 msgid ""
-"GPS tag 27, 0x1B. A character string recording the name of the method used "
-"for location finding."
+"The maximum available height in pixels of the original photo from which this "
+"photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:596 src/tags.cpp:1639
-msgid "GPS Area Information"
-msgstr ""
+#: src/properties.cpp:667
+#, fuzzy
+msgid "Maximum available width"
+msgstr "Максимальное фокусное расстояние"
 
-#: src/properties.cpp:596
+#: src/properties.cpp:667
 msgid ""
-"GPS tag 28, 0x1C. A character string recording the name of the GPS area."
-msgstr ""
-
-#: src/properties.cpp:597 src/tags.cpp:1647
-msgid "GPS Differential"
+"The maximum available width in pixels of the original photo from which this "
+"photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:597
-#, fuzzy
-msgid ""
-"GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
-"the GPS receiver."
+#: src/properties.cpp:668
+msgid "Registry Entry"
 msgstr ""
-"Этот тэг отображает направление обработки насыщенности при съёмке изображения"
 
-#: src/properties.cpp:603
+#: src/properties.cpp:668
 msgid ""
-"A description of the lens used to take the photograph. For example, \"70-200 "
-"mm f/2.8-4.0\"."
+"Both a Registry Item Id and a Registry Organisation Id to record any "
+"registration of this digital image with a registry."
 msgstr ""
-"Описание объектива, применявшегося для съемки. Например, \"70-200 mm f/2.8-"
-"4.0\"."
 
-#: src/properties.cpp:604
+#: src/properties.cpp:669
 #, fuzzy
-msgid "SerialNumber"
-msgstr "Серийный номер"
+msgid "Registry Entry-Item Identifier"
+msgstr "Стабилизация снимка"
 
-#: src/properties.cpp:604
+#: src/properties.cpp:669
 msgid ""
-"The serial number of the camera or camera body used to take the photograph."
+"A unique identifier created by a registry and applied by the creator of the "
+"digital image. This value shall not be changed after being applied. This "
+"identifier is linked to a corresponding Registry Organisation Identifier."
 msgstr ""
-"Серийный номер камеры или задника камеры, использовавшегося для съемки."
 
-#: src/properties.cpp:610
-msgid "Contact Info-City"
+#: src/properties.cpp:670
+msgid "Registry Entry-Organisation Identifier"
 msgstr ""
 
-#: src/properties.cpp:610
-#, fuzzy
-msgid "The contact information city part."
-msgstr "Способ фокусировки"
+#: src/properties.cpp:670
+msgid ""
+"An identifier for the registry which issued the corresponding Registry Image "
+"Id."
+msgstr ""
 
-#: src/properties.cpp:611
-msgid "Contact Info-Country"
+#: src/properties.cpp:671
+msgid "IPTC Fields Last Edited"
 msgstr ""
 
-#: src/properties.cpp:611
+#: src/properties.cpp:671
 #, fuzzy
-msgid "The contact information country part."
-msgstr "Способ фокусировки"
+msgid ""
+"The date and optionally time when any of the IPTC photo metadata fields has "
+"been last edited."
+msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:612
-msgid "Contact Info-Address"
-msgstr ""
+#: src/properties.cpp:672
+#, fuzzy
+msgid "Location shown"
+msgstr "Местоположение объекта съёмки"
 
-#: src/properties.cpp:612
-msgid ""
-"The contact information address part. Comprises an optional company name and "
-"all required information to locate the building or postbox to which mail "
-"should be sent."
+#: src/properties.cpp:672
+msgid "A location shown in the image."
 msgstr ""
 
-#: src/properties.cpp:614
-msgid "Contact Info-Postal Code"
-msgstr ""
+#: src/properties.cpp:673
+#, fuzzy
+msgid "Location Created"
+msgstr "Имя местоположения"
 
-#: src/properties.cpp:614
-msgid "The contact information part denoting the local postal code."
-msgstr ""
+#: src/properties.cpp:673
+#, fuzzy
+msgid "The location the photo was taken."
+msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:615
+#: src/properties.cpp:674
 #, fuzzy
-msgid "Contact Info-State/Province"
-msgstr "Штат/провинция"
+msgid "Location-City"
+msgstr "Местоположение объекта съёмки"
 
-#: src/properties.cpp:615
-msgid ""
-"The contact information part denoting regional information like state or "
-"province."
+#: src/properties.cpp:674
+msgid "Name of the city of a location."
 msgstr ""
 
-#: src/properties.cpp:616
-msgid "Contact Info-Email"
-msgstr ""
+#: src/properties.cpp:675
+#, fuzzy
+msgid "Location-Country ISO-Code"
+msgstr "Код страны"
 
-#: src/properties.cpp:616
-msgid "The contact information email address part."
+#: src/properties.cpp:675
+msgid "The ISO code of a country of a location."
 msgstr ""
 
-#: src/properties.cpp:617
-msgid "Contact Info-Phone"
-msgstr ""
+#: src/properties.cpp:676
+#, fuzzy
+msgid "Location-Country Name"
+msgstr "Имя местоположения"
 
-#: src/properties.cpp:617
-msgid "The contact information phone number part."
+#: src/properties.cpp:676
+msgid "The name of a country of a location."
 msgstr ""
 
-#: src/properties.cpp:618
-msgid "Contact Info-Web URL"
-msgstr ""
+#: src/properties.cpp:677
+#, fuzzy
+msgid "Location-Province/State"
+msgstr "Имя местоположения"
 
-#: src/properties.cpp:618
-msgid "The contact information web address part."
+#: src/properties.cpp:677
+msgid ""
+"The name of a subregion of a country - a province or state - of a location."
 msgstr ""
 
-#: src/properties.cpp:619
+#: src/properties.cpp:678
+#, fuzzy
+msgid "Location-Sublocation"
+msgstr "Местоположение объекта съёмки"
+
+#: src/properties.cpp:678
 msgid ""
-"Code of the country the content is focussing on -- either the country shown "
-"in visual media or referenced in text or audio media. This element is at the "
-"top/first level of a top-down geographical hierarchy. The code should be "
-"taken from ISO 3166 two or three letter code. The full name of a country "
-"should go to the \"Country\" element."
+"Name of a sublocation. This sublocation name could either be the name of a "
+"sublocation to a city or the name of a well known location or (natural) "
+"monument outside a city."
 msgstr ""
 
-#: src/properties.cpp:623
-msgid "Creator's Contact Info"
+#: src/properties.cpp:679
+#, fuzzy
+msgid "Location-World Region"
+msgstr "Местоположение объекта съёмки"
+
+#: src/properties.cpp:679
+msgid "The name of a world region of a location."
 msgstr ""
 
-#: src/properties.cpp:623
-msgid ""
-"The creator's contact information provides all necessary information to get "
-"in contact with the creator of this news object and comprises a set of sub-"
-"properties for proper addressing."
-msgstr ""
+#: src/properties.cpp:680
+#, fuzzy
+msgid "Artwork or object in the image"
+msgstr "Уведомление об авторских правах"
 
-#: src/properties.cpp:625
-msgid "Intellectual Genre"
+#: src/properties.cpp:680
+msgid "A set of metadata about artwork or an object in the image."
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:681
+#, fuzzy
+msgid "Artwork or object-Copyright notice"
+msgstr "Уведомление об авторских правах"
+
+#: src/properties.cpp:681
 msgid ""
-"Describes the nature, intellectual or journalistic characteristic of a news "
-"object, not specifically its content."
+"Contains any necessary copyright notice for claiming the intellectual "
+"property for artwork or an object in the image and should identify the "
+"current owner of the copyright of this work with associated intellectual "
+"property rights."
 msgstr ""
 
-#: src/properties.cpp:627
+#: src/properties.cpp:682
+#, fuzzy
+msgid "Artwork or object-Creator"
+msgstr "Уведомление об авторских правах"
+
+#: src/properties.cpp:682
 msgid ""
-"Name of a location the content is focussing on -- either the location shown "
-"in visual media or referenced by text or audio media. This location name "
-"could either be the name of a sublocation to a city or the name of a well "
-"known location or (natural) monument outside a city. In the sense of a "
-"sublocation to a city this element is at the fourth level of a top-down "
-"geographical hierarchy."
+"Contains the name of the artist who has created artwork or an object in the "
+"image. In cases where the artist could or should not be identified the name "
+"of a company or organisation may be appropriate."
 msgstr ""
 
-#: src/properties.cpp:632
-msgid "IPTC Scene"
-msgstr ""
+#: src/properties.cpp:683
+#, fuzzy
+msgid "Artwork or object-Date Created"
+msgstr "Уведомление об авторских правах"
 
-#: src/properties.cpp:632
+#: src/properties.cpp:683
 msgid ""
-"Describes the scene of a photo content. Specifies one or more terms from the "
-"IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
-"in an unordered list."
+"Designates the date and optionally the time the artwork or object in the "
+"image was created. This relates to artwork or objects with associated "
+"intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:634
+#: src/properties.cpp:684
 #, fuzzy
-msgid "IPTC Subject Code"
-msgstr "Область объекта съёмки"
+msgid "Artwork or object-Source"
+msgstr "Уведомление об авторских правах"
 
-#: src/properties.cpp:634
+#: src/properties.cpp:684
 msgid ""
-"Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
-"to categorize the content. Each Subject is represented as a string of 8 "
-"digits in an unordered list."
+"The organisation or body holding and registering the artwork or object in "
+"the image for inventory purposes."
 msgstr ""
 
-#: src/properties.cpp:641
-msgid "Additional model info"
-msgstr ""
+#: src/properties.cpp:685
+#, fuzzy
+msgid "Artwork or object-Source inventory number"
+msgstr "Уведомление об авторских правах"
 
-#: src/properties.cpp:641
+#: src/properties.cpp:685
 msgid ""
-"Information about the ethnicity and other facts of the model(s) in a model-"
-"released image."
+"The inventory number issued by the organisation or body holding and "
+"registering the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:642
-msgid "Code of featured Organisation"
+#: src/properties.cpp:686
+#, fuzzy
+msgid "Artwork or object-Title"
+msgstr "Уведомление об авторских правах"
+
+#: src/properties.cpp:686
+msgid "A reference for the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:642
-msgid ""
-"Code from controlled vocabulary for identyfing the organisation or company "
-"which is featured in the image."
+#: src/properties.cpp:693
+msgid "Scan from film"
 msgstr ""
 
-#: src/properties.cpp:643
-msgid "Controlled Vocabulary Term"
+#: src/properties.cpp:694
+msgid "Scan from transparency (including slide)"
 msgstr ""
 
-#: src/properties.cpp:643
-msgid ""
-"A term to describe the content of the image by a value from a Controlled "
-"Vocabulary."
+#: src/properties.cpp:695
+msgid "Scan from print"
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:696
 #, fuzzy
-msgid "Model age"
-msgstr "Модель"
-
-#: src/properties.cpp:644
-msgid ""
-"Age of the human model(s) at the time this image was taken in a model "
-"released image."
-msgstr ""
+msgid "Camera RAW"
+msgstr "ID камеры"
 
-#: src/properties.cpp:645
-msgid "Name of featured Organisation"
-msgstr ""
+#: src/properties.cpp:697
+#, fuzzy
+msgid "Camera TIFF"
+msgstr "ID камеры"
 
-#: src/properties.cpp:645
-msgid "Name of the organisation or company which is featured in the image."
-msgstr ""
+#: src/properties.cpp:698
+#, fuzzy
+msgid "Camera JPEG"
+msgstr "ID камеры"
 
-#: src/properties.cpp:646
+#: src/properties.cpp:703
 #, fuzzy
-msgid "Person shown"
-msgstr "Версии"
+msgid "PLUS Version"
+msgstr "Версия PDF"
 
-#: src/properties.cpp:646
-msgid "Name of a person shown in the image."
+#: src/properties.cpp:703
+msgid ""
+"The version number of the PLUS standards in place at the time of the "
+"transaction."
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:704
 #, fuzzy
-msgid "Digital Image Identifier"
-msgstr "Стабилизация снимка"
+msgid "Licensee"
+msgstr "Объектив"
 
-#: src/properties.cpp:647
+#: src/properties.cpp:704
 msgid ""
-"Globally unique identifier for this digital image. It is created and applied "
-"by the creator of the digital image at the time of its creation. this value "
-"shall not be changed after that time."
+"Party or parties to whom the license is granted by the Licensor/s under the "
+"license transaction."
 msgstr ""
 
-#: src/properties.cpp:648
-msgid "Physical type of original photo"
+#: src/properties.cpp:705
+#, fuzzy
+msgid "Licensee ID"
+msgstr "ID объектива"
+
+#: src/properties.cpp:705
+msgid "Optional PLUS-ID identifying each Licensee."
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:706
 #, fuzzy
-msgid "The type of the source digital file."
+msgid "Licensee Name"
+msgstr "Имя местоположения"
+
+#: src/properties.cpp:706
+#, fuzzy
+msgid "Name of each Licensee."
 msgstr "Вид источника света"
 
-#: src/properties.cpp:649
+#: src/properties.cpp:707
 #, fuzzy
-msgid "Event"
-msgstr "Вечер"
+msgid "End User"
+msgstr "внешняя"
 
-#: src/properties.cpp:649
-msgid "Names or describes the specific event at which the photo was taken."
+#: src/properties.cpp:707
+msgid "Party or parties ultimately making use of the image under the license."
 msgstr ""
 
-#: src/properties.cpp:650
+#: src/properties.cpp:708
 #, fuzzy
-msgid "Maximum available height"
-msgstr "Заполняющий свет"
+msgid "End User ID"
+msgstr "внешняя"
 
-#: src/properties.cpp:650
-msgid ""
-"The maximum available height in pixels of the original photo from which this "
-"photo has been derived by downsizing."
+#: src/properties.cpp:708
+msgid "Optional PLUS-ID identifying each End User."
 msgstr ""
 
-#: src/properties.cpp:651
+#: src/properties.cpp:709
 #, fuzzy
-msgid "Maximum available width"
-msgstr "Максимальное фокусное расстояние"
+msgid "End User Name"
+msgstr "Имя владельца"
 
-#: src/properties.cpp:651
-msgid ""
-"The maximum available width in pixels of the original photo from which this "
-"photo has been derived by downsizing."
-msgstr ""
+#: src/properties.cpp:709
+#, fuzzy
+msgid "Name of each End User."
+msgstr "Вид источника света"
 
-#: src/properties.cpp:652
-msgid "Registry Entry"
-msgstr ""
+#: src/properties.cpp:710
+#, fuzzy
+msgid "Licensor"
+msgstr "Объектив"
 
-#: src/properties.cpp:652
-msgid ""
-"Both a Registry Item Id and a Registry Organisation Id to record any "
-"registration of this digital image with a registry."
+#: src/properties.cpp:710
+msgid "Party or parties granting the license to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:653
-msgid "Registry Entry-Item Identifier"
-msgstr ""
+#: src/properties.cpp:711
+#, fuzzy
+msgid "Licensor ID"
+msgstr "ID объектива"
 
-#: src/properties.cpp:653
-msgid ""
-"A unique identifier created by a registry and applied by the creator of the "
-"digital image. This value shall not be changed after being applied. This "
-"identifier is linked to a corresponding Registry Organisation Identifier."
+#: src/properties.cpp:711
+msgid "Optional PLUS-ID identifying each Licensor."
 msgstr ""
 
-#: src/properties.cpp:654
-msgid "Registry Entry-Organisation Identifier"
-msgstr ""
+#: src/properties.cpp:712
+#, fuzzy
+msgid "Licensor Name"
+msgstr "Имя местоположения"
 
-#: src/properties.cpp:654
-msgid ""
-"An identifier for the registry which issued the corresponding Registry Image "
-"Id."
+#: src/properties.cpp:712
+#, fuzzy
+msgid "Name of each Licensor."
+msgstr "Вид источника света"
+
+#: src/properties.cpp:713
+#, fuzzy
+msgid "Licensor Address"
+msgstr "Температура объектива"
+
+#: src/properties.cpp:713
+#, fuzzy
+msgid "Licensor street address."
+msgstr "Название страны"
+
+#: src/properties.cpp:714
+msgid "Licensor Address Detail"
 msgstr ""
 
-#: src/properties.cpp:655
-msgid "IPTC Fields Last Edited"
+#: src/properties.cpp:714
+msgid "Additional Licensor mailing address details."
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:715
 #, fuzzy
-msgid ""
-"The date and optionally time when any of the IPTC photo metadata fields has "
-"been last edited."
-msgstr "Дата и время сохранения изображения в цифровом виде"
+msgid "Licensor City"
+msgstr "Мехико"
+
+#: src/properties.cpp:715
+#, fuzzy
+msgid "Licensor City name."
+msgstr "Название страны"
 
-#: src/properties.cpp:656
+#: src/properties.cpp:716
 #, fuzzy
-msgid "Location shown"
-msgstr "Местоположение объекта съёмки"
+msgid "Licensor State or Province"
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:656
-msgid "A location shown in the image."
-msgstr ""
+#: src/properties.cpp:716
+#, fuzzy
+msgid "Licensor State or Province name."
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:717
 #, fuzzy
-msgid "Location Created"
-msgstr "Имя местоположения"
+msgid "Licensor Postal Code"
+msgstr "Температура объектива"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:717
 #, fuzzy
-msgid "The location the photo was taken."
-msgstr "Дата и время сохранения изображения в цифровом виде"
+msgid "Licensor Postal Code or Zip Code."
+msgstr "Штат/провинция"
 
-#: src/properties.cpp:658
+#: src/properties.cpp:718
 #, fuzzy
-msgid "Location-City"
-msgstr "Местоположение объекта съёмки"
+msgid "Licensor Country"
+msgstr "Страна"
 
-#: src/properties.cpp:658
-msgid "Name of the city of a location."
-msgstr ""
+#: src/properties.cpp:718
+#, fuzzy
+msgid "Licensor Country name."
+msgstr "Название страны"
 
-#: src/properties.cpp:659
+#: src/properties.cpp:719
 #, fuzzy
-msgid "Location-Country ISO-Code"
-msgstr "Код страны"
+msgid "Licensor Telephone Type 1"
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:659
-msgid "The ISO code of a country of a location."
-msgstr ""
+#: src/properties.cpp:719
+#, fuzzy
+msgid "Licensor Telephone Type 1."
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:660
+#: src/properties.cpp:720
 #, fuzzy
-msgid "Location-Country Name"
-msgstr "Имя местоположения"
+msgid "Licensor Telephone 1"
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:660
-msgid "The name of a country of a location."
-msgstr ""
+#: src/properties.cpp:720
+#, fuzzy
+msgid "Licensor Telephone number 1."
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:661
-msgid "Location-Province/State"
-msgstr ""
+#: src/properties.cpp:721
+#, fuzzy
+msgid "Licensor Telephone Type 2"
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:661
-msgid ""
-"The name of a subregion of a country - a province or state - of a location."
-msgstr ""
+#: src/properties.cpp:721
+#, fuzzy
+msgid "Licensor Telephone Type 2."
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:662
+#: src/properties.cpp:722
 #, fuzzy
-msgid "Location-Sublocation"
-msgstr "Местоположение объекта съёмки"
+msgid "Licensor Telephone 2"
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:662
-msgid ""
-"Name of a sublocation. This sublocation name could either be the name of a "
-"sublocation to a city or the name of a well known location or (natural) "
-"monument outside a city."
-msgstr ""
+#: src/properties.cpp:722
+#, fuzzy
+msgid "Licensor Telephone number 2."
+msgstr "Серийный номер камеры"
 
-#: src/properties.cpp:663
-msgid "Location-World Region"
-msgstr ""
+#: src/properties.cpp:723
+#, fuzzy
+msgid "Licensor Email"
+msgstr "Имя местоположения"
 
-#: src/properties.cpp:663
-msgid "The name of a world region of a location."
-msgstr ""
+#: src/properties.cpp:723
+#, fuzzy
+msgid "Licensor Email address."
+msgstr "Имя местоположения"
 
-#: src/properties.cpp:664
-msgid "Artwork or object in the image"
-msgstr ""
+#: src/properties.cpp:724
+#, fuzzy
+msgid "Licensor URL"
+msgstr "Объектив"
 
-#: src/properties.cpp:664
-msgid "A set of metadata about artwork or an object in the image."
+#: src/properties.cpp:724
+msgid "Licensor world wide web address."
 msgstr ""
 
-#: src/properties.cpp:665
+#: src/properties.cpp:725
 #, fuzzy
-msgid "Artwork or object-Copyright notice"
-msgstr "Уведомление об авторских правах"
+msgid "Licensor Notes"
+msgstr "Температура объектива"
 
-#: src/properties.cpp:665
+#: src/properties.cpp:725
 msgid ""
-"Contains any necessary copyright notice for claiming the intellectual "
-"property for artwork or an object in the image and should identify the "
-"current owner of the copyright of this work with associated intellectual "
-"property rights."
+"Supplemental information for use in identifying and contacting the Licensor/"
+"s."
 msgstr ""
 
-#: src/properties.cpp:666
-msgid "Artwork or object-Creator"
-msgstr ""
+#: src/properties.cpp:726
+#, fuzzy
+msgid "PLUS Media Summary Code"
+msgstr "Режим захвата данных GPS"
 
-#: src/properties.cpp:666
+#: src/properties.cpp:726
 msgid ""
-"Contains the name of the artist who has created artwork or an object in the "
-"image. In cases where the artist could or should not be identified the name "
-"of a company or organisation may be appropriate."
+"A PLUS-standardized alphanumeric code string summarizing the media usages "
+"included in the license."
 msgstr ""
 
-#: src/properties.cpp:667
-msgid "Artwork or object-Date Created"
-msgstr ""
+#: src/properties.cpp:727
+#, fuzzy
+msgid "License Start Date"
+msgstr "Данные объектива"
 
-#: src/properties.cpp:667
-msgid ""
-"Designates the date and optionally the time the artwork or object in the "
-"image was created. This relates to artwork or objects with associated "
-"intellectual property rights."
-msgstr ""
+#: src/properties.cpp:727
+#, fuzzy
+msgid "The date on which the license takes effect."
+msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:668
-msgid "Artwork or object-Source"
-msgstr ""
+#: src/properties.cpp:728
+#, fuzzy
+msgid "License End Date"
+msgstr "Данные объектива"
 
-#: src/properties.cpp:668
-msgid ""
-"The organisation or body holding and registering the artwork or object in "
-"the image for inventory purposes."
-msgstr ""
+#: src/properties.cpp:728
+#, fuzzy
+msgid "The date on which the license expires."
+msgstr "Вид источника света"
 
-#: src/properties.cpp:669
-msgid "Artwork or object-Source inventory number"
-msgstr ""
+#: src/properties.cpp:729
+#, fuzzy
+msgid "Media Constraints"
+msgstr "Контраст"
 
-#: src/properties.cpp:669
+#: src/properties.cpp:729
 msgid ""
-"The inventory number issued by the organisation or body holding and "
-"registering the artwork or object in the image."
-msgstr ""
-
-#: src/properties.cpp:670
-msgid "Artwork or object-Title"
-msgstr ""
-
-#: src/properties.cpp:670
-msgid "A reference for the artwork or object in the image."
-msgstr ""
-
-#: src/properties.cpp:677
-msgid "Scan from film"
+"Constraints limiting the scope of PLUS Media Usage/s included in the license "
+"to particular named media or to media not yet specifically defined in the "
+"PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:678
-msgid "Scan from transparency (including slide)"
-msgstr ""
+#: src/properties.cpp:730
+#, fuzzy
+msgid "Region Constraints"
+msgstr "Контраст"
 
-#: src/properties.cpp:679
-msgid "Scan from print"
+#: src/properties.cpp:730
+msgid ""
+"Constraints limiting the scope of geographic distribution to specific "
+"cities, states, provinces or other areas to be included in or excluded from "
+"the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:680
-#, fuzzy
-msgid "Camera RAW"
-msgstr "ID камеры"
-
-#: src/properties.cpp:681
+#: src/properties.cpp:731
 #, fuzzy
-msgid "Camera TIFF"
-msgstr "ID камеры"
+msgid "Product or Service Constraints"
+msgstr "Автоматический контраст"
 
-#: src/properties.cpp:682
-#, fuzzy
-msgid "Camera JPEG"
-msgstr "ID камеры"
+#: src/properties.cpp:731
+msgid ""
+"Constraints limiting usage of the image to promotion of/association with a "
+"named product or service."
+msgstr ""
 
-#: src/properties.cpp:687
+#: src/properties.cpp:732
 #, fuzzy
-msgid "PLUS Version"
-msgstr "Версия PDF"
+msgid "Image File Constraints"
+msgstr "Описание снимка"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:732
 msgid ""
-"The version number of the PLUS standards in place at the time of the "
-"transaction."
+"Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:688
+#: src/properties.cpp:733
 #, fuzzy
-msgid "Licensee"
-msgstr "Объектив"
+msgid "Image Alteration Constraints"
+msgstr "Описание снимка"
 
-#: src/properties.cpp:688
+#: src/properties.cpp:733
 msgid ""
-"Party or parties to whom the license is granted by the Licensor/s under the "
-"license transaction."
+"Constraints on alteration of the image by cropping, flipping, retouching, "
+"colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:689
+#: src/properties.cpp:734
 #, fuzzy
-msgid "Licensee ID"
-msgstr "ID объектива"
+msgid "Image Duplication Constraints"
+msgstr "Описание снимка"
 
-#: src/properties.cpp:689
-msgid "Optional PLUS-ID identifying each Licensee."
+#: src/properties.cpp:734
+msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:690
+#: src/properties.cpp:735
 #, fuzzy
-msgid "Licensee Name"
-msgstr "Имя местоположения"
+msgid "Model Release Status"
+msgstr "Дата пубикации"
 
-#: src/properties.cpp:690
-#, fuzzy
-msgid "Name of each Licensee."
-msgstr "Вид источника света"
+#: src/properties.cpp:735
+msgid ""
+"Summarizes the availability and scope of model releases authorizing usage of "
+"the likenesses of persons appearing in the photograph."
+msgstr ""
 
-#: src/properties.cpp:691
+#: src/properties.cpp:736
 #, fuzzy
-msgid "End User"
-msgstr "внешняя"
+msgid "Model Release ID"
+msgstr "ID модели"
 
-#: src/properties.cpp:691
-msgid "Party or parties ultimately making use of the image under the license."
+#: src/properties.cpp:736
+msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:692
-msgid "End User ID"
+#: src/properties.cpp:737
+msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:692
-msgid "Optional PLUS-ID identifying each End User."
+#: src/properties.cpp:737
+msgid ""
+"Age of the youngest model pictured in the image, at the time that the image "
+"was made."
 msgstr ""
 
-#: src/properties.cpp:693
+#: src/properties.cpp:738
 #, fuzzy
-msgid "End User Name"
-msgstr "Имя владельца"
+msgid "Property Release Status"
+msgstr "Дата пубикации"
 
-#: src/properties.cpp:693
-msgid "Name of each End User."
+#: src/properties.cpp:738
+msgid ""
+"Summarizes the availability and scope of property releases authorizing usage "
+"of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:694
+#: src/properties.cpp:739
 #, fuzzy
-msgid "Licensor"
-msgstr "Объектив"
+msgid "Property Release ID"
+msgstr "ID модели"
 
-#: src/properties.cpp:694
-msgid "Party or parties granting the license to the Licensee."
+#: src/properties.cpp:739
+msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:695
+#: src/properties.cpp:740
 #, fuzzy
-msgid "Licensor ID"
-msgstr "ID объектива"
+msgid "Other Constraints"
+msgstr "Автоматический контраст"
 
-#: src/properties.cpp:695
-msgid "Optional PLUS-ID identifying each Licensor."
+#: src/properties.cpp:740
+msgid "Additional constraints on the license."
 msgstr ""
 
-#: src/properties.cpp:696
+#: src/properties.cpp:741
 #, fuzzy
-msgid "Licensor Name"
-msgstr "Имя местоположения"
+msgid "Credit Line Required"
+msgstr "Не определено"
 
-#: src/properties.cpp:696
-msgid "Name of each Licensor."
+#: src/properties.cpp:741
+msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:697
-msgid "Licensor Address"
+#: src/properties.cpp:742
+msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:697
-msgid "Licensor street address."
+#: src/properties.cpp:742
+msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:698
-msgid "Licensor Address Detail"
-msgstr ""
+#: src/properties.cpp:743
+#, fuzzy
+msgid "Other License Requirements"
+msgstr "Объектив"
 
-#: src/properties.cpp:698
-msgid "Additional Licensor mailing address details."
-msgstr ""
+#: src/properties.cpp:743
+#, fuzzy
+msgid "Additional license requirements."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:744
 #, fuzzy
-msgid "Licensor City"
-msgstr "Мехико"
+msgid "Terms and Conditions Text"
+msgstr "Условия съёмки кадра"
 
-#: src/properties.cpp:699
-msgid "Licensor City name."
+#: src/properties.cpp:744
+msgid "Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:700
+#: src/properties.cpp:745
 #, fuzzy
-msgid "Licensor State or Province"
-msgstr "Штат/провинция"
-
-#: src/properties.cpp:700
-msgid "Licensor State or Province name."
-msgstr ""
+msgid "Terms and Conditions URL"
+msgstr "Условия съёмки кадра"
 
-#: src/properties.cpp:701
-msgid "Licensor Postal Code"
+#: src/properties.cpp:745
+msgid "URL for Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:701
-msgid "Licensor Postal Code or Zip Code."
-msgstr ""
+#: src/properties.cpp:746
+#, fuzzy
+msgid "Other License Conditions"
+msgstr "Условия съёмки кадра"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:746
 #, fuzzy
-msgid "Licensor Country"
-msgstr "Страна"
+msgid "Additional license conditions."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:747
+msgid "Identifies the type of image delivered."
+msgstr ""
+
+#: src/properties.cpp:748
 #, fuzzy
-msgid "Licensor Country name."
-msgstr "Название страны"
+msgid "Licensor Image ID"
+msgstr "ID объектива"
 
-#: src/properties.cpp:703
-msgid "Licensor Telephone Type 1"
+#: src/properties.cpp:748
+msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:703
-msgid "Licensor Telephone Type 1."
+#: src/properties.cpp:749
+msgid "Image File Name As Delivered"
 msgstr ""
 
-#: src/properties.cpp:704
-msgid "Licensor Telephone 1"
+#: src/properties.cpp:749
+msgid ""
+"Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:704
+#: src/properties.cpp:750
 #, fuzzy
-msgid "Licensor Telephone number 1."
-msgstr "Серийный номер камеры"
+msgid "Image File Format As Delivered"
+msgstr "Описание снимка"
 
-#: src/properties.cpp:705
-msgid "Licensor Telephone Type 2"
+#: src/properties.cpp:750
+msgid ""
+"File format of the image file delivered to the Licensee for use under the "
+"license."
 msgstr ""
 
-#: src/properties.cpp:705
-msgid "Licensor Telephone Type 2."
+#: src/properties.cpp:751
+msgid "Image File Size As Delivered"
 msgstr ""
 
-#: src/properties.cpp:706
-msgid "Licensor Telephone 2"
+#: src/properties.cpp:751
+msgid "Size of the image file delivered to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:706
+#: src/properties.cpp:752
 #, fuzzy
-msgid "Licensor Telephone number 2."
-msgstr "Серийный номер камеры"
+msgid "Copyright Status"
+msgstr "Авторские права"
 
-#: src/properties.cpp:707
-msgid "Licensor Email"
-msgstr ""
+#: src/properties.cpp:752
+#, fuzzy
+msgid "Copyright status of the image."
+msgstr "Уведомление об авторских правах"
 
-#: src/properties.cpp:707
-msgid "Licensor Email address."
-msgstr ""
+#: src/properties.cpp:753
+#, fuzzy
+msgid "Copyright Registration Number"
+msgstr "Имя владельца"
 
-#: src/properties.cpp:708
-msgid "Licensor URL"
+#: src/properties.cpp:753
+msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:708
-msgid "Licensor world wide web address."
-msgstr ""
+#: src/properties.cpp:754
+#, fuzzy
+msgid "First Publication Date"
+msgstr "Дата оцифровки"
 
-#: src/properties.cpp:709
+#: src/properties.cpp:754
 #, fuzzy
-msgid "Licensor Notes"
-msgstr "Температура объектива"
+msgid "The date on which the image was first published."
+msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/properties.cpp:709
-msgid ""
-"Supplemental information for use in identifying and contacting the Licensor/"
-"s."
+#: src/properties.cpp:755
+#, fuzzy
+msgid "Copyright Owner"
+msgstr "Авторские права"
+
+#: src/properties.cpp:755
+msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:710
+#: src/properties.cpp:756
 #, fuzzy
-msgid "PLUS Media Summary Code"
-msgstr "Режим захвата данных GPS"
+msgid "Copyright Owner ID"
+msgstr "Авторские права"
 
-#: src/properties.cpp:710
-msgid ""
-"A PLUS-standardized alphanumeric code string summarizing the media usages "
-"included in the license."
+#: src/properties.cpp:756
+msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:711
-msgid "License Start Date"
+#: src/properties.cpp:757
+#, fuzzy
+msgid "Copyright Owner Name"
+msgstr "Имя владельца"
+
+#: src/properties.cpp:757
+#, fuzzy
+msgid "Name of Copyright Owner."
+msgstr "Авторские права"
+
+#: src/properties.cpp:758
+#, fuzzy
+msgid "Copyright Owner Image ID"
+msgstr "Авторские права"
+
+#: src/properties.cpp:758
+msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:711
+#: src/properties.cpp:759
 #, fuzzy
-msgid "The date on which the license takes effect."
-msgstr "Дата и время сохранения изображения в цифровом виде"
+msgid "Image Creator"
+msgstr "Ориентация изображения"
 
-#: src/properties.cpp:712
+#: src/properties.cpp:759
 #, fuzzy
-msgid "License End Date"
-msgstr "Данные объектива"
+msgid "Creator/s of the image."
+msgstr "Уведомление об авторских правах"
 
-#: src/properties.cpp:712
+#: src/properties.cpp:760
 #, fuzzy
-msgid "The date on which the license expires."
-msgstr "Вид источника света"
+msgid "Image Creator ID"
+msgstr "Ориентация изображения"
 
-#: src/properties.cpp:713
+#: src/properties.cpp:760
+msgid "Optional PLUS-ID identifying each Image Creator."
+msgstr ""
+
+#: src/properties.cpp:761
 #, fuzzy
-msgid "Media Constraints"
-msgstr "Контраст"
+msgid "Image Creator Name"
+msgstr "Тип изображения"
 
-#: src/properties.cpp:713
-msgid ""
-"Constraints limiting the scope of PLUS Media Usage/s included in the license "
-"to particular named media or to media not yet specifically defined in the "
-"PLUS Media Matrix."
-msgstr ""
+#: src/properties.cpp:761
+#, fuzzy
+msgid "Name of Image Creator."
+msgstr "Номер изображения"
 
-#: src/properties.cpp:714
-msgid "Region Constraints"
-msgstr ""
+#: src/properties.cpp:762
+#, fuzzy
+msgid "Image Creator Image ID"
+msgstr "Ориентация изображения"
 
-#: src/properties.cpp:714
-msgid ""
-"Constraints limiting the scope of geographic distribution to specific "
-"cities, states, provinces or other areas to be included in or excluded from "
-"the PLUS Regions specified in the Media Usages specified in the license."
+#: src/properties.cpp:762
+msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:715
-msgid "Product or Service Constraints"
-msgstr ""
+#: src/properties.cpp:763
+#, fuzzy
+msgid "Image Supplier ID"
+msgstr "Уникальный ID изображения"
 
-#: src/properties.cpp:715
-msgid ""
-"Constraints limiting usage of the image to promotion of/association with a "
-"named product or service."
+#: src/properties.cpp:763
+msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:716
+#: src/properties.cpp:764
 #, fuzzy
-msgid "Image File Constraints"
-msgstr "Описание снимка"
+msgid "Image Supplier Name"
+msgstr "Размер изображения"
 
-#: src/properties.cpp:716
-msgid ""
-"Constraints on the changing of the image file name, metadata or file type."
-msgstr ""
+#: src/properties.cpp:764
+#, fuzzy
+msgid "Name of Image Supplier."
+msgstr "Номер изображения"
 
-#: src/properties.cpp:717
-msgid "Image Alteration Constraints"
-msgstr ""
+#: src/properties.cpp:765
+#, fuzzy
+msgid "Image Supplier Image ID"
+msgstr "Уникальный ID изображения"
 
-#: src/properties.cpp:717
-msgid ""
-"Constraints on alteration of the image by cropping, flipping, retouching, "
-"colorization, de-colorization or merging."
+#: src/properties.cpp:765
+msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:718
+#: src/properties.cpp:766
 #, fuzzy
-msgid "Image Duplication Constraints"
-msgstr "Описание снимка"
+msgid "Licensee Image ID"
+msgstr "ID объектива"
 
-#: src/properties.cpp:718
-msgid "Constraints on the creation of duplicates of the image."
+#: src/properties.cpp:766
+msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:719
+#: src/properties.cpp:767
 #, fuzzy
-msgid "Model Release Status"
-msgstr "Дата пубикации"
+msgid "Licensee Image Notes"
+msgstr "Температура объектива"
 
-#: src/properties.cpp:719
-msgid ""
-"Summarizes the availability and scope of model releases authorizing usage of "
-"the likenesses of persons appearing in the photograph."
-msgstr ""
+#: src/properties.cpp:767
+#, fuzzy
+msgid "Notes added by Licensee."
+msgstr "Вид источника света"
 
-#: src/properties.cpp:720
+#: src/properties.cpp:768
 #, fuzzy
-msgid "Model Release ID"
-msgstr "ID модели"
+msgid "Other Image Info"
+msgstr "Объектив"
 
-#: src/properties.cpp:720
-msgid "Optional identifier associated with each Model Release."
-msgstr ""
+#: src/properties.cpp:768
+#, fuzzy
+msgid "Additional image information."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:721
-msgid "Minor Model Age Disclosure"
-msgstr ""
+#: src/properties.cpp:769
+#, fuzzy
+msgid "License ID"
+msgstr "ID объектива"
 
-#: src/properties.cpp:721
-msgid ""
-"Age of the youngest model pictured in the image, at the time that the image "
-"was made."
+#: src/properties.cpp:769
+msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:722
-msgid "Property Release Status"
-msgstr ""
+#: src/properties.cpp:770
+#, fuzzy
+msgid "Licensor Transaction ID"
+msgstr "Истечение срока"
 
-#: src/properties.cpp:722
+#: src/properties.cpp:770
 msgid ""
-"Summarizes the availability and scope of property releases authorizing usage "
-"of the properties appearing in the photograph."
+"Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:723
-msgid "Property Release ID"
-msgstr ""
+#: src/properties.cpp:771
+#, fuzzy
+msgid "Licensee Transaction ID"
+msgstr "Истечение срока"
 
-#: src/properties.cpp:723
-msgid "Optional identifier associated with each Property Release."
+#: src/properties.cpp:771
+msgid ""
+"Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:724
+#: src/properties.cpp:772
 #, fuzzy
-msgid "Other Constraints"
-msgstr "Автоматический контраст"
-
-#: src/properties.cpp:724
-msgid "Additional constraints on the license."
-msgstr ""
+msgid "Licensee Project Reference"
+msgstr "Эталонный Чёрный/Белый"
 
-#: src/properties.cpp:725
-msgid "Credit Line Required"
+#: src/properties.cpp:772
+msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:725
-msgid "Attribution requirements, if any."
-msgstr ""
+#: src/properties.cpp:773
+#, fuzzy
+msgid "License Transaction Date"
+msgstr "Истечение срока"
 
-#: src/properties.cpp:726
-msgid "Adult Content Warning"
-msgstr ""
+#: src/properties.cpp:773
+#, fuzzy
+msgid "The date of the License Transaction."
+msgstr "Вид источника света"
 
-#: src/properties.cpp:726
-msgid "Warning indicating the presence of content not suitable for minors."
+#: src/properties.cpp:774
+msgid "Reuse"
 msgstr ""
 
-#: src/properties.cpp:727
-msgid "Other License Requirements"
+#: src/properties.cpp:774
+msgid ""
+"Indicates whether a license is a repeat or an initial license.  Reuse may "
+"require that licenses stored in files previously delivered to the customer "
+"be updated."
 msgstr ""
 
-#: src/properties.cpp:727
-msgid "Additional license requirements."
-msgstr ""
+#: src/properties.cpp:775
+#, fuzzy
+msgid "Other License Documents"
+msgstr "Условия съёмки кадра"
 
-#: src/properties.cpp:728
-msgid "Terms and Conditions Text"
+#: src/properties.cpp:775
+msgid ""
+"Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:728
-msgid "Terms and Conditions applying to the license."
-msgstr ""
+#: src/properties.cpp:776
+#, fuzzy
+msgid "Other License Info"
+msgstr "Объектив"
 
-#: src/properties.cpp:729
-msgid "Terms and Conditions URL"
-msgstr ""
+#: src/properties.cpp:776
+#, fuzzy
+msgid "Additional license information."
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:729
-msgid "URL for Terms and Conditions applying to the license."
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
+msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:730
+#: src/properties.cpp:780
 #, fuzzy
-msgid "Other License Conditions"
-msgstr "Условия съёмки кадра"
+msgid "Custom 4"
+msgstr "Свой 1"
 
-#: src/properties.cpp:730
-msgid "Additional license conditions."
-msgstr ""
+#: src/properties.cpp:781
+#, fuzzy
+msgid "Custom 5"
+msgstr "Свой 1"
 
-#: src/properties.cpp:731
-msgid "Identifies the type of image delivered."
-msgstr ""
+#: src/properties.cpp:782
+#, fuzzy
+msgid "Custom 6"
+msgstr "Свой 1"
 
-#: src/properties.cpp:732
-msgid "Licensor Image ID"
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
+msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:732
-msgid "Optional identifier assigned by the Licensor to the image."
-msgstr ""
+#: src/properties.cpp:783
+#, fuzzy
+msgid "Custom 7"
+msgstr "Свой 1"
 
-#: src/properties.cpp:733
-msgid "Image File Name As Delivered"
-msgstr ""
+#: src/properties.cpp:784
+#, fuzzy
+msgid "Custom 8"
+msgstr "Свой 1"
 
-#: src/properties.cpp:733
-msgid ""
-"Name of the image file delivered to the Licensee for use under the license."
-msgstr ""
+#: src/properties.cpp:785
+#, fuzzy
+msgid "Custom 9"
+msgstr "Свой 1"
 
-#: src/properties.cpp:734
-msgid "Image File Format As Delivered"
-msgstr ""
+#: src/properties.cpp:786
+#, fuzzy
+msgid "Custom 10"
+msgstr "Свой 1"
 
-#: src/properties.cpp:734
-msgid ""
-"File format of the image file delivered to the Licensee for use under the "
-"license."
+#: src/properties.cpp:793
+msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:735
-msgid "Image File Size As Delivered"
-msgstr ""
+#: src/properties.cpp:794
+#, fuzzy
+msgid "Not Required"
+msgstr "Не определено"
 
-#: src/properties.cpp:735
-msgid "Size of the image file delivered to the Licensee."
+#: src/properties.cpp:800
+msgid "Protected"
 msgstr ""
 
-#: src/properties.cpp:736
+#: src/properties.cpp:801
 #, fuzzy
-msgid "Copyright Status"
-msgstr "Авторские права"
+msgid "Public Domain"
+msgstr "вкл"
 
-#: src/properties.cpp:736
+#: src/properties.cpp:807
 #, fuzzy
-msgid "Copyright status of the image."
-msgstr "Уведомление об авторских правах"
-
-#: src/properties.cpp:737
-msgid "Copyright Registration Number"
-msgstr ""
+msgid "Credit Adjacent To Image"
+msgstr "Версия эскиза"
 
-#: src/properties.cpp:737
-msgid "Copyright Registration Number, if any, applying to the licensed image."
+#: src/properties.cpp:808
+msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:738
+#: src/properties.cpp:809
 #, fuzzy
-msgid "First Publication Date"
-msgstr "Дата оцифровки"
+msgid "Credit on Image"
+msgstr "Версия эскиза"
 
-#: src/properties.cpp:738
+#: src/properties.cpp:810
 #, fuzzy
-msgid "The date on which the image was first published."
-msgstr "Дата и время сохранения изображения в цифровом виде"
+msgid "Not Require"
+msgstr "Не определено"
 
-#: src/properties.cpp:739
+#: src/properties.cpp:815
 #, fuzzy
-msgid "Copyright Owner"
-msgstr "Авторские права"
+msgid "No Colorization"
+msgstr "Насыщенность"
 
-#: src/properties.cpp:739
-msgid "Owner or owners of the copyright in the licensed image."
+#: src/properties.cpp:816
+msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:740
+#: src/properties.cpp:817
 #, fuzzy
-msgid "Copyright Owner ID"
-msgstr "Авторские права"
+msgid "No De-Colorization"
+msgstr "Насыщенность"
 
-#: src/properties.cpp:740
-msgid "Optional PLUS-ID identifying each Copyright Owner."
+#: src/properties.cpp:818
+msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:741
+#: src/properties.cpp:819
 #, fuzzy
-msgid "Copyright Owner Name"
-msgstr "Имя владельца"
+msgid "No Merging"
+msgstr "Подавление шума"
 
-#: src/properties.cpp:741
-msgid "Name of Copyright Owner."
-msgstr ""
+#: src/properties.cpp:820
+#, fuzzy
+msgid "No Retouching"
+msgstr "Подавление шума"
 
-#: src/properties.cpp:742
-msgid "Copyright Owner Image ID"
+#: src/properties.cpp:825
+msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:742
-msgid "Optional identifier assigned by the Copyright Owner to the image."
-msgstr ""
+#: src/properties.cpp:826
+#, fuzzy
+msgid "No Duplication Constraints"
+msgstr "Описание снимка"
 
-#: src/properties.cpp:743
+#: src/properties.cpp:827
 #, fuzzy
-msgid "Image Creator"
-msgstr "Ориентация изображения"
+msgid "No Duplication"
+msgstr "Длительность звукозаписи"
 
-#: src/properties.cpp:743
-msgid "Creator/s of the image."
-msgstr ""
+#: src/properties.cpp:832
+#, fuzzy
+msgid "Maintain File Name"
+msgstr "Имя файла"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:833
 #, fuzzy
-msgid "Image Creator ID"
-msgstr "Ориентация изображения"
+msgid "Maintain File Type"
+msgstr "Имя файла"
 
-#: src/properties.cpp:744
-msgid "Optional PLUS-ID identifying each Image Creator."
-msgstr ""
+#: src/properties.cpp:834
+#, fuzzy
+msgid "Maintain ID in File Name"
+msgstr "Имя файла"
 
-#: src/properties.cpp:745
+#: src/properties.cpp:835
 #, fuzzy
-msgid "Image Creator Name"
-msgstr "Тип изображения"
+msgid "Maintain Metadata"
+msgstr "Имя файла"
 
-#: src/properties.cpp:745
+#: src/properties.cpp:840
 #, fuzzy
-msgid "Name of Image Creator."
-msgstr "Номер изображения"
+msgid "Windows Bitmap (BMP)"
+msgstr "Название (Windows)"
 
-#: src/properties.cpp:746
-msgid "Image Creator Image ID"
+#: src/properties.cpp:841
+msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:746
-msgid "Optional identifier assigned by the Image Creator to the image."
+#: src/properties.cpp:842
+msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
-#: src/properties.cpp:747
+#: src/properties.cpp:843
 #, fuzzy
-msgid "Image Supplier ID"
-msgstr "Уникальный ID изображения"
-
-#: src/properties.cpp:747
-msgid "Optional PLUS-ID identifying the Image Supplier."
-msgstr ""
+msgid "Graphics Interchange Format (GIF)"
+msgstr "Формат обмена данными JPEG"
 
-#: src/properties.cpp:748
+#: src/properties.cpp:844
 #, fuzzy
-msgid "Image Supplier Name"
-msgstr "Размер изображения"
+msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
+msgstr "Формат обмена данными JPEG"
 
-#: src/properties.cpp:748
-msgid "Name of Image Supplier."
+#: src/properties.cpp:846
+msgid "Macintosh Picture (PICT)"
 msgstr ""
 
-#: src/properties.cpp:749
-msgid "Image Supplier Image ID"
+#: src/properties.cpp:847
+msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:749
-msgid "Optional identifier assigned by the Image Supplier to the image."
+#: src/properties.cpp:848
+msgid "Photoshop Document (PSD)"
 msgstr ""
 
-#: src/properties.cpp:750
-msgid "Licensee Image ID"
+#: src/properties.cpp:849
+msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:750
-msgid "Optional identifier assigned by the Licensee to the image."
+#: src/properties.cpp:850
+msgid "Tagged Image File Format (TIFF)"
 msgstr ""
 
-#: src/properties.cpp:751
-msgid "Licensee Image Notes"
+#: src/properties.cpp:851
+msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:751
-msgid "Notes added by Licensee."
+#: src/properties.cpp:856
+msgid "Greater than 50 MB"
 msgstr ""
 
-#: src/properties.cpp:752
-msgid "Other Image Info"
-msgstr ""
+#: src/properties.cpp:857
+#, fuzzy
+msgid "Up to 1 MB"
+msgstr "Optio A10"
 
-#: src/properties.cpp:752
+#: src/properties.cpp:858
 #, fuzzy
-msgid "Additional image information."
-msgstr "Способ фокусировки"
+msgid "Up to 10 MB"
+msgstr "Optio A10"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:859
 #, fuzzy
-msgid "License ID"
-msgstr "ID объектива"
+msgid "Up to 30 MB"
+msgstr "Optio 30"
 
-#: src/properties.cpp:753
-msgid "Optional PLUS-ID assigned by the Licensor to the License."
-msgstr ""
+#: src/properties.cpp:860
+#, fuzzy
+msgid "Up to 50 MB"
+msgstr "Optio S50"
 
-#: src/properties.cpp:754
-msgid "Licensor Transaction ID"
+#: src/properties.cpp:865
+#, fuzzy
+msgid "Illustrated Image"
+msgstr "Ширина изображения"
+
+#: src/properties.cpp:866
+msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:754
-msgid ""
-"Identifier assigned by Licensor for Licensor's reference and internal use."
+#: src/properties.cpp:868
+msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:755
-msgid "Licensee Transaction ID"
+#: src/properties.cpp:874
+msgid "Cell"
 msgstr ""
 
-#: src/properties.cpp:755
-msgid ""
-"Identifier assigned by Licensee for Licensee's reference and internal use."
+#: src/properties.cpp:875
+msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:756
+#: src/properties.cpp:877
 #, fuzzy
-msgid "Licensee Project Reference"
-msgstr "Эталонный Чёрный/Белый"
+msgid "Pager"
+msgstr "Язык"
 
-#: src/properties.cpp:756
-msgid "Project reference name or description assigned by Licensee."
+#: src/properties.cpp:878
+msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:757
+#: src/properties.cpp:883
 #, fuzzy
-msgid "License Transaction Date"
-msgstr "Истечение срока"
+msgid "Age Unknown"
+msgstr "Неизвестно"
+
+#: src/properties.cpp:884
+msgid "Age 25 or Over"
+msgstr ""
+
+#: src/properties.cpp:885
+msgid "Age 24"
+msgstr ""
+
+#: src/properties.cpp:886
+msgid "Age 23"
+msgstr ""
+
+#: src/properties.cpp:887
+msgid "Age 22"
+msgstr ""
 
-#: src/properties.cpp:757
-#, fuzzy
-msgid "The date of the License Transaction."
-msgstr "Вид источника света"
+#: src/properties.cpp:888
+msgid "Age 21"
+msgstr ""
 
-#: src/properties.cpp:758
-msgid "Reuse"
+#: src/properties.cpp:889
+msgid "Age 20"
 msgstr ""
 
-#: src/properties.cpp:758
-msgid ""
-"Indicates whether a license is a repeat or an initial license.  Reuse may "
-"require that licenses stored in files previously delivered to the customer "
-"be updated."
+#: src/properties.cpp:890
+msgid "Age 19"
 msgstr ""
 
-#: src/properties.cpp:759
-msgid "Other License Documents"
+#: src/properties.cpp:891
+msgid "Age 18"
 msgstr ""
 
-#: src/properties.cpp:759
-msgid ""
-"Reference information for additional documents associated with the license."
+#: src/properties.cpp:892
+msgid "Age 17"
 msgstr ""
 
-#: src/properties.cpp:760
-#, fuzzy
-msgid "Other License Info"
-msgstr "Объектив"
+#: src/properties.cpp:893
+msgid "Age 16"
+msgstr ""
 
-#: src/properties.cpp:760
-msgid "Additional license information."
+#: src/properties.cpp:894
+msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
-msgid "Optional field for use at Licensor's discretion."
+#: src/properties.cpp:895
+msgid "Age 14 or Under"
 msgstr ""
 
-#: src/properties.cpp:764
-#, fuzzy
-msgid "Custom 4"
-msgstr "Свой 1"
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
+msgid "Not Applicable"
+msgstr ""
 
-#: src/properties.cpp:765
+#: src/properties.cpp:902
 #, fuzzy
-msgid "Custom 5"
-msgstr "Свой 1"
+msgid "Unlimited Model Releases"
+msgstr "ID модели"
 
-#: src/properties.cpp:766
-#, fuzzy
-msgid "Custom 6"
-msgstr "Свой 1"
+#: src/properties.cpp:903
+msgid "Limited or Incomplete Model Releases"
+msgstr ""
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
-msgid "Optional field for use at Licensee's discretion."
+#: src/properties.cpp:910
+msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:767
-#, fuzzy
-msgid "Custom 7"
-msgstr "Свой 1"
+#: src/properties.cpp:911
+msgid "Limited or Incomplete Property Releases"
+msgstr ""
 
-#: src/properties.cpp:768
-#, fuzzy
-msgid "Custom 8"
-msgstr "Свой 1"
+#: src/properties.cpp:917
+msgid "Repeat Use"
+msgstr ""
 
-#: src/properties.cpp:769
+#: src/properties.cpp:921 src/properties.cpp:930
 #, fuzzy
-msgid "Custom 9"
-msgstr "Свой 1"
+msgid "Fixture Identification"
+msgstr "Версия модели"
 
-#: src/properties.cpp:770
+#: src/properties.cpp:922 src/properties.cpp:931
 #, fuzzy
-msgid "Custom 10"
-msgstr "Свой 1"
+msgid "Status"
+msgstr "Статус приёмника GPS"
 
-#: src/properties.cpp:777
-msgid "Adult Content Warning Required"
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
 msgstr ""
 
-#: src/properties.cpp:778
-#, fuzzy
-msgid "Not Required"
-msgstr "Не определено"
-
-#: src/properties.cpp:784
-msgid "Protected"
+#: src/properties.cpp:923 src/properties.cpp:932
+msgid "People"
 msgstr ""
 
-#: src/properties.cpp:785
-#, fuzzy
-msgid "Public Domain"
-msgstr "вкл"
-
-#: src/properties.cpp:791
-msgid "Credit Adjacent To Image"
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
 msgstr ""
 
-#: src/properties.cpp:792
-msgid "Credit in Credits Area"
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
 msgstr ""
 
-#: src/properties.cpp:793
+#: src/sigmamn.cpp:62
 #, fuzzy
-msgid "Credit on Image"
-msgstr "Версия эскиза"
+msgid "Resolution Mode"
+msgstr "Разрешение по X"
 
-#: src/properties.cpp:794
+#: src/sigmamn.cpp:63
 #, fuzzy
-msgid "Not Require"
-msgstr "Не определено"
+msgid "Resolution mode"
+msgstr "Разрешение по X"
 
-#: src/properties.cpp:799
-#, fuzzy
-msgid "No Colorization"
-msgstr "Насыщенность"
+#: src/sigmamn.cpp:65
+msgid "Autofocus Mode"
+msgstr "Режим автофокусировки"
 
-#: src/properties.cpp:800
-msgid "No Cropping"
-msgstr ""
+#: src/sigmamn.cpp:66
+msgid "Autofocus mode"
+msgstr "Режим автофокусировки"
 
-#: src/properties.cpp:801
+#: src/sigmamn.cpp:68
 #, fuzzy
-msgid "No De-Colorization"
-msgstr "Насыщенность"
+msgid "Focus Setting"
+msgstr "Настройка контраста"
 
-#: src/properties.cpp:802
-msgid "No Flipping"
-msgstr ""
+#: src/sigmamn.cpp:69
+#, fuzzy
+msgid "Focus setting"
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:803
-msgid "No Merging"
-msgstr ""
+#: src/sigmamn.cpp:80
+msgid "Lens Range"
+msgstr "Фокусный диапазон"
 
-#: src/properties.cpp:804
-#, fuzzy
-msgid "No Retouching"
-msgstr "Подавление шума"
+#: src/sigmamn.cpp:81
+msgid "Lens focal length range"
+msgstr "Фокусный диапазон объектива"
 
-#: src/properties.cpp:809
-msgid "Duplication Only as Necessary Under License"
-msgstr ""
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+msgid "Shadow"
+msgstr "Тень"
 
-#: src/properties.cpp:810
-msgid "No Duplication Constraints"
-msgstr ""
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
+msgid "Highlight"
+msgstr "Светлые области"
+
+#: src/sigmamn.cpp:104
+msgid "Fill Light"
+msgstr "Заполняющий свет"
 
-#: src/properties.cpp:811
+#: src/sigmamn.cpp:105
 #, fuzzy
-msgid "No Duplication"
-msgstr "Длительность звукозаписи"
+msgid "X3 Fill light"
+msgstr "Заполняющий свет"
 
-#: src/properties.cpp:816
+#: src/sigmamn.cpp:107
+msgid "Color Adjustment"
+msgstr "Режим коррекции"
+
+#: src/sigmamn.cpp:108
+msgid "Color adjustment"
+msgstr "Режим коррекции"
+
+#: src/sigmamn.cpp:110
+msgid "Adjustment Mode"
+msgstr "Режим коррекции"
+
+#: src/sigmamn.cpp:111
+msgid "Adjustment mode"
+msgstr "Режим коррекции"
+
+#: src/sigmamn.cpp:122
+msgid "Auto Bracket"
+msgstr "Автобрекетирование"
+
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
+msgid "Auto bracket"
+msgstr "Автобрекетирование"
+
+#: src/sigmamn.cpp:127
 #, fuzzy
-msgid "Maintain File Name"
-msgstr "Имя файла"
+msgid "Unknown SigmaMakerNote tag"
+msgstr "Неизвестный тэг CanonMakerNote"
 
-#: src/properties.cpp:817
-msgid "Maintain File Type"
+#: src/sigmamn.cpp:170
+msgid "8-Segment"
 msgstr ""
 
-#: src/properties.cpp:818
+#: src/sonymn.cpp:88
 #, fuzzy
-msgid "Maintain ID in File Name"
-msgstr "Имя файла"
+msgid "Standard "
+msgstr "Стандартный свет A"
 
-#: src/properties.cpp:819
-msgid "Maintain Metadata"
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
 msgstr ""
 
-#: src/properties.cpp:824
-#, fuzzy
-msgid "Windows Bitmap (BMP)"
-msgstr "Название (Windows)"
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
+msgstr ""
 
-#: src/properties.cpp:825
-msgid "Digital Negative (DNG)"
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
 msgstr ""
 
-#: src/properties.cpp:826
-msgid "Encapsulated PostScript (EPS)"
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
 msgstr ""
 
-#: src/properties.cpp:827
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
+msgstr ""
+
+#: src/sonymn.cpp:109
 #, fuzzy
-msgid "Graphics Interchange Format (GIF)"
-msgstr "Формат обмена данными JPEG"
+msgid "Landscape "
+msgstr "Альбом"
 
-#: src/properties.cpp:828
+#: src/sonymn.cpp:113
 #, fuzzy
-msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
-msgstr "Формат обмена данными JPEG"
+msgid "Night Scene / Twilight"
+msgstr "Ночная съёмка"
 
-#: src/properties.cpp:830
-msgid "Macintosh Picture (PICT)"
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
 msgstr ""
 
-#: src/properties.cpp:831
-msgid "Portable Network Graphics (PNG)"
-msgstr ""
+#: src/sonymn.cpp:115
+#, fuzzy
+msgid "Twilight Portrait"
+msgstr "Ночной портрет"
 
-#: src/properties.cpp:832
-msgid "Photoshop Document (PSD)"
+#: src/sonymn.cpp:116
+msgid "Soft Snap"
 msgstr ""
 
-#: src/properties.cpp:833
-msgid "Proprietary RAW Image Format"
-msgstr ""
+#: src/sonymn.cpp:118
+#, fuzzy
+msgid "Smile Shutter"
+msgstr "Скорость срабатывания затвора"
 
-#: src/properties.cpp:834
-msgid "Tagged Image File Format (TIFF)"
-msgstr ""
+#: src/sonymn.cpp:120
+#, fuzzy
+msgid "High Sensitivity"
+msgstr "Спектральная чувствительность"
 
-#: src/properties.cpp:835
-msgid "Windows Media Photo (HD Photo)"
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
 msgstr ""
 
-#: src/properties.cpp:840
-msgid "Greater than 50 MB"
-msgstr ""
+#: src/sonymn.cpp:123
+#, fuzzy
+msgid "Gourmet"
+msgstr "ID документа"
 
-#: src/properties.cpp:841
-msgid "Up to 1 MB"
-msgstr ""
+#: src/sonymn.cpp:125
+#, fuzzy
+msgid "Handheld Twilight"
+msgstr "Дневной свет"
 
-#: src/properties.cpp:842
+#: src/sonymn.cpp:126
 #, fuzzy
-msgid "Up to 10 MB"
-msgstr "Optio A10"
+msgid "Anti Motion Blur"
+msgstr "Портретный режим"
 
-#: src/properties.cpp:843
+#: src/sonymn.cpp:128
 #, fuzzy
-msgid "Up to 30 MB"
-msgstr "Optio 30"
+msgid "Backlight Correction HDR"
+msgstr "Без коррекции"
 
-#: src/properties.cpp:844
+#: src/sonymn.cpp:142
 #, fuzzy
-msgid "Up to 50 MB"
-msgstr "Optio S50"
+msgid "On (Continuous)"
+msgstr "Продолжительный ведущий режим"
 
-#: src/properties.cpp:849
+#: src/sonymn.cpp:143
 #, fuzzy
-msgid "Illustrated Image"
-msgstr "Ширина изображения"
+msgid "On (Shooting)"
+msgstr "Режим съемки"
 
-#: src/properties.cpp:850
-msgid "Multimedia or Composited Image"
+#: src/sonymn.cpp:151
+msgid "Plus"
 msgstr ""
 
-#: src/properties.cpp:852
-msgid "Photographic Image"
-msgstr ""
+#: src/sonymn.cpp:167
+#, fuzzy
+msgid "White Flourescent"
+msgstr "Флуоресцентная лампа"
+
+#: src/sonymn.cpp:168
+#, fuzzy
+msgid "Cool White Flourescent"
+msgstr "Флуоресцентная лампа"
+
+#: src/sonymn.cpp:169
+#, fuzzy
+msgid "Day White Flourescent"
+msgstr "Флуоресцентная лампа"
 
-#: src/properties.cpp:853
+#: src/sonymn.cpp:172
 #, fuzzy
-msgid "Video"
-msgstr "Цвет"
+msgid "Underwater 1 (Blue Water)"
+msgstr "Подводная съемка"
 
-#: src/properties.cpp:858
-msgid "Cell"
-msgstr ""
+#: src/sonymn.cpp:173
+#, fuzzy
+msgid "Underwater 2 (Green Water)"
+msgstr "Подводная съемка"
 
-#: src/properties.cpp:859
-msgid "FAX"
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
 msgstr ""
 
-#: src/properties.cpp:861
+#: src/sonymn.cpp:188
 #, fuzzy
-msgid "Pager"
-msgstr "Язык"
+msgid "Center AF"
+msgstr "Центральный"
 
-#: src/properties.cpp:862
-msgid "Work"
+#: src/sonymn.cpp:189
+#, fuzzy
+msgid "Spot AF"
+msgstr "Спорт"
+
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
 msgstr ""
 
-#: src/properties.cpp:867
+#: src/sonymn.cpp:191
 #, fuzzy
-msgid "Age Unknown"
-msgstr "Неизвестно"
+msgid "Touch AF"
+msgstr "One-touch"
 
-#: src/properties.cpp:868
-msgid "Age 25 or Over"
-msgstr ""
+#: src/sonymn.cpp:192
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Ручная фокусировка"
 
-#: src/properties.cpp:869
-msgid "Age 24"
-msgstr ""
+#: src/sonymn.cpp:193
+#, fuzzy
+msgid "Face Detected"
+msgstr "Не удалось прочитать"
 
-#: src/properties.cpp:870
-msgid "Age 23"
-msgstr ""
+#: src/sonymn.cpp:208
+#, fuzzy
+msgid "Close Focus"
+msgstr "AI Focus"
 
-#: src/properties.cpp:871
-msgid "Age 22"
-msgstr ""
+#: src/sonymn.cpp:224
+#, fuzzy
+msgid "Exposure Bracketing"
+msgstr "Брекетинг"
 
-#: src/properties.cpp:872
-msgid "Age 21"
-msgstr ""
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+#, fuzzy
+msgid "Multi Burst Mode"
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:873
-msgid "Age 20"
-msgstr ""
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+#, fuzzy
+msgid "Multi Burst Image Width"
+msgstr "Ширина изображения"
 
-#: src/properties.cpp:874
-msgid "Age 19"
-msgstr ""
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+#, fuzzy
+msgid "Multi Burst Image Height"
+msgstr "Длина изображения"
 
-#: src/properties.cpp:875
-msgid "Age 18"
-msgstr ""
+#: src/sonymn.cpp:315
+#, fuzzy
+msgid "JPEG preview image"
+msgstr "Версия эскиза"
 
-#: src/properties.cpp:876
-msgid "Age 17"
-msgstr ""
+#: src/sonymn.cpp:341
+#, fuzzy
+msgid "Auto HDR"
+msgstr "Авторские и смежные права"
 
-#: src/properties.cpp:877
-msgid "Age 16"
+#: src/sonymn.cpp:342
+msgid "High Definition Range Mode"
 msgstr ""
 
-#: src/properties.cpp:878
-msgid "Age 15"
-msgstr ""
+#: src/sonymn.cpp:346
+#, fuzzy
+msgid "Shot Information"
+msgstr "Способ фокусировки"
 
-#: src/properties.cpp:879
-msgid "Age 14 or Under"
-msgstr ""
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+#, fuzzy
+msgid "Sony Model ID"
+msgstr "ID модели"
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
-msgid "Not Applicable"
-msgstr ""
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+#, fuzzy
+msgid "Color Reproduction"
+msgstr "Подавление цветного шума"
 
-#: src/properties.cpp:886
-msgid "Unlimited Model Releases"
-msgstr ""
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+#, fuzzy
+msgid "Dynamic Range Optimizer"
+msgstr "Настройка баланса белого"
 
-#: src/properties.cpp:887
-msgid "Limited or Incomplete Model Releases"
-msgstr ""
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+#, fuzzy
+msgid "Minolta MakerNote"
+msgstr "Режим замера"
 
-#: src/properties.cpp:894
-msgid "Unlimited Property Releases"
-msgstr ""
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+#, fuzzy
+msgid "Full Image Size"
+msgstr "Размер изображения"
 
-#: src/properties.cpp:895
-msgid "Limited or Incomplete Property Releases"
-msgstr ""
+#: src/sonymn.cpp:387
+#, fuzzy
+msgid "Preview Image Size"
+msgstr "Версия эскиза"
 
-#: src/properties.cpp:901
-msgid "Repeat Use"
+#: src/sonymn.cpp:388
+#, fuzzy
+msgid "Preview image size"
+msgstr "Версия эскиза"
+
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
 msgstr ""
 
-#: src/sigmamn.cpp:60
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
 #, fuzzy
-msgid "Resolution Mode"
-msgstr "Разрешение по X"
+msgid "JPEG Quality"
+msgstr "Качество"
 
-#: src/sigmamn.cpp:61
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
 #, fuzzy
-msgid "Resolution mode"
-msgstr "Разрешение по X"
+msgid "Release Mode"
+msgstr "Дата пубикации"
 
-#: src/sigmamn.cpp:62
-msgid "Autofocus Mode"
-msgstr "Режим автофокусировки"
+#: src/sonymn.cpp:415
+msgid "Shot number in continous burst mode"
+msgstr ""
 
-#: src/sigmamn.cpp:63
-msgid "Autofocus mode"
-msgstr "Режим автофокусировки"
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+#, fuzzy
+msgid "Anti-Blur"
+msgstr "Антиразмывание"
 
-#: src/sigmamn.cpp:65
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
 #, fuzzy
-msgid "Focus Setting"
-msgstr "Настройка контраста"
+msgid "Long Exposure Noise Reduction"
+msgstr "Подавление шума при длительной выдержке"
 
-#: src/sigmamn.cpp:66
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
 #, fuzzy
-msgid "Focus setting"
-msgstr "Способ фокусировки"
+msgid "Intelligent Auto"
+msgstr "Фокусное расстояние"
 
-#: src/sigmamn.cpp:77
-msgid "Lens Range"
-msgstr "Фокусный диапазон"
+#: src/sonymn.cpp:434
+#, fuzzy
+msgid "Unknown Sony1MakerNote tag"
+msgstr "Неизвестный тэг CanonMakerNote"
 
-#: src/sigmamn.cpp:78
-msgid "Lens focal length range"
-msgstr "Фокусный диапазон объектива"
+#: src/sonymn.cpp:448
+#, fuzzy
+msgid "Continuous High"
+msgstr "Продолжительный ведущий режим"
 
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
-msgid "Shadow"
-msgstr "Тень"
+#: src/sonymn.cpp:452
+#, fuzzy
+msgid "Continuous Low"
+msgstr "Продолжительный ведущий режим"
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
-msgid "Highlight"
-msgstr "Светлые области"
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
+#, fuzzy
+msgid "D-Range Optimizer Bracketing Low"
+msgstr "Оптимизация изображения"
 
-#: src/sigmamn.cpp:101
-msgid "Fill Light"
-msgstr "Заполняющий свет"
+#: src/sonymn.cpp:487
+#, fuzzy
+msgid "Autumn"
+msgstr "Авто"
 
-#: src/sigmamn.cpp:102
-msgid "X3 Fill light"
+#: src/sonymn.cpp:493
+msgid "ADI"
 msgstr ""
 
-#: src/sigmamn.cpp:104
-msgid "Color Adjustment"
-msgstr "Режим коррекции"
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
+msgstr ""
 
-#: src/sigmamn.cpp:105
-msgid "Color adjustment"
-msgstr "Режим коррекции"
+#: src/sonymn.cpp:529
+#, fuzzy
+msgid "Auto No Flash"
+msgstr "Автобрекетирование"
 
-#: src/sigmamn.cpp:107
-msgid "Adjustment Mode"
-msgstr "Режим коррекции"
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
+#, fuzzy
+msgid "Dynamic Range Optimizer Level"
+msgstr "Настройка баланса белого"
 
-#: src/sigmamn.cpp:108
-msgid "Adjustment mode"
-msgstr "Режим коррекции"
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
+#, fuzzy
+msgid "Creative Style"
+msgstr "Дата создания"
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
-msgstr "Версия прошивки"
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
+#, fuzzy
+msgid "Zone Matching Value"
+msgstr "Яркость"
 
-#: src/sigmamn.cpp:119
-msgid "Auto Bracket"
-msgstr "Автобрекетирование"
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
+msgid "AF With Shutter"
+msgstr ""
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
-msgid "Auto bracket"
-msgstr "Автобрекетирование"
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+#, fuzzy
+msgid "High ISO NoiseReduction"
+msgstr "Подавление шума"
 
-#: src/sigmamn.cpp:124
-msgid "Unknown SigmaMakerNote tag"
-msgstr ""
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
+#, fuzzy
+msgid "Image Style"
+msgstr "Тип изображения"
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
-msgstr ""
+#: src/sonymn.cpp:655
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings tag"
+msgstr "Настройка контраста"
 
-#: src/sonymn.cpp:80
-msgid "Unknown SonyMakerNote tag"
-msgstr ""
+#: src/sonymn.cpp:719
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings 2 tag"
+msgstr "Настройка контраста"
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
 msgid "Unknown section"
 msgstr "Неизвестный раздел"
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
 #, fuzzy
 msgid "Image data structure"
 msgstr "Размер изображения"
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
+#, fuzzy
 msgid "Recording offset"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
 #, fuzzy
 msgid "Image data characteristics"
 msgstr "Размер изображения"
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 msgid "Other data"
 msgstr "Прочие данные"
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
 msgid "Exif data structure"
 msgstr "Структура данных Exif"
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
 #, fuzzy
 msgid "Image configuration"
 msgstr "Планарная конфигурация"
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
 msgid "User information"
 msgstr "О пользователе"
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
 msgid "Related file"
 msgstr "Связанный файл"
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 msgid "Date and time"
 msgstr "Дата и время"
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
 msgid "Picture taking conditions"
 msgstr "Условия съёмки кадра"
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
 msgid "GPS information"
 msgstr "Информация GPS"
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
 msgid "Interoperability information"
 msgstr "О совместимости"
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
 msgid "Vendor specific information"
 msgstr "Специфичная для производителя информация"
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 #, fuzzy
 msgid "Adobe DNG tags"
 msgstr "Adobe RGB"
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
+#, fuzzy
 msgid "Panasonic RAW tags"
-msgstr ""
+msgstr "Неизвестный тэг"
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 #, fuzzy
 msgid "TIFF/EP tags"
 msgstr "ID стандарта TIFF/EP"
 
-#: src/tags.cpp:193
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
+msgstr ""
+
+#: src/tags.cpp:208
+#, fuzzy
+msgid "Adobe OPI tags"
+msgstr "Adobe RGB"
+
+#: src/tags.cpp:209
 msgid "Last section"
 msgstr "Последний раздел"
 
-#: src/tags.cpp:213
+#: src/tags.cpp:225
+#, fuzzy
 msgid "Primary image"
-msgstr ""
+msgstr "Версия эскиза"
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
+#, fuzzy
 msgid "Thumbnail/Preview image"
-msgstr ""
+msgstr "Эскиз"
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
 msgid "Primary image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
 msgid "Thumbnail/Preview image, Multi page file"
 msgstr ""
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
+#, fuzzy
 msgid "Primary image, Transparency mask"
-msgstr ""
+msgstr "Прозрачная маска"
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
 msgid "Thumbnail/Preview image, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+msgid "Full-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr ""
+
+#: src/tags.cpp:246
 msgid "inch"
 msgstr "дюйм"
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr "CCITT RLE"
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr "T4/Group 3 Fax"
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr "T6/Group 4 Fax"
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
 msgstr "LZW"
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
 msgstr ""
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr "JPEG"
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
+#, fuzzy
 msgid "Adobe Deflate"
-msgstr ""
+msgstr "Pixar Deflate"
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
 msgstr "JBIG Ч/Б"
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 #, fuzzy
 msgid "JBIG Color"
 msgstr "Цвет"
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr ""
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 #, fuzzy
 msgid "Epson ERF Compressed"
 msgstr "Cжатый Nikon NEF"
 
-#: src/tags.cpp:244
+#: src/tags.cpp:264
+#, fuzzy
+msgid "Samsung SRW Compressed"
+msgstr "Cжатый Nikon NEF"
+
+#: src/tags.cpp:265
+#, fuzzy
 msgid "CCITT RLE 1-word"
-msgstr ""
+msgstr "CCITT RLE"
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr "PackBits (Macintosh RLE)"
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr "Thunderscan RLE"
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr "IT8 CT Padding"
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr "IT8 Linework RLE"
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
 msgid "IT8 Monochrome Picture"
 msgstr "Монохромное изображение IT8"
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr "IT8 Binary Lineart"
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr "Pixar Film (10-разрядный LZW)"
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr "Pixar Log (11-разрядный ZIP)"
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
 msgid "Pixar Deflate"
 msgstr "Pixar Deflate"
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr "Kodak DCS Encoding"
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
 msgid "ISO JBIG"
 msgstr "ISO JBIG"
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr "SGI Log Luminance RLE"
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr "SGI Log 24-bits packed"
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr "Leadtools JPEG 2000"
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 msgid "Nikon NEF Compressed"
 msgstr "Cжатый Nikon NEF"
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
 #, fuzzy
 msgid "Kodak DCR Compressed"
 msgstr "Cжатый Nikon NEF"
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 #, fuzzy
 msgid "Pentax PEF Compressed"
 msgstr "Cжатый Nikon NEF"
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
+#, fuzzy
 msgid "White Is Zero"
-msgstr ""
+msgstr "Чёрно-белый"
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
 #, fuzzy
 msgid "Black Is Zero"
 msgstr "Чёрно-белый"
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr "RGB"
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
 msgstr "Палитра RGB"
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
 msgstr "Прозрачная маска"
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr "CIELab"
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr "ICCLab"
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr "ITULab"
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
+#, fuzzy
 msgid "Color Filter Array"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr "Pixar LogL"
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr "Pixar LogLuv"
 
-#: src/tags.cpp:279
+#: src/tags.cpp:300
 msgid "Linear Raw"
 msgstr "Линейный Raw"
 
-#: src/tags.cpp:284
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
+msgstr ""
+
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+#, fuzzy
+msgid "Randomized process"
+msgstr "Обычный процесс проявки"
+
+#: src/tags.cpp:312
 #, fuzzy
 msgid "top, left"
 msgstr "справа налево"
 
-#: src/tags.cpp:285
+#: src/tags.cpp:313
 #, fuzzy
 msgid "top, right"
 msgstr "Авторские и смежные права"
 
-#: src/tags.cpp:286
+#: src/tags.cpp:314
 #, fuzzy
 msgid "bottom, right"
 msgstr "слева направо"
 
-#: src/tags.cpp:287
+#: src/tags.cpp:315
 #, fuzzy
 msgid "bottom, left"
 msgstr "справа налево"
 
-#: src/tags.cpp:288
+#: src/tags.cpp:316
 #, fuzzy
 msgid "left, top"
 msgstr "слева направо"
 
-#: src/tags.cpp:289
+#: src/tags.cpp:317
 #, fuzzy
 msgid "right, top"
 msgstr "справа налево"
 
-#: src/tags.cpp:290
+#: src/tags.cpp:318
 #, fuzzy
 msgid "right, bottom"
 msgstr "сверху вниз"
 
-#: src/tags.cpp:291
+#: src/tags.cpp:319 src/tags.cpp:320
 #, fuzzy
 msgid "left, bottom"
 msgstr "сверху вниз"
 
-#: src/tags.cpp:296
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
+msgstr ""
+
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+#, fuzzy
+msgid "not CMYK"
+msgstr "CMYK"
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr ""
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
+msgstr ""
+
+#: src/tags.cpp:340 src/tags.cpp:341
+#, fuzzy
+msgid "Undefined data format"
+msgstr "Неподдерживаемый формат даты"
+
+#: src/tags.cpp:346
+#, fuzzy
+msgid "Not indexed"
+msgstr "Не определено"
+
+#: src/tags.cpp:347 src/tags.cpp:653
+msgid "Indexed"
+msgstr ""
+
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
+
+#: src/tags.cpp:353
+msgid "B"
+msgstr ""
+
+#: src/tags.cpp:354
+msgid "C"
+msgstr ""
+
+#: src/tags.cpp:355
+msgid "A+B-C"
+msgstr ""
+
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:358
+msgid "(A+B)/2"
+msgstr ""
+
+#: src/tags.cpp:363
 #, fuzzy
 msgid "Centered"
 msgstr "Центральная"
 
-#: src/tags.cpp:297
+#: src/tags.cpp:364
 #, fuzzy
 msgid "Co-sited"
 msgstr "Крупный план"
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
 msgid "No flash"
 msgstr "Без вспышки"
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 #, fuzzy
 msgid "Fired, strobe return light not detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет не найден"
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 #, fuzzy
 msgid "Fired, strobe return light detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет найден"
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
 #, fuzzy
 msgid "Yes, did not fire"
 msgstr "Вспышка не сработала"
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
+#, fuzzy
 msgid "Yes, compulsory"
-msgstr ""
+msgstr "авто + подавление эффекта красных глаз"
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 #, fuzzy
 msgid "Yes, compulsory, return light not detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет не найден"
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 #, fuzzy
 msgid "Yes, compulsory, return light detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет найден"
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
 msgstr ""
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 #, fuzzy
 msgid "No, did not fire, return not detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет не найден"
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 msgid "No, auto"
 msgstr "Нет, авто"
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 msgid "Yes, auto"
 msgstr "Да, авто"
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 #, fuzzy
 msgid "Yes, auto, return light not detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет не найден"
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 #, fuzzy
 msgid "Yes, auto, return light detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет найден"
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 msgid "No flash function"
 msgstr "Нет функции вспышки"
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 #, fuzzy
 msgid "No, no flash function"
 msgstr "Нет функции вспышки"
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
 msgid "Yes, red-eye reduction"
 msgstr "Да, с подавлением эффекта красных глаз"
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 #, fuzzy
 msgid "Yes, red-eye reduction, return light not detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет не найден"
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 #, fuzzy
 msgid "Yes, red-eye reduction, return light detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет найден"
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
 #, fuzzy
 msgid "Yes, compulsory, red-eye reduction"
 msgstr "авто + подавление эффекта красных глаз"
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 #, fuzzy
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет не найден"
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 #, fuzzy
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет найден"
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
 #, fuzzy
 msgid "No, red-eye reduction"
 msgstr "Да, с подавлением эффекта красных глаз"
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
 #, fuzzy
 msgid "No, auto, red-eye reduction"
 msgstr "авто + подавление эффекта красных глаз"
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
 #, fuzzy
 msgid "Yes, auto, red-eye reduction"
 msgstr "авто + подавление эффекта красных глаз"
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 #, fuzzy
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет не найден"
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 #, fuzzy
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr "Вспышка сработала, автоматический режим, возвратный свет найден"
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
 msgstr ""
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 msgid "Processing Software"
 msgstr "По обработки"
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
 msgstr ""
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
+#, fuzzy
 msgid "New Subfile Type"
-msgstr ""
+msgstr "Тип изображения"
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr ""
 
-#: src/tags.cpp:350
+#: src/tags.cpp:416
+#, fuzzy
+msgid "Subfile Type"
+msgstr "Тип изображения"
+
+#: src/tags.cpp:417
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
+msgstr ""
+
+#: src/tags.cpp:421
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -15991,7 +20052,7 @@
 "Количество столбцов данных изображения, равное количеству пикселов на ряд. В "
 "данных, сжатых по алгоритму JPEG, вместо этого тэга используется маркер."
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -15999,11 +20060,11 @@
 "Количество рядов данных изображения. В данных, сжатых по алгоритму JPEG, "
 "вместо этого тэга используется маркер."
 
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr "Битов на сэмпл"
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 #, fuzzy
 msgid ""
 "The number of bits per image component. In this standard each component of "
@@ -16016,7 +20077,7 @@
 "также <SamplesPerPixel>. В данных, сжатых по алгоритму JPEG, вместо этого "
 "тэга используется маркер."
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
 msgid ""
 "The compression scheme used for the image data. When a primary image is JPEG "
 "compressed, this designation is not necessary and is omitted. When "
@@ -16027,7 +20088,7 @@
 "обязательным и опускается. Когда миниатюры используют JPEG-сжатие, значение "
 "этого тэга равно 6."
 
-#: src/tags.cpp:371
+#: src/tags.cpp:442
 msgid ""
 "The pixel composition. In JPEG compressed data a JPEG marker is used instead "
 "of this tag."
@@ -16035,23 +20096,55 @@
 "Компоновка пикселов. Если данные сжаты по алгоритму JPEG, вместо этого тэга "
 "используется JPEG-маркер."
 
-#: src/tags.cpp:374
+#: src/tags.cpp:445
+msgid "Threshholding"
+msgstr ""
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+
+#: src/tags.cpp:449
+#, fuzzy
+msgid "Cell Width"
+msgstr "Ширина изображения"
+
+#: src/tags.cpp:450
+msgid ""
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:453
+#, fuzzy
+msgid "Cell Length"
+msgstr "Длина изображения"
+
+#: src/tags.cpp:454
+msgid ""
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
+msgstr ""
+
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr "Порядок заполнения"
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
 msgstr ""
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
 msgid "Document Name"
 msgstr "Имя документа"
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
 msgid "The name of the document from which this image was scanned"
 msgstr "Название отсканированного документа"
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -16063,7 +20156,7 @@
 "Двухбайтовая кодировка символов не может быть использована. Если она всё же "
 "необходима, должен быть использован частный тег Exif <UserComment>."
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -16074,7 +20167,7 @@
 "которое использовалось для получения этого изображения. Если поле не "
 "заполнено, производитель считается неизвестным."
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
@@ -16085,7 +20178,7 @@
 "оборудования, которое использовалось для получения этого изображения. Если "
 "поле не заполнено, оборудование считается неизвестным."
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -16093,15 +20186,15 @@
 "<RowsPerStrip> and <StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Ориентация изображения, рассматриваемая в терминах строк и столбцов."
 
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr "Сэмплов на пиксел"
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
@@ -16112,11 +20205,11 @@
 "3. Если данные сжаты по алгоритму JPEG, вместо этого тэга используется JPEG-"
 "маркер."
 
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr ""
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
 "strip when an image is divided into strips. With JPEG compressed data this "
@@ -16124,21 +20217,22 @@
 "<StripByteCounts>."
 msgstr ""
 
-#: src/tags.cpp:420
+#: src/tags.cpp:503
+#, fuzzy
 msgid "Strip Byte Count"
-msgstr ""
+msgstr "Выдержка"
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
 msgstr ""
 
-#: src/tags.cpp:424
+#: src/tags.cpp:507
 msgid "X-Resolution"
 msgstr "Разрешение по X"
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -16146,11 +20240,11 @@
 "Количество пикселов на <ResolutionUnit> в направлении <ImageWidth>. Если "
 "разрешение не указано, оно принимается за 72 точки на дюйм."
 
-#: src/tags.cpp:428
+#: src/tags.cpp:511
 msgid "Y-Resolution"
 msgstr "Разрешение по Y"
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -16158,14 +20252,50 @@
 "Количество пикселов на <ResolutionUnit> в направлении <ImageLength>. "
 "Остальное аналогично <XResolution>."
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
 "If this field does not exist, the TIFF default of 1 (chunky) is assumed."
 msgstr ""
 
-#: src/tags.cpp:439
+#: src/tags.cpp:521
+#, fuzzy
+msgid "Gray Response Unit"
+msgstr "Использованная точка AF"
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr ""
+
+#: src/tags.cpp:524
+#, fuzzy
+msgid "Gray Response Curve"
+msgstr "Кривая тонкоррекции"
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+
+#: src/tags.cpp:527
+#, fuzzy
+msgid "T4 Options"
+msgstr "Параметр"
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+#, fuzzy
+msgid "T6 Options"
+msgstr "Параметр"
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -16175,7 +20305,7 @@
 "используется как для <XResolution>, так и для <YResolution>. Если разрешение "
 "изображения неизвестно, оно принимается за 2 (дюйма)."
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
@@ -16185,7 +20315,7 @@
 "не является необходимым, поскольку цветовое пространство уже указано в тэге "
 "<ColorSpace>."
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -16198,7 +20328,7 @@
 "рекомендуется следовать приведённому ниже примеру. Когда поле оставлено "
 "пустым, значение принимается за неизвестное."
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
 "time the file was changed."
@@ -16206,7 +20336,7 @@
 "Дата и время создания изображения. В текущей версии стандарта Exif это дата "
 "и время изменения файла."
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
 "creator. The detailed format is not specified, but it is recommended that "
@@ -16220,57 +20350,94 @@
 "следовать приведённому ниже примеру. Когда поле оставлено пустым, значение "
 "принимается за неизвестное."
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+msgid "Host Computer"
+msgstr ""
+
+#: src/tags.cpp:563
+msgid ""
+"This tag records information about the host computer used to generate the "
+"image."
+msgstr ""
+
+#: src/tags.cpp:566
+#, fuzzy
+msgid "Predictor"
+msgstr "Создатель"
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+
+#: src/tags.cpp:571
+msgid ""
+"The chromaticity of the white point of the image. Normally this tag is not "
+"necessary, since color space is specified in the colorspace information tag "
+"(<ColorSpace>)."
+msgstr ""
+"Хроматичность белой точки изображения. Обычно этот тег не является "
+"необходимым, поскольку цветовое пространство уже указано в теге <ColorSpace>."
+
+#: src/tags.cpp:576
+#, fuzzy
+msgid ""
+"The chromaticity of the three primary colors of the image. Normally this tag "
+"is not necessary, since colorspace is specified in the colorspace "
+"information tag (<ColorSpace>)."
 msgstr ""
+"Хроматичность белой точки изображения. Обычно этот тег не является "
+"необходимым, поскольку цветовое пространство уже указано в теге <ColorSpace>."
+
+#: src/tags.cpp:580
+#, fuzzy
+msgid "Color Map"
+msgstr "Цветовое пространство"
 
-#: src/tags.cpp:468
+#: src/tags.cpp:581
 msgid ""
-"This tag records information about the host computer used to generate the "
-"image."
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
 msgstr ""
 
-#: src/tags.cpp:472
-msgid ""
-"The chromaticity of the white point of the image. Normally this tag is not "
-"necessary, since color space is specified in the colorspace information tag "
-"(<ColorSpace>)."
+#: src/tags.cpp:586
+msgid "Halftone Hints"
 msgstr ""
-"Хроматичность белой точки изображения. Обычно этот тег не является "
-"необходимым, поскольку цветовое пространство уже указано в теге <ColorSpace>."
 
-#: src/tags.cpp:477
+#: src/tags.cpp:587
 msgid ""
-"The chromaticity of the three primary colors of the image. Normally this tag "
-"is not necessary, since colorspace is specified in the colorspace "
-"information tag (<ColorSpace>)."
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
 msgstr ""
 
-#: src/tags.cpp:481
+#: src/tags.cpp:591
 #, fuzzy
 msgid "Tile Width"
 msgstr "Ширина изображения"
 
-#: src/tags.cpp:482
+#: src/tags.cpp:592
 msgid "The tile width in pixels. This is the number of columns in each tile."
 msgstr ""
 
-#: src/tags.cpp:484
+#: src/tags.cpp:594
 #, fuzzy
 msgid "Tile Length"
 msgstr "Длина изображения"
 
-#: src/tags.cpp:485
+#: src/tags.cpp:595
 msgid ""
 "The tile length (height) in pixels. This is the number of rows in each tile."
 msgstr ""
 
-#: src/tags.cpp:487
+#: src/tags.cpp:597
 #, fuzzy
 msgid "Tile Offsets"
 msgstr "Режим захвата"
 
-#: src/tags.cpp:488
+#: src/tags.cpp:598
 msgid ""
 "For each tile, the byte offset of that tile, as compressed and stored on "
 "disk. The offset is specified with respect to the beginning of the TIFF "
@@ -16278,67 +20445,207 @@
 "the locations of other tiles."
 msgstr ""
 
-#: src/tags.cpp:493
+#: src/tags.cpp:603
+#, fuzzy
 msgid "Tile Byte Counts"
-msgstr ""
+msgstr "Выдержка"
 
-#: src/tags.cpp:494
+#: src/tags.cpp:604
 msgid ""
 "For each tile, the number of (compressed) bytes in that tile. See "
 "TileOffsets for a description of how the byte counts are ordered."
 msgstr ""
 
-#: src/tags.cpp:497
+#: src/tags.cpp:607
+#, fuzzy
 msgid "SubIFD Offsets"
-msgstr ""
+msgstr "Режим захвата"
 
-#: src/tags.cpp:498
+#: src/tags.cpp:608
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr "Определено Adobe Corporation для включения TIFF Trees в файлах TIFF."
 
-#: src/tags.cpp:500
+#: src/tags.cpp:610
+#, fuzzy
+msgid "Ink Set"
+msgstr "Установить"
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:613
+#, fuzzy
+msgid "Ink Names"
+msgstr "Имя владельца"
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+#, fuzzy
+msgid "Number Of Inks"
+msgstr "Число F"
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+#, fuzzy
+msgid "Dot Range"
+msgstr "Динамический диапазон"
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
+
+#: src/tags.cpp:622
+#, fuzzy
+msgid "Target Printer"
+msgstr "Диафрагма"
+
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
+msgstr ""
+
+#: src/tags.cpp:625
+#, fuzzy
+msgid "Extra Samples"
+msgstr "Битов на сэмпл"
+
+#: src/tags.cpp:626
+msgid ""
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
+msgstr ""
+
+#: src/tags.cpp:629
+#, fuzzy
+msgid "Sample Format"
+msgstr "Формат файла"
+
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr ""
+
+#: src/tags.cpp:632
+#, fuzzy
+msgid "SMin Sample Value"
+msgstr "Частота сэмплирования звукозаписи"
+
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr ""
+
+#: src/tags.cpp:635
+#, fuzzy
+msgid "SMax Sample Value"
+msgstr "Максимально открытая диафрагма"
+
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr ""
+
+#: src/tags.cpp:638
 msgid "Transfer Range"
 msgstr "Область передачи"
 
-#: src/tags.cpp:501
+#: src/tags.cpp:639
 msgid "Expands the range of the TransferFunction"
 msgstr ""
 
-#: src/tags.cpp:503
+#: src/tags.cpp:641
+msgid "Clip Path"
+msgstr ""
+
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
 #, fuzzy
 msgid "JPEG tables"
 msgstr "Сжатие JPEG"
 
-#: src/tags.cpp:504
+#: src/tags.cpp:659
 msgid ""
 "This optional tag may be used to encode the JPEG quantization andHuffman "
 "tables for subsequent use by the JPEG decompression process."
 msgstr ""
 
-#: src/tags.cpp:507
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
 #, fuzzy
 msgid "JPEG Process"
 msgstr "Сжатие JPEG"
 
-#: src/tags.cpp:508
+#: src/tags.cpp:667
 msgid "This field indicates the process used to produce the compressed data"
 msgstr ""
 
-#: src/tags.cpp:510
+#: src/tags.cpp:669
 msgid "JPEG Interchange Format"
 msgstr "Формат обмена данными JPEG"
 
-#: src/tags.cpp:511
+#: src/tags.cpp:670
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
 msgstr ""
 
-#: src/tags.cpp:514
+#: src/tags.cpp:673
+#, fuzzy
 msgid "JPEG Interchange Format Length"
-msgstr ""
+msgstr "Формат обмена данными JPEG"
 
-#: src/tags.cpp:515
+#: src/tags.cpp:674
 msgid ""
 "The number of bytes of JPEG compressed thumbnail data. This is not used for "
 "primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
@@ -16347,7 +20654,71 @@
 "Kbytes, including all other data to be recorded in APP1."
 msgstr ""
 
-#: src/tags.cpp:523
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
+msgstr ""
+
+#: src/tags.cpp:682
+#, fuzzy
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
+msgstr ""
+"Этот тэг отображает направление обработки резкости при съёмке изображения"
+
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
+msgstr ""
+
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
+msgstr ""
+
+#: src/tags.cpp:690
+msgid ""
+"This Field points to a list of point transform values, one per component."
+msgstr ""
+
+#: src/tags.cpp:692
+#, fuzzy
+msgid "JPEG Q-Tables"
+msgstr "Сжатие JPEG"
+
+#: src/tags.cpp:693
+msgid ""
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:696
+#, fuzzy
+msgid "JPEG DC-Tables"
+msgstr "Сжатие JPEG"
+
+#: src/tags.cpp:697
+msgid ""
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
+msgstr ""
+
+#: src/tags.cpp:700
+#, fuzzy
+msgid "JPEG AC-Tables"
+msgstr "Сжатие JPEG"
+
+#: src/tags.cpp:701
+msgid ""
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:705
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in Appendix E, \"Color "
@@ -16362,17 +20733,20 @@
 "используется значение, которое обеспечивает оптимальные характеристики "
 "совместимости."
 
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr "Субсэмплинг YCbCr"
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
+#, fuzzy
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
 "component. In JPEG compressed data a JPEG marker is used instead of this tag."
 msgstr ""
+"Компоновка пикселов. Если данные сжаты по алгоритму JPEG, вместо этого тэга "
+"используется JPEG-маркер."
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -16399,11 +20773,11 @@
 "Предпочтительнее, когда считывающая программа поддерживает оба типа "
 "позиционирования."
 
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr "Эталонный Чёрный/Белый"
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -16417,52 +20791,60 @@
 "используется значение, которое обеспечивает оптимальные характеристики "
 "совместимости."
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr "XML-пакет"
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr "Метаданные XMP (Adobe technote 9-14-02)"
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 msgid "Windows Rating"
 msgstr "Оценка в Windows"
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr "Поле оценки, используемое Windows"
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
 msgid "Windows Rating Percent"
 msgstr "Процентная оценка в Windows"
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr "Поле оценки, используемое Windows, процентное значение"
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+#, fuzzy
+msgid "Image ID"
+msgstr "Уникальный ID изображения"
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr ""
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods"
 msgstr ""
 
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr "Заряд батареи"
-
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
 "photographer and editor copyrights. It is the copyright notice of the person "
@@ -16481,97 +20863,100 @@
 "it is treated as unknown."
 msgstr ""
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 #, fuzzy
 msgid "Exposure time, given in seconds."
 msgstr "Время экспозиции в секундах"
 
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
 msgid "The F number."
 msgstr "Число F"
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr "IPTC/NAA"
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr "Содержит запись IPTC/NAA"
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr ""
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr ""
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
 "contain image data as in the case of TIFF."
 msgstr ""
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
+#, fuzzy
 msgid "Inter Color Profile"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
 msgstr ""
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
 msgstr ""
 "Класс программы, использованной камерой для установки экспозиции при съёмке."
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
+#, fuzzy
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
-msgstr ""
+msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
 msgstr ""
 
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
+#, fuzzy
 msgid "ISO Speed Ratings"
-msgstr ""
+msgstr "Настройка резкости"
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
 msgstr ""
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
 "14524."
 msgstr ""
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Interlace"
 msgstr "Intel"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Indicates the field number of multifield images."
 msgstr "Показывает макет изображения"
 
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 #, fuzzy
 msgid "Time Zone Offset"
 msgstr "Режим захвата"
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -16579,101 +20964,101 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 #, fuzzy
 msgid "Self Timer Mode"
 msgstr "Серийный номер"
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "Date Time Original"
 msgstr "Исходная дата и время"
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "The date and time when the original image data was generated."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 #, fuzzy
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
 "Специфичная для сжатых данных информация. Использованный режим сжатия для "
 "сжатого изображения показывается в единице измерения \"битов на пиксел\""
 
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 #, fuzzy
 msgid "Shutter speed."
 msgstr "Скорость срабатывания затвора"
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
 #, fuzzy
 msgid "The lens aperture."
 msgstr "Максимально открытая диафрагма"
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 #, fuzzy
 msgid "The value of brightness."
 msgstr "Число F"
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 #, fuzzy
 msgid "The exposure bias."
 msgstr "Смещение экспозиции"
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
 #, fuzzy
 msgid "Max Aperture Value"
 msgstr "Максимально открытая диафрагма"
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 #, fuzzy
 msgid "The smallest F number of the lens."
 msgstr "Вид источника света"
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr "Расстояние до объекта в метрах"
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
 msgid "The metering mode."
 msgstr "Режим замера"
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr "Вид источника света"
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 #, fuzzy
 msgid "Indicates the status of flash when the image was shot."
 msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 msgid "The actual focal length of the lens, in mm."
 msgstr ""
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 msgid "Amount of flash energy (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 #, fuzzy
 msgid "Noise"
 msgstr "Ничего"
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr ""
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
@@ -16682,7 +21067,7 @@
 "Количество пикселов на <ResolutionUnit> в направлении <ImageLength>. "
 "Остальное аналогично <XResolution>."
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
@@ -16691,34 +21076,29 @@
 "Количество пикселов на <ResolutionUnit> в направлении <ImageLength>. "
 "Остальное аналогично <XResolution>."
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
 "FocalPlaneYResolution(37391)."
 msgstr ""
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security Classification"
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 msgid "Security classification assigned to the image."
 msgstr ""
 
-#: src/tags.cpp:655
-#, fuzzy
-msgid "Image History"
-msgstr "Длина изображения"
-
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 #, fuzzy
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
@@ -16726,91 +21106,93 @@
 "Это поле хранит информацию о местоположении и области объекта съёмки во всей "
 "сцене."
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
 msgid "TIFF/EP Standard ID"
 msgstr "ID стандарта TIFF/EP"
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
 msgstr ""
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
+#, fuzzy
 msgid "Type of image sensor."
-msgstr ""
+msgstr "Номер изображения"
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
 msgid "Windows Title"
 msgstr "Название (Windows)"
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr "Поле названия, используемое в Windows, кодированное в UCS2"
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
 msgid "Windows Comment"
 msgstr "Комментарий (Windows)"
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr "Поле комментария, используемое в Windows, кодированное в UCS2"
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 msgid "Windows Author"
 msgstr "Автор (Windows)"
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr "Поле автора, используемое в Windows, кодированное в UCS2"
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
 msgid "Windows Keywords"
 msgstr "Ключевые слова (Windows)"
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr "Поле ключевых слов, используемое в Windows, кодированное в UCS2"
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 #, fuzzy
 msgid "Windows Subject"
 msgstr "Пользовательский комментарий"
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
+#, fuzzy
 msgid "Subject tag used by Windows, encoded in UCS2"
-msgstr ""
+msgstr "Поле автора, используемое в Windows, кодированное в UCS2"
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
 msgid "Print Image Matching"
 msgstr ""
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
+#: src/tags.cpp:866
+msgid "Print Image Matching, description needed."
 msgstr ""
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
 #, fuzzy
 msgid "DNG version"
 msgstr "Версия PDF"
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
 "1, 1, 0, 0."
 msgstr ""
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
 #, fuzzy
 msgid "DNG backward version"
 msgstr "Версия прошивки"
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -16820,12 +21202,12 @@
 "values, to verify it is able to correctly read the file."
 msgstr ""
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
 #, fuzzy
 msgid "Unique Camera Model"
 msgstr "Модель камеры"
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -16835,37 +21217,37 @@
 "replacement profiles."
 msgstr ""
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
 #, fuzzy
 msgid "Localized Camera Model"
 msgstr "Модель камеры"
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
 msgstr ""
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
 #, fuzzy
 msgid "CFA Plane Color"
 msgstr "Паттерн CFA"
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr ""
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr ""
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -16874,16 +21256,16 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
 #, fuzzy
 msgid "Black Level Repeat Dim"
 msgstr "Заряд батареи"
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -16891,12 +21273,12 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 #, fuzzy
 msgid "Black Level Delta H"
 msgstr "Заряд батареи"
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -16905,12 +21287,12 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 #, fuzzy
 msgid "Black Level Delta V"
 msgstr "Заряд батареи"
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -16918,24 +21300,24 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
 #, fuzzy
 msgid "White Level"
 msgstr "Заряд батареи"
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
 #, fuzzy
 msgid "Default Scale"
 msgstr "По умолчанию"
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -16945,11 +21327,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr ""
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16958,11 +21340,12 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
+#, fuzzy
 msgid "Default Crop Size"
-msgstr ""
+msgstr "По умолчанию"
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16970,12 +21353,12 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 #, fuzzy
 msgid "Color Matrix 1"
 msgstr "Цветовое пространство"
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -16983,24 +21366,24 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 #, fuzzy
 msgid "Color Matrix 2"
 msgstr "Цветовое пространство"
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 #, fuzzy
 msgid "Camera Calibration 1"
 msgstr "Настройка контраста"
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -17011,11 +21394,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
+#, fuzzy
 msgid "Camera Calibration 2"
-msgstr ""
+msgstr "Настройка контраста"
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -17026,11 +21410,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
+#, fuzzy
 msgid "Reduction Matrix 1"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -17038,11 +21423,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
+#, fuzzy
 msgid "Reduction Matrix 2"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -17050,12 +21436,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
 #, fuzzy
 msgid "Analog Balance"
 msgstr "Баланс белого"
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -17066,35 +21452,35 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
 #, fuzzy
 msgid "As Shot Neutral"
 msgstr "внешняя"
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 msgid "As Shot White XY"
 msgstr ""
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
 #, fuzzy
 msgid "Baseline Exposure"
 msgstr "Режим экспозиции"
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -17109,11 +21495,12 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
+#, fuzzy
 msgid "Baseline Noise"
-msgstr ""
+msgstr "Режим экспозиции"
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -17122,12 +21509,12 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
 #, fuzzy
 msgid "Baseline Sharpness"
 msgstr "Резкость"
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -17135,11 +21522,11 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 msgid "Bayer Green Split"
 msgstr ""
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -17149,11 +21536,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr ""
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -17163,7 +21550,7 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 #, fuzzy
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
@@ -17171,22 +21558,22 @@
 msgstr ""
 "Серийный номер камеры или задника камеры, использовавшегося для съемки."
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
 #, fuzzy
 msgid "Lens Info"
 msgstr "Объектив"
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
 "f-stops are unknown, they should be encoded as 0/0."
 msgstr ""
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr ""
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -17197,12 +21584,12 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
 #, fuzzy
 msgid "Anti Alias Strength"
 msgstr "Фокусное расстояние"
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -17211,35 +21598,35 @@
 "artifacts)."
 msgstr ""
 
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 #, fuzzy
 msgid "Shadow Scale"
 msgstr "Тень"
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
 msgstr ""
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 #, fuzzy
 msgid "DNG Private Data"
 msgstr "Данные эскиза"
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
 "programs that edit DNG files."
 msgstr ""
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
 #, fuzzy
 msgid "MakerNote Safety"
 msgstr "Данные производителя"
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -17248,22 +21635,23 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr ""
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
+#, fuzzy
 msgid "Calibration Illuminant 2"
-msgstr ""
+msgstr "Без коррекции"
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -17272,11 +21660,12 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
+#, fuzzy
 msgid "Best Quality Scale"
-msgstr ""
+msgstr "По умолчанию"
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -17285,12 +21674,12 @@
 "need to be multiplied to achieve the best quality image size."
 msgstr ""
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 #, fuzzy
 msgid "Raw Data Unique ID"
 msgstr "Уникальный ID изображения"
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -17300,22 +21689,23 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 #, fuzzy
 msgid "Original Raw File Name"
 msgstr "Имя файла"
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
+#, fuzzy
 msgid "Original Raw File Data"
-msgstr ""
+msgstr "Имя файла"
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -17328,23 +21718,23 @@
 "data blocks."
 msgstr ""
 
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 #, fuzzy
 msgid "Active Area"
 msgstr "Область объекта съёмки"
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
 msgstr ""
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 #, fuzzy
 msgid "Masked Areas"
 msgstr "Ручная"
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -17354,11 +21744,12 @@
 "masked pixels are no longer useful."
 msgstr ""
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
+#, fuzzy
 msgid "As-Shot ICC Profile"
-msgstr ""
+msgstr "Профиль камеры"
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -17371,11 +21762,11 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
 msgid "As-Shot Pre-Profile Matrix"
 msgstr ""
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -17387,12 +21778,12 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 #, fuzzy
 msgid "Current ICC Profile"
 msgstr "Профиль камеры"
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17400,11 +21791,12 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
+#, fuzzy
 msgid "Current Pre-Profile Matrix"
-msgstr ""
+msgstr "Профиль камеры"
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17412,204 +21804,204 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
 msgid "Unknown IFD tag"
 msgstr "Неизвестное поле IFD"
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr "Не определено"
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 msgid "Creative program"
 msgstr "Творческая программа"
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 #, fuzzy
 msgid "Action program"
 msgstr "Нормальная программа"
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
 msgid "Portrait mode"
 msgstr "Портретный режим"
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
 msgid "Landscape mode"
 msgstr "Альбомный режим"
 
-#: src/tags.cpp:1051
-#, fuzzy
-msgid "Center weighted average"
-msgstr "Центрально-взвешенный средний"
-
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 msgid "Multi-spot"
 msgstr ""
 
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 #, fuzzy
 msgid "Tungsten (incandescent light)"
 msgstr "Яркая лампа накаливания"
 
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
 msgstr "Ясная погода"
 
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
 msgid "Cloudy weather"
 msgstr "Облачность"
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 msgid "Daylight fluorescent (D 5700 - 7100K)"
 msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
+#, fuzzy
 msgid "Day white fluorescent (N 4600 - 5400K)"
-msgstr ""
+msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
+#, fuzzy
 msgid "Cool white fluorescent (W 3900 - 4500K)"
-msgstr ""
+msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
+#, fuzzy
 msgid "White fluorescent (WW 3200 - 3700K)"
-msgstr ""
+msgstr "Флуоресцентная лампа дневного света (D 5700 - 7100K)"
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr "Стандартный свет A"
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr "Стандартный свет B"
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr "Стандартный свет C"
 
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr "D55"
 
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr "D65"
 
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr "D75"
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 msgid "D50"
 msgstr "D50"
 
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
+#, fuzzy
 msgid "ISO studio tungsten"
-msgstr ""
+msgstr "Скорость ISO"
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 msgid "Other light source"
 msgstr "Другой источник света"
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr "Не откалибровано"
 
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 msgid "One-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 msgid "Two-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 msgid "Three-chip color area"
 msgstr ""
 
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 msgid "Color sequential area"
 msgstr ""
 
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr ""
 
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 msgid "Color sequential linear"
 msgstr ""
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
 msgid "Film scanner"
 msgstr "Сканер фотопленки"
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr ""
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
 msgid "Digital still camera"
 msgstr "Цифровая фотокамера"
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr ""
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
 msgid "Normal process"
 msgstr "Обычный процесс проявки"
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
 msgid "Custom process"
 msgstr "Другой процесс проявки"
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr ""
 
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr ""
 
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
+#, fuzzy
 msgid "Low gain down"
-msgstr ""
+msgstr "Местоположение объекта съёмки"
 
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr ""
 
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr "Крупный план"
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr ""
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Время экспозиции в секундах"
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
 "tag value is an ASCII string compatible with the standard developed by the "
 "ASTM Technical Committee."
 msgstr ""
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr ""
 
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
 "image values."
 msgstr ""
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -17617,11 +22009,11 @@
 "Поддерживаемая версия стандарта Exif. Отсутствие этого поля принимается за "
 "свидетельство несоответствия стандарту."
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
 msgid "Date and Time (original)"
 msgstr "Исходная дата и время"
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
@@ -17629,15 +22021,15 @@
 "Дата и время создания исходного изображения. Для цифровой фотокамеры это "
 "дата и время съёмки."
 
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
 msgid "Date and Time (digitized)"
 msgstr "Дата и время оцифровки"
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 msgid "The date and time when the image was stored as digital data."
 msgstr "Дата и время сохранения изображения в цифровом виде"
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -17654,11 +22046,11 @@
 "используются компоненты, отличные от Y, Cb и Cr, а также для обеспечения "
 "поддержки обеих последовательностей."
 
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr "Сжатых битов на пиксел"
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -17666,7 +22058,7 @@
 "Специфичная для сжатых данных информация. Использованный режим сжатия для "
 "сжатого изображения показывается в единице измерения \"битов на пиксел\""
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 #, fuzzy
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
@@ -17675,11 +22067,11 @@
 "Скорость срабатывания затвора. Эта единица измерения является APEX(Additive "
 "System of Photographic Exposure)-настройкой (см. Приложение С)"
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Диафрагма объектива. Эта единица измерения является APEX-значением"
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -17687,11 +22079,11 @@
 "Значение яркости. Эта единица измерения является APEX-значением. Обычно оно "
 "находится в пределах от -99.99 до 99.99"
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr "Смещение экспозиции"
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
@@ -17699,7 +22091,7 @@
 "Смещение экспозиции. Измеряется APEX-единицами. Обычно значение лежит в "
 "диапазоне между -99.99 и 99.99."
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
@@ -17708,12 +22100,12 @@
 "значение лежит в диапазоне между 00.00 и 99.99, но оно не ограничено этим "
 "диапазоном."
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr "Это поле записывается при использовании эффекта стробоскопа во вспышке"
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -17721,7 +22113,7 @@
 "Реальное фокусное расстояние объектива. Преобразование в 35мм плёночный "
 "аналог не производится."
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
@@ -17729,11 +22121,11 @@
 "Это поле хранит информацию о местоположении и области объекта съёмки во всей "
 "сцене."
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
 msgid "Maker Note"
 msgstr "Данные производителя"
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -17741,52 +22133,53 @@
 "Поле для разработчиков средства записи тегов Exif, в который можно "
 "записывать всё, что им хочется. Содержимое зависит от разработчиков."
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
+#, fuzzy
 msgid "Sub-seconds Time"
-msgstr ""
+msgstr "Исходная дата и время"
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr "Поле, используемое для записи долей секунды из тега <DateTime>."
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 #, fuzzy
 msgid "Sub-seconds Time Original"
 msgstr "Исходная дата и время"
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Поле, используемое для записи долей секунды из тега <DateTimeOriginal>."
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 #, fuzzy
 msgid "Sub-seconds Time Digitized"
 msgstr "Дата и время оцифровки"
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Поле, используемое для записи долей секунды из тега <DateTimeDigitized>."
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
 msgid "FlashPix Version"
 msgstr "Версия FlashPix"
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Версия формата FlashPix, поддерживаемого в формате файлов FPXR"
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 #, fuzzy
 msgid ""
 "The color space information tag is always recorded as the color space "
@@ -17802,7 +22195,7 @@
 "могут быть восприняты как sRGB при преобразовании во FlashPix. Подробнее "
 "sRGB рассматривается в приложении E."
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -17810,7 +22203,7 @@
 "not exist in an uncompressed file."
 msgstr ""
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
@@ -17820,7 +22213,7 @@
 "tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
@@ -17828,11 +22221,12 @@
 "characters). The path is not recorded."
 msgstr ""
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
+#, fuzzy
 msgid "Interoperability IFD Pointer"
-msgstr ""
+msgstr "Версия совместимости"
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -17841,48 +22235,48 @@
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 msgstr ""
 
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 #, fuzzy
 msgid "Focal Plane X-Resolution"
 msgstr "Разрешение по X"
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 #, fuzzy
 msgid "Focal Plane Y-Resolution"
 msgstr "Разрешение по X"
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 #, fuzzy
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
@@ -17895,21 +22289,23 @@
 "края, до обработки поворота согласно тэгу <Rotation>. Первое значение "
 "отображает номер столбца по X, а второй - номер строки по Y."
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
+#, fuzzy
 msgid "Exposure index"
-msgstr ""
+msgstr "Режим экспозиции"
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
+#, fuzzy
 msgid "Indicates the image sensor type on the camera or input device."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 #, fuzzy
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
@@ -17919,7 +22315,7 @@
 "значение тэга всегда должно быть равно 1, что означает непосредственную "
 "съёмку."
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
@@ -17928,25 +22324,26 @@
 "значение тэга всегда должно быть равно 1, что означает непосредственную "
 "съёмку."
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
+#, fuzzy
 msgid "Color Filter Array Pattern"
-msgstr ""
+msgstr "Цветовое пространство"
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods."
 msgstr ""
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
 "is expected to disable or minimize any further processing."
 msgstr ""
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
@@ -17956,11 +22353,11 @@
 "автоматического брекетинга камера делает серию кадров одной и той же сцены с "
 "разными настройками экспозиции."
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
@@ -17970,7 +22367,7 @@
 "изображения. Если значение равно 0, то цифровой трансфокатор не был "
 "использован."
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 #, fuzzy
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
@@ -17981,7 +22378,7 @@
 "измеряемом миллиметрами. Если значение равно 0, то фокусное расстояние "
 "неизвестно. Обратите внимание на то, что этот тэг отличется от <FocalLength>."
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
 #, fuzzy
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
@@ -17992,140 +22389,143 @@
 "измеряемом миллиметрами. Если значение равно 0, то фокусное расстояние "
 "неизвестно. Обратите внимание на то, что этот тэг отличется от <FocalLength>."
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
+#, fuzzy
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
+msgstr "Этот тэг отображает режим баланса белого при съёмке изображения."
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 "Этот тэг отображает направление обработки контраста при съёмке изображения"
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 "Этот тэг отображает направление обработки насыщенности при съёмке изображения"
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 "Этот тэг отображает направление обработки резкости при съёмке изображения"
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
 "conditions in the reader."
 msgstr ""
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
+#, fuzzy
 msgid "This tag indicates the distance to the subject."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
 "fixed length."
 msgstr ""
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
 msgid "Unknown Exif tag"
 msgstr "Неизвестный тег Exif"
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
 msgid "North"
 msgstr "Север"
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
 msgid "South"
 msgstr "Юг"
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
 msgid "East"
 msgstr "Восток"
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
 msgid "West"
 msgstr "Запад"
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr "Над уровнем моря"
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
 msgid "Below sea level"
 msgstr "Под уровнем моря"
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
 msgid "Measurement in progress"
 msgstr "Выполняется измерение"
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
+#, fuzzy
 msgid "Measurement Interoperability"
-msgstr ""
+msgstr "Выполняется измерение"
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr ""
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr "км/ч"
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr "миль/ч"
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
 msgid "knots"
 msgstr "узлов"
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 #, fuzzy
 msgid "True direction"
 msgstr "Направление съёмки панорамы"
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 #, fuzzy
 msgid "Magnetic direction"
 msgstr "Направление снимка GPS"
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 #, fuzzy
 msgid "Kilometers"
 msgstr "Порядок заполнения"
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 #, fuzzy
 msgid "Miles"
 msgstr "Файл"
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 #, fuzzy
 msgid "Knots"
 msgstr "узлов"
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
 msgid "Without correction"
 msgstr "Без коррекции"
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 #, fuzzy
 msgid "Correction applied"
 msgstr "Тонкомпенсация"
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
 "tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
@@ -18137,11 +22537,12 @@
 "<ExifVersion> тег <GPSVersionID> задаётся в байтах. Когда версия равна "
 "2.0.0.0, значение тега равно 02000000.H)."
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
+#, fuzzy
 msgid "GPS Latitude Reference"
-msgstr ""
+msgstr "Эталонный Чёрный/Белый"
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -18149,7 +22550,7 @@
 "Показывает, северная широта или же южная. ASCII-значение 'N' обозначает "
 "северную широту, а 'S' - южную."
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -18161,11 +22562,12 @@
 "минутами (mm) и секундами (ss). При это формат таков: dd/1,mm/1,ss/1. Когда "
 "используются только градусы и минуты, формат таков: dd/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
+#, fuzzy
 msgid "GPS Longitude Reference"
-msgstr ""
+msgstr "Долгота по GPS"
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -18173,7 +22575,7 @@
 "Показывает, восточная долгота или же западная. ASCII-значение 'E' обозначает "
 "восточную долготу, а 'W' - западную."
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -18185,7 +22587,7 @@
 "минутами (mm) и секундами (ss). При это формат таков: ddd/1,mm/1,ss/1. Когда "
 "используются только градусы и минуты, формат таков: ddd/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -18199,7 +22601,7 @@
 "<GSPAltitude>. Эталонной единицей измерения является метр. Помните, что этот "
 "тэг в отличие от других \"эталонных\" тэгов имеет тип BYTE."
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -18207,14 +22609,14 @@
 "Отображает высоту, основываясь на эталоне из тэга <GPSAltitudeRef>. Высота "
 "выражается RATIONAL значением. Эталонной единицей измерения является метр."
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
 "(atomic clock)."
 msgstr ""
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -18223,81 +22625,83 @@
 "the tag is set to NULL."
 msgstr ""
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
 "Interoperability."
 msgstr ""
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
 msgstr ""
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 #, fuzzy
 msgid "GPS Data Degree of Precision"
 msgstr "Версия тэга GPS"
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 msgstr ""
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Скорость перемещения приёмника GPS"
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
+#, fuzzy
 msgid "GPS Track Ref"
-msgstr ""
+msgstr "Эталонный Чёрный/Белый"
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
+#, fuzzy
 msgid "GPS Destination Latitude Refeference"
-msgstr ""
+msgstr "Расстояние до объекта"
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 #, fuzzy
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
@@ -18307,7 +22711,7 @@
 "Показывает, северная широта или же южная. ASCII-значение 'N' обозначает "
 "северную широту, а 'S' - южную."
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 #, fuzzy
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
@@ -18321,11 +22725,12 @@
 "минутами (mm) и секундами (ss). При это формат таков: dd/1,mm/1,ss/1. Когда "
 "используются только градусы и минуты, формат таков: dd/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
+#, fuzzy
 msgid "GPS Destination Longitude Reference"
-msgstr ""
+msgstr "Расстояние до объекта"
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 #, fuzzy
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
@@ -18334,7 +22739,7 @@
 "Показывает, восточная долгота или же западная. ASCII-значение 'E' обозначает "
 "восточную долготу, а 'W' - западную."
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 #, fuzzy
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
@@ -18348,72 +22753,78 @@
 "минутами (mm) и секундами (ss). При это формат таков: ddd/1,mm/1,ss/1. Когда "
 "используются только градусы и минуты, формат таков: ddd/1,mmmm/100,0/1."
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
+#, fuzzy
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
-msgstr ""
+msgstr "Расстояние до объекта в метрах"
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
+#, fuzzy
 msgid "GPS Destination Distance Reference"
-msgstr ""
+msgstr "Расстояние до объекта"
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
 msgstr ""
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
 #, fuzzy
 msgid "Indicates the distance to the destination point."
 msgstr "Расстояние до объекта в метрах"
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
 "followed by the name of the method."
 msgstr ""
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
 "GPS area."
 msgstr ""
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
+#, fuzzy
 msgid "GPS Date Stamp"
-msgstr ""
+msgstr "Отметка времени по GPS"
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
 msgstr ""
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
+#, fuzzy
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
+"Этот тэг отображает направление обработки насыщенности при съёмке изображения"
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 #, fuzzy
 msgid "Unknown GPSInfo tag"
 msgstr "Неизвестный тэг"
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
+#, fuzzy
 msgid "Interoperability Index"
-msgstr ""
+msgstr "Версия совместимости"
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -18421,87 +22832,105 @@
 "(ExifR98) for other tags used for ExifR98."
 msgstr ""
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
 msgid "Interoperability Version"
 msgstr "Версия совместимости"
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr "Версия совместимости"
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
+#, fuzzy
 msgid "Related Image File Format"
-msgstr ""
+msgstr "Ширина изображения"
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
+#, fuzzy
 msgid "File format of image file"
-msgstr ""
+msgstr "Не удалось открыть файл\n"
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 #, fuzzy
 msgid "Related Image Width"
 msgstr "Ширина изображения"
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 #, fuzzy
 msgid "Related Image Length"
 msgstr "Длина изображения"
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 msgid "Unknown Exif Interoperability tag"
 msgstr "Неизвестный тег совместимости с Exif"
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
 #, fuzzy
 msgid "Offset"
 msgstr "быстрый"
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr ""
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 #, fuzzy
 msgid "Byte Order"
 msgstr "Порядок заполнения"
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
 msgstr ""
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 #, fuzzy
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr "Неизвестный тег PentaxMakerNote"
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
 msgid "Unknown tag"
 msgstr "Неизвестное поле"
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 msgid "Digital zoom not used"
 msgstr "Цифровой трансфокатор не использовался"
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 msgid "TIFF header, offset"
 msgstr ""
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr ""
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Color balance settings 1"
+#~ msgid "Software firmware version"
+#~ msgstr "Версия прошивки"
+
+#, fuzzy
+#~ msgid "White Balance Bracketing "
 #~ msgstr "Настройка баланса белого"
 
-#~ msgid "Tone curve"
-#~ msgstr "Тональная кривая"
+#~ msgid "(Unknown Error)"
+#~ msgstr "(Неизвестная ошибка)"
+
+#, fuzzy
+#~ msgid "Exposure Speed"
+#~ msgstr "Режим экспозиции"
+
+#, fuzzy
+#~ msgid "Exposure speed"
+#~ msgstr "Режим экспозиции"
+
+#, fuzzy
+#~ msgid "Color balance settings 1"
+#~ msgstr "Настройка баланса белого"
 
 #~ msgid "Compression Curve"
 #~ msgstr "Кривая сжатия"
@@ -18513,9 +22942,6 @@
 #~ msgid "Color balance settings 2"
 #~ msgstr "Настройка баланса белого"
 
-#~ msgid "Spot Mode"
-#~ msgstr "Режим замера"
-
 #~ msgid "ImageStabilizer"
 #~ msgstr "Стабилизатор изображения"
 
@@ -18554,10 +22980,6 @@
 #~ msgstr "Запись данных EXIF из"
 
 #, fuzzy
-#~ msgid "Failed to open file "
-#~ msgstr "Не удалось открыть файл\n"
-
-#, fuzzy
 #~ msgid "uncalibrated"
 #~ msgstr "Не откалибровано"
 
@@ -18574,22 +22996,10 @@
 #~ msgstr "Неизвестно"
 
 #, fuzzy
-#~ msgid "other"
-#~ msgstr "Север"
-
-#, fuzzy
 #~ msgid "centimeters"
 #~ msgstr "Центральный"
 
 #, fuzzy
-#~ msgid "Manual exposure"
-#~ msgstr "Ручная экспозиция"
-
-#, fuzzy
-#~ msgid "Auto white balance"
-#~ msgstr "Автомат. баланс белого"
-
-#, fuzzy
 #~ msgid "Date Time"
 #~ msgstr "Дата и время"
 
Binary files /tmp/TId3M1M1Ks/exiv2-0.19/po/sk.gmo and /tmp/B4Gg93MYI9/exiv2-0.21/po/sk.gmo differ
diff -Nru exiv2-0.19/po/sk.po exiv2-0.21/po/sk.po
--- exiv2-0.19/po/sk.po	2009-12-29 10:51:25.000000000 +0000
+++ exiv2-0.21/po/sk.po	2010-11-22 15:13:38.000000000 +0000
@@ -1,17 +1,18 @@
 # translation of exiv2 to Slovak
-# Copyright (C) 2008-2009 Andreas Huggel
+# Copyright (C) 2008-2010 Andreas Huggel
 # This file is distributed under the same license as the exiv2 package.
 # Ivan Masár <helix84@centrum.sk>, 2008.
 #
-#: src/nikonmn.cpp:967
+#: src/nikonmn.cpp:1207
 msgid ""
 msgstr ""
 "Project-Id-Version: exiv2\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2009-12-29 18:49+0800\n"
+"POT-Creation-Date: 2010-11-22 23:10+0800\n"
 "PO-Revision-Date: 2008-11-18 14:54+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,2360 +21,2978 @@
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
 
-#: src/actions.cpp:259 src/actions.cpp:493 src/actions.cpp:669
-#: src/actions.cpp:686 src/actions.cpp:731 src/actions.cpp:821
-#: src/actions.cpp:970 src/actions.cpp:1012 src/actions.cpp:1081
-#: src/actions.cpp:1123 src/actions.cpp:1128 src/actions.cpp:1148
-#: src/actions.cpp:1153 src/actions.cpp:1185 src/actions.cpp:1428
-#: src/actions.cpp:1564 src/actions.cpp:1716
+#: src/actions.cpp:253 src/actions.cpp:486 src/actions.cpp:698
+#: src/actions.cpp:715 src/actions.cpp:760 src/actions.cpp:850
+#: src/actions.cpp:993 src/actions.cpp:1035 src/actions.cpp:1104
+#: src/actions.cpp:1146 src/actions.cpp:1151 src/actions.cpp:1171
+#: src/actions.cpp:1176 src/actions.cpp:1208 src/actions.cpp:1451
+#: src/actions.cpp:1587 src/actions.cpp:1652 src/actions.cpp:1824
 msgid "Failed to open the file\n"
 msgstr "Nepodarilo sa otvoriť súbor\n"
 
-#: src/actions.cpp:269
+#: src/actions.cpp:263
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/actions.cpp:275
+#: src/actions.cpp:269
 msgid "File size"
 msgstr "Veľkosť súboru"
 
-#: src/actions.cpp:276 src/actions.cpp:428 src/actions.cpp:996
+#: src/actions.cpp:270 src/actions.cpp:422 src/actions.cpp:1019
 msgid "Bytes"
 msgstr "bajtov"
 
-#: src/actions.cpp:280
+#: src/actions.cpp:274
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/actions.cpp:284 src/canonmn.cpp:662 src/minoltamn.cpp:620
-#: src/minoltamn.cpp:889 src/minoltamn.cpp:1127 src/pentaxmn.cpp:812
+#: src/actions.cpp:278 src/canonmn.cpp:767 src/minoltamn.cpp:500
+#: src/minoltamn.cpp:745 src/minoltamn.cpp:988 src/pentaxmn.cpp:892
 msgid "Image size"
 msgstr "Veľkosť obrázka"
 
-#: src/actions.cpp:289 src/actions.cpp:515 src/actions.cpp:744
-#: src/actions.cpp:979 src/actions.cpp:1441 src/actions.cpp:1577
+#: src/actions.cpp:283 src/actions.cpp:513 src/actions.cpp:773
+#: src/actions.cpp:1002 src/actions.cpp:1464 src/actions.cpp:1600
+#: src/actions.cpp:1665
 msgid "No Exif data found in the file\n"
 msgstr "V súbore neboli nájdené žiadne EXIF údaje\n"
 
-#: src/actions.cpp:294
+#: src/actions.cpp:288
 msgid "Camera make"
 msgstr "Zmačka fotoaparátu"
 
-#: src/actions.cpp:297
+#: src/actions.cpp:291
 msgid "Camera model"
 msgstr "Model fotoaparátu"
 
-#: src/actions.cpp:300
+#: src/actions.cpp:294
 msgid "Image timestamp"
 msgstr "Časová známka obrázka"
 
-#: src/actions.cpp:304 src/minoltamn.cpp:680 src/minoltamn.cpp:949
-#: src/minoltamn.cpp:956 src/minoltamn.cpp:1193
+#: src/actions.cpp:298 src/minoltamn.cpp:805 src/minoltamn.cpp:812
+#: src/minoltamn.cpp:1066
 msgid "Image number"
 msgstr "Číslo obrázka"
 
-#: src/actions.cpp:309 src/minoltamn.cpp:635 src/minoltamn.cpp:942
-#: src/minoltamn.cpp:1160 src/pentaxmn.cpp:826 src/pentaxmn.cpp:827
+#: src/actions.cpp:303 src/minoltamn.cpp:515 src/minoltamn.cpp:798
+#: src/minoltamn.cpp:1024 src/minoltamn.cpp:1368 src/pentaxmn.cpp:909
+#: src/pentaxmn.cpp:910
 msgid "Exposure time"
 msgstr "Čas expozície"
 
-#: src/actions.cpp:321 src/canonmn.cpp:775 src/tags.cpp:1227
+#: src/actions.cpp:315 src/canonmn.cpp:885 src/minoltamn.cpp:1262
+#: src/tags.cpp:1417
 msgid "Aperture"
 msgstr "Clona"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:325
 msgid "Exposure bias"
 msgstr "Skreslenie expozície"
 
-#: src/actions.cpp:334 src/canonmn.cpp:711 src/minoltamn.cpp:664
-#: src/minoltamn.cpp:903 src/minoltamn.cpp:904 src/minoltamn.cpp:1012
-#: src/minoltamn.cpp:1141 src/minoltamn.cpp:1142 src/panasonicmn.cpp:67
-#: src/pentaxmn.cpp:265 src/properties.cpp:533 src/tags.cpp:645
-#: src/tags.cpp:1065 src/tags.cpp:1252
+#: src/actions.cpp:328 src/canonmn.cpp:817 src/minoltamn.cpp:874
+#: src/minoltamn.cpp:1198 src/minoltamn.cpp:2098 src/panasonicmn.cpp:69
+#: src/pentaxmn.cpp:320 src/properties.cpp:549 src/sonymn.cpp:171
+#: src/tags.cpp:832 src/tags.cpp:1253 src/tags.cpp:1442
 msgid "Flash"
 msgstr "Blesk"
 
-#: src/actions.cpp:337 src/canonmn.cpp:769 src/panasonicmn.cpp:243
+#: src/actions.cpp:331 src/canonmn.cpp:879 src/panasonicmn.cpp:249
 msgid "Flash bias"
 msgstr "Skreslenie blesku"
 
-#: src/actions.cpp:342 src/canonmn.cpp:167 src/minoltamn.cpp:659
-#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1110
+#: src/actions.cpp:336 src/canonmn.cpp:201 src/minoltamn.cpp:539
+#: src/nikonmn.cpp:1325 src/nikonmn.cpp:1350
 msgid "Focal length"
 msgstr "Ohnisková vzdialenosť"
 
-#: src/actions.cpp:347
+#: src/actions.cpp:341
 msgid "35 mm equivalent"
 msgstr "ekvivalent 35 mm"
 
 # exif-subjectdistance
-#: src/actions.cpp:357
+#: src/actions.cpp:351
 msgid "Subject distance"
 msgstr "vzdialenosť subjektu"
 
-#: src/actions.cpp:368
+#: src/actions.cpp:362
 msgid "ISO speed"
 msgstr "ISO rýchlosť"
 
-#: src/actions.cpp:371 src/minoltamn.cpp:611 src/minoltamn.cpp:886
-#: src/minoltamn.cpp:1124 src/olympusmn.cpp:612 src/sigmamn.cpp:72
+#: src/actions.cpp:365 src/minoltamn.cpp:491 src/minoltamn.cpp:742
+#: src/minoltamn.cpp:985 src/minoltamn.cpp:1353 src/olympusmn.cpp:659
+#: src/sigmamn.cpp:75
 msgid "Exposure mode"
 msgstr "Režim expozície"
 
 # exif-meteringmode
-#: src/actions.cpp:374 src/minoltamn.cpp:629 src/minoltamn.cpp:1145
-#: src/olympusmn.cpp:614 src/sigmamn.cpp:75
+#: src/actions.cpp:368 src/minoltamn.cpp:509 src/minoltamn.cpp:1006
+#: src/minoltamn.cpp:1395 src/olympusmn.cpp:661 src/sigmamn.cpp:78
 msgid "Metering mode"
 msgstr "merací režim"
 
-#: src/actions.cpp:377 src/canonmn.cpp:653 src/minoltamn.cpp:641
-#: src/olympusmn.cpp:138 src/olympusmn.cpp:615 src/panasonicmn.cpp:237
+#: src/actions.cpp:371 src/canonmn.cpp:758 src/minoltamn.cpp:521
+#: src/olympusmn.cpp:202 src/olympusmn.cpp:663 src/panasonicmn.cpp:243
 msgid "Macro mode"
 msgstr "režim makro"
 
-#: src/actions.cpp:380 src/minoltamn.cpp:263 src/minoltamn.cpp:623
-#: src/minoltamn.cpp:892 src/minoltamn.cpp:1130 src/pentaxmn.cpp:809
+#: src/actions.cpp:374 src/minoltamn.cpp:133 src/minoltamn.cpp:503
+#: src/minoltamn.cpp:748 src/minoltamn.cpp:991 src/pentaxmn.cpp:889
+#: src/sonymn.cpp:275
 msgid "Image quality"
 msgstr "Kvalita obrázka"
 
-#: src/actions.cpp:383
+#: src/actions.cpp:377
 msgid "Exif Resolution"
 msgstr "Rozlíšenie exif"
 
-#: src/actions.cpp:412 src/minoltamn.cpp:617 src/minoltamn.cpp:895
-#: src/minoltamn.cpp:1133 src/nikonmn.cpp:214 src/nikonmn.cpp:460
-#: src/nikonmn.cpp:516 src/olympusmn.cpp:819 src/sigmamn.cpp:69
+#: src/actions.cpp:406 src/canonmn.cpp:1122 src/minoltamn.cpp:178
+#: src/minoltamn.cpp:497 src/minoltamn.cpp:751 src/minoltamn.cpp:994
+#: src/minoltamn.cpp:1377 src/nikonmn.cpp:226 src/nikonmn.cpp:472
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:880 src/sigmamn.cpp:72
+#: src/sonymn.cpp:290
 msgid "White balance"
 msgstr "Vyváženie bielej"
 
-#: src/actions.cpp:415 src/minoltamn.cpp:250 src/olympusmn.cpp:364
+#: src/actions.cpp:409 src/minoltamn.cpp:114 src/olympusmn.cpp:426
 msgid "Thumbnail"
 msgstr "Náhľad"
 
-#: src/actions.cpp:419 src/actions.cpp:424 src/canonmn.cpp:288
-#: src/canonmn.cpp:920 src/canonmn.cpp:929 src/minoltamn.cpp:425
-#: src/minoltamn.cpp:519 src/nikonmn.cpp:161 src/nikonmn.cpp:176
-#: src/olympusmn.cpp:90 src/olympusmn.cpp:661 src/olympusmn.cpp:668
-#: src/olympusmn.cpp:1097 src/properties.cpp:884 src/properties.cpp:892
-#: src/tags.cpp:1143
+#: src/actions.cpp:413 src/actions.cpp:418 src/canonmn.cpp:339
+#: src/canonmn.cpp:1030 src/canonmn.cpp:1039 src/canonmn.cpp:1091
+#: src/minoltamn.cpp:310 src/minoltamn.cpp:399 src/minoltamn.cpp:2076
+#: src/nikonmn.cpp:173 src/nikonmn.cpp:188 src/nikonmn.cpp:881
+#: src/nikonmn.cpp:904 src/nikonmn.cpp:966 src/olympusmn.cpp:142
+#: src/olympusmn.cpp:720 src/olympusmn.cpp:727 src/olympusmn.cpp:1181
+#: src/olympusmn.cpp:1240 src/olympusmn.cpp:1337 src/olympusmn.cpp:1493
+#: src/olympusmn.cpp:1502 src/pentaxmn.cpp:230 src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:350 src/properties.cpp:900 src/properties.cpp:908
+#: src/tags.cpp:1332
 msgid "None"
 msgstr "Nič"
 
-#: src/actions.cpp:434 src/datasets.cpp:376 src/properties.cpp:327
-#: src/properties.cpp:493 src/tags.cpp:580
+#: src/actions.cpp:428 src/datasets.cpp:376 src/properties.cpp:343
+#: src/properties.cpp:509 src/tags.cpp:767
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/actions.cpp:437
+#: src/actions.cpp:431
 msgid "Exif comment"
 msgstr "Komentár EXIF"
 
-#: src/actions.cpp:528
+#: src/actions.cpp:526
 msgid "No IPTC data found in the file\n"
 msgstr "Neboli nájdené žiadne IPTC dáta v súbore\n"
 
-#: src/actions.cpp:541
+#: src/actions.cpp:539
 msgid "No XMP data found in the file\n"
 msgstr "Neboli nájdené žiadne XMP dáta v súbore\n"
 
-#: src/actions.cpp:629 src/actions.cpp:642 src/actions.cpp:655
+#: src/actions.cpp:638 src/actions.cpp:663 src/actions.cpp:684
 msgid "(Binary value suppressed)"
 msgstr "(binárna hodnota potlačená)"
 
-#: src/actions.cpp:676
+#: src/actions.cpp:705
 msgid "JPEG comment"
 msgstr "Komentár JPEG"
 
-#: src/actions.cpp:701
+#: src/actions.cpp:730
 #, fuzzy
 msgid "Preview"
 msgstr "Dáta náhľadu"
 
-#: src/actions.cpp:705 src/actions.cpp:1051 src/properties.cpp:396
+#: src/actions.cpp:734 src/actions.cpp:1074 src/properties.cpp:412
 msgid "pixels"
 msgstr "pixelov"
 
-#: src/actions.cpp:707 src/actions.cpp:1053
+#: src/actions.cpp:736 src/actions.cpp:1076
 msgid "bytes"
 msgstr "bajtov"
 
-#: src/actions.cpp:754
+#: src/actions.cpp:783
 msgid "Neither tag"
 msgstr "Žiadna značka"
 
-#: src/actions.cpp:755
+#: src/actions.cpp:784
 msgid "nor"
 msgstr "nor"
 
-#: src/actions.cpp:756
+#: src/actions.cpp:785
 msgid "found in the file"
 msgstr "nájdený v súbore"
 
-#: src/actions.cpp:761
+#: src/actions.cpp:790
 msgid "Image file creation timestamp not set in the file"
 msgstr "Časová známka vytvorenia obrázka nebola v súbore nastavená"
 
-#: src/actions.cpp:767 src/actions.cpp:1530
+#: src/actions.cpp:796 src/actions.cpp:1553
 msgid "Failed to parse timestamp"
 msgstr "Nepodarilo sa prečítať časovú známku"
 
-#: src/actions.cpp:768
+#: src/actions.cpp:797
 msgid "in the file"
 msgstr "v súbore"
 
-#: src/actions.cpp:779
+#: src/actions.cpp:808
 msgid "Updating timestamp to"
 msgstr "Časová známka  sa aktualizuje na"
 
-#: src/actions.cpp:873
+#: src/actions.cpp:902
 #, fuzzy
 msgid "Erasing thumbnail data"
 msgstr "bajtov údajov náhľadov"
 
-#: src/actions.cpp:881
+#: src/actions.cpp:910
 msgid "Erasing Exif data from the file"
 msgstr "Vymazávajú sa Exif údaje zo súboru"
 
-#: src/actions.cpp:896
+#: src/actions.cpp:919
 msgid "Erasing IPTC data from the file"
 msgstr "Vymazávajú sa IPTC údaje zo súboru"
 
-#: src/actions.cpp:905
+#: src/actions.cpp:928
 msgid "Erasing JPEG comment from the file"
 msgstr "Vymazáva sa komentár JPEG zo súboru"
 
-#: src/actions.cpp:914
+#: src/actions.cpp:937
 msgid "Erasing XMP data from the file"
 msgstr "Vymazávajú sa XMP dáta zo súboru"
 
-#: src/actions.cpp:986
+#: src/actions.cpp:1009
 msgid "Image does not contain an Exif thumbnail\n"
 msgstr "Obrázok neobsahuje EXIF náhľad\n"
 
-#: src/actions.cpp:995
+#: src/actions.cpp:1018
 #, fuzzy
 msgid "Writing thumbnail"
 msgstr "náhľad"
 
-#: src/actions.cpp:996 src/actions.cpp:1054
+#: src/actions.cpp:1019 src/actions.cpp:1077
 msgid "to file"
 msgstr "do súboru"
 
-#: src/actions.cpp:1002
+#: src/actions.cpp:1025
 msgid "Exif data doesn't contain a thumbnail\n"
 msgstr "EXIF údaje neobsahujú náhľad\n"
 
-#: src/actions.cpp:1032 src/actions.cpp:1058
+#: src/actions.cpp:1055 src/actions.cpp:1081
 msgid "Image does not have preview"
 msgstr ""
 
-#: src/actions.cpp:1047
+#: src/actions.cpp:1070
 #, fuzzy
 msgid "Writing preview"
 msgstr "Zapisuje sa"
 
-#: src/actions.cpp:1218
+#: src/actions.cpp:1241
 msgid "Setting JPEG comment"
 msgstr "Nastavuje sa JPEG komentár"
 
-#: src/actions.cpp:1259
+#: src/actions.cpp:1282
 msgid "Add"
 msgstr "Pridať"
 
-#: src/actions.cpp:1281 src/actions.cpp:1355
+#: src/actions.cpp:1304 src/actions.cpp:1378
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/actions.cpp:1282 src/actions.cpp:1356
+#: src/actions.cpp:1305 src/actions.cpp:1379
 msgid "Failed to read"
 msgstr "Nepodarilo sa prečítať"
 
-#: src/actions.cpp:1284 src/actions.cpp:1358
+#: src/actions.cpp:1307 src/actions.cpp:1381
 msgid "value"
 msgstr "hodnota"
 
-#: src/actions.cpp:1295
+#: src/actions.cpp:1318
 msgid "Set"
 msgstr "Nastaviť"
 
-#: src/actions.cpp:1367
+#: src/actions.cpp:1390
 msgid "Del"
 msgstr "Vymazať"
 
-#: src/actions.cpp:1399
+#: src/actions.cpp:1422
 msgid "Reg "
 msgstr "Reg "
 
-#: src/actions.cpp:1483
+#: src/actions.cpp:1506
 msgid "Timestamp of metadatum with key"
 msgstr "Časová známka metadáta s kľúčom"
 
-#: src/actions.cpp:1484
+#: src/actions.cpp:1507
 msgid "not set\n"
 msgstr "nenastavené\n"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "Adjusting"
 msgstr "Dolaďuje sa"
 
-#: src/actions.cpp:1489
+#: src/actions.cpp:1512
 msgid "by"
 msgstr "Autor"
 
-#: src/actions.cpp:1493 src/actions.cpp:1542
+#: src/actions.cpp:1516 src/actions.cpp:1565
 msgid "years"
 msgstr "rokov"
 
-#: src/actions.cpp:1496
+#: src/actions.cpp:1519
 msgid "year"
 msgstr "rok"
 
-#: src/actions.cpp:1504
+#: src/actions.cpp:1527
 msgid "months"
 msgstr "mesiacov"
 
-#: src/actions.cpp:1507
+#: src/actions.cpp:1530
 msgid "month"
 msgstr "mesiac"
 
-#: src/actions.cpp:1515
+#: src/actions.cpp:1538
 msgid "days"
 msgstr "dní"
 
-#: src/actions.cpp:1518
+#: src/actions.cpp:1541
 msgid "day"
 msgstr "deň"
 
-#: src/actions.cpp:1524
+#: src/actions.cpp:1547
 msgid "s"
 msgstr "s"
 
-#: src/actions.cpp:1540
+#: src/actions.cpp:1563
 msgid "Can't adjust timestamp by"
 msgstr "Nie je možné upraviť časovú známku o"
 
-#: src/actions.cpp:1549 src/actions.cpp:1740 src/actions.cpp:1763
-#: src/actions.cpp:1771 src/actions.cpp:1780 src/actions.cpp:1949
+#: src/actions.cpp:1572 src/actions.cpp:1848 src/actions.cpp:1856
+#: src/actions.cpp:1864 src/actions.cpp:1873 src/actions.cpp:1982
 msgid "to"
 msgstr "až"
 
-#: src/actions.cpp:1584
+#: src/actions.cpp:1607
 msgid "Standard Exif ISO tag exists; not modified\n"
 msgstr "Štandardný EXIF ISO značka už existuje; nebude sa meniť\n"
 
-#: src/actions.cpp:1592
+#: src/actions.cpp:1615
 msgid "Setting Exif ISO value to"
 msgstr "Nastavuje sa hodnota EXIF ISO na"
 
-#: src/actions.cpp:1739
+#: src/actions.cpp:1671
+#, fuzzy
+msgid "No Exif user comment found"
+msgstr "Komentár EXIF"
+
+#: src/actions.cpp:1679
+msgid "Found Exif user comment with unexpected value type"
+msgstr ""
+
+#: src/actions.cpp:1686
+msgid "No Exif UNICODE user comment found"
+msgstr ""
+
+#: src/actions.cpp:1692
+#, fuzzy
+msgid "Setting Exif UNICODE user comment to"
+msgstr "Nastavuje sa hodnota EXIF ISO na"
+
+#: src/actions.cpp:1847
 msgid "Writing Exif data from"
 msgstr "Zapisujú sa EXIF údaje z"
 
-#: src/actions.cpp:1762
+#: src/actions.cpp:1855
 msgid "Writing IPTC data from"
 msgstr "Zápis IPTC dát od"
 
-#: src/actions.cpp:1770
+#: src/actions.cpp:1863
 msgid "Writing XMP data from"
 msgstr "Zápis XMP dát od"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1872
 msgid "Writing JPEG comment from"
 msgstr "Zápis JPEG komentára od"
 
-#: src/actions.cpp:1789
+#: src/actions.cpp:1882
 msgid "Could not write metadata to file"
 msgstr "Nepodarilo sa zapísať metadáta do súboru"
 
-#: src/actions.cpp:1875
+#: src/actions.cpp:1908
 msgid "Filename format yields empty filename for the file"
 msgstr "Formát názvu súboru dáva prázdny názov súboru"
 
-#: src/actions.cpp:1884
+#: src/actions.cpp:1917
 msgid "This file already has the correct name"
 msgstr "Tento súbor už má správny názov"
 
-#: src/actions.cpp:1908 src/exiv2.cpp:162
+#: src/actions.cpp:1941 src/exiv2.cpp:168
 msgid "File"
 msgstr "Súbor"
 
-#: src/actions.cpp:1909
+#: src/actions.cpp:1942
 msgid "exists. [O]verwrite, [r]ename or [s]kip?"
 msgstr "existuje. [P]repísať, p[r]emenovať alebo pre[s]kočiť?"
 
-#: src/actions.cpp:1937
+#: src/actions.cpp:1970
 msgid "Renaming file to"
 msgstr "Súbor sa premenúva na"
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1972
 msgid "updating timestamp"
 msgstr "aktualizuje sa časová známka"
 
-#: src/actions.cpp:1948
+#: src/actions.cpp:1981
 msgid "Failed to rename"
 msgstr "Nepodarilo sa premenovať"
 
-#: src/actions.cpp:1970
+#: src/actions.cpp:2003
 msgid "Overwrite"
 msgstr "Prepísať"
 
-#: src/canonmn.cpp:60
+#: src/canonmn.cpp:58 src/canonmn.cpp:186 src/canonmn.cpp:245
+#: src/canonmn.cpp:260 src/canonmn.cpp:716 src/canonmn.cpp:729
+#: src/canonmn.cpp:991 src/canonmn.cpp:1014 src/canonmn.cpp:1023
+#: src/fujimn.cpp:56 src/fujimn.cpp:102 src/fujimn.cpp:140
+#: src/minoltamn.cpp:84 src/minoltamn.cpp:213 src/minoltamn.cpp:270
+#: src/minoltamn.cpp:1134 src/minoltamn.cpp:1275 src/minoltamn.cpp:1337
+#: src/minoltamn.cpp:1910 src/minoltamn.cpp:1924 src/minoltamn.cpp:1972
+#: src/nikonmn.cpp:62 src/nikonmn.cpp:68 src/nikonmn.cpp:76
+#: src/nikonmn.cpp:204 src/nikonmn.cpp:640 src/nikonmn.cpp:665
+#: src/nikonmn.cpp:728 src/nikonmn.cpp:814 src/nikonmn.cpp:859
+#: src/nikonmn.cpp:946 src/nikonmn.cpp:1188 src/nikonmn.cpp:1197
+#: src/olympusmn.cpp:59 src/olympusmn.cpp:79 src/olympusmn.cpp:86
+#: src/olympusmn.cpp:501 src/olympusmn.cpp:529 src/olympusmn.cpp:540
+#: src/olympusmn.cpp:557 src/olympusmn.cpp:586 src/olympusmn.cpp:648
+#: src/olympusmn.cpp:912 src/olympusmn.cpp:1133 src/olympusmn.cpp:1431
+#: src/olympusmn.cpp:1432 src/olympusmn.cpp:1471 src/panasonicmn.cpp:87
+#: src/panasonicmn.cpp:94 src/panasonicmn.cpp:100 src/panasonicmn.cpp:145
+#: src/panasonicmn.cpp:154 src/panasonicmn.cpp:183 src/panasonicmn.cpp:210
+#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:292 src/pentaxmn.cpp:713
+#: src/pentaxmn.cpp:719 src/sonymn.cpp:56 src/sonymn.cpp:87 src/sonymn.cpp:141
+#: src/sonymn.cpp:149 src/sonymn.cpp:156 src/sonymn.cpp:199 src/sonymn.cpp:206
+#: src/sonymn.cpp:237 src/sonymn.cpp:500
+msgid "Off"
+msgstr "vypnutý"
+
+#: src/canonmn.cpp:59 src/canonmn.cpp:244 src/canonmn.cpp:262
+#: src/canonmn.cpp:717 src/canonmn.cpp:1017 src/fujimn.cpp:57
+#: src/fujimn.cpp:101 src/fujimn.cpp:141 src/minoltamn.cpp:85
+#: src/minoltamn.cpp:1911 src/minoltamn.cpp:1923 src/nikonmn.cpp:63
+#: src/nikonmn.cpp:639 src/nikonmn.cpp:1198 src/olympusmn.cpp:60
+#: src/olympusmn.cpp:80 src/olympusmn.cpp:87 src/olympusmn.cpp:502
+#: src/olympusmn.cpp:530 src/olympusmn.cpp:1472 src/panasonicmn.cpp:93
+#: src/pentaxmn.cpp:186 src/pentaxmn.cpp:293 src/pentaxmn.cpp:714
+#: src/sonymn.cpp:157 src/sonymn.cpp:207 src/sonymn.cpp:238
+msgid "On"
+msgstr "zapnutý"
+
+#: src/canonmn.cpp:69
 msgid "PowerShot A30"
 msgstr "PowerShot A30"
 
-#: src/canonmn.cpp:61
+#: src/canonmn.cpp:70
 msgid "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 msgstr "PowerShot S300 / Digital IXUS 300 / IXY Digital 300"
 
-#: src/canonmn.cpp:62
+#: src/canonmn.cpp:71
 msgid "PowerShot A20"
 msgstr "PowerShot A20"
 
-#: src/canonmn.cpp:63
+#: src/canonmn.cpp:72
 msgid "PowerShot A10"
 msgstr "PowerShot A10"
 
-#: src/canonmn.cpp:64
+#: src/canonmn.cpp:73
 msgid "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 msgstr "PowerShot S110 / Digital IXUS v / IXY Digital 200"
 
-#: src/canonmn.cpp:65
+#: src/canonmn.cpp:74
 msgid "PowerShot G2"
 msgstr "PowerShot G2"
 
-#: src/canonmn.cpp:66
+#: src/canonmn.cpp:75
 msgid "PowerShot S40"
 msgstr "PowerShot S40"
 
-#: src/canonmn.cpp:67
+#: src/canonmn.cpp:76
 msgid "PowerShot S30"
 msgstr "PowerShot S30"
 
-#: src/canonmn.cpp:68
+#: src/canonmn.cpp:77
 msgid "PowerShot A40"
 msgstr "PowerShot A40"
 
-#: src/canonmn.cpp:69
+#: src/canonmn.cpp:78
 msgid "EOS D30"
 msgstr "EOS D30"
 
-#: src/canonmn.cpp:70
+#: src/canonmn.cpp:79
 msgid "PowerShot A100"
 msgstr "PowerShot A100"
 
-#: src/canonmn.cpp:71
+#: src/canonmn.cpp:80
 msgid "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 msgstr "PowerShot S200 / Digital IXUS v2 / IXY Digital 200a"
 
-#: src/canonmn.cpp:72
+#: src/canonmn.cpp:81
 msgid "PowerShot A200"
 msgstr "PowerShot A200"
 
-#: src/canonmn.cpp:73
+#: src/canonmn.cpp:82
 msgid "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 msgstr "PowerShot S330 / Digital IXUS 330 / IXY Digital 300a"
 
-#: src/canonmn.cpp:74
+#: src/canonmn.cpp:83
 msgid "PowerShot G3"
 msgstr "PowerShot G3"
 
-#: src/canonmn.cpp:75
+#: src/canonmn.cpp:84
 msgid "PowerShot S45"
 msgstr "PowerShot S45"
 
-#: src/canonmn.cpp:76
+#: src/canonmn.cpp:85
 msgid "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 msgstr "PowerShot SD100 / Digital IXUS II / IXY Digital 30"
 
-#: src/canonmn.cpp:77
+#: src/canonmn.cpp:86
 msgid "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 msgstr "PowerShot S230 / Digital IXUS v3 / IXY Digital 320"
 
-#: src/canonmn.cpp:78
+#: src/canonmn.cpp:87
 msgid "PowerShot A70"
 msgstr "PowerShot A70"
 
-#: src/canonmn.cpp:79
+#: src/canonmn.cpp:88
 msgid "PowerShot A60"
 msgstr "PowerShot A60"
 
-#: src/canonmn.cpp:80
+#: src/canonmn.cpp:89
 msgid "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 msgstr "PowerShot S400 / Digital IXUS 400 / IXY Digital 400"
 
-#: src/canonmn.cpp:81
+#: src/canonmn.cpp:90
 msgid "PowerShot G5"
 msgstr "PowerShot G5"
 
-#: src/canonmn.cpp:82
+#: src/canonmn.cpp:91
 msgid "PowerShot A300"
 msgstr "PowerShot A300"
 
-#: src/canonmn.cpp:83
+#: src/canonmn.cpp:92
 msgid "PowerShot S50"
 msgstr "PowerShot S50"
 
-#: src/canonmn.cpp:84
+#: src/canonmn.cpp:93
 msgid "PowerShot A80"
 msgstr "PowerShot A80"
 
-#: src/canonmn.cpp:85
+#: src/canonmn.cpp:94
 msgid "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 msgstr "PowerShot SD10 / Digital IXUS i / IXY Digital L"
 
-#: src/canonmn.cpp:86
+#: src/canonmn.cpp:95
 msgid "PowerShot S1 IS"
 msgstr "PowerShot S1 IS"
 
-#: src/canonmn.cpp:87
+#: src/canonmn.cpp:96
 msgid "PowerShot Pro1"
 msgstr "PowerShot Pro1"
 
-#: src/canonmn.cpp:88
+#: src/canonmn.cpp:97
 msgid "PowerShot S70"
 msgstr "PowerShot S70"
 
-#: src/canonmn.cpp:89
+#: src/canonmn.cpp:98
 msgid "PowerShot S60"
 msgstr "PowerShot S60"
 
-#: src/canonmn.cpp:90
+#: src/canonmn.cpp:99
 msgid "PowerShot G6"
 msgstr "PowerShot G6"
 
-#: src/canonmn.cpp:91
+#: src/canonmn.cpp:100
 msgid "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 msgstr "PowerShot S500 / Digital IXUS 500 / IXY Digital 500"
 
-#: src/canonmn.cpp:92
+#: src/canonmn.cpp:101
 msgid "PowerShot A75"
 msgstr "PowerShot A75"
 
-#: src/canonmn.cpp:93
+#: src/canonmn.cpp:102
 msgid "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 msgstr "PowerShot SD110 / Digital IXUS IIs / IXY Digital 30a"
 
-#: src/canonmn.cpp:94
+#: src/canonmn.cpp:103
 msgid "PowerShot A400"
 msgstr "PowerShot A400"
 
-#: src/canonmn.cpp:95
+#: src/canonmn.cpp:104
 msgid "PowerShot A310"
 msgstr "PowerShot A310"
 
-#: src/canonmn.cpp:96
+#: src/canonmn.cpp:105
 msgid "PowerShot A85"
 msgstr "PowerShot A85"
 
-#: src/canonmn.cpp:97
+#: src/canonmn.cpp:106
 msgid "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 msgstr "PowerShot S410 / Digital IXUS 430 / IXY Digital 450"
 
-#: src/canonmn.cpp:98
+#: src/canonmn.cpp:107
 msgid "PowerShot A95"
 msgstr "PowerShot A95"
 
-#: src/canonmn.cpp:99
+#: src/canonmn.cpp:108
 msgid "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 msgstr "PowerShot SD300 / Digital IXUS 40 / IXY Digital 50"
 
-#: src/canonmn.cpp:100
+#: src/canonmn.cpp:109
 msgid "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 msgstr "PowerShot SD200 / Digital IXUS 30 / IXY Digital 40"
 
-#: src/canonmn.cpp:101
+#: src/canonmn.cpp:110
 msgid "PowerShot A520"
 msgstr "PowerShot A520"
 
-#: src/canonmn.cpp:102
+#: src/canonmn.cpp:111
 msgid "PowerShot A510"
 msgstr "PowerShot A510"
 
-#: src/canonmn.cpp:103
+#: src/canonmn.cpp:112
 msgid "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 msgstr "PowerShot SD20 / Digital IXUS i5 / IXY Digital L2"
 
-#: src/canonmn.cpp:104
+#: src/canonmn.cpp:113
 msgid "PowerShot S2 IS"
 msgstr "PowerShot S2 IS"
 
-#: src/canonmn.cpp:105
+#: src/canonmn.cpp:114
 msgid "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 msgstr "PowerShot SD430 / IXUS Wireless / IXY Wireless"
 
-#: src/canonmn.cpp:106
+#: src/canonmn.cpp:115
 msgid "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 msgstr "PowerShot SD500 / Digital IXUS 700 / IXY Digital 600"
 
-#: src/canonmn.cpp:107
+#: src/canonmn.cpp:116
 msgid "EOS D60"
 msgstr "EOS D60"
 
-#: src/canonmn.cpp:108
+#: src/canonmn.cpp:117
 msgid "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 msgstr "PowerShot SD30 / Digital IXUS i zoom / IXY Digital L3"
 
-#: src/canonmn.cpp:109
+#: src/canonmn.cpp:118
 msgid "PowerShot A430"
 msgstr "PowerShot A430"
 
-#: src/canonmn.cpp:110
+#: src/canonmn.cpp:119
 msgid "PowerShot A410"
 msgstr "PowerShot A410"
 
-#: src/canonmn.cpp:111
+#: src/canonmn.cpp:120
 msgid "PowerShot S80"
 msgstr "PowerShot S80"
 
-#: src/canonmn.cpp:112
+#: src/canonmn.cpp:121
 msgid "PowerShot A620"
 msgstr "PowerShot A620"
 
-#: src/canonmn.cpp:113
+#: src/canonmn.cpp:122
 msgid "PowerShot A610"
 msgstr "PowerShot A610"
 
-#: src/canonmn.cpp:114
+#: src/canonmn.cpp:123
 msgid "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 msgstr "PowerShot SD630 / Digital IXUS 65 / IXY Digital 80"
 
-#: src/canonmn.cpp:115
+#: src/canonmn.cpp:124
 msgid "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 msgstr "PowerShot SD450 / Digital IXUS 55 / IXY Digital 60"
 
-#: src/canonmn.cpp:116
+#: src/canonmn.cpp:125
 msgid "PowerShot TX1"
 msgstr "PowerShot TX1"
 
-#: src/canonmn.cpp:117
+#: src/canonmn.cpp:126
 msgid "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 msgstr "PowerShot SD400 / Digital IXUS 50 / IXY Digital 55"
 
-#: src/canonmn.cpp:118
+#: src/canonmn.cpp:127
 msgid "PowerShot A420"
 msgstr "PowerShot A420"
 
-#: src/canonmn.cpp:119
+#: src/canonmn.cpp:128
 msgid "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 msgstr "PowerShot SD900 / Digital IXUS 900 Ti / IXY Digital 1000"
 
-#: src/canonmn.cpp:120
+#: src/canonmn.cpp:129
 msgid "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 msgstr "PowerShot SD550 / Digital IXUS 750 / IXY Digital 700"
 
-#: src/canonmn.cpp:121
+#: src/canonmn.cpp:130
 msgid "PowerShot A700"
 msgstr "PowerShot A700"
 
-#: src/canonmn.cpp:122
+#: src/canonmn.cpp:131
 msgid "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 msgstr "PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS"
 
-#: src/canonmn.cpp:123
+#: src/canonmn.cpp:132
 msgid "PowerShot S3 IS"
 msgstr "PowerShot S3 IS"
 
-#: src/canonmn.cpp:124
+#: src/canonmn.cpp:133
 msgid "PowerShot A540"
 msgstr "PowerShot A540"
 
-#: src/canonmn.cpp:125
+#: src/canonmn.cpp:134
 msgid "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 msgstr "PowerShot SD600 / Digital IXUS 60 / IXY Digital 70"
 
-#: src/canonmn.cpp:126
+#: src/canonmn.cpp:135
 msgid "PowerShot G7"
 msgstr "PowerShot G7"
 
-#: src/canonmn.cpp:127
+#: src/canonmn.cpp:136
 msgid "PowerShot A530"
 msgstr "PowerShot A530"
 
-#: src/canonmn.cpp:128
+#: src/canonmn.cpp:137
 msgid "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 msgstr "PowerShot SD800 IS / Digital IXUS 850 IS / IXY Digital 900 IS"
 
-#: src/canonmn.cpp:129
+#: src/canonmn.cpp:138
 msgid "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 msgstr "PowerShot SD40 / Digital IXUS i7 / IXY Digital L4"
 
-#: src/canonmn.cpp:130
+#: src/canonmn.cpp:139
 msgid "PowerShot A710 IS"
 msgstr "PowerShot A710 IS"
 
-#: src/canonmn.cpp:131
+#: src/canonmn.cpp:140
 msgid "PowerShot A640"
 msgstr "PowerShot A640"
 
-#: src/canonmn.cpp:132
+#: src/canonmn.cpp:141
 msgid "PowerShot A630"
 msgstr "PowerShot A630"
 
-#: src/canonmn.cpp:133
+#: src/canonmn.cpp:142
 msgid "PowerShot S5 IS"
 msgstr "PowerShot S5 IS"
 
-#: src/canonmn.cpp:134
+#: src/canonmn.cpp:143
 msgid "PowerShot A460"
 msgstr "PowerShot A460"
 
-#: src/canonmn.cpp:135
+#: src/canonmn.cpp:144
 msgid "PowerShot SD850 IS / Digital IXUS 950 IS"
 msgstr "PowerShot SD850 IS / Digital IXUS 950 IS"
 
-#: src/canonmn.cpp:136
+#: src/canonmn.cpp:145
 msgid "PowerShot A570 IS"
 msgstr "PowerShot A570 IS"
 
-#: src/canonmn.cpp:137
+#: src/canonmn.cpp:146
 msgid "PowerShot A560"
 msgstr "PowerShot A560"
 
-#: src/canonmn.cpp:138
+#: src/canonmn.cpp:147
 msgid "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 msgstr "PowerShot SD750 / Digital IXUS 75 / IXY Digital 90"
 
-#: src/canonmn.cpp:139
+#: src/canonmn.cpp:148
 msgid "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 msgstr "PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10"
 
-#: src/canonmn.cpp:140
+#: src/canonmn.cpp:149
 msgid "PowerShot A550"
 msgstr "PowerShot A550"
 
-#: src/canonmn.cpp:141
+#: src/canonmn.cpp:150
 msgid "PowerShot A450"
 msgstr "PowerShot A450"
 
-#: src/canonmn.cpp:142
+#: src/canonmn.cpp:151
 msgid "PowerShot Pro90 IS"
 msgstr "PowerShot Pro90 IS"
 
-#: src/canonmn.cpp:143
+#: src/canonmn.cpp:152
 msgid "PowerShot G1"
 msgstr "PowerShot G1"
 
-#: src/canonmn.cpp:144
+#: src/canonmn.cpp:153
 msgid "PowerShot S100 / Digital IXUS / IXY Digital"
 msgstr "PowerShot S100 / Digital IXUS / IXY Digital"
 
-#: src/canonmn.cpp:145
+#: src/canonmn.cpp:154
 msgid "HV10"
 msgstr "HV10"
 
-#: src/canonmn.cpp:146
+#: src/canonmn.cpp:155
 msgid "iVIS DC50"
 msgstr "iVIS DC50"
 
-#: src/canonmn.cpp:147
+#: src/canonmn.cpp:156
 msgid "iVIS HV20"
 msgstr "iVIS HV20"
 
-#: src/canonmn.cpp:148
+#: src/canonmn.cpp:157
 msgid "EOS-1D"
 msgstr "EOS-1D"
 
-#: src/canonmn.cpp:149
+#: src/canonmn.cpp:158
 msgid "EOS-1DS"
 msgstr "EOS-1DS"
 
-#: src/canonmn.cpp:150
+#: src/canonmn.cpp:159
 msgid "EOS 10D"
 msgstr "EOS 10D"
 
-#: src/canonmn.cpp:151
+#: src/canonmn.cpp:160
 msgid "EOS-1D Mark III"
 msgstr "EOS-1D Mark III"
 
-#: src/canonmn.cpp:152
+#: src/canonmn.cpp:161
 msgid "EOS Digital Rebel / 300D / Kiss Digital"
 msgstr "EOS Digital Rebel / 300D / Kiss Digital"
 
-#: src/canonmn.cpp:153
+#: src/canonmn.cpp:162
 msgid "EOS-1D Mark II"
 msgstr "EOS-1D Mark II"
 
-#: src/canonmn.cpp:154
+#: src/canonmn.cpp:163
 msgid "EOS 20D"
 msgstr "EOS 20D"
 
-#: src/canonmn.cpp:155
+#: src/canonmn.cpp:164
 msgid "EOS-1Ds Mark II"
 msgstr "EOS-1Ds Mark II"
 
-#: src/canonmn.cpp:156
+#: src/canonmn.cpp:165
 msgid "EOS Digital Rebel XT / 350D / Kiss Digital N"
 msgstr "EOS Digital Rebel XT / 350D / Kiss Digital N"
 
-#: src/canonmn.cpp:157
+#: src/canonmn.cpp:166
 msgid "EOS 5D"
 msgstr "EOS 5D"
 
-#: src/canonmn.cpp:158
+#: src/canonmn.cpp:167
 msgid "EOS-1D Mark II N"
 msgstr "EOS-1D Mark II N"
 
-#: src/canonmn.cpp:159
+#: src/canonmn.cpp:168
 msgid "EOS 30D"
 msgstr "EOS 30D"
 
-#: src/canonmn.cpp:160
+#: src/canonmn.cpp:169
 msgid "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
 
-#: src/canonmn.cpp:165 src/canonmn.cpp:168 src/canonmn.cpp:176
-#: src/canonmn.cpp:181 src/canonmn.cpp:182 src/canonmn.cpp:183
-#: src/canonmn.cpp:658 src/canonmn.cpp:660 src/canonmn.cpp:661
-#: src/canonmn.cpp:673 src/canonmn.cpp:676 src/canonmn.cpp:677
-#: src/canonmn.cpp:682 src/canonmn.cpp:683 src/canonmn.cpp:690
-#: src/canonmn.cpp:691 src/canonmn.cpp:693 src/canonmn.cpp:755
-#: src/canonmn.cpp:757 src/canonmn.cpp:760 src/canonmn.cpp:762
-#: src/canonmn.cpp:764 src/canonmn.cpp:765 src/canonmn.cpp:766
-#: src/canonmn.cpp:767 src/canonmn.cpp:770 src/canonmn.cpp:771
-#: src/canonmn.cpp:772 src/canonmn.cpp:774 src/canonmn.cpp:777
-#: src/canonmn.cpp:778 src/canonmn.cpp:779 src/canonmn.cpp:780
-#: src/fujimn.cpp:209 src/fujimn.cpp:218 src/fujimn.cpp:227
-#: src/nikonmn.cpp:226 src/nikonmn.cpp:291 src/nikonmn.cpp:445
-#: src/nikonmn.cpp:466 src/nikonmn.cpp:475 src/nikonmn.cpp:521
-#: src/nikonmn.cpp:532 src/nikonmn.cpp:572 src/nikonmn.cpp:575
-#: src/nikonmn.cpp:578 src/nikonmn.cpp:1232 src/nikonmn.cpp:2041
-#: src/olympusmn.cpp:182 src/olympusmn.cpp:188 src/olympusmn.cpp:191
-#: src/olympusmn.cpp:233 src/olympusmn.cpp:236 src/olympusmn.cpp:263
-#: src/olympusmn.cpp:266 src/olympusmn.cpp:272 src/olympusmn.cpp:281
-#: src/olympusmn.cpp:287 src/olympusmn.cpp:290 src/olympusmn.cpp:293
-#: src/olympusmn.cpp:296 src/olympusmn.cpp:299 src/olympusmn.cpp:302
-#: src/olympusmn.cpp:305 src/olympusmn.cpp:308 src/olympusmn.cpp:314
-#: src/olympusmn.cpp:317 src/olympusmn.cpp:350 src/olympusmn.cpp:353
-#: src/olympusmn.cpp:356 src/olympusmn.cpp:359 src/olympusmn.cpp:955
-#: src/panasonicmn.cpp:233 src/panasonicmn.cpp:241 src/panasonicmn.cpp:246
-#: src/panasonicmn.cpp:254 src/panasonicmn.cpp:256 src/panasonicmn.cpp:274
-#: src/pentaxmn.cpp:267 src/properties.cpp:779 src/properties.cpp:786
-#: src/sonymn.cpp:52 src/sonymn.cpp:55 src/sonymn.cpp:58 src/sonymn.cpp:61
-#: src/sonymn.cpp:64 src/sonymn.cpp:67 src/sonymn.cpp:70 src/sonymn.cpp:73
-#: src/sonymn.cpp:76 src/tags.cpp:1049 src/tags.cpp:1061 src/tags.cpp:1166
-#: src/tags.cpp:2472 src/tags.cpp:2588
+#: src/canonmn.cpp:170
+#, fuzzy
+msgid "EOS 7D"
+msgstr "EOS 5D"
+
+#: src/canonmn.cpp:171
+#, fuzzy
+msgid "EOS Rebel T1i / 500D / Kiss X3"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
+
+#: src/canonmn.cpp:172
+#, fuzzy
+msgid "EOS Rebel XS / 1000D / Kiss F"
+msgstr "EOS Digital Rebel / 300D / Kiss Digital"
+
+#: src/canonmn.cpp:173
+#, fuzzy
+msgid "EOS 50D"
+msgstr "EOS 5D"
+
+#: src/canonmn.cpp:174
+#, fuzzy
+msgid "EOS Rebel T2i / 550D / Kiss X4"
+msgstr "EOS Digital Rebel XTi / 400D / Kiss Digital X"
+
+#: src/canonmn.cpp:175
+#, fuzzy
+msgid "EOS-1D Mark IV"
+msgstr "EOS-1D Mark II"
+
+#: src/canonmn.cpp:180
+#, fuzzy
+msgid "Format 1"
+msgstr "Formát"
+
+#: src/canonmn.cpp:181
+#, fuzzy
+msgid "Format 2"
+msgstr "Formát"
+
+#: src/canonmn.cpp:187 src/nikonmn.cpp:1189
+#, fuzzy
+msgid "On (1)"
+msgstr "zapnutý"
+
+#: src/canonmn.cpp:188 src/nikonmn.cpp:1190
+#, fuzzy
+msgid "On (2)"
+msgstr "zapnutý"
+
+#: src/canonmn.cpp:193 src/minoltamn.cpp:1142 src/nikonmn.cpp:136
+#: src/olympusmn.cpp:595 src/olympusmn.cpp:774 src/olympusmn.cpp:839
+#: src/pentaxmn.cpp:548 src/tags.cpp:1274
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/canonmn.cpp:194 src/canonmn.cpp:1095 src/minoltamn.cpp:359
+#: src/minoltamn.cpp:729 src/minoltamn.cpp:905 src/minoltamn.cpp:954
+#: src/minoltamn.cpp:1143 src/nikonmn.cpp:137 src/olympusmn.cpp:596
+#: src/olympusmn.cpp:775 src/olympusmn.cpp:840 src/pentaxmn.cpp:549
+#: src/sonymn.cpp:482 src/sonymn.cpp:507 src/tags.cpp:1275
+msgid "Adobe RGB"
+msgstr "Adobe RGB"
+
+#: src/canonmn.cpp:199 src/canonmn.cpp:202 src/canonmn.cpp:227
+#: src/canonmn.cpp:228 src/canonmn.cpp:229 src/canonmn.cpp:763
+#: src/canonmn.cpp:765 src/canonmn.cpp:766 src/canonmn.cpp:778
+#: src/canonmn.cpp:787 src/canonmn.cpp:788 src/canonmn.cpp:795
+#: src/canonmn.cpp:865 src/canonmn.cpp:870 src/canonmn.cpp:872
+#: src/canonmn.cpp:874 src/canonmn.cpp:875 src/canonmn.cpp:876
+#: src/canonmn.cpp:877 src/canonmn.cpp:880 src/canonmn.cpp:881
+#: src/canonmn.cpp:882 src/canonmn.cpp:884 src/canonmn.cpp:888
+#: src/canonmn.cpp:889 src/canonmn.cpp:890 src/fujimn.cpp:214
+#: src/fujimn.cpp:223 src/fujimn.cpp:232 src/nikonmn.cpp:238
+#: src/nikonmn.cpp:303 src/nikonmn.cpp:457 src/nikonmn.cpp:478
+#: src/nikonmn.cpp:487 src/nikonmn.cpp:533 src/nikonmn.cpp:585
+#: src/nikonmn.cpp:588 src/nikonmn.cpp:591 src/nikonmn.cpp:981
+#: src/nikonmn.cpp:1003 src/nikonmn.cpp:1473 src/nikonmn.cpp:2515
+#: src/olympusmn.cpp:186 src/olympusmn.cpp:325 src/olympusmn.cpp:328
+#: src/olympusmn.cpp:334 src/olympusmn.cpp:349 src/olympusmn.cpp:352
+#: src/olympusmn.cpp:355 src/olympusmn.cpp:358 src/olympusmn.cpp:361
+#: src/olympusmn.cpp:364 src/olympusmn.cpp:367 src/olympusmn.cpp:370
+#: src/olympusmn.cpp:376 src/olympusmn.cpp:379 src/olympusmn.cpp:412
+#: src/olympusmn.cpp:415 src/olympusmn.cpp:418 src/olympusmn.cpp:421
+#: src/olympusmn.cpp:1039 src/panasonicmn.cpp:239 src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:252 src/panasonicmn.cpp:260 src/panasonicmn.cpp:262
+#: src/panasonicmn.cpp:280 src/pentaxmn.cpp:323 src/properties.cpp:795
+#: src/properties.cpp:802 src/sonymn.cpp:293 src/sonymn.cpp:312
+#: src/sonymn.cpp:318 src/sonymn.cpp:321 src/sonymn.cpp:330 src/sonymn.cpp:333
+#: src/sonymn.cpp:336 src/sonymn.cpp:339 src/tags.cpp:1236 src/tags.cpp:1249
+#: src/tags.cpp:1355 src/tags.cpp:2389 src/tags.cpp:2502
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: src/canonmn.cpp:166 src/olympusmn.cpp:388
+#: src/canonmn.cpp:200 src/olympusmn.cpp:450 src/sonymn.cpp:286
+#: src/sonymn.cpp:287
 msgid "Camera Settings"
 msgstr "Nastavenie fotoaparátu"
 
-#: src/canonmn.cpp:166
+#: src/canonmn.cpp:200
 msgid "Various camera settings"
 msgstr "Rôzne nastavenia fotoaparátu"
 
-#: src/canonmn.cpp:167 src/minoltamn.cpp:658 src/nikonmn.cpp:1085
-#: src/nikonmn.cpp:1110 src/properties.cpp:534 src/tags.cpp:646
-#: src/tags.cpp:1255
+#: src/canonmn.cpp:201 src/minoltamn.cpp:538 src/nikonmn.cpp:1325
+#: src/nikonmn.cpp:1350 src/properties.cpp:550 src/tags.cpp:833
+#: src/tags.cpp:1445
 msgid "Focal Length"
 msgstr "Ohnisková vzdialenosť"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203 src/sonymn.cpp:345
 msgid "Shot Info"
 msgstr "Info o snímke"
 
-#: src/canonmn.cpp:169
+#: src/canonmn.cpp:203
 msgid "Shot information"
 msgstr "Informácie o snímke"
 
-#: src/canonmn.cpp:170 src/olympusmn.cpp:523 src/olympusmn.cpp:1068
+#: src/canonmn.cpp:204 src/olympusmn.cpp:101 src/olympusmn.cpp:1152
+#: src/sonymn.cpp:124 src/sonymn.cpp:308 src/sonymn.cpp:309
 msgid "Panorama"
 msgstr "panoráma"
 
-#: src/canonmn.cpp:171 src/datasets.cpp:396 src/properties.cpp:731
+#: src/canonmn.cpp:205 src/datasets.cpp:396 src/properties.cpp:747
 msgid "Image Type"
 msgstr "Typ obrázka"
 
-#: src/canonmn.cpp:171
+#: src/canonmn.cpp:205
 msgid "Image type"
 msgstr "Typ obrázka"
 
-#: src/canonmn.cpp:172 src/olympusmn.cpp:152 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware Version"
 msgstr "Verzia firmvéru"
 
-#: src/canonmn.cpp:172 src/panasonicmn.cpp:231
+#: src/canonmn.cpp:206 src/panasonicmn.cpp:237
 msgid "Firmware version"
 msgstr "Verzia firmvéru"
 
-#: src/canonmn.cpp:173 src/canonmn.cpp:938
+#: src/canonmn.cpp:207 src/canonmn.cpp:1048 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File Number"
 msgstr "číslo F"
 
-#: src/canonmn.cpp:173
+#: src/canonmn.cpp:207 src/nikonmn.cpp:847
 #, fuzzy
 msgid "File number"
 msgstr "Názov súboru"
 
-#: src/canonmn.cpp:174
+#: src/canonmn.cpp:208
 msgid "Owner Name"
 msgstr "Meno vlastníka"
 
-#: src/canonmn.cpp:175 src/fujimn.cpp:177 src/nikonmn.cpp:537
-#: src/olympusmn.cpp:193 src/olympusmn.cpp:681 src/sigmamn.cpp:54
+#: src/canonmn.cpp:209 src/fujimn.cpp:182 src/nikonmn.cpp:550
+#: src/olympusmn.cpp:741 src/pentaxmn.cpp:1120 src/pentaxmn.cpp:1121
+#: src/sigmamn.cpp:56
 msgid "Serial Number"
 msgstr "Sériové číslo"
 
-#: src/canonmn.cpp:175 src/sigmamn.cpp:55
+#: src/canonmn.cpp:209 src/sigmamn.cpp:57
 msgid "Camera serial number"
 msgstr "Sériové číslo fotoaparátu"
 
-#: src/canonmn.cpp:177
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera Info"
+msgstr "Info o fotoaparáte"
+
+#: src/canonmn.cpp:210
+#, fuzzy
+msgid "Camera info"
+msgstr "Info o fotoaparáte"
+
+#: src/canonmn.cpp:211 src/canonmn.cpp:223
 msgid "Custom Functions"
 msgstr "Vlastné funkcie"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "ModelID"
 msgstr "ID modelu"
 
-#: src/canonmn.cpp:178
+#: src/canonmn.cpp:212
 msgid "Model ID"
 msgstr "ID modelu"
 
-#: src/canonmn.cpp:179 src/olympusmn.cpp:155
+#: src/canonmn.cpp:213 src/olympusmn.cpp:219
 msgid "Picture Info"
 msgstr "Informácie o obrázku"
 
-#: src/canonmn.cpp:179
+#: src/canonmn.cpp:213
 msgid "Picture info"
 msgstr "Informácie o obrázku"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail Image Valid Area"
+msgstr "Náhľad"
+
+#: src/canonmn.cpp:214
+#, fuzzy
+msgid "Thumbnail image valid area"
+msgstr "Náhľad"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial Number Format"
+msgstr "Sériové číslo 1"
+
+#: src/canonmn.cpp:215
+#, fuzzy
+msgid "Serial number format"
+msgstr "Sériové číslo 2"
+
+#: src/canonmn.cpp:216 src/minoltamn.cpp:2042 src/olympusmn.cpp:110
+#: src/olympusmn.cpp:503 src/pentaxmn.cpp:202
+#, fuzzy
+msgid "Super Macro"
+msgstr "super makro"
+
+#: src/canonmn.cpp:216 src/canonmn.cpp:323 src/canonmn.cpp:393
+#: src/olympusmn.cpp:81
+msgid "Super macro"
+msgstr "super makro"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF Info"
+msgstr "Info o AZ"
+
+#: src/canonmn.cpp:217 src/nikonmn.cpp:567
+#, fuzzy
+msgid "AF info"
+msgstr "Info o AZ"
+
+#: src/canonmn.cpp:218
+msgid "Original Decision Data Offset"
+msgstr ""
+
+#: src/canonmn.cpp:218
+msgid "Original decision data offset"
+msgstr ""
+
+#: src/canonmn.cpp:219
 msgid "White Balance Table"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/canonmn.cpp:180
+#: src/canonmn.cpp:219
 msgid "White balance table"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/canonmn.cpp:185
-msgid "Unknown CanonMakerNote tag"
-msgstr "Neznáma značka CanonMakerNote"
+#: src/canonmn.cpp:220
+#, fuzzy
+msgid "LensModel"
+msgstr "Model šošoviek"
 
-#: src/canonmn.cpp:195 src/canonmn.cpp:213 src/canonmn.cpp:635
-#: src/canonmn.cpp:907 src/fujimn.cpp:55 src/fujimn.cpp:97 src/fujimn.cpp:136
-#: src/minoltamn.cpp:92 src/minoltamn.cpp:374 src/minoltamn.cpp:413
-#: src/minoltamn.cpp:868 src/minoltamn.cpp:874 src/minoltamn.cpp:880
-#: src/minoltamn.cpp:1053 src/minoltamn.cpp:1059 src/nikonmn.cpp:61
-#: src/nikonmn.cpp:626 src/nikonmn.cpp:958 src/olympusmn.cpp:57
-#: src/olympusmn.cpp:77 src/olympusmn.cpp:84 src/olympusmn.cpp:440
-#: src/olympusmn.cpp:468 src/panasonicmn.cpp:89 src/pentaxmn.cpp:168
-#: src/pentaxmn.cpp:238 src/pentaxmn.cpp:635
-msgid "On"
-msgstr "zapnutý"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742 src/panasonicmn.cpp:250
+#, fuzzy
+msgid "Internal Serial Number"
+msgstr "Sériové číslo fotoaparátu"
 
-#: src/canonmn.cpp:196 src/canonmn.cpp:211 src/canonmn.cpp:634
-#: src/canonmn.cpp:641 src/canonmn.cpp:881 src/canonmn.cpp:904
-#: src/canonmn.cpp:913 src/fujimn.cpp:54 src/fujimn.cpp:98 src/fujimn.cpp:135
-#: src/minoltamn.cpp:91 src/minoltamn.cpp:373 src/minoltamn.cpp:379
-#: src/minoltamn.cpp:412 src/minoltamn.cpp:867 src/minoltamn.cpp:873
-#: src/minoltamn.cpp:879 src/minoltamn.cpp:1052 src/minoltamn.cpp:1058
-#: src/nikonmn.cpp:60 src/nikonmn.cpp:66 src/nikonmn.cpp:192
-#: src/nikonmn.cpp:627 src/nikonmn.cpp:652 src/nikonmn.cpp:715
-#: src/nikonmn.cpp:948 src/nikonmn.cpp:957 src/olympusmn.cpp:56
-#: src/olympusmn.cpp:76 src/olympusmn.cpp:83 src/olympusmn.cpp:439
-#: src/olympusmn.cpp:467 src/olympusmn.cpp:499 src/olympusmn.cpp:1049
-#: src/panasonicmn.cpp:83 src/panasonicmn.cpp:90 src/panasonicmn.cpp:96
-#: src/panasonicmn.cpp:141 src/panasonicmn.cpp:150 src/panasonicmn.cpp:178
-#: src/panasonicmn.cpp:205 src/pentaxmn.cpp:165 src/pentaxmn.cpp:237
-#: src/pentaxmn.cpp:634 src/pentaxmn.cpp:640
-msgid "Off"
-msgstr "vypnutý"
+#: src/canonmn.cpp:221 src/olympusmn.cpp:742
+#, fuzzy
+msgid "Internal serial number"
+msgstr "Sériové číslo fotoaparátu"
+
+#: src/canonmn.cpp:222
+msgid "Dust Removal Data"
+msgstr ""
 
-#: src/canonmn.cpp:201 src/minoltamn.cpp:78 src/minoltamn.cpp:349
-#: src/minoltamn.cpp:798 src/minoltamn.cpp:1001
+#: src/canonmn.cpp:222
+msgid "Dust removal data"
+msgstr ""
+
+#: src/canonmn.cpp:223
+#, fuzzy
+msgid "Custom functions"
+msgstr "Vlastné funkcie"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing Info"
+msgstr "Softvér použitý na spracovanie"
+
+#: src/canonmn.cpp:224
+#, fuzzy
+msgid "Processing info"
+msgstr "Softvér použitý na spracovanie"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured Color"
+msgstr "Prirodzená farba"
+
+#: src/canonmn.cpp:225
+#, fuzzy
+msgid "Measured color"
+msgstr "Prirodzená farba"
+
+#: src/canonmn.cpp:226
+#, fuzzy
+msgid "ColorSpace"
+msgstr "Farebný priestor"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD Offset"
+msgstr "Ofset"
+
+#: src/canonmn.cpp:230
+#, fuzzy
+msgid "VRD offset"
+msgstr "ofset"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor Info"
+msgstr "Info o šošovkách"
+
+#: src/canonmn.cpp:231
+#, fuzzy
+msgid "Sensor info"
+msgstr "Info o snímke"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color Data"
+msgstr "Matica farieb"
+
+#: src/canonmn.cpp:232
+#, fuzzy
+msgid "Color data"
+msgstr "moje farebné údaje"
+
+#: src/canonmn.cpp:234
+msgid "Unknown CanonMakerNote tag"
+msgstr "Neznáma značka CanonMakerNote"
+
+#: src/canonmn.cpp:250 src/minoltamn.cpp:78 src/minoltamn.cpp:246
+#: src/minoltamn.cpp:677 src/minoltamn.cpp:863 src/minoltamn.cpp:2060
 msgid "Economy"
 msgstr "ekonomický"
 
-#: src/canonmn.cpp:202 src/canonmn.cpp:297 src/fujimn.cpp:62 src/fujimn.cpp:81
-#: src/fujimn.cpp:89 src/minoltamn.cpp:419 src/minoltamn.cpp:796
-#: src/minoltamn.cpp:999 src/nikonmn.cpp:68 src/nikonmn.cpp:195
-#: src/nikonmn.cpp:416 src/olympusmn.cpp:104 src/olympusmn.cpp:112
-#: src/olympusmn.cpp:1024 src/olympusmn.cpp:1066 src/panasonicmn.cpp:54
-#: src/panasonicmn.cpp:97 src/panasonicmn.cpp:157 src/panasonicmn.cpp:192
-#: src/pentaxmn.cpp:180 src/pentaxmn.cpp:287 src/pentaxmn.cpp:298
-#: src/pentaxmn.cpp:309 src/tags.cpp:1152 src/tags.cpp:1159
+#: src/canonmn.cpp:251 src/canonmn.cpp:349 src/fujimn.cpp:64 src/fujimn.cpp:84
+#: src/fujimn.cpp:93 src/minoltamn.cpp:304 src/minoltamn.cpp:675
+#: src/minoltamn.cpp:861 src/nikonmn.cpp:70 src/nikonmn.cpp:78
+#: src/nikonmn.cpp:207 src/nikonmn.cpp:428 src/olympusmn.cpp:150
+#: src/olympusmn.cpp:162 src/olympusmn.cpp:170 src/olympusmn.cpp:1108
+#: src/olympusmn.cpp:1150 src/panasonicmn.cpp:56 src/panasonicmn.cpp:101
+#: src/panasonicmn.cpp:161 src/panasonicmn.cpp:197 src/pentaxmn.cpp:198
+#: src/pentaxmn.cpp:343 src/pentaxmn.cpp:356 src/pentaxmn.cpp:367
+#: src/sonymn.cpp:134 src/sonymn.cpp:216 src/sonymn.cpp:222 src/tags.cpp:1341
+#: src/tags.cpp:1348
 msgid "Normal"
 msgstr "Normálny"
 
-#: src/canonmn.cpp:203 src/minoltamn.cpp:76 src/minoltamn.cpp:347
-#: src/minoltamn.cpp:795 src/minoltamn.cpp:998
+#: src/canonmn.cpp:252 src/minoltamn.cpp:76 src/minoltamn.cpp:244
+#: src/minoltamn.cpp:674 src/minoltamn.cpp:860 src/minoltamn.cpp:2004
+#: src/minoltamn.cpp:2058 src/sonymn.cpp:135
 msgid "Fine"
 msgstr "jemný"
 
-#: src/canonmn.cpp:204 src/olympusmn.cpp:604 src/pentaxmn.cpp:138
+#: src/canonmn.cpp:253 src/olympusmn.cpp:643 src/pentaxmn.cpp:156
 msgid "RAW"
 msgstr "RAW"
 
-#: src/canonmn.cpp:205
+#: src/canonmn.cpp:254
 msgid "Superfine"
 msgstr "superjemný"
 
-#: src/canonmn.cpp:206
+#: src/canonmn.cpp:255
 #, fuzzy
 msgid "Normal Movie"
 msgstr "Bežné spracovanie"
 
-#: src/canonmn.cpp:212 src/canonmn.cpp:305 src/canonmn.cpp:333
-#: src/canonmn.cpp:706 src/canonmn.cpp:908 src/fujimn.cpp:69 src/fujimn.cpp:96
-#: src/fujimn.cpp:104 src/fujimn.cpp:110 src/minoltamn.cpp:321
-#: src/minoltamn.cpp:439 src/minoltamn.cpp:780 src/minoltamn.cpp:803
-#: src/minoltamn.cpp:842 src/minoltamn.cpp:984 src/minoltamn.cpp:1006
-#: src/minoltamn.cpp:1032 src/nikonmn.cpp:433 src/olympusmn.cpp:98
-#: src/olympusmn.cpp:478 src/olympusmn.cpp:516 src/olympusmn.cpp:1112
-#: src/olympusmn.cpp:1118 src/olympusmn.cpp:1119 src/panasonicmn.cpp:62
-#: src/panasonicmn.cpp:74 src/pentaxmn.cpp:55 src/pentaxmn.cpp:191
-#: src/pentaxmn.cpp:256 src/tags.cpp:1038 src/tags.cpp:1122 src/tags.cpp:1129
+#: src/canonmn.cpp:261 src/canonmn.cpp:357 src/canonmn.cpp:385
+#: src/canonmn.cpp:812 src/canonmn.cpp:1018 src/fujimn.cpp:71
+#: src/fujimn.cpp:100 src/fujimn.cpp:109 src/fujimn.cpp:115
+#: src/minoltamn.cpp:218 src/minoltamn.cpp:324 src/minoltamn.cpp:659
+#: src/minoltamn.cpp:682 src/minoltamn.cpp:716 src/minoltamn.cpp:839
+#: src/minoltamn.cpp:868 src/minoltamn.cpp:888 src/minoltamn.cpp:1119
+#: src/minoltamn.cpp:1182 src/minoltamn.cpp:1235 src/minoltamn.cpp:1976
+#: src/minoltamn.cpp:2043 src/minoltamn.cpp:2092 src/nikonmn.cpp:81
+#: src/nikonmn.cpp:445 src/olympusmn.cpp:94 src/olympusmn.cpp:156
+#: src/olympusmn.cpp:559 src/olympusmn.cpp:565 src/olympusmn.cpp:605
+#: src/olympusmn.cpp:1196 src/olympusmn.cpp:1202 src/olympusmn.cpp:1203
+#: src/panasonicmn.cpp:64 src/panasonicmn.cpp:77 src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:311 src/sonymn.cpp:57
+#: src/sonymn.cpp:90 src/sonymn.cpp:105 src/sonymn.cpp:163 src/sonymn.cpp:200
+#: src/sonymn.cpp:499 src/sonymn.cpp:516 src/tags.cpp:1225 src/tags.cpp:1310
+#: src/tags.cpp:1317
 msgid "Auto"
 msgstr "Auto"
 
-#: src/canonmn.cpp:214 src/olympusmn.cpp:470
+#: src/canonmn.cpp:263 src/olympusmn.cpp:532
 msgid "Red-eye"
 msgstr "Červené oči"
 
-#: src/canonmn.cpp:215
+#: src/canonmn.cpp:264
 msgid "Slow sync"
 msgstr "Pomalá synchronizácia"
 
-#: src/canonmn.cpp:216
+#: src/canonmn.cpp:265
 msgid "Auto + red-eye"
 msgstr "auto + korekcia červených očí"
 
-#: src/canonmn.cpp:217
+#: src/canonmn.cpp:266
 msgid "On + red-eye"
 msgstr "zapnutý + korekcia červených očí"
 
-#: src/canonmn.cpp:218 src/olympusmn.cpp:92
+#: src/canonmn.cpp:267 src/canonmn.cpp:268 src/minoltamn.cpp:1339
+#: src/nikonmn.cpp:882 src/olympusmn.cpp:144
 msgid "External"
 msgstr "externý"
 
-#: src/canonmn.cpp:223
+#: src/canonmn.cpp:273
 msgid "Single / timer"
 msgstr "Jednotlivý záber / časovač"
 
-#: src/canonmn.cpp:224 src/canonmn.cpp:238 src/canonmn.cpp:620
-#: src/fujimn.cpp:220 src/minoltamn.cpp:356 src/nikonmn.cpp:139
-#: src/nikonmn.cpp:150 src/pentaxmn.cpp:470
+#: src/canonmn.cpp:274 src/canonmn.cpp:288 src/canonmn.cpp:702
+#: src/fujimn.cpp:225 src/minoltamn.cpp:253 src/minoltamn.cpp:1097
+#: src/minoltamn.cpp:1149 src/nikonmn.cpp:151 src/nikonmn.cpp:162
+#: src/pentaxmn.cpp:534
 msgid "Continuous"
 msgstr "Spojitý"
 
-#: src/canonmn.cpp:225 src/olympusmn.cpp:525
+#: src/canonmn.cpp:275 src/olympusmn.cpp:103
 msgid "Movie"
 msgstr "Film"
 
-#: src/canonmn.cpp:226
+#: src/canonmn.cpp:276
 msgid "Continuous, speed priority"
 msgstr "spojitý, priorita pre rýchlosť"
 
-#: src/canonmn.cpp:227
+#: src/canonmn.cpp:277
 msgid "Continuous, low"
 msgstr "Spojitý, nízky"
 
-#: src/canonmn.cpp:228
+#: src/canonmn.cpp:278
 msgid "Continuous, high"
 msgstr "Spojitý, vysoký"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:233
+#: src/canonmn.cpp:283
 msgid "One shot AF"
 msgstr "automatické zaostrenie pre jeden záber"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:234
+#: src/canonmn.cpp:284
 msgid "AI servo AF"
 msgstr "inteligentné servo zaostrenie"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:235
+#: src/canonmn.cpp:285
 msgid "AI focus AF"
 msgstr "inteligentné zaostrenie"
 
-#: src/canonmn.cpp:236 src/canonmn.cpp:239 src/minoltamn.cpp:494
+#: src/canonmn.cpp:286 src/canonmn.cpp:289 src/minoltamn.cpp:374
 msgid "Manual focus"
 msgstr "Ručné zaostrenie"
 
-#: src/canonmn.cpp:237 src/canonmn.cpp:619 src/minoltamn.cpp:355
+#: src/canonmn.cpp:287 src/canonmn.cpp:701 src/sonymn.cpp:231
 msgid "Single"
 msgstr "Jednotlivý"
 
-#: src/canonmn.cpp:240 src/canonmn.cpp:267 src/canonmn.cpp:340
+#: src/canonmn.cpp:290 src/canonmn.cpp:291 src/canonmn.cpp:318
+#: src/canonmn.cpp:392
 msgid "Pan focus"
 msgstr "posúvať zaostrenie"
 
-#: src/canonmn.cpp:245 src/canonmn.cpp:890 src/minoltamn.cpp:787
-#: src/minoltamn.cpp:990
+#: src/canonmn.cpp:296 src/canonmn.cpp:1000 src/minoltamn.cpp:666
+#: src/minoltamn.cpp:852 src/sonymn.cpp:534
 msgid "Large"
 msgstr "Veľký"
 
-#: src/canonmn.cpp:246 src/canonmn.cpp:891 src/minoltamn.cpp:788
-#: src/minoltamn.cpp:991
+#: src/canonmn.cpp:297 src/canonmn.cpp:744 src/canonmn.cpp:1001
+#: src/minoltamn.cpp:667 src/minoltamn.cpp:853 src/minoltamn.cpp:1222
+#: src/sonymn.cpp:535
 msgid "Medium"
 msgstr "Stredný"
 
-#: src/canonmn.cpp:247 src/canonmn.cpp:892 src/minoltamn.cpp:789
-#: src/minoltamn.cpp:992
+#: src/canonmn.cpp:298 src/canonmn.cpp:1002 src/minoltamn.cpp:668
+#: src/minoltamn.cpp:854 src/minoltamn.cpp:1223 src/sonymn.cpp:536
 msgid "Small"
 msgstr "malý"
 
-#: src/canonmn.cpp:248 src/canonmn.cpp:893
+#: src/canonmn.cpp:299 src/canonmn.cpp:1003
 msgid "Medium 1"
 msgstr "stredný 1"
 
-#: src/canonmn.cpp:249 src/canonmn.cpp:894
+#: src/canonmn.cpp:300 src/canonmn.cpp:1004
 msgid "Medium 2"
 msgstr "stredný 2"
 
-#: src/canonmn.cpp:250 src/canonmn.cpp:895
+#: src/canonmn.cpp:301 src/canonmn.cpp:1005
 msgid "Medium 3"
 msgstr "stredný 3"
 
-#: src/canonmn.cpp:255
+#: src/canonmn.cpp:306
 msgid "Full auto"
 msgstr "Plne automatický"
 
-#: src/canonmn.cpp:256 src/canonmn.cpp:332 src/canonmn.cpp:608
-#: src/fujimn.cpp:105 src/fujimn.cpp:130 src/minoltamn.cpp:308
-#: src/minoltamn.cpp:779 src/minoltamn.cpp:810 src/minoltamn.cpp:818
-#: src/minoltamn.cpp:983 src/minoltamn.cpp:1014 src/olympusmn.cpp:99
-#: src/olympusmn.cpp:420 src/panasonicmn.cpp:66 src/panasonicmn.cpp:69
-#: src/panasonicmn.cpp:75 src/panasonicmn.cpp:107 src/pentaxmn.cpp:57
-#: src/pentaxmn.cpp:183 src/pentaxmn.cpp:261 src/pentaxmn.cpp:438
-#: src/pentaxmn.cpp:450 src/sigmamn.cpp:154 src/tags.cpp:1037
-#: src/tags.cpp:1123 src/tags.cpp:1130
+#: src/canonmn.cpp:307 src/canonmn.cpp:384 src/canonmn.cpp:690
+#: src/canonmn.cpp:1075 src/fujimn.cpp:110 src/fujimn.cpp:135
+#: src/minoltamn.cpp:204 src/minoltamn.cpp:658 src/minoltamn.cpp:689
+#: src/minoltamn.cpp:690 src/minoltamn.cpp:697 src/minoltamn.cpp:838
+#: src/minoltamn.cpp:876 src/minoltamn.cpp:1281 src/nikonmn.cpp:952
+#: src/olympusmn.cpp:157 src/olympusmn.cpp:482 src/olympusmn.cpp:560
+#: src/panasonicmn.cpp:68 src/panasonicmn.cpp:71 src/panasonicmn.cpp:72
+#: src/panasonicmn.cpp:78 src/panasonicmn.cpp:111 src/pentaxmn.cpp:58
+#: src/pentaxmn.cpp:201 src/pentaxmn.cpp:316 src/pentaxmn.cpp:500
+#: src/pentaxmn.cpp:512 src/sigmamn.cpp:157 src/sonymn.cpp:119
+#: src/sonymn.cpp:164 src/sonymn.cpp:460 src/sonymn.cpp:517 src/tags.cpp:1224
+#: src/tags.cpp:1311 src/tags.cpp:1318
 msgid "Manual"
 msgstr "Manuál"
 
 # exif-scenecapturetype-1
-#: src/canonmn.cpp:257 src/fujimn.cpp:112 src/minoltamn.cpp:66
-#: src/olympusmn.cpp:520 src/pentaxmn.cpp:413 src/pentaxmn.cpp:627
-#: src/tags.cpp:1136
+#: src/canonmn.cpp:308 src/canonmn.cpp:1107 src/fujimn.cpp:117
+#: src/minoltamn.cpp:66 src/minoltamn.cpp:846 src/minoltamn.cpp:1887
+#: src/minoltamn.cpp:2039 src/olympusmn.cpp:98 src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:705 src/sonymn.cpp:478 src/sonymn.cpp:527
+#: src/tags.cpp:1324
 msgid "Landscape"
 msgstr "krajinka"
 
-#: src/canonmn.cpp:258
+#: src/canonmn.cpp:309
 msgid "Fast shutter"
 msgstr "rýchla uzávierka"
 
-#: src/canonmn.cpp:259
+#: src/canonmn.cpp:310
 msgid "Slow shutter"
 msgstr "pomalá uzávierka"
 
-#: src/canonmn.cpp:260 src/minoltamn.cpp:68 src/olympusmn.cpp:521
-#: src/pentaxmn.cpp:419
+#: src/canonmn.cpp:311 src/minoltamn.cpp:68 src/minoltamn.cpp:951
+#: src/minoltamn.cpp:2036 src/olympusmn.cpp:99 src/pentaxmn.cpp:478
 msgid "Night Scene"
 msgstr "Nočná scéna"
 
-#: src/canonmn.cpp:261
+#: src/canonmn.cpp:312
 msgid "Gray scale"
 msgstr "Odtiene šedej"
 
-#: src/canonmn.cpp:262 src/canonmn.cpp:645 src/canonmn.cpp:930
-#: src/minoltamn.cpp:61 src/nikonmn.cpp:178 src/nikonmn.cpp:663
-#: src/olympusmn.cpp:576 src/olympusmn.cpp:593 src/olympusmn.cpp:795
-#: src/olympusmn.cpp:810 src/panasonicmn.cpp:145
+#: src/canonmn.cpp:313 src/canonmn.cpp:733 src/canonmn.cpp:1040
+#: src/minoltamn.cpp:61 src/nikonmn.cpp:190 src/nikonmn.cpp:676
+#: src/olympusmn.cpp:615 src/olympusmn.cpp:632 src/olympusmn.cpp:856
+#: src/olympusmn.cpp:871 src/panasonicmn.cpp:149 src/sonymn.cpp:488
 msgid "Sepia"
 msgstr "Sépia"
 
-#: src/canonmn.cpp:263 src/fujimn.cpp:111 src/minoltamn.cpp:63
-#: src/minoltamn.cpp:426 src/olympusmn.cpp:518 src/olympusmn.cpp:574
-#: src/panasonicmn.cpp:98 src/pentaxmn.cpp:412 src/pentaxmn.cpp:626
-#: src/tags.cpp:1137
+#: src/canonmn.cpp:314 src/canonmn.cpp:1093 src/canonmn.cpp:1106
+#: src/fujimn.cpp:116 src/minoltamn.cpp:63 src/minoltamn.cpp:311
+#: src/minoltamn.cpp:842 src/minoltamn.cpp:948 src/minoltamn.cpp:1886
+#: src/minoltamn.cpp:2034 src/olympusmn.cpp:96 src/olympusmn.cpp:613
+#: src/panasonicmn.cpp:102 src/pentaxmn.cpp:471 src/pentaxmn.cpp:704
+#: src/sonymn.cpp:106 src/sonymn.cpp:477 src/sonymn.cpp:523 src/tags.cpp:1325
 msgid "Portrait"
 msgstr "Portrét"
 
-#: src/canonmn.cpp:264 src/fujimn.cpp:113 src/panasonicmn.cpp:100
+#: src/canonmn.cpp:315 src/fujimn.cpp:118 src/minoltamn.cpp:843
+#: src/minoltamn.cpp:2038 src/panasonicmn.cpp:104 src/sonymn.cpp:524
 msgid "Sports"
 msgstr "Športy"
 
-#: src/canonmn.cpp:265
+#: src/canonmn.cpp:316
 msgid "Macro / close-up"
 msgstr "Makro / záber zblízka"
 
-#: src/canonmn.cpp:266 src/fujimn.cpp:144
+#: src/canonmn.cpp:317 src/fujimn.cpp:149
 msgid "Black & white"
 msgstr "Čierna a biela"
 
-#: src/canonmn.cpp:268 src/canonmn.cpp:642 src/olympusmn.cpp:556
-#: src/olympusmn.cpp:571 src/olympusmn.cpp:791 src/panasonicmn.cpp:194
+#: src/canonmn.cpp:319 src/canonmn.cpp:730 src/olympusmn.cpp:134
+#: src/olympusmn.cpp:610 src/olympusmn.cpp:852 src/panasonicmn.cpp:199
+#: src/sonymn.cpp:476 src/sonymn.cpp:506
 msgid "Vivid"
 msgstr "živé"
 
-#: src/canonmn.cpp:269 src/canonmn.cpp:643 src/olympusmn.cpp:582
-#: src/olympusmn.cpp:592 src/olympusmn.cpp:800 src/olympusmn.cpp:809
+#: src/canonmn.cpp:320 src/canonmn.cpp:731 src/canonmn.cpp:1108
+#: src/minoltamn.cpp:1892 src/minoltamn.cpp:1893 src/olympusmn.cpp:621
+#: src/olympusmn.cpp:631 src/olympusmn.cpp:861 src/olympusmn.cpp:870
+#: src/sonymn.cpp:483 src/sonymn.cpp:508
 msgid "Neutral"
 msgstr "Neutrálny"
 
-#: src/canonmn.cpp:270
+#: src/canonmn.cpp:321
 msgid "Flash off"
 msgstr "Blesk vypnutý"
 
-#: src/canonmn.cpp:271
+#: src/canonmn.cpp:322
 msgid "Long shutter"
 msgstr "pomalá uzávierka"
 
-#: src/canonmn.cpp:272 src/canonmn.cpp:341 src/olympusmn.cpp:78
-msgid "Super macro"
-msgstr "super makro"
-
-#: src/canonmn.cpp:273
+#: src/canonmn.cpp:324
 msgid "Foliage"
 msgstr "zeleň"
 
-#: src/canonmn.cpp:274 src/olympusmn.cpp:528
+#: src/canonmn.cpp:325 src/olympusmn.cpp:106
 msgid "Indoor"
 msgstr "vnútri"
 
-#: src/canonmn.cpp:275 src/fujimn.cpp:126 src/olympusmn.cpp:529
-#: src/panasonicmn.cpp:112
+#: src/canonmn.cpp:326 src/fujimn.cpp:131 src/olympusmn.cpp:107
+#: src/panasonicmn.cpp:116 src/sonymn.cpp:117
 msgid "Fireworks"
 msgstr "Ohňostroj"
 
-#: src/canonmn.cpp:276 src/fujimn.cpp:124 src/olympusmn.cpp:551
-#: src/panasonicmn.cpp:124
+#: src/canonmn.cpp:327 src/fujimn.cpp:129 src/olympusmn.cpp:129
+#: src/panasonicmn.cpp:128 src/sonymn.cpp:107
 msgid "Beach"
 msgstr "Pláž"
 
-#: src/canonmn.cpp:277 src/canonmn.cpp:722 src/fujimn.cpp:127
-#: src/panasonicmn.cpp:123
+#: src/canonmn.cpp:328 src/canonmn.cpp:828 src/fujimn.cpp:132
+#: src/panasonicmn.cpp:127 src/sonymn.cpp:122
 msgid "Underwater"
 msgstr "pod vodou"
 
-#: src/canonmn.cpp:278 src/fujimn.cpp:125 src/olympusmn.cpp:552
-#: src/panasonicmn.cpp:114
+#: src/canonmn.cpp:329 src/fujimn.cpp:130 src/olympusmn.cpp:130
+#: src/panasonicmn.cpp:118 src/sonymn.cpp:108
 msgid "Snow"
 msgstr "Sneh"
 
-#: src/canonmn.cpp:279
+#: src/canonmn.cpp:330
 msgid "Kids & pets"
 msgstr "deti & zvieratá"
 
-#: src/canonmn.cpp:280
+#: src/canonmn.cpp:331
 msgid "Night SnapShot"
 msgstr "Nočný záber"
 
-#: src/canonmn.cpp:281
+#: src/canonmn.cpp:332
 msgid "Digital macro"
 msgstr "digitálne makro"
 
-#: src/canonmn.cpp:282
+#: src/canonmn.cpp:333
 msgid "My Colors"
 msgstr "Moje farby"
 
-#: src/canonmn.cpp:283 src/minoltamn.cpp:457
+#: src/canonmn.cpp:334 src/minoltamn.cpp:343
 msgid "Still image"
 msgstr "Fotografia"
 
-#: src/canonmn.cpp:291 src/properties.cpp:829 src/properties.cpp:851
-#: src/tags.cpp:1056
+#: src/canonmn.cpp:342 src/canonmn.cpp:343 src/properties.cpp:845
+#: src/properties.cpp:867 src/tags.cpp:1243 src/tags.cpp:1244
 msgid "Other"
 msgstr "Iný"
 
-#: src/canonmn.cpp:296 src/fujimn.cpp:83 src/fujimn.cpp:91 src/nikonmn.cpp:67
-#: src/nikonmn.cpp:194 src/olympusmn.cpp:113 src/olympusmn.cpp:1050
-#: src/panasonicmn.cpp:158 src/panasonicmn.cpp:162 src/pentaxmn.cpp:286
-#: src/pentaxmn.cpp:297 src/tags.cpp:1160
+#: src/canonmn.cpp:348 src/canonmn.cpp:745 src/canonmn.cpp:1083
+#: src/fujimn.cpp:86 src/fujimn.cpp:95 src/minoltamn.cpp:1164
+#: src/minoltamn.cpp:1170 src/minoltamn.cpp:1176 src/minoltamn.cpp:1345
+#: src/nikonmn.cpp:69 src/nikonmn.cpp:77 src/nikonmn.cpp:206
+#: src/olympusmn.cpp:171 src/olympusmn.cpp:1134 src/panasonicmn.cpp:162
+#: src/panasonicmn.cpp:166 src/pentaxmn.cpp:342 src/pentaxmn.cpp:355
+#: src/sonymn.cpp:214 src/tags.cpp:1349
 msgid "Low"
 msgstr "nízka"
 
-#: src/canonmn.cpp:298 src/fujimn.cpp:82 src/fujimn.cpp:90 src/nikonmn.cpp:69
-#: src/nikonmn.cpp:196 src/olympusmn.cpp:111 src/olympusmn.cpp:1052
-#: src/panasonicmn.cpp:53 src/panasonicmn.cpp:159 src/panasonicmn.cpp:164
-#: src/pentaxmn.cpp:288 src/pentaxmn.cpp:299 src/tags.cpp:1161
+#: src/canonmn.cpp:350 src/canonmn.cpp:1085 src/fujimn.cpp:85
+#: src/fujimn.cpp:94 src/minoltamn.cpp:1165 src/minoltamn.cpp:1171
+#: src/minoltamn.cpp:1177 src/nikonmn.cpp:71 src/nikonmn.cpp:79
+#: src/nikonmn.cpp:208 src/olympusmn.cpp:169 src/olympusmn.cpp:1136
+#: src/panasonicmn.cpp:55 src/panasonicmn.cpp:163 src/panasonicmn.cpp:168
+#: src/panasonicmn.cpp:169 src/pentaxmn.cpp:344 src/pentaxmn.cpp:357
+#: src/sonymn.cpp:217 src/tags.cpp:1350
 msgid "High"
 msgstr "vysoká"
 
-#: src/canonmn.cpp:303 src/nikonmn.cpp:657 src/nikonmn.cpp:672
-#: src/nikonmn.cpp:956 src/olympusmn.cpp:581 src/olympusmn.cpp:591
+#: src/canonmn.cpp:355 src/canonmn.cpp:742 src/canonmn.cpp:746
+#: src/canonmn.cpp:751 src/canonmn.cpp:1081 src/nikonmn.cpp:670
+#: src/nikonmn.cpp:685 src/nikonmn.cpp:888 src/nikonmn.cpp:941
+#: src/nikonmn.cpp:1196 src/olympusmn.cpp:620 src/olympusmn.cpp:630
+#: src/sonymn.cpp:129 src/sonymn.cpp:136 src/sonymn.cpp:144 src/sonymn.cpp:181
+#: src/sonymn.cpp:194 src/sonymn.cpp:201 src/sonymn.cpp:209 src/sonymn.cpp:215
+#: src/sonymn.cpp:226 src/sonymn.cpp:232 src/sonymn.cpp:239
 msgid "n/a"
 msgstr "nie je k dispozícii"
 
-#: src/canonmn.cpp:304
+#: src/canonmn.cpp:356
 msgid "Auto High"
 msgstr "automatický vysoký"
 
-#: src/canonmn.cpp:322
+#: src/canonmn.cpp:374 src/sonymn.cpp:186
 msgid "Default"
 msgstr "štandardný"
 
-#: src/canonmn.cpp:323 src/minoltamn.cpp:368 src/minoltamn.cpp:1027
-#: src/minoltamn.cpp:1080 src/olympusmn.cpp:430 src/panasonicmn.cpp:106
-#: src/pentaxmn.cpp:251 src/tags.cpp:1052
+#: src/canonmn.cpp:375 src/minoltamn.cpp:265 src/minoltamn.cpp:883
+#: src/minoltamn.cpp:933 src/minoltamn.cpp:1129 src/minoltamn.cpp:1938
+#: src/olympusmn.cpp:492 src/panasonicmn.cpp:110 src/pentaxmn.cpp:306
+#: src/sonymn.cpp:470 src/tags.cpp:1239
 msgid "Spot"
 msgstr "Bodový"
 
-#: src/canonmn.cpp:324 src/sigmamn.cpp:165 src/tags.cpp:1050
+#: src/canonmn.cpp:376 src/sigmamn.cpp:168 src/tags.cpp:1237
 msgid "Average"
 msgstr "priemer"
 
-#: src/canonmn.cpp:325
+#: src/canonmn.cpp:377
 msgid "Evaluative"
 msgstr "vyhodnocujúci"
 
-#: src/canonmn.cpp:326 src/tags.cpp:1055
+#: src/canonmn.cpp:378 src/tags.cpp:1242
 msgid "Partial"
 msgstr "Čiastočný"
 
-#: src/canonmn.cpp:327 src/minoltamn.cpp:367 src/minoltamn.cpp:1026
+#: src/canonmn.cpp:379 src/minoltamn.cpp:882
 msgid "Center weighted"
 msgstr "Stredovo vážený"
 
-#: src/canonmn.cpp:334
+#: src/canonmn.cpp:386
 msgid "Not known"
 msgstr "Neznámy"
 
 # exif-subjectdistancerange-1
-#: src/canonmn.cpp:335 src/canonmn.cpp:653 src/fujimn.cpp:202
-#: src/olympusmn.cpp:137 src/olympusmn.cpp:531 src/panasonicmn.cpp:105
-#: src/panasonicmn.cpp:208 src/panasonicmn.cpp:237 src/pentaxmn.cpp:181
-#: src/pentaxmn.cpp:414 src/tags.cpp:1167
+#: src/canonmn.cpp:387 src/canonmn.cpp:758 src/fujimn.cpp:207
+#: src/minoltamn.cpp:847 src/minoltamn.cpp:2041 src/olympusmn.cpp:109
+#: src/olympusmn.cpp:151 src/olympusmn.cpp:201 src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:213 src/panasonicmn.cpp:214 src/panasonicmn.cpp:243
+#: src/pentaxmn.cpp:199 src/pentaxmn.cpp:473 src/sonymn.cpp:390
+#: src/sonymn.cpp:391 src/sonymn.cpp:528 src/tags.cpp:1356
 msgid "Macro"
 msgstr "makro"
 
-#: src/canonmn.cpp:336
+#: src/canonmn.cpp:388
 msgid "Very close"
 msgstr "veľmi zblízka"
 
-#: src/canonmn.cpp:337
+#: src/canonmn.cpp:389
 msgid "Close"
 msgstr "Zblízka"
 
-#: src/canonmn.cpp:338
+#: src/canonmn.cpp:390
 msgid "Middle range"
 msgstr "stredný rozsah"
 
-#: src/canonmn.cpp:339
+#: src/canonmn.cpp:391
 msgid "Far range"
 msgstr "V diaľke"
 
-#: src/canonmn.cpp:342 src/pentaxmn.cpp:182 src/tags.cpp:2475
+#: src/canonmn.cpp:394 src/pentaxmn.cpp:200 src/tags.cpp:2392
 msgid "Infinity"
 msgstr "Nekonečno"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:347
+#: src/canonmn.cpp:399
 msgid "Manual AF point selection"
 msgstr "Ručná voľba bodu automatického zaostrenia"
 
-#: src/canonmn.cpp:348
+#: src/canonmn.cpp:400
 msgid "None (MF)"
 msgstr "Nič (MF)"
 
-#: src/canonmn.cpp:349
+#: src/canonmn.cpp:401
 msgid "Auto-selected"
 msgstr "Automatický výber"
 
-#: src/canonmn.cpp:350 src/minoltamn.cpp:396 src/minoltamn.cpp:826
-#: src/minoltamn.cpp:1068 src/nikonmn.cpp:91 src/pentaxmn.cpp:200
+#: src/canonmn.cpp:402 src/minoltamn.cpp:287 src/minoltamn.cpp:706
+#: src/minoltamn.cpp:921 src/minoltamn.cpp:1953 src/nikonmn.cpp:103
+#: src/olympusmn.cpp:1491 src/pentaxmn.cpp:222 src/pentaxmn.cpp:237
 msgid "Right"
 msgstr "vpravo"
 
-#: src/canonmn.cpp:351 src/minoltamn.cpp:393 src/minoltamn.cpp:823
-#: src/nikonmn.cpp:87 src/nikonmn.cpp:757 src/nikonmn.cpp:772
-#: src/pentaxmn.cpp:198 src/sigmamn.cpp:166
+#: src/canonmn.cpp:403 src/canonmn.cpp:723 src/minoltamn.cpp:284
+#: src/minoltamn.cpp:703 src/minoltamn.cpp:1950 src/nikonmn.cpp:99
+#: src/nikonmn.cpp:770 src/nikonmn.cpp:785 src/pentaxmn.cpp:220
+#: src/pentaxmn.cpp:236 src/sigmamn.cpp:169
 msgid "Center"
 msgstr "v strede"
 
-#: src/canonmn.cpp:352 src/minoltamn.cpp:400 src/minoltamn.cpp:830
-#: src/minoltamn.cpp:1072 src/nikonmn.cpp:90 src/pentaxmn.cpp:196
+#: src/canonmn.cpp:404 src/minoltamn.cpp:291 src/minoltamn.cpp:710
+#: src/minoltamn.cpp:925 src/minoltamn.cpp:1957 src/nikonmn.cpp:102
+#: src/pentaxmn.cpp:218 src/pentaxmn.cpp:235
 msgid "Left"
 msgstr "vľavo"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:353
+#: src/canonmn.cpp:405
 msgid "Auto AF point selection"
 msgstr "automatická voľba bodu zaostrenia"
 
-#: src/canonmn.cpp:358
+#: src/canonmn.cpp:410
 msgid "Easy shooting (Auto)"
 msgstr "Jednoduché fotenie (auto)"
 
-#: src/canonmn.cpp:359
+#: src/canonmn.cpp:411
 msgid "Program (P)"
 msgstr "Program (P)"
 
 # exif-exposureprogram-4
-#: src/canonmn.cpp:360
+#: src/canonmn.cpp:412
 msgid "Shutter priority (Tv)"
 msgstr "Priorita uzávierky (Tv)"
 
 # FUZZY exif-exposureprogram-3
-#: src/canonmn.cpp:361
+#: src/canonmn.cpp:413
 msgid "Aperture priority (Av)"
 msgstr "Priorita clony (Av)"
 
-#: src/canonmn.cpp:362
+#: src/canonmn.cpp:414
 msgid "Manual (M)"
 msgstr "Manuál (M)"
 
-#: src/canonmn.cpp:363
+#: src/canonmn.cpp:415
 msgid "A-DEP"
 msgstr "A-DEP"
 
-#: src/canonmn.cpp:364
+#: src/canonmn.cpp:416
 msgid "M-DEP"
 msgstr "M-DEP"
 
-#: src/canonmn.cpp:600 src/minoltamn.cpp:406 src/minoltamn.cpp:478
-#: src/minoltamn.cpp:836 src/minoltamn.cpp:1019 src/nikonmn.cpp:130
+#: src/canonmn.cpp:682 src/minoltamn.cpp:297 src/nikonmn.cpp:142
 msgid "Did not fire"
 msgstr "Blesk sa nespustil"
 
-#: src/canonmn.cpp:601 src/minoltamn.cpp:407 src/minoltamn.cpp:479
-#: src/minoltamn.cpp:837 src/minoltamn.cpp:1020 src/tags.cpp:303
+#: src/canonmn.cpp:683 src/minoltamn.cpp:298 src/nikonmn.cpp:959
+#: src/tags.cpp:370
 msgid "Fired"
 msgstr "Spustil sa"
 
-#: src/canonmn.cpp:606 src/olympusmn.cpp:925
+#: src/canonmn.cpp:688 src/olympusmn.cpp:1009
 msgid "External flash"
 msgstr "externý blesk"
 
-#: src/canonmn.cpp:607 src/minoltamn.cpp:728 src/olympusmn.cpp:929
+#: src/canonmn.cpp:689 src/olympusmn.cpp:1013
 msgid "Internal flash"
 msgstr "Vnútorný blesk"
 
-#: src/canonmn.cpp:609
+#: src/canonmn.cpp:691 src/olympusmn.cpp:558 src/sonymn.cpp:494
 msgid "TTL"
 msgstr "TTL"
 
-#: src/canonmn.cpp:610
+#: src/canonmn.cpp:692
 msgid "A-TTL"
 msgstr "A-TTL"
 
-#: src/canonmn.cpp:611
+#: src/canonmn.cpp:693
 msgid "E-TTL"
 msgstr "E-TTL"
 
-#: src/canonmn.cpp:612
+#: src/canonmn.cpp:694
 msgid "FP sync enabled"
 msgstr "FP synchr. zapnutá"
 
-#: src/canonmn.cpp:613
+#: src/canonmn.cpp:695
 msgid "2nd-curtain sync used"
 msgstr "synchr. 2. zácl. použitá"
 
-#: src/canonmn.cpp:614
+#: src/canonmn.cpp:696
 msgid "FP sync used"
 msgstr "FP synchr. použitá"
 
-#: src/canonmn.cpp:625
+#: src/canonmn.cpp:707
 msgid "Normal AE"
 msgstr "Normálna AE"
 
-#: src/canonmn.cpp:626 src/minoltamn.cpp:647 src/minoltamn.cpp:913
-#: src/minoltamn.cpp:1181 src/pentaxmn.cpp:836 src/pentaxmn.cpp:837
+#: src/canonmn.cpp:708 src/minoltamn.cpp:527 src/minoltamn.cpp:769
+#: src/minoltamn.cpp:1045 src/pentaxmn.cpp:919 src/pentaxmn.cpp:920
 msgid "Exposure compensation"
 msgstr "Kompenzácia expozície"
 
 # AE - automatická expozícia
-#: src/canonmn.cpp:627 src/pentaxmn.cpp:925 src/pentaxmn.cpp:926
+#: src/canonmn.cpp:709 src/minoltamn.cpp:1575 src/pentaxmn.cpp:1021
+#: src/pentaxmn.cpp:1022
 msgid "AE lock"
 msgstr "zámok AE"
 
 # AE - automatická expozícia
-#: src/canonmn.cpp:628
+#: src/canonmn.cpp:710
 msgid "AE lock + exposure compensation"
 msgstr "zámok AE + kompenzácia expozície"
 
 # AE - automatická expozícia
-#: src/canonmn.cpp:629
+#: src/canonmn.cpp:711
 msgid "No AE"
 msgstr "bez AE"
 
-#: src/canonmn.cpp:636
+#: src/canonmn.cpp:718
 msgid "On, shot only"
 msgstr "zapnutý, iba pri fotení"
 
-#: src/canonmn.cpp:644
+# AF = automatické zaostrenie
+#: src/canonmn.cpp:724 src/canonmn.cpp:776 src/nikonmn.cpp:801
+#: src/olympusmn.cpp:1008
+msgid "AF Point"
+msgstr "Bod automatického zaostrenia"
+
+#: src/canonmn.cpp:732
 msgid "Smooth"
 msgstr "Hladký"
 
-#: src/canonmn.cpp:646 src/nikonmn.cpp:662
+#: src/canonmn.cpp:734 src/nikonmn.cpp:675
 msgid "B&W"
 msgstr "ČB"
 
-#: src/canonmn.cpp:647 src/canonmn.cpp:712 src/fujimn.cpp:76
-#: src/minoltamn.cpp:325
+#: src/canonmn.cpp:735 src/canonmn.cpp:818 src/canonmn.cpp:1076
+#: src/fujimn.cpp:78 src/fujimn.cpp:79 src/minoltamn.cpp:222
+#: src/minoltamn.cpp:1184 src/minoltamn.cpp:1187 src/minoltamn.cpp:2100
+#: src/pentaxmn.cpp:723
 msgid "Custom"
 msgstr "Vlastný"
 
-#: src/canonmn.cpp:648
+#: src/canonmn.cpp:736 src/canonmn.cpp:737
 msgid "My color data"
 msgstr "moje farebné údaje"
 
-#: src/canonmn.cpp:654
+#: src/canonmn.cpp:743 src/pentaxmn.cpp:163
+msgid "Full"
+msgstr "Plný"
+
+#: src/canonmn.cpp:752
+msgid "sRAW1 (mRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:753
+msgid "sRAW2 (sRAW)"
+msgstr ""
+
+#: src/canonmn.cpp:759
 msgid "Selftimer"
 msgstr "Samospúšť"
 
-#: src/canonmn.cpp:654 src/panasonicmn.cpp:253
+#: src/canonmn.cpp:759 src/panasonicmn.cpp:259
 msgid "Self timer"
 msgstr "Samospúšť"
 
-#: src/canonmn.cpp:655 src/fujimn.cpp:181 src/nikonmn.cpp:210
-#: src/nikonmn.cpp:447 src/nikonmn.cpp:515 src/olympusmn.cpp:134
-#: src/panasonicmn.cpp:230 src/sigmamn.cpp:110 src/sigmamn.cpp:111
+#: src/canonmn.cpp:760 src/fujimn.cpp:186 src/minoltamn.cpp:1484
+#: src/minoltamn.cpp:1485 src/nikonmn.cpp:222 src/nikonmn.cpp:459
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:198 src/panasonicmn.cpp:236
+#: src/sigmamn.cpp:113 src/sigmamn.cpp:114 src/sonymn.cpp:647
+#: src/sonymn.cpp:648
 msgid "Quality"
 msgstr "Kvalita"
 
-#: src/canonmn.cpp:656 src/fujimn.cpp:196 src/minoltamn.cpp:613
-#: src/minoltamn.cpp:906 src/nikonmn.cpp:553 src/olympusmn.cpp:217
-#: src/olympusmn.cpp:620
+#: src/canonmn.cpp:761 src/fujimn.cpp:201 src/minoltamn.cpp:493
+#: src/minoltamn.cpp:762 src/nikonmn.cpp:566 src/olympusmn.cpp:279
+#: src/olympusmn.cpp:670
 msgid "Flash Mode"
 msgstr "Režim blesku"
 
-#: src/canonmn.cpp:656
+#: src/canonmn.cpp:761
 msgid "Flash mode setting"
 msgstr "Nastavenie režimu blesku"
 
-#: src/canonmn.cpp:657 src/minoltamn.cpp:625 src/olympusmn.cpp:644
-#: src/sigmamn.cpp:57
+#: src/canonmn.cpp:762 src/minoltamn.cpp:505 src/minoltamn.cpp:1427
+#: src/olympusmn.cpp:700 src/sigmamn.cpp:59 src/sonymn.cpp:559
+#: src/sonymn.cpp:560
 msgid "Drive Mode"
 msgstr "Režim jazda autom"
 
-#: src/canonmn.cpp:657
+#: src/canonmn.cpp:762
 msgid "Drive mode setting"
 msgstr "Nastavenie režimu jazda autom"
 
-#: src/canonmn.cpp:659 src/fujimn.cpp:205 src/minoltamn.cpp:742
-#: src/minoltamn.cpp:897 src/minoltamn.cpp:1171 src/nikonmn.cpp:462
-#: src/olympusmn.cpp:238 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
+#: src/canonmn.cpp:764 src/fujimn.cpp:210 src/minoltamn.cpp:622
+#: src/minoltamn.cpp:753 src/minoltamn.cpp:1035 src/minoltamn.cpp:1379
+#: src/nikonmn.cpp:474 src/olympusmn.cpp:300 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/sonymn.cpp:396 src/sonymn.cpp:397
+#: src/sonymn.cpp:566 src/sonymn.cpp:567 src/sonymn.cpp:672 src/sonymn.cpp:673
 msgid "Focus Mode"
 msgstr "režim zaostrenia"
 
-#: src/canonmn.cpp:659
+#: src/canonmn.cpp:764
 msgid "Focus mode setting"
 msgstr "Nastavenie režimu zaostrenia"
 
-#: src/canonmn.cpp:662 src/minoltamn.cpp:619 src/minoltamn.cpp:888
-#: src/minoltamn.cpp:1126
+#: src/canonmn.cpp:767 src/minoltamn.cpp:499 src/minoltamn.cpp:744
+#: src/minoltamn.cpp:987
 msgid "Image Size"
 msgstr "Veľkosť obrázka"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy Mode"
 msgstr "Jednoduchý režim"
 
-#: src/canonmn.cpp:663
+#: src/canonmn.cpp:768
 msgid "Easy shooting mode"
 msgstr "režim jednoduchého fotenia"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:643 src/nikonmn.cpp:243
-#: src/nikonmn.cpp:468 src/nikonmn.cpp:552 src/olympusmn.cpp:143
+#: src/canonmn.cpp:769 src/minoltamn.cpp:523 src/nikonmn.cpp:255
+#: src/nikonmn.cpp:480 src/nikonmn.cpp:565 src/olympusmn.cpp:207
 msgid "Digital Zoom"
 msgstr "digitálne priblíženie"
 
-#: src/canonmn.cpp:664 src/minoltamn.cpp:644
+#: src/canonmn.cpp:769 src/minoltamn.cpp:524 src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:945
 msgid "Digital zoom"
 msgstr "digitálne priblíženie"
 
-#: src/canonmn.cpp:665 src/minoltamn.cpp:506 src/minoltamn.cpp:694
-#: src/minoltamn.cpp:695 src/minoltamn.cpp:921 src/minoltamn.cpp:922
-#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1154 src/nikonmn.cpp:683
-#: src/olympusmn.cpp:328 src/olympusmn.cpp:739 src/panasonicmn.cpp:251
-#: src/panasonicmn.cpp:262 src/pentaxmn.cpp:770 src/pentaxmn.cpp:860
-#: src/pentaxmn.cpp:861 src/properties.cpp:413 src/properties.cpp:559
-#: src/sigmamn.cpp:86 src/sigmamn.cpp:87 src/tags.cpp:1407
+#: src/canonmn.cpp:770 src/minoltamn.cpp:386 src/minoltamn.cpp:574
+#: src/minoltamn.cpp:575 src/minoltamn.cpp:777 src/minoltamn.cpp:778
+#: src/minoltamn.cpp:1017 src/minoltamn.cpp:1018 src/minoltamn.cpp:1415
+#: src/minoltamn.cpp:1416 src/nikonmn.cpp:696 src/olympusmn.cpp:390
+#: src/olympusmn.cpp:800 src/panasonicmn.cpp:257 src/panasonicmn.cpp:268
+#: src/pentaxmn.cpp:850 src/pentaxmn.cpp:950 src/pentaxmn.cpp:951
+#: src/properties.cpp:429 src/properties.cpp:575 src/sigmamn.cpp:89
+#: src/sigmamn.cpp:90 src/sonymn.cpp:324 src/sonymn.cpp:593 src/sonymn.cpp:594
+#: src/sonymn.cpp:699 src/sonymn.cpp:700 src/tags.cpp:1597
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/canonmn.cpp:665 src/fujimn.cpp:194 src/olympusmn.cpp:329
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996 src/panasonicmn.cpp:251
+#: src/canonmn.cpp:770 src/fujimn.cpp:199 src/olympusmn.cpp:391
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080 src/panasonicmn.cpp:257
 msgid "Contrast setting"
 msgstr "Nastavenie kontrastu"
 
-#: src/canonmn.cpp:666 src/minoltamn.cpp:507 src/minoltamn.cpp:691
-#: src/minoltamn.cpp:692 src/minoltamn.cpp:924 src/minoltamn.cpp:925
-#: src/minoltamn.cpp:1156 src/minoltamn.cpp:1157 src/nikonmn.cpp:565
-#: src/nikonmn.cpp:584 src/nikonmn.cpp:685 src/olympusmn.cpp:738
-#: src/olympusmn.cpp:837 src/panasonicmn.cpp:265 src/pentaxmn.cpp:764
-#: src/pentaxmn.cpp:857 src/pentaxmn.cpp:858 src/properties.cpp:431
-#: src/properties.cpp:560 src/sigmamn.cpp:95 src/sigmamn.cpp:96
-#: src/tags.cpp:1411
+#: src/canonmn.cpp:771 src/minoltamn.cpp:387 src/minoltamn.cpp:571
+#: src/minoltamn.cpp:572 src/minoltamn.cpp:780 src/minoltamn.cpp:781
+#: src/minoltamn.cpp:1020 src/minoltamn.cpp:1021 src/minoltamn.cpp:1418
+#: src/minoltamn.cpp:1419 src/nikonmn.cpp:578 src/nikonmn.cpp:597
+#: src/nikonmn.cpp:698 src/olympusmn.cpp:799 src/olympusmn.cpp:898
+#: src/panasonicmn.cpp:271 src/pentaxmn.cpp:844 src/pentaxmn.cpp:947
+#: src/pentaxmn.cpp:948 src/properties.cpp:447 src/properties.cpp:576
+#: src/sigmamn.cpp:98 src/sigmamn.cpp:99 src/sonymn.cpp:327 src/sonymn.cpp:596
+#: src/sonymn.cpp:597 src/sonymn.cpp:702 src/sonymn.cpp:703 src/tags.cpp:1601
 msgid "Saturation"
 msgstr "Sýtosť"
 
-#: src/canonmn.cpp:666 src/olympusmn.cpp:994
+#: src/canonmn.cpp:771 src/olympusmn.cpp:1078
 msgid "Saturation setting"
 msgstr "Nastavenie sýtosti"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:184 src/minoltamn.cpp:697
-#: src/minoltamn.cpp:698 src/minoltamn.cpp:918 src/minoltamn.cpp:919
-#: src/minoltamn.cpp:1150 src/minoltamn.cpp:1151 src/nikonmn.cpp:682
-#: src/olympusmn.cpp:740 src/panasonicmn.cpp:266 src/pentaxmn.cpp:767
-#: src/pentaxmn.cpp:863 src/pentaxmn.cpp:864 src/properties.cpp:434
-#: src/properties.cpp:561 src/sigmamn.cpp:98 src/sigmamn.cpp:99
-#: src/tags.cpp:1415
+#: src/canonmn.cpp:772 src/canonmn.cpp:1116 src/fujimn.cpp:189
+#: src/minoltamn.cpp:577 src/minoltamn.cpp:578 src/minoltamn.cpp:774
+#: src/minoltamn.cpp:775 src/minoltamn.cpp:1014 src/minoltamn.cpp:1015
+#: src/minoltamn.cpp:1412 src/minoltamn.cpp:1413 src/nikonmn.cpp:695
+#: src/olympusmn.cpp:801 src/panasonicmn.cpp:272 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:953 src/pentaxmn.cpp:954 src/properties.cpp:450
+#: src/properties.cpp:577 src/sigmamn.cpp:101 src/sigmamn.cpp:102
+#: src/sonymn.cpp:590 src/sonymn.cpp:591 src/sonymn.cpp:696 src/sonymn.cpp:697
+#: src/tags.cpp:1605
 msgid "Sharpness"
 msgstr "Ostrosť"
 
-#: src/canonmn.cpp:667 src/fujimn.cpp:185 src/olympusmn.cpp:628
-#: src/olympusmn.cpp:997
+#: src/canonmn.cpp:772 src/fujimn.cpp:190 src/olympusmn.cpp:682
+#: src/olympusmn.cpp:1081
 msgid "Sharpness setting"
 msgstr "Nastavenie zaostrenia"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:706 src/minoltamn.cpp:909
-#: src/minoltamn.cpp:1147
+#: src/canonmn.cpp:773 src/minoltamn.cpp:765 src/minoltamn.cpp:1008
 msgid "ISO Speed Mode"
 msgstr "Režim ISO rýchlosť"
 
-#: src/canonmn.cpp:668 src/minoltamn.cpp:707 src/minoltamn.cpp:910
-#: src/minoltamn.cpp:1148 src/nikonmn.cpp:205 src/nikonmn.cpp:457
-#: src/nikonmn.cpp:513 src/panasonicmn.cpp:338
+#: src/canonmn.cpp:773 src/minoltamn.cpp:766 src/minoltamn.cpp:1009
+#: src/nikonmn.cpp:217 src/nikonmn.cpp:469 src/nikonmn.cpp:525
+#: src/panasonicmn.cpp:344
 msgid "ISO speed setting"
 msgstr "Nastavenie ISO rýchlosti"
 
 # exif-meteringmode
-#: src/canonmn.cpp:669 src/minoltamn.cpp:628 src/minoltamn.cpp:1144
-#: src/olympusmn.cpp:614 src/properties.cpp:531 src/sigmamn.cpp:74
-#: src/tags.cpp:643 src/tags.cpp:1246
+#: src/canonmn.cpp:774 src/minoltamn.cpp:508 src/minoltamn.cpp:1005
+#: src/minoltamn.cpp:1394 src/olympusmn.cpp:661 src/properties.cpp:547
+#: src/sigmamn.cpp:77 src/sonymn.cpp:575 src/sonymn.cpp:576 src/sonymn.cpp:681
+#: src/sonymn.cpp:682 src/tags.cpp:830 src/tags.cpp:1436
 msgid "Metering Mode"
 msgstr "merací režim"
 
-#: src/canonmn.cpp:669
+#: src/canonmn.cpp:774
 msgid "Metering mode setting"
 msgstr "Nastavenie režimu merania"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus Type"
 msgstr "Typ zaostrenia"
 
-#: src/canonmn.cpp:670
+#: src/canonmn.cpp:775
 msgid "Focus type setting"
 msgstr "Nastavenie typu zaostrenia"
 
-# AF = automatické zaostrenie
-#: src/canonmn.cpp:671 src/nikonmn.cpp:788 src/olympusmn.cpp:924
-msgid "AF Point"
-msgstr "Bod automatického zaostrenia"
-
-#: src/canonmn.cpp:671
+#: src/canonmn.cpp:776
 msgid "AF point selected"
 msgstr "Nebol vybraný bod automatického zaostrenia"
 
-#: src/canonmn.cpp:672 src/properties.cpp:520 src/tags.cpp:617
-#: src/tags.cpp:1180
+#: src/canonmn.cpp:777 src/properties.cpp:536 src/sonymn.cpp:632
+#: src/sonymn.cpp:633 src/sonymn.cpp:708 src/sonymn.cpp:709 src/tags.cpp:804
+#: src/tags.cpp:1370
 msgid "Exposure Program"
 msgstr "Režim expozície"
 
 # exif-exposuremode
-#: src/canonmn.cpp:672
+#: src/canonmn.cpp:777
 msgid "Exposure mode setting"
 msgstr "Nastavenie režimu expozície"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276
 msgid "Lens Type"
 msgstr "Typ šošpviek"
 
-#: src/canonmn.cpp:674 src/nikonmn.cpp:549 src/olympusmn.cpp:685
-#: src/panasonicmn.cpp:270 src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
+#: src/canonmn.cpp:779 src/nikonmn.cpp:562 src/olympusmn.cpp:745
+#: src/panasonicmn.cpp:276 src/pentaxmn.cpp:1008 src/pentaxmn.cpp:1009
 msgid "Lens type"
 msgstr "typ šošoviek"
 
-#: src/canonmn.cpp:675 src/nikonmn.cpp:550 src/properties.cpp:603
+#: src/canonmn.cpp:780 src/nikonmn.cpp:563 src/properties.cpp:619
 msgid "Lens"
 msgstr "šošovky"
 
-#: src/canonmn.cpp:675
+#: src/canonmn.cpp:780
 msgid ""
 "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' "
 "per mm"
 msgstr ""
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:673
+#: src/canonmn.cpp:781
+msgid "Short Focal"
+msgstr ""
+
+#: src/canonmn.cpp:781
+#, fuzzy
+msgid "Short focal"
+msgstr "Bodové zaostrenie"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal Units"
+msgstr "Ohnisková vzdialenosť"
+
+#: src/canonmn.cpp:782
+#, fuzzy
+msgid "Focal units"
+msgstr "Ohnisková vzdialenosť"
+
+#: src/canonmn.cpp:783 src/minoltamn.cpp:553
 msgid "Max Aperture"
 msgstr "Max. clona"
 
-#: src/canonmn.cpp:678 src/minoltamn.cpp:674
+#: src/canonmn.cpp:783 src/minoltamn.cpp:554
 msgid "Max aperture"
 msgstr "Max. clona"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min Aperture"
 msgstr "Max. clona"
 
-#: src/canonmn.cpp:679
+#: src/canonmn.cpp:784
 #, fuzzy
 msgid "Min aperture"
 msgstr "Max. clona"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash Activity"
 msgstr "Aktivita blesku"
 
-#: src/canonmn.cpp:680
+#: src/canonmn.cpp:785
 msgid "Flash activity"
 msgstr "aktivita blesku"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash Details"
 msgstr "Podrobnosti blesku"
 
-#: src/canonmn.cpp:681
+#: src/canonmn.cpp:786
 msgid "Flash details"
 msgstr "podrobnosti blesku"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus Continuous"
 msgstr "Spojité zaostrenie"
 
-#: src/canonmn.cpp:684
+#: src/canonmn.cpp:789
 msgid "Focus continuous setting"
 msgstr "Nastavenie spojité zaostrenie"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AESetting"
 msgstr "Nastavenie AE"
 
-#: src/canonmn.cpp:685
+#: src/canonmn.cpp:790
 msgid "AE setting"
 msgstr "Nastavenie AE"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:268 src/minoltamn.cpp:958
-#: src/minoltamn.cpp:1198 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:147 src/minoltamn.cpp:814
+#: src/minoltamn.cpp:1071 src/minoltamn.cpp:1562 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:372 src/sonymn.cpp:635 src/sonymn.cpp:636
 msgid "Image Stabilization"
 msgstr "Stabilizácia obrazu"
 
-#: src/canonmn.cpp:686 src/minoltamn.cpp:269 src/minoltamn.cpp:959
-#: src/minoltamn.cpp:1199 src/nikonmn.cpp:586 src/olympusmn.cpp:932
-#: src/panasonicmn.cpp:236
+#: src/canonmn.cpp:791 src/minoltamn.cpp:148 src/minoltamn.cpp:815
+#: src/minoltamn.cpp:1072 src/minoltamn.cpp:1563 src/nikonmn.cpp:599
+#: src/olympusmn.cpp:703 src/olympusmn.cpp:1016 src/panasonicmn.cpp:242
+#: src/sonymn.cpp:373
 msgid "Image stabilization"
 msgstr "Stabilizácia obrazu"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display Aperture"
 msgstr "Clona displeja"
 
-#: src/canonmn.cpp:687
+#: src/canonmn.cpp:792
 msgid "Display aperture"
 msgstr "Clona displeja"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom Source Width"
 msgstr "Zdrojová šírka priblíženia"
 
-#: src/canonmn.cpp:688
+#: src/canonmn.cpp:793
 msgid "Zoom source width"
 msgstr "zdrojová šírka priblíženia"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom Target Width"
 msgstr "Cieľová šírka priblíženia"
 
-#: src/canonmn.cpp:689
+#: src/canonmn.cpp:794
 msgid "Zoom target width"
 msgstr "Cieľová šírka priblíženia"
 
-#: src/canonmn.cpp:692
+# exif-meteringmode
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot Metering Mode"
+msgstr "merací režim"
+
+#: src/canonmn.cpp:796
+#, fuzzy
+msgid "Spot metering mode"
+msgstr "Režim merania."
+
+#: src/canonmn.cpp:797
 msgid "Photo Effect"
 msgstr "Fotoefekt"
 
-#: src/canonmn.cpp:692
+#: src/canonmn.cpp:797
 msgid "Photo effect"
 msgstr "fotoefekt"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual Flash Output"
+msgstr "Ručné uvoľnenie"
+
+#: src/canonmn.cpp:798
+#, fuzzy
+msgid "Manual flash output"
+msgstr "Ručné uvoľnenie"
+
+#: src/canonmn.cpp:799
 msgid "Color Tone"
 msgstr "Farebný tón"
 
-#: src/canonmn.cpp:694
+#: src/canonmn.cpp:799
 msgid "Color tone"
 msgstr "Farebný tón"
 
-#: src/canonmn.cpp:696
+#: src/canonmn.cpp:800
+msgid "SRAW Quality Tone"
+msgstr ""
+
+#: src/canonmn.cpp:800
+#, fuzzy
+msgid "SRAW quality"
+msgstr "Kvalita obrázka"
+
+#: src/canonmn.cpp:802
 msgid "Unknown Canon Camera Settings 1 tag"
 msgstr "Neznáma značka Nastavenie fotoaparátu Canon 1"
 
-#: src/canonmn.cpp:707
+#: src/canonmn.cpp:813
 msgid "Sunny"
 msgstr "slnečno"
 
-#: src/canonmn.cpp:708 src/fujimn.cpp:71 src/minoltamn.cpp:323
-#: src/minoltamn.cpp:806 src/minoltamn.cpp:1008 src/nikonmn.cpp:438
-#: src/olympusmn.cpp:957 src/panasonicmn.cpp:64 src/pentaxmn.cpp:266
+#: src/canonmn.cpp:814 src/fujimn.cpp:73 src/minoltamn.cpp:220
+#: src/minoltamn.cpp:685 src/minoltamn.cpp:870 src/minoltamn.cpp:1194
+#: src/minoltamn.cpp:2095 src/nikonmn.cpp:450 src/olympusmn.cpp:1041
+#: src/panasonicmn.cpp:66 src/pentaxmn.cpp:321 src/sonymn.cpp:166
 msgid "Cloudy"
 msgstr "oblačno"
 
 # exif-lightsource-3
-#: src/canonmn.cpp:709 src/minoltamn.cpp:324 src/minoltamn.cpp:807
-#: src/minoltamn.cpp:1010 src/pentaxmn.cpp:260
+#: src/canonmn.cpp:815 src/minoltamn.cpp:221 src/minoltamn.cpp:686
+#: src/minoltamn.cpp:872 src/minoltamn.cpp:1196 src/minoltamn.cpp:2097
+#: src/pentaxmn.cpp:315
 msgid "Tungsten"
 msgstr "volfrám"
 
 # exif-lightsource-2
-#: src/canonmn.cpp:710 src/minoltamn.cpp:326 src/minoltamn.cpp:808
-#: src/minoltamn.cpp:1011 src/nikonmn.cpp:437 src/pentaxmn.cpp:259
-#: src/tags.cpp:1063
+#: src/canonmn.cpp:816 src/minoltamn.cpp:223 src/minoltamn.cpp:687
+#: src/minoltamn.cpp:873 src/minoltamn.cpp:1197 src/minoltamn.cpp:2099
+#: src/nikonmn.cpp:449 src/pentaxmn.cpp:314 src/tags.cpp:1251
 msgid "Fluorescent"
 msgstr "fluorescencia"
 
-#: src/canonmn.cpp:713 src/minoltamn.cpp:57
+#: src/canonmn.cpp:819 src/minoltamn.cpp:57 src/minoltamn.cpp:1890
+#: src/sonymn.cpp:481
 msgid "Black & White"
 msgstr "Čiernobiela"
 
-#: src/canonmn.cpp:714 src/minoltamn.cpp:805 src/minoltamn.cpp:1009
-#: src/olympusmn.cpp:956 src/pentaxmn.cpp:258 src/tags.cpp:1068
+#: src/canonmn.cpp:820 src/minoltamn.cpp:684 src/minoltamn.cpp:871
+#: src/minoltamn.cpp:1195 src/minoltamn.cpp:2096 src/olympusmn.cpp:1040
+#: src/pentaxmn.cpp:313 src/tags.cpp:1256
 msgid "Shade"
 msgstr "Tieň"
 
 # ?exif-lightsource-255
-#: src/canonmn.cpp:715
+#: src/canonmn.cpp:821
 msgid "Manual Temperature (Kelvin)"
 msgstr "Ručné nastavenie teploty (v kelvinoch)"
 
-#: src/canonmn.cpp:716
+#: src/canonmn.cpp:822
 msgid "PC Set 1"
 msgstr "PC Set 1"
 
-#: src/canonmn.cpp:717
+#: src/canonmn.cpp:823
 msgid "PC Set 2"
 msgstr "PC Set 2"
 
-#: src/canonmn.cpp:718
+#: src/canonmn.cpp:824
 msgid "PC Set 3"
 msgstr "PC Set 3"
 
 # exif-lightsource-12
-#: src/canonmn.cpp:719
+#: src/canonmn.cpp:825
 msgid "Daylight Fluorescent"
 msgstr "denné svetlo, fluorescenčné"
 
-#: src/canonmn.cpp:720 src/properties.cpp:761
+#: src/canonmn.cpp:826 src/properties.cpp:777
 msgid "Custom 1"
 msgstr "Vlastný 1"
 
-#: src/canonmn.cpp:721 src/minoltamn.cpp:328 src/properties.cpp:762
+#: src/canonmn.cpp:827 src/minoltamn.cpp:225 src/properties.cpp:778
 msgid "Custom 2"
 msgstr "Vlastný 2"
 
-#: src/canonmn.cpp:727 src/canonmn.cpp:846 src/canonmn.cpp:854
+#: src/canonmn.cpp:829 src/canonmn.cpp:830 src/minoltamn.cpp:226
+#: src/properties.cpp:779
+msgid "Custom 3"
+msgstr "vlastné 3"
+
+#: src/canonmn.cpp:831
+#, fuzzy
+msgid "PC Set 4"
+msgstr "PC Set 1"
+
+#: src/canonmn.cpp:832
+#, fuzzy
+msgid "PC Set 5"
+msgstr "PC Set 1"
+
+#: src/canonmn.cpp:837 src/canonmn.cpp:956 src/canonmn.cpp:964
 msgid "left"
 msgstr "vľavo"
 
-#: src/canonmn.cpp:728 src/canonmn.cpp:843 src/canonmn.cpp:855
+#: src/canonmn.cpp:838 src/canonmn.cpp:953 src/canonmn.cpp:965
 msgid "center"
 msgstr "v strede"
 
-#: src/canonmn.cpp:729 src/canonmn.cpp:840 src/canonmn.cpp:856
+#: src/canonmn.cpp:839 src/canonmn.cpp:950 src/canonmn.cpp:966
 msgid "right"
 msgstr "vpravo"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO Speed Used"
 msgstr "Použitá ISO rýchlosť"
 
-#: src/canonmn.cpp:756
+#: src/canonmn.cpp:866
 msgid "ISO speed used"
 msgstr "Použitá ISO rýchlosť"
 
-#: src/canonmn.cpp:758
+#: src/canonmn.cpp:867
+msgid "Measured EV"
+msgstr ""
+
+#: src/canonmn.cpp:868
 msgid "Target Aperture"
 msgstr "Cieľová clona"
 
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target Shutter Speed"
 msgstr "Cieľová rýchlosť uzávierky"
 
 # exif-shutterspeedvalue
-#: src/canonmn.cpp:759
+#: src/canonmn.cpp:869
 msgid "Target shutter speed"
 msgstr "exif-shutterspeedvalue"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:187 src/minoltamn.cpp:616
-#: src/minoltamn.cpp:894 src/minoltamn.cpp:1132 src/nikonmn.cpp:213
-#: src/nikonmn.cpp:459 src/nikonmn.cpp:516 src/olympusmn.cpp:268
-#: src/olympusmn.cpp:819 src/panasonicmn.cpp:232 src/properties.cpp:443
-#: src/properties.cpp:552 src/sigmamn.cpp:68 src/tags.cpp:1385
+#: src/canonmn.cpp:871 src/fujimn.cpp:192 src/minoltamn.cpp:177
+#: src/minoltamn.cpp:496 src/minoltamn.cpp:750 src/minoltamn.cpp:993
+#: src/minoltamn.cpp:1376 src/nikonmn.cpp:225 src/nikonmn.cpp:471
+#: src/nikonmn.cpp:528 src/olympusmn.cpp:330 src/olympusmn.cpp:880
+#: src/panasonicmn.cpp:238 src/properties.cpp:459 src/properties.cpp:568
+#: src/sigmamn.cpp:71 src/sonymn.cpp:289 src/tags.cpp:1575
 msgid "White Balance"
 msgstr "Vyváženie bielej"
 
-#: src/canonmn.cpp:761 src/fujimn.cpp:188 src/panasonicmn.cpp:232
+#: src/canonmn.cpp:871 src/fujimn.cpp:193 src/minoltamn.cpp:1443
+#: src/panasonicmn.cpp:238
 msgid "White balance setting"
 msgstr "Nastavenie vyváženia bielej"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence"
 msgstr "Poradové číslo"
 
-#: src/canonmn.cpp:763
+#: src/canonmn.cpp:873
 msgid "Sequence number (if in a continuous burst)"
 msgstr "Poradové číslo (ak je zo spojitého záberu)"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF Point Used"
 msgstr "Použitý bod automatického zaostrenia"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:768
+#: src/canonmn.cpp:878
 msgid "AF point used"
 msgstr "Použitý bod automatického zaostrenia"
 
-#: src/canonmn.cpp:769 src/olympusmn.cpp:310
+#: src/canonmn.cpp:879 src/olympusmn.cpp:372
 msgid "Flash Bias"
 msgstr "Skreslenie blesku"
 
 # exif-subjectdistance
-#: src/canonmn.cpp:773 src/properties.cpp:530 src/tags.cpp:642
-#: src/tags.cpp:1243
+#: src/canonmn.cpp:883 src/properties.cpp:546 src/tags.cpp:829
+#: src/tags.cpp:1433
 msgid "Subject Distance"
 msgstr "vzdialenosť subjektu"
 
 # exif-subjectdistancerange
-#: src/canonmn.cpp:773
+#: src/canonmn.cpp:883
 msgid "Subject distance (units are not clear)"
 msgstr "Vzdialenosť subjektu (jednotky nie sú jasné)"
 
-#: src/canonmn.cpp:775 src/olympusmn.cpp:211 src/properties.cpp:526
-#: src/tags.cpp:638
+#: src/canonmn.cpp:885 src/olympusmn.cpp:273 src/properties.cpp:542
+#: src/tags.cpp:825
 msgid "Aperture Value"
 msgstr "Hodnota clony"
 
-#: src/canonmn.cpp:776 src/properties.cpp:525 src/tags.cpp:637
+#: src/canonmn.cpp:886 src/properties.cpp:541 src/tags.cpp:824
 msgid "Shutter Speed Value"
 msgstr "Hodnota rýchlosti uzávierky"
 
 # exif-shutterspeedvalue
-#: src/canonmn.cpp:776 src/tags.cpp:1223
+#: src/canonmn.cpp:886 src/tags.cpp:1413
 msgid "Shutter speed"
 msgstr "rýchlosť uzávierky"
 
-#: src/canonmn.cpp:782
+#: src/canonmn.cpp:887
+msgid "Measured EV 2"
+msgstr ""
+
+#: src/canonmn.cpp:892
 msgid "Unknown Canon Camera Settings 2 tag"
 msgstr "Neznáma značka Nastavenie fotoaparátu Canon 2"
 
-#: src/canonmn.cpp:792 src/olympusmn.cpp:1080
+#: src/canonmn.cpp:902 src/olympusmn.cpp:1164
 msgid "Left to right"
 msgstr "zľava doprava"
 
-#: src/canonmn.cpp:793 src/olympusmn.cpp:1081
+#: src/canonmn.cpp:903 src/olympusmn.cpp:1165
 msgid "Right to left"
 msgstr "sprava doľava"
 
-#: src/canonmn.cpp:794 src/olympusmn.cpp:1082
+#: src/canonmn.cpp:904 src/olympusmn.cpp:1166
 msgid "Bottom to top"
 msgstr "zdola hore"
 
-#: src/canonmn.cpp:795 src/olympusmn.cpp:1083
+#: src/canonmn.cpp:905 src/olympusmn.cpp:1167
 msgid "Top to bottom"
 msgstr "zhora dolu"
 
-#: src/canonmn.cpp:796
+#: src/canonmn.cpp:906
 msgid "2x2 matrix (Clockwise)"
 msgstr "matica 2x2 (v smere hodinových ručičiek)"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama Frame"
 msgstr "Rámec panorámy"
 
-#: src/canonmn.cpp:801
+#: src/canonmn.cpp:911
 msgid "Panorama frame number"
 msgstr "Číslo rámca panorámy"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama Direction"
 msgstr "Smer panorámy"
 
-#: src/canonmn.cpp:802
+#: src/canonmn.cpp:912
 msgid "Panorama direction"
 msgstr "smer panorámy"
 
-#: src/canonmn.cpp:804
+#: src/canonmn.cpp:914
 msgid "Unknown Canon Panorama tag"
 msgstr "Neznáma značka Canon Panorama"
 
-#: src/canonmn.cpp:814 src/canonmn.cpp:944 src/minoltamn.cpp:951
-#: src/minoltamn.cpp:1195 src/nikonmn.cpp:566 src/olympusmn.cpp:376
-#: src/olympusmn.cpp:564 src/olympusmn.cpp:631 src/olympusmn.cpp:743
-#: src/olympusmn.cpp:758 src/olympusmn.cpp:828 src/olympusmn.cpp:893
+#: src/canonmn.cpp:924 src/canonmn.cpp:1054 src/minoltamn.cpp:807
+#: src/minoltamn.cpp:1068 src/minoltamn.cpp:1493 src/nikonmn.cpp:579
+#: src/olympusmn.cpp:438 src/olympusmn.cpp:602 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:804 src/olympusmn.cpp:819 src/olympusmn.cpp:889
+#: src/olympusmn.cpp:974
 msgid "Noise Reduction"
 msgstr "Redukcia šumu"
 
-#: src/canonmn.cpp:814
+#: src/canonmn.cpp:924
 msgid "Long exposure noise reduction"
 msgstr "Redukciu šumu dlhej expozície"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 msgid "Shutter Ae Lock"
 msgstr "Ae zámok uzávierky"
 
-#: src/canonmn.cpp:815
+#: src/canonmn.cpp:925
 msgid "Shutter/AE lock buttons"
 msgstr "Tlačidlá zamknutia uzávierky/AE"
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror Lockup"
 msgstr ""
 
-#: src/canonmn.cpp:816
+#: src/canonmn.cpp:926
 msgid "Mirror lockup"
 msgstr ""
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927 src/sonymn.cpp:650 src/sonymn.cpp:651
 msgid "Exposure Level Increments"
 msgstr "Kroky úrovne expozície"
 
-#: src/canonmn.cpp:817
+#: src/canonmn.cpp:927
 msgid "Tv/Av and exposure level"
 msgstr ""
 
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928 src/minoltamn.cpp:1520
 msgid "AF Assist"
 msgstr "Asistent AZ"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:818
+#: src/canonmn.cpp:928
 msgid "AF assist light"
 msgstr "Svetlo asistenta AZ"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Flash Sync Speed Av"
 msgstr "Blesk synch. rýchlosť Av"
 
-#: src/canonmn.cpp:819
+#: src/canonmn.cpp:929
 msgid "Shutter speed in Av mode"
 msgstr "Rýchlosť uzávierky v režime Av"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB Sequence"
 msgstr "Poradové číslo AEB"
 
-#: src/canonmn.cpp:820
+#: src/canonmn.cpp:930
 msgid "AEB sequence/auto cancellation"
 msgstr ""
 
 # exif-exposureprogram-4
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 #, fuzzy
 msgid "Shutter Curtain Sync"
 msgstr "priorita uzávierky"
 
 # exif-exposureprogram-4
-#: src/canonmn.cpp:821
+#: src/canonmn.cpp:931
 #, fuzzy
 msgid "Shutter curtain sync"
 msgstr "priorita uzávierky"
 
 # TODO: check
-#: src/canonmn.cpp:822
+#: src/canonmn.cpp:932
 #, fuzzy
 msgid "Lens AF Stop Button"
 msgstr "F stops šošoviek"
 
-#: src/canonmn.cpp:822
+# TODO: check
+#: src/canonmn.cpp:932
+#, fuzzy
 msgid "Lens AF stop button Fn. Switch"
-msgstr ""
+msgstr "F stops šošoviek"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Fill Flash Auto Reduction"
 msgstr "Blesk sa spustí automatická redukcia"
 
-#: src/canonmn.cpp:823
+#: src/canonmn.cpp:933
 msgid "Auto reduction of fill flash"
 msgstr "Automatická redukcia alebo blesk sa spustí"
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu Button Return"
 msgstr "Tlačidlo menu Návrat"
 
-#: src/canonmn.cpp:824
+#: src/canonmn.cpp:934
 msgid "Menu button return position"
 msgstr "Poloha tlačidla menu Návrat"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "Set Button Function"
 msgstr "Nastavenie funkcie tlačidla"
 
-#: src/canonmn.cpp:825
+#: src/canonmn.cpp:935
 msgid "SET button func. when shooting"
 msgstr ""
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor Cleaning"
 msgstr "Čistenie snímača"
 
-#: src/canonmn.cpp:826
+#: src/canonmn.cpp:936
 msgid "Sensor cleaning"
 msgstr "Vyčistenie snímača"
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed Display"
 msgstr ""
 
-#: src/canonmn.cpp:827
+#: src/canonmn.cpp:937
 msgid "Superimposed display"
 msgstr ""
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release No CF Card"
 msgstr "Uvoľnenie spúšte Žiadna CF karta"
 
-#: src/canonmn.cpp:828
+#: src/canonmn.cpp:938
 msgid "Shutter Release W/O CF Card"
 msgstr "Uvoľnenie spúšte bez CF karty"
 
-#: src/canonmn.cpp:830
+#: src/canonmn.cpp:940
 msgid "Unknown Canon Custom Function tag"
 msgstr "Neznáma značka Canon Custom Function"
 
-#: src/canonmn.cpp:841
+#: src/canonmn.cpp:951
 msgid "mid-right"
 msgstr "v strede vpravo"
 
-#: src/canonmn.cpp:842 src/canonmn.cpp:859
+#: src/canonmn.cpp:952 src/canonmn.cpp:969
 msgid "bottom"
 msgstr "dolu"
 
-#: src/canonmn.cpp:844 src/canonmn.cpp:851
+#: src/canonmn.cpp:954 src/canonmn.cpp:961
 msgid "top"
 msgstr "hore"
 
-#: src/canonmn.cpp:845
+#: src/canonmn.cpp:955
 msgid "mid-left"
 msgstr "v strede vľavo"
 
-#: src/canonmn.cpp:852
+#: src/canonmn.cpp:962
 msgid "upper-left"
 msgstr "vyššie vľavo"
 
-#: src/canonmn.cpp:853
+#: src/canonmn.cpp:963
 msgid "upper-right"
 msgstr "vyššie vpravo"
 
-#: src/canonmn.cpp:857
+#: src/canonmn.cpp:967
 msgid "lower-left"
 msgstr "nižšie vľavo"
 
-#: src/canonmn.cpp:858
+#: src/canonmn.cpp:968
 msgid "lower-right"
 msgstr "nižšie vpravo"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:343 src/panasonicmn.cpp:335
-#: src/properties.cpp:450 src/tags.cpp:349
+#: src/canonmn.cpp:974 src/olympusmn.cpp:225 src/olympusmn.cpp:405
+#: src/panasonicmn.cpp:341 src/properties.cpp:466 src/tags.cpp:420
 msgid "Image Width"
 msgstr "Šírka obrázka"
 
-#: src/canonmn.cpp:864 src/olympusmn.cpp:344 src/panasonicmn.cpp:335
-#: src/tags.cpp:1677
+#: src/canonmn.cpp:974 src/olympusmn.cpp:226 src/olympusmn.cpp:406
+#: src/panasonicmn.cpp:341 src/tags.cpp:1867
 msgid "Image width"
 msgstr "Šírka obrázka"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:346 src/panasonicmn.cpp:334
+#: src/canonmn.cpp:975 src/olympusmn.cpp:228 src/olympusmn.cpp:408
+#: src/panasonicmn.cpp:340
 msgid "Image Height"
 msgstr "Výška obrázka"
 
-#: src/canonmn.cpp:865 src/olympusmn.cpp:347 src/panasonicmn.cpp:334
-#: src/tags.cpp:1680
+#: src/canonmn.cpp:975 src/olympusmn.cpp:229 src/olympusmn.cpp:409
+#: src/panasonicmn.cpp:340 src/tags.cpp:1870
 msgid "Image height"
 msgstr "Dĺžka obrázka"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image Width As Shot"
 msgstr "šírka obrázka ako bol odfotený"
 
-#: src/canonmn.cpp:866
+#: src/canonmn.cpp:976
 msgid "Image width (as shot)"
 msgstr "šírka obrázka (ako bol odfotený)"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
 msgid "Image Height As Shot"
 msgstr "výška obrázka (ako bol odfotený)"
 
-#: src/canonmn.cpp:867
+#: src/canonmn.cpp:977
+#, fuzzy
 msgid "Image height (as shot)"
-msgstr ""
+msgstr "šírka obrázka (ako bol odfotený)"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF Points Used"
 msgstr "Použité body automatického zaostrenia"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:868
+#: src/canonmn.cpp:978 src/nikonmn.cpp:826
 msgid "AF points used"
 msgstr "Použité body automatického zaostrenia"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:869
+#: src/canonmn.cpp:979
 msgid "AF Points Used 20D"
 msgstr "Použité body automatického zaostrenia 20D"
 
-#: src/canonmn.cpp:869
+# AF = automatické zaostrenie
+#: src/canonmn.cpp:979
+#, fuzzy
 msgid "AF points used (20D)"
-msgstr ""
+msgstr "Použité body automatického zaostrenia 20D"
 
-#: src/canonmn.cpp:871
+#: src/canonmn.cpp:981
 msgid "Unknown Canon Picture Info tag"
 msgstr "Neznáma značka Canon Picture Info"
 
-#: src/canonmn.cpp:882
+#: src/canonmn.cpp:992
 msgid "AEB"
 msgstr ""
 
-#: src/canonmn.cpp:883
+#: src/canonmn.cpp:993
 msgid "FEB"
 msgstr ""
 
-#: src/canonmn.cpp:884 src/nikonmn.cpp:732 src/nikonmn.cpp:874
-#: src/nikonmn.cpp:934 src/nikonmn.cpp:970
+#: src/canonmn.cpp:994 src/minoltamn.cpp:511 src/nikonmn.cpp:745
+#: src/nikonmn.cpp:1114 src/nikonmn.cpp:1174 src/nikonmn.cpp:1210
+#, fuzzy
 msgid "ISO"
-msgstr ""
+msgstr "Info o snímke"
 
-#: src/canonmn.cpp:885
+#: src/canonmn.cpp:995
 msgid "WB"
 msgstr ""
 
-#: src/canonmn.cpp:896
+#: src/canonmn.cpp:1006
 msgid "Postcard"
 msgstr ""
 
-#: src/canonmn.cpp:897
+#: src/canonmn.cpp:1007
 msgid "Widescreen"
 msgstr ""
 
-#: src/canonmn.cpp:898
+#: src/canonmn.cpp:1008
 #, fuzzy
 msgid "Medium Movie"
 msgstr "stredný 1"
 
-#: src/canonmn.cpp:899
+#: src/canonmn.cpp:1009
 #, fuzzy
 msgid "Small Movie"
 msgstr "Film"
 
-#: src/canonmn.cpp:905
+#: src/canonmn.cpp:1015
 #, fuzzy
 msgid "On 1"
 msgstr "zapnutý"
 
-#: src/canonmn.cpp:906
+#: src/canonmn.cpp:1016
 #, fuzzy
 msgid "On 2"
 msgstr "zapnutý"
 
 # AF = automatické zaostrenie
-#: src/canonmn.cpp:914
+#: src/canonmn.cpp:1024
 #, fuzzy
 msgid "On (shift AB)"
 msgstr "automatické zaostrenie pre jeden záber"
 
-#: src/canonmn.cpp:915
+# AF = automatické zaostrenie
+#: src/canonmn.cpp:1025
+#, fuzzy
 msgid "On (shift GM)"
-msgstr ""
+msgstr "automatické zaostrenie pre jeden záber"
 
-#: src/canonmn.cpp:921 src/nikonmn.cpp:653 src/nikonmn.cpp:666
-#: src/olympusmn.cpp:583 src/olympusmn.cpp:801
+#: src/canonmn.cpp:1031 src/nikonmn.cpp:666 src/nikonmn.cpp:679
+#: src/nikonmn.cpp:973 src/olympusmn.cpp:622 src/olympusmn.cpp:862
 msgid "Yellow"
 msgstr ""
 
-#: src/canonmn.cpp:922 src/nikonmn.cpp:654 src/olympusmn.cpp:584
-#: src/olympusmn.cpp:802
+#: src/canonmn.cpp:1032 src/nikonmn.cpp:667 src/olympusmn.cpp:623
+#: src/olympusmn.cpp:863
 #, fuzzy
 msgid "Orange"
 msgstr "V diaľke"
 
-#: src/canonmn.cpp:923 src/nikonmn.cpp:655 src/nikonmn.cpp:665
-#: src/olympusmn.cpp:585 src/olympusmn.cpp:803
+#: src/canonmn.cpp:1033 src/nikonmn.cpp:668 src/nikonmn.cpp:678
+#: src/nikonmn.cpp:971 src/olympusmn.cpp:624 src/olympusmn.cpp:864
 #, fuzzy
 msgid "Red"
 msgstr "Červené oči"
 
-#: src/canonmn.cpp:924 src/canonmn.cpp:933 src/nikonmn.cpp:656
-#: src/nikonmn.cpp:667 src/olympusmn.cpp:586 src/olympusmn.cpp:596
-#: src/olympusmn.cpp:804 src/olympusmn.cpp:813
+#: src/canonmn.cpp:1034 src/canonmn.cpp:1043 src/nikonmn.cpp:669
+#: src/nikonmn.cpp:680 src/olympusmn.cpp:625 src/olympusmn.cpp:635
+#: src/olympusmn.cpp:865 src/olympusmn.cpp:874
 #, fuzzy
 msgid "Green"
 msgstr "Zelený odtieň"
 
-#: src/canonmn.cpp:931 src/nikonmn.cpp:669 src/olympusmn.cpp:594
-#: src/olympusmn.cpp:811
+#: src/canonmn.cpp:1041 src/nikonmn.cpp:682 src/nikonmn.cpp:972
+#: src/olympusmn.cpp:633 src/olympusmn.cpp:872
 #, fuzzy
 msgid "Blue"
 msgstr "hodnota"
 
-#: src/canonmn.cpp:932 src/olympusmn.cpp:595 src/olympusmn.cpp:812
+#: src/canonmn.cpp:1042 src/olympusmn.cpp:634 src/olympusmn.cpp:873
 msgid "Purple"
 msgstr ""
 
-#: src/canonmn.cpp:939
+#: src/canonmn.cpp:1049
 #, fuzzy
 msgid "Bracket Mode"
 msgstr "Krok viacnásobného záberu"
 
-#: src/canonmn.cpp:940
+#: src/canonmn.cpp:1050
 #, fuzzy
 msgid "Bracket Value"
 msgstr "Krok viacnásobného záberu"
 
-#: src/canonmn.cpp:941
+#: src/canonmn.cpp:1051
 #, fuzzy
 msgid "Bracket Shot Number"
 msgstr "Krok viacnásobného záberu"
 
-#: src/canonmn.cpp:942
+#: src/canonmn.cpp:1052
 #, fuzzy
 msgid "Raw Jpg Quality"
 msgstr "Kvalita obrázka"
 
-#: src/canonmn.cpp:943
+#: src/canonmn.cpp:1053
 #, fuzzy
 msgid "Raw Jpg Size"
 msgstr "Veľkosť obrázka"
 
-#: src/canonmn.cpp:945
+#: src/canonmn.cpp:1055
 #, fuzzy
 msgid "WB Bracket Mode"
 msgstr "Krok viacnásobného záberu"
 
-#: src/canonmn.cpp:946
+#: src/canonmn.cpp:1056
 #, fuzzy
 msgid "WB Bracket Value AB"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/canonmn.cpp:947
+#: src/canonmn.cpp:1057
 #, fuzzy
 msgid "WB Bracket Value GM"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/canonmn.cpp:948 src/nikonmn.cpp:687
+#: src/canonmn.cpp:1058 src/nikonmn.cpp:700
 #, fuzzy
 msgid "Filter Effect"
 msgstr "Farebný efekt"
 
-#: src/canonmn.cpp:949 src/nikonmn.cpp:688
+#: src/canonmn.cpp:1059 src/nikonmn.cpp:701
 #, fuzzy
 msgid "Toning Effect"
 msgstr "fotoefekt"
 
-#: src/canonmn.cpp:951
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro Magnification"
+msgstr "Elektromagnetické zväčšenie"
+
+#: src/canonmn.cpp:1060
+#, fuzzy
+msgid "Macro magnification"
+msgstr "Elektromagnetické zväčšenie"
+
+#: src/canonmn.cpp:1061
+msgid "Live View Shooting"
+msgstr ""
+
+#: src/canonmn.cpp:1061
+#, fuzzy
+msgid "Live view shooting"
+msgstr "Nastavenie režimu jazda autom"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash Exposure Lock"
+msgstr "Kompenzácia expozície blesku"
+
+#: src/canonmn.cpp:1062
+#, fuzzy
+msgid "Flash exposure lock"
+msgstr "Kompenzácia expozície blesku"
+
+#: src/canonmn.cpp:1064
 #, fuzzy
 msgid "Unknown Canon File Info tag"
 msgstr "Neznáma značka Canon Picture Info"
 
-#: src/crwimage.cpp:663
+#: src/canonmn.cpp:1074 src/canonmn.cpp:1084 src/canonmn.cpp:1092
+#: src/canonmn.cpp:1105 src/fujimn.cpp:147 src/fujimn.cpp:154
+#: src/minoltamn.cpp:77 src/minoltamn.cpp:245 src/minoltamn.cpp:1135
+#: src/minoltamn.cpp:1221 src/minoltamn.cpp:1884 src/minoltamn.cpp:1973
+#: src/minoltamn.cpp:2007 src/minoltamn.cpp:2033 src/minoltamn.cpp:2059
+#: src/olympusmn.cpp:93 src/olympusmn.cpp:1135 src/panasonicmn.cpp:167
+#: src/panasonicmn.cpp:174 src/panasonicmn.cpp:204 src/pentaxmn.cpp:470
+#: src/sonymn.cpp:150 src/sonymn.cpp:475 src/sonymn.cpp:505 src/tags.cpp:1323
+msgid "Standard"
+msgstr "Štandardný"
+
+#: src/canonmn.cpp:1082
+#, fuzzy
+msgid "Lowest"
+msgstr "vľavo dolu"
+
+#: src/canonmn.cpp:1086
+#, fuzzy
+msgid "Highest"
+msgstr "vysoká"
+
+#: src/canonmn.cpp:1094
+#, fuzzy
+msgid "High Saturation"
+msgstr "Sýtosť"
+
+#: src/canonmn.cpp:1096
+#, fuzzy
+msgid "Low Saturation"
+msgstr "Sýtosť"
+
+#: src/canonmn.cpp:1097
+#, fuzzy
+msgid "CM Set 1"
+msgstr "PC Set 1"
+
+#: src/canonmn.cpp:1098
+#, fuzzy
+msgid "CM Set 2"
+msgstr "PC Set 2"
+
+#: src/canonmn.cpp:1099
+msgid "User Def. 1"
+msgstr ""
+
+#: src/canonmn.cpp:1100
+msgid "User Def. 2"
+msgstr ""
+
+#: src/canonmn.cpp:1101
+msgid "User Def. 3"
+msgstr ""
+
+#: src/canonmn.cpp:1102
+msgid "PC 1"
+msgstr ""
+
+#: src/canonmn.cpp:1103
+msgid "PC 2"
+msgstr ""
+
+#: src/canonmn.cpp:1104
+msgid "PC 3"
+msgstr ""
+
+#: src/canonmn.cpp:1109
+msgid "Faithful"
+msgstr ""
+
+#: src/canonmn.cpp:1110 src/minoltamn.cpp:903 src/minoltamn.cpp:953
+#: src/nikonmn.cpp:423 src/pentaxmn.cpp:707
+msgid "Monochrome"
+msgstr "jednofarebné"
+
+#: src/canonmn.cpp:1115
+#, fuzzy
+msgid "ToneCurve"
+msgstr "Krivka tónu"
+
+#: src/canonmn.cpp:1115
+msgid "Tone curve"
+msgstr "Krivka tónu"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "SharpnessFrequency"
+msgstr "Ostrosť"
+
+#: src/canonmn.cpp:1117
+#, fuzzy
+msgid "Sharpness frequency"
+msgstr "Ostrosť"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "SensorRedLevel"
+msgstr "WB_RGGBLevelsShade"
+
+#: src/canonmn.cpp:1118
+#, fuzzy
+msgid "Sensor red level"
+msgstr "Úroveň čiernej"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "SensorBlueLevel"
+msgstr "WB_RGGBLevelsShade"
+
+#: src/canonmn.cpp:1119
+#, fuzzy
+msgid "Sensor blue level"
+msgstr "Úroveň čiernej"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "WhiteBalanceRed"
+msgstr "Vyváženie bielej"
+
+#: src/canonmn.cpp:1120
+#, fuzzy
+msgid "White balance red"
+msgstr "Vyváženie bielej"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "WhiteBalanceBlue"
+msgstr "Tabuľka vyváženia bielej"
+
+#: src/canonmn.cpp:1121
+#, fuzzy
+msgid "White balance blue"
+msgstr "Tabuľka vyváženia bielej"
+
+#: src/canonmn.cpp:1122
+#, fuzzy
+msgid "WhiteBalance"
+msgstr "Vyváženie bielej"
+
+#: src/canonmn.cpp:1123
+#, fuzzy
+msgid "ColorTemperature"
+msgstr "Farebná teplota"
+
+#: src/canonmn.cpp:1123 src/minoltamn.cpp:156 src/minoltamn.cpp:786
+#: src/minoltamn.cpp:1038 src/minoltamn.cpp:1053 src/minoltamn.cpp:1054
+#: src/minoltamn.cpp:1475 src/minoltamn.cpp:1577 src/olympusmn.cpp:833
+#: src/sonymn.cpp:357 src/sonymn.cpp:358
+msgid "Color Temperature"
+msgstr "Farebná teplota"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "PictureStyle"
+msgstr "Režim obrázka"
+
+#: src/canonmn.cpp:1124
+#, fuzzy
+msgid "Picture style"
+msgstr "Režim obrázka"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "DigitalGain"
+msgstr "digitálne makro"
+
+#: src/canonmn.cpp:1125
+#, fuzzy
+msgid "Digital gain"
+msgstr "digitálne makro"
+
+#: src/canonmn.cpp:1126
+msgid "WBShiftAB"
+msgstr ""
+
+# AF = automatické zaostrenie
+#: src/canonmn.cpp:1126
+#, fuzzy
+msgid "WBShift AB"
+msgstr "automatické zaostrenie pre jeden záber"
+
+#: src/canonmn.cpp:1127
+msgid "WBShiftGM"
+msgstr ""
+
+# AF = automatické zaostrenie
+#: src/canonmn.cpp:1127
+#, fuzzy
+msgid "WB Shift GM"
+msgstr "automatické zaostrenie pre jeden záber"
+
+#: src/canonmn.cpp:1128
+#, fuzzy
+msgid "Unknown Canon Processing Info tag"
+msgstr "Neznáma značka Canon Picture Info"
+
+#: src/crwimage.cpp:664
 msgid "Header, offset"
 msgstr "Hlavička, ofset"
 
-#: src/crwimage.cpp:680
+#: src/crwimage.cpp:681
 msgid "tag"
 msgstr "značka"
 
-#: src/crwimage.cpp:682
+#: src/crwimage.cpp:683
 msgid "dir"
 msgstr "priečinok"
 
-#: src/crwimage.cpp:684
+#: src/crwimage.cpp:685
 msgid "type"
 msgstr "typ"
 
-#: src/crwimage.cpp:685
+#: src/crwimage.cpp:686
 msgid "size"
 msgstr "veľkosť"
 
-#: src/crwimage.cpp:686
+#: src/crwimage.cpp:687
 msgid "offset"
 msgstr "ofset"
 
@@ -2402,8 +3021,8 @@
 "Binárne číslo, ktoré identifikuje verziu Modelu na výmenu informácií, časť "
 "1, ktorú používa poskytovateľ. Čísla verzií priraďujú organizácie IPTC a NAA."
 
-#: src/datasets.cpp:90 src/panasonicmn.cpp:214 src/pentaxmn.cpp:320
-#: src/pentaxmn.cpp:872 src/pentaxmn.cpp:873
+#: src/datasets.cpp:90 src/panasonicmn.cpp:220 src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:962 src/pentaxmn.cpp:963
 msgid "Destination"
 msgstr "Cieľ"
 
@@ -2415,7 +3034,7 @@
 "Táto množina údajov slúži pre niektorých poskytovateľov, ktorí vyžadujú "
 "tieto smerovacie informácie nad príslušnými vrstvami modelu OSI."
 
-#: src/datasets.cpp:94
+#: src/datasets.cpp:94 src/sonymn.cpp:348 src/sonymn.cpp:349
 msgid "File Format"
 msgstr "Formát súboru"
 
@@ -2531,8 +3150,9 @@
 msgstr ""
 
 #: src/datasets.cpp:145
+#, fuzzy
 msgid "Unique Name Object"
-msgstr ""
+msgstr "Jedinečný model fotoaparátu"
 
 #: src/datasets.cpp:146
 msgid ""
@@ -2557,21 +3177,27 @@
 msgstr "Verzia ARM"
 
 #: src/datasets.cpp:157
+#, fuzzy
 msgid ""
 "This tag consisting of a binary number representing the particular version "
 "of the ARM specified by tag <ARMId>."
 msgstr ""
+"Binárne číslo, ktoré predstavuje konkrétnu verziu Formátu súboru, ktorý "
+"špecifikuje značka <FileFormat>."
 
 #: src/datasets.cpp:170
 msgid "Record Version"
 msgstr "Verzia záznamu"
 
 #: src/datasets.cpp:171
+#, fuzzy
 msgid ""
 "A binary number identifying the version of the Information Interchange "
 "Model, Part II, utilised by the provider. Version numbers are assigned by "
 "IPTC and NAA organizations."
 msgstr ""
+"Binárne číslo, ktoré identifikuje verziu Modelu na výmenu informácií, časť "
+"1, ktorú používa poskytovateľ. Čísla verzií priraďujú organizácie IPTC a NAA."
 
 #: src/datasets.cpp:175
 msgid "Object Type"
@@ -2617,7 +3243,7 @@
 msgid "Document Title"
 msgstr "Názov dokumentu"
 
-#: src/datasets.cpp:199 src/olympusmn.cpp:759
+#: src/datasets.cpp:199 src/olympusmn.cpp:820
 msgid "Edit Status"
 msgstr "Upraviť stav"
 
@@ -2636,18 +3262,18 @@
 "<ARMVersion>, according to the practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:389
+#: src/datasets.cpp:207 src/datasets.cpp:212 src/properties.cpp:405
 msgid "Urgency"
 msgstr "Súrnosť"
 
 #: src/datasets.cpp:208
 msgid ""
 "Specifies the editorial urgency of content and not necessarily the envelope "
-"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, \"5"
-"\" normal and \"8\" denotes the least-urgent copy."
+"handling priority (see tag <EnvelopePriority>). The \"1\" is most urgent, "
+"\"5\" normal and \"8\" denotes the least-urgent copy."
 msgstr ""
 
-#: src/datasets.cpp:213 src/properties.cpp:149
+#: src/datasets.cpp:213 src/properties.cpp:157
 msgid "Subject"
 msgstr "Predmet"
 
@@ -2655,7 +3281,7 @@
 msgid "The Subject Reference is a structured definition of the subject matter."
 msgstr ""
 
-#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:375
+#: src/datasets.cpp:216 src/datasets.cpp:221 src/properties.cpp:391
 msgid "Category"
 msgstr "Kategória"
 
@@ -2678,7 +3304,7 @@
 "to the provider."
 msgstr ""
 
-#: src/datasets.cpp:228 src/properties.cpp:387
+#: src/datasets.cpp:228 src/properties.cpp:403
 msgid "Supplemental Categories"
 msgstr "Dodatočné kategórie"
 
@@ -2692,7 +3318,7 @@
 "immediately find or recall such an object."
 msgstr ""
 
-#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:365
+#: src/datasets.cpp:233 src/datasets.cpp:239 src/properties.cpp:381
 msgid "Keywords"
 msgstr "Kľúčové slová"
 
@@ -2729,7 +3355,7 @@
 "provider."
 msgstr ""
 
-#: src/datasets.cpp:253 src/properties.cpp:328
+#: src/datasets.cpp:253 src/properties.cpp:344
 msgid "Release Date"
 msgstr "Dátum vydania"
 
@@ -2779,7 +3405,7 @@
 "embargoes and warnings."
 msgstr ""
 
-#: src/datasets.cpp:273 src/properties.cpp:384
+#: src/datasets.cpp:273 src/properties.cpp:400
 msgid "Instructions"
 msgstr "Inštrukcie"
 
@@ -2823,7 +3449,7 @@
 "object refers."
 msgstr ""
 
-#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:379
+#: src/datasets.cpp:289 src/datasets.cpp:294 src/properties.cpp:395
 msgid "Date Created"
 msgstr "Dátum vytvorenia"
 
@@ -2865,9 +3491,10 @@
 "representation of the object data was created. Follows ISO 8601 standard."
 msgstr ""
 
-#: src/datasets.cpp:310 src/minoltamn.cpp:305 src/minoltamn.cpp:776
-#: src/minoltamn.cpp:980 src/olympusmn.cpp:421 src/panasonicmn.cpp:102
-#: src/pentaxmn.cpp:409 src/pentaxmn.cpp:464 src/sigmamn.cpp:151
+#: src/datasets.cpp:310 src/minoltamn.cpp:201 src/minoltamn.cpp:655
+#: src/minoltamn.cpp:835 src/olympusmn.cpp:483 src/panasonicmn.cpp:106
+#: src/pentaxmn.cpp:468 src/pentaxmn.cpp:526 src/sigmamn.cpp:154
+#: src/sonymn.cpp:110
 msgid "Program"
 msgstr "Program"
 
@@ -2915,7 +3542,7 @@
 "Where used, a by-line title should follow the by-line it modifies."
 msgstr ""
 
-#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:376
+#: src/datasets.cpp:328 src/datasets.cpp:332 src/properties.cpp:392
 msgid "City"
 msgstr "Mesto"
 
@@ -2949,7 +3576,7 @@
 msgid "State/Province"
 msgstr "Štát/provincia"
 
-#: src/datasets.cpp:342 src/properties.cpp:619
+#: src/datasets.cpp:342 src/properties.cpp:635
 msgid "Country Code"
 msgstr "Kód krajiny"
 
@@ -2975,11 +3602,11 @@
 "guidelines of the provider."
 msgstr ""
 
-#: src/datasets.cpp:357 src/properties.cpp:377
+#: src/datasets.cpp:357 src/properties.cpp:393
 msgid "Country"
 msgstr "Krajina"
 
-#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:388
+#: src/datasets.cpp:358 src/datasets.cpp:362 src/properties.cpp:404
 msgid "Transmission Reference"
 msgstr "Osvedčenie na prenos"
 
@@ -2989,7 +3616,7 @@
 "practices of the provider."
 msgstr ""
 
-#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:383
+#: src/datasets.cpp:363 src/datasets.cpp:366 src/properties.cpp:399
 msgid "Headline"
 msgstr "Nadpis"
 
@@ -2998,7 +3625,7 @@
 "A publishable entry providing a synopsis of the contents of the object data."
 msgstr ""
 
-#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:378
+#: src/datasets.cpp:367 src/datasets.cpp:370 src/properties.cpp:394
 msgid "Credit"
 msgstr "Pôvodca"
 
@@ -3008,8 +3635,8 @@
 "creator."
 msgstr ""
 
-#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:148
-#: src/properties.cpp:385
+#: src/datasets.cpp:371 src/datasets.cpp:375 src/properties.cpp:156
+#: src/properties.cpp:401
 msgid "Source"
 msgstr "Zdroj"
 
@@ -3029,7 +3656,7 @@
 msgid "Copyright Notice"
 msgstr "Oznam autorských práv"
 
-#: src/datasets.cpp:380
+#: src/datasets.cpp:380 src/properties.cpp:923 src/properties.cpp:932
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -3047,7 +3674,7 @@
 msgid "A textual description of the object data."
 msgstr ""
 
-#: src/datasets.cpp:387 src/properties.cpp:133
+#: src/datasets.cpp:387 src/properties.cpp:141
 msgid "Description"
 msgstr "Popis"
 
@@ -3083,7 +3710,7 @@
 msgid "Indicates the layout of an image."
 msgstr "Rozloženie obrázka."
 
-#: src/datasets.cpp:402 src/properties.cpp:139
+#: src/datasets.cpp:402 src/properties.cpp:147
 msgid "Language"
 msgstr "Jazyk"
 
@@ -3107,16 +3734,18 @@
 msgstr "Rýchlosť zvuku"
 
 #: src/datasets.cpp:412
+#, fuzzy
 msgid "Indicates the sampling rate in Hertz of an audio content."
-msgstr ""
+msgstr "Zobrazuje dĺžku trvania zvukového obsahu"
 
 #: src/datasets.cpp:414
 msgid "Audio Resolution"
 msgstr "Rozlíšenie zvuku"
 
 #: src/datasets.cpp:415
+#, fuzzy
 msgid "Indicates the sampling resolution of an audio content."
-msgstr ""
+msgstr "Zobrazuje dĺžku trvania zvukového obsahu"
 
 #: src/datasets.cpp:417
 msgid "Audio Duration"
@@ -3152,10 +3781,13 @@
 msgstr "Verzia náhľadu"
 
 #: src/datasets.cpp:430
+#, fuzzy
 msgid ""
 "A binary number representing the particular version of the object data "
 "preview file format specified in tag <PreviewFormat>."
 msgstr ""
+"Binárne číslo, ktoré predstavuje konkrétnu verziu Formátu súboru, ktorý "
+"špecifikuje značka <FileFormat>."
 
 #: src/datasets.cpp:433
 msgid "Preview Data"
@@ -3173,225 +3805,228 @@
 msgid "Unknown dataset"
 msgstr "Neznáma množina údajov"
 
-#: src/error.cpp:49
-msgid "Error %0: arg1=%1, arg2=%2, arg3=%3."
+#: src/error.cpp:55
+#, fuzzy
+msgid "Error %0: arg2=%2, arg3=%3, arg1=%1."
 msgstr "Chyba %0: arg1=%1, arg2=%2, arg3=%3."
 
-#: src/error.cpp:50
+#: src/error.cpp:56
 msgid "Success"
 msgstr "Úspešné"
 
-#: src/error.cpp:53
+#: src/error.cpp:59
 msgid "This does not look like a %1 image"
 msgstr "Toto nevyzerá ako obrázok %1"
 
-#: src/error.cpp:54
+#: src/error.cpp:60
 msgid "Invalid dataset name `%1'"
 msgstr "Chybný názov množiny údajov „%1“"
 
-#: src/error.cpp:55
+#: src/error.cpp:61
 msgid "Invalid record name `%1'"
 msgstr "Neplatný názov záznamu „%1“"
 
-#: src/error.cpp:56
+#: src/error.cpp:62
 msgid "Invalid key `%1'"
 msgstr "Neplatný kľúč „%1“"
 
-#: src/error.cpp:57
+#: src/error.cpp:63
 msgid "Invalid tag name or ifdId `%1', ifdId %2"
 msgstr "neplatný názov značky alebo ifdId „%1“, ifdId %2"
 
-#: src/error.cpp:58
+#: src/error.cpp:64
 msgid "Value not set"
 msgstr "Nenastavená hodnota"
 
-#: src/error.cpp:59
+#: src/error.cpp:65
 msgid "%1: Failed to open the data source: %2"
 msgstr "%1: Nepodarilo sa otvoriť zdroj dát: %2"
 
-#: src/error.cpp:60
+#: src/error.cpp:66
 msgid "%1: Failed to open file (%2): %3"
 msgstr "%1: Nepodarilo sa otvoriť súbor (%2): %3"
 
-#: src/error.cpp:61
+#: src/error.cpp:67
 msgid "%1: The file contains data of an unknown image type"
 msgstr "%1: Súbor obsahuje dáta neznámeho typu obrázka"
 
-#: src/error.cpp:62
+#: src/error.cpp:68
 msgid "The memory contains data of an unknown image type"
 msgstr "Pamäť obsahuje dáta neznámeho typu obrázka"
 
-#: src/error.cpp:63
+#: src/error.cpp:69
 msgid "Image type %1 is not supported"
 msgstr "Typ obrázka %1 nie je podporovaný"
 
-#: src/error.cpp:64
+#: src/error.cpp:70
 msgid "Failed to read image data"
 msgstr "Nepodarilo sa načítať obrazové údaje"
 
-#: src/error.cpp:65
+#: src/error.cpp:71
 msgid "This does not look like a JPEG image"
 msgstr "Toto nevyzerá na JPEG obrázok"
 
-#: src/error.cpp:67
+#: src/error.cpp:72
+#, fuzzy
+msgid "%1: Failed to map file for reading and writing: %2"
+msgstr "Nepodarilo sa otvoriť súbor s príkazmi na čítanie\n"
+
+#: src/error.cpp:73
 msgid "%1: Failed to rename file to %2: %3"
 msgstr "%1: Nepodarilo sa premenovať súbor na %2: %3"
 
-#: src/error.cpp:68
+#: src/error.cpp:74
 msgid "%1: Transfer failed: %2"
 msgstr "%1: Prenos zlyhal: %2"
 
-#: src/error.cpp:69
+#: src/error.cpp:75
 msgid "Memory transfer failed: %1"
 msgstr "Prenos z pamäte zlyhal: %1"
 
-#: src/error.cpp:70
+#: src/error.cpp:76
 msgid "Failed to read input data"
 msgstr "Nepodarilo sa načítať vstupné údaje"
 
-#: src/error.cpp:71
+#: src/error.cpp:77
 msgid "Failed to write image"
 msgstr "Nepodarilo sa zapísať obrázok"
 
-#: src/error.cpp:72
+#: src/error.cpp:78
 msgid "Input data does not contain a valid image"
 msgstr "Vstupné dáta neobsahujú podporovaný obrázok"
 
-#: src/error.cpp:73
+#: src/error.cpp:79
 #, fuzzy
 msgid "Invalid ifdId %1"
 msgstr "Neplatný kľúč „%1“"
 
-#: src/error.cpp:74
+#: src/error.cpp:80
 msgid "Entry::setValue: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
-"Entry::setValue: Hodnota je príliš veľká (značka=%1, veľkosť=%2, požadovaná=%"
-"3)"
+"Entry::setValue: Hodnota je príliš veľká (značka=%1, veľkosť=%2, požadovaná="
+"%3)"
 
-#: src/error.cpp:75
+#: src/error.cpp:81
 msgid "Entry::setDataArea: Value too large (tag=%1, size=%2, requested=%3)"
 msgstr ""
 "Entry::setDataArea: Hodnota je príliš veľká (značka=%1, veľkosť=%2, "
 "požadovaná=%3)"
 
-#: src/error.cpp:76
+#: src/error.cpp:82
 msgid "Offset out of range"
 msgstr "Ofset mimo rozsahu"
 
-#: src/error.cpp:77
+#: src/error.cpp:83
 msgid "Unsupported data area offset type"
 msgstr "Nepodporovaný typ ofsetu oblasti údajov"
 
-#: src/error.cpp:78
+#: src/error.cpp:84
 msgid "Invalid charset: `%1'"
 msgstr "Neplatná znaková sada: „%1“"
 
-#: src/error.cpp:79
+#: src/error.cpp:85
 msgid "Unsupported date format"
 msgstr "Nepodporovaný formát dátumu"
 
-#: src/error.cpp:80
+#: src/error.cpp:86
 msgid "Unsupported time format"
 msgstr "Nepodporovaný formát času"
 
-#: src/error.cpp:81
+#: src/error.cpp:87
 #, fuzzy
 msgid "Writing to %1 images is not supported"
 msgstr "Zapisovanie do obrázkov „%2“ nie je podporované"
 
-#: src/error.cpp:82
+#: src/error.cpp:88
 msgid "Setting %1 in %2 images is not supported"
 msgstr "Voľba %1 v %2 obrázkoch nie je povolené"
 
-#: src/error.cpp:83
+#: src/error.cpp:89
 msgid "This does not look like a CRW image"
 msgstr "Toto nevyzerá na CRW obrázok"
 
-#: src/error.cpp:84
+#: src/error.cpp:90
 msgid "%1: Not supported"
 msgstr "%1: Nepodporovaný"
 
-#: src/error.cpp:85
+#: src/error.cpp:91
 msgid "No namespace info available for XMP prefix `%1'"
 msgstr "Nie sú dostupné informácie mennom priestore XMP predpony „%1“"
 
-#: src/error.cpp:86
+#: src/error.cpp:92
 #, fuzzy
 msgid "No prefix registered for namespace `%2', needed for property path `%1'"
 msgstr "Pre menný priestor „%1“ nie je zaregistrovaná predpona"
 
-#: src/error.cpp:87
+#: src/error.cpp:93
 msgid "Size of %1 JPEG segment is larger than 65535 bytes"
 msgstr "Veľkosť %1 JPEG časti je väčšia ako 65535 bajtov"
 
-#: src/error.cpp:88
+#: src/error.cpp:94
 msgid "Unhandled Xmpdatum %1 of type %2"
 msgstr "Xmpdatum %1 typu %2 bez obsluhy"
 
-#: src/error.cpp:89
+#: src/error.cpp:95
 msgid "Unhandled XMP node %1 with opt=%2"
 msgstr "XMP uzol %1 s opt=%2 bez obsluhy"
 
-#: src/error.cpp:90
+#: src/error.cpp:96
 msgid "XMP Toolkit error %1: %2"
 msgstr "Chyba XMP Toolkit %1: %2"
 
-#: src/error.cpp:91
+#: src/error.cpp:97
 msgid "Failed to decode Lang Alt property %1 with opt=%2"
 msgstr "Nepodarilo sa dekódovať vlastnosť Lang Alt %1 s opt=%2"
 
-#: src/error.cpp:92
+#: src/error.cpp:98
 msgid "Failed to decode Lang Alt qualifier %1 with opt=%2"
 msgstr "Nepodarilo sa dekódovať kvalifikátor Lang Alt %1 s opt=%2"
 
-#: src/error.cpp:93
+#: src/error.cpp:99
 msgid "Failed to encode Lang Alt property %1"
 msgstr "Nepodarilo sa zakódovať vlastnosť Lang Alt %1"
 
-#: src/error.cpp:94
+#: src/error.cpp:100
 msgid "Failed to determine property name from path %1, namespace %2"
 msgstr ""
 "Nepodarilo sa dekódovať názov vlastnosti z cesty %1, menného priestoru %2"
 
-#: src/error.cpp:95
+#: src/error.cpp:101
 msgid "Schema namespace %1 is not registered with the XMP Toolkit"
 msgstr "Menný priestor schémy %1 nie je registrovaný v XMP Toolkit"
 
-#: src/error.cpp:96
+#: src/error.cpp:102
 msgid "No namespace registered for prefix `%1'"
 msgstr "Pre predponu „%1“ nie je zaregistrovaný menný priestor"
 
-#: src/error.cpp:97
+#: src/error.cpp:103
 msgid ""
-"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `%"
-"1', `%2', `%3'"
+"Aliases are not supported. Please send this XMP packet to ahuggel@gmx.net `"
+"%1', `%2', `%3'"
 msgstr ""
 
-#: src/error.cpp:98
+#: src/error.cpp:104
+#, fuzzy
 msgid "Invalid XmpText type `%1'"
-msgstr ""
+msgstr "Neplatný kľúč „%1“"
 
-#: src/error.cpp:99
+#: src/error.cpp:105
 msgid "TIFF directory %1 has too many entries"
 msgstr ""
 
-#: src/error.cpp:100
+#: src/error.cpp:106
 msgid "Multiple TIFF array element tags %1 in one directory"
 msgstr ""
 
-#: src/error.cpp:101
+#: src/error.cpp:107
 msgid "TIFF array element tag %1 has wrong type"
 msgstr ""
 
-#: src/error.cpp:103
-msgid "(Unknown Error)"
-msgstr "(Neznáma chyba)"
-
-#: src/exiv2.cpp:203
-msgid "Copyright (C) 2004-2009 Andreas Huggel.\n"
-msgstr "Autorské práva (C) 2004-2008 Andreas Huggel.\n"
+#: src/exiv2.cpp:209
+msgid "Copyright (C) 2004-2010 Andreas Huggel.\n"
+msgstr "Autorské práva (C) 2004-2010 Andreas Huggel.\n"
 
-#: src/exiv2.cpp:205
+#: src/exiv2.cpp:211
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License\n"
@@ -3399,7 +4034,7 @@
 "of the License, or (at your option) any later version.\n"
 msgstr ""
 
-#: src/exiv2.cpp:210
+#: src/exiv2.cpp:216
 msgid ""
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3411,7 +4046,7 @@
 "alebo VHODNOSTI PRE URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte \n"
 "v GNU General Public License.\n"
 
-#: src/exiv2.cpp:215
+#: src/exiv2.cpp:221
 msgid ""
 "You should have received a copy of the GNU General Public\n"
 "License along with this program; if not, write to the Free\n"
@@ -3419,11 +4054,11 @@
 "Boston, MA 02110-1301 USA\n"
 msgstr ""
 
-#: src/exiv2.cpp:223
+#: src/exiv2.cpp:229
 msgid "Usage:"
 msgstr "Použitie:"
 
-#: src/exiv2.cpp:224
+#: src/exiv2.cpp:230
 msgid ""
 "[ options ] [ action ] file ...\n"
 "\n"
@@ -3431,11 +4066,11 @@
 "[ voľby ] [ činnosť ] súbor ...\n"
 "\n"
 
-#: src/exiv2.cpp:225
+#: src/exiv2.cpp:231
 msgid "Manipulate the Exif metadata of images.\n"
 msgstr "Manipulácia s Exif metadátami obrázkov.\n"
 
-#: src/exiv2.cpp:231
+#: src/exiv2.cpp:237
 msgid ""
 "\n"
 "Actions:\n"
@@ -3443,7 +4078,7 @@
 "\n"
 "Operácie:\n"
 
-#: src/exiv2.cpp:232
+#: src/exiv2.cpp:238
 msgid ""
 "  ad | adjust   Adjust Exif timestamps by the given time. This action\n"
 "                requires at least one of the -a, -Y, -O or -D options.\n"
@@ -3451,15 +4086,15 @@
 "  ad | adjust   Upraviť časové známky EXIF o daný čas. Táto operácia\n"
 "                vyžaduje aspoň jednu z volieb -a, -Y, -O or -D.\n"
 
-#: src/exiv2.cpp:234
+#: src/exiv2.cpp:240
 msgid "  pr | print    Print image metadata.\n"
 msgstr "  pr | print    Vypísať metadáta obrázka.\n"
 
-#: src/exiv2.cpp:235
+#: src/exiv2.cpp:241
 msgid "  rm | delete   Delete image metadata from the files.\n"
 msgstr "  rm | delete   Zmazať metadáta obrázkov zo súborov.\n"
 
-#: src/exiv2.cpp:236
+#: src/exiv2.cpp:242
 msgid ""
 "  in | insert   Insert metadata from corresponding *.exv files.\n"
 "                Use option -S to change the suffix of the input files.\n"
@@ -3467,13 +4102,13 @@
 "  in | insert   Vložiť metadáta zo zodpovedajúcich súborov *.exv.\n"
 "                Voľbou -S môžete zmeniť príponu vstupných súborov.\n"
 
-#: src/exiv2.cpp:238
+#: src/exiv2.cpp:244
 msgid ""
 "  ex | extract  Extract metadata to *.exv, *.xmp and thumbnail image files.\n"
 msgstr ""
 "  ex | extract  Extrahovať metadáta do súborov *.exv, *.xmp a náhľadov.\n"
 
-#: src/exiv2.cpp:239
+#: src/exiv2.cpp:245
 msgid ""
 "  mv | rename   Rename files and/or set file timestamps according to the\n"
 "                Exif create timestamp. The filename format can be set with\n"
@@ -3483,7 +4118,7 @@
 "                časovej známky EXIF. Formát názvu súboru je možné nastaviť\n"
 "                voľbou -r, voľby časovej známku sa menia pomocou -t a -T.\n"
 
-#: src/exiv2.cpp:242
+#: src/exiv2.cpp:248
 msgid ""
 "  mo | modify   Apply commands to modify (add, set, delete) the Exif and\n"
 "                IPTC metadata of image files or set the JPEG comment.\n"
@@ -3495,7 +4130,7 @@
 "komentára.\n"
 "                Vyžaduje voľbu -c, -m alebo -M.\n"
 
-#: src/exiv2.cpp:245
+#: src/exiv2.cpp:251
 msgid ""
 "  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
 "                Exif tag.\n"
@@ -3504,7 +4139,13 @@
 "do\n"
 "                bežnej EXIF značky.\n"
 
-#: src/exiv2.cpp:247
+#: src/exiv2.cpp:253
+msgid ""
+"  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+"                character encoding can be specified with the -n option.\n"
+msgstr ""
+
+#: src/exiv2.cpp:255
 msgid ""
 "\n"
 "Options:\n"
@@ -3512,39 +4153,54 @@
 "\n"
 "Voľby:\n"
 
-#: src/exiv2.cpp:248
+#: src/exiv2.cpp:256
 msgid "   -h      Display this help and exit.\n"
 msgstr "   -h      Zobraziť tohto pomocníka a skončiť.\n"
 
-#: src/exiv2.cpp:249
+#: src/exiv2.cpp:257
 msgid "   -V      Show the program version and exit.\n"
 msgstr "   -V      Zobraziť verziu programu a skončiť.\n"
 
-#: src/exiv2.cpp:250
+#: src/exiv2.cpp:258
 msgid "   -v      Be verbose during the program run.\n"
 msgstr "   -v      Výrečné informácie o behu programu.\n"
 
-#: src/exiv2.cpp:251
+#: src/exiv2.cpp:259
+#, fuzzy
+msgid ""
+"   -q      Silence warnings and error messages during the program run "
+"(quiet).\n"
+msgstr "   -v      Výrečné informácie o behu programu.\n"
+
+#: src/exiv2.cpp:260
 msgid "   -b      Show large binary values.\n"
 msgstr "   -b      Zobrazovať veľké binárne hodnoty.\n"
 
-#: src/exiv2.cpp:252
+#: src/exiv2.cpp:261
 #, fuzzy
 msgid "   -u      Show unknown tags.\n"
 msgstr "   -u      Nezobrazovať neznáme značky.\n"
 
-#: src/exiv2.cpp:253
+#: src/exiv2.cpp:262
+msgid "   -g key  Only output info for this key (grep).\n"
+msgstr ""
+
+#: src/exiv2.cpp:263
+msgid "   -n enc  Charset to use to decode UNICODE Exif user comments.\n"
+msgstr ""
+
+#: src/exiv2.cpp:264
 msgid "   -k      Preserve file timestamps (keep).\n"
 msgstr "   -k      Zachovať časové známky súborov.\n"
 
-#: src/exiv2.cpp:254
+#: src/exiv2.cpp:265
 msgid ""
 "   -t      Also set the file timestamp in 'rename' action (overrides -k).\n"
 msgstr ""
 "   -t      Pri operácii „rename“ nastaviť aj časové známky súborov (má "
 "prioritu pred -k).\n"
 
-#: src/exiv2.cpp:255
+#: src/exiv2.cpp:266
 msgid ""
 "   -T      Only set the file timestamp in 'rename' action, do not rename\n"
 "           the file (overrides -k).\n"
@@ -3552,15 +4208,15 @@
 "   -T      Operáciou „rename“ iba nastavovať časové známky, nepremenúvať\n"
 "           súbor (má prioritu pred -k).\n"
 
-#: src/exiv2.cpp:257
+#: src/exiv2.cpp:268
 msgid "   -f      Do not prompt before overwriting existing files (force).\n"
 msgstr "   -f      Nepýtať sa pred prepísaním existujúcich súborov.\n"
 
-#: src/exiv2.cpp:258
+#: src/exiv2.cpp:269
 msgid "   -F      Do not prompt before renaming files (Force).\n"
 msgstr "   -F      Nepýtať sa pred premenovaním súborov.\n"
 
-#: src/exiv2.cpp:259
+#: src/exiv2.cpp:270
 msgid ""
 "   -a time Time adjustment in the format [-]HH[:MM[:SS]]. This option\n"
 "           is only used with the 'adjust' action.\n"
@@ -3568,69 +4224,69 @@
 "   -a time nastavenie času vo formáte [-]HH[:MM[:SS]]. Táto voľba\n"
 "           sa používa iba s operáciou „adjust“.\n"
 
-#: src/exiv2.cpp:261
+#: src/exiv2.cpp:272
 msgid "   -Y yrs  Year adjustment with the 'adjust' action.\n"
 msgstr "   -Y rok  Nastavenie rokov operáciou „adjust“.\n"
 
-#: src/exiv2.cpp:262
+#: src/exiv2.cpp:273
 msgid "   -O mon  Month adjustment with the 'adjust' action.\n"
 msgstr "   -O mes  Nastavenie mesiacov operáciou „adjust“.\n"
 
-#: src/exiv2.cpp:263
+#: src/exiv2.cpp:274
 msgid "   -D day  Day adjustment with the 'adjust' action.\n"
 msgstr "   -D deň  Nastavenie dní operáciou „adjust“.\n"
 
-#: src/exiv2.cpp:264
+#: src/exiv2.cpp:275
 msgid "   -p mode Print mode for the 'print' action. Possible modes are:\n"
 msgstr "   -p rež  Režim výpisu operácie „print“. možné režimy sú:\n"
 
-#: src/exiv2.cpp:265
+#: src/exiv2.cpp:276
 msgid "             s : print a summary of the Exif metadata (the default)\n"
 msgstr "             s : vypísať zhrnutie EXIF metadát (štandardne)\n"
 
-#: src/exiv2.cpp:266
+#: src/exiv2.cpp:277
 #, fuzzy
 msgid ""
 "             a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct)\n"
 msgstr "             v : čisto hodnoty EXIF údajov (skratka pre -Pxgnycv)\n"
 
-#: src/exiv2.cpp:267
+#: src/exiv2.cpp:278
 #, fuzzy
 msgid "             t : interpreted (translated) Exif data (-PEkyct)\n"
 msgstr ""
 "             t : interpretované (preložené) EXIF údaje (skratka pre -Pkyct)\n"
 
-#: src/exiv2.cpp:268
+#: src/exiv2.cpp:279
 #, fuzzy
 msgid "             v : plain Exif data values (-PExgnycv)\n"
 msgstr "             v : čisto hodnoty EXIF údajov (skratka pre -Pxgnycv)\n"
 
-#: src/exiv2.cpp:269
+#: src/exiv2.cpp:280
 #, fuzzy
 msgid "             h : hexdump of the Exif data (-PExgnycsh)\n"
 msgstr ""
 "             h : hexadecimálny výpis EXIF údajov (skratka pre -Pxgnycsh)\n"
 
-#: src/exiv2.cpp:270
+#: src/exiv2.cpp:281
 #, fuzzy
 msgid "             i : IPTC data values (-PIkyct)\n"
 msgstr "             i : hodnoty IPTC údajov\n"
 
-#: src/exiv2.cpp:271
+#: src/exiv2.cpp:282
 #, fuzzy
 msgid "             x : XMP properties (-PXkyct)\n"
 msgstr "             x : XMP vlastnosti\n"
 
-#: src/exiv2.cpp:272 src/exiv2.cpp:295
+#: src/exiv2.cpp:283 src/exiv2.cpp:306
 msgid "             c : JPEG comment\n"
 msgstr "             c : JPEG komentár\n"
 
-#: src/exiv2.cpp:273
+#: src/exiv2.cpp:284
 #, fuzzy
 msgid "             p : list available previews\n"
 msgstr "             l : označenie značky\n"
 
-#: src/exiv2.cpp:274
+#: src/exiv2.cpp:285
 #, fuzzy
 msgid ""
 "   -P flgs Print flags for fine control of tag lists ('print' action):\n"
@@ -3638,92 +4294,92 @@
 "   -P stĺps Vypísať stĺpce zoznamu EXIF značiek (operácia „print“). Platné "
 "voľby:\n"
 
-#: src/exiv2.cpp:275
+#: src/exiv2.cpp:286
 #, fuzzy
 msgid "             E : include Exif tags in the list\n"
 msgstr "             s : veľkosť v bajtoch\n"
 
-#: src/exiv2.cpp:276
+#: src/exiv2.cpp:287
 #, fuzzy
 msgid "             I : IPTC datasets\n"
 msgstr "             i : údaje IPTC\n"
 
-#: src/exiv2.cpp:277
+#: src/exiv2.cpp:288
 #, fuzzy
 msgid "             X : XMP properties\n"
 msgstr "             x : XMP vlastnosti\n"
 
-#: src/exiv2.cpp:278
+#: src/exiv2.cpp:289
 #, fuzzy
 msgid "             x : print a column with the tag number\n"
 msgstr "             x : vypísať stĺpec s hodnotou značky\n"
 
-#: src/exiv2.cpp:279
+#: src/exiv2.cpp:290
 msgid "             g : group name\n"
 msgstr "             g : názov skupiny\n"
 
-#: src/exiv2.cpp:280
+#: src/exiv2.cpp:291
 msgid "             k : key\n"
 msgstr "             k : kľúč\n"
 
-#: src/exiv2.cpp:281
+#: src/exiv2.cpp:292
 msgid "             l : tag label\n"
 msgstr "             l : označenie značky\n"
 
-#: src/exiv2.cpp:282
+#: src/exiv2.cpp:293
 msgid "             n : tag name\n"
 msgstr "             n : názov značky\n"
 
-#: src/exiv2.cpp:283
+#: src/exiv2.cpp:294
 msgid "             y : type\n"
 msgstr "             y : typ\n"
 
-#: src/exiv2.cpp:284
+#: src/exiv2.cpp:295
 msgid "             c : number of components (count)\n"
 msgstr "             c : počet zložiek\n"
 
-#: src/exiv2.cpp:285
+#: src/exiv2.cpp:296
 msgid "             s : size in bytes\n"
 msgstr "             s : veľkosť v bajtoch\n"
 
-#: src/exiv2.cpp:286
+#: src/exiv2.cpp:297
 msgid "             v : plain data value\n"
 msgstr "             v : čisté dátové hodnoty\n"
 
-#: src/exiv2.cpp:287
+#: src/exiv2.cpp:298
 msgid "             t : interpreted (translated) data\n"
 msgstr "             t : interpretované (preložené) hodnoty\n"
 
-#: src/exiv2.cpp:288
+#: src/exiv2.cpp:299
 msgid "             h : hexdump of the data\n"
 msgstr "             h : hexadecimálny výpis údajov\n"
 
-#: src/exiv2.cpp:289
+#: src/exiv2.cpp:300
 msgid ""
 "   -d tgt  Delete target(s) for the 'delete' action. Possible targets are:\n"
 msgstr "   -d cieľ Ciele zmazanie operácie „delete“. Možné ciele sú:\n"
 
-#: src/exiv2.cpp:290
+#: src/exiv2.cpp:301
 msgid "             a : all supported metadata (the default)\n"
 msgstr "             a : všetky podporované metadáta (štandardne)\n"
 
-#: src/exiv2.cpp:291
+#: src/exiv2.cpp:302
 msgid "             e : Exif section\n"
 msgstr "             e : sekcia EXIF\n"
 
-#: src/exiv2.cpp:292
+#: src/exiv2.cpp:303
 msgid "             t : Exif thumbnail only\n"
 msgstr "             t : iba EXIF náhľady\n"
 
-#: src/exiv2.cpp:293
+#: src/exiv2.cpp:304
 msgid "             i : IPTC data\n"
 msgstr "             i : údaje IPTC\n"
 
-#: src/exiv2.cpp:294
+#: src/exiv2.cpp:305
 msgid "             x : XMP packet\n"
 msgstr "             x : XMP paket\n"
 
-#: src/exiv2.cpp:296
+#: src/exiv2.cpp:307
 #, fuzzy
 msgid ""
 "   -i tgt  Insert target(s) for the 'insert' action. Possible targets are\n"
@@ -3738,7 +4394,7 @@
 "           Je možné vložiť iba náhľady JPEG, musia byť pomenované\n"
 "           <súbor>-thumb.jpg\n"
 
-#: src/exiv2.cpp:301
+#: src/exiv2.cpp:312
 #, fuzzy
 msgid ""
 "   -e tgt  Extract target(s) for the 'extract' action. Possible targets\n"
@@ -3752,7 +4408,7 @@
 "           rovnaké ako pri voľbe -i, plus:\n"
 "             X : Extrahovať XMP paket do <súbor>.xmp\n"
 
-#: src/exiv2.cpp:306
+#: src/exiv2.cpp:317
 msgid ""
 "   -r fmt  Filename format for the 'rename' action. The format string\n"
 "           follows strftime(3). The following keywords are supported:\n"
@@ -3760,30 +4416,30 @@
 "   -r fmt  Formát názvu súboru operácie „rename“. Formátovací reťazec\n"
 "           je podľa strftime(3). Podporované sú nasledovné kľúčové slová:\n"
 
-#: src/exiv2.cpp:308
+#: src/exiv2.cpp:319
 msgid "             :basename:   - original filename without extension\n"
 msgstr "             :basename:   - pôvodný názov súboru bez prípony\n"
 
-#: src/exiv2.cpp:309
+#: src/exiv2.cpp:320
 msgid ""
 "             :dirname:    - name of the directory holding the original file\n"
 msgstr ""
 "             :dirname:    - názov adresára, v ktorom sa nachádza pôvodný "
 "súbor\n"
 
-#: src/exiv2.cpp:310
+#: src/exiv2.cpp:321
 msgid "             :parentname: - name of parent directory\n"
 msgstr "             :parentname: - názov rodičovského adresára\n"
 
-#: src/exiv2.cpp:311
+#: src/exiv2.cpp:322
 msgid "           Default filename format is "
 msgstr "           Štandardný formát názvu súboru je "
 
-#: src/exiv2.cpp:313
+#: src/exiv2.cpp:324
 msgid "   -c txt  JPEG comment string to set in the image.\n"
 msgstr "   -c txt  Reťazec JPEG komentára, ktorý sa má v obrázku nastaviť.\n"
 
-#: src/exiv2.cpp:314
+#: src/exiv2.cpp:325
 msgid ""
 "   -m file Command file for the modify action. The format for commands is\n"
 "           set|add|del <key> [[<type>] <value>].\n"
@@ -3791,7 +4447,7 @@
 "   -m súbor Súbor s príkazmi operácie „modify“. Formát príkazov je\n"
 "           set|add|del <kľúč> [[<typ>] <hodnota>].\n"
 
-#: src/exiv2.cpp:316
+#: src/exiv2.cpp:327
 msgid ""
 "   -M cmd  Command line for the modify action. The format for the\n"
 "           commands is the same as that of the lines of a command file.\n"
@@ -3799,7 +4455,7 @@
 "   -M súbor Príkazový riadok operácie „modify“. Formát príkazov je\n"
 "           rovnaký ako formát riadkov súboru s príkazmi.\n"
 
-#: src/exiv2.cpp:318
+#: src/exiv2.cpp:329
 msgid ""
 "   -l dir  Location (directory) for files to be inserted from or extracted "
 "to.\n"
@@ -3807,7 +4463,7 @@
 "   -l adr  Umiestnenie (adresár) súborov, ktoré sa majú vložiť alebo "
 "extrahovať.\n"
 
-#: src/exiv2.cpp:319
+#: src/exiv2.cpp:330
 msgid ""
 "   -S .suf Use suffix .suf for source files for insert command.\n"
 "\n"
@@ -3815,376 +4471,382 @@
 "   -S .suf Použiť príponu .suf pre zdrojové súbory operácie „insert“.\n"
 "\n"
 
-#: src/exiv2.cpp:352 src/exiv2.cpp:398 src/exiv2.cpp:457 src/exiv2.cpp:644
+#: src/exiv2.cpp:366 src/exiv2.cpp:412 src/exiv2.cpp:471 src/exiv2.cpp:658
 msgid "Option"
 msgstr "Voľba"
 
-#: src/exiv2.cpp:353
+#: src/exiv2.cpp:367
 msgid "requires an argument\n"
 msgstr "vyžaduje parameter\n"
 
-#: src/exiv2.cpp:357
+#: src/exiv2.cpp:371
 msgid "Unrecognized option"
 msgstr "Neprípustná možnosť"
 
-#: src/exiv2.cpp:363
+#: src/exiv2.cpp:377
 msgid "getopt returned unexpected character code"
 msgstr "getopt vrátil neočakávaný kód znaku"
 
-#: src/exiv2.cpp:389 src/exiv2.cpp:442
+#: src/exiv2.cpp:403 src/exiv2.cpp:456
 msgid "Ignoring surplus option"
 msgstr "Ignoruje sa nadbytočná voľba"
 
-#: src/exiv2.cpp:399 src/exiv2.cpp:459 src/exiv2.cpp:645
+#: src/exiv2.cpp:413 src/exiv2.cpp:473 src/exiv2.cpp:659
 msgid "is not compatible with a previous option\n"
 msgstr "nie je kompatibilná s predošlou voľbou\n"
 
-#: src/exiv2.cpp:414
+#: src/exiv2.cpp:428
 msgid "Ignoring surplus option -a"
 msgstr "Ignoruje sa nadbytočná voľba -a"
 
-#: src/exiv2.cpp:420
+#: src/exiv2.cpp:434
 msgid "Error parsing -a option argument"
 msgstr "Chyba syntaktickej analýzy argumentu voľby -a"
 
-#: src/exiv2.cpp:427
+#: src/exiv2.cpp:441
 msgid "Option -a is not compatible with a previous option\n"
 msgstr "Voľba -a nie je kompatibilná s predošlou voľbou\n"
 
-#: src/exiv2.cpp:449
+#: src/exiv2.cpp:463
 msgid "Error parsing"
 msgstr "Spracovanie chýb"
 
-#: src/exiv2.cpp:451
+#: src/exiv2.cpp:465
 msgid "option argument"
 msgstr "argument voľby"
 
-#: src/exiv2.cpp:482
+#: src/exiv2.cpp:496
 msgid "Unrecognized print mode"
 msgstr "Nerozpoznaný režim výpisu"
 
-#: src/exiv2.cpp:490
+#: src/exiv2.cpp:504
 msgid "Ignoring surplus option -p"
 msgstr "Ignoruje sa nadbytočná voľba -p"
 
-#: src/exiv2.cpp:494
+#: src/exiv2.cpp:508
 msgid "Option -p is not compatible with a previous option\n"
 msgstr "Voľba -p nie je kompatibilná s predošlou voľbou\n"
 
-#: src/exiv2.cpp:525
+#: src/exiv2.cpp:539
 msgid "Unrecognized print item"
 msgstr "Nerozpoznaný cieľ výpisu"
 
-#: src/exiv2.cpp:534
+#: src/exiv2.cpp:548
 msgid "Ignoring surplus option -P"
 msgstr "Ignoruje sa nadbytočná voľba -P"
 
-#: src/exiv2.cpp:538
+#: src/exiv2.cpp:552
 msgid "Option -P is not compatible with a previous option\n"
 msgstr "Voľba -P nie je kompatibilná s predošlou voľbou\n"
 
-#: src/exiv2.cpp:565
+#: src/exiv2.cpp:579
 msgid "Option -d is not compatible with a previous option\n"
 msgstr "Voľba -d nie je kompatibilná s predošlou voľbou\n"
 
-#: src/exiv2.cpp:593
+#: src/exiv2.cpp:607
 msgid "Option -e is not compatible with a previous option\n"
 msgstr "Voľba -e nie je kompatibilná s predošlou voľbou\n"
 
-#: src/exiv2.cpp:621
+#: src/exiv2.cpp:635
 msgid "Option -i is not compatible with a previous option\n"
 msgstr "Voľba -i nie je kompatibilná s predošlou voľbou\n"
 
-#: src/exiv2.cpp:662
+#: src/exiv2.cpp:676
 msgid "Action adjust is not compatible with the given options\n"
 msgstr "Činnosť adjust nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:671
+#: src/exiv2.cpp:685
 msgid "Action print is not compatible with the given options\n"
 msgstr "Činnosť print nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:680
+#: src/exiv2.cpp:694
 msgid "Action delete is not compatible with the given options\n"
 msgstr "Činnosť delete nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:691
+#: src/exiv2.cpp:705
 msgid "Action extract is not compatible with the given options\n"
 msgstr "Činnosť extract nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:702
+#: src/exiv2.cpp:716
 msgid "Action insert is not compatible with the given options\n"
 msgstr "Činnosť insert nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:711
+#: src/exiv2.cpp:725
 msgid "Action rename is not compatible with the given options\n"
 msgstr "Činnosť rename nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:720
+#: src/exiv2.cpp:734
 msgid "Action modify is not compatible with the given options\n"
 msgstr "Činnosť modify nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:729
+#: src/exiv2.cpp:743
 msgid "Action fixiso is not compatible with the given options\n"
 msgstr "Činnosť fixiso nie je kompatibilná so zadanými voľbami\n"
 
-#: src/exiv2.cpp:753
+#: src/exiv2.cpp:752
+#, fuzzy
+msgid "Action fixcom is not compatible with the given options\n"
+msgstr "Činnosť fixiso nie je kompatibilná so zadanými voľbami\n"
+
+#: src/exiv2.cpp:776
 msgid "An action must be specified\n"
 msgstr "Musí byť uvedená operácia\n"
 
-#: src/exiv2.cpp:762
+#: src/exiv2.cpp:785
 msgid "Adjust action requires at least one -a, -Y, -O or -D option\n"
 msgstr "Operácia adjust vyžaduje aspoň jednu z volieb -a, -Y, -O alebo -D\n"
 
-#: src/exiv2.cpp:768
+#: src/exiv2.cpp:791
 msgid "Modify action requires at least one -c, -m or -M option\n"
 msgstr "Operácia modify vyžaduje aspoň jednu z volieb -c, -m alebo -M\n"
 
-#: src/exiv2.cpp:772
+#: src/exiv2.cpp:795
 msgid "At least one file is required\n"
 msgstr "Je požadovaný aspoň jeden súbor\n"
 
-#: src/exiv2.cpp:778
+#: src/exiv2.cpp:801
 msgid "Error parsing -m option arguments\n"
 msgstr "Chyba syntaktickej analýzy argumentov voľby -m\n"
 
-#: src/exiv2.cpp:785
+#: src/exiv2.cpp:808
 msgid "Error parsing -M option arguments\n"
 msgstr "Chyba syntaktickej analýzy argumentov voľby -M\n"
 
-#: src/exiv2.cpp:792
+#: src/exiv2.cpp:819
 msgid "-l option can only be used with extract or insert actions\n"
 msgstr "Voľbu -l možno použiť iba s operáciami extract alebo insert\n"
 
-#: src/exiv2.cpp:797
+#: src/exiv2.cpp:824
 msgid "-S option can only be used with insert action\n"
 msgstr "Voľbu -S možno použiť iba s operáciou insert\n"
 
-#: src/exiv2.cpp:802
+#: src/exiv2.cpp:829
 msgid "-t option can only be used with rename action\n"
 msgstr "Voľbu -t možno použiť iba s operáciou rename\n"
 
-#: src/exiv2.cpp:807
+#: src/exiv2.cpp:834
 msgid "-T option can only be used with rename action\n"
 msgstr "Voľbu -T možno použiť iba s operáciou rename\n"
 
-#: src/exiv2.cpp:887
+#: src/exiv2.cpp:914
 msgid "Unrecognized "
 msgstr "Nerozpoznaný "
 
-#: src/exiv2.cpp:888
+#: src/exiv2.cpp:915
 msgid "target"
 msgstr "cieľ"
 
-#: src/exiv2.cpp:914
+#: src/exiv2.cpp:941
 #, fuzzy
 msgid "Invalid preview number"
 msgstr "Číslo intervalu"
 
-#: src/exiv2.cpp:946
+#: src/exiv2.cpp:973
 msgid "Failed to open command file for reading\n"
 msgstr "Nepodarilo sa otvoriť súbor s príkazmi na čítanie\n"
 
-#: src/exiv2.cpp:959
+#: src/exiv2.cpp:986
 msgid "line"
 msgstr "riadok"
 
-#: src/exiv2.cpp:982
+#: src/exiv2.cpp:1009
 msgid "-M option"
 msgstr "voľba -M"
 
-#: src/exiv2.cpp:1003 src/exiv2.cpp:1062 src/exiv2.cpp:1072
+#: src/exiv2.cpp:1030 src/exiv2.cpp:1088 src/exiv2.cpp:1098
 msgid "Invalid command line"
 msgstr "Neplatný príkazový riadok"
 
-#: src/exiv2.cpp:1010
+#: src/exiv2.cpp:1037
 msgid "Invalid command"
 msgstr "Neplatný príkaz"
 
-#: src/exiv2.cpp:1043
+#: src/exiv2.cpp:1069
 msgid "Invalid key"
 msgstr "Neplatný kľúč"
 
-#: src/fujimn.cpp:60
+#: src/fujimn.cpp:62
+#, fuzzy
 msgid "Soft mode 1"
-msgstr ""
+msgstr "Bodový režim"
 
-#: src/fujimn.cpp:61
+#: src/fujimn.cpp:63
+#, fuzzy
 msgid "Soft mode 2"
-msgstr ""
+msgstr "Bodový režim"
 
-#: src/fujimn.cpp:63
+#: src/fujimn.cpp:65
 msgid "Hard mode 1"
 msgstr "Tvrdý režim 1"
 
-#: src/fujimn.cpp:64
+#: src/fujimn.cpp:66
 msgid "Hard mode 2"
 msgstr "Tvrdý režim 2"
 
 # exif-lightsource-1
-#: src/fujimn.cpp:70 src/minoltamn.cpp:322 src/minoltamn.cpp:804
-#: src/minoltamn.cpp:1007 src/nikonmn.cpp:435 src/panasonicmn.cpp:63
-#: src/pentaxmn.cpp:257 src/tags.cpp:1062
+#: src/fujimn.cpp:72 src/minoltamn.cpp:219 src/minoltamn.cpp:683
+#: src/minoltamn.cpp:869 src/minoltamn.cpp:1193 src/minoltamn.cpp:2094
+#: src/nikonmn.cpp:447 src/panasonicmn.cpp:65 src/pentaxmn.cpp:312
+#: src/sonymn.cpp:165 src/tags.cpp:1250
 msgid "Daylight"
 msgstr "denné svetlo"
 
-#: src/fujimn.cpp:72
+#: src/fujimn.cpp:74
 msgid "Fluorescent (daylight)"
 msgstr "fluorescenčné (denné svetlo)"
 
-#: src/fujimn.cpp:73
+#: src/fujimn.cpp:75
 msgid "Fluorescent (warm white)"
 msgstr "fluorescenčné (teplá biela)"
 
-#: src/fujimn.cpp:74
+#: src/fujimn.cpp:76
 msgid "Fluorescent (cool white)"
 msgstr "fluorescenčné (chladná biela)"
 
-#: src/fujimn.cpp:75 src/nikonmn.cpp:436
+#: src/fujimn.cpp:77 src/nikonmn.cpp:448 src/sonymn.cpp:170
 msgid "Incandescent"
 msgstr "Inkadescentné"
 
-#: src/fujimn.cpp:84
+#: src/fujimn.cpp:87 src/fujimn.cpp:88
 msgid "None (black & white)"
 msgstr "Žiadne (čiernobiele)"
 
-#: src/fujimn.cpp:99 src/minoltamn.cpp:314
+#: src/fujimn.cpp:103 src/fujimn.cpp:104 src/minoltamn.cpp:210
 msgid "Red-eye reduction"
 msgstr "Korekcia červených očí"
 
-#: src/fujimn.cpp:114 src/tags.cpp:1138
+#: src/fujimn.cpp:119 src/tags.cpp:1326 src/tags.cpp:1327
 msgid "Night scene"
 msgstr "Nočná scéna"
 
-#: src/fujimn.cpp:115 src/pentaxmn.cpp:434 src/pentaxmn.cpp:441
+#: src/fujimn.cpp:120 src/pentaxmn.cpp:496 src/pentaxmn.cpp:503
+#: src/sonymn.cpp:518
 msgid "Program AE"
 msgstr "Program AE"
 
-#: src/fujimn.cpp:116
+#: src/fujimn.cpp:121
 msgid "Natural light"
 msgstr "Prirodzené svetlo"
 
-#: src/fujimn.cpp:117
+#: src/fujimn.cpp:122
 msgid "Anti-blur"
 msgstr "Zabránenie rozostrenia"
 
-#: src/fujimn.cpp:118 src/minoltamn.cpp:429 src/olympusmn.cpp:530
-#: src/panasonicmn.cpp:126 src/pentaxmn.cpp:422
+#: src/fujimn.cpp:123 src/minoltamn.cpp:314 src/minoltamn.cpp:844
+#: src/minoltamn.cpp:1888 src/minoltamn.cpp:2037 src/olympusmn.cpp:108
+#: src/panasonicmn.cpp:130 src/pentaxmn.cpp:481 src/sonymn.cpp:479
+#: src/sonymn.cpp:525
 msgid "Sunset"
 msgstr "Západ slnka"
 
-#: src/fujimn.cpp:119 src/olympusmn.cpp:535 src/pentaxmn.cpp:426
+#: src/fujimn.cpp:124 src/olympusmn.cpp:113 src/pentaxmn.cpp:485
 msgid "Museum"
 msgstr "múzeum"
 
-#: src/fujimn.cpp:120 src/panasonicmn.cpp:113
+#: src/fujimn.cpp:125 src/panasonicmn.cpp:117
 msgid "Party"
 msgstr "Oslavy"
 
-#: src/fujimn.cpp:121
+#: src/fujimn.cpp:126
 msgid "Flower"
 msgstr "Kvet"
 
-#: src/fujimn.cpp:122 src/minoltamn.cpp:427 src/minoltamn.cpp:522
-#: src/pentaxmn.cpp:421
+#: src/fujimn.cpp:127 src/minoltamn.cpp:312 src/minoltamn.cpp:402
+#: src/minoltamn.cpp:2035 src/pentaxmn.cpp:480
 msgid "Text"
 msgstr "Text"
 
-#: src/fujimn.cpp:123
+#: src/fujimn.cpp:128
 msgid "Natural light & flash"
 msgstr "Prírodné svetlo a blesk"
 
 # FUZZY exif-exposureprogram-3
-#: src/fujimn.cpp:128 src/olympusmn.cpp:422
+#: src/fujimn.cpp:133 src/olympusmn.cpp:484 src/sonymn.cpp:519
 msgid "Aperture-priority AE"
 msgstr "Priorita clony AE"
 
 # FUZZY exif-exposureprogram-4
-#: src/fujimn.cpp:129 src/olympusmn.cpp:423
+#: src/fujimn.cpp:134 src/olympusmn.cpp:485 src/sonymn.cpp:520
 msgid "Shutter speed priority AE"
 msgstr "Priorita rýchlosti uzávierky AE"
 
-#: src/fujimn.cpp:137
+#: src/fujimn.cpp:142
 msgid "No flash & flash"
 msgstr "Bez blesku a blesk"
 
-#: src/fujimn.cpp:142 src/fujimn.cpp:149 src/minoltamn.cpp:77
-#: src/minoltamn.cpp:348 src/olympusmn.cpp:515 src/olympusmn.cpp:1051
-#: src/panasonicmn.cpp:163 src/panasonicmn.cpp:169 src/panasonicmn.cpp:199
-#: src/pentaxmn.cpp:411 src/tags.cpp:1135
-msgid "Standard"
-msgstr "Štandardný"
-
-#: src/fujimn.cpp:143
+#: src/fujimn.cpp:148
 msgid "Chrome"
 msgstr "Chróm"
 
-#: src/fujimn.cpp:150 src/minoltamn.cpp:1064 src/minoltamn.cpp:1078
-#: src/panasonicmn.cpp:206
+#: src/fujimn.cpp:155 src/minoltamn.cpp:917 src/minoltamn.cpp:931
+#: src/minoltamn.cpp:1936 src/panasonicmn.cpp:211
 msgid "Wide"
 msgstr "Široké"
 
-#: src/fujimn.cpp:155
+#: src/fujimn.cpp:160
 msgid "F0/Standard"
 msgstr "F0/Štandardný"
 
-#: src/fujimn.cpp:156
+#: src/fujimn.cpp:161
 msgid "F1/Studio portrait"
 msgstr "F1/Štúdiový portrét"
 
-#: src/fujimn.cpp:157
+#: src/fujimn.cpp:162
 msgid "F2/Fujichrome"
 msgstr "F2/Fujichróm"
 
-#: src/fujimn.cpp:158
+#: src/fujimn.cpp:163
 msgid "F3/Studio portrait Ex"
 msgstr "F3/Štúdiový portrét Ex"
 
-#: src/fujimn.cpp:159
+#: src/fujimn.cpp:164
 msgid "F4/Velvia"
 msgstr "F4/Velvia"
 
-#: src/fujimn.cpp:164
+#: src/fujimn.cpp:169
 msgid "Auto (100-400%)"
 msgstr "Auto (100-400 %)"
 
-#: src/fujimn.cpp:165 src/minoltamn.cpp:74 src/minoltamn.cpp:345
-#: src/minoltamn.cpp:794 src/minoltamn.cpp:997 src/olympusmn.cpp:71
-#: src/panasonicmn.cpp:56
+#: src/fujimn.cpp:170 src/minoltamn.cpp:74 src/minoltamn.cpp:242
+#: src/minoltamn.cpp:673 src/minoltamn.cpp:859 src/minoltamn.cpp:2056
+#: src/olympusmn.cpp:74 src/panasonicmn.cpp:58
 msgid "Raw"
 msgstr "Raw"
 
-#: src/fujimn.cpp:166
+#: src/fujimn.cpp:171
 msgid "Standard (100%)"
 msgstr "Štandardný (100%)"
 
-#: src/fujimn.cpp:167
+#: src/fujimn.cpp:172
 msgid "Wide mode 1 (230%)"
 msgstr "Široký režim 1 (230%)"
 
-#: src/fujimn.cpp:168
+#: src/fujimn.cpp:173
 msgid "Wide mode 2 (400%)"
 msgstr "Široký režim 2 (400%)"
 
-#: src/fujimn.cpp:169
+#: src/fujimn.cpp:174
 msgid "Film simulation mode"
 msgstr "Režim simulácie filmu"
 
-#: src/fujimn.cpp:174 src/nikonmn.cpp:201 src/nikonmn.cpp:512
-#: src/nikonmn.cpp:632 src/nikonmn.cpp:677 src/nikonmn.cpp:801
-#: src/nikonmn.cpp:814 src/nikonmn.cpp:873 src/nikonmn.cpp:933
-#: src/nikonmn.cpp:963 src/nikonmn.cpp:983 src/nikonmn.cpp:996
-#: src/nikonmn.cpp:1009 src/nikonmn.cpp:1022 src/nikonmn.cpp:1035
-#: src/nikonmn.cpp:1048 src/nikonmn.cpp:1061 src/nikonmn.cpp:1080
-#: src/nikonmn.cpp:1105 src/panasonicmn.cpp:329 src/pentaxmn.cpp:785
-#: src/properties.cpp:440
+#: src/fujimn.cpp:179 src/nikonmn.cpp:213 src/nikonmn.cpp:524
+#: src/nikonmn.cpp:645 src/nikonmn.cpp:690 src/nikonmn.cpp:821
+#: src/nikonmn.cpp:845 src/nikonmn.cpp:866 src/nikonmn.cpp:979
+#: src/nikonmn.cpp:1001 src/nikonmn.cpp:1021 src/nikonmn.cpp:1041
+#: src/nikonmn.cpp:1054 src/nikonmn.cpp:1113 src/nikonmn.cpp:1173
+#: src/nikonmn.cpp:1203 src/nikonmn.cpp:1223 src/nikonmn.cpp:1236
+#: src/nikonmn.cpp:1249 src/nikonmn.cpp:1262 src/nikonmn.cpp:1275
+#: src/nikonmn.cpp:1288 src/nikonmn.cpp:1301 src/nikonmn.cpp:1320
+#: src/nikonmn.cpp:1345 src/panasonicmn.cpp:335 src/pentaxmn.cpp:865
+#: src/properties.cpp:456
 msgid "Version"
 msgstr "Verzia"
 
-#: src/fujimn.cpp:175
+#: src/fujimn.cpp:180
 msgid "Fujifilm Makernote version"
 msgstr "Poznámka výrobcu Fujifilm"
 
-#: src/fujimn.cpp:178 src/panasonicmn.cpp:244
+#: src/fujimn.cpp:183 src/panasonicmn.cpp:250
 msgid ""
 "This number is unique, and contains the date of manufacture, but is not the "
 "same as the number printed on the camera body."
@@ -4192,196 +4854,196 @@
 "Toto číslo je jedinečné a obsahuje dátum výroby, ale nie je rovnaké ako "
 "číslo na plášti fotoaparátu."
 
-#: src/fujimn.cpp:182 src/nikonmn.cpp:211 src/nikonmn.cpp:448
-#: src/nikonmn.cpp:515 src/olympusmn.cpp:135
+#: src/fujimn.cpp:187 src/nikonmn.cpp:223 src/nikonmn.cpp:460
+#: src/nikonmn.cpp:527 src/olympusmn.cpp:199
 msgid "Image quality setting"
 msgstr "Nastavenie kvality obrázka"
 
-#: src/fujimn.cpp:190 src/nikonmn.cpp:410
+#: src/fujimn.cpp:195 src/nikonmn.cpp:422
 msgid "Color"
 msgstr "Farba"
 
-#: src/fujimn.cpp:191
+#: src/fujimn.cpp:196
 msgid "Chroma saturation setting"
 msgstr "Nastavenie sýtosti chromaticity"
 
-#: src/fujimn.cpp:193
+#: src/fujimn.cpp:198
 msgid "Tone"
 msgstr "odtieň"
 
-#: src/fujimn.cpp:197
+#: src/fujimn.cpp:202
 msgid "Flash firing mode setting"
 msgstr "Nastavenie režimu spustenia blesku"
 
-#: src/fujimn.cpp:199
+#: src/fujimn.cpp:204
 msgid "Flash Strength"
 msgstr "Sila blesku"
 
-#: src/fujimn.cpp:200
+#: src/fujimn.cpp:205
 msgid "Flash firing strength compensation setting"
 msgstr "Nastavenie kompenzácie intenzity blesku"
 
-#: src/fujimn.cpp:203
+#: src/fujimn.cpp:208
 msgid "Macro mode setting"
 msgstr "Nastavenie režimu makro"
 
-#: src/fujimn.cpp:206
+#: src/fujimn.cpp:211
 msgid "Focusing mode setting"
 msgstr "Nastavenie režimu zaostrenia"
 
-#: src/fujimn.cpp:211
+#: src/fujimn.cpp:216
 msgid "Slow Sync"
 msgstr "Pomalá synchronizácia"
 
-#: src/fujimn.cpp:212
+#: src/fujimn.cpp:217
 msgid "Slow synchro mode setting"
 msgstr "Nastavenie režimu pomalej synchronizácie"
 
-#: src/fujimn.cpp:214 src/olympusmn.cpp:636 src/olympusmn.cpp:830
+#: src/fujimn.cpp:219 src/olympusmn.cpp:690 src/olympusmn.cpp:891
 msgid "Picture Mode"
 msgstr "Režim obrázka"
 
-#: src/fujimn.cpp:215
+#: src/fujimn.cpp:220
 msgid "Picture mode setting"
 msgstr "Nastavenie režimu obrázka"
 
-#: src/fujimn.cpp:221
+#: src/fujimn.cpp:226
 msgid "Continuous shooting or auto bracketing setting"
 msgstr "Nastavenie spojitého alebo viacnásobného záberu"
 
-#: src/fujimn.cpp:223 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:228 src/panasonicmn.cpp:256 src/sonymn.cpp:414
 msgid "Sequence Number"
 msgstr "Poradové číslo"
 
-#: src/fujimn.cpp:224 src/olympusmn.cpp:1074 src/panasonicmn.cpp:250
+#: src/fujimn.cpp:229 src/olympusmn.cpp:1158 src/panasonicmn.cpp:256
 msgid "Sequence number"
 msgstr "Poradové číslo"
 
-#: src/fujimn.cpp:229
+#: src/fujimn.cpp:234
 msgid "FinePix Color"
 msgstr "FinePix Color"
 
-#: src/fujimn.cpp:230
+#: src/fujimn.cpp:235
 msgid "Fuji FinePix color setting"
 msgstr "Nastavenie farieb Fuji FinePix"
 
-#: src/fujimn.cpp:232
+#: src/fujimn.cpp:237
 msgid "Blur Warning"
 msgstr "Upozornenie pred rozostrením"
 
-#: src/fujimn.cpp:233
+#: src/fujimn.cpp:238
 msgid "Blur warning status"
 msgstr "Stav upozornenia pred rozostrením"
 
-#: src/fujimn.cpp:235
+#: src/fujimn.cpp:240
 msgid "Focus Warning"
 msgstr "Upozornenie zaostrenia"
 
-#: src/fujimn.cpp:236
+#: src/fujimn.cpp:241
 msgid "Auto Focus warning status"
 msgstr "Stav upozornenia automatického zaistrenia"
 
-#: src/fujimn.cpp:238
+#: src/fujimn.cpp:243
 msgid "Exposure Warning"
 msgstr "Upozornenie expozície"
 
-#: src/fujimn.cpp:239
+#: src/fujimn.cpp:244
 msgid "Auto exposure warning status"
 msgstr "Stav upozornenia automatickej expozície"
 
-#: src/fujimn.cpp:241
+#: src/fujimn.cpp:246
 msgid "Dynamic Range"
 msgstr "Dynamický rozsah"
 
-#: src/fujimn.cpp:242
+#: src/fujimn.cpp:247
 msgid "Dynamic range"
 msgstr "Dynamický rozsah"
 
-#: src/fujimn.cpp:244 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:249 src/panasonicmn.cpp:273
 msgid "Film Mode"
 msgstr "Režim filmu"
 
-#: src/fujimn.cpp:245 src/panasonicmn.cpp:267
+#: src/fujimn.cpp:250 src/panasonicmn.cpp:273
 msgid "Film mode"
 msgstr "Režim filmu"
 
-#: src/fujimn.cpp:247
+#: src/fujimn.cpp:252
 msgid "Dynamic Range Setting"
 msgstr "Nastavenie dynamického rozsahu"
 
-#: src/fujimn.cpp:248
+#: src/fujimn.cpp:253
 msgid "Dynamic range settings"
 msgstr "Nastavenie dynamického rozsahu"
 
-#: src/fujimn.cpp:250
+#: src/fujimn.cpp:255
 msgid "Development Dynamic Range"
 msgstr "Vývojový dynamický rozsah"
 
-#: src/fujimn.cpp:251
+#: src/fujimn.cpp:256
 msgid "Development dynamic range"
 msgstr "Vývojový dynamický rozsah"
 
 # FUZZY exif-focallength
-#: src/fujimn.cpp:253
+#: src/fujimn.cpp:258
 msgid "Minimum Focal Length"
 msgstr "Minimálna ohnisková vzdialenosť"
 
 # FUZZY exif-focallength
-#: src/fujimn.cpp:254
+#: src/fujimn.cpp:259
 msgid "Minimum focal length"
 msgstr "Minimálna ohnisková vzdialenosť"
 
 # FUZZY exif-focallength
-#: src/fujimn.cpp:256
+#: src/fujimn.cpp:261
 msgid "Maximum Focal Length"
 msgstr "Maximálna ohnisková vzdialenosť"
 
 # FUZZY exif-focallength
-#: src/fujimn.cpp:257
+#: src/fujimn.cpp:262
 msgid "Maximum focal length"
 msgstr "Maximálna ohnisková vzdialenosť"
 
-#: src/fujimn.cpp:259
+#: src/fujimn.cpp:264
 msgid "Maximum Aperture at Mininimum Focal"
 msgstr "maximálna clona pri minimálnom ohnisku"
 
-#: src/fujimn.cpp:260
+#: src/fujimn.cpp:265
 msgid "Maximum aperture at mininimum focal"
 msgstr "maximálna clona pri minimálnom ohnisku"
 
-#: src/fujimn.cpp:262
+#: src/fujimn.cpp:267
 msgid "Maximum Aperture at Maxinimum Focal"
 msgstr "maximálna clona pri maximálnom ohnisku"
 
-#: src/fujimn.cpp:263
+#: src/fujimn.cpp:268
 msgid "Maximum aperture at maxinimum focal"
 msgstr "maximálna clona pri maximálnom ohnisku"
 
-#: src/fujimn.cpp:265 src/properties.cpp:547 src/tags.cpp:1359
+#: src/fujimn.cpp:270 src/properties.cpp:563 src/tags.cpp:1549
 msgid "File Source"
 msgstr "Zdroj súboru"
 
-#: src/fujimn.cpp:266
+#: src/fujimn.cpp:271
 msgid "File source"
 msgstr "Zdroj súboru"
 
-#: src/fujimn.cpp:268
+#: src/fujimn.cpp:273
 msgid "Order Number"
 msgstr "Poradové číslo"
 
-#: src/fujimn.cpp:269
+#: src/fujimn.cpp:274
 msgid "Order number"
 msgstr "Poradové číslo"
 
-#: src/fujimn.cpp:271
+#: src/fujimn.cpp:276
 msgid "Frame Number"
 msgstr "Číslo rámca"
 
-#: src/fujimn.cpp:272 src/pentaxmn.cpp:887 src/pentaxmn.cpp:888
+#: src/fujimn.cpp:277 src/pentaxmn.cpp:977 src/pentaxmn.cpp:978
 msgid "Frame number"
 msgstr "Číslo rámca"
 
-#: src/fujimn.cpp:277
+#: src/fujimn.cpp:281
 msgid "Unknown FujiMakerNote tag"
 msgstr "Neznáma značka FujiMakerNote"
 
@@ -4389,20 +5051,20 @@
 msgid "Natural Color"
 msgstr "Prirodzená farba"
 
-#: src/minoltamn.cpp:58
+#: src/minoltamn.cpp:58 src/minoltamn.cpp:1885
 msgid "Vivid Color"
 msgstr "Živé farby"
 
-#: src/minoltamn.cpp:59 src/minoltamn.cpp:472
+#: src/minoltamn.cpp:59 src/minoltamn.cpp:358
 msgid "Solarization"
 msgstr "Solarizácia"
 
-#: src/minoltamn.cpp:60
+#: src/minoltamn.cpp:60 src/minoltamn.cpp:1891
 msgid "AdobeRGB"
 msgstr "Adobe RGB"
 
-#: src/minoltamn.cpp:62 src/olympusmn.cpp:572 src/olympusmn.cpp:792
-#: src/panasonicmn.cpp:193 src/pentaxmn.cpp:624
+#: src/minoltamn.cpp:62 src/minoltamn.cpp:946 src/olympusmn.cpp:611
+#: src/olympusmn.cpp:853 src/panasonicmn.cpp:198 src/pentaxmn.cpp:702
 msgid "Natural"
 msgstr "Prirodzené"
 
@@ -4418,6770 +5080,9306 @@
 msgid "Evening"
 msgstr "Večer"
 
-#: src/minoltamn.cpp:69
+#: src/minoltamn.cpp:69 src/minoltamn.cpp:952 src/minoltamn.cpp:2040
+#: src/sonymn.cpp:526
 msgid "Night Portrait"
 msgstr "Nočný portrét"
 
-#: src/minoltamn.cpp:75
+#: src/minoltamn.cpp:75 src/minoltamn.cpp:2057
 msgid "Super Fine"
 msgstr "super jemný"
 
-#: src/minoltamn.cpp:79
+#: src/minoltamn.cpp:79 src/minoltamn.cpp:2003 src/minoltamn.cpp:2061
 msgid "Extra Fine"
 msgstr "extra jemný"
 
-#: src/minoltamn.cpp:84
-msgid "ISO Setting Used"
-msgstr "Použité nastavenie ISO"
-
-#: src/minoltamn.cpp:85 src/olympusmn.cpp:548 src/olympusmn.cpp:1025
-msgid "High Key"
-msgstr "Vysoký kľúč"
-
-#: src/minoltamn.cpp:86 src/olympusmn.cpp:554 src/olympusmn.cpp:1023
-msgid "Low Key"
-msgstr "Nízky kľúč"
-
-#: src/minoltamn.cpp:232
+#: src/minoltamn.cpp:90
 msgid "Makernote Version"
 msgstr "Poznámky zhotoviteľa - verzia"
 
-#: src/minoltamn.cpp:233
+#: src/minoltamn.cpp:91
 msgid "String 'MLT0' (not null terminated)"
 msgstr "Reťazec 'MLT0' (nie je ukončený nulou)"
 
-#: src/minoltamn.cpp:235
+#: src/minoltamn.cpp:93
 msgid "Camera Settings (Std Old)"
 msgstr "Nastavenie fotoaparátu (štd. staré)"
 
-#: src/minoltamn.cpp:236
+#: src/minoltamn.cpp:94
 msgid ""
 "Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"
 msgstr ""
 
-#: src/minoltamn.cpp:238
+#: src/minoltamn.cpp:96
 msgid "Camera Settings (Std New)"
 msgstr "Nastavenie fotoaparátu (štd. nové)"
 
-#: src/minoltamn.cpp:239
+#: src/minoltamn.cpp:97
 msgid "Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"
 msgstr ""
 
-#: src/minoltamn.cpp:241
+#: src/minoltamn.cpp:99
 msgid "Camera Settings (7D)"
 msgstr "Nastavenie fotoaparátu (7D)"
 
-#: src/minoltamn.cpp:242
+#: src/minoltamn.cpp:100
 msgid "Camera Settings (for Dynax 7D model)"
 msgstr "Nastavenia fotoaparátu (pre model Dynax 7D)"
 
-#: src/minoltamn.cpp:244
+#: src/minoltamn.cpp:102
 msgid "Image Stabilization Data"
 msgstr "Údaje o stabilizácii obrazu"
 
-#: src/minoltamn.cpp:245
+#: src/minoltamn.cpp:103
 msgid "Image stabilization data"
 msgstr "Údaje o stabilizácii obrazu"
 
-#: src/minoltamn.cpp:247
+#: src/minoltamn.cpp:107
+msgid "WB Info A100"
+msgstr ""
+
+#: src/minoltamn.cpp:108
+msgid "White balance information for the Sony DSLR-A100"
+msgstr ""
+
+#: src/minoltamn.cpp:111
 msgid "Compressed Image Size"
 msgstr "Veľkosť komprimovaného obrázka"
 
-#: src/minoltamn.cpp:248
+#: src/minoltamn.cpp:112
 msgid "Compressed image size"
 msgstr "Veľkosť komprimovaného obrázka"
 
-#: src/minoltamn.cpp:251
+#: src/minoltamn.cpp:115
 msgid "Jpeg thumbnail 640x480 pixels"
 msgstr "Jpeg miniatúra 640x480 bodov"
 
-#: src/minoltamn.cpp:253 src/olympusmn.cpp:367
+#: src/minoltamn.cpp:117 src/olympusmn.cpp:429
 msgid "Thumbnail Offset"
 msgstr "Ofset náhľadu"
 
-#: src/minoltamn.cpp:254
+#: src/minoltamn.cpp:118
 msgid "Offset of the thumbnail"
 msgstr "Umiestnenie náhľadu v dátach"
 
-#: src/minoltamn.cpp:256 src/olympusmn.cpp:370
+#: src/minoltamn.cpp:120 src/olympusmn.cpp:432
 msgid "Thumbnail Length"
 msgstr "Dĺžka náhľadu"
 
-#: src/minoltamn.cpp:257
+#: src/minoltamn.cpp:121
 msgid "Size of the thumbnail"
 msgstr "Veľkosť náhľadu"
 
-#: src/minoltamn.cpp:259 src/nikonmn.cpp:207 src/nikonmn.cpp:450
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:123 src/minoltamn.cpp:124 src/nikonmn.cpp:573
+#: src/olympusmn.cpp:252 src/olympusmn.cpp:684 src/panasonicmn.cpp:282
+#: src/sonymn.cpp:363 src/sonymn.cpp:364
+msgid "Scene Mode"
+msgstr "Režim scény"
+
+#: src/minoltamn.cpp:128 src/minoltamn.cpp:1406 src/nikonmn.cpp:219
+#: src/nikonmn.cpp:462 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
+#: src/sonymn.cpp:381 src/sonymn.cpp:382
 msgid "Color Mode"
 msgstr "Farebný režim"
 
-#: src/minoltamn.cpp:260 src/nikonmn.cpp:208 src/nikonmn.cpp:451
-#: src/nikonmn.cpp:514 src/panasonicmn.cpp:257
+#: src/minoltamn.cpp:129 src/minoltamn.cpp:1407 src/nikonmn.cpp:220
+#: src/nikonmn.cpp:463 src/nikonmn.cpp:526 src/panasonicmn.cpp:263
 msgid "Color mode"
 msgstr "Farebný režim"
 
-#: src/minoltamn.cpp:262 src/minoltamn.cpp:622 src/minoltamn.cpp:891
-#: src/minoltamn.cpp:1129 src/panasonicmn.cpp:230
+#: src/minoltamn.cpp:132 src/minoltamn.cpp:502 src/minoltamn.cpp:747
+#: src/minoltamn.cpp:990 src/panasonicmn.cpp:236 src/sonymn.cpp:274
 msgid "Image Quality"
 msgstr "Kvalita obrázka"
 
-#: src/minoltamn.cpp:271
-msgid "Zone Matching"
+#: src/minoltamn.cpp:137 src/minoltamn.cpp:138
+msgid "0x0103"
 msgstr ""
 
-#: src/minoltamn.cpp:272
-msgid "Zone matching"
+#: src/minoltamn.cpp:141 src/minoltamn.cpp:583 src/olympusmn.cpp:671
+#: src/sonymn.cpp:277
+msgid "Flash Exposure Compensation"
+msgstr "Kompenzácia expozície blesku"
+
+#: src/minoltamn.cpp:142 src/minoltamn.cpp:584 src/sonymn.cpp:278
+msgid "Flash exposure compensation in EV"
+msgstr "Kompenzácia expozície blesku v EV"
+
+#: src/minoltamn.cpp:144 src/minoltamn.cpp:145 src/sonymn.cpp:280
+#: src/sonymn.cpp:281
+#, fuzzy
+msgid "Teleconverter Model"
+msgstr "Režim scény"
+
+#: src/minoltamn.cpp:150
+msgid "RAW+JPG Recording"
 msgstr ""
 
-#: src/minoltamn.cpp:274 src/minoltamn.cpp:930 src/minoltamn.cpp:1174
-#: src/olympusmn.cpp:772
-msgid "Color Temperature"
-msgstr "Farebná teplota"
+#: src/minoltamn.cpp:151
+msgid "RAW and JPG files recording"
+msgstr ""
+
+#: src/minoltamn.cpp:153 src/sonymn.cpp:366 src/sonymn.cpp:367
+#, fuzzy
+msgid "Zone Matching"
+msgstr "Redukcia šumu"
+
+#: src/minoltamn.cpp:154
+#, fuzzy
+msgid "Zone matching"
+msgstr "Redukcia šumu"
 
-#: src/minoltamn.cpp:275 src/minoltamn.cpp:931 src/minoltamn.cpp:1175
+#: src/minoltamn.cpp:157 src/minoltamn.cpp:787 src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:1476 src/minoltamn.cpp:1578
 msgid "Color temperature"
 msgstr "Farebná teplota"
 
-#: src/minoltamn.cpp:277
+#: src/minoltamn.cpp:159 src/sonymn.cpp:375
 msgid "Lens ID"
 msgstr "ID šošoviek"
 
-#: src/minoltamn.cpp:278
+#: src/minoltamn.cpp:160 src/sonymn.cpp:376
 msgid "Lens identifier"
 msgstr "Identifikátor šošoviek"
 
-#: src/minoltamn.cpp:280
+#: src/minoltamn.cpp:162 src/minoltamn.cpp:1478 src/minoltamn.cpp:1580
+#: src/sonymn.cpp:360
+#, fuzzy
+msgid "Color Compensation Filter"
+msgstr "Kompenzácia tónu"
+
+#: src/minoltamn.cpp:163 src/sonymn.cpp:361
+msgid "Color Compensation Filter: negative is green, positive is magenta"
+msgstr ""
+
+#: src/minoltamn.cpp:165 src/minoltamn.cpp:1472 src/sonymn.cpp:283
+#: src/sonymn.cpp:563 src/sonymn.cpp:564
+#, fuzzy
+msgid "White Balance Fine Tune"
+msgstr "Tabuľka vyváženia bielej"
+
+#: src/minoltamn.cpp:166 src/sonymn.cpp:284
+#, fuzzy
+msgid "White Balance Fine Tune Value"
+msgstr "Tabuľka vyváženia bielej"
+
+#: src/minoltamn.cpp:168
+#, fuzzy
+msgid "Image Stabilization A100"
+msgstr "Stabilizácia obrazu"
+
+#: src/minoltamn.cpp:169
+#, fuzzy
+msgid "Image Stabilization for the Sony DSLR-A100"
+msgstr "Údaje o stabilizácii obrazu"
+
+#: src/minoltamn.cpp:173
 msgid "Camera Settings (5D)"
 msgstr "Nastavenie fotoaparátu (5D)"
 
-#: src/minoltamn.cpp:281
+#: src/minoltamn.cpp:174
 msgid "Camera Settings (for Dynax 5D model)"
 msgstr "Nastavenia fotoaparátu (pre model Dynax 5D)"
 
-#: src/minoltamn.cpp:283 src/nikonmn.cpp:593 src/olympusmn.cpp:196
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:180 src/nikonmn.cpp:606 src/olympusmn.cpp:258
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:295
 msgid "Print IM"
 msgstr ""
 
-#: src/minoltamn.cpp:284 src/nikonmn.cpp:593 src/olympusmn.cpp:197
-#: src/panasonicmn.cpp:273
+#: src/minoltamn.cpp:181 src/nikonmn.cpp:606 src/olympusmn.cpp:259
+#: src/panasonicmn.cpp:279 src/sonymn.cpp:296
+#, fuzzy
 msgid "PrintIM information"
-msgstr ""
+msgstr "Informácie GPS"
 
-#: src/minoltamn.cpp:286
+#: src/minoltamn.cpp:183
 msgid "Camera Settings (Z1)"
 msgstr "Nastavenie fotoaparátu (Z1)"
 
-#: src/minoltamn.cpp:287
+#: src/minoltamn.cpp:184
 msgid "Camera Settings (for Z1, DImage X, and F100 models)"
 msgstr "Nastavenia fotoaparátu (pre modely Z1, DImage X, a F100)"
 
-#: src/minoltamn.cpp:292
+#: src/minoltamn.cpp:188
 msgid "Unknown Minolta MakerNote tag"
 msgstr "Neznáma značka Minolta MakerNote"
 
 # exif-exposureprogram-3
-#: src/minoltamn.cpp:306 src/minoltamn.cpp:777 src/minoltamn.cpp:981
-#: src/panasonicmn.cpp:103 src/sigmamn.cpp:152 src/tags.cpp:1039
+#: src/minoltamn.cpp:202 src/minoltamn.cpp:656 src/minoltamn.cpp:836
+#: src/panasonicmn.cpp:107 src/sigmamn.cpp:155 src/sonymn.cpp:111
+#: src/tags.cpp:1226
 msgid "Aperture priority"
 msgstr "priorita clony"
 
 # exif-exposureprogram-4
-#: src/minoltamn.cpp:307 src/minoltamn.cpp:778 src/minoltamn.cpp:982
-#: src/sigmamn.cpp:153 src/tags.cpp:1040
+#: src/minoltamn.cpp:203 src/minoltamn.cpp:657 src/minoltamn.cpp:837
+#: src/sigmamn.cpp:156 src/sonymn.cpp:112 src/tags.cpp:1227
 msgid "Shutter priority"
 msgstr "priorita uzávierky"
 
-#: src/minoltamn.cpp:313
+#: src/minoltamn.cpp:209 src/minoltamn.cpp:1122
 msgid "Fill flash"
 msgstr "Spustí sa blesk"
 
-#: src/minoltamn.cpp:315
+#: src/minoltamn.cpp:211 src/minoltamn.cpp:1120
+#, fuzzy
 msgid "Rear flash sync"
-msgstr ""
+msgstr "Odrazenie externého blesku"
 
-#: src/minoltamn.cpp:316
+#: src/minoltamn.cpp:212 src/minoltamn.cpp:1121
 msgid "Wireless"
 msgstr "Bezdrôtové"
 
-#: src/minoltamn.cpp:327
+#: src/minoltamn.cpp:224
 msgid "Fluorescent 2"
 msgstr "fluorescentné 2"
 
-#: src/minoltamn.cpp:329 src/properties.cpp:763
-msgid "Custom 3"
-msgstr "vlastné 3"
-
-#: src/minoltamn.cpp:334
+#: src/minoltamn.cpp:231
 msgid "Full size"
 msgstr "Plná veľkosť"
 
-#: src/minoltamn.cpp:346
+#: src/minoltamn.cpp:243
 msgid "Super fine"
 msgstr "super jemný"
 
-#: src/minoltamn.cpp:350
+#: src/minoltamn.cpp:247
 msgid "Extra fine"
 msgstr "extrajemný"
 
-#: src/minoltamn.cpp:357
+#: src/minoltamn.cpp:252 src/minoltamn.cpp:1099 src/minoltamn.cpp:1148
+#: src/sonymn.cpp:447
+#, fuzzy
+msgid "Single Frame"
+msgstr "jediný záber"
+
+#: src/minoltamn.cpp:254 src/minoltamn.cpp:1150
 msgid "Self-timer"
 msgstr "samospúšť"
 
-#: src/minoltamn.cpp:358
+#: src/minoltamn.cpp:255
 msgid "Bracketing"
 msgstr "Viacnásobné snímky"
 
-#: src/minoltamn.cpp:359
+#: src/minoltamn.cpp:256
 msgid "Interval"
 msgstr "Interval"
 
-#: src/minoltamn.cpp:360
+#: src/minoltamn.cpp:257
 msgid "UHS continuous"
 msgstr "UHS spojitý"
 
-#: src/minoltamn.cpp:361
+#: src/minoltamn.cpp:258
 msgid "HS continuous"
 msgstr "HS spojitý"
 
-#: src/minoltamn.cpp:366 src/minoltamn.cpp:1025 src/tags.cpp:1054
+# exif-meteringmode-4
+#: src/minoltamn.cpp:263 src/minoltamn.cpp:881 src/minoltamn.cpp:1127
+#: src/sonymn.cpp:468 src/tags.cpp:1241
+#, fuzzy
 msgid "Multi-segment"
-msgstr ""
+msgstr "Viacbodový"
 
-#: src/minoltamn.cpp:380
+#: src/minoltamn.cpp:264 src/minoltamn.cpp:1128 src/sonymn.cpp:469
+#: src/tags.cpp:1238
+msgid "Center weighted average"
+msgstr "Stredovo vážený priemer"
+
+#: src/minoltamn.cpp:271
 msgid "Electronic magnification"
 msgstr "Elektromagnetické zväčšenie"
 
-#: src/minoltamn.cpp:394 src/minoltamn.cpp:824 src/nikonmn.cpp:88
-#: src/nikonmn.cpp:758 src/nikonmn.cpp:773 src/pentaxmn.cpp:194
+#: src/minoltamn.cpp:285 src/minoltamn.cpp:704 src/minoltamn.cpp:1951
+#: src/nikonmn.cpp:100 src/nikonmn.cpp:771 src/nikonmn.cpp:786
+#: src/pentaxmn.cpp:216
 msgid "Top"
 msgstr "hore"
 
-#: src/minoltamn.cpp:395 src/minoltamn.cpp:825
+#: src/minoltamn.cpp:286 src/minoltamn.cpp:705 src/pentaxmn.cpp:234
 msgid "Top-right"
 msgstr "vpravo hore"
 
-#: src/minoltamn.cpp:397 src/minoltamn.cpp:827
+#: src/minoltamn.cpp:288 src/minoltamn.cpp:707 src/pentaxmn.cpp:240
 msgid "Bottom-right"
 msgstr "vpravo dolu"
 
-#: src/minoltamn.cpp:398 src/minoltamn.cpp:828 src/nikonmn.cpp:89
-#: src/nikonmn.cpp:759 src/nikonmn.cpp:774 src/pentaxmn.cpp:202
+#: src/minoltamn.cpp:289 src/minoltamn.cpp:708 src/minoltamn.cpp:1955
+#: src/nikonmn.cpp:101 src/nikonmn.cpp:772 src/nikonmn.cpp:787
+#: src/pentaxmn.cpp:224
 msgid "Bottom"
 msgstr "dolu"
 
-#: src/minoltamn.cpp:399 src/minoltamn.cpp:829
+#: src/minoltamn.cpp:290 src/minoltamn.cpp:709 src/pentaxmn.cpp:238
 msgid "Bottom-left"
 msgstr "vľavo dolu"
 
-#: src/minoltamn.cpp:401 src/minoltamn.cpp:831
+#: src/minoltamn.cpp:292 src/minoltamn.cpp:711 src/pentaxmn.cpp:232
 msgid "Top-left"
 msgstr "vpravo hore"
 
 # exif-sharpness-2
-#: src/minoltamn.cpp:418 src/olympusmn.cpp:105 src/pentaxmn.cpp:310
-#: src/tags.cpp:1154
+#: src/minoltamn.cpp:303 src/olympusmn.cpp:163 src/pentaxmn.cpp:368
+#: src/tags.cpp:1343
 msgid "Hard"
 msgstr "tvrdý"
 
 # exif-sharpness-1
-#: src/minoltamn.cpp:420 src/olympusmn.cpp:106 src/pentaxmn.cpp:308
-#: src/tags.cpp:1153
+#: src/minoltamn.cpp:305 src/olympusmn.cpp:164 src/pentaxmn.cpp:366
+#: src/tags.cpp:1342
 msgid "Soft"
 msgstr "mäkký"
 
-#: src/minoltamn.cpp:428 src/panasonicmn.cpp:101
+#: src/minoltamn.cpp:313 src/panasonicmn.cpp:105
 msgid "Night portrait"
 msgstr "Nočný portrét"
 
-#: src/minoltamn.cpp:430
+#: src/minoltamn.cpp:315
 msgid "Sports action"
 msgstr "Akčný šport"
 
-#: src/minoltamn.cpp:458
+#: src/minoltamn.cpp:344
 msgid "Time-lapse movie"
 msgstr ""
 
-#: src/minoltamn.cpp:463
+#: src/minoltamn.cpp:349
 msgid "Standard form"
 msgstr "Štandardný tvar"
 
-#: src/minoltamn.cpp:464
+#: src/minoltamn.cpp:350
 msgid "Data form"
 msgstr "Tvar dát"
 
-#: src/minoltamn.cpp:469
+#: src/minoltamn.cpp:355
 msgid "Natural color"
 msgstr "Prirodzená farba"
 
-#: src/minoltamn.cpp:470 src/panasonicmn.cpp:68 src/panasonicmn.cpp:144
+#: src/minoltamn.cpp:356 src/panasonicmn.cpp:70 src/panasonicmn.cpp:148
 msgid "Black and white"
 msgstr "Čiernobiela"
 
-#: src/minoltamn.cpp:471
+#: src/minoltamn.cpp:357
 msgid "Vivid color"
 msgstr "Živé farby"
 
-#: src/minoltamn.cpp:473 src/minoltamn.cpp:855 src/nikonmn.cpp:125
-#: src/olympusmn.cpp:509 src/olympusmn.cpp:714 src/olympusmn.cpp:779
-#: src/pentaxmn.cpp:483 src/tags.cpp:1087
-msgid "Adobe RGB"
-msgstr "Adobe RGB"
-
-#: src/minoltamn.cpp:484
+#: src/minoltamn.cpp:364
 msgid "No zone"
 msgstr "Žiadna oblasť"
 
-#: src/minoltamn.cpp:485
+#: src/minoltamn.cpp:365
 msgid "Center zone (horizontal orientation)"
 msgstr "Stredná oblasť (vodorovná orientácia)"
 
-#: src/minoltamn.cpp:486
+#: src/minoltamn.cpp:366
 msgid "Center zone (vertical orientation)"
 msgstr "Stredná oblasť (zvislá orientácia)"
 
-#: src/minoltamn.cpp:487
+#: src/minoltamn.cpp:367
 msgid "Left zone"
 msgstr "Oblasť vľavo"
 
-#: src/minoltamn.cpp:488
+#: src/minoltamn.cpp:368
 msgid "Right zone"
 msgstr "Oblasť vpravo"
 
-#: src/minoltamn.cpp:493 src/olympusmn.cpp:915
+#: src/minoltamn.cpp:373 src/olympusmn.cpp:999
 msgid "Auto focus"
 msgstr "Automatické zaostrenie"
 
-#: src/minoltamn.cpp:499
+#: src/minoltamn.cpp:379
 msgid "Wide focus (normal)"
 msgstr "Široké zaostrenie (bežné)"
 
-#: src/minoltamn.cpp:500
+#: src/minoltamn.cpp:380
 msgid "Spot focus"
 msgstr "Bodové zaostrenie"
 
-#: src/minoltamn.cpp:505 src/properties.cpp:422 src/sigmamn.cpp:83
-#: src/sigmamn.cpp:84
+#: src/minoltamn.cpp:385 src/properties.cpp:438 src/sigmamn.cpp:86
+#: src/sigmamn.cpp:87
 msgid "Exposure"
 msgstr "Expozícia"
 
-#: src/minoltamn.cpp:508
+#: src/minoltamn.cpp:388
 msgid "Filter"
 msgstr "Filter"
 
-#: src/minoltamn.cpp:513
+#: src/minoltamn.cpp:393
 msgid "Not embedded"
 msgstr "Nevložený"
 
-#: src/minoltamn.cpp:514
+#: src/minoltamn.cpp:394
 msgid "Embedded"
 msgstr "Vložený"
 
-#: src/minoltamn.cpp:523
+#: src/minoltamn.cpp:403
 msgid "Text + ID#"
 msgstr "Text + ID#"
 
-#: src/minoltamn.cpp:528
+#: src/minoltamn.cpp:408
 msgid "ADI (Advanced Distance Integration)"
 msgstr "ADI (Pokročilá integrácia vzdialenosti)"
 
-#: src/minoltamn.cpp:529
+#: src/minoltamn.cpp:409
 msgid "Pre-flash TTl"
 msgstr ""
 
-#: src/minoltamn.cpp:530
+#: src/minoltamn.cpp:410
 msgid "Manual flash control"
 msgstr "Ručné riadenie blesku"
 
-#: src/minoltamn.cpp:610 src/minoltamn.cpp:885 src/minoltamn.cpp:1123
-#: src/olympusmn.cpp:612 src/properties.cpp:551 src/sigmamn.cpp:71
-#: src/tags.cpp:1380
+#: src/minoltamn.cpp:490 src/minoltamn.cpp:741 src/minoltamn.cpp:984
+#: src/minoltamn.cpp:1352 src/olympusmn.cpp:659 src/properties.cpp:567
+#: src/sigmamn.cpp:74 src/sonymn.cpp:393 src/sonymn.cpp:394 src/tags.cpp:1570
 msgid "Exposure Mode"
 msgstr "Režim expozície"
 
-#: src/minoltamn.cpp:614 src/minoltamn.cpp:665 src/minoltamn.cpp:907
-#: src/olympusmn.cpp:218 src/olympusmn.cpp:620 src/pentaxmn.cpp:816
+#: src/minoltamn.cpp:494 src/minoltamn.cpp:763 src/olympusmn.cpp:280
+#: src/olympusmn.cpp:670 src/pentaxmn.cpp:896
 msgid "Flash mode"
 msgstr "Režim blesku"
 
-#: src/minoltamn.cpp:626 src/olympusmn.cpp:644 src/pentaxmn.cpp:901
-#: src/pentaxmn.cpp:902 src/sigmamn.cpp:58
+#: src/minoltamn.cpp:506 src/minoltamn.cpp:1428 src/olympusmn.cpp:700
+#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992 src/sigmamn.cpp:60
 msgid "Drive mode"
 msgstr "jazda autom"
 
-#: src/minoltamn.cpp:631
-msgid "Exposure Speed"
-msgstr "Rýchlosť expozície"
-
-#: src/minoltamn.cpp:632
-msgid "Exposure speed"
-msgstr "Rýchlosť expozície"
+#: src/minoltamn.cpp:512
+#, fuzzy
+msgid "ISO Value"
+msgstr "Hodnota ISO rýchlosti"
 
-#: src/minoltamn.cpp:634 src/minoltamn.cpp:941 src/minoltamn.cpp:1159
-#: src/properties.cpp:518 src/tags.cpp:600 src/tags.cpp:1174
+#: src/minoltamn.cpp:514 src/minoltamn.cpp:797 src/minoltamn.cpp:1023
+#: src/minoltamn.cpp:1367 src/properties.cpp:534 src/tags.cpp:787
+#: src/tags.cpp:1364
 msgid "Exposure Time"
 msgstr "Čas expozície"
 
-#: src/minoltamn.cpp:637 src/minoltamn.cpp:938 src/minoltamn.cpp:1162
-#: src/tags.cpp:601 src/tags.cpp:1177
+#: src/minoltamn.cpp:517 src/minoltamn.cpp:794 src/minoltamn.cpp:1026
+#: src/minoltamn.cpp:1370 src/minoltamn.cpp:1371 src/tags.cpp:788
+#: src/tags.cpp:1367
 msgid "FNumber"
 msgstr "číslo F"
 
-#: src/minoltamn.cpp:638 src/minoltamn.cpp:939 src/minoltamn.cpp:1163
+#: src/minoltamn.cpp:518 src/minoltamn.cpp:795 src/minoltamn.cpp:1027
 msgid "The F-Number"
 msgstr "Číslo F"
 
-#: src/minoltamn.cpp:640 src/olympusmn.cpp:615
+#: src/minoltamn.cpp:520 src/olympusmn.cpp:663
 msgid "Macro Mode"
 msgstr "Režim makro"
 
-#: src/minoltamn.cpp:646 src/minoltamn.cpp:912 src/minoltamn.cpp:1180
+#: src/minoltamn.cpp:526 src/minoltamn.cpp:768 src/minoltamn.cpp:1044
 msgid "Exposure Compensation"
 msgstr "Kompenzácia expozície"
 
-#: src/minoltamn.cpp:649
+#: src/minoltamn.cpp:529
 msgid "Bracket Step"
 msgstr "Krok viacnásobného záberu"
 
-#: src/minoltamn.cpp:650
+#: src/minoltamn.cpp:530
 msgid "Bracket step"
 msgstr "Krok viacnásobného záberu"
 
-#: src/minoltamn.cpp:652
+#: src/minoltamn.cpp:532
 msgid "Interval Length"
 msgstr "Dĺžka intervalu"
 
-#: src/minoltamn.cpp:653
+#: src/minoltamn.cpp:533
 msgid "Interval length"
 msgstr "Dĺžka intervalu"
 
-#: src/minoltamn.cpp:655
+#: src/minoltamn.cpp:535
 msgid "Interval Number"
 msgstr "Číslo intervalu"
 
-#: src/minoltamn.cpp:656
+#: src/minoltamn.cpp:536
 msgid "Interval number"
 msgstr "Číslo intervalu"
 
-#: src/minoltamn.cpp:661 src/nikonmn.cpp:240 src/nikonmn.cpp:551
-#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1109 src/olympusmn.cpp:241
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:541 src/nikonmn.cpp:252 src/nikonmn.cpp:564
+#: src/nikonmn.cpp:1324 src/nikonmn.cpp:1349 src/olympusmn.cpp:303
+#: src/olympusmn.cpp:1007
 msgid "Focus Distance"
 msgstr "Vzdialenosť zaostrenia"
 
-#: src/minoltamn.cpp:662 src/nikonmn.cpp:1084 src/nikonmn.cpp:1109
-#: src/olympusmn.cpp:923
+#: src/minoltamn.cpp:542 src/nikonmn.cpp:1324 src/nikonmn.cpp:1349
+#: src/olympusmn.cpp:1007
 msgid "Focus distance"
 msgstr "Vzdialenosť zaostrenia"
 
-#: src/minoltamn.cpp:667
+#: src/minoltamn.cpp:544 src/minoltamn.cpp:759 src/minoltamn.cpp:1002
+#, fuzzy
+msgid "Flash Fired"
+msgstr "Zariadenie blesku"
+
+#: src/minoltamn.cpp:545 src/minoltamn.cpp:760 src/minoltamn.cpp:1003
+#, fuzzy
+msgid "Flash fired"
+msgstr "Blesk vypnutý"
+
+#: src/minoltamn.cpp:547
 msgid "Minolta Date"
 msgstr "Dátum Minolta"
 
-#: src/minoltamn.cpp:668
+#: src/minoltamn.cpp:548
 msgid "Minolta date"
 msgstr "Dátum Minolta"
 
-#: src/minoltamn.cpp:670
+#: src/minoltamn.cpp:550
 msgid "Minolta Time"
 msgstr "Čas Minolta"
 
-#: src/minoltamn.cpp:671
+#: src/minoltamn.cpp:551
 msgid "Minolta time"
 msgstr "Čas Minolta"
 
-#: src/minoltamn.cpp:676
+#: src/minoltamn.cpp:556
 msgid "File Number Memory"
 msgstr "Pamäť čísla súboru"
 
-#: src/minoltamn.cpp:677
+#: src/minoltamn.cpp:557
 msgid "File number memory"
 msgstr "Pamäť čísla súboru"
 
-#: src/minoltamn.cpp:679 src/minoltamn.cpp:948 src/minoltamn.cpp:955
-#: src/minoltamn.cpp:1192 src/tags.cpp:653
-msgid "Image Number"
+#: src/minoltamn.cpp:559
+#, fuzzy
+msgid "Last Image Number"
+msgstr "Číslo obrázka"
+
+#: src/minoltamn.cpp:560
+#, fuzzy
+msgid "Last image number"
 msgstr "Číslo obrázka"
 
-#: src/minoltamn.cpp:682
+#: src/minoltamn.cpp:562
 msgid "Color Balance Red"
 msgstr "Vyváženie farieb Červená"
 
-#: src/minoltamn.cpp:683
+#: src/minoltamn.cpp:563
 msgid "Color balance red"
 msgstr "Vyváženie farieb Červená"
 
-#: src/minoltamn.cpp:685
+#: src/minoltamn.cpp:565
 msgid "Color Balance Green"
 msgstr "Vyváženie farieb Zelená"
 
-#: src/minoltamn.cpp:686
+#: src/minoltamn.cpp:566
 msgid "Color balance green"
 msgstr "Vyváženie farieb Zelená"
 
-#: src/minoltamn.cpp:688
+#: src/minoltamn.cpp:568
 msgid "Color Balance Blue"
 msgstr "Vyváženie farieb Modrá"
 
-#: src/minoltamn.cpp:689
+#: src/minoltamn.cpp:569
 msgid "Color balance blue"
 msgstr "Vyváženie farieb Modrá"
 
-#: src/minoltamn.cpp:700
+#: src/minoltamn.cpp:580
 msgid "Subject Program"
 msgstr "Program subjektu"
 
-#: src/minoltamn.cpp:701
+#: src/minoltamn.cpp:581
 msgid "Subject program"
 msgstr "Program subjektu"
 
-#: src/minoltamn.cpp:703 src/olympusmn.cpp:621
-msgid "Flash Exposure Compensation"
-msgstr "Kompenzácia expozície blesku"
+#: src/minoltamn.cpp:586 src/nikonmn.cpp:542
+msgid "ISO Settings"
+msgstr "Nastavenia ISO"
 
-#: src/minoltamn.cpp:704
-msgid "Flash exposure compensation in EV"
-msgstr "Kompenzácia expozície blesku v EV"
+#: src/minoltamn.cpp:587 src/minoltamn.cpp:1398 src/nikonmn.cpp:542
+msgid "ISO setting"
+msgstr "Nastavenia ISO"
 
-#: src/minoltamn.cpp:709
+#: src/minoltamn.cpp:589
 msgid "Minolta Model"
 msgstr "Model Minolta"
 
-#: src/minoltamn.cpp:710
+#: src/minoltamn.cpp:590
 msgid "Minolta model"
 msgstr "Model Minolta"
 
-#: src/minoltamn.cpp:712
+#: src/minoltamn.cpp:592
 msgid "Interval Mode"
 msgstr "Režim intervalu"
 
-#: src/minoltamn.cpp:713
+#: src/minoltamn.cpp:593
 msgid "Interval mode"
 msgstr "Režim intervalu"
 
-#: src/minoltamn.cpp:715
+#: src/minoltamn.cpp:595
 msgid "Folder Name"
 msgstr "Názov priečinka"
 
-#: src/minoltamn.cpp:716
+#: src/minoltamn.cpp:596
 msgid "Folder name"
 msgstr "Názov priečinka"
 
-#: src/minoltamn.cpp:718 src/minoltamn.cpp:719
+#: src/minoltamn.cpp:598 src/minoltamn.cpp:599
 msgid "ColorMode"
 msgstr "Farebný režim"
 
-#: src/minoltamn.cpp:721 src/pentaxmn.cpp:403
+#: src/minoltamn.cpp:601 src/minoltamn.cpp:1204 src/pentaxmn.cpp:462
 msgid "Color Filter"
 msgstr "Farebný filter"
 
-#: src/minoltamn.cpp:722
+#: src/minoltamn.cpp:602
 msgid "Color filter"
 msgstr "Farebný filter"
 
-#: src/minoltamn.cpp:724
+#: src/minoltamn.cpp:604
 msgid "Black and White Filter"
 msgstr "Čiernobiely filter"
 
-#: src/minoltamn.cpp:725
+#: src/minoltamn.cpp:605
 msgid "Black and white filter"
 msgstr "Čiernobiely filter"
 
-#: src/minoltamn.cpp:727 src/olympusmn.cpp:929
+#: src/minoltamn.cpp:607 src/minoltamn.cpp:608 src/olympusmn.cpp:1013
 msgid "Internal Flash"
 msgstr "Vnútorný blesk"
 
-#: src/minoltamn.cpp:730 src/minoltamn.cpp:731 src/nikonmn.cpp:684
-#: src/olympusmn.cpp:214 src/properties.cpp:408 src/tags.cpp:1230
+#: src/minoltamn.cpp:610 src/minoltamn.cpp:611 src/nikonmn.cpp:697
+#: src/olympusmn.cpp:276 src/properties.cpp:424 src/sonymn.cpp:602
+#: src/sonymn.cpp:603 src/tags.cpp:1420
 msgid "Brightness"
 msgstr "Jas"
 
-#: src/minoltamn.cpp:733
+#: src/minoltamn.cpp:613
 msgid "Spot Focus Point X"
 msgstr "Bod zaostrenia X"
 
-#: src/minoltamn.cpp:734
+#: src/minoltamn.cpp:614
 msgid "Spot focus point X"
 msgstr "Bod zaostrenia X"
 
-#: src/minoltamn.cpp:736
+#: src/minoltamn.cpp:616
 msgid "Spot Focus Point Y"
 msgstr "Bod zaostrenia Y"
 
-#: src/minoltamn.cpp:737
+#: src/minoltamn.cpp:617
 msgid "Spot focus point Y"
 msgstr "Bod zaostrenia Y"
 
-#: src/minoltamn.cpp:739
+#: src/minoltamn.cpp:619
 msgid "Wide Focus Zone"
 msgstr "Široký rozsah zaostrenia"
 
-#: src/minoltamn.cpp:740
+#: src/minoltamn.cpp:620
 msgid "Wide focus zone"
 msgstr "Oblasť širokého zaostrenia"
 
-#: src/minoltamn.cpp:743 src/minoltamn.cpp:898 src/minoltamn.cpp:1172
-#: src/nikonmn.cpp:220 src/nikonmn.cpp:463 src/nikonmn.cpp:518
-#: src/olympusmn.cpp:239 src/olympusmn.cpp:616 src/panasonicmn.cpp:234
-#: src/pentaxmn.cpp:819
+#: src/minoltamn.cpp:623 src/minoltamn.cpp:754 src/minoltamn.cpp:1036
+#: src/minoltamn.cpp:1380 src/nikonmn.cpp:232 src/nikonmn.cpp:475
+#: src/nikonmn.cpp:530 src/olympusmn.cpp:301 src/olympusmn.cpp:664
+#: src/panasonicmn.cpp:240 src/pentaxmn.cpp:899
 msgid "Focus mode"
 msgstr "režim zaostrenia"
 
-#: src/minoltamn.cpp:745 src/minoltamn.cpp:746 src/minoltamn.cpp:1139
+#: src/minoltamn.cpp:625 src/minoltamn.cpp:626 src/minoltamn.cpp:1000
 msgid "Focus area"
 msgstr "Rozsah zaostrenia"
 
-#: src/minoltamn.cpp:748
+#: src/minoltamn.cpp:628
 msgid "DEC Switch Position"
 msgstr "Poloha prepínača DEC"
 
-#: src/minoltamn.cpp:749
+#: src/minoltamn.cpp:629
 msgid "DEC switch position"
 msgstr "poloha prepínača DEC"
 
-#: src/minoltamn.cpp:751
+#: src/minoltamn.cpp:631
 msgid "Color Profile"
 msgstr "Farebný profil"
 
-#: src/minoltamn.cpp:752
+#: src/minoltamn.cpp:632
 msgid "Color profile"
 msgstr "Farebný profil"
 
-#: src/minoltamn.cpp:754 src/minoltamn.cpp:755
+#: src/minoltamn.cpp:634 src/minoltamn.cpp:635
+#, fuzzy
 msgid "Data Imprint"
-msgstr ""
+msgstr "Výpis dát 1"
 
-#: src/minoltamn.cpp:757
+#: src/minoltamn.cpp:637 src/minoltamn.cpp:1421
 msgid "Flash Metering"
 msgstr "Meranie blesku"
 
-#: src/minoltamn.cpp:758
+#: src/minoltamn.cpp:638 src/minoltamn.cpp:1422
 msgid "Flash metering"
 msgstr "Meranie blesku"
 
-#: src/minoltamn.cpp:763
+#: src/minoltamn.cpp:642
 msgid "Unknown Minolta Camera Settings tag"
 msgstr "Neznáma značka Nastavenie fotoaparátu Minolta"
 
-#: src/minoltamn.cpp:781
+#: src/minoltamn.cpp:660
+#, fuzzy
 msgid "Program-shift A"
-msgstr ""
+msgstr "Posunutie programu"
 
-#: src/minoltamn.cpp:782
+#: src/minoltamn.cpp:661
+#, fuzzy
 msgid "Program-shift S"
-msgstr ""
+msgstr "Posunutie programu"
 
-#: src/minoltamn.cpp:797 src/minoltamn.cpp:1000
+#: src/minoltamn.cpp:676 src/minoltamn.cpp:862
 msgid "Raw+Jpeg"
 msgstr "Raw+Jpeg"
 
-#: src/minoltamn.cpp:809 src/minoltamn.cpp:1013
+#: src/minoltamn.cpp:688 src/minoltamn.cpp:875 src/pentaxmn.cpp:322
 msgid "Kelvin"
 msgstr "Kelvinov"
 
 # AF = automatické zaostrenie
-#: src/minoltamn.cpp:815
+#: src/minoltamn.cpp:695
 msgid "Single-shot AF"
 msgstr "automatické zaostrenie pre jeden záber"
 
-#: src/minoltamn.cpp:816 src/olympusmn.cpp:448
+#: src/minoltamn.cpp:696 src/olympusmn.cpp:510 src/olympusmn.cpp:1371
 msgid "Continuous AF"
 msgstr "spojité automatické zaostrenie"
 
-#: src/minoltamn.cpp:817
+#: src/minoltamn.cpp:698
 msgid "Automatic AF"
 msgstr "automatické zaostrenie"
 
-#: src/minoltamn.cpp:853
+#: src/minoltamn.cpp:727 src/minoltamn.cpp:901
 msgid "sRGB (Natural)"
 msgstr "sRGB (prirodzené)"
 
-#: src/minoltamn.cpp:854
+#: src/minoltamn.cpp:728 src/minoltamn.cpp:902
 msgid "sRGB (Natural+)"
 msgstr "sRGB (prirodzené+)"
 
-#: src/minoltamn.cpp:860 src/minoltamn.cpp:1045 src/panasonicmn.cpp:185
+#: src/minoltamn.cpp:734 src/minoltamn.cpp:910 src/minoltamn.cpp:2019
+#: src/panasonicmn.cpp:190
 msgid "Horizontal (normal)"
 msgstr "Horizontálne (normálne)"
 
-#: src/minoltamn.cpp:861 src/minoltamn.cpp:1046 src/panasonicmn.cpp:186
+#: src/minoltamn.cpp:735 src/minoltamn.cpp:911 src/minoltamn.cpp:2020
+#: src/panasonicmn.cpp:191
 msgid "Rotate 90 CW"
 msgstr "Otočiť o 90°"
 
-#: src/minoltamn.cpp:862 src/minoltamn.cpp:1047 src/panasonicmn.cpp:187
+#: src/minoltamn.cpp:736 src/minoltamn.cpp:912 src/minoltamn.cpp:2021
+#: src/panasonicmn.cpp:192
 msgid "Rotate 270 CW"
 msgstr "Otočiť o 270°"
 
 # AF = automatické zaostrenie
-#: src/minoltamn.cpp:900
+#: src/minoltamn.cpp:756
 msgid "AF Points"
 msgstr "body automatického zaostrenia"
 
 # AF = automatické zaostrenie
-#: src/minoltamn.cpp:901
+#: src/minoltamn.cpp:757
 msgid "AF points"
 msgstr "body automatického zaostrenia"
 
-#: src/minoltamn.cpp:915 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:741 src/olympusmn.cpp:756 src/olympusmn.cpp:827
-#: src/properties.cpp:502 src/sigmamn.cpp:80 src/tags.cpp:1284
+#: src/minoltamn.cpp:771 src/minoltamn.cpp:1011 src/minoltamn.cpp:1409
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:802
+#: src/olympusmn.cpp:817 src/olympusmn.cpp:888 src/properties.cpp:518
+#: src/sigmamn.cpp:83 src/tags.cpp:1474
 msgid "Color Space"
 msgstr "Farebný priestor"
 
-#: src/minoltamn.cpp:916 src/nikonmn.cpp:538 src/olympusmn.cpp:629
-#: src/olympusmn.cpp:756 src/olympusmn.cpp:827 src/pentaxmn.cpp:905
-#: src/pentaxmn.cpp:906 src/sigmamn.cpp:81
+#: src/minoltamn.cpp:772 src/minoltamn.cpp:1012 src/minoltamn.cpp:1410
+#: src/nikonmn.cpp:551 src/olympusmn.cpp:683 src/olympusmn.cpp:817
+#: src/olympusmn.cpp:888 src/pentaxmn.cpp:995 src/pentaxmn.cpp:996
+#: src/sigmamn.cpp:84
 msgid "Color space"
 msgstr "Fariebný priestor"
 
-#: src/minoltamn.cpp:927 src/minoltamn.cpp:945 src/minoltamn.cpp:1165
-#: src/minoltamn.cpp:1183
+#: src/minoltamn.cpp:783 src/minoltamn.cpp:801 src/minoltamn.cpp:1029
+#: src/minoltamn.cpp:1047 src/minoltamn.cpp:1457
 msgid "Free Memory Card Images"
 msgstr ""
 
-#: src/minoltamn.cpp:928 src/minoltamn.cpp:946 src/minoltamn.cpp:1166
-#: src/minoltamn.cpp:1184
+#: src/minoltamn.cpp:784 src/minoltamn.cpp:802 src/minoltamn.cpp:1030
+#: src/minoltamn.cpp:1048 src/minoltamn.cpp:1458
 msgid "Free memory card images"
 msgstr ""
 
-#: src/minoltamn.cpp:933
+#: src/minoltamn.cpp:789
 msgid "Hue"
 msgstr "Odtieň"
 
-#: src/minoltamn.cpp:935 src/minoltamn.cpp:936 src/minoltamn.cpp:1177
-#: src/minoltamn.cpp:1178 src/panasonicmn.cpp:255
+#: src/minoltamn.cpp:791 src/minoltamn.cpp:792 src/minoltamn.cpp:1041
+#: src/minoltamn.cpp:1042 src/minoltamn.cpp:1571 src/minoltamn.cpp:1572
+#: src/panasonicmn.cpp:261 src/sonymn.cpp:638 src/sonymn.cpp:639
+#: src/sonymn.cpp:711 src/sonymn.cpp:712
 msgid "Rotation"
 msgstr "otočenie"
 
-#: src/minoltamn.cpp:952 src/minoltamn.cpp:1196 src/nikonmn.cpp:566
-#: src/olympusmn.cpp:377 src/olympusmn.cpp:631 src/olympusmn.cpp:758
-#: src/olympusmn.cpp:828 src/olympusmn.cpp:893 src/panasonicmn.cpp:252
-#: src/pentaxmn.cpp:928 src/pentaxmn.cpp:929
+#: src/minoltamn.cpp:804 src/minoltamn.cpp:811 src/minoltamn.cpp:1065
+#: src/tags.cpp:840
+msgid "Image Number"
+msgstr "Číslo obrázka"
+
+#: src/minoltamn.cpp:808 src/minoltamn.cpp:1069 src/minoltamn.cpp:1494
+#: src/nikonmn.cpp:579 src/olympusmn.cpp:439 src/olympusmn.cpp:685
+#: src/olympusmn.cpp:819 src/olympusmn.cpp:889 src/olympusmn.cpp:974
+#: src/panasonicmn.cpp:258 src/pentaxmn.cpp:1024 src/pentaxmn.cpp:1025
 msgid "Noise reduction"
 msgstr "Redukcia šumu"
 
-#: src/minoltamn.cpp:961
+#: src/minoltamn.cpp:817
 msgid "Zone Matching On"
 msgstr ""
 
-#: src/minoltamn.cpp:962
+#: src/minoltamn.cpp:818
+#, fuzzy
 msgid "Zone matching on"
-msgstr ""
+msgstr "Kompenzácia tónu"
 
-#: src/minoltamn.cpp:967
+#: src/minoltamn.cpp:822
 msgid "Unknown Minolta Camera Settings 7D tag"
 msgstr "Neznáma značka Minolta Camera Settings 7D"
 
-#: src/minoltamn.cpp:985
-msgid "Connected copying"
-msgstr ""
+#: src/minoltamn.cpp:840 src/sonymn.cpp:521
+#, fuzzy
+msgid "Program Shift A"
+msgstr "Posunutie programu"
+
+#: src/minoltamn.cpp:841 src/sonymn.cpp:522
+#, fuzzy
+msgid "Program Shift S"
+msgstr "Posunutie programu"
 
-#: src/minoltamn.cpp:1039
+#: src/minoltamn.cpp:845 src/minoltamn.cpp:1889 src/minoltamn.cpp:2044
+#: src/sonymn.cpp:480
+#, fuzzy
+msgid "Night View/Portrait"
+msgstr "Nočný portrét"
+
+#: src/minoltamn.cpp:895
 msgid "200 (Zone Matching High)"
 msgstr ""
 
-#: src/minoltamn.cpp:1040
+#: src/minoltamn.cpp:896
 msgid "80 (Zone Matching Low)"
 msgstr ""
 
-#: src/minoltamn.cpp:1065
+#: src/minoltamn.cpp:904 src/minoltamn.cpp:955
+#, fuzzy
+msgid "Adobe RGB (ICC)"
+msgstr "Adobe RGB"
+
+#: src/minoltamn.cpp:918
 msgid "Central"
 msgstr "Stred"
 
-#: src/minoltamn.cpp:1066
+#: src/minoltamn.cpp:919
 msgid "Up"
 msgstr "Hore"
 
-#: src/minoltamn.cpp:1067
+#: src/minoltamn.cpp:920
 msgid "Up right"
 msgstr "Vpravo hore"
 
-#: src/minoltamn.cpp:1069
+#: src/minoltamn.cpp:922
 msgid "Down right"
 msgstr "Vpravo dolu"
 
-#: src/minoltamn.cpp:1070
+#: src/minoltamn.cpp:923
 msgid "Down"
 msgstr "Dolu"
 
-#: src/minoltamn.cpp:1071
+#: src/minoltamn.cpp:924
 msgid "Down left"
 msgstr "Vľavo dolu"
 
-#: src/minoltamn.cpp:1073
+#: src/minoltamn.cpp:926
 msgid "Up left"
 msgstr "Vľavo hore"
 
-#: src/minoltamn.cpp:1079
+#: src/minoltamn.cpp:932
 msgid "Selection"
 msgstr "Výber"
 
-#: src/minoltamn.cpp:1135 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:947
+#, fuzzy
+msgid "Natural+"
+msgstr "Prirodzené"
+
+#: src/minoltamn.cpp:949
+#, fuzzy
+msgid "Wind Scene"
+msgstr "Nočná scéna"
+
+#: src/minoltamn.cpp:950
+#, fuzzy
+msgid "Evening Scene"
+msgstr "Večer"
+
+#: src/minoltamn.cpp:996 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus Position"
 msgstr "poloha zaostrenia"
 
-#: src/minoltamn.cpp:1136 src/nikonmn.cpp:1083 src/nikonmn.cpp:1108
+#: src/minoltamn.cpp:997 src/nikonmn.cpp:1323 src/nikonmn.cpp:1348
 msgid "Focus position"
 msgstr "poloha zaostrenia"
 
-#: src/minoltamn.cpp:1138
+#: src/minoltamn.cpp:999
 msgid "Focus Area"
 msgstr "rozsah zaostrenia"
 
-#: src/minoltamn.cpp:1168
+#: src/minoltamn.cpp:1032
 msgid "Exposure Revision"
 msgstr "Revízia expozície"
 
-#: src/minoltamn.cpp:1169
+#: src/minoltamn.cpp:1033
 msgid "Exposure revision"
 msgstr "Revízia expozície"
 
-#: src/minoltamn.cpp:1186
+#: src/minoltamn.cpp:1050 src/minoltamn.cpp:1051
+#, fuzzy
+msgid "Rotation2"
+msgstr "otočenie"
+
+#: src/minoltamn.cpp:1056 src/minoltamn.cpp:1057
+#, fuzzy
+msgid "Picture Finish"
+msgstr "Informácie o obrázku"
+
+#: src/minoltamn.cpp:1059
 msgid "Exposure Manual Bias"
 msgstr "Ručné skreslenie expozície"
 
-#: src/minoltamn.cpp:1187
+#: src/minoltamn.cpp:1060
 msgid "Exposure manual bias"
 msgstr "Ručné skreslenie expozície"
 
-#: src/minoltamn.cpp:1189 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1062 src/panasonicmn.cpp:241 src/sonymn.cpp:399
+#: src/sonymn.cpp:400
 msgid "AF Mode"
 msgstr "Režim AZ"
 
-#: src/minoltamn.cpp:1190 src/panasonicmn.cpp:235
+#: src/minoltamn.cpp:1063 src/panasonicmn.cpp:241
 msgid "AF mode"
 msgstr "Režim AZ"
 
-#: src/minoltamn.cpp:1210
+#: src/minoltamn.cpp:1083
 msgid "Unknown Minolta Camera Settings 5D tag"
 msgstr "Neznáma značka Minolta Camera Settings 5D"
 
-#: src/nikonmn.cpp:74 src/nikonmn.cpp:1297
-msgid "Single area"
-msgstr "Jednoduchá oblasť"
+#: src/minoltamn.cpp:1096 src/sonymn.cpp:449
+#, fuzzy
+msgid "Self-timer 10 sec"
+msgstr "samospúšť (12 sek)"
 
-#: src/nikonmn.cpp:75 src/nikonmn.cpp:1298
-msgid "Dynamic area"
-msgstr "Dynamická oblasť"
+#: src/minoltamn.cpp:1098 src/sonymn.cpp:450
+#, fuzzy
+msgid "Self-timer 2 sec"
+msgstr "samospúšť (2 sek)"
 
-#: src/nikonmn.cpp:76
-msgid "Dynamic area, closest subject"
-msgstr ""
+#: src/minoltamn.cpp:1100 src/sonymn.cpp:453
+#, fuzzy
+msgid "White Balance Bracketing Low"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/nikonmn.cpp:77
-msgid "Group dynamic"
-msgstr ""
+#: src/minoltamn.cpp:1101
+#, fuzzy
+msgid "White Balance Bracketing High"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/nikonmn.cpp:78 src/nikonmn.cpp:1301
-msgid "Single area (wide)"
-msgstr ""
+#: src/minoltamn.cpp:1102
+#, fuzzy
+msgid "Single-frame Bracketing Low"
+msgstr "jediný záber"
 
-#: src/nikonmn.cpp:79 src/nikonmn.cpp:1302
-msgid "Dynamic area (wide)"
-msgstr "Dynamická oblasť (široká)"
+#: src/minoltamn.cpp:1103
+#, fuzzy
+msgid "Continous Bracketing Low"
+msgstr "Viacnásobné snímky"
 
-#: src/nikonmn.cpp:92 src/nikonmn.cpp:762 src/nikonmn.cpp:777
-#: src/pentaxmn.cpp:193
-msgid "Upper-left"
-msgstr "vľavo hore"
+#: src/minoltamn.cpp:1104
+#, fuzzy
+msgid "Single-frame Bracketing High"
+msgstr "jediný záber"
 
-#: src/nikonmn.cpp:93 src/nikonmn.cpp:763 src/nikonmn.cpp:778
-#: src/pentaxmn.cpp:195
-msgid "Upper-right"
-msgstr "vpravo hore"
+#: src/minoltamn.cpp:1105
+#, fuzzy
+msgid "Continous Bracketing High"
+msgstr "Spojitý, vysoký"
 
-#: src/nikonmn.cpp:94 src/nikonmn.cpp:764 src/nikonmn.cpp:779
-#: src/pentaxmn.cpp:201
-msgid "Lower-left"
-msgstr "vľavo dolu"
+#: src/minoltamn.cpp:1136 src/sonymn.cpp:158
+msgid "Advanced"
+msgstr ""
 
-#: src/nikonmn.cpp:95 src/nikonmn.cpp:765 src/nikonmn.cpp:780
-#: src/pentaxmn.cpp:203
-msgid "Lower-right"
-msgstr "vpravo dolu"
+#: src/minoltamn.cpp:1151 src/minoltamn.cpp:1433 src/sonymn.cpp:451
+#, fuzzy
+msgid "Continuous Bracketing"
+msgstr "Spojitý, vysoký"
 
-#: src/nikonmn.cpp:96
-msgid "Left-most"
-msgstr "najviac vľavo"
+#: src/minoltamn.cpp:1152
+#, fuzzy
+msgid "Single-Frame Bracketing"
+msgstr "jediný záber"
 
-#: src/nikonmn.cpp:97
-msgid "Right-most"
-msgstr "najviac vpravo"
+#: src/minoltamn.cpp:1153 src/minoltamn.cpp:1439 src/sonymn.cpp:225
+#, fuzzy
+msgid "White Balance Bracketing"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/nikonmn.cpp:124 src/olympusmn.cpp:508 src/olympusmn.cpp:713
-#: src/olympusmn.cpp:778 src/pentaxmn.cpp:482 src/tags.cpp:1086
-msgid "sRGB"
-msgstr "sRGB"
+#: src/minoltamn.cpp:1183 src/minoltamn.cpp:1186 src/nikonmn.cpp:446
+msgid "Preset"
+msgstr "Štandardné"
 
-#: src/nikonmn.cpp:131
-msgid "Fire, manual"
-msgstr "Blesk, ručne"
+#: src/minoltamn.cpp:1185 src/minoltamn.cpp:1188 src/minoltamn.cpp:2093
+#, fuzzy
+msgid "Color Temperature/Color Filter"
+msgstr "Farebná teplota"
 
-#: src/nikonmn.cpp:132
-msgid "Fire, external"
-msgstr "blesk, externý"
+#: src/minoltamn.cpp:1203 src/pentaxmn.cpp:1018 src/properties.cpp:451
+msgid "Temperature"
+msgstr "Teplota"
 
-#: src/nikonmn.cpp:133
-msgid "Fire, commander mode"
-msgstr ""
+#: src/minoltamn.cpp:1209
+#, fuzzy
+msgid "Setup"
+msgstr "Nastaviť"
 
-#: src/nikonmn.cpp:134
-msgid "Fire, TTL mode"
+#: src/minoltamn.cpp:1210
+msgid "Recall"
 msgstr ""
 
-#: src/nikonmn.cpp:140 src/nikonmn.cpp:151
-msgid "Delay"
-msgstr "Oneskorenie"
-
-#: src/nikonmn.cpp:141 src/nikonmn.cpp:152
-msgid "PC control"
-msgstr "Riadenie PC"
+#: src/minoltamn.cpp:1215
+msgid "Ok"
+msgstr ""
 
-#: src/nikonmn.cpp:142 src/nikonmn.cpp:153
-msgid "Exposure bracketing"
-msgstr "Viacnásobné snímky so zmenou expozície"
+#: src/minoltamn.cpp:1216
+msgid "Error"
+msgstr ""
 
-#: src/nikonmn.cpp:143
+#: src/minoltamn.cpp:1228
 #, fuzzy
-msgid "Auto ISO"
-msgstr "Auto"
-
-#: src/nikonmn.cpp:144 src/nikonmn.cpp:155
-msgid "White balance bracketing"
-msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
+msgid "Image and Information"
+msgstr "Konfigurácia obrázka"
 
-#: src/nikonmn.cpp:145 src/nikonmn.cpp:156
-msgid "IR control"
-msgstr "riadenie IR"
+#: src/minoltamn.cpp:1229
+#, fuzzy
+msgid "Image Only"
+msgstr "Typ obrázka"
 
-#: src/nikonmn.cpp:154
-msgid "Unused LE-NR slowdown"
-msgstr ""
+#: src/minoltamn.cpp:1230
+#, fuzzy
+msgid "Image and Histogram"
+msgstr "Výška obrázka"
 
-#: src/nikonmn.cpp:162
-msgid "Auto release"
-msgstr "Automatické uvoľnenie"
+#: src/minoltamn.cpp:1236
+#, fuzzy
+msgid "Fill Flash"
+msgstr "Spustí sa blesk"
 
-#: src/nikonmn.cpp:163
-msgid "Manual release"
-msgstr "Ručné uvoľnenie"
+#: src/minoltamn.cpp:1247
+#, fuzzy
+msgid "Focus Hold"
+msgstr "režim zaostrenia"
 
-#: src/nikonmn.cpp:168
+#: src/minoltamn.cpp:1248
 #, fuzzy
-msgid "Lossy (type 1)"
-msgstr "typ šošoviek"
+msgid "DOF Preview"
+msgstr "Dáta náhľadu"
 
-# exif-compression-1
-#: src/nikonmn.cpp:169 src/tags.cpp:232
-msgid "Uncompressed"
-msgstr "nekomprimovaný"
+#: src/minoltamn.cpp:1253
+msgid "Hold"
+msgstr ""
 
-#: src/nikonmn.cpp:170
+#: src/minoltamn.cpp:1254
 #, fuzzy
-msgid "Lossless"
-msgstr "Los Angeles"
+msgid "Toggle"
+msgstr "odtieň"
 
-#: src/nikonmn.cpp:171
+#: src/minoltamn.cpp:1255
 #, fuzzy
-msgid "Lossy (type 2)"
-msgstr "typ šošoviek"
+msgid "Spot Hold"
+msgstr "Bodový režim"
 
-#: src/nikonmn.cpp:177
+#: src/minoltamn.cpp:1256
 #, fuzzy
-msgid "B & W"
-msgstr "ČB"
+msgid "Spot Toggle"
+msgstr "Bodový režim"
 
-#: src/nikonmn.cpp:179
-#, fuzzy
-msgid "Trim"
-msgstr "Čas"
+# exif-shutterspeedvalue
+#: src/minoltamn.cpp:1261 src/olympusmn.cpp:267
+msgid "Shutter Speed"
+msgstr "Rýchlosť uzávierky"
 
-#: src/nikonmn.cpp:180
-msgid "Small picture"
+#: src/minoltamn.cpp:1267
+msgid "Ambient and Flash"
 msgstr ""
 
-#: src/nikonmn.cpp:181
-msgid "D-Lighting"
+#: src/minoltamn.cpp:1268
+msgid "Ambient Only"
 msgstr ""
 
-#: src/nikonmn.cpp:182
+#: src/minoltamn.cpp:1273
+msgid "0.3 seconds"
+msgstr ""
+
+#: src/minoltamn.cpp:1274
+msgid "0.6 seconds"
+msgstr ""
+
+#: src/minoltamn.cpp:1280 src/nikonmn.cpp:292 src/nikonmn.cpp:950
+#: src/nikonmn.cpp:1396
 #, fuzzy
-msgid "Red eye"
-msgstr "Červené oči"
+msgid "Automatic"
+msgstr "automatické zaostrenie"
 
-#: src/nikonmn.cpp:183 src/nikonmn.cpp:664
+#: src/minoltamn.cpp:1286 src/minoltamn.cpp:1292
 #, fuzzy
-msgid "Cyanotype"
-msgstr "typ"
+msgid "Auto-rotate"
+msgstr "Automatický kontrast"
 
-# exif-lightsource-1
-#: src/nikonmn.cpp:184
+#: src/minoltamn.cpp:1287
 #, fuzzy
-msgid "Sky light"
-msgstr "denné svetlo"
+msgid "Horizontal"
+msgstr "Horizontálne (normálne)"
 
-#: src/nikonmn.cpp:185
+#: src/minoltamn.cpp:1293
 #, fuzzy
-msgid "Warm tone"
-msgstr "Farebný tón"
+msgid "Manual Rotate"
+msgstr "Ručné uvoľnenie"
 
-#: src/nikonmn.cpp:186
+#: src/minoltamn.cpp:1298
 #, fuzzy
-msgid "Color custom"
-msgstr "Farebný tón"
+msgid "Within Range"
+msgstr "Rozsah šošoviek:"
 
-#: src/nikonmn.cpp:187
+#: src/minoltamn.cpp:1299
 #, fuzzy
-msgid "Image overlay"
-msgstr "Tón obrázka"
+msgid "Under/Over Range"
+msgstr "prenosový rozsah"
 
-#: src/nikonmn.cpp:193
+#: src/minoltamn.cpp:1300
 #, fuzzy
-msgid "Minimal"
-msgstr "Manuál"
+msgid "Out of Range"
+msgstr "Ofset mimo rozsahu"
 
-#: src/nikonmn.cpp:202 src/nikonmn.cpp:512
-msgid "Nikon Makernote version"
-msgstr "Poznámka výrobcu Nikon"
+#: src/minoltamn.cpp:1305
+#, fuzzy
+msgid "Not Indicated"
+msgstr "nedefinované"
 
-#: src/nikonmn.cpp:204 src/nikonmn.cpp:456 src/nikonmn.cpp:513
-#: src/olympusmn.cpp:208 src/panasonicmn.cpp:338
-msgid "ISO Speed"
-msgstr "ISO rýchlosť"
+#: src/minoltamn.cpp:1306
+#, fuzzy
+msgid "Under Scale"
+msgstr "pod vodou"
 
-#: src/nikonmn.cpp:216 src/nikonmn.cpp:517
-msgid "Sharpening"
-msgstr "Zaostrovanie"
+#: src/minoltamn.cpp:1307
+#, fuzzy
+msgid "Bottom of Scale"
+msgstr "zdola hore"
 
-#: src/nikonmn.cpp:217 src/nikonmn.cpp:517
-msgid "Image sharpening setting"
-msgstr "Nastavenie zaostrovania obrazu"
+#: src/minoltamn.cpp:1325
+msgid "Top of Scale"
+msgstr ""
 
-#: src/nikonmn.cpp:219 src/nikonmn.cpp:518
-msgid "Focus"
-msgstr "zaostrenie"
+#: src/minoltamn.cpp:1326
+#, fuzzy
+msgid "Over Scale"
+msgstr "Štandardná škála"
 
-#: src/nikonmn.cpp:222 src/nikonmn.cpp:519
-msgid "Flash Setting"
-msgstr "Nastavenie blesku"
-
-#: src/nikonmn.cpp:223 src/nikonmn.cpp:519
-msgid "Flash setting"
-msgstr "Nastavenie blesku"
-
-#: src/nikonmn.cpp:228 src/nikonmn.cpp:526
-msgid "ISO Selection"
-msgstr "Výber ISO"
-
-#: src/nikonmn.cpp:229 src/nikonmn.cpp:526
-msgid "ISO selection"
-msgstr "Výber ISO"
-
-#: src/nikonmn.cpp:231 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data Dump"
+#: src/minoltamn.cpp:1331
+msgid "AM"
 msgstr ""
 
-#: src/nikonmn.cpp:232 src/nikonmn.cpp:527 src/panasonicmn.cpp:240
-msgid "Data dump"
+#: src/minoltamn.cpp:1332 src/olympusmn.cpp:512 src/olympusmn.cpp:1374
+#: src/olympusmn.cpp:1384
+msgid "MF"
 msgstr ""
 
-#: src/nikonmn.cpp:234 src/nikonmn.cpp:453 src/nikonmn.cpp:546
-msgid "Image Adjustment"
-msgstr "Úpravy obrázka"
+#: src/minoltamn.cpp:1338
+msgid "Built-in"
+msgstr ""
 
-#: src/nikonmn.cpp:235 src/nikonmn.cpp:454 src/nikonmn.cpp:546
-msgid "Image adjustment setting"
-msgstr "Nastavenia úprav obrázka"
+#: src/minoltamn.cpp:1344 src/pentaxmn.cpp:347 src/pentaxmn.cpp:360
+msgid "Very Low"
+msgstr "veľmi nízky"
 
-#: src/nikonmn.cpp:237 src/nikonmn.cpp:471 src/nikonmn.cpp:548
-msgid "Auxiliary Lens"
-msgstr "Pomocné šošovky"
+#: src/minoltamn.cpp:1346
+#, fuzzy
+msgid "Half Full"
+msgstr "Plný"
 
-#: src/nikonmn.cpp:238 src/nikonmn.cpp:472 src/nikonmn.cpp:548
-msgid "Auxiliary lens (adapter)"
+#: src/minoltamn.cpp:1347
+msgid "Sufficient Power Remaining"
 msgstr ""
 
-#: src/nikonmn.cpp:241 src/nikonmn.cpp:551 src/olympusmn.cpp:242
-msgid "Manual focus distance"
-msgstr "Ručné nastavenie vzdialenosti zaostrenia"
+#: src/minoltamn.cpp:1355
+#, fuzzy
+msgid "Exposure Compensation Setting"
+msgstr "Kompenzácia expozície"
 
-#: src/nikonmn.cpp:244 src/nikonmn.cpp:469 src/nikonmn.cpp:552
-msgid "Digital zoom setting"
-msgstr "nastavenie digitálneho priblíženie"
+#: src/minoltamn.cpp:1356
+#, fuzzy
+msgid "Exposure compensation setting"
+msgstr "Kompenzácia expozície"
 
-# AF = automatické zaostrenie
-#: src/nikonmn.cpp:246
-msgid "AF Focus Position"
-msgstr "poloha automatického zaostrenia"
+#: src/minoltamn.cpp:1358
+#, fuzzy
+msgid "High Speed Sync"
+msgstr "Orezanie vysoká rýchlosť"
 
-#: src/nikonmn.cpp:247
-msgid "AF focus position information"
-msgstr "Informácie o polohe automatického zaostrenia"
+#: src/minoltamn.cpp:1359
+#, fuzzy
+msgid "High speed sync"
+msgstr "Orezanie vysoká rýchlosť"
 
-#: src/nikonmn.cpp:252
-msgid "Unknown Nikon1MakerNote tag"
-msgstr "Neznáma značka Nikon1MakerNote"
+#: src/minoltamn.cpp:1361
+#, fuzzy
+msgid "Manual Exposure Time"
+msgstr "Čas expozície"
 
-#: src/nikonmn.cpp:279 src/nikonmn.cpp:1154
-msgid "Continuous autofocus"
-msgstr "Spojité automatické zaostrenie"
+#: src/minoltamn.cpp:1362
+#, fuzzy
+msgid "Manual exposure time"
+msgstr "Čas expozície"
 
-#: src/nikonmn.cpp:280 src/nikonmn.cpp:1155
-msgid "Single autofocus"
-msgstr ""
+#: src/minoltamn.cpp:1364 src/minoltamn.cpp:1365
+#, fuzzy
+msgid "Manual FNumber"
+msgstr "Číslo intervalu"
 
-#: src/nikonmn.cpp:313 src/nikonmn.cpp:494 src/nikonmn.cpp:1254
-msgid "Not used"
-msgstr "Nepoužité"
+#: src/minoltamn.cpp:1373
+#, fuzzy
+msgid "Drive Mode 2"
+msgstr "Režim jazda autom"
 
-#: src/nikonmn.cpp:353
-msgid "guess"
-msgstr "hádať"
+#: src/minoltamn.cpp:1374
+#, fuzzy
+msgid "Drive mode 2"
+msgstr "jazda autom"
 
-#: src/nikonmn.cpp:400
-msgid "VGA Basic"
-msgstr "VGA základné"
+#: src/minoltamn.cpp:1382 src/minoltamn.cpp:1383 src/sonymn.cpp:572
+#: src/sonymn.cpp:573 src/sonymn.cpp:678 src/sonymn.cpp:679
+msgid "Local AF Area Point"
+msgstr ""
 
-#: src/nikonmn.cpp:401
-msgid "VGA Normal"
-msgstr "Normálny VGA"
+#: src/minoltamn.cpp:1385 src/minoltamn.cpp:1386 src/nikonmn.cpp:800
+#: src/nikonmn.cpp:823 src/sonymn.cpp:569 src/sonymn.cpp:570
+#: src/sonymn.cpp:675 src/sonymn.cpp:676
+#, fuzzy
+msgid "AF Area Mode"
+msgstr "Režim AZ"
 
-#: src/nikonmn.cpp:402
-msgid "VGA Fine"
-msgstr "VGA jemné"
+#: src/minoltamn.cpp:1388 src/minoltamn.cpp:1389 src/sonymn.cpp:605
+#: src/sonymn.cpp:606 src/sonymn.cpp:705 src/sonymn.cpp:706
+#, fuzzy
+msgid "FlashMode"
+msgstr "Režim blesku"
 
-#: src/nikonmn.cpp:403
-msgid "SXGA Basic"
-msgstr "SXGA základné"
+#: src/minoltamn.cpp:1391
+#, fuzzy
+msgid "Flash Exposure Comp Setting"
+msgstr "Kompenzácia expozície blesku"
 
-#: src/nikonmn.cpp:404
-msgid "SXGA Normal"
-msgstr "Normálny SXGA"
+#: src/minoltamn.cpp:1392
+#, fuzzy
+msgid "Flash exposure compensation setting"
+msgstr "Kompenzácia expozície blesku v EV"
 
-#: src/nikonmn.cpp:405
-msgid "SXGA Fine"
-msgstr "SXGA jemné"
+#: src/minoltamn.cpp:1397 src/sonymn.cpp:578 src/sonymn.cpp:579
+#: src/sonymn.cpp:684 src/sonymn.cpp:685
+#, fuzzy
+msgid "ISO Setting"
+msgstr "Nastavenia ISO"
 
-#: src/nikonmn.cpp:411 src/pentaxmn.cpp:629
-msgid "Monochrome"
-msgstr "jednofarebné"
+#: src/minoltamn.cpp:1400 src/minoltamn.cpp:1401
+#, fuzzy
+msgid "Zone Matching Mode"
+msgstr "Redukcia šumu"
 
-#: src/nikonmn.cpp:417
-msgid "Bright+"
-msgstr "Jas+"
+#: src/minoltamn.cpp:1403 src/sonymn.cpp:581 src/sonymn.cpp:582
+#: src/sonymn.cpp:687 src/sonymn.cpp:688
+#, fuzzy
+msgid "Dynamic Range Optimizer Mode"
+msgstr "Nastavenie dynamického rozsahu"
 
-#: src/nikonmn.cpp:418
-msgid "Bright-"
-msgstr "Jas-"
+#: src/minoltamn.cpp:1404
+#, fuzzy
+msgid "Dynamic range optimizer mode"
+msgstr "Nastavenie dynamického rozsahu"
 
-#: src/nikonmn.cpp:419
-msgid "Contrast+"
-msgstr "Kontrast+"
+#: src/minoltamn.cpp:1424 src/minoltamn.cpp:1425 src/sonymn.cpp:609
+#: src/sonymn.cpp:610
+msgid "Priority Setup Shutter Release"
+msgstr ""
 
-#: src/nikonmn.cpp:420
-msgid "Contrast-"
-msgstr "Kontrast-"
+#: src/minoltamn.cpp:1430
+#, fuzzy
+msgid "Self Timer Time"
+msgstr "Samospúšť"
 
-#: src/nikonmn.cpp:434
-msgid "Preset"
-msgstr "Štandardné"
+#: src/minoltamn.cpp:1431
+#, fuzzy
+msgid "Self timer time"
+msgstr "Samospúšť"
 
-#: src/nikonmn.cpp:439
-msgid "Speedlight"
-msgstr "Rýchlosvetlo"
+#: src/minoltamn.cpp:1434
+#, fuzzy
+msgid "Continuous bracketing"
+msgstr "Spojitý, vysoký"
 
-#: src/nikonmn.cpp:479
-msgid "Unknown Nikon2MakerNote tag"
-msgstr "Neznáma značka Nikon2MakerNote"
+#: src/minoltamn.cpp:1436
+#, fuzzy
+msgid "Single Frame Bracketing"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:220
-msgid "Flash Device"
-msgstr "Zariadenie blesku"
+#: src/minoltamn.cpp:1437
+#, fuzzy
+msgid "Single frame bracketing"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/nikonmn.cpp:520 src/olympusmn.cpp:221
-msgid "Flash device"
-msgstr "Zariadenie blesku"
+#: src/minoltamn.cpp:1440 src/nikonmn.cpp:156 src/nikonmn.cpp:167
+msgid "White balance bracketing"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/nikonmn.cpp:522 src/panasonicmn.cpp:242
-msgid "White Balance Bias"
-msgstr "Skreslenie vyváženia bielej"
+#: src/minoltamn.cpp:1442
+#, fuzzy
+msgid "White Balance Setting"
+msgstr "Nastavenie vyváženia bielej"
 
-#: src/nikonmn.cpp:522
-msgid "White balance bias"
-msgstr "Skreslenie vyváženia bielej"
+#: src/minoltamn.cpp:1445
+#, fuzzy
+msgid "Preset White Balance"
+msgstr "Vyváženie bielej"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1446
 #, fuzzy
-msgid "WB RB Levels"
-msgstr "WB_RGGBLevelsShade"
+msgid "Preset white balance"
+msgstr "Vyváženie bielej"
 
-#: src/nikonmn.cpp:523 src/olympusmn.cpp:851
+#: src/minoltamn.cpp:1448
 #, fuzzy
-msgid "WB RB levels"
-msgstr "Úroveň čiernej"
+msgid "Color Temperature Setting"
+msgstr "Farebná teplota"
 
-#: src/nikonmn.cpp:524
-msgid "Program Shift"
-msgstr "Posunutie programu"
+#: src/minoltamn.cpp:1449
+#, fuzzy
+msgid "Color temperature setting"
+msgstr "Farebná teplota"
 
-#: src/nikonmn.cpp:524
-msgid "Program shift"
-msgstr "Posunutie programu"
+#: src/minoltamn.cpp:1451
+#, fuzzy
+msgid "Custom WB Setting"
+msgstr "Vlastný 1"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure Difference"
-msgstr "Rozdiel expozície"
+#: src/minoltamn.cpp:1452
+#, fuzzy
+msgid "Custom WB setting"
+msgstr "Vlastný 1"
 
-#: src/nikonmn.cpp:525
-msgid "Exposure difference"
-msgstr "Rozdiel expozície"
+#: src/minoltamn.cpp:1454 src/minoltamn.cpp:1455
+#, fuzzy
+msgid "Dynamic Range Optimizer Settings"
+msgstr "Nastavenie dynamického rozsahu"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:797
-msgid "Pointer to a preview image"
-msgstr "Ukazovateľ na náhľad"
+#: src/minoltamn.cpp:1460
+#, fuzzy
+msgid "Custom WB Red Level"
+msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:528 src/pentaxmn.cpp:798
-msgid "Offset to an IFD containing a preview image"
-msgstr "Umiestnenie IFD obsahujúceho náhľad obrázka"
+#: src/minoltamn.cpp:1461
+#, fuzzy
+msgid "Custom WB red level"
+msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:529
-msgid "Flash Comp"
-msgstr "Komp. blesku"
+#: src/minoltamn.cpp:1463
+#, fuzzy
+msgid "Custom WB Green Level"
+msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:529
-msgid "Flash compensation setting"
-msgstr "Nastavenie kompenzácie blesku"
+#: src/minoltamn.cpp:1464
+#, fuzzy
+msgid "Custom WB green level"
+msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:530
-msgid "ISO Settings"
-msgstr "Nastavenia ISO"
+#: src/minoltamn.cpp:1466
+#, fuzzy
+msgid "Custom WB Blue Level"
+msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:530
-msgid "ISO setting"
-msgstr "Nastavenia ISO"
+#: src/minoltamn.cpp:1467
+#, fuzzy
+msgid "CustomWB blue level"
+msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:531
-msgid "Image Boundary"
-msgstr "Okraj obrázka"
+#: src/minoltamn.cpp:1469 src/minoltamn.cpp:1470
+#, fuzzy
+msgid "Custom WB Error"
+msgstr "Vlastný 1"
 
-#: src/nikonmn.cpp:531
-msgid "Image boundary"
-msgstr "Okraj obrázka"
+#: src/minoltamn.cpp:1473
+#, fuzzy
+msgid "White balance fine tune"
+msgstr "Nastavenie vyváženia bielej"
 
-#: src/nikonmn.cpp:533
-msgid "Flash Bracket Comp"
-msgstr "Komp. viacnásobného záberu blesku"
+#: src/minoltamn.cpp:1479
+#, fuzzy
+msgid "Color compensation filter"
+msgstr "Hodnota kompenzácie expozície"
 
-#: src/nikonmn.cpp:533
-msgid "Flash bracket compensation applied"
-msgstr "Kompenzácia viacnásobného záberu blesku"
+#: src/minoltamn.cpp:1481 src/minoltamn.cpp:1482 src/sonymn.cpp:641
+#: src/sonymn.cpp:642 src/sonymn.cpp:714 src/sonymn.cpp:715
+#, fuzzy
+msgid "Sony Image Size"
+msgstr "Veľkosť obrázka"
 
-#: src/nikonmn.cpp:534
-msgid "Exposure Bracket Comp"
-msgstr "Komp. viacnásobného záberu"
+#: src/minoltamn.cpp:1487
+msgid "Instant Playback Time"
+msgstr ""
 
-#: src/nikonmn.cpp:534
-msgid "AE bracket compensation applied"
-msgstr "Použitá kompenzácia viacnásobného záberu AE"
+#: src/minoltamn.cpp:1488
+msgid "Instant playback time"
+msgstr ""
 
-#: src/nikonmn.cpp:535 src/olympusmn.cpp:397
-msgid "Image Processing"
-msgstr "Spracovanie obrazu"
+#: src/minoltamn.cpp:1490
+msgid "Instant Playback Setup"
+msgstr ""
 
-#: src/nikonmn.cpp:535 src/pentaxmn.cpp:895 src/pentaxmn.cpp:896
-msgid "Image processing"
-msgstr "Spracovanie obrazu"
+#: src/minoltamn.cpp:1491
+msgid "Instant playback setup"
+msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop High Speed"
-msgstr "Orezanie vysoká rýchlosť"
+#: src/minoltamn.cpp:1496
+msgid "Eye Start AF"
+msgstr ""
 
-#: src/nikonmn.cpp:536
-msgid "Crop high speed"
-msgstr "Orezanie vysoká rýchlosť"
+# AF = automatické zaostrenie
+#: src/minoltamn.cpp:1497
+#, fuzzy
+msgid "Eye start AF"
+msgstr "automatické zaostrenie pre jeden záber"
 
-#: src/nikonmn.cpp:539
+#: src/minoltamn.cpp:1499
 #, fuzzy
-msgid "VR Info"
-msgstr "Nespracované info"
+msgid "Red Eye Reduction"
+msgstr "Korekcia červených očí"
 
-#: src/nikonmn.cpp:539
+#: src/minoltamn.cpp:1500
 #, fuzzy
-msgid "VR info"
-msgstr "Nespracované info"
+msgid "Red eye reduction"
+msgstr "Korekcia červených očí"
 
-#: src/nikonmn.cpp:540
+#: src/minoltamn.cpp:1502
 #, fuzzy
-msgid "Image Authentication"
-msgstr "Orientácia obrázka"
+msgid "Flash Default"
+msgstr "Podrobnosti blesku"
 
-#: src/nikonmn.cpp:540
+#: src/minoltamn.cpp:1503
 #, fuzzy
-msgid "Image authentication"
-msgstr "Orientácia obrázka"
+msgid "Flash default"
+msgstr "podrobnosti blesku"
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-Lighting"
-msgstr ""
+#: src/minoltamn.cpp:1505
+#, fuzzy
+msgid "Auto Bracket Order"
+msgstr "Automatická uzávierka"
 
-#: src/nikonmn.cpp:541
-msgid "ActiveD-lighting"
-msgstr ""
+#: src/minoltamn.cpp:1506
+#, fuzzy
+msgid "Auto bracket order"
+msgstr "Automatický viacnásobný záber"
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1508
 #, fuzzy
-msgid "Picture Control"
-msgstr "Informácie o obrázku"
+msgid "Focus Hold Button"
+msgstr "Nastavenie režimu zaostrenia"
 
-#: src/nikonmn.cpp:542
+#: src/minoltamn.cpp:1509
 #, fuzzy
-msgid " Picture control"
-msgstr "Informácie o obrázku"
+msgid "Focus hold button"
+msgstr "Nastavenie režimu zaostrenia"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1511
 #, fuzzy
-msgid "World Time"
-msgstr "Čas Minolta"
+msgid "AEL Button"
+msgstr "Nastavenie AE"
 
-#: src/nikonmn.cpp:543
+#: src/minoltamn.cpp:1512
 #, fuzzy
-msgid "World time"
-msgstr "Čas Minolta"
+msgid "AEL button"
+msgstr "Nastavenie AE"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1514
 #, fuzzy
-msgid "ISO Info"
-msgstr "Info o snímke"
+msgid "Control Dial Set"
+msgstr "Nastavenie kontrastu"
 
-#: src/nikonmn.cpp:544
+#: src/minoltamn.cpp:1515
 #, fuzzy
-msgid "ISO info"
-msgstr "Nastavenia ISO"
+msgid "Control dial set"
+msgstr "Kontrast"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1517
 #, fuzzy
-msgid "Vignette Control"
-msgstr "Diaľkové ovládanie?"
+msgid "Exposure Compensation Mode"
+msgstr "Kompenzácia expozície"
 
-#: src/nikonmn.cpp:545
+#: src/minoltamn.cpp:1518
 #, fuzzy
-msgid "Vignette control"
-msgstr "Diaľkové ovládanie?"
+msgid "Exposure compensation mode"
+msgstr "Kompenzácia expozície"
 
-#: src/nikonmn.cpp:547
-msgid "Tone Compensation"
-msgstr "Kompenzácia tónu"
+#: src/minoltamn.cpp:1521
+#, fuzzy
+msgid "AF assist"
+msgstr "Asistent AZ"
 
-#: src/nikonmn.cpp:547
-msgid "Tone compensation"
-msgstr "Kompenzácia tónu"
+#: src/minoltamn.cpp:1523
+#, fuzzy
+msgid "Card Shutter Lock"
+msgstr "Ae zámok uzávierky"
 
-#: src/nikonmn.cpp:553
-msgid "Mode of flash used"
-msgstr "Použitý režim blesku"
+#: src/minoltamn.cpp:1524
+#, fuzzy
+msgid "Card shutter lock"
+msgstr "Ae zámok uzávierky"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1526
 #, fuzzy
-msgid "AF Info"
-msgstr "Info o AZ"
+msgid "Lens Shutter Lock"
+msgstr "Ae zámok uzávierky"
 
-#: src/nikonmn.cpp:554
+#: src/minoltamn.cpp:1527
 #, fuzzy
-msgid "AF info"
-msgstr "Info o AZ"
+msgid "Lens shutter lock"
+msgstr "pomalá uzávierka"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238
-msgid "Shooting Mode"
-msgstr "Režim fotenia"
+#: src/minoltamn.cpp:1529
+#, fuzzy
+msgid "AF Area Illumination"
+msgstr "GPS Informácie o oblasti"
 
-#: src/nikonmn.cpp:555 src/panasonicmn.cpp:238 src/pentaxmn.cpp:788
-msgid "Shooting mode"
-msgstr "Režim fotenia"
+#: src/minoltamn.cpp:1530
+#, fuzzy
+msgid "AF area illumination"
+msgstr "Režim AZ"
 
-#: src/nikonmn.cpp:556
-msgid "Auto Bracket Release"
-msgstr "Uvoľnenie viacnásobného záberu"
+#: src/minoltamn.cpp:1532
+msgid "Monitor Display Off"
+msgstr ""
 
-#: src/nikonmn.cpp:556
-msgid "Auto bracket release"
-msgstr "Uvoľnenie viacnásobného záberu"
+#: src/minoltamn.cpp:1533
+msgid "Monitor display off"
+msgstr ""
 
-# TODO: check
-#: src/nikonmn.cpp:557
-#, fuzzy
-msgid "Lens FStops"
-msgstr "F stops šošoviek"
+#: src/minoltamn.cpp:1535
+msgid "Record Display"
+msgstr ""
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1536
+msgid "Record display"
+msgstr ""
+
+#: src/minoltamn.cpp:1538
+msgid "Play Display"
+msgstr ""
+
+#: src/minoltamn.cpp:1539
+msgid "Play display"
+msgstr ""
+
+#: src/minoltamn.cpp:1541
 #, fuzzy
-msgid "Contrast Curve"
-msgstr "Kontrast"
+msgid "Exposure Indicator"
+msgstr "Index expozície"
 
-#: src/nikonmn.cpp:558
+#: src/minoltamn.cpp:1542
 #, fuzzy
-msgid "Contrast curve"
-msgstr "Kontrast"
+msgid "Exposure indicator"
+msgstr "Expozičný index"
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1544
 #, fuzzy
-msgid "Color Hue"
-msgstr "Farebný tón"
+msgid "AEL Exposure Indicator"
+msgstr "Index expozície"
+
+#: src/minoltamn.cpp:1545
+msgid ""
+"AEL exposure indicator (also indicates exposure for next shot when "
+"bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:559
+#: src/minoltamn.cpp:1547
 #, fuzzy
-msgid "Color hue"
-msgstr "Farebný tón"
+msgid "Exposure Bracketing Indicator Last"
+msgstr "Viacnásobné snímky so zmenou expozície"
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene Mode"
-msgstr "Režim scény"
+#: src/minoltamn.cpp:1548
+msgid ""
+"Exposure bracketing indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:560 src/olympusmn.cpp:630 src/panasonicmn.cpp:276
-msgid "Scene mode"
-msgstr "Režim scény"
+#: src/minoltamn.cpp:1550
+msgid "Metering Off Scale Indicator"
+msgstr ""
 
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992 src/properties.cpp:532
-#: src/tags.cpp:644 src/tags.cpp:1249
-msgid "Light Source"
-msgstr "Zdroj svetla"
+#: src/minoltamn.cpp:1551
+msgid ""
+"Metering off scale indicator (two flashing triangles when under or over "
+"metering scale)"
+msgstr ""
 
-# exif-lightsource
-#: src/nikonmn.cpp:561 src/olympusmn.cpp:992
-msgid "Light source"
-msgstr "Svetelný zdroj"
+#: src/minoltamn.cpp:1553
+#, fuzzy
+msgid "Flash Exposure Indicator"
+msgstr "Kompenzácia expozície blesku"
 
-#: src/nikonmn.cpp:562
+#: src/minoltamn.cpp:1554
 #, fuzzy
-msgid "Shot info"
-msgstr "Info o snímke"
+msgid "Flash exposure indicator"
+msgstr "Kompenzácia expozície blesku"
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue Adjustment"
-msgstr "Úpravy tónu"
+#: src/minoltamn.cpp:1556
+#, fuzzy
+msgid "Flash Exposure Indicator Next"
+msgstr "Kompenzácia expozície blesku"
 
-#: src/nikonmn.cpp:563 src/nikonmn.cpp:686
-msgid "Hue adjustment"
-msgstr "Úpravy tónu"
+#: src/minoltamn.cpp:1557
+msgid "Flash exposure indicator next (indicator for next shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:564
+#: src/minoltamn.cpp:1559
 #, fuzzy
-msgid "NEF Compression"
-msgstr "Kompresia"
+msgid "Flash Exposure Indicator Last"
+msgstr "Kompenzácia expozície blesku"
+
+#: src/minoltamn.cpp:1560
+msgid "Flash exposure indicator last (indicator for last shot when bracketing)"
+msgstr ""
 
-#: src/nikonmn.cpp:564
+#: src/minoltamn.cpp:1565
 #, fuzzy
-msgid "NEF compression"
-msgstr "Kompresia"
+msgid "Focus Mode Switch"
+msgstr "režim zaostrenia"
 
-#: src/nikonmn.cpp:567 src/tags.cpp:716
-msgid "Linearization Table"
-msgstr "Linearizačná tabuľka"
+#: src/minoltamn.cpp:1566
+#, fuzzy
+msgid "Focus mode switch"
+msgstr "Nastavenie režimu zaostrenia"
 
-#: src/nikonmn.cpp:567
+#: src/minoltamn.cpp:1568 src/olympusmn.cpp:759
 #, fuzzy
-msgid "Linearization table"
-msgstr "Linearizačná tabuľka"
+msgid "Flash Type"
+msgstr "Režim blesku"
 
-#: src/nikonmn.cpp:568
+#: src/minoltamn.cpp:1569 src/olympusmn.cpp:759
 #, fuzzy
-msgid "Color Balance"
-msgstr "Vyváženie farieb 1"
+msgid "Flash type"
+msgstr "Režim blesku"
 
-#: src/nikonmn.cpp:568
+# AE - automatická expozícia
+#: src/minoltamn.cpp:1574 src/olympusmn.cpp:660
 #, fuzzy
-msgid "Color balance"
-msgstr "Vyváženie farieb Červená"
+msgid "AE Lock"
+msgstr "zámok AE"
 
-#: src/nikonmn.cpp:569
-msgid "Lens Data"
-msgstr "Údaje šošoviek"
+#: src/minoltamn.cpp:1581
+msgid "Color compensation filter: negative is green, positive is magenta"
+msgstr ""
 
-#: src/nikonmn.cpp:569
-msgid "Lens data settings"
-msgstr "Nastavenia údajov šošoviek"
+#: src/minoltamn.cpp:1583 src/tags.cpp:764
+msgid "Battery Level"
+msgstr "úroveň batérie"
 
-#: src/nikonmn.cpp:570
+#: src/minoltamn.cpp:1584
 #, fuzzy
-msgid "Raw Image Center"
-msgstr "Počet obrázkov"
+msgid "Battery level"
+msgstr "úroveň batérie"
 
-#: src/nikonmn.cpp:570
+#: src/minoltamn.cpp:1588
 #, fuzzy
-msgid "Raw image center"
-msgstr "Zobraziť vložený obrázok"
-
-#: src/nikonmn.cpp:571
-msgid "Sensor Pixel Size"
-msgstr "Veľkosť obrazového bodu snímača"
+msgid "Unknown Sony Camera Settings A100 tag"
+msgstr "Neznáma značka Nastavenie fotoaparátu Canon 1"
 
-#: src/nikonmn.cpp:571
-msgid "Sensor pixel size"
-msgstr "Veľkosť obrazového bodu snímača"
+#: src/minoltamn.cpp:1894 src/sonymn.cpp:484
+#, fuzzy
+msgid "Clear"
+msgstr "rok"
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:1895 src/sonymn.cpp:485
 #, fuzzy
-msgid "Scene Assist"
-msgstr "Asistent AZ"
+msgid "Deep"
+msgstr "Denver"
 
-#: src/nikonmn.cpp:573
+#: src/minoltamn.cpp:1896 src/sonymn.cpp:486
 #, fuzzy
-msgid "Scene assist"
-msgstr "scenéria"
+msgid "Light"
+msgstr "vpravo"
 
-#: src/nikonmn.cpp:574
+#: src/minoltamn.cpp:1897
 #, fuzzy
-msgid "Retouch History"
-msgstr "História"
+msgid "Night View"
+msgstr "Nočná scéna"
 
-#: src/nikonmn.cpp:574
-msgid "Retouch history"
+#: src/minoltamn.cpp:1898
+msgid "Autumn Leaves"
 msgstr ""
 
-#: src/nikonmn.cpp:576
+#: src/minoltamn.cpp:1937
 #, fuzzy
-msgid "Serial NO"
-msgstr "Sériové číslo"
+msgid "Local"
+msgstr "Umiestnenie"
 
-#: src/nikonmn.cpp:576
-msgid "Camera serial number, usually starts with \"NO= \""
-msgstr ""
+#: src/minoltamn.cpp:1952
+#, fuzzy
+msgid "Top-Right"
+msgstr "vpravo hore"
 
-#: src/nikonmn.cpp:577
-msgid "Image Data Size"
-msgstr "Veľkosť obrazových údajov"
+#: src/minoltamn.cpp:1954
+#, fuzzy
+msgid "Bottom-Right"
+msgstr "vpravo dolu"
 
-#: src/nikonmn.cpp:577
-msgid "Image data size"
-msgstr "Veľkosť obrazových údajov"
+#: src/minoltamn.cpp:1956
+#, fuzzy
+msgid "Bottom-Left"
+msgstr "vľavo dolu"
 
-#: src/nikonmn.cpp:579
-msgid "Image Count"
-msgstr "Počet obrázkov"
+#: src/minoltamn.cpp:1958
+#, fuzzy
+msgid "Top-Left"
+msgstr "vpravo hore"
 
-#: src/nikonmn.cpp:579
-msgid "Image count"
-msgstr "Počet obrázkov"
+#: src/minoltamn.cpp:1959
+#, fuzzy
+msgid "Far-Right"
+msgstr "Orezať vpravo"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+#: src/minoltamn.cpp:1960
 #, fuzzy
-msgid "Deleted Image Count"
-msgstr "Zmazať počet obrázkov"
+msgid "Far-Left"
+msgstr "Orezať vľavo"
 
-#: src/nikonmn.cpp:580 src/nikonmn.cpp:965
+# exif-transferfunction
+#: src/minoltamn.cpp:1974 src/sonymn.cpp:89
 #, fuzzy
-msgid "Deleted image count"
-msgstr "Zmazať počet obrázkov"
+msgid "Advanced Auto"
+msgstr "prenosová funkcia"
 
-#: src/nikonmn.cpp:581 src/nikonmn.cpp:802 src/nikonmn.cpp:815
-#: src/nikonmn.cpp:875 src/nikonmn.cpp:935 src/nikonmn.cpp:971
-msgid "Shutter Count"
-msgstr "Počítadlo uzávierky"
+#: src/minoltamn.cpp:1975
+#, fuzzy
+msgid "Advanced Level"
+msgstr "Orezanie vysoká rýchlosť"
 
-#: src/nikonmn.cpp:581
-msgid "Number of shots taken by camera"
-msgstr "Počet snímok zachytených fotoaparátom"
+# AF = automatické zaostrenie
+#: src/minoltamn.cpp:1988
+#, fuzzy
+msgid "AF"
+msgstr "AZ-S"
 
-#: src/nikonmn.cpp:582
+#: src/minoltamn.cpp:1989
 #, fuzzy
-msgid "Flash info"
-msgstr "Info o blesku"
+msgid "Release"
+msgstr "Dátum vydania"
 
-#: src/nikonmn.cpp:583
-msgid "Image Optimization"
-msgstr "Optimalizácia obrázka"
+#: src/minoltamn.cpp:2001
+#, fuzzy
+msgid "RAW "
+msgstr "RAW"
 
-#: src/nikonmn.cpp:583
-msgid "Image optimization"
-msgstr "Optimalizácia obrázka"
+#: src/minoltamn.cpp:2002
+#, fuzzy
+msgid "CRAW "
+msgstr "RAW"
 
-#: src/nikonmn.cpp:585
-msgid "Program Variation"
-msgstr "Variácia programu"
+#: src/minoltamn.cpp:2005
+#, fuzzy
+msgid "RAW+JPEG"
+msgstr "JPEG"
 
-#: src/nikonmn.cpp:585
-msgid "Program variation"
-msgstr "Variácia programu"
+#: src/minoltamn.cpp:2006
+#, fuzzy
+msgid "CRAW+JPEG"
+msgstr "JPEG"
 
-# AF = automatické zaostrenie
-#: src/nikonmn.cpp:587
-msgid "AF Response"
-msgstr "Odpoveď automatického zaostrenia"
+#: src/minoltamn.cpp:2062
+msgid "Raw + JPEG"
+msgstr ""
 
-# AF = automatické zaostrenie
-#: src/nikonmn.cpp:587
-msgid "AF response"
-msgstr "Odpoveď automatického zaostrenia"
+#: src/minoltamn.cpp:2063
+#, fuzzy
+msgid "Compressed Raw"
+msgstr "Kompresný pomer"
 
-#: src/nikonmn.cpp:588
+#: src/minoltamn.cpp:2064
 #, fuzzy
-msgid "Multi exposure"
-msgstr "Viacnásobná expozícia"
+msgid "Compressed Raw + JPEG"
+msgstr "Veľkosť komprimovaného obrázka"
 
-#: src/nikonmn.cpp:589
-msgid "High ISO Noise Reduction"
-msgstr "Vysoká redukcia šumu ISO"
+#: src/minoltamn.cpp:2077
+msgid "Minolta AF 2x APO (D)"
+msgstr ""
+
+#: src/minoltamn.cpp:2078
+msgid "Minolta AF 2x APO II"
+msgstr ""
+
+#: src/minoltamn.cpp:2079
+msgid "Minolta AF 1.4x APO (D)"
+msgstr ""
+
+#: src/minoltamn.cpp:2080
+msgid "Minolta AF 1.4x APO II"
+msgstr ""
+
+#: src/minoltamn.cpp:2110
+msgid "ISO Setting Used"
+msgstr "Použité nastavenie ISO"
+
+#: src/minoltamn.cpp:2111 src/olympusmn.cpp:126 src/olympusmn.cpp:1109
+msgid "High Key"
+msgstr "Vysoký kľúč"
+
+#: src/minoltamn.cpp:2112 src/olympusmn.cpp:132 src/olympusmn.cpp:1107
+msgid "Low Key"
+msgstr "Nízky kľúč"
+
+#: src/nikonmn.cpp:80
+#, fuzzy
+msgid "Extra High"
+msgstr "extra jemný"
+
+#: src/nikonmn.cpp:86 src/nikonmn.cpp:1538
+msgid "Single area"
+msgstr "Jednoduchá oblasť"
+
+#: src/nikonmn.cpp:87 src/nikonmn.cpp:1539
+msgid "Dynamic area"
+msgstr "Dynamická oblasť"
+
+#: src/nikonmn.cpp:88
+#, fuzzy
+msgid "Dynamic area, closest subject"
+msgstr "Najbližší subjekt"
+
+#: src/nikonmn.cpp:89
+#, fuzzy
+msgid "Group dynamic"
+msgstr "Skupinové dynamické AZ"
+
+#: src/nikonmn.cpp:90 src/nikonmn.cpp:1542
+msgid "Single area (wide)"
+msgstr ""
+
+#: src/nikonmn.cpp:91 src/nikonmn.cpp:1543
+msgid "Dynamic area (wide)"
+msgstr "Dynamická oblasť (široká)"
+
+#: src/nikonmn.cpp:104 src/nikonmn.cpp:775 src/nikonmn.cpp:790
+#: src/pentaxmn.cpp:215
+msgid "Upper-left"
+msgstr "vľavo hore"
+
+#: src/nikonmn.cpp:105 src/nikonmn.cpp:776 src/nikonmn.cpp:791
+#: src/pentaxmn.cpp:217
+msgid "Upper-right"
+msgstr "vpravo hore"
+
+#: src/nikonmn.cpp:106 src/nikonmn.cpp:777 src/nikonmn.cpp:792
+#: src/pentaxmn.cpp:223
+msgid "Lower-left"
+msgstr "vľavo dolu"
+
+#: src/nikonmn.cpp:107 src/nikonmn.cpp:778 src/nikonmn.cpp:793
+#: src/pentaxmn.cpp:225
+msgid "Lower-right"
+msgstr "vpravo dolu"
+
+#: src/nikonmn.cpp:108
+msgid "Left-most"
+msgstr "najviac vľavo"
+
+#: src/nikonmn.cpp:109
+msgid "Right-most"
+msgstr "najviac vpravo"
+
+#: src/nikonmn.cpp:143
+msgid "Fire, manual"
+msgstr "Blesk, ručne"
+
+#: src/nikonmn.cpp:144
+msgid "Fire, external"
+msgstr "blesk, externý"
+
+#: src/nikonmn.cpp:145
+msgid "Fire, commander mode"
+msgstr ""
+
+#: src/nikonmn.cpp:146
+#, fuzzy
+msgid "Fire, TTL mode"
+msgstr "Režim AZ"
+
+#: src/nikonmn.cpp:152 src/nikonmn.cpp:163
+msgid "Delay"
+msgstr "Oneskorenie"
+
+#: src/nikonmn.cpp:153 src/nikonmn.cpp:164
+msgid "PC control"
+msgstr "Riadenie PC"
+
+#: src/nikonmn.cpp:154 src/nikonmn.cpp:165
+msgid "Exposure bracketing"
+msgstr "Viacnásobné snímky so zmenou expozície"
+
+#: src/nikonmn.cpp:155
+#, fuzzy
+msgid "Auto ISO"
+msgstr "Auto"
+
+#: src/nikonmn.cpp:157 src/nikonmn.cpp:168
+msgid "IR control"
+msgstr "riadenie IR"
+
+#: src/nikonmn.cpp:166
+msgid "Unused LE-NR slowdown"
+msgstr ""
+
+#: src/nikonmn.cpp:174
+msgid "Auto release"
+msgstr "Automatické uvoľnenie"
+
+#: src/nikonmn.cpp:175
+msgid "Manual release"
+msgstr "Ručné uvoľnenie"
+
+#: src/nikonmn.cpp:180
+#, fuzzy
+msgid "Lossy (type 1)"
+msgstr "typ šošoviek"
+
+# exif-compression-1
+#: src/nikonmn.cpp:181 src/tags.cpp:252
+msgid "Uncompressed"
+msgstr "nekomprimovaný"
+
+#: src/nikonmn.cpp:182
+#, fuzzy
+msgid "Lossless"
+msgstr "Los Angeles"
+
+#: src/nikonmn.cpp:183
+#, fuzzy
+msgid "Lossy (type 2)"
+msgstr "typ šošoviek"
+
+#: src/nikonmn.cpp:189
+#, fuzzy
+msgid "B & W"
+msgstr "ČB"
+
+#: src/nikonmn.cpp:191
+#, fuzzy
+msgid "Trim"
+msgstr "Čas"
+
+#: src/nikonmn.cpp:192
+#, fuzzy
+msgid "Small picture"
+msgstr "Film"
+
+# exif-lightsource-1
+#: src/nikonmn.cpp:193
+#, fuzzy
+msgid "D-Lighting"
+msgstr "denné svetlo"
+
+#: src/nikonmn.cpp:194
+#, fuzzy
+msgid "Red eye"
+msgstr "Červené oči"
+
+#: src/nikonmn.cpp:195 src/nikonmn.cpp:677
+#, fuzzy
+msgid "Cyanotype"
+msgstr "typ"
+
+# exif-lightsource-1
+#: src/nikonmn.cpp:196
+#, fuzzy
+msgid "Sky light"
+msgstr "denné svetlo"
+
+#: src/nikonmn.cpp:197
+#, fuzzy
+msgid "Warm tone"
+msgstr "Farebný tón"
+
+#: src/nikonmn.cpp:198
+#, fuzzy
+msgid "Color custom"
+msgstr "Farebný tón"
+
+#: src/nikonmn.cpp:199
+#, fuzzy
+msgid "Image overlay"
+msgstr "Tón obrázka"
+
+#: src/nikonmn.cpp:205
+#, fuzzy
+msgid "Minimal"
+msgstr "Manuál"
+
+#: src/nikonmn.cpp:214 src/nikonmn.cpp:524
+msgid "Nikon Makernote version"
+msgstr "Poznámka výrobcu Nikon"
+
+#: src/nikonmn.cpp:216 src/nikonmn.cpp:468 src/nikonmn.cpp:525
+#: src/olympusmn.cpp:270 src/panasonicmn.cpp:344
+msgid "ISO Speed"
+msgstr "ISO rýchlosť"
+
+#: src/nikonmn.cpp:228 src/nikonmn.cpp:529
+msgid "Sharpening"
+msgstr "Zaostrovanie"
+
+#: src/nikonmn.cpp:229 src/nikonmn.cpp:529
+msgid "Image sharpening setting"
+msgstr "Nastavenie zaostrovania obrazu"
+
+#: src/nikonmn.cpp:231 src/nikonmn.cpp:530
+msgid "Focus"
+msgstr "zaostrenie"
+
+#: src/nikonmn.cpp:234 src/nikonmn.cpp:531
+msgid "Flash Setting"
+msgstr "Nastavenie blesku"
+
+#: src/nikonmn.cpp:235 src/nikonmn.cpp:531
+msgid "Flash setting"
+msgstr "Nastavenie blesku"
+
+#: src/nikonmn.cpp:240 src/nikonmn.cpp:538
+msgid "ISO Selection"
+msgstr "Výber ISO"
+
+#: src/nikonmn.cpp:241 src/nikonmn.cpp:538
+msgid "ISO selection"
+msgstr "Výber ISO"
+
+#: src/nikonmn.cpp:243 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+#, fuzzy
+msgid "Data Dump"
+msgstr "Výpis dát 1"
+
+#: src/nikonmn.cpp:244 src/nikonmn.cpp:539 src/panasonicmn.cpp:246
+#, fuzzy
+msgid "Data dump"
+msgstr "Výpis dát 1"
+
+#: src/nikonmn.cpp:246 src/nikonmn.cpp:465 src/nikonmn.cpp:559
+msgid "Image Adjustment"
+msgstr "Úpravy obrázka"
+
+#: src/nikonmn.cpp:247 src/nikonmn.cpp:466 src/nikonmn.cpp:559
+msgid "Image adjustment setting"
+msgstr "Nastavenia úprav obrázka"
+
+#: src/nikonmn.cpp:249 src/nikonmn.cpp:483 src/nikonmn.cpp:561
+msgid "Auxiliary Lens"
+msgstr "Pomocné šošovky"
+
+#: src/nikonmn.cpp:250 src/nikonmn.cpp:484 src/nikonmn.cpp:561
+#, fuzzy
+msgid "Auxiliary lens (adapter)"
+msgstr "Pomocné šošovky"
+
+#: src/nikonmn.cpp:253 src/nikonmn.cpp:564 src/olympusmn.cpp:304
+msgid "Manual focus distance"
+msgstr "Ručné nastavenie vzdialenosti zaostrenia"
+
+#: src/nikonmn.cpp:256 src/nikonmn.cpp:481 src/nikonmn.cpp:565
+msgid "Digital zoom setting"
+msgstr "nastavenie digitálneho priblíženie"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:258
+msgid "AF Focus Position"
+msgstr "poloha automatického zaostrenia"
+
+#: src/nikonmn.cpp:259
+msgid "AF focus position information"
+msgstr "Informácie o polohe automatického zaostrenia"
+
+#: src/nikonmn.cpp:263
+msgid "Unknown Nikon1MakerNote tag"
+msgstr "Neznáma značka Nikon1MakerNote"
+
+#: src/nikonmn.cpp:290 src/nikonmn.cpp:1394
+msgid "Continuous autofocus"
+msgstr "Spojité automatické zaostrenie"
+
+#: src/nikonmn.cpp:291 src/nikonmn.cpp:1395
+msgid "Single autofocus"
+msgstr ""
+
+#: src/nikonmn.cpp:325 src/nikonmn.cpp:506 src/nikonmn.cpp:1495
+msgid "Not used"
+msgstr "Nepoužité"
+
+#: src/nikonmn.cpp:365
+msgid "guess"
+msgstr "hádať"
+
+#: src/nikonmn.cpp:412
+msgid "VGA Basic"
+msgstr "VGA základné"
+
+#: src/nikonmn.cpp:413
+msgid "VGA Normal"
+msgstr "Normálny VGA"
+
+#: src/nikonmn.cpp:414
+msgid "VGA Fine"
+msgstr "VGA jemné"
+
+#: src/nikonmn.cpp:415
+msgid "SXGA Basic"
+msgstr "SXGA základné"
+
+#: src/nikonmn.cpp:416
+msgid "SXGA Normal"
+msgstr "Normálny SXGA"
+
+#: src/nikonmn.cpp:417
+msgid "SXGA Fine"
+msgstr "SXGA jemné"
+
+#: src/nikonmn.cpp:429
+msgid "Bright+"
+msgstr "Jas+"
+
+#: src/nikonmn.cpp:430
+msgid "Bright-"
+msgstr "Jas-"
+
+#: src/nikonmn.cpp:431
+msgid "Contrast+"
+msgstr "Kontrast+"
+
+#: src/nikonmn.cpp:432
+msgid "Contrast-"
+msgstr "Kontrast-"
+
+#: src/nikonmn.cpp:451
+msgid "Speedlight"
+msgstr "Rýchlosvetlo"
+
+#: src/nikonmn.cpp:491
+msgid "Unknown Nikon2MakerNote tag"
+msgstr "Neznáma značka Nikon2MakerNote"
+
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:282
+msgid "Flash Device"
+msgstr "Zariadenie blesku"
+
+#: src/nikonmn.cpp:532 src/olympusmn.cpp:283
+msgid "Flash device"
+msgstr "Zariadenie blesku"
+
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:249 src/panasonicmn.cpp:248
+msgid "White Balance Bias"
+msgstr "Skreslenie vyváženia bielej"
+
+#: src/nikonmn.cpp:534 src/olympusmn.cpp:250
+msgid "White balance bias"
+msgstr "Skreslenie vyváženia bielej"
+
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB Levels"
+msgstr "WB_RGGBLevelsShade"
+
+#: src/nikonmn.cpp:535 src/olympusmn.cpp:932
+#, fuzzy
+msgid "WB RB levels"
+msgstr "Úroveň čiernej"
+
+#: src/nikonmn.cpp:536
+msgid "Program Shift"
+msgstr "Posunutie programu"
+
+#: src/nikonmn.cpp:536
+msgid "Program shift"
+msgstr "Posunutie programu"
+
+#: src/nikonmn.cpp:537
+msgid "Exposure Difference"
+msgstr "Rozdiel expozície"
+
+#: src/nikonmn.cpp:537
+msgid "Exposure difference"
+msgstr "Rozdiel expozície"
+
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:877
+msgid "Pointer to a preview image"
+msgstr "Ukazovateľ na náhľad"
+
+#: src/nikonmn.cpp:540 src/pentaxmn.cpp:878
+msgid "Offset to an IFD containing a preview image"
+msgstr "Umiestnenie IFD obsahujúceho náhľad obrázka"
+
+#: src/nikonmn.cpp:541
+msgid "Flash Comp"
+msgstr "Komp. blesku"
+
+#: src/nikonmn.cpp:541
+msgid "Flash compensation setting"
+msgstr "Nastavenie kompenzácie blesku"
+
+#: src/nikonmn.cpp:543
+msgid "Image Boundary"
+msgstr "Okraj obrázka"
+
+#: src/nikonmn.cpp:543
+msgid "Image boundary"
+msgstr "Okraj obrázka"
+
+#: src/nikonmn.cpp:544
+#, fuzzy
+msgid "Flash exposure comp"
+msgstr "Kompenzácia expozície blesku"
+
+#: src/nikonmn.cpp:545
+msgid "Flash Bracket Comp"
+msgstr "Komp. viacnásobného záberu blesku"
+
+#: src/nikonmn.cpp:545
+msgid "Flash bracket compensation applied"
+msgstr "Kompenzácia viacnásobného záberu blesku"
+
+#: src/nikonmn.cpp:546
+msgid "Exposure Bracket Comp"
+msgstr "Komp. viacnásobného záberu"
+
+#: src/nikonmn.cpp:546
+msgid "AE bracket compensation applied"
+msgstr "Použitá kompenzácia viacnásobného záberu AE"
+
+#: src/nikonmn.cpp:547 src/olympusmn.cpp:459
+msgid "Image Processing"
+msgstr "Spracovanie obrazu"
+
+#: src/nikonmn.cpp:547 src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+msgid "Image processing"
+msgstr "Spracovanie obrazu"
+
+#: src/nikonmn.cpp:548
+msgid "Crop High Speed"
+msgstr "Orezanie vysoká rýchlosť"
+
+#: src/nikonmn.cpp:548
+msgid "Crop high speed"
+msgstr "Orezanie vysoká rýchlosť"
+
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure Tuning"
+msgstr "Upozornenie expozície"
+
+#: src/nikonmn.cpp:549
+#, fuzzy
+msgid "Exposure tuning"
+msgstr "Upozornenie expozície"
+
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR Info"
+msgstr "Nespracované info"
+
+#: src/nikonmn.cpp:552
+#, fuzzy
+msgid "VR info"
+msgstr "Nespracované info"
+
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image Authentication"
+msgstr "Orientácia obrázka"
+
+#: src/nikonmn.cpp:553
+#, fuzzy
+msgid "Image authentication"
+msgstr "Orientácia obrázka"
+
+#: src/nikonmn.cpp:554
+msgid "ActiveD-Lighting"
+msgstr ""
+
+#: src/nikonmn.cpp:554
+msgid "ActiveD-lighting"
+msgstr ""
+
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid "Picture Control"
+msgstr "Informácie o obrázku"
+
+#: src/nikonmn.cpp:555
+#, fuzzy
+msgid " Picture control"
+msgstr "Informácie o obrázku"
+
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World Time"
+msgstr "Čas Minolta"
+
+#: src/nikonmn.cpp:556
+#, fuzzy
+msgid "World time"
+msgstr "Čas Minolta"
+
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO Info"
+msgstr "Info o snímke"
+
+#: src/nikonmn.cpp:557
+#, fuzzy
+msgid "ISO info"
+msgstr "Nastavenia ISO"
+
+#: src/nikonmn.cpp:558
+#, fuzzy
+msgid "Vignette Control"
+msgstr "Diaľkové ovládanie?"
+
+#: src/nikonmn.cpp:558
+#, fuzzy
+msgid "Vignette control"
+msgstr "Diaľkové ovládanie?"
+
+#: src/nikonmn.cpp:560
+msgid "Tone Compensation"
+msgstr "Kompenzácia tónu"
+
+#: src/nikonmn.cpp:560
+msgid "Tone compensation"
+msgstr "Kompenzácia tónu"
+
+#: src/nikonmn.cpp:566
+msgid "Mode of flash used"
+msgstr "Použitý režim blesku"
+
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244
+msgid "Shooting Mode"
+msgstr "Režim fotenia"
+
+#: src/nikonmn.cpp:568 src/panasonicmn.cpp:244 src/pentaxmn.cpp:868
+msgid "Shooting mode"
+msgstr "Režim fotenia"
+
+#: src/nikonmn.cpp:569
+msgid "Auto Bracket Release"
+msgstr "Uvoľnenie viacnásobného záberu"
+
+#: src/nikonmn.cpp:569
+msgid "Auto bracket release"
+msgstr "Uvoľnenie viacnásobného záberu"
+
+# TODO: check
+#: src/nikonmn.cpp:570
+#, fuzzy
+msgid "Lens FStops"
+msgstr "F stops šošoviek"
+
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast Curve"
+msgstr "Kontrast"
+
+#: src/nikonmn.cpp:571
+#, fuzzy
+msgid "Contrast curve"
+msgstr "Kontrast"
+
+#: src/nikonmn.cpp:572
+#, fuzzy
+msgid "Color Hue"
+msgstr "Farebný tón"
+
+#: src/nikonmn.cpp:572
+#, fuzzy
+msgid "Color hue"
+msgstr "Farebný tón"
+
+#: src/nikonmn.cpp:573 src/olympusmn.cpp:253 src/olympusmn.cpp:684
+#: src/panasonicmn.cpp:282
+msgid "Scene mode"
+msgstr "Režim scény"
+
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076 src/properties.cpp:548
+#: src/tags.cpp:831 src/tags.cpp:1439
+msgid "Light Source"
+msgstr "Zdroj svetla"
+
+# exif-lightsource
+#: src/nikonmn.cpp:574 src/olympusmn.cpp:1076
+msgid "Light source"
+msgstr "Svetelný zdroj"
+
+#: src/nikonmn.cpp:575
+#, fuzzy
+msgid "Shot info"
+msgstr "Info o snímke"
+
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue Adjustment"
+msgstr "Úpravy tónu"
+
+#: src/nikonmn.cpp:576 src/nikonmn.cpp:699
+msgid "Hue adjustment"
+msgstr "Úpravy tónu"
+
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF Compression"
+msgstr "Kompresia"
+
+#: src/nikonmn.cpp:577
+#, fuzzy
+msgid "NEF compression"
+msgstr "Kompresia"
+
+#: src/nikonmn.cpp:580 src/tags.cpp:903
+msgid "Linearization Table"
+msgstr "Linearizačná tabuľka"
+
+#: src/nikonmn.cpp:580
+#, fuzzy
+msgid "Linearization table"
+msgstr "Linearizačná tabuľka"
+
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color Balance"
+msgstr "Vyváženie farieb 1"
+
+#: src/nikonmn.cpp:581
+#, fuzzy
+msgid "Color balance"
+msgstr "Vyváženie farieb Červená"
+
+#: src/nikonmn.cpp:582
+msgid "Lens Data"
+msgstr "Údaje šošoviek"
+
+#: src/nikonmn.cpp:582
+msgid "Lens data settings"
+msgstr "Nastavenia údajov šošoviek"
+
+#: src/nikonmn.cpp:583
+#, fuzzy
+msgid "Raw Image Center"
+msgstr "Počet obrázkov"
+
+#: src/nikonmn.cpp:583
+#, fuzzy
+msgid "Raw image center"
+msgstr "Zobraziť vložený obrázok"
+
+#: src/nikonmn.cpp:584
+msgid "Sensor Pixel Size"
+msgstr "Veľkosť obrazového bodu snímača"
+
+#: src/nikonmn.cpp:584
+msgid "Sensor pixel size"
+msgstr "Veľkosť obrazového bodu snímača"
+
+#: src/nikonmn.cpp:586
+#, fuzzy
+msgid "Scene Assist"
+msgstr "Asistent AZ"
+
+#: src/nikonmn.cpp:586
+#, fuzzy
+msgid "Scene assist"
+msgstr "scenéria"
+
+#: src/nikonmn.cpp:587
+#, fuzzy
+msgid "Retouch History"
+msgstr "História"
+
+#: src/nikonmn.cpp:587
+#, fuzzy
+msgid "Retouch history"
+msgstr "História"
+
+#: src/nikonmn.cpp:589
+#, fuzzy
+msgid "Serial NO"
+msgstr "Sériové číslo"
+
+#: src/nikonmn.cpp:589
+msgid "Camera serial number, usually starts with \"NO= \""
+msgstr ""
+
+#: src/nikonmn.cpp:590
+msgid "Image Data Size"
+msgstr "Veľkosť obrazových údajov"
+
+#: src/nikonmn.cpp:590
+msgid "Image data size"
+msgstr "Veľkosť obrazových údajov"
+
+#: src/nikonmn.cpp:592
+msgid "Image Count"
+msgstr "Počet obrázkov"
+
+#: src/nikonmn.cpp:592
+msgid "Image count"
+msgstr "Počet obrázkov"
+
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted Image Count"
+msgstr "Zmazať počet obrázkov"
+
+#: src/nikonmn.cpp:593 src/nikonmn.cpp:1205
+#, fuzzy
+msgid "Deleted image count"
+msgstr "Zmazať počet obrázkov"
+
+#: src/nikonmn.cpp:594 src/nikonmn.cpp:1042 src/nikonmn.cpp:1055
+#: src/nikonmn.cpp:1115 src/nikonmn.cpp:1175 src/nikonmn.cpp:1211
+msgid "Shutter Count"
+msgstr "Počítadlo uzávierky"
+
+#: src/nikonmn.cpp:594
+msgid "Number of shots taken by camera"
+msgstr "Počet snímok zachytených fotoaparátom"
+
+#: src/nikonmn.cpp:595
+#, fuzzy
+msgid "Flash info"
+msgstr "Info o blesku"
+
+#: src/nikonmn.cpp:596
+msgid "Image Optimization"
+msgstr "Optimalizácia obrázka"
+
+#: src/nikonmn.cpp:596
+msgid "Image optimization"
+msgstr "Optimalizácia obrázka"
+
+#: src/nikonmn.cpp:598
+msgid "Program Variation"
+msgstr "Variácia programu"
+
+#: src/nikonmn.cpp:598
+msgid "Program variation"
+msgstr "Variácia programu"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:600
+msgid "AF Response"
+msgstr "Odpoveď automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:600
+msgid "AF response"
+msgstr "Odpoveď automatického zaostrenia"
+
+#: src/nikonmn.cpp:601
+#, fuzzy
+msgid "Multi exposure"
+msgstr "Viacnásobná expozícia"
+
+#: src/nikonmn.cpp:602
+msgid "High ISO Noise Reduction"
+msgstr "Vysoká redukcia šumu ISO"
+
+#: src/nikonmn.cpp:603 src/nikonmn.cpp:701
+#, fuzzy
+msgid "Toning effect"
+msgstr "fotoefekt"
+
+#: src/nikonmn.cpp:604
+#, fuzzy
+msgid "AF info 2"
+msgstr "Info o AZ"
+
+#: src/nikonmn.cpp:605
+#, fuzzy
+msgid "File info"
+msgstr "Názov súboru"
+
+#: src/nikonmn.cpp:608
+msgid "Capture Data"
+msgstr "Dáta snímania"
+
+#: src/nikonmn.cpp:608
+msgid "Capture data"
+msgstr "Dáta snímania"
+
+#: src/nikonmn.cpp:609
+msgid "Capture Version"
+msgstr "Verzia snímania"
+
+#: src/nikonmn.cpp:609
+msgid "Capture version"
+msgstr "Verzia snímania"
+
+#: src/nikonmn.cpp:611
+msgid "Capture Offsets"
+msgstr "Ofset snímania"
+
+#: src/nikonmn.cpp:611
+msgid "Capture offsets"
+msgstr "Ofset snímania"
+
+#: src/nikonmn.cpp:612
+#, fuzzy
+msgid "Scan IFD"
+msgstr "Uložiť ID"
+
+#: src/nikonmn.cpp:613
+#, fuzzy
+msgid "ICC profile"
+msgstr "Farebný profil"
+
+#: src/nikonmn.cpp:614
+#, fuzzy
+msgid "Capture output"
+msgstr "Dáta snímania"
+
+#: src/nikonmn.cpp:616
+msgid "Unknown Nikon3MakerNote tag"
+msgstr "Neznáma značka Nikon3MakerNote"
+
+#: src/nikonmn.cpp:626 src/olympusmn.cpp:65 src/panasonicmn.cpp:140
+#: src/pentaxmn.cpp:298
+msgid "No"
+msgstr "Nie"
+
+#: src/nikonmn.cpp:627 src/olympusmn.cpp:66 src/panasonicmn.cpp:139
+#: src/pentaxmn.cpp:299
+msgid "Yes"
+msgstr "Áno"
+
+#: src/nikonmn.cpp:632
+msgid "Y/M/D"
+msgstr ""
+
+#: src/nikonmn.cpp:633
+msgid "M/D/Y"
+msgstr ""
+
+#: src/nikonmn.cpp:634
+msgid "D/M/Y"
+msgstr ""
+
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+#, fuzzy
+msgid "Vibration Reduction"
+msgstr "Bez korekcie"
+
+#: src/nikonmn.cpp:646 src/nikonmn.cpp:1206
+#, fuzzy
+msgid "Vibration reduction"
+msgstr "Bez korekcie"
+
+#: src/nikonmn.cpp:648
+#, fuzzy
+msgid "Unknown Nikon Vibration Reduction Tag"
+msgstr "Neznáma značka Canon Custom Function"
+
+#: src/nikonmn.cpp:658
+#, fuzzy
+msgid "Default Settings"
+msgstr "Nastavenia"
+
+#: src/nikonmn.cpp:659 src/nikonmn.cpp:694
+#, fuzzy
+msgid "Quick Adjust"
+msgstr "Úpravy tónu"
+
+#: src/nikonmn.cpp:660
+#, fuzzy
+msgid "Full Control"
+msgstr "Riadenie farieb"
+
+#: src/nikonmn.cpp:681
+msgid "Blue-green"
+msgstr ""
+
+#: src/nikonmn.cpp:683
+msgid "Purple-blue"
+msgstr ""
+
+#: src/nikonmn.cpp:684
+msgid "Red-purple"
+msgstr ""
+
+#: src/nikonmn.cpp:691
+#, fuzzy
+msgid "Name"
+msgstr "Prezývka"
+
+#: src/nikonmn.cpp:692
+#, fuzzy
+msgid "Base"
+msgstr "Základné URL"
+
+#: src/nikonmn.cpp:693
+#, fuzzy
+msgid "Adjust"
+msgstr "Dolaďuje sa"
+
+#: src/nikonmn.cpp:694
+#, fuzzy
+msgid "Quick adjust"
+msgstr "Úpravy tónu"
+
+#: src/nikonmn.cpp:700
+#, fuzzy
+msgid "Filter effect"
+msgstr "Farebný efekt"
+
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning Saturation"
+msgstr "Sýtosť"
+
+#: src/nikonmn.cpp:702
+#, fuzzy
+msgid "Toning saturation"
+msgstr "Sýtosť"
+
+#: src/nikonmn.cpp:704
+#, fuzzy
+msgid "Unknown Nikon Picture Control Tag"
+msgstr "Neznáma značka Canon Picture Info"
+
+#: src/nikonmn.cpp:714
+#, fuzzy
+msgid "Timezone"
+msgstr "odtieň"
+
+# exif-lightsource-1
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight Savings"
+msgstr "denné svetlo"
+
+# exif-lightsource-1
+#: src/nikonmn.cpp:715
+#, fuzzy
+msgid "Daylight savings"
+msgstr "denné svetlo"
+
+#: src/nikonmn.cpp:716
+#, fuzzy
+msgid "Date Display Format"
+msgstr "Formát súboru"
+
+#: src/nikonmn.cpp:716
+#, fuzzy
+msgid "Date display format"
+msgstr "Tvar dát"
+
+#: src/nikonmn.cpp:718
+#, fuzzy
+msgid "Unknown Nikon World Time Tag"
+msgstr "Neznáma značka Nikon1MakerNote"
+
+#: src/nikonmn.cpp:729
+#, fuzzy
+msgid "Hi 0.3"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:730
+#, fuzzy
+msgid "Hi 0.5"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:731
+#, fuzzy
+msgid "Hi 0.7"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:732
+#, fuzzy
+msgid "Hi 1.0"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:733
+#, fuzzy
+msgid "Hi 1.3"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:734
+#, fuzzy
+msgid "Hi 1.5"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:735
+#, fuzzy
+msgid "Hi 1.7"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:736
+#, fuzzy
+msgid "Hi 2.0"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:737
+msgid "Lo 0.3"
+msgstr ""
+
+#: src/nikonmn.cpp:738
+msgid "Lo 0.5"
+msgstr ""
+
+#: src/nikonmn.cpp:739
+msgid "Lo 0.7"
+msgstr ""
+
+#: src/nikonmn.cpp:740
+#, fuzzy
+msgid "Lo 1.0"
+msgstr "HV10"
+
+#: src/nikonmn.cpp:746
+#, fuzzy
+msgid "ISO Expansion"
+msgstr "Výber ISO"
+
+#: src/nikonmn.cpp:746
+#, fuzzy
+msgid "ISO expansion"
+msgstr "Výber ISO"
+
+#: src/nikonmn.cpp:747
+#, fuzzy
+msgid "ISO 2"
+msgstr "Info o snímke"
+
+#: src/nikonmn.cpp:748
+#, fuzzy
+msgid "ISO Expansion 2"
+msgstr "Výber ISO"
+
+#: src/nikonmn.cpp:748
+#, fuzzy
+msgid "ISO expansion 2"
+msgstr "Výber ISO"
+
+#: src/nikonmn.cpp:750
+#, fuzzy
+msgid "Unknown Nikon Iso Info Tag"
+msgstr "Neznáma značka Canon Picture Info"
+
+#: src/nikonmn.cpp:760
+#, fuzzy
+msgid "Single Area"
+msgstr "Jednoduchá oblasť"
+
+#: src/nikonmn.cpp:761
+#, fuzzy
+msgid "Dynamic Area"
+msgstr "Dynamická oblasť"
+
+#: src/nikonmn.cpp:762
+#, fuzzy
+msgid "Dynamic Area, Closest Subject"
+msgstr "Najbližší subjekt"
+
+#: src/nikonmn.cpp:763
+#, fuzzy
+msgid "Group Dynamic"
+msgstr "Skupinové dynamické AZ"
+
+#: src/nikonmn.cpp:764
+#, fuzzy
+msgid "Single Area (wide)"
+msgstr "Jednoduchá oblasť"
+
+#: src/nikonmn.cpp:765
+#, fuzzy
+msgid "Dynamic Area (wide)"
+msgstr "Dynamická oblasť (široká)"
+
+#: src/nikonmn.cpp:773 src/nikonmn.cpp:788 src/pentaxmn.cpp:219
+msgid "Mid-left"
+msgstr "v strede vľavo"
+
+#: src/nikonmn.cpp:774 src/nikonmn.cpp:789 src/pentaxmn.cpp:221
+msgid "Mid-right"
+msgstr "v strede vpravo"
+
+#: src/nikonmn.cpp:779 src/nikonmn.cpp:794
+#, fuzzy
+msgid "Far Left"
+msgstr "Orezať vľavo"
+
+#: src/nikonmn.cpp:780 src/nikonmn.cpp:795
+#, fuzzy
+msgid "Far Right"
+msgstr "Orezať vpravo"
+
+#: src/nikonmn.cpp:800 src/nikonmn.cpp:823
+#, fuzzy
+msgid "AF area mode"
+msgstr "Režim AZ"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:801 src/olympusmn.cpp:1008 src/pentaxmn.cpp:902
+msgid "AF point"
+msgstr "bod automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF Points In Focus"
+msgstr "Použité body automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:802
+#, fuzzy
+msgid "AF points in focus"
+msgstr "Použité body automatického zaostrenia"
+
+#: src/nikonmn.cpp:804
+#, fuzzy
+msgid "Unknown Nikon Auto Focus Tag"
+msgstr "Neznáma značka Canon Custom Function"
+
+#: src/nikonmn.cpp:815
+msgid "On (51-point)"
+msgstr ""
+
+#: src/nikonmn.cpp:816
+msgid "On (11-point)"
+msgstr ""
+
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast Detect AF"
+msgstr "Nastavenie kontrastu"
+
+#: src/nikonmn.cpp:822
+#, fuzzy
+msgid "Contrast detect AF"
+msgstr "Nastavenie kontrastu"
+
+#: src/nikonmn.cpp:824
+#, fuzzy
+msgid "Phase Detect AF"
+msgstr "Nepodarilo sa prečítať"
+
+#: src/nikonmn.cpp:824
+#, fuzzy
+msgid "Phase detect AF"
+msgstr "Nepodarilo sa prečítať"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF Point"
+msgstr "Bod automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:825
+#, fuzzy
+msgid "Primary AF point"
+msgstr "bod automatického zaostrenia"
+
+#: src/nikonmn.cpp:827
+#, fuzzy
+msgid "AF Image Width"
+msgstr "Šírka obrázka"
+
+#: src/nikonmn.cpp:827
+#, fuzzy
+msgid "AF image width"
+msgstr "Šírka obrázka"
+
+#: src/nikonmn.cpp:828
+#, fuzzy
+msgid "AF Image Height"
+msgstr "Výška obrázka"
+
+#: src/nikonmn.cpp:828
+#, fuzzy
+msgid "AF image height"
+msgstr "Dĺžka obrázka"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:829
+#, fuzzy
+msgid "AF Area X Position"
+msgstr "poloha automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:829
+#, fuzzy
+msgid "AF area x position"
+msgstr "poloha automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF Area Y Position"
+msgstr "poloha automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/nikonmn.cpp:830
+#, fuzzy
+msgid "AF area y position"
+msgstr "poloha automatického zaostrenia"
+
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF Area Width"
+msgstr "Režim AZ"
+
+#: src/nikonmn.cpp:831
+#, fuzzy
+msgid "AF area width"
+msgstr "Režim AZ"
+
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF Area Height"
+msgstr "Režim AZ"
+
+#: src/nikonmn.cpp:832
+#, fuzzy
+msgid "AF area height"
+msgstr "Orezať vpravo"
+
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast Detect AF In Focus"
+msgstr "Nastavenie kontrastu"
+
+#: src/nikonmn.cpp:833
+#, fuzzy
+msgid "Contrast detect AF in focus"
+msgstr "Nastavenie kontrastu"
+
+#: src/nikonmn.cpp:835
+#, fuzzy
+msgid "Unknown Nikon Auto Focus 2 Tag"
+msgstr "Neznáma značka Canon Custom Function"
+
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory Number"
+msgstr "Poradové číslo"
+
+#: src/nikonmn.cpp:846
+#, fuzzy
+msgid "Directory number"
+msgstr "Poradové číslo"
+
+#: src/nikonmn.cpp:849
+#, fuzzy
+msgid "Unknown Nikon File Info Tag"
+msgstr "Neznáma značka Canon Picture Info"
+
+#: src/nikonmn.cpp:860 src/pentaxmn.cpp:542
+msgid "Multiple Exposure"
+msgstr "Viacnásobná expozícia"
+
+#: src/nikonmn.cpp:861
+#, fuzzy
+msgid "Image Overlay"
+msgstr "Tón obrázka"
+
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi Exposure Mode"
+msgstr "Režim expozície"
+
+#: src/nikonmn.cpp:867
+#, fuzzy
+msgid "Multi exposure mode"
+msgstr "Viacnásobná expozícia"
+
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi Exposure Shots"
+msgstr "Viacnásobná expozícia"
+
+#: src/nikonmn.cpp:868
+#, fuzzy
+msgid "Multi exposure shots"
+msgstr "Viacnásobná expozícia"
 
-#: src/nikonmn.cpp:590 src/nikonmn.cpp:688
+#: src/nikonmn.cpp:869
 #, fuzzy
-msgid "Toning effect"
-msgstr "fotoefekt"
+msgid "Multi Exposure Auto Gain"
+msgstr "Viacnásobná expozícia"
 
-#: src/nikonmn.cpp:591
+#: src/nikonmn.cpp:869
 #, fuzzy
-msgid "AF info 2"
-msgstr "Info o AZ"
+msgid "Multi exposure auto gain"
+msgstr "Viacnásobná expozícia"
 
-#: src/nikonmn.cpp:592
+#: src/nikonmn.cpp:871 src/nikonmn.cpp:991 src/nikonmn.cpp:1011
+#: src/nikonmn.cpp:1031
 #, fuzzy
-msgid "File info"
-msgstr "Názov súboru"
+msgid "Unknown Nikon Multi Exposure Tag"
+msgstr "Neznáma značka Canon Custom Function"
 
-#: src/nikonmn.cpp:595
-msgid "Capture Data"
-msgstr "Dáta snímania"
+#: src/nikonmn.cpp:883 src/olympusmn.cpp:143
+msgid "Internal"
+msgstr "Vnútorný"
 
-#: src/nikonmn.cpp:595
-msgid "Capture data"
-msgstr "Dáta snímania"
+#: src/nikonmn.cpp:889
+msgid "1.01 (SB-800 or Metz 58 AF-1)"
+msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture Version"
-msgstr "Verzia snímania"
+#: src/nikonmn.cpp:890
+msgid "1.03 (SB-800)"
+msgstr ""
 
-#: src/nikonmn.cpp:596
-msgid "Capture version"
-msgstr "Verzia snímania"
+#: src/nikonmn.cpp:891
+msgid "2.01 (SB-800)"
+msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture Offsets"
-msgstr "Ofset snímania"
+#: src/nikonmn.cpp:892
+msgid "2.04 (SB-600)"
+msgstr ""
 
-#: src/nikonmn.cpp:598
-msgid "Capture offsets"
-msgstr "Ofset snímania"
+#: src/nikonmn.cpp:893
+msgid "2.05 (SB-600)"
+msgstr ""
 
-#: src/nikonmn.cpp:599
-#, fuzzy
-msgid "Scan IFD"
-msgstr "Uložiť ID"
+#: src/nikonmn.cpp:894
+msgid "3.01 (SU-800 Remote Commander)"
+msgstr ""
 
-#: src/nikonmn.cpp:600
-#, fuzzy
-msgid "ICC profile"
-msgstr "Farebný profil"
+#: src/nikonmn.cpp:895
+msgid "4.01 (SB-400)"
+msgstr ""
 
-#: src/nikonmn.cpp:601
-#, fuzzy
-msgid "Capture output"
-msgstr "Dáta snímania"
+#: src/nikonmn.cpp:896
+msgid "4.02 (SB-400)"
+msgstr ""
 
-#: src/nikonmn.cpp:603
-msgid "Unknown Nikon3MakerNote tag"
-msgstr "Neznáma značka Nikon3MakerNote"
+#: src/nikonmn.cpp:897
+msgid "4.04 (SB-400)"
+msgstr ""
 
-#: src/nikonmn.cpp:613 src/olympusmn.cpp:62 src/panasonicmn.cpp:136
-#: src/pentaxmn.cpp:243
-msgid "No"
-msgstr "Nie"
+#: src/nikonmn.cpp:898
+msgid "5.01 (SB-900)"
+msgstr ""
 
-#: src/nikonmn.cpp:614 src/olympusmn.cpp:63 src/panasonicmn.cpp:135
-#: src/pentaxmn.cpp:244
-msgid "Yes"
-msgstr "Áno"
+#: src/nikonmn.cpp:899
+msgid "5.02 (SB-900)"
+msgstr ""
 
-#: src/nikonmn.cpp:619
-msgid "Y/M/D"
+#: src/nikonmn.cpp:905
+msgid "0.1 m"
 msgstr ""
 
-#: src/nikonmn.cpp:620
-msgid "M/D/Y"
+#: src/nikonmn.cpp:906
+msgid "0.2 m"
 msgstr ""
 
-#: src/nikonmn.cpp:621
-msgid "D/M/Y"
+#: src/nikonmn.cpp:907
+msgid "0.3 m"
 msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-#, fuzzy
-msgid "Vibration Reduction"
-msgstr "Bez korekcie"
+#: src/nikonmn.cpp:908
+msgid "0.4 m"
+msgstr ""
 
-#: src/nikonmn.cpp:633 src/nikonmn.cpp:966
-#, fuzzy
-msgid "Vibration reduction"
-msgstr "Bez korekcie"
+#: src/nikonmn.cpp:909
+msgid "0.5 m"
+msgstr ""
 
-#: src/nikonmn.cpp:635
-#, fuzzy
-msgid "Unknown Nikon Vibration Reduction Tag"
-msgstr "Neznáma značka Canon Custom Function"
+#: src/nikonmn.cpp:910
+msgid "0.6 m"
+msgstr ""
 
-#: src/nikonmn.cpp:645
-#, fuzzy
-msgid "Default Settings"
-msgstr "Nastavenia"
+#: src/nikonmn.cpp:911
+msgid "0.7 m"
+msgstr ""
 
-#: src/nikonmn.cpp:646 src/nikonmn.cpp:681
-#, fuzzy
-msgid "Quick Adjust"
-msgstr "Úpravy tónu"
+#: src/nikonmn.cpp:912
+msgid "0.8 m"
+msgstr ""
 
-#: src/nikonmn.cpp:647
-#, fuzzy
-msgid "Full Control"
-msgstr "Riadenie farieb"
+#: src/nikonmn.cpp:913
+msgid "0.9 m"
+msgstr ""
 
-#: src/nikonmn.cpp:668
-msgid "Blue-green"
+#: src/nikonmn.cpp:914
+msgid "1.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:670
-msgid "Purple-blue"
+#: src/nikonmn.cpp:915
+msgid "1.1 m"
 msgstr ""
 
-#: src/nikonmn.cpp:671
-msgid "Red-purple"
+#: src/nikonmn.cpp:916
+msgid "1.3 m"
 msgstr ""
 
-#: src/nikonmn.cpp:678
-#, fuzzy
-msgid "Name"
-msgstr "Prezývka"
+#: src/nikonmn.cpp:917
+msgid "1.4 m"
+msgstr ""
 
-#: src/nikonmn.cpp:679
-#, fuzzy
-msgid "Base"
-msgstr "Základné URL"
+#: src/nikonmn.cpp:918
+msgid "1.6 m"
+msgstr ""
 
-#: src/nikonmn.cpp:680
-#, fuzzy
-msgid "Adjust"
-msgstr "Dolaďuje sa"
+#: src/nikonmn.cpp:919
+msgid "1.8 m"
+msgstr ""
 
-#: src/nikonmn.cpp:681
-#, fuzzy
-msgid "Quick adjust"
-msgstr "Úpravy tónu"
+#: src/nikonmn.cpp:920
+msgid "2.0 m"
+msgstr ""
 
-#: src/nikonmn.cpp:687
-#, fuzzy
-msgid "Filter effect"
-msgstr "Farebný efekt"
+#: src/nikonmn.cpp:921
+msgid "2.2 m"
+msgstr ""
 
-#: src/nikonmn.cpp:689
-#, fuzzy
-msgid "Toning Saturation"
-msgstr "Sýtosť"
+#: src/nikonmn.cpp:922
+msgid "2.5 m"
+msgstr ""
 
-#: src/nikonmn.cpp:689
-#, fuzzy
-msgid "Toning saturation"
-msgstr "Sýtosť"
+#: src/nikonmn.cpp:923
+msgid "2.8 m"
+msgstr ""
 
-#: src/nikonmn.cpp:691
-#, fuzzy
-msgid "Unknown Nikon Picture Control Tag"
-msgstr "Neznáma značka Canon Picture Info"
+#: src/nikonmn.cpp:924
+msgid "3.2 m"
+msgstr ""
 
-#: src/nikonmn.cpp:701
-#, fuzzy
-msgid "Timezone"
-msgstr "odtieň"
+#: src/nikonmn.cpp:925
+msgid "3.6 m"
+msgstr ""
 
-# exif-lightsource-1
-#: src/nikonmn.cpp:702
-#, fuzzy
-msgid "Daylight Savings"
-msgstr "denné svetlo"
+#: src/nikonmn.cpp:926
+msgid "4.0 m"
+msgstr ""
 
-# exif-lightsource-1
-#: src/nikonmn.cpp:702
-#, fuzzy
-msgid "Daylight savings"
-msgstr "denné svetlo"
+#: src/nikonmn.cpp:927
+msgid "4.5 m"
+msgstr ""
 
-#: src/nikonmn.cpp:703
-#, fuzzy
-msgid "Date Display Format"
-msgstr "Formát súboru"
+#: src/nikonmn.cpp:928
+msgid "5.0 m"
+msgstr ""
 
-#: src/nikonmn.cpp:703
-#, fuzzy
-msgid "Date display format"
-msgstr "Tvar dát"
+#: src/nikonmn.cpp:929
+msgid "5.6 m"
+msgstr ""
 
-#: src/nikonmn.cpp:705
-#, fuzzy
-msgid "Unknown Nikon World Time Tag"
-msgstr "Neznáma značka Nikon1MakerNote"
+#: src/nikonmn.cpp:930
+msgid "6.3 m"
+msgstr ""
 
-#: src/nikonmn.cpp:716
-msgid "Hi 0.3"
+#: src/nikonmn.cpp:931
+msgid "7.1 m"
 msgstr ""
 
-#: src/nikonmn.cpp:717
-msgid "Hi 0.5"
+#: src/nikonmn.cpp:932
+msgid "8.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:718
-msgid "Hi 0.7"
+#: src/nikonmn.cpp:933
+msgid "9.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:719
+#: src/nikonmn.cpp:934
 #, fuzzy
-msgid "Hi 1.0"
-msgstr "HV10"
+msgid "10.0 m"
+msgstr "&"
 
-#: src/nikonmn.cpp:720
-msgid "Hi 1.3"
+#: src/nikonmn.cpp:935
+msgid "11.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:721
-msgid "Hi 1.5"
+#: src/nikonmn.cpp:936
+msgid "13.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:722
-msgid "Hi 1.7"
+#: src/nikonmn.cpp:937
+msgid "14.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:723
-msgid "Hi 2.0"
-msgstr ""
+#: src/nikonmn.cpp:938
+#, fuzzy
+msgid "16.0 m"
+msgstr "160"
 
-#: src/nikonmn.cpp:724
-msgid "Lo 0.3"
+#: src/nikonmn.cpp:939
+msgid "18.0 m"
 msgstr ""
 
-#: src/nikonmn.cpp:725
-msgid "Lo 0.5"
-msgstr ""
+#: src/nikonmn.cpp:940
+#, fuzzy
+msgid "20.0 m"
+msgstr "&"
 
-#: src/nikonmn.cpp:726
-msgid "Lo 0.7"
-msgstr ""
+#: src/nikonmn.cpp:947
+#, fuzzy
+msgid "iTTL-BL"
+msgstr "TTL"
 
-#: src/nikonmn.cpp:727
-msgid "Lo 1.0"
-msgstr ""
+#: src/nikonmn.cpp:948
+#, fuzzy
+msgid "iTTL"
+msgstr "TTL"
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:949
 #, fuzzy
-msgid "ISO Expansion"
-msgstr "Výber ISO"
+msgid "Auto Aperture"
+msgstr "Clona"
 
-#: src/nikonmn.cpp:733
+#: src/nikonmn.cpp:951
+msgid "GN (distance priority)"
+msgstr ""
+
+#: src/nikonmn.cpp:953 src/nikonmn.cpp:954
 #, fuzzy
-msgid "ISO expansion"
-msgstr "Výber ISO"
+msgid "Repeating Flash"
+msgstr "Ročník vydania"
 
-#: src/nikonmn.cpp:734
+#: src/nikonmn.cpp:960
 #, fuzzy
-msgid "ISO 2"
-msgstr "Info o snímke"
+msgid "Bounce Flash"
+msgstr "Bez blesku"
 
-#: src/nikonmn.cpp:735
-msgid "ISO Expansion 2"
+#: src/nikonmn.cpp:961
+msgid "Wide Flash Adapter"
 msgstr ""
 
-#: src/nikonmn.cpp:735
-msgid "ISO expansion 2"
+#: src/nikonmn.cpp:967
+msgid "FL-GL1"
 msgstr ""
 
-#: src/nikonmn.cpp:737
+#: src/nikonmn.cpp:968
+msgid "FL-GL2"
+msgstr ""
+
+#: src/nikonmn.cpp:969
+msgid "TN-A1"
+msgstr ""
+
+#: src/nikonmn.cpp:970
+msgid "TN-A2"
+msgstr ""
+
+#: src/nikonmn.cpp:974
 #, fuzzy
-msgid "Unknown Nikon Iso Info Tag"
-msgstr "Neznáma značka Canon Picture Info"
+msgid "Amber"
+msgstr "číslo F"
 
-#: src/nikonmn.cpp:747
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "Single Area"
-msgstr "Jednoduchá oblasť"
+msgid "Flash Source"
+msgstr "Zdroj súboru"
 
-#: src/nikonmn.cpp:748
+#: src/nikonmn.cpp:980 src/nikonmn.cpp:1002 src/nikonmn.cpp:1022
 #, fuzzy
-msgid "Dynamic Area"
-msgstr "Dynamická oblasť"
+msgid "Flash source"
+msgstr "Zdroj súboru"
 
-#: src/nikonmn.cpp:749
+#: src/nikonmn.cpp:981 src/nikonmn.cpp:1003
 #, fuzzy
-msgid "Dynamic Area, Closest Subject"
-msgstr "Najbližší subjekt"
+msgid "0x0005"
+msgstr "1000"
 
-#: src/nikonmn.cpp:750
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Group Dynamic"
-msgstr "Skupinové dynamické AZ"
+msgid "External Flash Firmware"
+msgstr "Priblíženie externého blesku"
 
-#: src/nikonmn.cpp:751
+#: src/nikonmn.cpp:982 src/nikonmn.cpp:1004 src/nikonmn.cpp:1023
 #, fuzzy
-msgid "Single Area (wide)"
-msgstr "Jednoduchá oblasť"
+msgid "External flash firmware"
+msgstr "Režim externého blesku"
 
-#: src/nikonmn.cpp:752
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
 #, fuzzy
-msgid "Dynamic Area (wide)"
-msgstr "Dynamická oblasť (široká)"
+msgid "External Flash Flags"
+msgstr "externý blesk"
 
-#: src/nikonmn.cpp:760 src/nikonmn.cpp:775 src/pentaxmn.cpp:197
-msgid "Mid-left"
-msgstr "v strede vľavo"
+#: src/nikonmn.cpp:983 src/nikonmn.cpp:1005 src/nikonmn.cpp:1024
+#, fuzzy
+msgid "External flash flags"
+msgstr "externý blesk"
 
-#: src/nikonmn.cpp:761 src/nikonmn.cpp:776 src/pentaxmn.cpp:199
-msgid "Mid-right"
-msgstr "v strede vpravo"
+# FUZZY exif-focallength
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
+#, fuzzy
+msgid "Flash Focal Length"
+msgstr "Maximálna ohnisková vzdialenosť"
 
-#: src/nikonmn.cpp:766 src/nikonmn.cpp:781
+# FUZZY exif-focallength
+#: src/nikonmn.cpp:984 src/nikonmn.cpp:1006 src/nikonmn.cpp:1025
 #, fuzzy
-msgid "Far Left"
-msgstr "Orezať vľavo"
+msgid "Flash focal length"
+msgstr "Maximálna ohnisková vzdialenosť"
+
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
+msgid "Repeating Flash Rate"
+msgstr ""
 
-#: src/nikonmn.cpp:767 src/nikonmn.cpp:782
+#: src/nikonmn.cpp:985 src/nikonmn.cpp:1007 src/nikonmn.cpp:1026
 #, fuzzy
-msgid "Far Right"
-msgstr "Orezať vpravo"
+msgid "Repeating flash rate"
+msgstr "Súbor sa premenúva na"
+
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+msgid "Repeating Flash Count"
+msgstr ""
+
+#: src/nikonmn.cpp:986 src/nikonmn.cpp:1008 src/nikonmn.cpp:1027
+#, fuzzy
+msgid "Repeating flash count"
+msgstr "Ručné riadenie blesku"
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF Area Mode"
-msgstr "Režim AZ"
+msgid "Flash GN Distance"
+msgstr "Vzdialenosť zaostrenia"
 
-#: src/nikonmn.cpp:787
+#: src/nikonmn.cpp:987 src/nikonmn.cpp:1009 src/nikonmn.cpp:1028
 #, fuzzy
-msgid "AF area mode"
-msgstr "Režim AZ"
+msgid "Flash GN distance"
+msgstr "Vzdialenosť zaostrenia"
 
-# AF = automatické zaostrenie
-#: src/nikonmn.cpp:788 src/olympusmn.cpp:924 src/pentaxmn.cpp:822
-msgid "AF point"
-msgstr "bod automatického zaostrenia"
+#: src/nikonmn.cpp:988
+msgid "Flash Group A Control Mode"
+msgstr ""
 
-# AF = automatické zaostrenie
-#: src/nikonmn.cpp:789
-#, fuzzy
-msgid "AF Points In Focus"
-msgstr "Použité body automatického zaostrenia"
+#: src/nikonmn.cpp:988
+msgid "Flash group a control mode"
+msgstr ""
 
-# AF = automatické zaostrenie
-#: src/nikonmn.cpp:789
+#: src/nikonmn.cpp:989
+msgid "Flash Group B Control Mode"
+msgstr ""
+
+#: src/nikonmn.cpp:989
+msgid "Flash group b control mode"
+msgstr ""
+
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "AF points in focus"
-msgstr "Použité body automatického zaostrenia"
+msgid "Flash Color Filter"
+msgstr "Farebný filter"
 
-#: src/nikonmn.cpp:791
+#: src/nikonmn.cpp:1029
 #, fuzzy
-msgid "Unknown Nikon Auto Focus Tag"
-msgstr "Neznáma značka Canon Custom Function"
+msgid "Flash color filter"
+msgstr "Farebný filter"
 
-#: src/nikonmn.cpp:802 src/nikonmn.cpp:815 src/nikonmn.cpp:875
-#: src/nikonmn.cpp:935 src/nikonmn.cpp:971 src/pentaxmn.cpp:946
-#: src/pentaxmn.cpp:947
+#: src/nikonmn.cpp:1042 src/nikonmn.cpp:1055 src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1175 src/nikonmn.cpp:1211 src/pentaxmn.cpp:1042
+#: src/pentaxmn.cpp:1043
 msgid "Shutter count"
 msgstr "Hodnota uzávierky"
 
-#: src/nikonmn.cpp:804
+#: src/nikonmn.cpp:1044
 #, fuzzy
 msgid "Unknown Nikon Shot Info D80 Tag"
 msgstr "Neznáma značka Canon Picture Info"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:1056 src/sonymn.cpp:408 src/sonymn.cpp:409
 #, fuzzy
 msgid "Flash Level"
 msgstr "Zariadenie blesku"
 
-#: src/nikonmn.cpp:816
+#: src/nikonmn.cpp:1056
 #, fuzzy
 msgid "Flash level"
 msgstr "Zariadenie blesku"
 
-#: src/nikonmn.cpp:818
+#: src/nikonmn.cpp:1058
 #, fuzzy
 msgid "Unknown Nikon Shot Info D40 Tag"
 msgstr "Neznáma značka Canon Picture Info"
 
-#: src/nikonmn.cpp:828 src/nikonmn.cpp:888
+#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1128
 #, fuzzy
 msgid "0"
 msgstr "50"
 
-#: src/nikonmn.cpp:829 src/nikonmn.cpp:897
+#: src/nikonmn.cpp:1069 src/nikonmn.cpp:1137
+#, fuzzy
 msgid "+1"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:830 src/nikonmn.cpp:898
+#: src/nikonmn.cpp:1070 src/nikonmn.cpp:1138
+#, fuzzy
 msgid "+2"
-msgstr ""
+msgstr "&"
 
-#: src/nikonmn.cpp:831 src/nikonmn.cpp:899
+#: src/nikonmn.cpp:1071 src/nikonmn.cpp:1139
 msgid "+4"
 msgstr ""
 
-#: src/nikonmn.cpp:832 src/nikonmn.cpp:900
+#: src/nikonmn.cpp:1072 src/nikonmn.cpp:1140
 msgid "+8"
 msgstr ""
 
-#: src/nikonmn.cpp:833 src/nikonmn.cpp:901
+#: src/nikonmn.cpp:1073 src/nikonmn.cpp:1141
 #, fuzzy
 msgid "+16"
 msgstr "160"
 
-#: src/nikonmn.cpp:834 src/nikonmn.cpp:902
+#: src/nikonmn.cpp:1074 src/nikonmn.cpp:1142
 #, fuzzy
 msgid "-16"
 msgstr "160"
 
-#: src/nikonmn.cpp:835 src/nikonmn.cpp:903
+#: src/nikonmn.cpp:1075 src/nikonmn.cpp:1143
 msgid "-8"
 msgstr ""
 
-#: src/nikonmn.cpp:836 src/nikonmn.cpp:904
+#: src/nikonmn.cpp:1076 src/nikonmn.cpp:1144
 msgid "-4"
 msgstr ""
 
-#: src/nikonmn.cpp:837 src/nikonmn.cpp:905
+#: src/nikonmn.cpp:1077 src/nikonmn.cpp:1145
+#, fuzzy
 msgid "-2"
-msgstr ""
+msgstr "&"
 
-#: src/nikonmn.cpp:838 src/nikonmn.cpp:906
+#: src/nikonmn.cpp:1078 src/nikonmn.cpp:1146
+#, fuzzy
 msgid "-1"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:839 src/nikonmn.cpp:907
+#: src/nikonmn.cpp:1079 src/nikonmn.cpp:1147
+#, fuzzy
 msgid "+17"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:840 src/nikonmn.cpp:908
+#: src/nikonmn.cpp:1080 src/nikonmn.cpp:1148
+#, fuzzy
 msgid "-17"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:841 src/nikonmn.cpp:909
+#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1149
 msgid "+9"
 msgstr ""
 
-#: src/nikonmn.cpp:842 src/nikonmn.cpp:910
+#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1150
+#, fuzzy
 msgid "+18"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:843 src/nikonmn.cpp:911
+#: src/nikonmn.cpp:1083 src/nikonmn.cpp:1151
+#, fuzzy
 msgid "-18"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:844 src/nikonmn.cpp:912
+#: src/nikonmn.cpp:1084 src/nikonmn.cpp:1152
 msgid "-9"
 msgstr ""
 
-#: src/nikonmn.cpp:845 src/nikonmn.cpp:913
+#: src/nikonmn.cpp:1085 src/nikonmn.cpp:1153
+#, fuzzy
 msgid "+19"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:846 src/nikonmn.cpp:914
+#: src/nikonmn.cpp:1086 src/nikonmn.cpp:1154
+#, fuzzy
 msgid "-19"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:847 src/nikonmn.cpp:915
+#: src/nikonmn.cpp:1087 src/nikonmn.cpp:1155
+#, fuzzy
 msgid "+5"
-msgstr ""
+msgstr "125"
 
-#: src/nikonmn.cpp:848 src/nikonmn.cpp:916
+#: src/nikonmn.cpp:1088 src/nikonmn.cpp:1156
 #, fuzzy
 msgid "+10"
 msgstr "10s"
 
-#: src/nikonmn.cpp:849 src/nikonmn.cpp:917
+#: src/nikonmn.cpp:1089 src/nikonmn.cpp:1157
 #, fuzzy
 msgid "+20"
 msgstr "&"
 
-#: src/nikonmn.cpp:850 src/nikonmn.cpp:918
+#: src/nikonmn.cpp:1090 src/nikonmn.cpp:1158
 #, fuzzy
 msgid "-20"
 msgstr "&"
 
-#: src/nikonmn.cpp:851 src/nikonmn.cpp:919
+#: src/nikonmn.cpp:1091 src/nikonmn.cpp:1159
 #, fuzzy
 msgid "-10"
 msgstr "10s"
 
-#: src/nikonmn.cpp:852 src/nikonmn.cpp:920
+#: src/nikonmn.cpp:1092 src/nikonmn.cpp:1160
+#, fuzzy
 msgid "-5"
-msgstr ""
+msgstr "125"
 
-#: src/nikonmn.cpp:853 src/nikonmn.cpp:921
+#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1161
+#, fuzzy
 msgid "+11"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:854 src/nikonmn.cpp:922
+#: src/nikonmn.cpp:1094 src/nikonmn.cpp:1162
+#, fuzzy
 msgid "-11"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:855 src/nikonmn.cpp:923
+#: src/nikonmn.cpp:1095 src/nikonmn.cpp:1163
 msgid "+3"
 msgstr ""
 
-#: src/nikonmn.cpp:856 src/nikonmn.cpp:924
+#: src/nikonmn.cpp:1096 src/nikonmn.cpp:1164
+#, fuzzy
 msgid "+6"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:857 src/nikonmn.cpp:925
+#: src/nikonmn.cpp:1097 src/nikonmn.cpp:1165
 #, fuzzy
 msgid "+12"
 msgstr "125"
 
-#: src/nikonmn.cpp:858 src/nikonmn.cpp:926
+#: src/nikonmn.cpp:1098 src/nikonmn.cpp:1166
 #, fuzzy
 msgid "-12"
 msgstr "125"
 
-#: src/nikonmn.cpp:859 src/nikonmn.cpp:927
+#: src/nikonmn.cpp:1099 src/nikonmn.cpp:1167
+#, fuzzy
 msgid "-6"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:860 src/nikonmn.cpp:928
+#: src/nikonmn.cpp:1100 src/nikonmn.cpp:1168
 msgid "-3"
 msgstr ""
 
-#: src/nikonmn.cpp:861 src/nikonmn.cpp:889
+#: src/nikonmn.cpp:1101 src/nikonmn.cpp:1129
+#, fuzzy
 msgid "+13"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:862 src/nikonmn.cpp:890
+#: src/nikonmn.cpp:1102 src/nikonmn.cpp:1130
+#, fuzzy
 msgid "-13"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:863 src/nikonmn.cpp:891
+#: src/nikonmn.cpp:1103 src/nikonmn.cpp:1131
 msgid "+7"
 msgstr ""
 
-#: src/nikonmn.cpp:864 src/nikonmn.cpp:892
+#: src/nikonmn.cpp:1104 src/nikonmn.cpp:1132
+#, fuzzy
 msgid "+14"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:865 src/nikonmn.cpp:893
+#: src/nikonmn.cpp:1105 src/nikonmn.cpp:1133
+#, fuzzy
 msgid "-14"
-msgstr ""
+msgstr "160"
 
-#: src/nikonmn.cpp:866 src/nikonmn.cpp:894
+#: src/nikonmn.cpp:1106 src/nikonmn.cpp:1134
 msgid "-7"
 msgstr ""
 
-#: src/nikonmn.cpp:867 src/nikonmn.cpp:895
+#: src/nikonmn.cpp:1107 src/nikonmn.cpp:1135
 #, fuzzy
 msgid "+15"
 msgstr "125"
 
-#: src/nikonmn.cpp:868 src/nikonmn.cpp:896
+#: src/nikonmn.cpp:1108 src/nikonmn.cpp:1136
 #, fuzzy
 msgid "-15"
 msgstr "125"
 
 # AF = automatické zaostrenie
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
 msgid "AF Fine Tune Adj"
 msgstr "Použitý bod automatického zaostrenia"
 
 # AF = automatické zaostrenie
-#: src/nikonmn.cpp:876 src/nikonmn.cpp:936
+#: src/nikonmn.cpp:1116 src/nikonmn.cpp:1176
 #, fuzzy
 msgid "AF fine tune adj"
 msgstr "Použitý bod automatického zaostrenia"
 
-#: src/nikonmn.cpp:878
+#: src/nikonmn.cpp:1118
 #, fuzzy
 msgid "Unknown Nikon Shot Info D300 (a) Tag"
 msgstr "Neznáma značka Canon Picture Info"
 
-#: src/nikonmn.cpp:938
+#: src/nikonmn.cpp:1178
 #, fuzzy
 msgid "Unknown Nikon Shot Info D300 (b) Tag"
 msgstr "Neznáma značka Canon Picture Info"
 
-#: src/nikonmn.cpp:949
-msgid "On (1)"
-msgstr ""
-
-#: src/nikonmn.cpp:950
-msgid "On (2)"
-msgstr ""
-
-#: src/nikonmn.cpp:951
+#: src/nikonmn.cpp:1191
+#, fuzzy
 msgid "On (3)"
-msgstr ""
+msgstr "zapnutý"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:1204
 #, fuzzy
 msgid "Shutter Count 1"
 msgstr "Počítadlo uzávierky"
 
-#: src/nikonmn.cpp:964
+#: src/nikonmn.cpp:1204
 #, fuzzy
 msgid "Shutter count 1"
 msgstr "Hodnota uzávierky"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:1208
 #, fuzzy
 msgid "Shutter Count 2"
 msgstr "Počítadlo uzávierky"
 
-#: src/nikonmn.cpp:968
+#: src/nikonmn.cpp:1208
 #, fuzzy
 msgid "Shutter count 2"
 msgstr "Hodnota uzávierky"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:1209
 #, fuzzy
 msgid "Vibration Reduction 2"
 msgstr "Bez korekcie"
 
-#: src/nikonmn.cpp:969
+#: src/nikonmn.cpp:1209
 #, fuzzy
 msgid "Vibration reduction 2"
 msgstr "Bez korekcie"
 
-#: src/nikonmn.cpp:973
+#: src/nikonmn.cpp:1213
 #, fuzzy
 msgid "Unknown Nikon Shot Info Tag"
 msgstr "Neznáma značka Canon Picture Info"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:1224
 #, fuzzy
 msgid "WB RBGG Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:984
+#: src/nikonmn.cpp:1224
 #, fuzzy
 msgid "WB RBGG levels"
 msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:986
+#: src/nikonmn.cpp:1226
 #, fuzzy
 msgid "Unknown Nikon Color Balance 1 Tag"
 msgstr "Vyváženie farieb 1"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
 msgid "WB RGGB Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:997 src/nikonmn.cpp:1010 src/nikonmn.cpp:1023
+#: src/nikonmn.cpp:1237 src/nikonmn.cpp:1250 src/nikonmn.cpp:1263
 #, fuzzy
 msgid "WB RGGB levels"
 msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:999
+#: src/nikonmn.cpp:1239
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2 Tag"
 msgstr "Vyváženie farieb 2"
 
-#: src/nikonmn.cpp:1012
+#: src/nikonmn.cpp:1252
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2a Tag"
 msgstr "Vyváženie farieb 2"
 
-#: src/nikonmn.cpp:1025
+#: src/nikonmn.cpp:1265
 #, fuzzy
 msgid "Unknown Nikon Color Balance 2b Tag"
 msgstr "Vyváženie farieb 2"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:1276
 #, fuzzy
 msgid "WB RGBG Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:1036
+#: src/nikonmn.cpp:1276
 #, fuzzy
 msgid "WB RGBG levels"
 msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:1038
+#: src/nikonmn.cpp:1278
 #, fuzzy
 msgid "Unknown Nikon Color Balance 3 Tag"
 msgstr "Neznáma značka Canon Panorama"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:1289
 #, fuzzy
 msgid "WB GRBG Levels"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/nikonmn.cpp:1049
+#: src/nikonmn.cpp:1289
 #, fuzzy
 msgid "WB GRBG levels"
 msgstr "Úroveň čiernej"
 
-#: src/nikonmn.cpp:1051
+#: src/nikonmn.cpp:1291
 #, fuzzy
 msgid "Unknown Nikon Color Balance 4 Tag"
 msgstr "Neznáma značka Canon Panorama"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
 msgid "Lens ID Number"
 msgstr "Sériové číslo"
 
-#: src/nikonmn.cpp:1062 src/nikonmn.cpp:1086 src/nikonmn.cpp:1111
+#: src/nikonmn.cpp:1302 src/nikonmn.cpp:1326 src/nikonmn.cpp:1351
 #, fuzzy
 msgid "Lens ID number"
 msgstr "Sériové číslo fotoaparátu"
 
 # TODO: check
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
 msgid "Lens F-Stops"
 msgstr "F stops šošoviek"
 
 # TODO: check
-#: src/nikonmn.cpp:1063 src/nikonmn.cpp:1087 src/nikonmn.cpp:1112
+#: src/nikonmn.cpp:1303 src/nikonmn.cpp:1327 src/nikonmn.cpp:1352
 #, fuzzy
 msgid "Lens F-stops"
 msgstr "F stops šošoviek"
 
 # FUZZY exif-focallength
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 #, fuzzy
 msgid "Min Focal Length"
 msgstr "Minimálna ohnisková vzdialenosť"
 
 # FUZZY exif-focallength
-#: src/nikonmn.cpp:1064 src/nikonmn.cpp:1088 src/nikonmn.cpp:1113
-#: src/olympusmn.cpp:690
+#: src/nikonmn.cpp:1304 src/nikonmn.cpp:1328 src/nikonmn.cpp:1353
+#: src/olympusmn.cpp:751
 #, fuzzy
 msgid "Min focal length"
 msgstr "Minimálna ohnisková vzdialenosť"
 
 # FUZZY exif-focallength
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 #, fuzzy
 msgid "Max Focal Length"
 msgstr "Maximálna ohnisková vzdialenosť"
 
 # FUZZY exif-focallength
-#: src/nikonmn.cpp:1065 src/nikonmn.cpp:1089 src/nikonmn.cpp:1114
-#: src/olympusmn.cpp:691
+#: src/nikonmn.cpp:1305 src/nikonmn.cpp:1329 src/nikonmn.cpp:1354
+#: src/olympusmn.cpp:752
 #, fuzzy
 msgid "Max focal length"
 msgstr "Maximálna ohnisková vzdialenosť"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/nikonmn.cpp:1115
-#: src/olympusmn.cpp:688
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/nikonmn.cpp:1355
+#: src/olympusmn.cpp:749
 #, fuzzy
 msgid "Max Aperture At Min Focal"
 msgstr "maximálna clona pri minimálnom ohnisku"
 
-#: src/nikonmn.cpp:1066 src/nikonmn.cpp:1090 src/olympusmn.cpp:688
+#: src/nikonmn.cpp:1306 src/nikonmn.cpp:1330 src/olympusmn.cpp:749
 #, fuzzy
 msgid "Max aperture at min focal"
 msgstr "maximálna clona pri minimálnom ohnisku"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/nikonmn.cpp:1116
-#: src/olympusmn.cpp:689
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/nikonmn.cpp:1356
+#: src/olympusmn.cpp:750
 #, fuzzy
 msgid "Max Aperture At Max Focal"
 msgstr "maximálna clona pri maximálnom ohnisku"
 
-#: src/nikonmn.cpp:1067 src/nikonmn.cpp:1091 src/olympusmn.cpp:689
+#: src/nikonmn.cpp:1307 src/nikonmn.cpp:1331 src/olympusmn.cpp:750
 #, fuzzy
 msgid "Max aperture at max focal"
 msgstr "maximálna clona pri maximálnom ohnisku"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
 msgid "MCU Version"
 msgstr "Verzia ARM"
 
-#: src/nikonmn.cpp:1068 src/nikonmn.cpp:1092 src/nikonmn.cpp:1117
+#: src/nikonmn.cpp:1308 src/nikonmn.cpp:1332 src/nikonmn.cpp:1357
 #, fuzzy
 msgid "MCU version"
 msgstr "Verzia ARM"
 
-#: src/nikonmn.cpp:1070
+#: src/nikonmn.cpp:1310
 #, fuzzy
 msgid "Unknown Nikon Lens Data 1 Tag"
 msgstr "Neznáma značka Nikon1MakerNote"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
 msgid "Exit Pupil Position"
 msgstr "Poloha prepínača DEC"
 
-#: src/nikonmn.cpp:1081 src/nikonmn.cpp:1106
+#: src/nikonmn.cpp:1321 src/nikonmn.cpp:1346
 #, fuzzy
 msgid "Exit pupil position"
 msgstr "poloha prepínača DEC"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
 msgid "AF Aperture"
 msgstr "Clona"
 
-#: src/nikonmn.cpp:1082 src/nikonmn.cpp:1107
+#: src/nikonmn.cpp:1322 src/nikonmn.cpp:1347
 #, fuzzy
 msgid "AF aperture"
 msgstr "Clona"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
 msgid "Effective Max Aperture"
 msgstr "Max. clona"
 
-#: src/nikonmn.cpp:1093 src/nikonmn.cpp:1118
+#: src/nikonmn.cpp:1333 src/nikonmn.cpp:1358
 #, fuzzy
 msgid "Effective max aperture"
 msgstr "Max. clona"
 
-#: src/nikonmn.cpp:1095
+#: src/nikonmn.cpp:1335
 #, fuzzy
 msgid "Unknown Nikon Lens Data 2 Tag"
 msgstr "Neznáma značka Nikon1MakerNote"
 
-#: src/nikonmn.cpp:1115
+#: src/nikonmn.cpp:1355
 #, fuzzy
 msgid "Max aperture at min focal length"
 msgstr "maximálna clona pri minimálnom ohnisku"
 
-#: src/nikonmn.cpp:1116
+#: src/nikonmn.cpp:1356
 #, fuzzy
 msgid "Max aperture at max focal length"
 msgstr "maximálna clona pri maximálnom ohnisku"
 
-#: src/nikonmn.cpp:1120
+#: src/nikonmn.cpp:1360
 #, fuzzy
 msgid "Unknown Nikon Lens Data 3 Tag"
 msgstr "Neznáma značka Nikon1MakerNote"
 
-#: src/nikonmn.cpp:1299
+#: src/nikonmn.cpp:1540
 msgid "Closest subject"
 msgstr "Najbližší subjekt"
 
-#: src/nikonmn.cpp:1300
+#: src/nikonmn.cpp:1541
 msgid "Group dynamic-AF"
 msgstr "Skupinové dynamické AZ"
 
-#: src/nikonmn.cpp:1323 src/tags.cpp:225
+#: src/nikonmn.cpp:1564 src/tags.cpp:245
 msgid "none"
 msgstr "žiadne"
 
-#: src/nikonmn.cpp:1333
+#: src/nikonmn.cpp:1574
 msgid "used"
 msgstr "použité"
 
 # AF = automatické zaostrenie
-#: src/nikonmn.cpp:1359
+#: src/nikonmn.cpp:1600
 #, fuzzy
 msgid "All 11 Points"
 msgstr "body automatického zaostrenia"
 
-#: src/nikonmn.cpp:1374 src/nikonmn.cpp:1375 src/pentaxmn.cpp:469
+#: src/nikonmn.cpp:1615 src/nikonmn.cpp:1616 src/pentaxmn.cpp:533
+#: src/pentaxmn.cpp:537
 msgid "Single-frame"
 msgstr "jediný záber"
 
-#: src/olympusmn.cpp:68
+#: src/olympusmn.cpp:71
 msgid "Standard Quality (SQ)"
 msgstr "Štandardná kvalita (SQ)"
 
-#: src/olympusmn.cpp:69
+#: src/olympusmn.cpp:72
 msgid "High Quality (HQ)"
 msgstr "Vysoká kvalita (HQ)"
 
-#: src/olympusmn.cpp:70
+#: src/olympusmn.cpp:73
 msgid "Super High Quality (SHQ)"
 msgstr "Super vysoká kvalita (SHQ)"
 
-#: src/olympusmn.cpp:85
+#: src/olympusmn.cpp:88
 msgid "On (preset)"
 msgstr "Zapnuté (predvolené)"
 
-#: src/olympusmn.cpp:91
-msgid "Internal"
-msgstr "Vnútorný"
+#: src/olympusmn.cpp:95 src/pentaxmn.cpp:474
+msgid "Sport"
+msgstr "Šport"
+
+# exif-scenecapturetype-1
+#: src/olympusmn.cpp:97 src/olympusmn.cpp:104
+#, fuzzy
+msgid "Landscape+Portrait"
+msgstr "krajinka"
+
+#: src/olympusmn.cpp:100
+#, fuzzy
+msgid "Self Portrait"
+msgstr "Portrét"
+
+#: src/olympusmn.cpp:102
+#, fuzzy
+msgid "2 in 1"
+msgstr "zapnutý"
+
+#: src/olympusmn.cpp:105
+#, fuzzy
+msgid "Night+Portrait"
+msgstr "Nočný portrét"
+
+#: src/olympusmn.cpp:111 src/panasonicmn.cpp:120 src/pentaxmn.cpp:486
+msgid "Food"
+msgstr "jedlo"
+
+#: src/olympusmn.cpp:112
+#, fuzzy
+msgid "Documents"
+msgstr "ID dokumentu"
+
+#: src/olympusmn.cpp:114
+#, fuzzy
+msgid "Shoot & Select"
+msgstr "fotoefekt"
+
+#: src/olympusmn.cpp:115
+#, fuzzy
+msgid "Beach & Snow"
+msgstr "surfovanie & sneh"
+
+#: src/olympusmn.cpp:116
+#, fuzzy
+msgid "Self Portrait+Timer"
+msgstr "Samospúšť"
+
+#: src/olympusmn.cpp:117
+#, fuzzy
+msgid "Candle"
+msgstr "svetlo sviečky"
+
+#: src/olympusmn.cpp:118
+#, fuzzy
+msgid "Available Light"
+msgstr "nedostupné"
+
+#: src/olympusmn.cpp:119
+msgid "Behind Glass"
+msgstr ""
+
+#: src/olympusmn.cpp:120
+#, fuzzy
+msgid "My Mode"
+msgstr "Jednoduchý režim"
+
+#: src/olympusmn.cpp:121 src/panasonicmn.cpp:131 src/pentaxmn.cpp:483
+#: src/sonymn.cpp:127
+msgid "Pet"
+msgstr "Zvieratko"
+
+#: src/olympusmn.cpp:122
+#, fuzzy
+msgid "Underwater Wide1"
+msgstr "pod vodou"
+
+#: src/olympusmn.cpp:123
+#, fuzzy
+msgid "Underwater Macro"
+msgstr "pod vodou"
+
+#: src/olympusmn.cpp:124
+#, fuzzy
+msgid "Shoot & Select1"
+msgstr "fotoefekt"
+
+#: src/olympusmn.cpp:125
+#, fuzzy
+msgid "Shoot & Select2"
+msgstr "fotoefekt"
+
+#: src/olympusmn.cpp:127
+#, fuzzy
+msgid "Digital Image Stabilization"
+msgstr "Stabilizácia obrazu"
+
+#: src/olympusmn.cpp:128
+#, fuzzy
+msgid "Auction"
+msgstr "Auto"
+
+#: src/olympusmn.cpp:131
+#, fuzzy
+msgid "Underwater Wide2"
+msgstr "pod vodou"
+
+#: src/olympusmn.cpp:133
+msgid "Children"
+msgstr ""
+
+#: src/olympusmn.cpp:135
+#, fuzzy
+msgid "Nature Macro"
+msgstr "Prirodzená farba"
+
+#: src/olympusmn.cpp:136
+#, fuzzy
+msgid "Underwater Snapshot"
+msgstr "pod vodou"
+
+#: src/olympusmn.cpp:137
+#, fuzzy
+msgid "Shooting Guide"
+msgstr "Režim fotenia"
 
-#: src/olympusmn.cpp:93
+#: src/olympusmn.cpp:145
 msgid "Internal + External"
 msgstr "Interný + externý"
 
-#: src/olympusmn.cpp:118
+#: src/olympusmn.cpp:176
 msgid "Interlaced"
 msgstr "Prekladaný"
 
-#: src/olympusmn.cpp:119
+#: src/olympusmn.cpp:177
 msgid "Progressive"
 msgstr "Progresívne"
 
-#: src/olympusmn.cpp:127
+#: src/olympusmn.cpp:188
 #, fuzzy
 msgid "Thumbnail Image"
 msgstr "Náhľad"
 
-#: src/olympusmn.cpp:128
+#: src/olympusmn.cpp:189
 #, fuzzy
 msgid "Thumbnail image"
 msgstr "Náhľad"
 
-#: src/olympusmn.cpp:131
+#: src/olympusmn.cpp:192 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body Firmware Version"
+msgstr "Verzia firmvéru"
+
+#: src/olympusmn.cpp:193 src/olympusmn.cpp:744 src/olympusmn.cpp:1027
+#, fuzzy
+msgid "Body firmware version"
+msgstr "Verzia firmvéru"
+
+#: src/olympusmn.cpp:195
 msgid "Special Mode"
 msgstr "Špeciálny režim"
 
-#: src/olympusmn.cpp:132
+#: src/olympusmn.cpp:196
 msgid "Picture taking mode"
 msgstr "Režim fotenia"
 
-#: src/olympusmn.cpp:140
+#: src/olympusmn.cpp:204
 msgid "Black & White Mode"
 msgstr "Čiernobiely režim"
 
-#: src/olympusmn.cpp:141
+#: src/olympusmn.cpp:205
 msgid "Black and white mode"
 msgstr "Čiernobiely režim"
 
 # exif-digitalzoomratio
-#: src/olympusmn.cpp:144
+#: src/olympusmn.cpp:208
 msgid "Digital zoom ratio"
 msgstr "Pomer digitálneho priblíženia"
 
-#: src/olympusmn.cpp:146 src/olympusmn.cpp:683
+#: src/olympusmn.cpp:210 src/olympusmn.cpp:743
 msgid "Focal Plane Diagonal"
 msgstr "Diagonála ohniskovej roviny"
 
-#: src/olympusmn.cpp:147 src/olympusmn.cpp:683
+#: src/olympusmn.cpp:211 src/olympusmn.cpp:743
 msgid "Focal plane diagonal"
 msgstr "Diagonála ohniskovej roviny"
 
-#: src/olympusmn.cpp:149
+#: src/olympusmn.cpp:213
 msgid "Lens Distortion Parameters"
 msgstr "Parametre zakrivenia šošoviek"
 
-#: src/olympusmn.cpp:150
+#: src/olympusmn.cpp:214
 msgid "Lens distortion parameters"
 msgstr "Parametre zakrivenia šošoviek"
 
-#: src/olympusmn.cpp:153
-msgid "Software firmware version"
-msgstr "Verzia formvéru"
+#: src/olympusmn.cpp:216 src/olympusmn.cpp:740
+#, fuzzy
+msgid "Camera Type"
+msgstr "Zmačka fotoaparátu"
+
+#: src/olympusmn.cpp:217 src/olympusmn.cpp:740
+#, fuzzy
+msgid "Camera type"
+msgstr "Zmačka fotoaparátu"
 
-#: src/olympusmn.cpp:156
+#: src/olympusmn.cpp:220
 msgid "ASCII format data such as [PictureInfo]"
 msgstr "údaje vo formáte ASCII ako [PictureInfo]"
 
-#: src/olympusmn.cpp:158
+#: src/olympusmn.cpp:222
 msgid "Camera ID"
 msgstr "ID fotoaparátu"
 
-#: src/olympusmn.cpp:159
+#: src/olympusmn.cpp:223
 msgid "Camera ID data"
 msgstr "ID údaje fotoaparátu"
 
-#: src/olympusmn.cpp:178
+# exif-software
+#: src/olympusmn.cpp:231 src/olympusmn.cpp:232 src/properties.cpp:505
+#: src/sigmamn.cpp:119 src/sigmamn.cpp:120 src/tags.cpp:543
+msgid "Software"
+msgstr "softvér"
+
+#: src/olympusmn.cpp:234 src/panasonicmn.cpp:348 src/sonymn.cpp:314
+#, fuzzy
+msgid "Preview Image"
+msgstr "Zobraziť vložený obrázok"
+
+#: src/olympusmn.cpp:235 src/panasonicmn.cpp:348
+#, fuzzy
+msgid "Preview image"
+msgstr "Zobraziť vložený obrázok"
+
+#: src/olympusmn.cpp:237
 msgid "Pre Capture Frames"
 msgstr "Predzachytávať rámce"
 
-#: src/olympusmn.cpp:179
+#: src/olympusmn.cpp:238
 msgid "Pre-capture frames"
 msgstr "Predzachytávať rámce"
 
-#: src/olympusmn.cpp:184
+#: src/olympusmn.cpp:240
+#, fuzzy
+msgid "White Board"
+msgstr "Vyváženie bielej"
+
+#: src/olympusmn.cpp:241
+#, fuzzy
+msgid "White board"
+msgstr "Vyváženie bielej"
+
+#: src/olympusmn.cpp:243
 msgid "One Touch WB"
 msgstr "VB jedným dotykom"
 
-#: src/olympusmn.cpp:185
+#: src/olympusmn.cpp:244
 msgid "One touch white balance"
 msgstr "Vyváženie bielej jedným dotykom"
 
-#: src/olympusmn.cpp:194 src/olympusmn.cpp:681
-msgid "Serial number"
-msgstr "Sériové číslo"
+#: src/olympusmn.cpp:246 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White Balance Bracket"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
+
+#: src/olympusmn.cpp:247 src/olympusmn.cpp:678
+#, fuzzy
+msgid "White balance bracket"
+msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
+
+#: src/olympusmn.cpp:255 src/sigmamn.cpp:116 src/sigmamn.cpp:117
+msgid "Firmware"
+msgstr "Firmvér"
+
+#: src/olympusmn.cpp:256
+#, fuzzy
+msgid "Firmwarer"
+msgstr "Firmvér"
 
-#: src/olympusmn.cpp:199
+#: src/olympusmn.cpp:261
 msgid "Data Dump 1"
 msgstr "Výpis dát 1"
 
-#: src/olympusmn.cpp:200
+#: src/olympusmn.cpp:262
 msgid "Various camera settings 1"
 msgstr "Rôzne nastavenia fotoaparátu 1"
 
-#: src/olympusmn.cpp:202
+#: src/olympusmn.cpp:264
 msgid "Data Dump 2"
 msgstr "Výpis dát 2"
 
-#: src/olympusmn.cpp:203
+#: src/olympusmn.cpp:265
 msgid "Various camera settings 2"
 msgstr "Rôzne nastavenia fotoaparátu 2"
 
 # exif-shutterspeedvalue
-#: src/olympusmn.cpp:205
-msgid "Shutter Speed"
-msgstr "Rýchlosť uzávierky"
-
-# exif-shutterspeedvalue
-#: src/olympusmn.cpp:206
+#: src/olympusmn.cpp:268
 msgid "Shutter speed value"
 msgstr "Hodnota rýchlosti uzávierky"
 
-#: src/olympusmn.cpp:209
+#: src/olympusmn.cpp:271
 msgid "ISO speed value"
 msgstr "Hodnota ISO rýchlosti"
 
-#: src/olympusmn.cpp:212
+#: src/olympusmn.cpp:274
 msgid "Aperture value"
 msgstr "Hodnota clony"
 
-#: src/olympusmn.cpp:215
+#: src/olympusmn.cpp:277
 msgid "Brightness value"
 msgstr "Hodnota jasu"
 
-#: src/olympusmn.cpp:223
+#: src/olympusmn.cpp:285
 msgid "Bracket"
 msgstr "Viacnásobné snímky"
 
-#: src/olympusmn.cpp:224
+#: src/olympusmn.cpp:286
 msgid "Exposure compensation value"
 msgstr "Hodnota kompenzácie expozície"
 
-#: src/olympusmn.cpp:226 src/olympusmn.cpp:931
+#: src/olympusmn.cpp:288 src/olympusmn.cpp:1015
 msgid "Sensor Temperature"
 msgstr "Teplota snímača"
 
-#: src/olympusmn.cpp:227 src/olympusmn.cpp:931
+#: src/olympusmn.cpp:289 src/olympusmn.cpp:1015
 msgid "Sensor temperature"
 msgstr "Teplota snímača"
 
-#: src/olympusmn.cpp:229
+#: src/olympusmn.cpp:291
 msgid "Lens Temperature"
 msgstr "Teplota šošoviek"
 
-#: src/olympusmn.cpp:230
+#: src/olympusmn.cpp:292
 msgid "Lens temperature"
 msgstr "Teplota šošoviek"
 
-#: src/olympusmn.cpp:244
+#: src/olympusmn.cpp:294
+#, fuzzy
+msgid "Light Condition"
+msgstr "Silné nasýtenie"
+
+#: src/olympusmn.cpp:295
+#, fuzzy
+msgid "Light condition"
+msgstr "Silné nasýtenie"
+
+#: src/olympusmn.cpp:297
+#, fuzzy
+msgid "Focus Range"
+msgstr "Rozsah zaostrenia"
+
+#: src/olympusmn.cpp:298
+#, fuzzy
+msgid "Focus range"
+msgstr "Rozsah zaostrenia"
+
+#: src/olympusmn.cpp:306
 msgid "Zoom"
 msgstr "Priblíženie"
 
-#: src/olympusmn.cpp:245 src/olympusmn.cpp:919
+#: src/olympusmn.cpp:307 src/olympusmn.cpp:1003
 msgid "Zoom step count"
 msgstr "Počet krokov priblíženia"
 
-#: src/olympusmn.cpp:247
+#: src/olympusmn.cpp:309
 msgid "Macro Focus"
 msgstr "Priblíženie makro"
 
-#: src/olympusmn.cpp:248
+#: src/olympusmn.cpp:310
 msgid "Macro focus step count"
 msgstr "Počet krokov makro priblíženia"
 
-#: src/olympusmn.cpp:250 src/olympusmn.cpp:331
+#: src/olympusmn.cpp:312 src/olympusmn.cpp:393
 msgid "Sharpness Factor"
 msgstr "Koeficient ostrosti"
 
-#: src/olympusmn.cpp:251 src/olympusmn.cpp:332
+#: src/olympusmn.cpp:313 src/olympusmn.cpp:394
 msgid "Sharpness factor"
 msgstr "Koeficient ostrosti"
 
-#: src/olympusmn.cpp:253
+#: src/olympusmn.cpp:315
 msgid "Flash Charge Level"
 msgstr "Úroveň nabitia blesku"
 
-#: src/olympusmn.cpp:254
+#: src/olympusmn.cpp:316
 msgid "Flash charge level"
 msgstr "Úroveň nabitia blesku"
 
-#: src/olympusmn.cpp:256 src/olympusmn.cpp:881
+#: src/olympusmn.cpp:318 src/olympusmn.cpp:962
 msgid "Color Matrix"
 msgstr "Matica farieb"
 
-#: src/olympusmn.cpp:257 src/olympusmn.cpp:881
+#: src/olympusmn.cpp:319 src/olympusmn.cpp:962
 msgid "Color matrix"
 msgstr "Matica farieb"
 
-#: src/olympusmn.cpp:259
+#: src/olympusmn.cpp:321
 msgid "BlackLevel"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:260 src/olympusmn.cpp:886
+#: src/olympusmn.cpp:322 src/olympusmn.cpp:967
 msgid "Black level"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:269
+#: src/olympusmn.cpp:331
 msgid "White balance mode"
 msgstr "Režim vyváženia bielej"
 
-#: src/olympusmn.cpp:274 src/panasonicmn.cpp:336
+#: src/olympusmn.cpp:336 src/panasonicmn.cpp:342
 msgid "Red Balance"
 msgstr "Vyváženie červenej"
 
-#: src/olympusmn.cpp:275
+#: src/olympusmn.cpp:337 src/pentaxmn.cpp:938
 msgid "Red balance"
 msgstr "Vyváženie červenej"
 
-#: src/olympusmn.cpp:277 src/panasonicmn.cpp:337
+#: src/olympusmn.cpp:339 src/panasonicmn.cpp:343
 msgid "Blue Balance"
 msgstr "Vyváženie modrej"
 
-#: src/olympusmn.cpp:278 src/panasonicmn.cpp:337
+#: src/olympusmn.cpp:340 src/panasonicmn.cpp:343 src/pentaxmn.cpp:935
 msgid "Blue balance"
 msgstr "Vyváženie modrej"
 
-#: src/olympusmn.cpp:283
+#: src/olympusmn.cpp:342
+#, fuzzy
+msgid "Color Matrix Number"
+msgstr "Matica farieb 1"
+
+#: src/olympusmn.cpp:343
+#, fuzzy
+msgid "Color matrix mumber"
+msgstr "Matica farieb 2"
+
+#: src/olympusmn.cpp:345
 msgid "Serial Number 2"
 msgstr "Sériové číslo 1"
 
-#: src/olympusmn.cpp:284
+#: src/olympusmn.cpp:346
 msgid "Serial number 2"
 msgstr "Sériové číslo 2"
 
-#: src/olympusmn.cpp:311 src/olympusmn.cpp:621 src/pentaxmn.cpp:932
-#: src/pentaxmn.cpp:933
+#: src/olympusmn.cpp:373 src/olympusmn.cpp:671 src/pentaxmn.cpp:1028
+#: src/pentaxmn.cpp:1029
 msgid "Flash exposure compensation"
 msgstr "Kompenzácia expozície blesku"
 
-#: src/olympusmn.cpp:319 src/olympusmn.cpp:927
+#: src/olympusmn.cpp:381 src/olympusmn.cpp:1011
 msgid "External Flash Bounce"
 msgstr "Odrazenie externého blesku"
 
-#: src/olympusmn.cpp:320 src/olympusmn.cpp:927
+#: src/olympusmn.cpp:382 src/olympusmn.cpp:1011
 msgid "External flash bounce"
 msgstr "Odrazenie externého blesku"
 
-#: src/olympusmn.cpp:322 src/olympusmn.cpp:928
+#: src/olympusmn.cpp:384 src/olympusmn.cpp:1012
 msgid "External Flash Zoom"
 msgstr "Priblíženie externého blesku"
 
-#: src/olympusmn.cpp:323 src/olympusmn.cpp:928
+#: src/olympusmn.cpp:385 src/olympusmn.cpp:1012
 msgid "External flash zoom"
 msgstr "Priblíženie externého blesku"
 
-#: src/olympusmn.cpp:325
+#: src/olympusmn.cpp:387
 msgid "External Flash Mode"
 msgstr "Režim externého blesku"
 
-#: src/olympusmn.cpp:326
+#: src/olympusmn.cpp:388
 msgid "External flash mode"
 msgstr "Režim externého blesku"
 
-#: src/olympusmn.cpp:334
+#: src/olympusmn.cpp:396
 msgid "Color Control"
 msgstr "Riadenie farieb"
 
-#: src/olympusmn.cpp:335
+#: src/olympusmn.cpp:397
 msgid "Color control"
 msgstr "Riadenie farieb"
 
-#: src/olympusmn.cpp:337
+#: src/olympusmn.cpp:399
 msgid "ValidBits"
 msgstr "Platné bity"
 
-#: src/olympusmn.cpp:338 src/olympusmn.cpp:888
+#: src/olympusmn.cpp:400 src/olympusmn.cpp:969
 msgid "Valid bits"
 msgstr "Platné bity"
 
-#: src/olympusmn.cpp:340
+#: src/olympusmn.cpp:402
+#, fuzzy
 msgid "CoringFilter"
-msgstr ""
+msgstr "Farebný filter"
 
-#: src/olympusmn.cpp:341 src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:403 src/olympusmn.cpp:965 src/olympusmn.cpp:1067
+#, fuzzy
 msgid "Coring filter"
-msgstr ""
+msgstr "Farebný filter"
 
-#: src/olympusmn.cpp:361
+#: src/olympusmn.cpp:423
 msgid "Compression Ratio"
 msgstr "Kompresný pomer"
 
-#: src/olympusmn.cpp:362
+#: src/olympusmn.cpp:424
 msgid "Compression ratio"
 msgstr "Kompresný pomer"
 
-#: src/olympusmn.cpp:365
+#: src/olympusmn.cpp:427
 msgid "Preview image embedded"
 msgstr "Zobraziť vložený obrázok"
 
-#: src/olympusmn.cpp:368
+#: src/olympusmn.cpp:430
 msgid "Offset of the preview image"
 msgstr "Posunutie náhľadu"
 
-#: src/olympusmn.cpp:371
+#: src/olympusmn.cpp:433
 msgid "Size of the preview image"
 msgstr "Veľkosť náhľadu"
 
-#: src/olympusmn.cpp:373
+#: src/olympusmn.cpp:435
 msgid "CCD Scan Mode"
 msgstr "Režim CCD snímania"
 
-#: src/olympusmn.cpp:374
+#: src/olympusmn.cpp:436
 msgid "CCD scan mode"
 msgstr "Režim CCD snímania"
 
-#: src/olympusmn.cpp:379
+#: src/olympusmn.cpp:441
 msgid "Infinity Lens Step"
 msgstr "Nekonečný krok šošoviek"
 
-#: src/olympusmn.cpp:380
+#: src/olympusmn.cpp:442
 msgid "Infinity lens step"
 msgstr "Nekonečný krok šošoviek"
 
-#: src/olympusmn.cpp:382
+#: src/olympusmn.cpp:444
 msgid "Near Lens Step"
 msgstr "Blízky krok šošoviek"
 
-#: src/olympusmn.cpp:383
+#: src/olympusmn.cpp:445
 msgid "Near lens step"
 msgstr "Blízky krok šošoviek"
 
-#: src/olympusmn.cpp:385
+#: src/olympusmn.cpp:447
 msgid "Equipment Info"
 msgstr "Info o vybavení"
 
-#: src/olympusmn.cpp:386
+#: src/olympusmn.cpp:448
 #, fuzzy
 msgid "Camera equipment sub-IFD"
 msgstr "Informácie o vybavení fotoaparátu"
 
-#: src/olympusmn.cpp:389
+#: src/olympusmn.cpp:451
 #, fuzzy
 msgid "Camera Settings sub-IFD"
 msgstr "Nastavenie fotoaparátu (7D)"
 
-#: src/olympusmn.cpp:391
+#: src/olympusmn.cpp:453
 msgid "Raw Development"
 msgstr "Nespracovaný vývoj"
 
-#: src/olympusmn.cpp:392
+#: src/olympusmn.cpp:454
 #, fuzzy
 msgid "Raw development sub-IFD"
 msgstr "Nespracovaný vývoj"
 
-#: src/olympusmn.cpp:394
+#: src/olympusmn.cpp:456
 #, fuzzy
 msgid "Raw Development 2"
 msgstr "Nespracovaný vývoj"
 
-#: src/olympusmn.cpp:395
+#: src/olympusmn.cpp:457
 #, fuzzy
 msgid "Raw development 2 sub-IFD"
 msgstr "Nespracovaný vývoj"
 
-#: src/olympusmn.cpp:398
+#: src/olympusmn.cpp:460
 #, fuzzy
 msgid "Image processing sub-IFD"
 msgstr "Spracovanie obrazu"
 
-#: src/olympusmn.cpp:400
+#: src/olympusmn.cpp:462
 msgid "Focus Info"
 msgstr "Info o zaostrení"
 
-#: src/olympusmn.cpp:401
+#: src/olympusmn.cpp:463
 #, fuzzy
 msgid "Focus sub-IFD"
 msgstr "Info o zaostrení"
 
-#: src/olympusmn.cpp:403
+#: src/olympusmn.cpp:465
 msgid "Raw Info"
 msgstr "Nespracované info"
 
-#: src/olympusmn.cpp:404
+#: src/olympusmn.cpp:466
 #, fuzzy
 msgid "Raw sub-IFD"
 msgstr "Sub-IFD"
 
-#: src/olympusmn.cpp:409
+#: src/olympusmn.cpp:470
 msgid "Unknown OlympusMakerNote tag"
 msgstr "Neznáma značka OlympusMakerNote"
 
-#: src/olympusmn.cpp:424
+#: src/olympusmn.cpp:486
 #, fuzzy
 msgid "Program-shift"
 msgstr "Posunutie programu"
 
-#: src/olympusmn.cpp:429
+#: src/olympusmn.cpp:491
 #, fuzzy
 msgid "Center-weighted average"
 msgstr "Stredovo vážený priemer"
 
-#: src/olympusmn.cpp:431
+#: src/olympusmn.cpp:493
 msgid "ESP"
 msgstr ""
 
 # exif-meteringmode-5
-#: src/olympusmn.cpp:432
+#: src/olympusmn.cpp:494
 #, fuzzy
 msgid "Pattern+AF"
 msgstr "vzorka"
 
-#: src/olympusmn.cpp:433
+#: src/olympusmn.cpp:495
+#, fuzzy
 msgid "Spot+Highlight control"
-msgstr ""
+msgstr "Riadenie farieb"
 
-#: src/olympusmn.cpp:434
+#: src/olympusmn.cpp:496
 #, fuzzy
 msgid "Spot+Shadow control"
 msgstr "Riadenie farieb"
 
-#: src/olympusmn.cpp:441 src/olympusmn.cpp:532
-#, fuzzy
-msgid "Super Macro"
-msgstr "super makro"
-
-#: src/olympusmn.cpp:446
+#: src/olympusmn.cpp:508 src/olympusmn.cpp:1369
 #, fuzzy
 msgid "Single AF"
 msgstr "Jednotlivý"
 
-#: src/olympusmn.cpp:447
+#: src/olympusmn.cpp:509 src/olympusmn.cpp:1370
 msgid "Sequential shooting AF"
 msgstr ""
 
-#: src/olympusmn.cpp:449
+#: src/olympusmn.cpp:511 src/olympusmn.cpp:1372 src/sonymn.cpp:187
 #, fuzzy
 msgid "Multi AF"
 msgstr "Viacbodový"
 
-#: src/olympusmn.cpp:450
-msgid "MF"
-msgstr ""
-
 # AF = automatické zaostrenie
-#: src/olympusmn.cpp:455
+#: src/olympusmn.cpp:517
 #, fuzzy
 msgid "AF Not Used"
 msgstr "Použitý bod automatického zaostrenia"
 
 # AF = automatické zaostrenie
-#: src/olympusmn.cpp:456
+#: src/olympusmn.cpp:518
 #, fuzzy
 msgid "AF Used"
 msgstr "Použitý bod automatického zaostrenia"
 
-#: src/olympusmn.cpp:461
+#: src/olympusmn.cpp:523
 #, fuzzy
 msgid "Not Ready"
 msgstr "Nepoužité"
 
-#: src/olympusmn.cpp:462
+#: src/olympusmn.cpp:524
 #, fuzzy
 msgid "Ready"
 msgstr "Červené oči"
 
-#: src/olympusmn.cpp:469
+#: src/olympusmn.cpp:531
+#, fuzzy
 msgid "Fill-in"
-msgstr ""
+msgstr "Názov súboru"
 
-#: src/olympusmn.cpp:471
+#: src/olympusmn.cpp:533
 #, fuzzy
 msgid "Slow-sync"
 msgstr "Pomalá synchronizácia"
 
 # exif-lightsource-2
-#: src/olympusmn.cpp:472
+#: src/olympusmn.cpp:534
 #, fuzzy
 msgid "Forced On"
 msgstr "fluorescencia"
 
-#: src/olympusmn.cpp:473
+#: src/olympusmn.cpp:535
 msgid "2nd Curtain"
 msgstr ""
 
-#: src/olympusmn.cpp:479
-msgid "7500K (Fine Weather with Shade)"
+#: src/olympusmn.cpp:541
+msgid "Channel 1, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:542
+msgid "Channel 2, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:543
+msgid "Channel 3, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:544
+msgid "Channel 4, Low"
+msgstr ""
+
+#: src/olympusmn.cpp:545
+msgid "Channel 1, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:546
+msgid "Channel 2, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:547
+msgid "Channel 3, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:548
+msgid "Channel 4, Mid"
+msgstr ""
+
+#: src/olympusmn.cpp:549
+msgid "Channel 1, High"
+msgstr ""
+
+#: src/olympusmn.cpp:550
+msgid "Channel 2, High"
+msgstr ""
+
+#: src/olympusmn.cpp:551
+msgid "Channel 3, High"
+msgstr ""
+
+#: src/olympusmn.cpp:552
+msgid "Channel 4, High"
 msgstr ""
 
-#: src/olympusmn.cpp:480
+# exif-lightsource-9
+#: src/olympusmn.cpp:566
+#, fuzzy
+msgid "7500K (Fine Weather with Shade)"
+msgstr "pekné počasie"
+
+#: src/olympusmn.cpp:567
 #, fuzzy
 msgid "6000K (Cloudy)"
 msgstr "Auto (oblačno)"
 
 # exif-lightsource-9
-#: src/olympusmn.cpp:481
+#: src/olympusmn.cpp:568
 #, fuzzy
 msgid "5300K (Fine Weather)"
 msgstr "pekné počasie"
 
-#: src/olympusmn.cpp:482
+#: src/olympusmn.cpp:569
 msgid "3000K (Tungsten light)"
 msgstr ""
 
-#: src/olympusmn.cpp:483 src/olympusmn.cpp:487
+#: src/olympusmn.cpp:570 src/olympusmn.cpp:574
 msgid "3600K (Tungsten light-like)"
 msgstr ""
 
 # exif-lightsource-12
-#: src/olympusmn.cpp:484
+#: src/olympusmn.cpp:571
 #, fuzzy
 msgid "6600K (Daylight fluorescent)"
 msgstr "denné svetlo, fluorescenčné"
 
-#: src/olympusmn.cpp:485
+#: src/olympusmn.cpp:572
 #, fuzzy
 msgid "4500K (Neutral white fluorescent)"
 msgstr "Auto (biely deň, fluorescenčné)"
 
-#: src/olympusmn.cpp:486
+#: src/olympusmn.cpp:573
 #, fuzzy
 msgid "4000K (Cool white fluorescent)"
 msgstr "chladné biele fluorescenčné (W 3900 - 4500K)"
 
-#: src/olympusmn.cpp:488
+#: src/olympusmn.cpp:575
 #, fuzzy
 msgid "Custom WB 1"
 msgstr "Vlastný 1"
 
-#: src/olympusmn.cpp:489
+#: src/olympusmn.cpp:576
 #, fuzzy
 msgid "Custom WB 2"
 msgstr "Vlastný 2"
 
-#: src/olympusmn.cpp:490
+#: src/olympusmn.cpp:577
 #, fuzzy
 msgid "Custom WB 3"
 msgstr "vlastné 3"
 
-#: src/olympusmn.cpp:491
+#: src/olympusmn.cpp:578
 #, fuzzy
 msgid "Custom WB 4"
 msgstr "Vlastný 1"
 
-#: src/olympusmn.cpp:492
+#: src/olympusmn.cpp:579
 #, fuzzy
 msgid "Custom WB 5400K"
 msgstr "Vlastný 1"
 
-#: src/olympusmn.cpp:493
+#: src/olympusmn.cpp:580
 #, fuzzy
 msgid "Custom WB 2900K"
 msgstr "Vlastný 2"
 
-#: src/olympusmn.cpp:494
+#: src/olympusmn.cpp:581
 #, fuzzy
 msgid "Custom WB 8000K"
 msgstr "Vlastný 1"
 
-#: src/olympusmn.cpp:500
+#: src/olympusmn.cpp:587
+#, fuzzy
 msgid "CM1 (Red Enhance)"
-msgstr ""
+msgstr "Vyváženie modrej"
 
-#: src/olympusmn.cpp:501
+#: src/olympusmn.cpp:588
+#, fuzzy
 msgid "CM2 (Green Enhance)"
-msgstr ""
+msgstr "Vyváženie modrej"
 
-#: src/olympusmn.cpp:502
+#: src/olympusmn.cpp:589
 #, fuzzy
 msgid "CM3 (Blue Enhance)"
 msgstr "Vyváženie modrej"
 
-#: src/olympusmn.cpp:503
+#: src/olympusmn.cpp:590
 msgid "CM4 (Skin Tones)"
 msgstr ""
 
-#: src/olympusmn.cpp:510 src/olympusmn.cpp:715 src/olympusmn.cpp:780
+#: src/olympusmn.cpp:597 src/olympusmn.cpp:776 src/olympusmn.cpp:841
 msgid "Pro Photo RGB"
 msgstr ""
 
-#: src/olympusmn.cpp:517 src/pentaxmn.cpp:415
-msgid "Sport"
-msgstr "Šport"
-
-# exif-scenecapturetype-1
-#: src/olympusmn.cpp:519 src/olympusmn.cpp:526
-#, fuzzy
-msgid "Landscape+Portrait"
-msgstr "krajinka"
-
-#: src/olympusmn.cpp:522
-#, fuzzy
-msgid "Self Portrait"
-msgstr "Portrét"
-
-#: src/olympusmn.cpp:524
-msgid "2 in 1"
-msgstr ""
-
-#: src/olympusmn.cpp:527
-#, fuzzy
-msgid "Night+Portrait"
-msgstr "Nočný portrét"
-
-#: src/olympusmn.cpp:533 src/panasonicmn.cpp:116
-msgid "Food"
-msgstr "jedlo"
-
-#: src/olympusmn.cpp:534
-#, fuzzy
-msgid "Documents"
-msgstr "ID dokumentu"
-
-#: src/olympusmn.cpp:536
-#, fuzzy
-msgid "Shoot & Select"
-msgstr "fotoefekt"
-
-#: src/olympusmn.cpp:537
-#, fuzzy
-msgid "Beach & Snow"
-msgstr "surfovanie & sneh"
-
-#: src/olympusmn.cpp:538
-#, fuzzy
-msgid "Self Portrait+Timer"
-msgstr "Samospúšť"
-
-#: src/olympusmn.cpp:539
-#, fuzzy
-msgid "Candle"
-msgstr "svetlo sviečky"
-
-#: src/olympusmn.cpp:540
-#, fuzzy
-msgid "Available Light"
-msgstr "nedostupné"
-
-#: src/olympusmn.cpp:541
-msgid "Behind Glass"
-msgstr ""
-
-#: src/olympusmn.cpp:542
-#, fuzzy
-msgid "My Mode"
-msgstr "Jednoduchý režim"
-
-#: src/olympusmn.cpp:543 src/panasonicmn.cpp:127 src/pentaxmn.cpp:424
-msgid "Pet"
-msgstr "Zvieratko"
-
-#: src/olympusmn.cpp:544
-#, fuzzy
-msgid "Underwater Wide1"
-msgstr "pod vodou"
-
-#: src/olympusmn.cpp:545
-#, fuzzy
-msgid "Underwater Macro"
-msgstr "pod vodou"
-
-#: src/olympusmn.cpp:546
-msgid "Shoot & Select1"
-msgstr ""
-
-#: src/olympusmn.cpp:547
-msgid "Shoot & Select2"
-msgstr ""
-
-#: src/olympusmn.cpp:549
-#, fuzzy
-msgid "Digital Image Stabilization"
-msgstr "Stabilizácia obrazu"
-
-#: src/olympusmn.cpp:550
-#, fuzzy
-msgid "Auction"
-msgstr "Auto"
-
-#: src/olympusmn.cpp:553
-#, fuzzy
-msgid "Underwater Wide2"
-msgstr "pod vodou"
-
-#: src/olympusmn.cpp:555
-msgid "Children"
-msgstr ""
-
-#: src/olympusmn.cpp:557
-#, fuzzy
-msgid "Nature Macro"
-msgstr "Prirodzená farba"
-
-#: src/olympusmn.cpp:558
-#, fuzzy
-msgid "Underwater Snapshot"
-msgstr "pod vodou"
-
-#: src/olympusmn.cpp:559
-#, fuzzy
-msgid "Shooting Guide"
-msgstr "Režim fotenia"
-
-#: src/olympusmn.cpp:565 src/olympusmn.cpp:643
+#: src/olympusmn.cpp:603 src/olympusmn.cpp:697
 #, fuzzy
 msgid "Noise Filter"
 msgstr "Filter"
 
-#: src/olympusmn.cpp:566
+#: src/olympusmn.cpp:604
+#, fuzzy
 msgid "Noise Filter (ISO Boost)"
-msgstr ""
+msgstr "Filter"
 
-#: src/olympusmn.cpp:573 src/olympusmn.cpp:793
+#: src/olympusmn.cpp:612 src/olympusmn.cpp:854
 #, fuzzy
 msgid "Muted"
 msgstr "použité"
 
-#: src/olympusmn.cpp:575 src/olympusmn.cpp:794
+#: src/olympusmn.cpp:614 src/olympusmn.cpp:855
 #, fuzzy
 msgid "Monotone"
 msgstr "Farebný tón"
 
-#: src/olympusmn.cpp:601
+#: src/olympusmn.cpp:640
 msgid "SQ"
 msgstr ""
 
-#: src/olympusmn.cpp:602
+#: src/olympusmn.cpp:641
 msgid "HQ"
 msgstr ""
 
-#: src/olympusmn.cpp:603
+#: src/olympusmn.cpp:642
 msgid "SHQ"
 msgstr ""
 
-#: src/olympusmn.cpp:608
+#: src/olympusmn.cpp:649 src/panasonicmn.cpp:86
+msgid "On, Mode 1"
+msgstr "zapnutý, režim 1"
+
+#: src/olympusmn.cpp:650 src/panasonicmn.cpp:88
+msgid "On, Mode 2"
+msgstr "zapnutý, režim 2"
+
+#: src/olympusmn.cpp:651
+#, fuzzy
+msgid "On, Mode 3"
+msgstr "zapnutý, režim 1"
+
+#: src/olympusmn.cpp:655
 #, fuzzy
 msgid "Camera Settings Version"
 msgstr "Informácie o nastaveniach fotoaparátu"
 
-#: src/olympusmn.cpp:608
+#: src/olympusmn.cpp:655
 #, fuzzy
 msgid "Camera settings version"
 msgstr "Informácie o nastaveniach fotoaparátu"
 
-#: src/olympusmn.cpp:609
+#: src/olympusmn.cpp:656
 #, fuzzy
 msgid "PreviewImage Valid"
 msgstr "Zobraziť vložený obrázok"
 
-#: src/olympusmn.cpp:609
+#: src/olympusmn.cpp:656
 #, fuzzy
 msgid "Preview image valid"
 msgstr "Zobraziť vložený obrázok"
 
-#: src/olympusmn.cpp:610
+#: src/olympusmn.cpp:657
 #, fuzzy
 msgid "PreviewImage Start"
 msgstr "Dáta náhľadu"
 
-#: src/olympusmn.cpp:610
+#: src/olympusmn.cpp:657
 #, fuzzy
 msgid "Preview image start"
 msgstr "Zobraziť vložený obrázok"
 
-#: src/olympusmn.cpp:611
+#: src/olympusmn.cpp:658
 #, fuzzy
 msgid "PreviewImage Length"
 msgstr "Dĺžka obrázka"
 
-#: src/olympusmn.cpp:611
+#: src/olympusmn.cpp:658
 #, fuzzy
 msgid "Preview image length"
 msgstr "Zobraziť vložený obrázok"
 
-# AE - automatická expozícia
-#: src/olympusmn.cpp:613
+#: src/olympusmn.cpp:660
 #, fuzzy
-msgid "AE Lock"
-msgstr "zámok AE"
+msgid "Auto exposure lock"
+msgstr "Automatická expozícia"
+
+#: src/olympusmn.cpp:662
+#, fuzzy
+msgid "Exposure Shift"
+msgstr "Čas expozície"
 
-#: src/olympusmn.cpp:613
+#: src/olympusmn.cpp:662
 #, fuzzy
-msgid "Auto exposure lock"
-msgstr "Automatická expozícia"
+msgid "Exposure shift"
+msgstr "Čas expozície"
 
-#: src/olympusmn.cpp:617
+#: src/olympusmn.cpp:665
 #, fuzzy
 msgid "Focus Process"
 msgstr "režim zaostrenia"
 
-#: src/olympusmn.cpp:617
+#: src/olympusmn.cpp:665
 #, fuzzy
 msgid "Focus process"
 msgstr "Vlastné spracovanie"
 
-#: src/olympusmn.cpp:618
+#: src/olympusmn.cpp:666
 #, fuzzy
 msgid "AF Search"
 msgstr "Moje vyhľadávania"
 
-#: src/olympusmn.cpp:618
+#: src/olympusmn.cpp:666
 #, fuzzy
 msgid "AF search"
 msgstr "Moje vyhľadávania"
 
-#: src/olympusmn.cpp:619
+#: src/olympusmn.cpp:667
 #, fuzzy
 msgid "AF Areas"
 msgstr "rozsah zaostrenia"
 
-#: src/olympusmn.cpp:619
+#: src/olympusmn.cpp:667
 #, fuzzy
 msgid "AF areas"
 msgstr "Rozsah zaostrenia"
 
-#: src/olympusmn.cpp:622
+#: src/olympusmn.cpp:668
+#, fuzzy
+msgid "AFPointSelected"
+msgstr "Nebol vybraný bod automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF Fine Tune Adjust"
+msgstr "Použitý bod automatického zaostrenia"
+
+# AF = automatické zaostrenie
+#: src/olympusmn.cpp:669
+#, fuzzy
+msgid "AF fine tune adjust"
+msgstr "Použitý bod automatického zaostrenia"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash Remote Control"
+msgstr "Diaľkové ovládanie?"
+
+#: src/olympusmn.cpp:672
+#, fuzzy
+msgid "Flash remote control"
+msgstr "Diaľkové ovládanie?"
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash Control Mode"
+msgstr "Režim blesku"
+
+#: src/olympusmn.cpp:673
+#, fuzzy
+msgid "Flash control mode"
+msgstr "Režim blesku"
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash Intensity"
+msgstr "Aktivita blesku"
+
+#: src/olympusmn.cpp:674
+#, fuzzy
+msgid "Flash intensity"
+msgstr "Aktivita blesku"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual Flash Strength"
+msgstr "Sila blesku"
+
+#: src/olympusmn.cpp:675
+#, fuzzy
+msgid "Manual flash strength"
+msgstr "Ručné riadenie blesku"
+
+#: src/olympusmn.cpp:676 src/sonymn.cpp:429
 #, fuzzy
 msgid "White Balance 2"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:622
+#: src/olympusmn.cpp:676 src/sonymn.cpp:430
 #, fuzzy
 msgid "White balance 2"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:623
+#: src/olympusmn.cpp:677
 #, fuzzy
 msgid "White Balance Temperature"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/olympusmn.cpp:623
+#: src/olympusmn.cpp:677
 #, fuzzy
 msgid "White balance temperature"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/olympusmn.cpp:624
-#, fuzzy
-msgid "White Balance Bracket"
-msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
-
-#: src/olympusmn.cpp:624
-#, fuzzy
-msgid "White balance bracket"
-msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
-
-#: src/olympusmn.cpp:625
+#: src/olympusmn.cpp:679
 #, fuzzy
 msgid "Custom Saturation"
 msgstr "Modrá sýtosť"
 
-#: src/olympusmn.cpp:625
+#: src/olympusmn.cpp:679
 #, fuzzy
 msgid "Custom saturation"
 msgstr "Slabé nasýtenie"
 
-#: src/olympusmn.cpp:626
+#: src/olympusmn.cpp:680
 #, fuzzy
 msgid "Modified Saturation"
 msgstr "Červená sýtosť"
 
-#: src/olympusmn.cpp:626
+#: src/olympusmn.cpp:680
 #, fuzzy
 msgid "Modified saturation"
 msgstr "Červená sýtosť"
 
-#: src/olympusmn.cpp:627 src/olympusmn.cpp:996
+#: src/olympusmn.cpp:681 src/olympusmn.cpp:1080
 #, fuzzy
 msgid "Contrast Setting"
 msgstr "Nastavenie kontrastu"
 
-#: src/olympusmn.cpp:628 src/olympusmn.cpp:997
+#: src/olympusmn.cpp:682 src/olympusmn.cpp:1081
 #, fuzzy
 msgid "Sharpness Setting"
 msgstr "Nastavenie zaostrenia"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
 #, fuzzy
 msgid "Distortion Correction"
 msgstr "Bez korekcie"
 
-#: src/olympusmn.cpp:632 src/olympusmn.cpp:894
+#: src/olympusmn.cpp:686 src/olympusmn.cpp:975
 #, fuzzy
 msgid "Distortion correction"
 msgstr "Bez korekcie"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
 #, fuzzy
 msgid "Shading Compensation"
 msgstr "Kompenzácia tónu"
 
-#: src/olympusmn.cpp:633 src/olympusmn.cpp:895
+#: src/olympusmn.cpp:687 src/olympusmn.cpp:976
 #, fuzzy
 msgid "Shading compensation"
 msgstr "Kompenzácia tónu"
 
-#: src/olympusmn.cpp:634
+#: src/olympusmn.cpp:688
 #, fuzzy
 msgid "Compression Factor"
 msgstr "Kompresný pomer"
 
-#: src/olympusmn.cpp:634
+#: src/olympusmn.cpp:688
 #, fuzzy
 msgid "Compression factor"
 msgstr "Kompresný pomer"
 
-#: src/olympusmn.cpp:635 src/olympusmn.cpp:836
+#: src/olympusmn.cpp:689 src/olympusmn.cpp:897
 #, fuzzy
 msgid "Gradation"
 msgstr "Trvanie"
 
-#: src/olympusmn.cpp:636 src/olympusmn.cpp:830 src/pentaxmn.cpp:898
-#: src/pentaxmn.cpp:899
+#: src/olympusmn.cpp:690 src/olympusmn.cpp:891 src/pentaxmn.cpp:988
+#: src/pentaxmn.cpp:989
 msgid "Picture mode"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:637
+#: src/olympusmn.cpp:691
 #, fuzzy
 msgid "Picture Mode Saturation"
 msgstr "Nastavenie režimu obrázka"
 
-#: src/olympusmn.cpp:637 src/olympusmn.cpp:831
+#: src/olympusmn.cpp:691 src/olympusmn.cpp:892
 #, fuzzy
 msgid "Picture mode saturation"
 msgstr "Nastavenie režimu obrázka"
 
-#: src/olympusmn.cpp:638
+#: src/olympusmn.cpp:692
 #, fuzzy
 msgid "Picture Mode Hue"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:638
+#: src/olympusmn.cpp:692
 #, fuzzy
 msgid "Picture mode hue"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:639
+#: src/olympusmn.cpp:693
 #, fuzzy
 msgid "Picture Mode Contrast"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:639 src/olympusmn.cpp:832
+#: src/olympusmn.cpp:693 src/olympusmn.cpp:893
 #, fuzzy
 msgid "Picture mode contrast"
 msgstr "Nastavenie režimu obrázka"
 
-#: src/olympusmn.cpp:640
+#: src/olympusmn.cpp:694
 #, fuzzy
 msgid "Picture Mode Sharpness"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:640 src/olympusmn.cpp:833
+#: src/olympusmn.cpp:694 src/olympusmn.cpp:894
 #, fuzzy
 msgid "Picture mode sharpness"
 msgstr "Nastavenie režimu obrázka"
 
-#: src/olympusmn.cpp:641
+#: src/olympusmn.cpp:695
 #, fuzzy
 msgid "Picture Mode BW Filter"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:641
+#: src/olympusmn.cpp:695
 #, fuzzy
 msgid "Picture mode BW filter"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:642
+#: src/olympusmn.cpp:696
 #, fuzzy
 msgid "Picture Mode Tone"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:642
+#: src/olympusmn.cpp:696
 #, fuzzy
 msgid "Picture mode tone"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:643
+#: src/olympusmn.cpp:697
 #, fuzzy
 msgid "Noise filter"
 msgstr "Farebný filter"
 
-#: src/olympusmn.cpp:645
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art Filter"
+msgstr "Filter"
+
+#: src/olympusmn.cpp:698
+#, fuzzy
+msgid "Art filter"
+msgstr "Farebný filter"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic Filter"
+msgstr "Digitálny filter"
+
+#: src/olympusmn.cpp:699
+#, fuzzy
+msgid "Magic filter"
+msgstr "Digitálny filter"
+
+#: src/olympusmn.cpp:701
 #, fuzzy
 msgid "Panorama Mode"
 msgstr "panoráma"
 
-#: src/olympusmn.cpp:645
+#: src/olympusmn.cpp:701
 #, fuzzy
 msgid "Panorama mode"
 msgstr "Rámec panorámy"
 
-#: src/olympusmn.cpp:646
+#: src/olympusmn.cpp:702
 #, fuzzy
 msgid "Image Quality 2"
 msgstr "Kvalita obrázka"
 
-#: src/olympusmn.cpp:646
+#: src/olympusmn.cpp:702
 #, fuzzy
 msgid "Image quality 2"
 msgstr "Kvalita obrázka"
 
-#: src/olympusmn.cpp:647
+# exif-compression-1
+#: src/olympusmn.cpp:704
+#, fuzzy
 msgid "Manometer Pressure"
-msgstr ""
+msgstr "nekomprimovaný"
 
 # exif-compression-1
-#: src/olympusmn.cpp:647
+#: src/olympusmn.cpp:704
 #, fuzzy
 msgid "Manometer pressure"
 msgstr "nekomprimovaný"
 
-#: src/olympusmn.cpp:648
+# exif-compression-1
+#: src/olympusmn.cpp:705
+#, fuzzy
 msgid "Manometer Reading"
-msgstr ""
+msgstr "nekomprimovaný"
 
-#: src/olympusmn.cpp:648
+# exif-compression-1
+#: src/olympusmn.cpp:705
+#, fuzzy
 msgid "Manometer reading"
-msgstr ""
+msgstr "nekomprimovaný"
 
-#: src/olympusmn.cpp:649
+#: src/olympusmn.cpp:706
+#, fuzzy
 msgid "Extended WB Detect"
-msgstr ""
+msgstr "Režim scény"
 
-#: src/olympusmn.cpp:649
+#: src/olympusmn.cpp:706
+#, fuzzy
 msgid "Extended WB detect"
+msgstr "Režim scény"
+
+#: src/olympusmn.cpp:707
+msgid "Level Gauge Roll"
 msgstr ""
 
-#: src/olympusmn.cpp:651
+#: src/olympusmn.cpp:707
+msgid "Level gauge roll"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level Gauge Pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:708
+msgid "Level gauge pitch"
+msgstr ""
+
+#: src/olympusmn.cpp:710
 msgid "Unknown OlympusCs tag"
 msgstr "Neznáma značka OlympusCs"
 
-#: src/olympusmn.cpp:662
+#: src/olympusmn.cpp:721
 msgid "Simple E-System"
 msgstr ""
 
-#: src/olympusmn.cpp:663
+#: src/olympusmn.cpp:722
 msgid "E-System"
 msgstr ""
 
-#: src/olympusmn.cpp:679
+#: src/olympusmn.cpp:739
 #, fuzzy
 msgid "Equipment Version"
 msgstr "Info o vybavení"
 
-#: src/olympusmn.cpp:679
+#: src/olympusmn.cpp:739
 #, fuzzy
 msgid "Equipment version"
 msgstr "Info o vybavení"
 
-#: src/olympusmn.cpp:680
-#, fuzzy
-msgid "Camera Type"
-msgstr "Zmačka fotoaparátu"
-
-#: src/olympusmn.cpp:680
-#, fuzzy
-msgid "Camera type"
-msgstr "Zmačka fotoaparátu"
-
-#: src/olympusmn.cpp:682 src/panasonicmn.cpp:244
-#, fuzzy
-msgid "Internal Serial Number"
-msgstr "Sériové číslo fotoaparátu"
-
-#: src/olympusmn.cpp:682
-#, fuzzy
-msgid "Internal serial number"
-msgstr "Sériové číslo fotoaparátu"
-
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-#, fuzzy
-msgid "Body Firmware Version"
-msgstr "Verzia firmvéru"
-
-#: src/olympusmn.cpp:684 src/olympusmn.cpp:943
-#, fuzzy
-msgid "Body firmware version"
-msgstr "Verzia firmvéru"
+#: src/olympusmn.cpp:741
+msgid "Serial number"
+msgstr "Sériové číslo"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
 #, fuzzy
 msgid "Lens Serial Number"
 msgstr "Sériové číslo"
 
-#: src/olympusmn.cpp:686 src/panasonicmn.cpp:271
+#: src/olympusmn.cpp:746 src/panasonicmn.cpp:277
 #, fuzzy
 msgid "Lens serial number"
 msgstr "Sériové číslo fotoaparátu"
 
-#: src/olympusmn.cpp:687
+#: src/olympusmn.cpp:747 src/properties.cpp:374
+msgid "Lens Model"
+msgstr "Model šošoviek"
+
+#: src/olympusmn.cpp:747
+#, fuzzy
+msgid "Lens model"
+msgstr "Model šošoviek"
+
+#: src/olympusmn.cpp:748
 #, fuzzy
 msgid "Lens Firmware Version"
 msgstr "Verzia firmvéru"
 
-#: src/olympusmn.cpp:687
+#: src/olympusmn.cpp:748
 #, fuzzy
 msgid "Lens firmware version"
 msgstr "Verzia firmvéru"
 
-#: src/olympusmn.cpp:692
+#: src/olympusmn.cpp:753
 #, fuzzy
 msgid "Max Aperture At Current Focal"
 msgstr "maximálna clona pri minimálnom ohnisku"
 
-#: src/olympusmn.cpp:692
+#: src/olympusmn.cpp:753
 #, fuzzy
 msgid "Max aperture at current focal"
 msgstr "maximálna clona pri minimálnom ohnisku"
 
-#: src/olympusmn.cpp:693
+#: src/olympusmn.cpp:754
 #, fuzzy
 msgid "Lens Properties"
 msgstr "Vlastnosti digiKam"
 
-#: src/olympusmn.cpp:693
+#: src/olympusmn.cpp:754
 #, fuzzy
 msgid "Lens properties"
 msgstr "Teplota šošoviek"
 
-#: src/olympusmn.cpp:694
+#: src/olympusmn.cpp:755
 #, fuzzy
 msgid "Extender"
 msgstr "externý"
 
-#: src/olympusmn.cpp:695
+#: src/olympusmn.cpp:756
 #, fuzzy
 msgid "Extender Serial Number"
 msgstr "Sériové číslo fotoaparátu"
 
-#: src/olympusmn.cpp:695
+#: src/olympusmn.cpp:756
 #, fuzzy
 msgid "Extender serial number"
 msgstr "Sériové číslo fotoaparátu"
 
-#: src/olympusmn.cpp:696
+#: src/olympusmn.cpp:757
 #, fuzzy
 msgid "Extender Model"
 msgstr "Režim scény"
 
-#: src/olympusmn.cpp:696
+#: src/olympusmn.cpp:757
 #, fuzzy
 msgid "Extender model"
 msgstr "Režim scény"
 
-#: src/olympusmn.cpp:697
+#: src/olympusmn.cpp:758
 #, fuzzy
 msgid "Extender Firmware Version"
 msgstr "Verzia firmvéru"
 
-#: src/olympusmn.cpp:697
+#: src/olympusmn.cpp:758
 #, fuzzy
 msgid "Extender firmwareversion"
 msgstr "Verzia formvéru"
 
-#: src/olympusmn.cpp:698
-#, fuzzy
-msgid "Flash Type"
-msgstr "Režim blesku"
-
-#: src/olympusmn.cpp:698
-#, fuzzy
-msgid "Flash type"
-msgstr "Režim blesku"
-
-#: src/olympusmn.cpp:699 src/properties.cpp:354
+#: src/olympusmn.cpp:760 src/properties.cpp:370
 #, fuzzy
 msgid "Flash Model"
 msgstr "Režim blesku"
 
-#: src/olympusmn.cpp:699
+#: src/olympusmn.cpp:760
 #, fuzzy
 msgid "Flash model"
 msgstr "Režim blesku"
 
-#: src/olympusmn.cpp:700
+#: src/olympusmn.cpp:761
 #, fuzzy
 msgid "Flash Firmware Version"
 msgstr "Verzia firmvéru"
 
-#: src/olympusmn.cpp:700
+#: src/olympusmn.cpp:761
 #, fuzzy
 msgid "Flash firmware version"
 msgstr "Verzia firmvéru"
 
-#: src/olympusmn.cpp:701
+#: src/olympusmn.cpp:762
 #, fuzzy
 msgid "FlashSerialNumber"
 msgstr "SériovéČíslo"
 
-#: src/olympusmn.cpp:703
+#: src/olympusmn.cpp:764
 msgid "Unknown OlympusEq tag"
 msgstr "Neznáma značka OlympusEq"
 
-#: src/olympusmn.cpp:720 src/olympusmn.cpp:785
+#: src/olympusmn.cpp:781 src/olympusmn.cpp:846
 #, fuzzy
 msgid "High Speed"
 msgstr "Orezanie vysoká rýchlosť"
 
-#: src/olympusmn.cpp:721 src/olympusmn.cpp:742 src/olympusmn.cpp:786
+#: src/olympusmn.cpp:782 src/olympusmn.cpp:803 src/olympusmn.cpp:847
 #, fuzzy
 msgid "High Function"
 msgstr "Silné nasýtenie"
 
-#: src/olympusmn.cpp:722
+#: src/olympusmn.cpp:783
 #, fuzzy
 msgid "Advanced High Speed"
 msgstr "Orezanie vysoká rýchlosť"
 
 # exif-transferfunction
-#: src/olympusmn.cpp:723
+#: src/olympusmn.cpp:784
 #, fuzzy
 msgid "Advanced High Function"
 msgstr "prenosová funkcia"
 
-#: src/olympusmn.cpp:728
+#: src/olympusmn.cpp:789
 msgid "Original"
 msgstr "Originál"
 
 # exif-scenecapturetype-1
-#: src/olympusmn.cpp:729
+#: src/olympusmn.cpp:790
 #, fuzzy
 msgid "Edited (Landscape)"
 msgstr "krajinka"
 
-#: src/olympusmn.cpp:730 src/olympusmn.cpp:731
+#: src/olympusmn.cpp:791 src/olympusmn.cpp:792
 #, fuzzy
 msgid "Edited (Portrait)"
 msgstr "Nočný portrét"
 
-#: src/olympusmn.cpp:736
+#: src/olympusmn.cpp:797
 #, fuzzy
 msgid "WB Color Temp"
 msgstr "Farebný tón"
 
-#: src/olympusmn.cpp:737
+# AF = automatické zaostrenie
+#: src/olympusmn.cpp:798
+#, fuzzy
 msgid "WB Gray Point"
-msgstr ""
+msgstr "Bod automatického zaostrenia"
 
-#: src/olympusmn.cpp:747
+#: src/olympusmn.cpp:808
 #, fuzzy
 msgid "Raw Development Version"
 msgstr "Nespracovaný vývoj"
 
-#: src/olympusmn.cpp:747
+#: src/olympusmn.cpp:808
 #, fuzzy
 msgid "Raw development version"
 msgstr "Informácie o nespracovanom vývoji"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818 src/properties.cpp:528
-#: src/tags.cpp:640
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879 src/properties.cpp:544
+#: src/tags.cpp:827
 msgid "Exposure Bias Value"
 msgstr "Hodnota skreslenia expozície"
 
-#: src/olympusmn.cpp:748 src/olympusmn.cpp:818
+#: src/olympusmn.cpp:809 src/olympusmn.cpp:879
 #, fuzzy
 msgid "Exposure bias value"
 msgstr "Hodnota skreslenia expozície"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
 #, fuzzy
 msgid "White Balance Value"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/olympusmn.cpp:749 src/olympusmn.cpp:820
+#: src/olympusmn.cpp:810 src/olympusmn.cpp:881
 #, fuzzy
 msgid "White balance value"
 msgstr "Tabuľka vyváženia bielej"
 
-#: src/olympusmn.cpp:750 src/olympusmn.cpp:821
+#: src/olympusmn.cpp:811 src/olympusmn.cpp:882
 #, fuzzy
 msgid "WB Fine Adjustment"
 msgstr "Úpravy tónu"
 
-#: src/olympusmn.cpp:750
+#: src/olympusmn.cpp:811
 #, fuzzy
 msgid "WB fine adjustment"
 msgstr "Úpravy tónu"
 
 # AF = automatické zaostrenie
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:773 src/olympusmn.cpp:822
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:834 src/olympusmn.cpp:883
 #, fuzzy
 msgid "Gray Point"
 msgstr "Bod automatického zaostrenia"
 
 # AF = automatické zaostrenie
-#: src/olympusmn.cpp:751 src/olympusmn.cpp:822
+#: src/olympusmn.cpp:812 src/olympusmn.cpp:883
 #, fuzzy
 msgid "Gray point"
 msgstr "bod automatického zaostrenia"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
 #, fuzzy
 msgid "Saturation Emphasis"
 msgstr "Nastavenie sýtosti"
 
-#: src/olympusmn.cpp:752 src/olympusmn.cpp:825
+#: src/olympusmn.cpp:813 src/olympusmn.cpp:886
 #, fuzzy
 msgid "Saturation emphasis"
 msgstr "Nastavenie sýtosti"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
 #, fuzzy
 msgid "Memory Color Emphasis"
 msgstr "Moje farby"
 
-#: src/olympusmn.cpp:753 src/olympusmn.cpp:826
+#: src/olympusmn.cpp:814 src/olympusmn.cpp:887
+#, fuzzy
 msgid "Memory color emphasis"
-msgstr ""
+msgstr "Moje farby"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
 #, fuzzy
 msgid "Contrast Value"
 msgstr "Kontrast"
 
-#: src/olympusmn.cpp:754 src/olympusmn.cpp:823
+#: src/olympusmn.cpp:815 src/olympusmn.cpp:884
 #, fuzzy
 msgid "Contrast value"
 msgstr "Kontrast"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
 #, fuzzy
 msgid "Sharpness Value"
 msgstr "Ostrosť"
 
-#: src/olympusmn.cpp:755 src/olympusmn.cpp:824
+#: src/olympusmn.cpp:816 src/olympusmn.cpp:885
 #, fuzzy
 msgid "Sharpness value"
 msgstr "Ostrosť"
 
-#: src/olympusmn.cpp:757 src/olympusmn.cpp:829
+#: src/olympusmn.cpp:818 src/olympusmn.cpp:890
 #, fuzzy
 msgid "Engine"
 msgstr "Večer"
 
-#: src/olympusmn.cpp:759
+#: src/olympusmn.cpp:820
 #, fuzzy
 msgid "Edit status"
 msgstr "Upraviť stav"
 
-#: src/olympusmn.cpp:760
+#: src/olympusmn.cpp:821
 #, fuzzy
 msgid "Settings"
 msgstr "Nastavenie AE"
 
-#: src/olympusmn.cpp:762
+#: src/olympusmn.cpp:823
 msgid "Unknown OlympusRd tag"
 msgstr "Neznáma značka OlympusRd"
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:878
 #, fuzzy
 msgid "Raw Development 2 Version"
 msgstr "Nespracovaný vývoj"
 
-#: src/olympusmn.cpp:817
+#: src/olympusmn.cpp:878
 #, fuzzy
 msgid "Raw development 2 version"
 msgstr "Informácie o nespracovanom vývoji"
 
-#: src/olympusmn.cpp:821
+#: src/olympusmn.cpp:882
 #, fuzzy
 msgid "White balance fine adjustment"
 msgstr "Nastavenie vyváženia bielej"
 
-#: src/olympusmn.cpp:831
+#: src/olympusmn.cpp:892
 #, fuzzy
 msgid "PM Saturation"
 msgstr "Sýtosť"
 
-#: src/olympusmn.cpp:832
+#: src/olympusmn.cpp:893
 #, fuzzy
 msgid "PM Contrast"
 msgstr "Kontrast"
 
-#: src/olympusmn.cpp:833
+#: src/olympusmn.cpp:894
 #, fuzzy
 msgid "PM Sharpness"
 msgstr "Ostrosť"
 
-#: src/olympusmn.cpp:834
+#: src/olympusmn.cpp:895
 #, fuzzy
 msgid "PM BW Filter"
 msgstr "Filter"
 
-#: src/olympusmn.cpp:834
+#: src/olympusmn.cpp:895
+#, fuzzy
 msgid "PM BW filter"
-msgstr ""
+msgstr "Filter"
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:896
 #, fuzzy
 msgid "PM Picture Tone"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:835
+#: src/olympusmn.cpp:896
 #, fuzzy
 msgid "PM picture tone"
 msgstr "Režim obrázka"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:899
 #, fuzzy
 msgid "Auto Gradation"
 msgstr "Trvanie zvuku"
 
-#: src/olympusmn.cpp:838
+#: src/olympusmn.cpp:899
 #, fuzzy
 msgid "Auto gradation"
 msgstr "Trvanie zvuku"
 
-#: src/olympusmn.cpp:839
+#: src/olympusmn.cpp:900
+#, fuzzy
 msgid "PM Noise Filter"
-msgstr ""
+msgstr "Filter"
 
-#: src/olympusmn.cpp:839
+#: src/olympusmn.cpp:900
 #, fuzzy
 msgid "Picture mode noise filter"
 msgstr "Nastavenie režimu obrázka"
 
-#: src/olympusmn.cpp:841
+#: src/olympusmn.cpp:902
 msgid "Unknown OlympusRd2 tag"
 msgstr "Neznáma značka OlympusRd2"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:913
+#, fuzzy
+msgid "On (2 frames)"
+msgstr "Zapnuté (predvolené)"
+
+#: src/olympusmn.cpp:914
+#, fuzzy
+msgid "On (3 frames)"
+msgstr "Zapnuté (predvolené)"
+
+#: src/olympusmn.cpp:919
+msgid "4:3"
+msgstr ""
+
+#: src/olympusmn.cpp:920
+#, fuzzy
+msgid "3:2"
+msgstr "320"
+
+#: src/olympusmn.cpp:921
+msgid "16:9"
+msgstr ""
+
+#: src/olympusmn.cpp:922
+msgid "6:6"
+msgstr ""
+
+#: src/olympusmn.cpp:923
+msgid "5:4"
+msgstr ""
+
+#: src/olympusmn.cpp:924
+msgid "7:6"
+msgstr ""
+
+# exif-lightsource-21
+#: src/olympusmn.cpp:925
+#, fuzzy
+msgid "6:5"
+msgstr "D65"
+
+# exif-lightsource-22
+#: src/olympusmn.cpp:926
+#, fuzzy
+msgid "7:5"
+msgstr "D75"
+
+#: src/olympusmn.cpp:927
+msgid "3:4"
+msgstr ""
+
+#: src/olympusmn.cpp:931
 #, fuzzy
 msgid "Image Processing Version"
 msgstr "Spracovanie obrazu"
 
-#: src/olympusmn.cpp:850
+#: src/olympusmn.cpp:931
 #, fuzzy
 msgid "Image processing version"
 msgstr "Informácie o spracovaní obrazu"
 
-#: src/olympusmn.cpp:852
+#: src/olympusmn.cpp:933
+#, fuzzy
 msgid "WB RB Levels 3000K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:852
+#: src/olympusmn.cpp:933
+#, fuzzy
 msgid "WB RB levels 3000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:853
+#: src/olympusmn.cpp:934
+#, fuzzy
 msgid "WB RB Levels 3300K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:853
+#: src/olympusmn.cpp:934
+#, fuzzy
 msgid "WB RB levels 3300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:854
+#: src/olympusmn.cpp:935
+#, fuzzy
 msgid "WB RB Levels 3600K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:854
+#: src/olympusmn.cpp:935
+#, fuzzy
 msgid "WB RB levels 3600K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:855
+#: src/olympusmn.cpp:936
+#, fuzzy
 msgid "WB RB Levels 3900K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:855
+#: src/olympusmn.cpp:936
+#, fuzzy
 msgid "WB RB levels 3900K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:856
+#: src/olympusmn.cpp:937
+#, fuzzy
 msgid "WB RB Levels 4000K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:856
+#: src/olympusmn.cpp:937
+#, fuzzy
 msgid "WB RB levels 4000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:857
+#: src/olympusmn.cpp:938
+#, fuzzy
 msgid "WB RB Levels 4300K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:857
+#: src/olympusmn.cpp:938
+#, fuzzy
 msgid "WB RB levels 4300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:858
+#: src/olympusmn.cpp:939
+#, fuzzy
 msgid "WB RB Levels 4500K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:858
+#: src/olympusmn.cpp:939
+#, fuzzy
 msgid "WB RB levels 4500K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:859
+#: src/olympusmn.cpp:940
+#, fuzzy
 msgid "WB RB Levels 4800K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:859
+#: src/olympusmn.cpp:940
+#, fuzzy
 msgid "WB RB levels 4800K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:860
+#: src/olympusmn.cpp:941
+#, fuzzy
 msgid "WB RB Levels 5300K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:860
+#: src/olympusmn.cpp:941
+#, fuzzy
 msgid "WB RB levels 5300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:861
+#: src/olympusmn.cpp:942
+#, fuzzy
 msgid "WB RB Levels 6000K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:861
+#: src/olympusmn.cpp:942
+#, fuzzy
 msgid "WB RB levels 6000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:862
+#: src/olympusmn.cpp:943
+#, fuzzy
 msgid "WB RB Levels 6600K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:862
+#: src/olympusmn.cpp:943
+#, fuzzy
 msgid "WB RB levels 6600K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:863
+#: src/olympusmn.cpp:944
+#, fuzzy
 msgid "WB RB Levels 7500K"
-msgstr ""
+msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:863
+#: src/olympusmn.cpp:944
+#, fuzzy
 msgid "WB RB levels 7500K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:864
+#: src/olympusmn.cpp:945
 #, fuzzy
 msgid "WB RB Levels CWB1"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:864
+#: src/olympusmn.cpp:945
+#, fuzzy
 msgid "WB RB levels CWB1"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:865
+#: src/olympusmn.cpp:946
 #, fuzzy
 msgid "WB RB Levels CWB2"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:865
+#: src/olympusmn.cpp:946
+#, fuzzy
 msgid "WB RB levels CWB2"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:866
+#: src/olympusmn.cpp:947
 #, fuzzy
 msgid "WB RB Levels CWB3"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:866
+#: src/olympusmn.cpp:947
+#, fuzzy
 msgid "WB RB levels CWB3"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:867
+#: src/olympusmn.cpp:948
 #, fuzzy
 msgid "WB RB Levels CWB4"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:867
+#: src/olympusmn.cpp:948
+#, fuzzy
 msgid "WB RB levels CWB4"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:868
+#: src/olympusmn.cpp:949
+#, fuzzy
 msgid "WB G Level 3000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:868
+#: src/olympusmn.cpp:949
+#, fuzzy
 msgid "WB G level 3000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:869
+#: src/olympusmn.cpp:950
+#, fuzzy
 msgid "WB G Level 3300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:869
+#: src/olympusmn.cpp:950
+#, fuzzy
 msgid "WB G level 3300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:870
+#: src/olympusmn.cpp:951
+#, fuzzy
 msgid "WB G Level 3600K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:870
+#: src/olympusmn.cpp:951
+#, fuzzy
 msgid "WB G level 3600K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:871
+#: src/olympusmn.cpp:952
+#, fuzzy
 msgid "WB G Level 3900K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:871
+#: src/olympusmn.cpp:952
+#, fuzzy
 msgid "WB G level 3900K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:872
+#: src/olympusmn.cpp:953
+#, fuzzy
 msgid "WB G Level 4000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:872
+#: src/olympusmn.cpp:953
+#, fuzzy
 msgid "WB G level 4000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:873
+#: src/olympusmn.cpp:954
+#, fuzzy
 msgid "WB G Level 4300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:873
+#: src/olympusmn.cpp:954
+#, fuzzy
 msgid "WB G level 4300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:874
+#: src/olympusmn.cpp:955
+#, fuzzy
 msgid "WB G Level 4500K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:874
+#: src/olympusmn.cpp:955
+#, fuzzy
 msgid "WB G level 4500K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:875
+#: src/olympusmn.cpp:956
+#, fuzzy
 msgid "WB G Level 4800K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:875
+#: src/olympusmn.cpp:956
+#, fuzzy
 msgid "WB G level 4800K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:876
+#: src/olympusmn.cpp:957
+#, fuzzy
 msgid "WB G Level 5300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:876
+#: src/olympusmn.cpp:957
+#, fuzzy
 msgid "WB G level 5300K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:877
+#: src/olympusmn.cpp:958
+#, fuzzy
 msgid "WB G Level 6000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:877
+#: src/olympusmn.cpp:958
+#, fuzzy
 msgid "WB G level 6000K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:878
+#: src/olympusmn.cpp:959
+#, fuzzy
 msgid "WB G Level 6600K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:878
+#: src/olympusmn.cpp:959
+#, fuzzy
 msgid "WB G level 6600K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:879
+#: src/olympusmn.cpp:960
+#, fuzzy
 msgid "WB G Level 7500K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:879
+#: src/olympusmn.cpp:960
+#, fuzzy
 msgid "WB G level 7500K"
-msgstr ""
+msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:961
 #, fuzzy
 msgid "WB G Level"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:880
+#: src/olympusmn.cpp:961
 #, fuzzy
 msgid "WB G level"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:882
+#: src/olympusmn.cpp:963
 msgid "Enhancer"
 msgstr ""
 
-#: src/olympusmn.cpp:883
+#: src/olympusmn.cpp:964
+#, fuzzy
 msgid "Enhancer Values"
-msgstr ""
+msgstr "Ostrosť"
 
-#: src/olympusmn.cpp:883
+#: src/olympusmn.cpp:964
+#, fuzzy
 msgid "Enhancer values"
-msgstr ""
+msgstr "Ostrosť"
 
-#: src/olympusmn.cpp:884 src/olympusmn.cpp:983
+#: src/olympusmn.cpp:965 src/olympusmn.cpp:1067
 #, fuzzy
 msgid "Coring Filter"
 msgstr "Farebný filter"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
 #, fuzzy
 msgid "Coring Values"
 msgstr "Hodnota jasu"
 
-#: src/olympusmn.cpp:885 src/olympusmn.cpp:984
+#: src/olympusmn.cpp:966 src/olympusmn.cpp:1068
 #, fuzzy
 msgid "Coring values"
 msgstr "Hodnota jasu"
 
-#: src/olympusmn.cpp:886 src/tags.cpp:726
+#: src/olympusmn.cpp:967 src/tags.cpp:913
 #, fuzzy
 msgid "Black Level"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:887
+#: src/olympusmn.cpp:968
+#, fuzzy
 msgid "Gain Base"
-msgstr ""
+msgstr "Základné URL"
 
-#: src/olympusmn.cpp:887
+#: src/olympusmn.cpp:968
 msgid "Gain base"
 msgstr ""
 
-#: src/olympusmn.cpp:888
+#: src/olympusmn.cpp:969
 #, fuzzy
 msgid "Valid Bits"
 msgstr "Platné bity"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988 src/properties.cpp:415
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072 src/properties.cpp:431
 msgid "Crop Left"
 msgstr "Orezať vľavo"
 
-#: src/olympusmn.cpp:889 src/olympusmn.cpp:988
+#: src/olympusmn.cpp:970 src/olympusmn.cpp:1072
 #, fuzzy
 msgid "Crop left"
 msgstr "Orezať vľavo"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989 src/properties.cpp:414
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073 src/properties.cpp:430
 msgid "Crop Top"
 msgstr "Orezať vrch"
 
-#: src/olympusmn.cpp:890 src/olympusmn.cpp:989
+#: src/olympusmn.cpp:971 src/olympusmn.cpp:1073
 #, fuzzy
 msgid "Crop top"
 msgstr "Orezať vrch"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990 src/properties.cpp:419
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074 src/properties.cpp:435
 msgid "Crop Width"
 msgstr "Orezať šírku"
 
-#: src/olympusmn.cpp:891 src/olympusmn.cpp:990
+#: src/olympusmn.cpp:972 src/olympusmn.cpp:1074
 #, fuzzy
 msgid "Crop width"
 msgstr "Orezať šírku"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991 src/properties.cpp:420
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075 src/properties.cpp:436
 msgid "Crop Height"
 msgstr "Orezať výšku"
 
-#: src/olympusmn.cpp:892 src/olympusmn.cpp:991
+#: src/olympusmn.cpp:973 src/olympusmn.cpp:1075
 #, fuzzy
 msgid "Crop height"
 msgstr "Orezať výšku"
 
-#: src/olympusmn.cpp:896
-msgid "Face Detect"
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple Exposure Mode"
+msgstr "Režim expozície"
+
+#: src/olympusmn.cpp:977
+#, fuzzy
+msgid "Multiple exposure mode"
+msgstr "Viacnásobná expozícia"
+
+#: src/olympusmn.cpp:978 src/sonymn.cpp:644 src/sonymn.cpp:645
+msgid "Aspect Ratio"
 msgstr ""
 
-#: src/olympusmn.cpp:896
+#: src/olympusmn.cpp:978
+#, fuzzy
+msgid "Aspect ratio"
+msgstr "Trvanie zvuku"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect Frame"
+msgstr "Názov objektu"
+
+#: src/olympusmn.cpp:979
+#, fuzzy
+msgid "Aspect frame"
+msgstr "Názov objektu"
+
+#: src/olympusmn.cpp:980
+#, fuzzy
+msgid "Face Detect"
+msgstr "Nepodarilo sa prečítať"
+
+#: src/olympusmn.cpp:980 src/olympusmn.cpp:1373 src/olympusmn.cpp:1385
+#, fuzzy
 msgid "Face detect"
-msgstr ""
+msgstr "Nepodarilo sa prečítať"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:981
 #, fuzzy
 msgid "Face Detect Area"
 msgstr "Nepodarilo sa prečítať"
 
-#: src/olympusmn.cpp:897
+#: src/olympusmn.cpp:981
 #, fuzzy
 msgid "Face detect area"
 msgstr "Nepodarilo sa prečítať"
 
-#: src/olympusmn.cpp:899
+#: src/olympusmn.cpp:983
 msgid "Unknown OlympusIp tag"
 msgstr "Neznáma značka OlympusIp"
 
-#: src/olympusmn.cpp:909
+#: src/olympusmn.cpp:993
 msgid "Bounce or Off"
 msgstr ""
 
-#: src/olympusmn.cpp:910
+#: src/olympusmn.cpp:994
 msgid "Direct"
 msgstr ""
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:998
 #, fuzzy
 msgid "Focus Info Version"
 msgstr "Informácie o zaostrení"
 
-#: src/olympusmn.cpp:914
+#: src/olympusmn.cpp:998
 #, fuzzy
 msgid "Focus info version"
 msgstr "Informácie o zaostrení"
 
-#: src/olympusmn.cpp:915
+#: src/olympusmn.cpp:999
 #, fuzzy
 msgid "Auto Focus"
 msgstr "Automatické zaostrenie"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:1000
 #, fuzzy
 msgid "Scene Detect"
 msgstr "Režim scény"
 
-#: src/olympusmn.cpp:916
+#: src/olympusmn.cpp:1000
 #, fuzzy
 msgid "Scene detect"
 msgstr "Režim scény"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:1001
 #, fuzzy
 msgid "Scene Area"
 msgstr "scenéria"
 
-#: src/olympusmn.cpp:917
+#: src/olympusmn.cpp:1001
 #, fuzzy
 msgid "Scene area"
 msgstr "Jednoduchá oblasť"
 
-#: src/olympusmn.cpp:918
+#: src/olympusmn.cpp:1002
+#, fuzzy
 msgid "Scene Detect Data"
-msgstr ""
+msgstr "Režim scény"
 
-#: src/olympusmn.cpp:918
+#: src/olympusmn.cpp:1002
+#, fuzzy
 msgid "Scene detect data"
-msgstr ""
+msgstr "Režim scény"
 
-#: src/olympusmn.cpp:919
+#: src/olympusmn.cpp:1003
 #, fuzzy
 msgid "Zoom Step Count"
 msgstr "Počet krokov priblíženia"
 
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:1004
 #, fuzzy
 msgid "Focus Step Count"
 msgstr "Počet krokov makro priblíženia"
 
-#: src/olympusmn.cpp:920
+#: src/olympusmn.cpp:1004
 #, fuzzy
 msgid "Focus step count"
 msgstr "Počet krokov makro priblíženia"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:1005
 #, fuzzy
 msgid "Focus Step Infinity"
 msgstr "Nastavenia zaostrenia"
 
-#: src/olympusmn.cpp:921
+#: src/olympusmn.cpp:1005
 #, fuzzy
 msgid "Focus step infinity"
 msgstr "Nastavenia zaostrenia"
 
-#: src/olympusmn.cpp:922
+#: src/olympusmn.cpp:1006
 #, fuzzy
 msgid "Focus Step Near"
 msgstr "Typ zaostrenia"
 
-#: src/olympusmn.cpp:922
+#: src/olympusmn.cpp:1006
 #, fuzzy
 msgid "Focus step near"
 msgstr "Vzdialenosť zaostrenia"
 
-#: src/olympusmn.cpp:925
+#: src/olympusmn.cpp:1009
 #, fuzzy
 msgid "External Flash"
 msgstr "externý blesk"
 
-#: src/olympusmn.cpp:926
+#: src/olympusmn.cpp:1010
 #, fuzzy
 msgid "External Flash Guide Number"
 msgstr "Režim externého blesku"
 
-#: src/olympusmn.cpp:926
+#: src/olympusmn.cpp:1010
 #, fuzzy
 msgid "External flash guide number"
 msgstr "Odrazenie externého blesku"
 
-#: src/olympusmn.cpp:930
+#: src/olympusmn.cpp:1014
 #, fuzzy
 msgid "Manual Flash"
 msgstr "Ručné uvoľnenie"
 
-#: src/olympusmn.cpp:930
+#: src/olympusmn.cpp:1014
 #, fuzzy
 msgid "Manual flash"
 msgstr "Ručné uvoľnenie"
 
-#: src/olympusmn.cpp:934
+#: src/olympusmn.cpp:1018
 msgid "Unknown OlympusFi tag"
 msgstr "Neznáma značka OlympusFi"
 
-#: src/olympusmn.cpp:945
+#: src/olympusmn.cpp:1029
 #, fuzzy
 msgid "Unknown OlympusFe tag"
 msgstr "Neznáma značka OlympusFi"
 
 # exif-lightsource-9
-#: src/olympusmn.cpp:958
+#: src/olympusmn.cpp:1042
 #, fuzzy
 msgid "Fine Weather"
 msgstr "pekné počasie"
 
 # exif-lightsource-3
-#: src/olympusmn.cpp:959
+#: src/olympusmn.cpp:1043
 #, fuzzy
 msgid "Tungsten (incandescent)"
 msgstr "volfram (inkadescentné svetlo)"
 
-#: src/olympusmn.cpp:960
+#: src/olympusmn.cpp:1044
 #, fuzzy
 msgid "Evening Sunlight"
 msgstr "Večer"
 
-#: src/olympusmn.cpp:961
+#: src/olympusmn.cpp:1045
 #, fuzzy
 msgid "Daylight Fluorescent (D 5700 - 7100K)"
 msgstr "denné svetlo fluorescenčné (D 5700 - 7100K)"
 
-#: src/olympusmn.cpp:962
+#: src/olympusmn.cpp:1046
 #, fuzzy
 msgid "Day White Fluorescent (N 4600 - 5400K)"
 msgstr "biely deň, fluorescenčné (N 4600 - 5400K)"
 
-#: src/olympusmn.cpp:963
+#: src/olympusmn.cpp:1047
 #, fuzzy
 msgid "Cool White Fluorescent (W 3900 - 4500K)"
 msgstr "chladné biele fluorescenčné (W 3900 - 4500K)"
 
-#: src/olympusmn.cpp:964
+#: src/olympusmn.cpp:1048
 #, fuzzy
 msgid "White Fluorescent (WW 3200 - 3700K)"
 msgstr "biele fluorescenčné (WW 3200 - 3700K)"
 
-#: src/olympusmn.cpp:965
+#: src/olympusmn.cpp:1049
 #, fuzzy
 msgid "One Touch White Balance"
 msgstr "Vyváženie bielej jedným dotykom"
 
-#: src/olympusmn.cpp:966
+#: src/olympusmn.cpp:1050
 #, fuzzy
 msgid "Custom 1-4"
 msgstr "Vlastný 1"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:1054
 #, fuzzy
 msgid "Raw Info Version"
 msgstr "Informácie o zaostrení"
 
-#: src/olympusmn.cpp:970
+#: src/olympusmn.cpp:1054
 #, fuzzy
 msgid "Raw info version"
 msgstr "Nespracované informácie"
 
-#: src/olympusmn.cpp:971
+#: src/olympusmn.cpp:1055
 #, fuzzy
 msgid "WB_RB Levels Used"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:971
+#: src/olympusmn.cpp:1055
 #, fuzzy
 msgid "WB_RB levels used"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:1056
 #, fuzzy
 msgid "WB_RB Levels Auto"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:972
+#: src/olympusmn.cpp:1056
 #, fuzzy
 msgid "WB_RB levels auto"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:1057
 #, fuzzy
 msgid "WB_RB Levels Shade"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:973
+#: src/olympusmn.cpp:1057
 #, fuzzy
 msgid "WB_RB levels shade"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:1058
 #, fuzzy
 msgid "WB_RB Levels Cloudy"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:974
+#: src/olympusmn.cpp:1058
 #, fuzzy
 msgid "WB_RB levels cloudy"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:975
+#: src/olympusmn.cpp:1059
 #, fuzzy
 msgid "WB_RB Levels Fine Weather"
 msgstr "WB_RGGBLevelsFlash"
 
-#: src/olympusmn.cpp:975
+#: src/olympusmn.cpp:1059
+#, fuzzy
 msgid "WB_RB levels fine weather"
-msgstr ""
+msgstr "WB_RGGBLevelsFlash"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:1060
 #, fuzzy
 msgid "WB_RB Levels Tungsten"
 msgstr "WB_RGGBLevelsTungsten"
 
-#: src/olympusmn.cpp:976
+#: src/olympusmn.cpp:1060
 #, fuzzy
 msgid "WB_RB levels tungsten"
 msgstr "WB_RGGBLevelsTungsten"
 
-#: src/olympusmn.cpp:977
+#: src/olympusmn.cpp:1061
 #, fuzzy
 msgid "WB_RB Levels Evening Sunlight"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:977
+#: src/olympusmn.cpp:1061
 #, fuzzy
 msgid "WB_RB levels evening sunlight"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:978
+#: src/olympusmn.cpp:1062
 #, fuzzy
 msgid "WB_RB Levels Daylight Fluor"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:978
+#: src/olympusmn.cpp:1062
 #, fuzzy
 msgid "WB_RB levels daylight fluor"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:979
+#: src/olympusmn.cpp:1063
 #, fuzzy
 msgid "WB_RB Levels Day White Fluor"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:979
+#: src/olympusmn.cpp:1063
+#, fuzzy
 msgid "WB_RB levels day white fluor"
-msgstr ""
+msgstr "WB_RGGBLevelsDaylight"
 
-#: src/olympusmn.cpp:980
+#: src/olympusmn.cpp:1064
 #, fuzzy
 msgid "WB_RB Levels Cool White Fluor"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/olympusmn.cpp:980
+#: src/olympusmn.cpp:1064
+#, fuzzy
 msgid "WB_RB levels cool white fluor"
-msgstr ""
+msgstr "WB_RGGBLevelsCloudy"
 
 # exif-lightsource-15
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:1065
 #, fuzzy
 msgid "WB_RB Levels White Fluorescent"
 msgstr "WB_RGGBLevelsFluorescentD"
 
 # exif-lightsource-15
-#: src/olympusmn.cpp:981
+#: src/olympusmn.cpp:1065
 #, fuzzy
 msgid "WB_RB levels white fluorescent"
 msgstr "WB_RGGBLevelsFluorescentD"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:1066
 #, fuzzy
 msgid "Color Matrix2"
 msgstr "Matica farieb 2"
 
-#: src/olympusmn.cpp:982
+#: src/olympusmn.cpp:1066
 #, fuzzy
 msgid "Color matrix 2"
 msgstr "Matica farieb 2"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1069
 #, fuzzy
 msgid "Black Level 2"
 msgstr "Úroveň čiernej"
 
-#: src/olympusmn.cpp:985
+#: src/olympusmn.cpp:1069
 #, fuzzy
 msgid "Black level 2"
 msgstr "Úroveň čiernej"
 
 # exif-ycbcrcoefficients
-#: src/olympusmn.cpp:986 src/properties.cpp:478 src/tags.cpp:522
+#: src/olympusmn.cpp:1070 src/properties.cpp:494 src/tags.cpp:704
 msgid "YCbCr Coefficients"
 msgstr "koeficienty YCbCr"
 
 # exif-ycbcrcoefficients
-#: src/olympusmn.cpp:986
+#: src/olympusmn.cpp:1070
 #, fuzzy
 msgid "YCbCr coefficients"
 msgstr "koeficienty YCbCr"
 
-#: src/olympusmn.cpp:987
+#: src/olympusmn.cpp:1071
 msgid "Valid Pixel Depth"
 msgstr ""
 
-#: src/olympusmn.cpp:987
+#: src/olympusmn.cpp:1071
 msgid "Valid pixel depth"
 msgstr ""
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:1077
 #, fuzzy
 msgid "White Balance Comp"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:993
+#: src/olympusmn.cpp:1077
 #, fuzzy
 msgid "White balance comp"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:994
+#: src/olympusmn.cpp:1078
 #, fuzzy
 msgid "Saturation Setting"
 msgstr "Nastavenie sýtosti"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:1079
 #, fuzzy
 msgid "Hue Setting"
 msgstr "Nastavenia"
 
-#: src/olympusmn.cpp:995
+#: src/olympusmn.cpp:1079
 #, fuzzy
 msgid "Hue setting"
 msgstr "Nastavenie AE"
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:1082
 #, fuzzy
 msgid "CM Exposure Compensation"
 msgstr "Kompenzácia expozície"
 
-#: src/olympusmn.cpp:998
+#: src/olympusmn.cpp:1082
 #, fuzzy
 msgid "CM exposure compensation"
 msgstr "Kompenzácia expozície"
 
-#: src/olympusmn.cpp:999
+#: src/olympusmn.cpp:1083
 #, fuzzy
 msgid "CM White Balance"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:999
+#: src/olympusmn.cpp:1083
 #, fuzzy
 msgid "CM white balance"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:1000
+#: src/olympusmn.cpp:1084
 #, fuzzy
 msgid "CM White Balance Comp"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:1000
+#: src/olympusmn.cpp:1084
 #, fuzzy
 msgid "CM white balance comp"
 msgstr "Vyváženie bielej"
 
-#: src/olympusmn.cpp:1001
+#: src/olympusmn.cpp:1085
 #, fuzzy
 msgid "CM White Balance Gray Point"
 msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/olympusmn.cpp:1001
+#: src/olympusmn.cpp:1085
 #, fuzzy
 msgid "CM white balance gray point"
 msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:1086
 #, fuzzy
 msgid "CM Saturation"
 msgstr "Sýtosť"
 
-#: src/olympusmn.cpp:1002
+#: src/olympusmn.cpp:1086
 #, fuzzy
 msgid "CM saturation"
 msgstr "Sýtosť"
 
-#: src/olympusmn.cpp:1003
+#: src/olympusmn.cpp:1087
 #, fuzzy
 msgid "CM Hue"
 msgstr "Odtieň"
 
-#: src/olympusmn.cpp:1003
+#: src/olympusmn.cpp:1087
+#, fuzzy
 msgid "CM hue"
-msgstr ""
+msgstr "Odtieň"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:1088
 #, fuzzy
 msgid "CM Contrast"
 msgstr "Kontrast"
 
-#: src/olympusmn.cpp:1004
+#: src/olympusmn.cpp:1088
 #, fuzzy
 msgid "CM contrast"
 msgstr "Kontrast"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:1089
 #, fuzzy
 msgid "CM Sharpness"
 msgstr "Ostrosť"
 
-#: src/olympusmn.cpp:1005
+#: src/olympusmn.cpp:1089
 #, fuzzy
 msgid "CM sharpness"
 msgstr "Ostrosť"
 
-#: src/olympusmn.cpp:1007
+#: src/olympusmn.cpp:1091
 #, fuzzy
 msgid "Unknown OlympusRi tag"
 msgstr "Neznáma značka OlympusRd"
 
-#: src/olympusmn.cpp:1030 src/pentaxmn.cpp:280
+#: src/olympusmn.cpp:1114 src/pentaxmn.cpp:336
 msgid "User-Selected"
 msgstr "Vybrané používateľom"
 
-#: src/olympusmn.cpp:1031
+#: src/olympusmn.cpp:1115
 #, fuzzy
 msgid "Auto-Override"
 msgstr "Prepísať"
 
-#: src/olympusmn.cpp:1067
+#: src/olympusmn.cpp:1151
 msgid "Fast"
 msgstr "rýchly"
 
-#: src/olympusmn.cpp:1124
+#: src/olympusmn.cpp:1208
 msgid "3000 Kelvin"
 msgstr "3000 Kelvinov"
 
-#: src/olympusmn.cpp:1125
+#: src/olympusmn.cpp:1209
 msgid "3700 Kelvin"
 msgstr "3700 Kelvinov"
 
-#: src/olympusmn.cpp:1126
+#: src/olympusmn.cpp:1210
 msgid "4000 Kelvin"
 msgstr "4000 Kelvinov"
 
-#: src/olympusmn.cpp:1127
+#: src/olympusmn.cpp:1211
 msgid "4500 Kelvin"
 msgstr "4500 Kelvinov"
 
-#: src/olympusmn.cpp:1128
+#: src/olympusmn.cpp:1212
 msgid "5500 Kelvin"
 msgstr "5500 Kelvinov"
 
-#: src/olympusmn.cpp:1129
+#: src/olympusmn.cpp:1213
 msgid "6500 Kelvin"
 msgstr "6500 Kelvinov"
 
-#: src/olympusmn.cpp:1130
+#: src/olympusmn.cpp:1214
 msgid "7500 Kelvin"
 msgstr "7500 Kelvinov"
 
-#: src/olympusmn.cpp:1136
+#: src/olympusmn.cpp:1220
 msgid "One-touch"
 msgstr "jedným dotykom"
 
-#: src/panasonicmn.cpp:55 src/pentaxmn.cpp:292 src/pentaxmn.cpp:303
+#: src/olympusmn.cpp:1241
+msgid "Olympus Zuiko Digital ED 50mm F2.0 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1242
+msgid "Olympus Zuiko Digital 40-150mm F3.5-4.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1243 src/olympusmn.cpp:1259
+msgid "Olympus Zuiko Digital ED 14-42mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1244
+msgid "Olympus Zuiko Digital ED 150mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1245
+msgid "Olympus Zuiko Digital 17mm F2.8 Pancake"
+msgstr ""
+
+#: src/olympusmn.cpp:1246
+msgid "Olympus Zuiko Digital ED 300mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1247
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1248
+msgid "Olympus Zuiko Digital Pro ED 90-250mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1249
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1250
+msgid "Olympus Zuiko Digital ED 8mm F3.5 Fisheye"
+msgstr ""
+
+#: src/olympusmn.cpp:1251
+msgid "Olympus Zuiko Digital 11-22mm F2.8-3.5"
+msgstr ""
+
+#: src/olympusmn.cpp:1252
+msgid "Olympus Zuiko Digital 18-180mm F3.5-6.3"
+msgstr ""
+
+#: src/olympusmn.cpp:1253
+msgid "Olympus Zuiko Digital 70-300mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1254
+msgid "Olympus Zuiko Digital ED 7-14mm F4.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1255
+msgid "Olympus Zuiko Digital Pro ED 35-100mm F2.0"
+msgstr ""
+
+#: src/olympusmn.cpp:1256
+msgid "Olympus Zuiko Digital 14-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1257
+msgid "Olympus Zuiko Digital 35mm F3.5 Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1258
+msgid "Olympus Zuiko Digital 17.5-45mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1260
+msgid "Olympus Zuiko Digital ED 40-150mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1261
+msgid "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1262
+msgid "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1263
+msgid "Olympus Zuiko Digital ED 14-35mm F2.0 SWD"
+msgstr ""
+
+#: src/olympusmn.cpp:1264
+msgid "Olympus Zuiko Digital 25mm F2.8"
+msgstr ""
+
+#: src/olympusmn.cpp:1265
+msgid "Olympus Zuiko Digital ED 9-18mm F4.0-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1266
+msgid "Olympus Zuiko Digital 14-54mm F2.8-3.5 II"
+msgstr ""
+
+#: src/olympusmn.cpp:1267
+msgid "Sigma 18-50mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1268
+msgid "Sigma 55-200mm F4.0-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1269
+msgid "Sigma 18-125mm F3.5-5.6 DC"
+msgstr ""
+
+#: src/olympusmn.cpp:1270
+msgid "Sigma 18-125mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1271
+msgid "Sigma 30mm F1.4"
+msgstr ""
+
+#: src/olympusmn.cpp:1272 src/olympusmn.cpp:1278
+msgid "Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1273
+msgid "Sigma 105mm F2.8 DG"
+msgstr ""
+
+#: src/olympusmn.cpp:1274
+msgid "Sigma 150mm F2.8 DG HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1275
+msgid "Sigma 24mm F1.8 EX DG Aspherical Macro"
+msgstr ""
+
+#: src/olympusmn.cpp:1276
+msgid "Sigma 135-400mm F4.5-5.6 DG ASP APO RF"
+msgstr ""
+
+#: src/olympusmn.cpp:1277
+msgid "Sigma 300-800mm F5.6 EX DG APO"
+msgstr ""
+
+#: src/olympusmn.cpp:1279
+msgid "Sigma 10-20mm F4.0-5.6 EX DC HSM"
+msgstr ""
+
+#: src/olympusmn.cpp:1280 src/olympusmn.cpp:1289
+msgid "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1281
+msgid "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1282 src/olympusmn.cpp:1290
+msgid "Leica D Summilux 25mm F1.4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1283
+msgid "Lumix G Vario 45-200mm F4-5.6 Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1284
+msgid "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1285
+msgid "Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS"
+msgstr ""
+
+#: src/olympusmn.cpp:1286
+msgid "Leica D Vario Elmar 14-150mm F3.5-5.6"
+msgstr ""
+
+#: src/olympusmn.cpp:1287
+msgid "Lumix G Vario 7-14mm F4 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1288
+msgid "Lumix G 20mm F1.7 Asph."
+msgstr ""
+
+#: src/olympusmn.cpp:1338
+msgid "Olympus Zuiko Digital EC-14 1.4x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1339
+msgid "Olympus EX-25 Extension Tube"
+msgstr ""
+
+#: src/olympusmn.cpp:1340
+msgid "Olympus Zuiko Digital EC-20 2.0x Teleconverter"
+msgstr ""
+
+#: src/olympusmn.cpp:1382
+msgid "S-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1383
+msgid "C-AF"
+msgstr ""
+
+#: src/olympusmn.cpp:1386
+#, fuzzy
+msgid "Imager AF"
+msgstr "Jedinečný ID obrázka"
+
+#: src/olympusmn.cpp:1387
+#, fuzzy
+msgid "AF sensor"
+msgstr "Moje vyhľadávania"
+
+#: src/olympusmn.cpp:1433
+#, fuzzy
+msgid "Soft Focus"
+msgstr "Bodové zaostrenie"
+
+#: src/olympusmn.cpp:1434
+msgid "Pop Art"
+msgstr ""
+
+#: src/olympusmn.cpp:1435
+msgid "Pale & Light Color"
+msgstr ""
+
+#: src/olympusmn.cpp:1436
+#, fuzzy
+msgid "Light Tone"
+msgstr "Oblasť vpravo"
+
+#: src/olympusmn.cpp:1437
+msgid "Pin Hole"
+msgstr ""
+
+#: src/olympusmn.cpp:1438
+msgid "Grainy Film"
+msgstr ""
+
+#: src/olympusmn.cpp:1439
+#, fuzzy
+msgid "Diorama"
+msgstr "panoráma"
+
+#: src/olympusmn.cpp:1440
+#, fuzzy
+msgid "Cross Process"
+msgstr "režim zaostrenia"
+
+# exif-flashenergy
+#: src/olympusmn.cpp:1441
+#, fuzzy
+msgid "Fish Eye"
+msgstr "energia blesku"
+
+#: src/olympusmn.cpp:1442
+msgid "Drawing"
+msgstr ""
+
+#: src/olympusmn.cpp:1489
+#, fuzzy
+msgid "Left (or n/a)"
+msgstr "Oblasť vľavo"
+
+#: src/olympusmn.cpp:1490 src/olympusmn.cpp:1508
+#, fuzzy
+msgid "Center (horizontal)"
+msgstr "Stredná oblasť (vodorovná orientácia)"
+
+#: src/olympusmn.cpp:1492 src/olympusmn.cpp:1519
+#, fuzzy
+msgid "Center (vertical)"
+msgstr "Stredná oblasť (zvislá orientácia)"
+
+#: src/olympusmn.cpp:1503
+msgid "Top-left (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1504
+#, fuzzy
+msgid "Top-center (horizontal)"
+msgstr "Stredná oblasť (vodorovná orientácia)"
+
+#: src/olympusmn.cpp:1505
+msgid "Top-right (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1506
+#, fuzzy
+msgid "Left (horizontal)"
+msgstr "Horizontálne (normálne)"
+
+#: src/olympusmn.cpp:1507
+msgid "Mid-left (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1509
+msgid "Mid-right (horizontal)"
+msgstr ""
+
+#: src/olympusmn.cpp:1510
+#, fuzzy
+msgid "Right (horizontal)"
+msgstr "Horizontálne (normálne)"
+
+#: src/olympusmn.cpp:1511
+#, fuzzy
+msgid "Bottom-left (horizontal)"
+msgstr "vľavo dolu"
+
+#: src/olympusmn.cpp:1512
+#, fuzzy
+msgid "Bottom-center (horizontal)"
+msgstr "vľavo dolu"
+
+#: src/olympusmn.cpp:1513
+#, fuzzy
+msgid "Bottom-right (horizontal)"
+msgstr "vpravo dolu"
+
+#: src/olympusmn.cpp:1514
+msgid "Top-left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1515
+#, fuzzy
+msgid "Top-center (vertical)"
+msgstr "v strede"
+
+#: src/olympusmn.cpp:1516
+#, fuzzy
+msgid "Top-right (vertical)"
+msgstr "vpravo hore"
+
+#: src/olympusmn.cpp:1517
+msgid "Left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1518
+msgid "Mid-left (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1520
+#, fuzzy
+msgid "Mid-right (vertical)"
+msgstr "v strede vpravo"
+
+#: src/olympusmn.cpp:1521
+msgid "Right (vertical)"
+msgstr ""
+
+#: src/olympusmn.cpp:1522
+#, fuzzy
+msgid "Bottom-left (vertical)"
+msgstr "vľavo dolu"
+
+#: src/olympusmn.cpp:1523
+#, fuzzy
+msgid "Bottom-center (vertical)"
+msgstr "vľavo dolu"
+
+#: src/olympusmn.cpp:1524
+#, fuzzy
+msgid "Bottom-right (vertical)"
+msgstr "vpravo dolu"
+
+#: src/olympusmn.cpp:1561
+#, fuzzy
+msgid "Single Target"
+msgstr "Jednoduchá oblasť"
+
+#: src/olympusmn.cpp:1562
+#, fuzzy
+msgid "All Target"
+msgstr "cieľ"
+
+#: src/olympusmn.cpp:1563
+#, fuzzy
+msgid "Dynamic Single Target"
+msgstr "Nastavenie dynamického rozsahu"
+
+#: src/panasonicmn.cpp:57 src/pentaxmn.cpp:348 src/pentaxmn.cpp:361
 msgid "Very High"
 msgstr "veľmi vysoký"
 
-#: src/panasonicmn.cpp:57
+#: src/panasonicmn.cpp:59
 #, fuzzy
 msgid "Motion Picture"
 msgstr "Režim obrázka"
 
-#: src/panasonicmn.cpp:65
+#: src/panasonicmn.cpp:67
 msgid "Halogen"
 msgstr "Halogén"
 
-#: src/panasonicmn.cpp:76
+#: src/panasonicmn.cpp:79
 msgid "Auto, focus button"
 msgstr "auto, stlačenie tlačidla zaostrenia"
 
-#: src/panasonicmn.cpp:77
+#: src/panasonicmn.cpp:80 src/panasonicmn.cpp:81
 msgid "Auto, continuous"
 msgstr "auto, spojitý"
 
-#: src/panasonicmn.cpp:82
-msgid "On, Mode 1"
-msgstr "zapnutý, režim 1"
-
-#: src/panasonicmn.cpp:84
-msgid "On, Mode 2"
-msgstr "zapnutý, režim 2"
-
-#: src/panasonicmn.cpp:91
+#: src/panasonicmn.cpp:95
 msgid "Tele-macro"
 msgstr "Tele-makro"
 
-#: src/panasonicmn.cpp:99
+#: src/panasonicmn.cpp:103
 msgid "Scenery"
 msgstr "scenéria"
 
 # exif-exposureprogram-4
-#: src/panasonicmn.cpp:104
+#: src/panasonicmn.cpp:108
 msgid "Shutter-speed priority"
 msgstr "priorita rýchlosti uzávierky"
 
-#: src/panasonicmn.cpp:108
+#: src/panasonicmn.cpp:112
 #, fuzzy
 msgid "Movie preview"
 msgstr "Zapisuje sa"
 
-#: src/panasonicmn.cpp:109
+#: src/panasonicmn.cpp:113
 msgid "Panning"
 msgstr "posúvanie"
 
-#: src/panasonicmn.cpp:110
+#: src/panasonicmn.cpp:114
 #, fuzzy
 msgid "Simple"
 msgstr "Jednotlivý"
 
-#: src/panasonicmn.cpp:111
+#: src/panasonicmn.cpp:115
 #, fuzzy
 msgid "Color effects"
 msgstr "Farebný efekt"
 
-#: src/panasonicmn.cpp:115
+#: src/panasonicmn.cpp:119
 msgid "Night scenery"
 msgstr "nočná scéna"
 
-#: src/panasonicmn.cpp:117
+#: src/panasonicmn.cpp:121
 #, fuzzy
 msgid "Baby"
 msgstr "Autor"
 
 # exif-sharpness-1
-#: src/panasonicmn.cpp:118
+#: src/panasonicmn.cpp:122
 #, fuzzy
 msgid "Soft skin"
 msgstr "mäkký"
 
-#: src/panasonicmn.cpp:119 src/pentaxmn.cpp:425
+#: src/panasonicmn.cpp:123 src/pentaxmn.cpp:484
 msgid "Candlelight"
 msgstr "svetlo sviečky"
 
-#: src/panasonicmn.cpp:120
+#: src/panasonicmn.cpp:124
 #, fuzzy
 msgid "Starry night"
 msgstr "Štandardné svetlo A"
 
-#: src/panasonicmn.cpp:121
+#: src/panasonicmn.cpp:125
 #, fuzzy
 msgid "High sensitivity"
 msgstr "ISO citlivosť"
 
-#: src/panasonicmn.cpp:122
+#: src/panasonicmn.cpp:126
 #, fuzzy
 msgid "Panorama assist"
 msgstr "panoráma"
 
-#: src/panasonicmn.cpp:125
+#: src/panasonicmn.cpp:129
 msgid "Aerial photo"
 msgstr ""
 
-#: src/panasonicmn.cpp:128
+#: src/panasonicmn.cpp:132
 #, fuzzy
 msgid "Intelligent ISO"
 msgstr "Dĺžka intervalu"
 
-#: src/panasonicmn.cpp:129
+#: src/panasonicmn.cpp:133
 #, fuzzy
 msgid "High speed continuous shooting"
 msgstr "Nastavenie spojité zaostrenie"
 
-#: src/panasonicmn.cpp:130
+#: src/panasonicmn.cpp:134
+#, fuzzy
 msgid "Intelligent auto"
-msgstr ""
+msgstr "Dĺžka intervalu"
 
-#: src/panasonicmn.cpp:142
+#: src/panasonicmn.cpp:146
 msgid "Warm"
 msgstr "Teplé"
 
-#: src/panasonicmn.cpp:143
+#: src/panasonicmn.cpp:147
 msgid "Cool"
 msgstr "Chladné"
 
-#: src/panasonicmn.cpp:151
+#: src/panasonicmn.cpp:155
 msgid "Low/High quality"
 msgstr "Nízka/vysoká kvalita"
 
-#: src/panasonicmn.cpp:152
+#: src/panasonicmn.cpp:156
 msgid "Infinite"
 msgstr "nekonečno"
 
-#: src/panasonicmn.cpp:160
+#: src/panasonicmn.cpp:164
 #, fuzzy
 msgid "Medium low"
 msgstr "stredný 1"
 
-#: src/panasonicmn.cpp:161
+#: src/panasonicmn.cpp:165
 #, fuzzy
 msgid "Medium high"
 msgstr "stredný 1"
 
-#: src/panasonicmn.cpp:170
+#: src/panasonicmn.cpp:175
 msgid "Low (-1)"
 msgstr ""
 
-#: src/panasonicmn.cpp:171
+#: src/panasonicmn.cpp:176
 #, fuzzy
 msgid "High (+1)"
 msgstr "vysoká"
 
-#: src/panasonicmn.cpp:172
+#: src/panasonicmn.cpp:177
 msgid "Lowest (-2)"
 msgstr ""
 
-#: src/panasonicmn.cpp:173
+#: src/panasonicmn.cpp:178
+#, fuzzy
 msgid "Highest (+2)"
-msgstr ""
+msgstr "vysoká"
 
-#: src/panasonicmn.cpp:179
+#: src/panasonicmn.cpp:184
 msgid "10s"
 msgstr "10s"
 
-#: src/panasonicmn.cpp:180
+#: src/panasonicmn.cpp:185
 msgid "2s"
 msgstr "2s"
 
-#: src/panasonicmn.cpp:200
+#: src/panasonicmn.cpp:205
 msgid "EX optics"
 msgstr ""
 
-#: src/panasonicmn.cpp:207
+#: src/panasonicmn.cpp:212
 msgid "Telephoto"
 msgstr ""
 
-#: src/panasonicmn.cpp:213 src/properties.cpp:860
+#: src/panasonicmn.cpp:219 src/properties.cpp:876
 #, fuzzy
 msgid "Home"
 msgstr "Rím"
 
-#: src/panasonicmn.cpp:219
+#: src/panasonicmn.cpp:225
 #, fuzzy
 msgid "Standard (color)"
 msgstr "Štandardný tvar"
 
-#: src/panasonicmn.cpp:220
+#: src/panasonicmn.cpp:226
 #, fuzzy
 msgid "Dynamic (color)"
 msgstr "Dynamická oblasť"
 
-#: src/panasonicmn.cpp:221
+#: src/panasonicmn.cpp:227
 #, fuzzy
 msgid "Nature (color)"
 msgstr "Prirodzená farba"
 
-#: src/panasonicmn.cpp:222
+#: src/panasonicmn.cpp:228
 #, fuzzy
 msgid "Smooth (color)"
 msgstr "Hladký"
 
-#: src/panasonicmn.cpp:223
+#: src/panasonicmn.cpp:229
 #, fuzzy
 msgid "Standard (B&W)"
 msgstr "Štandardný (100%)"
 
-#: src/panasonicmn.cpp:224
+#: src/panasonicmn.cpp:230
 #, fuzzy
 msgid "Dynamic (B&W)"
 msgstr "Dynamická oblasť"
 
-#: src/panasonicmn.cpp:225
+#: src/panasonicmn.cpp:231
 #, fuzzy
 msgid "Smooth (B&W)"
 msgstr "Hladký"
 
-#: src/panasonicmn.cpp:239
+#: src/panasonicmn.cpp:245
 msgid "Audio"
 msgstr "Audio"
 
-#: src/panasonicmn.cpp:242
+#: src/panasonicmn.cpp:248
 msgid "White balance adjustment"
 msgstr "Nastavenie vyváženia bielej"
 
-#: src/panasonicmn.cpp:243
+#: src/panasonicmn.cpp:249
 msgid "FlashBias"
 msgstr "Skreslenie blesku"
 
 # exif-exifversion
-#: src/panasonicmn.cpp:245 src/tags.cpp:181
+#: src/panasonicmn.cpp:251 src/tags.cpp:195
 msgid "Exif version"
 msgstr "Verzia EXIF"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color Effect"
 msgstr "Farebný efekt"
 
-#: src/panasonicmn.cpp:247
+#: src/panasonicmn.cpp:253
 msgid "Color effect"
 msgstr "Farebný efekt"
 
-#: src/panasonicmn.cpp:248
+#: src/panasonicmn.cpp:254
 msgid ""
 "Time in 1/100 s from when the camera was powered on to when the image is "
 "written to memory card"
 msgstr ""
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst Mode"
 msgstr "Režim dávky"
 
-#: src/panasonicmn.cpp:249
+#: src/panasonicmn.cpp:255
 msgid "Burst mode"
 msgstr "Režim dávky"
 
-#: src/panasonicmn.cpp:252
+#: src/panasonicmn.cpp:258
 msgid "NoiseReduction"
 msgstr "Redukcia šumu"
 
-#: src/panasonicmn.cpp:253
+#: src/panasonicmn.cpp:259
 msgid "Self Timer"
 msgstr "Samospúšť"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
+#, fuzzy
 msgid "Baby Age"
-msgstr ""
+msgstr "Autor"
 
-#: src/panasonicmn.cpp:258 src/panasonicmn.cpp:280
+#: src/panasonicmn.cpp:264 src/panasonicmn.cpp:286
 msgid "Baby (or pet) age"
 msgstr ""
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical Zoom Mode"
 msgstr "Špeciálny režim"
 
-#: src/panasonicmn.cpp:259
+#: src/panasonicmn.cpp:265
 #, fuzzy
 msgid "Optical zoom mode"
 msgstr "Režim filmu"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion Lens"
 msgstr "Verzie"
 
-#: src/panasonicmn.cpp:260
+#: src/panasonicmn.cpp:266
 #, fuzzy
 msgid "Conversion lens"
 msgstr "Hodnota jasu"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel Day"
 msgstr "Cestovanie"
 
-#: src/panasonicmn.cpp:261
+#: src/panasonicmn.cpp:267
 msgid "Travel day"
 msgstr "Cestovanie"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World Time Location"
 msgstr "Miesto záberu"
 
-#: src/panasonicmn.cpp:263
+#: src/panasonicmn.cpp:269
 #, fuzzy
 msgid "World time location"
 msgstr "Miesto záberu"
 
-#: src/panasonicmn.cpp:264
+#: src/panasonicmn.cpp:270
 #, fuzzy
 msgid "Program ISO"
 msgstr "Program"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 #, fuzzy
 msgid "WB Adjust AB"
 msgstr "Úpravy tónu"
 
-#: src/panasonicmn.cpp:268
+#: src/panasonicmn.cpp:274
 msgid "WB adjust AB. Positive is a shift toward blue."
 msgstr ""
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 #, fuzzy
 msgid "WB Adjust GM"
 msgstr "Úpravy tónu"
 
-#: src/panasonicmn.cpp:269
+#: src/panasonicmn.cpp:275
 msgid "WBAdjustGM. Positive is a shift toward green."
 msgstr ""
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory Type"
 msgstr "Typ šošpviek"
 
-#: src/panasonicmn.cpp:272
+#: src/panasonicmn.cpp:278
 #, fuzzy
 msgid "Accessory type"
 msgstr "typ šošoviek"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote Version"
 msgstr "Poznámky zhotoviteľa - verzia"
 
-#: src/panasonicmn.cpp:275
+#: src/panasonicmn.cpp:281
 #, fuzzy
 msgid "MakerNote version"
 msgstr "Poznámky zhotoviteľa - verzia"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB Red Level"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/panasonicmn.cpp:277 src/panasonicmn.cpp:339
+#: src/panasonicmn.cpp:283 src/panasonicmn.cpp:345
 #, fuzzy
 msgid "WB red level"
 msgstr "Úroveň čiernej"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB Green Level"
 msgstr "Úroveň čiernej"
 
-#: src/panasonicmn.cpp:278 src/panasonicmn.cpp:340
+#: src/panasonicmn.cpp:284 src/panasonicmn.cpp:346
 #, fuzzy
 msgid "WB green level"
 msgstr "Úroveň čiernej"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB Blue Level"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/panasonicmn.cpp:279 src/panasonicmn.cpp:341
+#: src/panasonicmn.cpp:285 src/panasonicmn.cpp:347
 #, fuzzy
 msgid "WB blue level"
 msgstr "Úroveň čiernej"
 
-#: src/panasonicmn.cpp:282
+#: src/panasonicmn.cpp:288
 msgid "Unknown PanasonicMakerNote tag"
 msgstr "Neznáma značka PanasonicMakerNote"
 
-#: src/panasonicmn.cpp:299
+#: src/panasonicmn.cpp:305
 #, fuzzy
 msgid "Spot mode on"
 msgstr "Bodový režim"
 
-#: src/panasonicmn.cpp:300
+#: src/panasonicmn.cpp:306
 msgid "Spot mode off or 3-area (high speed)"
 msgstr ""
 
-#: src/panasonicmn.cpp:301
+#: src/panasonicmn.cpp:307
 #, fuzzy
 msgid "Spot focussing"
 msgstr "Bodové zaostrenie"
 
-#: src/panasonicmn.cpp:302
+#: src/panasonicmn.cpp:308
 msgid "5-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:303
+#: src/panasonicmn.cpp:309
 msgid "1-area"
 msgstr ""
 
-#: src/panasonicmn.cpp:304
+#: src/panasonicmn.cpp:310
 #, fuzzy
 msgid "1-area (high speed)"
 msgstr "Orezanie vysoká rýchlosť"
 
-#: src/panasonicmn.cpp:305
+#: src/panasonicmn.cpp:311
 msgid "3-area (auto)"
 msgstr ""
 
-#: src/panasonicmn.cpp:306
+#: src/panasonicmn.cpp:312
 msgid "3-area (left)"
 msgstr ""
 
-#: src/panasonicmn.cpp:307
+#: src/panasonicmn.cpp:313
 msgid "3-area (center)"
 msgstr ""
 
-#: src/panasonicmn.cpp:308
+#: src/panasonicmn.cpp:314
 msgid "3-area (right)"
 msgstr ""
 
-#: src/panasonicmn.cpp:320
+#: src/panasonicmn.cpp:326
 msgid " EV"
 msgstr " EV"
 
-#: src/panasonicmn.cpp:329
+#: src/panasonicmn.cpp:335
 #, fuzzy
 msgid "Panasonic raw version"
 msgstr "Verzia firmvéru"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor Width"
 msgstr "Orezať šírku"
 
-#: src/panasonicmn.cpp:330
+#: src/panasonicmn.cpp:336
 #, fuzzy
 msgid "Sensor width"
 msgstr "Orezať šírku"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor Height"
 msgstr "Čistenie snímača"
 
-#: src/panasonicmn.cpp:331
+#: src/panasonicmn.cpp:337
 #, fuzzy
 msgid "Sensor height"
 msgstr "Čistenie snímača"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor Top Border"
 msgstr "Teplota snímača"
 
-#: src/panasonicmn.cpp:332
+#: src/panasonicmn.cpp:338
 #, fuzzy
 msgid "Sensor top border"
 msgstr "Teplota snímača"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor Left Border"
 msgstr "Teplota snímača"
 
-#: src/panasonicmn.cpp:333
+#: src/panasonicmn.cpp:339
 #, fuzzy
 msgid "Sensor left border"
 msgstr "Teplota snímača"
 
-#: src/panasonicmn.cpp:336
+#: src/panasonicmn.cpp:342
 msgid "Red balance (found in Digilux 2 RAW images)"
 msgstr ""
 
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview Image"
-msgstr "Zobraziť vložený obrázok"
-
-#: src/panasonicmn.cpp:342
-#, fuzzy
-msgid "Preview image"
-msgstr "Zobraziť vložený obrázok"
-
-#: src/panasonicmn.cpp:343 src/tags.cpp:387
+#: src/panasonicmn.cpp:349 src/tags.cpp:470
 msgid "Manufacturer"
 msgstr "Výrobca"
 
-#: src/panasonicmn.cpp:343
+#: src/panasonicmn.cpp:349
 msgid "The manufacturer of the recording equipment"
 msgstr ""
 
-#: src/panasonicmn.cpp:344 src/properties.cpp:488 src/tags.cpp:393
+#: src/panasonicmn.cpp:350 src/properties.cpp:504 src/tags.cpp:476
 msgid "Model"
 msgstr "Model"
 
-#: src/panasonicmn.cpp:344
+#: src/panasonicmn.cpp:350
+#, fuzzy
 msgid "The model name or model number of the equipment"
-msgstr ""
+msgstr "Názov scény"
 
 # exif-stripoffsets
-#: src/panasonicmn.cpp:345 src/tags.cpp:399
+#: src/panasonicmn.cpp:351 src/tags.cpp:482
 msgid "Strip Offsets"
 msgstr "umiestnenie obrazových dát"
 
 # exif-stripoffsets
-#: src/panasonicmn.cpp:345
+#: src/panasonicmn.cpp:351
 #, fuzzy
 msgid "Strip offsets"
 msgstr "umiestnenie obrazových dát"
 
-#: src/panasonicmn.cpp:346 src/properties.cpp:455 src/tags.cpp:406
+#: src/panasonicmn.cpp:352 src/properties.cpp:471 src/tags.cpp:489
 msgid "Orientation"
 msgstr "Orientácia"
 
 # exif-rowsperstrip
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 #, fuzzy
 msgid "Rows Per Strip"
 msgstr "riadkov na prúžok"
 
-#: src/panasonicmn.cpp:347
+#: src/panasonicmn.cpp:353
 #, fuzzy
 msgid "The number of rows per strip"
 msgstr "Počet úderov."
 
 # exif-stripbytecounts
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip Byte Counts"
 msgstr "bajtov na komprimovaný prúžok"
 
 # exif-stripbytecounts
-#: src/panasonicmn.cpp:348
+#: src/panasonicmn.cpp:354
 #, fuzzy
 msgid "Strip byte counts"
 msgstr "bajtov na komprimovaný prúžok"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw Data Offset"
 msgstr "umiestnenie IFD"
 
-#: src/panasonicmn.cpp:349
+#: src/panasonicmn.cpp:355
 #, fuzzy
 msgid "Raw data offset"
 msgstr "Hlavička, ofset"
 
-#: src/panasonicmn.cpp:350 src/tags.cpp:608
+#: src/panasonicmn.cpp:356 src/tags.cpp:795
 msgid "Exif IFD Pointer"
 msgstr ""
 
-#: src/panasonicmn.cpp:350
+#: src/panasonicmn.cpp:356
 msgid "A pointer to the Exif IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:351 src/tags.cpp:619
+#: src/panasonicmn.cpp:357 src/tags.cpp:806
+#, fuzzy
 msgid "GPS Info IFD Pointer"
-msgstr ""
+msgstr "IFD ukazovateľ interoperability"
 
-#: src/panasonicmn.cpp:351
+#: src/panasonicmn.cpp:357
 msgid "A pointer to the GPS Info IFD"
 msgstr ""
 
-#: src/panasonicmn.cpp:353
+#: src/panasonicmn.cpp:359
 #, fuzzy
 msgid "Unknown PanasonicRaw tag"
 msgstr "Neznáma značka PanasonicMakerNote"
 
-#: src/pentaxmn.cpp:56
+#: src/pentaxmn.cpp:57
 msgid "Night-Scene"
 msgstr "Nočná scéna"
 
-#: src/pentaxmn.cpp:62
+#: src/pentaxmn.cpp:63
 msgid "Optio 330/430"
 msgstr "Optio 330/430"
 
-#: src/pentaxmn.cpp:63
+#: src/pentaxmn.cpp:64
 msgid "Optio 230"
 msgstr "Optio 230"
 
-#: src/pentaxmn.cpp:64
+#: src/pentaxmn.cpp:65
 msgid "Optio 330GS"
 msgstr "Optio 330GS"
 
-#: src/pentaxmn.cpp:65
+#: src/pentaxmn.cpp:66
 msgid "Optio 450/550"
 msgstr "Optio 450/550"
 
-#: src/pentaxmn.cpp:66
+#: src/pentaxmn.cpp:67
 msgid "Optio S"
 msgstr "Optio S"
 
-#: src/pentaxmn.cpp:67
+#: src/pentaxmn.cpp:68
 msgid "*ist D"
 msgstr "*ist D"
 
-#: src/pentaxmn.cpp:68
+#: src/pentaxmn.cpp:69
 msgid "Optio 33L"
 msgstr "Optio 33L"
 
-#: src/pentaxmn.cpp:69
+#: src/pentaxmn.cpp:70
 msgid "Optio 33LF"
 msgstr "Optio 33LF"
 
-#: src/pentaxmn.cpp:70
+#: src/pentaxmn.cpp:71
 msgid "Optio 33WR/43WR/555"
 msgstr "Optio 33WR/43WR/555"
 
-#: src/pentaxmn.cpp:71
+#: src/pentaxmn.cpp:72
 msgid "Optio S4"
 msgstr "Optio S4"
 
-#: src/pentaxmn.cpp:72
+#: src/pentaxmn.cpp:73
 msgid "Optio MX"
 msgstr "Optio MX"
 
-#: src/pentaxmn.cpp:73
+#: src/pentaxmn.cpp:74
 msgid "Optio S40"
 msgstr "Optio S40"
 
-#: src/pentaxmn.cpp:74
+#: src/pentaxmn.cpp:75
 msgid "Optio S4i"
 msgstr "Optio S4i"
 
-#: src/pentaxmn.cpp:75
+#: src/pentaxmn.cpp:76
 msgid "Optio 30"
 msgstr "Optio 30"
 
-#: src/pentaxmn.cpp:76
+#: src/pentaxmn.cpp:77
 msgid "Optio S30"
 msgstr "Optio S30"
 
-#: src/pentaxmn.cpp:77
+#: src/pentaxmn.cpp:78
 msgid "Optio 750Z"
 msgstr "Optio 750Z"
 
-#: src/pentaxmn.cpp:78
+#: src/pentaxmn.cpp:79
 msgid "Optio SV"
 msgstr "Optio SV"
 
-#: src/pentaxmn.cpp:79
+#: src/pentaxmn.cpp:80
 msgid "Optio SVi"
 msgstr "Optio SVi"
 
-#: src/pentaxmn.cpp:80
+#: src/pentaxmn.cpp:81
 msgid "Optio X"
 msgstr "Optio X"
 
-#: src/pentaxmn.cpp:81
+#: src/pentaxmn.cpp:82
 msgid "Optio S5i"
 msgstr "Optio S5i"
 
-#: src/pentaxmn.cpp:82
+#: src/pentaxmn.cpp:83
 msgid "Optio S50"
 msgstr "Optio S50"
 
-#: src/pentaxmn.cpp:83
+#: src/pentaxmn.cpp:84
 msgid "*ist DS"
 msgstr "*ist DS"
 
-#: src/pentaxmn.cpp:84
+#: src/pentaxmn.cpp:85
 msgid "Optio MX4"
 msgstr "Optio MX4"
 
-#: src/pentaxmn.cpp:85
+#: src/pentaxmn.cpp:86
 msgid "Optio S5n"
 msgstr "Optio S5n"
 
-#: src/pentaxmn.cpp:86
+#: src/pentaxmn.cpp:87
 msgid "Optio WP"
 msgstr "Optio WP"
 
-#: src/pentaxmn.cpp:87
+#: src/pentaxmn.cpp:88
 msgid "Optio S55"
 msgstr "Optio S55"
 
-#: src/pentaxmn.cpp:88
+#: src/pentaxmn.cpp:89
 msgid "Optio S5z"
 msgstr "Optio S5z"
 
-#: src/pentaxmn.cpp:89
+#: src/pentaxmn.cpp:90
 msgid "*ist DL"
 msgstr "*ist DL"
 
-#: src/pentaxmn.cpp:90
+#: src/pentaxmn.cpp:91
 msgid "Optio S60"
 msgstr "Optio S60"
 
-#: src/pentaxmn.cpp:91
+#: src/pentaxmn.cpp:92
 msgid "Optio S45"
 msgstr "Optio S45"
 
-#: src/pentaxmn.cpp:92
+#: src/pentaxmn.cpp:93
 msgid "Optio S6"
 msgstr "Optio S6"
 
-#: src/pentaxmn.cpp:93
+#: src/pentaxmn.cpp:94
 msgid "Optio WPi"
 msgstr "Optio WPi"
 
-#: src/pentaxmn.cpp:94
+#: src/pentaxmn.cpp:95
 msgid "BenQ DC X600"
 msgstr "BenQ DC X600"
 
-#: src/pentaxmn.cpp:95
+#: src/pentaxmn.cpp:96
 msgid "*ist DS2"
 msgstr "*ist DS2"
 
-#: src/pentaxmn.cpp:96
+#: src/pentaxmn.cpp:97
 msgid "Samsung GX-1S"
 msgstr "Samsung GX-1S"
 
-#: src/pentaxmn.cpp:97
+#: src/pentaxmn.cpp:98
 msgid "Optio A10"
 msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:98
+#: src/pentaxmn.cpp:99
 msgid "*ist DL2"
 msgstr "*ist DL2"
 
-#: src/pentaxmn.cpp:99
+#: src/pentaxmn.cpp:100
 msgid "Samsung GX-1L"
 msgstr "Samsung GX-1L"
 
-#: src/pentaxmn.cpp:100
+#: src/pentaxmn.cpp:101
 msgid "K100D"
 msgstr "K100D"
 
-#: src/pentaxmn.cpp:101
+#: src/pentaxmn.cpp:102
 msgid "K110D"
 msgstr "K110D"
 
-#: src/pentaxmn.cpp:102
+#: src/pentaxmn.cpp:103
 msgid "K100D Super"
 msgstr "K100D Super"
 
-#: src/pentaxmn.cpp:103
-msgid "Optio T10"
+#: src/pentaxmn.cpp:104
+#, fuzzy
+msgid "Optio T10/T20"
 msgstr "Optio T10"
 
-#: src/pentaxmn.cpp:104
+#: src/pentaxmn.cpp:105
 msgid "Optio W10"
 msgstr "Optio W10"
 
-#: src/pentaxmn.cpp:105
+#: src/pentaxmn.cpp:106
 msgid "Optio M10"
 msgstr "Optio M10"
 
-#: src/pentaxmn.cpp:106
+#: src/pentaxmn.cpp:107
 msgid "K10D"
 msgstr "K10D"
 
-#: src/pentaxmn.cpp:107
+#: src/pentaxmn.cpp:108
 msgid "Samsung GX10"
 msgstr "Samsung GX10"
 
-#: src/pentaxmn.cpp:108
+#: src/pentaxmn.cpp:109
 msgid "Optio S7"
 msgstr "Optio S7"
 
-#: src/pentaxmn.cpp:109
+#: src/pentaxmn.cpp:110
+#, fuzzy
+msgid "Optio L20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:111
 msgid "Optio M20"
 msgstr "Optio M20"
 
-#: src/pentaxmn.cpp:110
+#: src/pentaxmn.cpp:112
 msgid "Optio W20"
 msgstr "Optio W20"
 
-#: src/pentaxmn.cpp:111
+#: src/pentaxmn.cpp:113
 msgid "Optio A20"
 msgstr "Optio A20"
 
-#: src/pentaxmn.cpp:112
+#: src/pentaxmn.cpp:114
 msgid "Optio M30"
 msgstr "Optio M30"
 
-#: src/pentaxmn.cpp:113
+#: src/pentaxmn.cpp:115
 msgid "Optio E30"
 msgstr "Optio E30"
 
-#: src/pentaxmn.cpp:114
+#: src/pentaxmn.cpp:116
+#, fuzzy
+msgid "Optio E35"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:117
 msgid "Optio T30"
 msgstr "Optio T30"
 
-#: src/pentaxmn.cpp:115
+#: src/pentaxmn.cpp:118
 msgid "Optio W30"
 msgstr "Optio W30"
 
-#: src/pentaxmn.cpp:116
+#: src/pentaxmn.cpp:119
 msgid "Optio A30"
 msgstr "Optio A30"
 
-#: src/pentaxmn.cpp:117
+#: src/pentaxmn.cpp:120
 msgid "Optio E40"
 msgstr "Optio E40"
 
-#: src/pentaxmn.cpp:118
+#: src/pentaxmn.cpp:121
 msgid "Optio M40"
 msgstr "Optio M40"
 
-#: src/pentaxmn.cpp:119
+#: src/pentaxmn.cpp:122
 #, fuzzy
 msgid "Optio Z10"
 msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:120 src/pentaxmn.cpp:124
+#: src/pentaxmn.cpp:123
+#, fuzzy
+msgid "K20D"
+msgstr "K10D"
+
+#: src/pentaxmn.cpp:124
+#, fuzzy
+msgid "Samsung GX20"
+msgstr "Samsung GX10"
+
+#: src/pentaxmn.cpp:125
 msgid "Optio S10"
 msgstr "Optio S10"
 
-#: src/pentaxmn.cpp:121 src/pentaxmn.cpp:125
+#: src/pentaxmn.cpp:126
 #, fuzzy
 msgid "Optio A40"
 msgstr "Optio S40"
 
-#: src/pentaxmn.cpp:122 src/pentaxmn.cpp:126
+#: src/pentaxmn.cpp:127
+#, fuzzy
+msgid "Optio V10"
+msgstr "Optio A10"
+
+#: src/pentaxmn.cpp:128
+#, fuzzy
+msgid "K200D"
+msgstr "K100D"
+
+#: src/pentaxmn.cpp:129
+#, fuzzy
+msgid "Optio S12"
+msgstr "Optio S10"
+
+#: src/pentaxmn.cpp:130
+#, fuzzy
+msgid "Optio E50"
+msgstr "Optio S50"
+
+#: src/pentaxmn.cpp:131
+#, fuzzy
+msgid "Optio M50"
+msgstr "Optio S50"
+
+#: src/pentaxmn.cpp:132
+#, fuzzy
+msgid "Optio V20"
+msgstr "Optio 230"
+
+#: src/pentaxmn.cpp:133
+#, fuzzy
+msgid "Optio W60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:134
+#, fuzzy
+msgid "Optio M60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:135
+#, fuzzy
+msgid "Optio E60"
+msgstr "Optio S60"
+
+#: src/pentaxmn.cpp:136
+#, fuzzy
+msgid "K2000"
+msgstr "K100D"
+
+#: src/pentaxmn.cpp:137
+msgid "K-m"
+msgstr ""
+
+#: src/pentaxmn.cpp:138
+#, fuzzy
+msgid "Optio P70"
+msgstr "Optio 750Z"
+
+#: src/pentaxmn.cpp:139
+#, fuzzy
+msgid "Optio E70"
+msgstr "Optio E30"
+
+#: src/pentaxmn.cpp:140
+msgid "X70"
+msgstr ""
+
+#: src/pentaxmn.cpp:141
+msgid "K-7"
+msgstr ""
+
+#: src/pentaxmn.cpp:142
 #, fuzzy
-msgid "Optio V10"
-msgstr "Optio A10"
+msgid "Optio W80"
+msgstr "Optio W10"
 
-#: src/pentaxmn.cpp:123
+#: src/pentaxmn.cpp:143
 #, fuzzy
-msgid "K20D"
-msgstr "K10D"
+msgid "Optio P80"
+msgstr "Optio 30"
 
-#: src/pentaxmn.cpp:127
+#: src/pentaxmn.cpp:144
 #, fuzzy
-msgid "K200D"
-msgstr "K100D"
+msgid "Optio WS80"
+msgstr "Optio S40"
 
-#: src/pentaxmn.cpp:128
+#: src/pentaxmn.cpp:145
+msgid "K-x"
+msgstr ""
+
+#: src/pentaxmn.cpp:146
 #, fuzzy
-msgid "Optio E50"
-msgstr "Optio S50"
+msgid "645D"
+msgstr "64"
 
-#: src/pentaxmn.cpp:129
+#: src/pentaxmn.cpp:147
 #, fuzzy
-msgid "Optio M50"
-msgstr "Optio S50"
+msgid "Optio I-10"
+msgstr "Optio A10"
 
-#: src/pentaxmn.cpp:134
+#: src/pentaxmn.cpp:152
 msgid "Good"
 msgstr "dobrý"
 
-#: src/pentaxmn.cpp:135
+#: src/pentaxmn.cpp:153
 msgid "Better"
 msgstr "Lepší"
 
-#: src/pentaxmn.cpp:136
+#: src/pentaxmn.cpp:154
 msgid "Best"
 msgstr "Najlepší"
 
-#: src/pentaxmn.cpp:137
+#: src/pentaxmn.cpp:155
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/pentaxmn.cpp:139
+#: src/pentaxmn.cpp:157
 #, fuzzy
 msgid "Premium"
 msgstr "Stredný"
 
-#: src/pentaxmn.cpp:144
+#: src/pentaxmn.cpp:162
 msgid "640x480"
 msgstr "640x480"
 
-#: src/pentaxmn.cpp:145
-msgid "Full"
-msgstr "Plný"
-
-#: src/pentaxmn.cpp:146
+#: src/pentaxmn.cpp:164
 msgid "1024x768"
 msgstr "1024x768"
 
-#: src/pentaxmn.cpp:147
+#: src/pentaxmn.cpp:165
 msgid "1280x960"
 msgstr "1280x960"
 
-#: src/pentaxmn.cpp:148
+#: src/pentaxmn.cpp:166
 msgid "1600x1200"
 msgstr "1600x1200"
 
-#: src/pentaxmn.cpp:149
+#: src/pentaxmn.cpp:167
 msgid "2048x1536"
 msgstr "2048x1536"
 
-#: src/pentaxmn.cpp:150
+#: src/pentaxmn.cpp:168
 msgid "2560x1920 or 2304x1728"
 msgstr "2560x1920 alebo 2304x1728"
 
-#: src/pentaxmn.cpp:151
+#: src/pentaxmn.cpp:169
 msgid "3072x2304"
 msgstr "3072x2304"
 
-#: src/pentaxmn.cpp:152
+#: src/pentaxmn.cpp:170
 msgid "3264x2448"
 msgstr "3264x2448"
 
-#: src/pentaxmn.cpp:153
+#: src/pentaxmn.cpp:171
 msgid "320x240"
 msgstr "320x240"
 
-#: src/pentaxmn.cpp:154
+#: src/pentaxmn.cpp:172
 msgid "2288x1712"
 msgstr "2288x1712"
 
-#: src/pentaxmn.cpp:155
+#: src/pentaxmn.cpp:173
 msgid "2592x1944"
 msgstr "2592x1944"
 
-#: src/pentaxmn.cpp:156
+#: src/pentaxmn.cpp:174
 msgid "2304x1728 or 2592x1944"
 msgstr "2304x1728 alebo 2592x1944"
 
-#: src/pentaxmn.cpp:157
+#: src/pentaxmn.cpp:175
 msgid "3056x2296"
 msgstr "3056x2296"
 
-#: src/pentaxmn.cpp:158
+#: src/pentaxmn.cpp:176
 msgid "2816x2212 or 2816x2112"
 msgstr "2816x2212 alebo 2816x2112"
 
-#: src/pentaxmn.cpp:159
+#: src/pentaxmn.cpp:177
 msgid "3648x2736"
 msgstr "3648x2736"
 
-#: src/pentaxmn.cpp:164
+#: src/pentaxmn.cpp:182
 msgid "Auto, Did not fire"
 msgstr "auto, blesk sa nespustil"
 
-#: src/pentaxmn.cpp:166
+#: src/pentaxmn.cpp:184
 msgid "Auto, Did not fire, Red-eye reduction"
 msgstr "automaticky, blesk sa nespustil, korekcia červených očí"
 
-#: src/pentaxmn.cpp:167
+#: src/pentaxmn.cpp:185
 msgid "Auto, Fired"
 msgstr "auto, blesk sa spustil"
 
-#: src/pentaxmn.cpp:169
+#: src/pentaxmn.cpp:187
 msgid "Auto, Fired, Red-eye reduction"
 msgstr "auto, blesk sa spustil, korekcia červených očí"
 
-#: src/pentaxmn.cpp:170
+#: src/pentaxmn.cpp:188
 msgid "On, Red-eye reduction"
 msgstr "Zap., korekcia červených očí"
 
-#: src/pentaxmn.cpp:171
+#: src/pentaxmn.cpp:189
 msgid "On, Wireless"
 msgstr "zapnuté, bezdrôtovo"
 
-#: src/pentaxmn.cpp:172
+#: src/pentaxmn.cpp:190
 msgid "On, Soft"
 msgstr "zapnutý, mäkký"
 
-#: src/pentaxmn.cpp:173
+#: src/pentaxmn.cpp:191
 msgid "On, Slow-sync"
 msgstr "zapnuté, pomalá synchr."
 
-#: src/pentaxmn.cpp:174
+#: src/pentaxmn.cpp:192
 msgid "On, Slow-sync, Red-eye reduction"
 msgstr "zapnutý, pomalá synch., korekcia červených očí"
 
-#: src/pentaxmn.cpp:175
+#: src/pentaxmn.cpp:193
 msgid "On, Trailing-curtain Sync"
 msgstr "zapnuté, synchr. koncovej záclony"
 
-#: src/pentaxmn.cpp:184
+#: src/pentaxmn.cpp:203
 msgid "Pan Focus"
 msgstr "posúvať zaostrenie"
 
 # AF = automatické zaostrenie
-#: src/pentaxmn.cpp:185
+#: src/pentaxmn.cpp:204
 msgid "AF-S"
 msgstr "AZ-S"
 
 # AF = automatické zaostrenie
-#: src/pentaxmn.cpp:186
+#: src/pentaxmn.cpp:205
 msgid "AF-C"
 msgstr "AZ-C"
 
-#: src/pentaxmn.cpp:192
+# AF = automatické zaostrenie
+#: src/pentaxmn.cpp:206
+#, fuzzy
+msgid "AF-A"
+msgstr "AZ-S"
+
+#: src/pentaxmn.cpp:212
 msgid "Fixed Center"
 msgstr "pevný stred"
 
-#: src/pentaxmn.cpp:208 src/pentaxmn.cpp:225
+#: src/pentaxmn.cpp:213
+#, fuzzy
+msgid "Automatic Tracking AF"
+msgstr "automatické zaostrenie"
+
+#: src/pentaxmn.cpp:214
+msgid "Face Recognition AF"
+msgstr ""
+
+#: src/pentaxmn.cpp:231
+#, fuzzy
+msgid "Fixed Center or multiple"
+msgstr "pevný stred"
+
+#: src/pentaxmn.cpp:233
+#, fuzzy
+msgid "Top-center"
+msgstr "v strede"
+
+#: src/pentaxmn.cpp:239
+#, fuzzy
+msgid "Bottom-center"
+msgstr "vľavo dolu"
+
+#: src/pentaxmn.cpp:245 src/pentaxmn.cpp:267 src/pentaxmn.cpp:275
 msgid "50"
 msgstr "50"
 
-#: src/pentaxmn.cpp:209
+#: src/pentaxmn.cpp:246
 msgid "64"
 msgstr "64"
 
-#: src/pentaxmn.cpp:210
+#: src/pentaxmn.cpp:247
 msgid "80"
 msgstr "80"
 
-#: src/pentaxmn.cpp:211 src/pentaxmn.cpp:226
+#: src/pentaxmn.cpp:248 src/pentaxmn.cpp:268 src/pentaxmn.cpp:277
 msgid "100"
 msgstr "&"
 
-#: src/pentaxmn.cpp:212
+#: src/pentaxmn.cpp:249
 msgid "125"
 msgstr "125"
 
-#: src/pentaxmn.cpp:213
+#: src/pentaxmn.cpp:250
 msgid "160"
 msgstr "160"
 
-#: src/pentaxmn.cpp:214 src/pentaxmn.cpp:227 src/pentaxmn.cpp:228
+#: src/pentaxmn.cpp:251 src/pentaxmn.cpp:269 src/pentaxmn.cpp:270
+#: src/pentaxmn.cpp:279
 msgid "200"
 msgstr "&"
 
-#: src/pentaxmn.cpp:215
+#: src/pentaxmn.cpp:252
 msgid "250"
 msgstr "250"
 
-#: src/pentaxmn.cpp:216
+#: src/pentaxmn.cpp:253
 msgid "320"
 msgstr "320"
 
-#: src/pentaxmn.cpp:217 src/pentaxmn.cpp:229
+#: src/pentaxmn.cpp:254 src/pentaxmn.cpp:271 src/pentaxmn.cpp:281
 msgid "400"
 msgstr "&"
 
-#: src/pentaxmn.cpp:218
+#: src/pentaxmn.cpp:255
 msgid "500"
 msgstr "500"
 
-#: src/pentaxmn.cpp:219
+#: src/pentaxmn.cpp:256
 msgid "640"
 msgstr "640"
 
-#: src/pentaxmn.cpp:220 src/pentaxmn.cpp:230
+#: src/pentaxmn.cpp:257 src/pentaxmn.cpp:272 src/pentaxmn.cpp:283
 msgid "800"
 msgstr "800"
 
-#: src/pentaxmn.cpp:221
+#: src/pentaxmn.cpp:258
 msgid "1000"
 msgstr "1000"
 
-#: src/pentaxmn.cpp:222
+#: src/pentaxmn.cpp:259
 msgid "1250"
 msgstr "1250"
 
-#: src/pentaxmn.cpp:223 src/pentaxmn.cpp:231
+#: src/pentaxmn.cpp:260 src/pentaxmn.cpp:273 src/pentaxmn.cpp:285
 msgid "1600"
 msgstr "1600"
 
-#: src/pentaxmn.cpp:224 src/pentaxmn.cpp:232
+#: src/pentaxmn.cpp:261
+#, fuzzy
+msgid "2000"
+msgstr "&"
+
+#: src/pentaxmn.cpp:262
+#, fuzzy
+msgid "2500"
+msgstr "&"
+
+#: src/pentaxmn.cpp:263 src/pentaxmn.cpp:274 src/pentaxmn.cpp:287
 msgid "3200"
 msgstr "3200"
 
+#: src/pentaxmn.cpp:264
+#, fuzzy
+msgid "4000"
+msgstr "&"
+
+#: src/pentaxmn.cpp:265
+#, fuzzy
+msgid "5000"
+msgstr "500"
+
+#: src/pentaxmn.cpp:266
+#, fuzzy
+msgid "6400"
+msgstr "&"
+
+#: src/pentaxmn.cpp:276
+#, fuzzy
+msgid "70"
+msgstr "50"
+
+#: src/pentaxmn.cpp:278
+#, fuzzy
+msgid "140"
+msgstr "10s"
+
+#: src/pentaxmn.cpp:280
+#, fuzzy
+msgid "280"
+msgstr "80"
+
+#: src/pentaxmn.cpp:282
+#, fuzzy
+msgid "560"
+msgstr "50"
+
+#: src/pentaxmn.cpp:284
+#, fuzzy
+msgid "1100"
+msgstr "&"
+
+#: src/pentaxmn.cpp:286
+#, fuzzy
+msgid "2200"
+msgstr "&"
+
 # exif-meteringmode-4
-#: src/pentaxmn.cpp:249
+#: src/pentaxmn.cpp:304
 msgid "Multi Segment"
 msgstr "Viacbodový"
 
-#: src/pentaxmn.cpp:250
+#: src/pentaxmn.cpp:305
 msgid "Center Weighted"
 msgstr "Stredovo vážený"
 
 # exif-lightsource-12
-#: src/pentaxmn.cpp:262
+#: src/pentaxmn.cpp:317
 msgid "DaylightFluorescent"
 msgstr "denné svetlo, fluorescenčné"
 
 # exif-lightsource-13
-#: src/pentaxmn.cpp:263
+#: src/pentaxmn.cpp:318
 msgid "DaywhiteFluorescent"
 msgstr "biely deň, fluorescenčné"
 
 # exif-lightsource-15
-#: src/pentaxmn.cpp:264
+#: src/pentaxmn.cpp:319
 msgid "WhiteFluorescent"
 msgstr "biela, fluorescenčná"
 
-#: src/pentaxmn.cpp:268
+#: src/pentaxmn.cpp:324
 msgid "User Selected"
 msgstr "Vybrané používateľom"
 
-#: src/pentaxmn.cpp:273
+#: src/pentaxmn.cpp:329
 msgid "Auto (Daylight)"
 msgstr "Auto (denné svetlo)"
 
-#: src/pentaxmn.cpp:274
+#: src/pentaxmn.cpp:330
 msgid "Auto (Shade)"
 msgstr "Auto (tieň)"
 
-#: src/pentaxmn.cpp:275
+#: src/pentaxmn.cpp:331
 msgid "Auto (Flash)"
 msgstr "Auto (blesk)"
 
-#: src/pentaxmn.cpp:276
+#: src/pentaxmn.cpp:332
 msgid "Auto (Tungsten)"
 msgstr "Auto (volfrám)"
 
-#: src/pentaxmn.cpp:277
+#: src/pentaxmn.cpp:333
 msgid "Auto (DaywhiteFluorescent)"
 msgstr "Auto (biely deň, fluorescenčné)"
 
-#: src/pentaxmn.cpp:278
+#: src/pentaxmn.cpp:334
 msgid "Auto (WhiteFluorescent)"
 msgstr "Auto (biela, fluorescenčná)"
 
-#: src/pentaxmn.cpp:279
+#: src/pentaxmn.cpp:335
 msgid "Auto (Cloudy)"
 msgstr "Auto (oblačno)"
 
-#: src/pentaxmn.cpp:281
+#: src/pentaxmn.cpp:337
 msgid "Preset (Fireworks?)"
 msgstr "Štandard (ohňostroj?)"
 
-#: src/pentaxmn.cpp:289 src/pentaxmn.cpp:300
+#: src/pentaxmn.cpp:345 src/pentaxmn.cpp:358
 msgid "Med Low"
 msgstr "stredne nízky"
 
-#: src/pentaxmn.cpp:290 src/pentaxmn.cpp:301
+#: src/pentaxmn.cpp:346 src/pentaxmn.cpp:359
 msgid "Med High"
 msgstr "stredne vysoký"
 
-#: src/pentaxmn.cpp:291 src/pentaxmn.cpp:302
-msgid "Very Low"
-msgstr "veľmi nízky"
-
-#: src/pentaxmn.cpp:311
+#: src/pentaxmn.cpp:369
 msgid "Med Soft"
 msgstr "stredne mäkký"
 
-#: src/pentaxmn.cpp:312
+#: src/pentaxmn.cpp:370
 msgid "Med Hard"
 msgstr "stredne tvrdý"
 
-#: src/pentaxmn.cpp:313
+#: src/pentaxmn.cpp:371
 msgid "Very Soft"
 msgstr "veľmi mäkký"
 
-#: src/pentaxmn.cpp:314
+#: src/pentaxmn.cpp:372
 msgid "Very Hard"
 msgstr "veľmi tvrdý"
 
-#: src/pentaxmn.cpp:319 src/pentaxmn.cpp:870
+#: src/pentaxmn.cpp:377 src/pentaxmn.cpp:960
 msgid "Home town"
 msgstr "Domovské mesto"
 
-#: src/pentaxmn.cpp:325
+#: src/pentaxmn.cpp:383
 msgid "Pago Pago"
 msgstr "Pago Pago"
 
-#: src/pentaxmn.cpp:326
+#: src/pentaxmn.cpp:384
 msgid "Honolulu"
 msgstr "Honolulu"
 
-#: src/pentaxmn.cpp:327
+#: src/pentaxmn.cpp:385
 msgid "Anchorage"
 msgstr "Ukotvenie"
 
-#: src/pentaxmn.cpp:328
+#: src/pentaxmn.cpp:386
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: src/pentaxmn.cpp:329
+#: src/pentaxmn.cpp:387
 msgid "San Fransisco"
 msgstr "San Fransisco"
 
-#: src/pentaxmn.cpp:330
+#: src/pentaxmn.cpp:388
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: src/pentaxmn.cpp:331
+#: src/pentaxmn.cpp:389
 msgid "Calgary"
 msgstr "Calgary"
 
-#: src/pentaxmn.cpp:332
+#: src/pentaxmn.cpp:390
 msgid "Denver"
 msgstr "Denver"
 
-#: src/pentaxmn.cpp:333
+#: src/pentaxmn.cpp:391
 msgid "Mexico City"
 msgstr "Mexico City"
 
-#: src/pentaxmn.cpp:334
+#: src/pentaxmn.cpp:392
 msgid "Chicago"
 msgstr "Chicago"
 
-#: src/pentaxmn.cpp:335
+#: src/pentaxmn.cpp:393
 msgid "Miami"
 msgstr "Miami"
 
-#: src/pentaxmn.cpp:336
+#: src/pentaxmn.cpp:394
 msgid "Toronto"
 msgstr "Toronto"
 
-#: src/pentaxmn.cpp:337
+#: src/pentaxmn.cpp:395
 msgid "New York"
 msgstr "New York"
 
-#: src/pentaxmn.cpp:338
+#: src/pentaxmn.cpp:396
 msgid "Santiago"
 msgstr "Santiago"
 
-#: src/pentaxmn.cpp:339
+#: src/pentaxmn.cpp:397
 msgid "Caracus"
 msgstr "Caracus"
 
-#: src/pentaxmn.cpp:340
+#: src/pentaxmn.cpp:398
 msgid "Halifax"
 msgstr "Halifax"
 
-#: src/pentaxmn.cpp:341
+#: src/pentaxmn.cpp:399
 msgid "Buenos Aires"
 msgstr "Buenos Aires"
 
-#: src/pentaxmn.cpp:342
+#: src/pentaxmn.cpp:400
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: src/pentaxmn.cpp:343
+#: src/pentaxmn.cpp:401
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
-#: src/pentaxmn.cpp:344
+#: src/pentaxmn.cpp:402
 msgid "Madrid"
 msgstr "Madrid"
 
-#: src/pentaxmn.cpp:345
+#: src/pentaxmn.cpp:403
 msgid "London"
 msgstr "Londýn"
 
-#: src/pentaxmn.cpp:346
+#: src/pentaxmn.cpp:404
 msgid "Paris"
 msgstr "Paríž"
 
-#: src/pentaxmn.cpp:347
+#: src/pentaxmn.cpp:405
 msgid "Milan"
 msgstr "Miláno"
 
-#: src/pentaxmn.cpp:348
+#: src/pentaxmn.cpp:406
 msgid "Rome"
 msgstr "Rím"
 
-#: src/pentaxmn.cpp:349
+#: src/pentaxmn.cpp:407
 msgid "Berlin"
 msgstr "Berlín"
 
-#: src/pentaxmn.cpp:350
+#: src/pentaxmn.cpp:408
 msgid "Johannesburg"
 msgstr "Johannesburg"
 
-#: src/pentaxmn.cpp:351
+#: src/pentaxmn.cpp:409
 msgid "Istanbul"
 msgstr "Istambul"
 
-#: src/pentaxmn.cpp:352
+#: src/pentaxmn.cpp:410
 msgid "Cairo"
 msgstr "Káhira"
 
-#: src/pentaxmn.cpp:353
+#: src/pentaxmn.cpp:411
 msgid "Jerusalem"
 msgstr "Jeruzalem"
 
-#: src/pentaxmn.cpp:354
+#: src/pentaxmn.cpp:412
 msgid "Moscow"
 msgstr "Moskva"
 
-#: src/pentaxmn.cpp:355
+#: src/pentaxmn.cpp:413
 msgid "Jeddah"
 msgstr "Jeddah"
 
-#: src/pentaxmn.cpp:356
+#: src/pentaxmn.cpp:414
 msgid "Tehran"
 msgstr "Teherán"
 
-#: src/pentaxmn.cpp:357
+#: src/pentaxmn.cpp:415
 msgid "Dubai"
 msgstr "Dubaj"
 
-#: src/pentaxmn.cpp:358
+#: src/pentaxmn.cpp:416
 msgid "Karachi"
 msgstr "Karáčí"
 
-#: src/pentaxmn.cpp:359
+#: src/pentaxmn.cpp:417
 msgid "Kabul"
 msgstr "Kábul"
 
-#: src/pentaxmn.cpp:360
+#: src/pentaxmn.cpp:418
 msgid "Male"
 msgstr "Male"
 
-#: src/pentaxmn.cpp:361
+#: src/pentaxmn.cpp:419
 msgid "Delhi"
 msgstr "Delhi"
 
-#: src/pentaxmn.cpp:362
+#: src/pentaxmn.cpp:420
 msgid "Colombo"
 msgstr "Colombo"
 
-#: src/pentaxmn.cpp:363
+#: src/pentaxmn.cpp:421
 msgid "Kathmandu"
 msgstr "Káthmandu"
 
-#: src/pentaxmn.cpp:364
+#: src/pentaxmn.cpp:422
 msgid "Dacca"
 msgstr "Dacca"
 
-#: src/pentaxmn.cpp:365
+#: src/pentaxmn.cpp:423
 msgid "Yangon"
 msgstr "Yangon"
 
-#: src/pentaxmn.cpp:366
+#: src/pentaxmn.cpp:424
 msgid "Bangkok"
 msgstr "Bangkok"
 
-#: src/pentaxmn.cpp:367
+#: src/pentaxmn.cpp:425
 msgid "Kuala Lumpur"
 msgstr "Kuala Lumpur"
 
-#: src/pentaxmn.cpp:368
+#: src/pentaxmn.cpp:426
 msgid "Vientiane"
 msgstr "Vientiane"
 
-#: src/pentaxmn.cpp:369
+#: src/pentaxmn.cpp:427
 msgid "Singapore"
 msgstr "Singapur"
 
-#: src/pentaxmn.cpp:370
+#: src/pentaxmn.cpp:428
 msgid "Phnom Penh"
 msgstr "Phnom Pénh"
 
-#: src/pentaxmn.cpp:371
+#: src/pentaxmn.cpp:429
 msgid "Ho Chi Minh"
 msgstr "Ho Chi Minh"
 
-#: src/pentaxmn.cpp:372
+#: src/pentaxmn.cpp:430
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: src/pentaxmn.cpp:373
+#: src/pentaxmn.cpp:431
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: src/pentaxmn.cpp:374
+#: src/pentaxmn.cpp:432
 msgid "Perth"
 msgstr "Perth"
 
-#: src/pentaxmn.cpp:375
+#: src/pentaxmn.cpp:433
 msgid "Beijing"
 msgstr "Peking"
 
-#: src/pentaxmn.cpp:376
+#: src/pentaxmn.cpp:434
 msgid "Shanghai"
 msgstr "Šanghaj"
 
-#: src/pentaxmn.cpp:377
+#: src/pentaxmn.cpp:435
 msgid "Manila"
 msgstr "Manila"
 
-#: src/pentaxmn.cpp:378
+#: src/pentaxmn.cpp:436
 msgid "Taipei"
 msgstr "Tchaj-pej"
 
-#: src/pentaxmn.cpp:379
+#: src/pentaxmn.cpp:437
 msgid "Seoul"
 msgstr "Soul"
 
-#: src/pentaxmn.cpp:380
+#: src/pentaxmn.cpp:438
 msgid "Adelaide"
 msgstr "Adelaide"
 
-#: src/pentaxmn.cpp:381
+#: src/pentaxmn.cpp:439
 msgid "Tokyo"
 msgstr "Tokio"
 
-#: src/pentaxmn.cpp:382
+#: src/pentaxmn.cpp:440
 msgid "Guam"
 msgstr "Guam"
 
-#: src/pentaxmn.cpp:383
+#: src/pentaxmn.cpp:441
 msgid "Sydney"
 msgstr "Sydney"
 
-#: src/pentaxmn.cpp:384
+#: src/pentaxmn.cpp:442
 msgid "Noumea"
 msgstr "Noumea"
 
-#: src/pentaxmn.cpp:385
+#: src/pentaxmn.cpp:443
 msgid "Wellington"
 msgstr "Wellington"
 
-#: src/pentaxmn.cpp:386
+#: src/pentaxmn.cpp:444
 msgid "Auckland"
 msgstr "Auckland"
 
-#: src/pentaxmn.cpp:387
+#: src/pentaxmn.cpp:445
 msgid "Lima"
 msgstr "Lima"
 
-#: src/pentaxmn.cpp:388
+#: src/pentaxmn.cpp:446
 msgid "Dakar"
 msgstr "Dakar"
 
-#: src/pentaxmn.cpp:389
+#: src/pentaxmn.cpp:447
 msgid "Algiers"
 msgstr "Algiers"
 
-#: src/pentaxmn.cpp:390
+#: src/pentaxmn.cpp:448
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: src/pentaxmn.cpp:391
+#: src/pentaxmn.cpp:449
 msgid "Athens"
 msgstr "Athény"
 
-#: src/pentaxmn.cpp:392
+#: src/pentaxmn.cpp:450
 msgid "Nairobi"
 msgstr "Nairobi"
 
-#: src/pentaxmn.cpp:393
+#: src/pentaxmn.cpp:451
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
-#: src/pentaxmn.cpp:394
+#: src/pentaxmn.cpp:452
 msgid "Stockholm"
 msgstr "Štokholm"
 
-#: src/pentaxmn.cpp:395
+#: src/pentaxmn.cpp:453
 msgid "Lisbon"
 msgstr "Lisabon"
 
-#: src/pentaxmn.cpp:400
+#: src/pentaxmn.cpp:454
+#, fuzzy
+msgid "Copenhagen"
+msgstr "Pokrytie"
+
+#: src/pentaxmn.cpp:459
 msgid "Unprocessed"
 msgstr "Nespracovaný"
 
-#: src/pentaxmn.cpp:401
+#: src/pentaxmn.cpp:460
 msgid "Digital Filter"
 msgstr "Digitálny filter"
 
-#: src/pentaxmn.cpp:402
+#: src/pentaxmn.cpp:461
 msgid "Cropped"
 msgstr "Orezaný"
 
-#: src/pentaxmn.cpp:404
+#: src/pentaxmn.cpp:463
 msgid "Frame Synthesis?"
 msgstr "Syntéza rámcov?"
 
-#: src/pentaxmn.cpp:410 src/pentaxmn.cpp:444
+#: src/pentaxmn.cpp:469 src/pentaxmn.cpp:506
 msgid "MTF Program"
 msgstr "Program MTF"
 
-#: src/pentaxmn.cpp:416
+#: src/pentaxmn.cpp:475
 msgid "Night Scene Portrait"
 msgstr "Nočný portrét"
 
-#: src/pentaxmn.cpp:417
+#: src/pentaxmn.cpp:476
 msgid "No Flash"
 msgstr "Bez blesku"
 
-#: src/pentaxmn.cpp:420
+#: src/pentaxmn.cpp:479
 msgid "Surf & Snow"
 msgstr "surfovanie & sneh"
 
-#: src/pentaxmn.cpp:423
+#: src/pentaxmn.cpp:482
 msgid "Kids"
 msgstr "Deti"
 
-#: src/pentaxmn.cpp:428
+#: src/pentaxmn.cpp:487
+#, fuzzy
+msgid "Stage Lighting"
+msgstr "Výška obrázka"
+
+#: src/pentaxmn.cpp:488
+#, fuzzy
+msgid "Night Snap"
+msgstr "Nočný záber"
+
+#: src/pentaxmn.cpp:490
 msgid "Auto PICT (Standard)"
 msgstr "Auto PICT (štandard)"
 
-#: src/pentaxmn.cpp:429
+#: src/pentaxmn.cpp:491
 msgid "Auto PICT (Portrait)"
 msgstr "Auto PICT (portrét)"
 
-#: src/pentaxmn.cpp:430
+#: src/pentaxmn.cpp:492
 msgid "Auto PICT (Landscape)"
 msgstr "Auto PICT (krajinka)"
 
-#: src/pentaxmn.cpp:431
+#: src/pentaxmn.cpp:493
 msgid "Auto PICT (Macro)"
 msgstr "Auto PICT (makro)"
 
-#: src/pentaxmn.cpp:432
+#: src/pentaxmn.cpp:494
 msgid "Auto PICT (Sport)"
 msgstr "Auto PICT (šport)"
 
-#: src/pentaxmn.cpp:435 src/pentaxmn.cpp:445
+#: src/pentaxmn.cpp:497 src/pentaxmn.cpp:507
 msgid "Green Mode"
 msgstr "Zelený režim"
 
 # exif-exposureprogram-4
-#: src/pentaxmn.cpp:436 src/pentaxmn.cpp:446
+#: src/pentaxmn.cpp:498 src/pentaxmn.cpp:508
 msgid "Shutter Speed Priority"
 msgstr "Priorita rýchlosti uzávierky"
 
 # exif-exposureprogram-3
-#: src/pentaxmn.cpp:437 src/pentaxmn.cpp:447
+#: src/pentaxmn.cpp:499 src/pentaxmn.cpp:509
 msgid "Aperture Priority"
 msgstr "Priorita clony"
 
-#: src/pentaxmn.cpp:439 src/pentaxmn.cpp:451
+#: src/pentaxmn.cpp:501 src/pentaxmn.cpp:513
 msgid "Bulb"
 msgstr "Žiarovka"
 
-#: src/pentaxmn.cpp:442
+#: src/pentaxmn.cpp:504
 msgid "Hi-speed Program"
 msgstr "Vysokorýchlostný program"
 
-#: src/pentaxmn.cpp:443
+#: src/pentaxmn.cpp:505
 msgid "DOF Program"
 msgstr "Program DOF"
 
-#: src/pentaxmn.cpp:448
+#: src/pentaxmn.cpp:510
+#, fuzzy
 msgid "Program Tv Shift"
-msgstr ""
+msgstr "Posunutie programu"
 
-#: src/pentaxmn.cpp:449
+#: src/pentaxmn.cpp:511
+#, fuzzy
 msgid "Program Av Shift"
-msgstr ""
+msgstr "Posunutie programu"
 
 # FUZZY exif-exposureprogram-3
-#: src/pentaxmn.cpp:452
+#: src/pentaxmn.cpp:514
 msgid "Aperture Priority (Off-Auto-Aperture)"
 msgstr "Priorita clony (vyp. - auto - clona)"
 
-#: src/pentaxmn.cpp:453
+#: src/pentaxmn.cpp:515
 msgid "Manual (Off-Auto-Aperture)"
 msgstr "Ručné nastavenie (vyp. - auto - clona)"
 
-#: src/pentaxmn.cpp:454
+#: src/pentaxmn.cpp:516
 msgid "Bulb (Off-Auto-Aperture)"
 msgstr "Žiarovka (vyp. - auto - clona)"
 
-#: src/pentaxmn.cpp:456
+#: src/pentaxmn.cpp:518
 msgid "Shutter Priority"
 msgstr "Priorita uzávierky"
 
-#: src/pentaxmn.cpp:457
+#: src/pentaxmn.cpp:519
 msgid "Shutter & Aperture Priority AE"
 msgstr "Priorita uzávierky a clony AE"
 
-#: src/pentaxmn.cpp:458
+#: src/pentaxmn.cpp:520
 msgid "Shutter & Aperture Priority AE (1)"
 msgstr "Priorita uzávierky a clony AE (1)"
 
 # FUZZY exif-exposureprogram-4
-#: src/pentaxmn.cpp:459
+#: src/pentaxmn.cpp:521
 msgid "Sensitivity Priority AE"
 msgstr "Priorita citlivosti AE"
 
 # FUZZY exif-exposureprogram-4
-#: src/pentaxmn.cpp:460
+#: src/pentaxmn.cpp:522
 msgid "Sensitivity Priority AE (1)"
 msgstr "Priorita citlivosti AE (1)"
 
-#: src/pentaxmn.cpp:461
+#: src/pentaxmn.cpp:523
 msgid "Flash X-Sync Speed AE"
 msgstr "Blesk synch. s rýchlosťou AE"
 
-#: src/pentaxmn.cpp:462
+#: src/pentaxmn.cpp:524
 msgid "Flash X-Sync Speed AE (1)"
 msgstr "Blesk synch. s rýchlosťou AE (1)"
 
-#: src/pentaxmn.cpp:471
+#: src/pentaxmn.cpp:527
+msgid "Video (30 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:528
+msgid "Video (24 fps)"
+msgstr ""
+
+#: src/pentaxmn.cpp:535
 #, fuzzy
 msgid "Continuous (Hi)"
 msgstr "Spojitý"
 
-#: src/pentaxmn.cpp:472
+#: src/pentaxmn.cpp:536 src/sonymn.cpp:223
 #, fuzzy
 msgid "Burst"
 msgstr "Režim dávky"
 
-#: src/pentaxmn.cpp:473
+#: src/pentaxmn.cpp:538
 msgid "Self-timer (12 sec)"
 msgstr "samospúšť (12 sek)"
 
-#: src/pentaxmn.cpp:474
+#: src/pentaxmn.cpp:539
 msgid "Self-timer (2 sec)"
 msgstr "samospúšť (2 sek)"
 
-#: src/pentaxmn.cpp:475
+#: src/pentaxmn.cpp:540
 #, fuzzy
 msgid "Remote Control (3 sec)"
 msgstr "Diaľkové ovládanie?"
 
-#: src/pentaxmn.cpp:476
+#: src/pentaxmn.cpp:541
 #, fuzzy
 msgid "Remote Control"
 msgstr "Diaľkové ovládanie?"
 
-#: src/pentaxmn.cpp:477
-msgid "Multiple Exposure"
-msgstr "Viacnásobná expozícia"
+#: src/pentaxmn.cpp:543 src/properties.cpp:869
+#, fuzzy
+msgid "Video"
+msgstr "Široké"
 
-#: src/pentaxmn.cpp:488
+#: src/pentaxmn.cpp:554
 msgid "M-42 or No Lens"
 msgstr "šošovky M-42 alebo žiadne"
 
-#: src/pentaxmn.cpp:489
+#: src/pentaxmn.cpp:555
 msgid "K,M Lens"
 msgstr "šošovky K,M"
 
-#: src/pentaxmn.cpp:490
+#: src/pentaxmn.cpp:556
 msgid "A Series Lens"
 msgstr "Šošovky série A"
 
-#: src/pentaxmn.cpp:625
+#: src/pentaxmn.cpp:703
 msgid "Bright"
 msgstr "Jasný"
 
-#: src/pentaxmn.cpp:628
+#: src/pentaxmn.cpp:706
 msgid "Vibrant"
 msgstr ""
 
-#: src/pentaxmn.cpp:641
+#: src/pentaxmn.cpp:708
+msgid "Reversal film"
+msgstr ""
+
+#: src/pentaxmn.cpp:720
 #, fuzzy
 msgid "Weakest"
 msgstr "Západ"
 
-#: src/pentaxmn.cpp:642
+#: src/pentaxmn.cpp:721
 msgid "Weak"
 msgstr "Slabé"
 
-#: src/pentaxmn.cpp:643
+#: src/pentaxmn.cpp:722
 msgid "Strong"
 msgstr "Silný"
 
-#: src/pentaxmn.cpp:752
+#: src/pentaxmn.cpp:832
 msgid "No extended bracketing"
 msgstr "Bez rozšírených viacnásobných snímok"
 
-#: src/pentaxmn.cpp:758
+#: src/pentaxmn.cpp:838
 msgid "WB-BA"
 msgstr "WB-BA"
 
-#: src/pentaxmn.cpp:761
+#: src/pentaxmn.cpp:841
 msgid "WB-GM"
 msgstr "WB-GM"
 
-#: src/pentaxmn.cpp:773
+#: src/pentaxmn.cpp:853
 msgid "Unknown "
 msgstr "Neznáme"
 
-#: src/pentaxmn.cpp:786
+#: src/pentaxmn.cpp:866
 msgid "Pentax Makernote version"
 msgstr "Poznámka výrobcu Pentax"
 
-#: src/pentaxmn.cpp:789
+#: src/pentaxmn.cpp:869
 msgid "Camera shooting mode"
 msgstr "Režim záberu fotoaparátu"
 
-#: src/pentaxmn.cpp:791 src/pentaxmn.cpp:792
+#: src/pentaxmn.cpp:871 src/pentaxmn.cpp:872
 msgid "Resolution of a preview image"
 msgstr "Rozlíšenie náhľadu"
 
-#: src/pentaxmn.cpp:794
+#: src/pentaxmn.cpp:874
 msgid "Length of a preview image"
 msgstr "Dĺžka náhľadu"
 
-#: src/pentaxmn.cpp:795
+#: src/pentaxmn.cpp:875
 msgid "Size of an IFD containing a preview image"
 msgstr "Veľkosť IFD obsahujúceho náhľad obrázka"
 
-#: src/pentaxmn.cpp:800
+#: src/pentaxmn.cpp:880
 msgid "Model identification"
 msgstr "Model"
 
-#: src/pentaxmn.cpp:801
+#: src/pentaxmn.cpp:881
 msgid "Pentax model idenfication"
 msgstr "Identifikácia modelu Pentax"
 
-#: src/pentaxmn.cpp:803 src/pentaxmn.cpp:804 src/properties.cpp:132
+#: src/pentaxmn.cpp:883 src/pentaxmn.cpp:884 src/properties.cpp:140
 msgid "Date"
 msgstr "Dátum"
 
-#: src/pentaxmn.cpp:806 src/pentaxmn.cpp:807
+#: src/pentaxmn.cpp:886 src/pentaxmn.cpp:887
 msgid "Time"
 msgstr "Čas"
 
-#: src/pentaxmn.cpp:810
+#: src/pentaxmn.cpp:890
 msgid "Image quality settings"
 msgstr "Nastavenie kvality obrázka"
 
-#: src/pentaxmn.cpp:813
+#: src/pentaxmn.cpp:893
 msgid "Image size settings"
 msgstr "Nastavenie veľkosti obrázka"
 
-#: src/pentaxmn.cpp:817
+#: src/pentaxmn.cpp:897
 msgid "Flash mode settings"
 msgstr "Nastavenie režimu blesku"
 
-#: src/pentaxmn.cpp:820
+#: src/pentaxmn.cpp:900
 msgid "Focus mode settings"
 msgstr "Nastavenie režimu zaostrenia"
 
-#: src/pentaxmn.cpp:823
+#: src/pentaxmn.cpp:903
 msgid "Selected AF point"
 msgstr "Vybraný bod AZ"
 
-#: src/pentaxmn.cpp:829 src/pentaxmn.cpp:830
+# AF = automatické zaostrenie
+#: src/pentaxmn.cpp:905 src/pentaxmn.cpp:906
+#, fuzzy
+msgid "AF point in focus"
+msgstr "Použité body automatického zaostrenia"
+
+#: src/pentaxmn.cpp:912 src/pentaxmn.cpp:913
 msgid "F-Number"
 msgstr "číslo F"
 
-#: src/pentaxmn.cpp:832
+#: src/pentaxmn.cpp:915
 msgid "ISO sensitivity"
 msgstr "ISO citlivosť"
 
-#: src/pentaxmn.cpp:833
+#: src/pentaxmn.cpp:916
 msgid "ISO sensitivity settings"
 msgstr "Nastavenia citlivosti ISO"
 
-#: src/pentaxmn.cpp:840 src/pentaxmn.cpp:841
+#: src/pentaxmn.cpp:923 src/pentaxmn.cpp:924
 msgid "MeteringMode"
 msgstr "merací režim"
 
-#: src/pentaxmn.cpp:843 src/pentaxmn.cpp:844
+#: src/pentaxmn.cpp:926 src/pentaxmn.cpp:927
 msgid "AutoBracketing"
 msgstr "Viacnásobné snímky"
 
-#: src/pentaxmn.cpp:846 src/pentaxmn.cpp:847
+#: src/pentaxmn.cpp:929 src/pentaxmn.cpp:930
 msgid "White ballance"
 msgstr "Vyváženie bielej"
 
-#: src/pentaxmn.cpp:849 src/pentaxmn.cpp:850
+#: src/pentaxmn.cpp:932 src/pentaxmn.cpp:933
 msgid "White ballance mode"
 msgstr "Režim vyváženia bielej"
 
-#: src/pentaxmn.cpp:853 src/pentaxmn.cpp:854
+#: src/pentaxmn.cpp:936
+#, fuzzy
+msgid "Blue color balance"
+msgstr "Vyváženie modrej"
+
+#: src/pentaxmn.cpp:939
+#, fuzzy
+msgid "Red color balance"
+msgstr "Vyváženie farieb Červená"
+
+#: src/pentaxmn.cpp:941 src/pentaxmn.cpp:942
 msgid "FocalLength"
 msgstr "Ohnisková vzdialenosť"
 
-#: src/pentaxmn.cpp:866 src/pentaxmn.cpp:867 src/properties.cpp:627
+#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957 src/properties.cpp:643
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: src/pentaxmn.cpp:869
+#: src/pentaxmn.cpp:959
 msgid "Hometown"
 msgstr "Domovské mesto"
 
-#: src/pentaxmn.cpp:875
+#: src/pentaxmn.cpp:965
 msgid "Hometown DST"
 msgstr "Domovské mesto, letný čas"
 
-#: src/pentaxmn.cpp:876
+#: src/pentaxmn.cpp:966
 msgid "Whether day saving time is active in home town"
 msgstr "Či v domovskom meste prebieha letný čas"
 
-#: src/pentaxmn.cpp:878
+#: src/pentaxmn.cpp:968
 msgid "Destination DST"
 msgstr "Cieľová DST"
 
-#: src/pentaxmn.cpp:879
+#: src/pentaxmn.cpp:969
 msgid "Whether day saving time is active in destination"
 msgstr "Či v cieľovom meste prebieha letný čas"
 
-#: src/pentaxmn.cpp:881 src/pentaxmn.cpp:882
+#: src/pentaxmn.cpp:971 src/pentaxmn.cpp:972
 #, fuzzy
 msgid "DSPFirmwareVersion"
 msgstr "Verzia firmvéru"
 
-#: src/pentaxmn.cpp:884 src/pentaxmn.cpp:885
+#: src/pentaxmn.cpp:974 src/pentaxmn.cpp:975
 #, fuzzy
 msgid "CPUFirmwareVersion"
 msgstr "Verzia firmvéru"
 
-#: src/pentaxmn.cpp:891
+#: src/pentaxmn.cpp:981
 #, fuzzy
 msgid "Light value"
 msgstr "Hodnota jasu"
 
-#: src/pentaxmn.cpp:892
+#: src/pentaxmn.cpp:982
 msgid "Camera calculated light value, includes exposure compensation"
 msgstr ""
 
-#: src/pentaxmn.cpp:909 src/pentaxmn.cpp:910
+#: src/pentaxmn.cpp:998 src/pentaxmn.cpp:999
+#, fuzzy
+msgid "Image area offset"
+msgstr "Veľkosť obrazových údajov"
+
+#: src/pentaxmn.cpp:1001 src/pentaxmn.cpp:1002
+#, fuzzy
+msgid "Raw image size"
+msgstr "Veľkosť obrázka"
+
+#: src/pentaxmn.cpp:1005 src/pentaxmn.cpp:1006
 #, fuzzy
 msgid "Preview image borders"
 msgstr "Zobraziť vložený obrázok"
 
-#: src/pentaxmn.cpp:915 src/pentaxmn.cpp:916
+#: src/pentaxmn.cpp:1011 src/pentaxmn.cpp:1012
 #, fuzzy
 msgid "Sensitivity adjust"
 msgstr "ISO citlivosť"
 
-#: src/pentaxmn.cpp:918 src/pentaxmn.cpp:919
+#: src/pentaxmn.cpp:1014 src/pentaxmn.cpp:1015
 msgid "Digital filter"
 msgstr "Digitálny filter"
 
-#: src/pentaxmn.cpp:922 src/properties.cpp:435
-msgid "Temperature"
-msgstr "Teplota"
-
-#: src/pentaxmn.cpp:923
+#: src/pentaxmn.cpp:1019
 msgid "Camera temperature"
 msgstr "Teplota fotoaparátu"
 
-#: src/pentaxmn.cpp:936 src/pentaxmn.cpp:937
+#: src/pentaxmn.cpp:1032 src/pentaxmn.cpp:1033
 msgid "Image tone"
 msgstr "Tón obrázka"
 
-#: src/pentaxmn.cpp:939 src/pentaxmn.cpp:940
+#: src/pentaxmn.cpp:1035 src/pentaxmn.cpp:1036
 #, fuzzy
 msgid "Colort temperature"
 msgstr "Farebná teplota"
 
-#: src/pentaxmn.cpp:943
+#: src/pentaxmn.cpp:1039
 msgid "Shake reduction"
 msgstr "Redukcia chvenia"
 
-#: src/pentaxmn.cpp:944
+#: src/pentaxmn.cpp:1040
 msgid "Shake reduction information"
 msgstr "Informácie o redukcii chvenia"
 
-#: src/pentaxmn.cpp:949 src/pentaxmn.cpp:950
+#: src/pentaxmn.cpp:1045 src/pentaxmn.cpp:1046
 #, fuzzy
 msgid "Dynamic range expansion"
 msgstr "Nastavenie dynamického rozsahu"
 
-#: src/pentaxmn.cpp:952 src/pentaxmn.cpp:953
+#: src/pentaxmn.cpp:1048 src/pentaxmn.cpp:1049
 #, fuzzy
 msgid "High ISO noise reduction"
 msgstr "Vysoká redukcia šumu ISO"
 
-#: src/pentaxmn.cpp:956 src/pentaxmn.cpp:957
+#: src/pentaxmn.cpp:1051 src/pentaxmn.cpp:1052
+#, fuzzy
+msgid "AF Adjustment"
+msgstr "Úpravy tónu"
+
+#: src/pentaxmn.cpp:1055 src/pentaxmn.cpp:1056
 msgid "Black point"
 msgstr "čierny bod"
 
-#: src/pentaxmn.cpp:959 src/pentaxmn.cpp:960
+#: src/pentaxmn.cpp:1058 src/pentaxmn.cpp:1059
 msgid "White point"
 msgstr "biely bod"
 
-#: src/pentaxmn.cpp:963 src/pentaxmn.cpp:964
+#: src/pentaxmn.cpp:1062 src/pentaxmn.cpp:1063
 #, fuzzy
 msgid "ShotInfo"
 msgstr "Info o snímke"
 
-#: src/pentaxmn.cpp:966 src/pentaxmn.cpp:967
+#: src/pentaxmn.cpp:1065 src/pentaxmn.cpp:1066
 msgid "AEInfo"
 msgstr "Info o AE"
 
-#: src/pentaxmn.cpp:969 src/pentaxmn.cpp:970
+#: src/pentaxmn.cpp:1068 src/pentaxmn.cpp:1069
 msgid "LensInfo"
 msgstr "Info o šošovkách"
 
-#: src/pentaxmn.cpp:972 src/pentaxmn.cpp:973
+#: src/pentaxmn.cpp:1071 src/pentaxmn.cpp:1072
 msgid "FlashInfo"
 msgstr "Info o blesku"
 
-#: src/pentaxmn.cpp:975 src/pentaxmn.cpp:976
+#: src/pentaxmn.cpp:1074 src/pentaxmn.cpp:1075
 msgid "AEMeteringSegments"
 msgstr "Segmenty merania AZ"
 
-#: src/pentaxmn.cpp:978 src/pentaxmn.cpp:979
+#: src/pentaxmn.cpp:1077 src/pentaxmn.cpp:1078
 msgid "FlashADump"
 msgstr "FlashADump"
 
-#: src/pentaxmn.cpp:981 src/pentaxmn.cpp:982
+#: src/pentaxmn.cpp:1080 src/pentaxmn.cpp:1081
 msgid "FlashBDump"
 msgstr "FlashBDump"
 
-#: src/pentaxmn.cpp:985 src/pentaxmn.cpp:986
+#: src/pentaxmn.cpp:1084 src/pentaxmn.cpp:1085
 msgid "WB_RGGBLevelsDaylight"
 msgstr "WB_RGGBLevelsDaylight"
 
-#: src/pentaxmn.cpp:988 src/pentaxmn.cpp:989
+#: src/pentaxmn.cpp:1087 src/pentaxmn.cpp:1088
 msgid "WB_RGGBLevelsShade"
 msgstr "WB_RGGBLevelsShade"
 
-#: src/pentaxmn.cpp:991 src/pentaxmn.cpp:992
+#: src/pentaxmn.cpp:1090 src/pentaxmn.cpp:1091
 msgid "WB_RGGBLevelsCloudy"
 msgstr "WB_RGGBLevelsCloudy"
 
-#: src/pentaxmn.cpp:994 src/pentaxmn.cpp:995
+#: src/pentaxmn.cpp:1093 src/pentaxmn.cpp:1094
 msgid "WB_RGGBLevelsTungsten"
 msgstr "WB_RGGBLevelsTungsten"
 
 # exif-lightsource-15
-#: src/pentaxmn.cpp:997 src/pentaxmn.cpp:998
+#: src/pentaxmn.cpp:1096 src/pentaxmn.cpp:1097
 msgid "WB_RGGBLevelsFluorescentD"
 msgstr "WB_RGGBLevelsFluorescentD"
 
 # exif-lightsource-15
-#: src/pentaxmn.cpp:1000 src/pentaxmn.cpp:1001
+#: src/pentaxmn.cpp:1099 src/pentaxmn.cpp:1100
 msgid "WB_RGGBLevelsFluorescentN"
 msgstr "WB_RGGBLevelsFluorescentN"
 
 # exif-lightsource-15
-#: src/pentaxmn.cpp:1003 src/pentaxmn.cpp:1004
+#: src/pentaxmn.cpp:1102 src/pentaxmn.cpp:1103
 msgid "WB_RGGBLevelsFluorescentW"
 msgstr "WB_RGGBLevelsFluorescentW"
 
-#: src/pentaxmn.cpp:1006 src/pentaxmn.cpp:1007
+#: src/pentaxmn.cpp:1105 src/pentaxmn.cpp:1106
 msgid "WB_RGGBLevelsFlash"
 msgstr "WB_RGGBLevelsFlash"
 
-#: src/pentaxmn.cpp:1009 src/pentaxmn.cpp:1010
+#: src/pentaxmn.cpp:1108 src/pentaxmn.cpp:1109
 msgid "CameraInfo"
 msgstr "Info o fotoaparáte"
 
-#: src/pentaxmn.cpp:1012 src/pentaxmn.cpp:1013
+#: src/pentaxmn.cpp:1111 src/pentaxmn.cpp:1112
 msgid "BatteryInfo"
 msgstr "Info o batérii"
 
-#: src/pentaxmn.cpp:1015 src/pentaxmn.cpp:1016
+#: src/pentaxmn.cpp:1114 src/pentaxmn.cpp:1115
 msgid "AFInfo"
 msgstr "Info o AZ"
 
-#: src/pentaxmn.cpp:1018 src/pentaxmn.cpp:1019
+#: src/pentaxmn.cpp:1117 src/pentaxmn.cpp:1118
 #, fuzzy
 msgid "ColorInfo"
 msgstr "Farba"
 
-#: src/pentaxmn.cpp:1023
+#: src/pentaxmn.cpp:1125
 msgid "Unknown PentaxMakerNote tag"
 msgstr "Neznáma značka PentaxMakerNote"
 
-#: src/properties.cpp:92
+#: src/properties.cpp:97
 msgid "Dublin Core schema"
 msgstr ""
 
-#: src/properties.cpp:93
+#: src/properties.cpp:98
 msgid "digiKam Photo Management schema"
 msgstr ""
 
-#: src/properties.cpp:94
+#: src/properties.cpp:99
+msgid "KDE Image Program Interface schema"
+msgstr ""
+
+#: src/properties.cpp:100
 msgid "XMP Basic schema"
 msgstr "XMP základná schéma"
 
-#: src/properties.cpp:95
+#: src/properties.cpp:101
 msgid "XMP Rights Management schema"
 msgstr ""
 
-#: src/properties.cpp:96
+#: src/properties.cpp:102
 msgid "XMP Media Management schema"
 msgstr ""
 
-#: src/properties.cpp:97
+#: src/properties.cpp:103
+#, fuzzy
 msgid "XMP Basic Job Ticket schema"
-msgstr ""
+msgstr "XMP základná schéma"
 
-#: src/properties.cpp:98
+#: src/properties.cpp:104
+#, fuzzy
 msgid "XMP Paged-Text schema"
-msgstr ""
+msgstr "XMP základná schéma"
 
-#: src/properties.cpp:99
+#: src/properties.cpp:105
+#, fuzzy
 msgid "XMP Dynamic Media schema"
-msgstr ""
+msgstr "XMP základná schéma"
 
-#: src/properties.cpp:100
+#: src/properties.cpp:106
 msgid "Microsoft Photo schema"
 msgstr ""
 
-#: src/properties.cpp:101
+#: src/properties.cpp:107
 msgid "Adobe PDF schema"
 msgstr "Schéma Adobe PDF"
 
-#: src/properties.cpp:102
+#: src/properties.cpp:108
 msgid "Adobe photoshop schema"
 msgstr "Schéma Adobe Photoshop"
 
-#: src/properties.cpp:103
+#: src/properties.cpp:109
 msgid "Camera Raw schema"
 msgstr "RAW schéma fotoaparátu"
 
-#: src/properties.cpp:104
+#: src/properties.cpp:110
 msgid "Exif Schema for TIFF Properties"
 msgstr ""
 
-#: src/properties.cpp:105
+#: src/properties.cpp:111
 msgid "Exif schema for Exif-specific Properties"
 msgstr ""
 
-#: src/properties.cpp:106
+#: src/properties.cpp:112
 msgid "Exif schema for Additional Exif Properties"
 msgstr ""
 
-#: src/properties.cpp:107
+#: src/properties.cpp:113
 msgid "IPTC Core schema"
 msgstr ""
 
-#: src/properties.cpp:109
+#: src/properties.cpp:115
 msgid "IPTC Extension schema"
 msgstr ""
 
-#: src/properties.cpp:111
+#: src/properties.cpp:117
 msgid "PLUS License Data Format schema"
 msgstr ""
 
-#: src/properties.cpp:114
+#: src/properties.cpp:118
+msgid "iView Media Pro schema"
+msgstr ""
+
+#: src/properties.cpp:119
+msgid "Expression Media schema"
+msgstr ""
+
+#: src/properties.cpp:122
 msgid "Colorant structure"
 msgstr "Štruktúra farbiva"
 
-#: src/properties.cpp:115
+#: src/properties.cpp:123
 msgid "Dimensions structure"
 msgstr "Štruktúra rozmerov"
 
-#: src/properties.cpp:116
+#: src/properties.cpp:124
 msgid "Font structure"
 msgstr "Štruktúra písma"
 
-#: src/properties.cpp:117
+#: src/properties.cpp:125
 msgid "Thumbnail structure"
 msgstr "Štruktúra náhľadu"
 
-#: src/properties.cpp:118
+#: src/properties.cpp:126
+#, fuzzy
 msgid "Resource Event structure"
-msgstr ""
+msgstr "Štruktúra písma"
 
-#: src/properties.cpp:119
+#: src/properties.cpp:127
+#, fuzzy
 msgid "ResourceRef structure"
-msgstr ""
+msgstr "Štruktúra verzie"
 
-#: src/properties.cpp:120
+#: src/properties.cpp:128
 msgid "Version structure"
 msgstr "Štruktúra verzie"
 
-#: src/properties.cpp:121
+#: src/properties.cpp:129
 msgid "Basic Job/Workflow structure"
 msgstr ""
 
-#: src/properties.cpp:124
+#: src/properties.cpp:132
 msgid "Qualifier for xmp:Identifier"
 msgstr ""
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributor"
 msgstr "Prispievateľ"
 
-#: src/properties.cpp:128
+#: src/properties.cpp:136
 msgid "Contributors to the resource (other than the authors)."
 msgstr "Prispeli do zdroja (okrem autorov)."
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid "Coverage"
 msgstr "Pokrytie"
 
-#: src/properties.cpp:129
+#: src/properties.cpp:137
 msgid ""
 "The spatial or temporal topic of the resource, the spatial applicability of "
 "the resource, or the jurisdiction under which the resource is relevant."
@@ -11189,20 +14387,20 @@
 "Priestorová alebo časová téma zdroja, priestorová aplikovateľkosť zdroja "
 "alebo jurisdikcia, v ktorej je zdroj relevantný."
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid "Creator"
 msgstr "Tvorca"
 
-#: src/properties.cpp:131
+#: src/properties.cpp:139
 msgid ""
 "The authors of the resource (listed in order of precedence, if significant)."
 msgstr "Autori zdroja (uvedení v poradí, ak je to dôležité)."
 
-#: src/properties.cpp:132
+#: src/properties.cpp:140
 msgid "Date(s) that something interesting happened to the resource."
 msgstr "Dátumy, kedy sa so zdrojom udialo niečo významné."
 
-#: src/properties.cpp:133
+#: src/properties.cpp:141
 msgid ""
 "A textual description of the content of the resource. Multiple values may be "
 "present for different languages."
@@ -11210,11 +14408,11 @@
 "Textový popis obsahu zdroja. Môže byť prítomných viacero hodnôt v rôznych "
 "jazykoch."
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid "Format"
 msgstr "Formát"
 
-#: src/properties.cpp:135
+#: src/properties.cpp:143
 msgid ""
 "The file format used when saving the resource. Tools and applications should "
 "set this property to the save format of the data. It may include appropriate "
@@ -11224,11 +14422,11 @@
 "vlastnosť nastavovať na formát, v ktorom sú uložené dáta. Môže obsahovať "
 "príslušné kvalifikátory."
 
-#: src/properties.cpp:137 src/properties.cpp:180
+#: src/properties.cpp:145 src/properties.cpp:196
 msgid "Identifier"
 msgstr "Identifikátor"
 
-#: src/properties.cpp:137
+#: src/properties.cpp:145
 msgid ""
 "Unique identifier of the resource. Recommended best practice is to identify "
 "the resource by means of a string conforming to a formal identification "
@@ -11237,15 +14435,15 @@
 "Jedinečný identifikátor zdroja. Odporúča sa identifikovať zdroje reťazcom "
 "zodpovedajúcim formalizovanému identifikačnému systému."
 
-#: src/properties.cpp:139
+#: src/properties.cpp:147
 msgid "An unordered array specifying the languages used in the resource."
 msgstr "Nezoradené pole so zoznamom jazykov použitých v zdroji."
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid "Publisher"
 msgstr "Vydavateľ"
 
-#: src/properties.cpp:140
+#: src/properties.cpp:148
 msgid ""
 "An entity responsible for making the resource available. Examples of a "
 "Publisher include a person, an organization, or a service. Typically, the "
@@ -11255,11 +14453,11 @@
 "osoba, organizácia alebo služba. Na označenie entity sa zvyčajne používa "
 "meno Vydavateľa."
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid "Relation"
 msgstr "Vzťah"
 
-#: src/properties.cpp:143
+#: src/properties.cpp:151
 msgid ""
 "Relationships to other documents. Recommended best practice is to identify "
 "the related resource by means of a string conforming to a formal "
@@ -11268,11 +14466,11 @@
 "Vzťah k iným dokumentom. Odporúča sa identifikovať súvisiace zdroje reťazcom "
 "zodpovedajúcim formalizovanému identifikačnému systému."
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid "Rights"
 msgstr "Práva"
 
-#: src/properties.cpp:145
+#: src/properties.cpp:153
 msgid ""
 "Informal rights statement, selected by language. Typically, rights "
 "information includes a statement about various property rights associated "
@@ -11282,11 +14480,11 @@
 "zvyčajne vyjadrenie o rôznych vlastníckych právach súvisiacich so zdrojom "
 "vrátane práv na intelektuálne vlastníctvo."
 
-#: src/properties.cpp:148
+#: src/properties.cpp:156
 msgid "Unique identifier of the work from which this resource was derived."
 msgstr "Jedinečný identifikátor diela, z ktorého bol zdroj odvodený."
 
-#: src/properties.cpp:149
+#: src/properties.cpp:157
 msgid ""
 "An unordered array of descriptive phrases or keywords that specify the topic "
 "of the content of the resource."
@@ -11294,11 +14492,11 @@
 "Nezoradené pole popisných kľúčových slov alebo spojení, ktoré špecifikujú "
 "predmet obsahu zdroja."
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid "Title"
 msgstr "Názov"
 
-#: src/properties.cpp:151
+#: src/properties.cpp:159
 msgid ""
 "The title of the document, or the name given to the resource. Typically, it "
 "will be a name by which the resource is formally known."
@@ -11306,19 +14504,19 @@
 "Titulok dokumentu alebo názov pridelený zdroju. Zvyčajne to bude názov, "
 "ktorým je zdroj formálne označovaný."
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "Type"
 msgstr "Typ"
 
-#: src/properties.cpp:153
+#: src/properties.cpp:161
 msgid "A document type; for example, novel, poem, or working paper."
 msgstr "Typ dokumentu, napr. román, báseň alebo pracovný dokument."
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid "Tags List"
 msgstr "Zoznam značiek"
 
-#: src/properties.cpp:159
+#: src/properties.cpp:167
 msgid ""
 "The list of complete tags path as string. The path hierarchy is separated by "
 "'/' character (ex.: \"City/Paris/Monument/Eiffel Tower\"."
@@ -11326,44 +14524,85 @@
 "Zoznam úplnej cesty ako reťazec. Hierarchia ciest sa oddeľuje znakom "
 "„/“ (napr. „City/Paris/Monument/Eiffel Tower“)"
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 #, fuzzy
 msgid "Captions Author Names"
 msgstr "Krajina"
 
-#: src/properties.cpp:160
+#: src/properties.cpp:168
 msgid ""
 "The list of all captions author names for each language alternative captions "
 "set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 #, fuzzy
 msgid "Captions Date Time Stamps"
 msgstr "aktualizuje sa časová známka"
 
-#: src/properties.cpp:161
+#: src/properties.cpp:169
 msgid ""
 "The list of all captions date time stamps for each language alternative "
 "captions set in standard XMP tags."
 msgstr ""
 
-#: src/properties.cpp:168
+#: src/properties.cpp:170 src/tags.cpp:842
+#, fuzzy
+msgid "Image History"
+msgstr "Výška obrázka"
+
+#: src/properties.cpp:170
+msgid ""
+"An XML based content to list all action processed on this image with image "
+"editor (as crop, rotate, color corrections, adjustements, etc.)."
+msgstr ""
+
+#: src/properties.cpp:171
+#, fuzzy
+msgid "Lens Correction Settings"
+msgstr "Nastavenia údajov šošoviek"
+
+#: src/properties.cpp:171
+msgid ""
+"The list of Lens Correction tools settings used to fix lens distorsion. This "
+"include Batch Queue Manager and Image editor tools based on LensFun library."
+msgstr ""
+
+#: src/properties.cpp:177
+msgid "Enfuse Input Files"
+msgstr ""
+
+#: src/properties.cpp:177
+msgid ""
+"The list of files processed with Enfuse program through ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:178
+#, fuzzy
+msgid "Enfuse Settings"
+msgstr "Nastavenia"
+
+#: src/properties.cpp:178
+msgid ""
+"The list of Enfuse settings used to blend image stack with ExpoBlending tool."
+msgstr ""
+
+#: src/properties.cpp:184
 msgid "Advisory"
 msgstr "Poradca"
 
-#: src/properties.cpp:168
+#: src/properties.cpp:184
 msgid ""
 "An unordered array specifying properties that were edited outside the "
 "authoring application. Each item should contain a single namespace and XPath "
 "separated by one ASCII space (U+0020)."
 msgstr ""
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid "Base URL"
 msgstr "Základné URL"
 
-#: src/properties.cpp:171
+#: src/properties.cpp:187
 msgid ""
 "The base URL for relative URLs in the document content. If this document "
 "contains Internet links, and those links are relative, they are relative to "
@@ -11372,26 +14611,26 @@
 "based on their notion of where URLs will be interpreted."
 msgstr ""
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 msgid "Create Date"
 msgstr "Dátum vytvorenia"
 
-#: src/properties.cpp:176
+#: src/properties.cpp:192
 msgid "The date and time the resource was originally created."
 msgstr "Dátum a čas, kedy bol obrázok pôvodne vytvorený."
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid "Creator Tool"
 msgstr "Vytvorené nástrojom"
 
-#: src/properties.cpp:177
+#: src/properties.cpp:193
 msgid ""
 "The name of the first known tool used to create the resource. If history is "
 "present in the metadata, this value should be equivalent to that of xmpMM:"
 "History's softwareAgent property."
 msgstr ""
 
-#: src/properties.cpp:180
+#: src/properties.cpp:196
 msgid ""
 "An unordered array of text strings that unambiguously identify the resource "
 "within a given context. An array item may be qualified with xmpidq:Scheme to "
@@ -11401,113 +14640,117 @@
 "(single-valued) property."
 msgstr ""
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid "Label"
 msgstr "Označenie"
 
-#: src/properties.cpp:185
+#: src/properties.cpp:201
 msgid ""
 "A word or short phrase that identifies a document as a member of a user-"
 "defined collection. Used to organize documents in a file browser."
 msgstr ""
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid "Metadata Date"
 msgstr "Dátum (metadáta)"
 
-#: src/properties.cpp:187
+#: src/properties.cpp:203
 msgid ""
 "The date and time that any metadata for this resource was last changed. It "
 "should be the same as or more recent than xmp:ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid "Modify Date"
 msgstr "Dátum zmeny"
 
-#: src/properties.cpp:189
+#: src/properties.cpp:205
 msgid ""
 "The date and time the resource was last modified. Note: The value of this "
 "property is not necessarily the same as the file's system modification date "
 "because it is set before the file is saved."
 msgstr ""
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: src/properties.cpp:192
+#: src/properties.cpp:208
 msgid "A short informal name for the resource."
 msgstr ""
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid "Rating"
 msgstr "Hodnotenie"
 
-#: src/properties.cpp:193
+#: src/properties.cpp:209
 msgid ""
 "A number that indicates a document's status relative to other documents, "
 "used to organize documents in a file browser. Values are user-defined within "
 "an application-defined range."
 msgstr ""
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid "Thumbnails"
 msgstr "Náhľady"
 
-#: src/properties.cpp:196
+#: src/properties.cpp:212
 msgid ""
 "An alternative array of thumbnail images for a file, which can differ in "
 "characteristics such as size or image encoding."
 msgstr ""
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Certificate"
 msgstr "Certifikát"
 
-#: src/properties.cpp:203
+#: src/properties.cpp:219
 msgid "Online rights management certificate."
 msgstr ""
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
 msgid "Marked"
 msgstr "Označené"
 
-#: src/properties.cpp:204
+#: src/properties.cpp:220
+#, fuzzy
 msgid "Indicates that this is a rights-managed resource."
-msgstr ""
+msgstr "Dátumy, kedy sa so zdrojom udialo niečo významné."
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
 msgid "Owner"
 msgstr "Vlastník"
 
-#: src/properties.cpp:205
+#: src/properties.cpp:221
+#, fuzzy
 msgid "An unordered array specifying the legal owner(s) of a resource."
-msgstr ""
+msgstr "Nezoradené pole so zoznamom jazykov použitých v zdroji."
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Usage Terms"
 msgstr "Podmienky používania"
 
-#: src/properties.cpp:206
+#: src/properties.cpp:222
 msgid "Text instructions on how a resource can be legally used."
 msgstr ""
 
-#: src/properties.cpp:207
+# exif-meteringmode-4
+#: src/properties.cpp:223
+#, fuzzy
 msgid "Web Statement"
-msgstr ""
+msgstr "element"
 
-#: src/properties.cpp:207
+#: src/properties.cpp:223
 msgid ""
 "The location of a web page describing the owner and/or rights statement for "
 "this resource."
 msgstr ""
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid "Derived From"
 msgstr "Odovodené od"
 
-#: src/properties.cpp:213
+#: src/properties.cpp:229
 msgid ""
 "A reference to the original document from which this one is derived. It is a "
 "minimal reference; missing components can be assumed to be unchanged. For "
@@ -11516,21 +14759,21 @@
 "specify the instance ID and rendition class of the original."
 msgstr ""
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid "Document ID"
 msgstr "ID dokumentu"
 
-#: src/properties.cpp:218
+#: src/properties.cpp:234
 msgid ""
 "The common identifier for all versions and renditions of a document. It "
 "should be based on a UUID; see Document and Instance IDs below."
 msgstr ""
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid "History"
 msgstr "História"
 
-#: src/properties.cpp:220
+#: src/properties.cpp:236
 msgid ""
 "An ordered array of high-level user actions that resulted in this resource. "
 "It is intended to give human readers a general indication of the steps taken "
@@ -11539,22 +14782,22 @@
 "other detailed history."
 msgstr ""
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid "Instance ID"
 msgstr "ID príkladu"
 
-#: src/properties.cpp:224
+#: src/properties.cpp:240
 msgid ""
 "An identifier for a specific incarnation of a document, updated each time a "
 "file is saved. It should be based on a UUID; see Document and Instance IDs "
 "below."
 msgstr ""
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid "Managed From"
 msgstr "Riadený z"
 
-#: src/properties.cpp:226
+#: src/properties.cpp:242
 msgid ""
 "A reference to the document as it was prior to becoming managed. It is set "
 "when a managed document is introduced to an asset management system that "
@@ -11562,22 +14805,23 @@
 "management systems."
 msgstr ""
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid "Manager"
 msgstr "Manažér"
 
-#: src/properties.cpp:229
+#: src/properties.cpp:245
 msgid ""
 "The name of the asset management system that manages this resource. Along "
 "with xmpMM: ManagerVariant, it tells applications which asset management "
 "system to contact concerning this document."
 msgstr ""
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
+#, fuzzy
 msgid "Manage To"
-msgstr ""
+msgstr "Riadený z"
 
-#: src/properties.cpp:232
+#: src/properties.cpp:248
 msgid ""
 "A URI identifying the managed resource to the asset management system; the "
 "presence of this property is the formal indication that this resource is "
@@ -11585,51 +14829,53 @@
 "system."
 msgstr ""
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
+#, fuzzy
 msgid "Manage UI"
-msgstr ""
+msgstr "Manažér"
 
-#: src/properties.cpp:235
+#: src/properties.cpp:251
 msgid ""
 "A URI that can be used to access information about the managed resource "
 "through a web browser. It might require a custom browser plug-in."
 msgstr ""
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
+#, fuzzy
 msgid "Manager Variant"
-msgstr ""
+msgstr "Manažér"
 
-#: src/properties.cpp:237
+#: src/properties.cpp:253
 msgid ""
 "Specifies a particular variant of the asset management system. The format of "
 "this property is private to the specific asset management system."
 msgstr ""
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid "Rendition Class"
 msgstr "Ročník vydania"
 
-#: src/properties.cpp:239
+#: src/properties.cpp:255
 msgid ""
 "The rendition class name for this resource. This property should be absent "
 "or set to default for a document version that is not a derived rendition."
 msgstr ""
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid "Rendition Params"
 msgstr "Parametre interpretácie"
 
-#: src/properties.cpp:241
+#: src/properties.cpp:257
 msgid ""
 "Can be used to provide additional rendition parameters that are too complex "
 "or verbose to encode in xmpMM: RenditionClass."
 msgstr ""
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid "Version ID"
 msgstr "ID verzie"
 
-#: src/properties.cpp:243
+#: src/properties.cpp:259
 msgid ""
 "The document version identifier for this resource. Each version of a "
 "document gets a new identifier, usually simply by incrementing integers 1, "
@@ -11637,11 +14883,11 @@
 "support branching which requires a more complex scheme."
 msgstr ""
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid "Versions"
 msgstr "Verzie"
 
-#: src/properties.cpp:247
+#: src/properties.cpp:263
 msgid ""
 "The version history associated with this resource. Entry [1] is the oldest "
 "known version for this document, entry [last()] is the most recent version. "
@@ -11652,37 +14898,38 @@
 "the version history can be truncated at some point."
 msgstr ""
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Last URL"
 msgstr "Posledný URL"
 
-#: src/properties.cpp:253
+#: src/properties.cpp:269
 msgid "Deprecated for privacy protection."
 msgstr ""
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid "Rendition Of"
 msgstr "Vydanie"
 
-#: src/properties.cpp:254
+#: src/properties.cpp:270
 msgid ""
 "Deprecated in favor of xmpMM:DerivedFrom. A reference to the document of "
 "which this is a rendition."
 msgstr ""
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Save ID"
 msgstr "Uložiť ID"
 
-#: src/properties.cpp:256
+#: src/properties.cpp:272
 msgid "Deprecated. Previously used only to support the xmpMM:LastURL property."
 msgstr ""
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
+#, fuzzy
 msgid "Job Reference"
-msgstr ""
+msgstr "Referenčný dátum"
 
-#: src/properties.cpp:262
+#: src/properties.cpp:278
 msgid ""
 "References an external job management file for a job process in which the "
 "document is being used. Use of job names is under user control. Typical use "
@@ -11692,666 +14939,684 @@
 "historical information about what jobs a document was part of previously."
 msgstr ""
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid "Maximum Page Size"
 msgstr "Maximálna veľkosť stránky"
 
-#: src/properties.cpp:271
+#: src/properties.cpp:287
 msgid ""
 "The size of the largest page in the document (including any in contained "
 "documents)."
 msgstr ""
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid "Number of Pages"
 msgstr "Počet stránok"
 
-#: src/properties.cpp:272
+#: src/properties.cpp:288
 msgid ""
 "The number of pages in the document (including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/properties.cpp:273
+#: src/properties.cpp:289
 msgid ""
 "An unordered array of fonts that are used in the document (including any in "
 "contained documents)."
 msgstr ""
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid "Colorants"
 msgstr "Farbivá"
 
-#: src/properties.cpp:274
+#: src/properties.cpp:290
 msgid ""
 "An ordered array of colorants (swatches) that are used in the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid "Plate Names"
 msgstr "Názvy plôch"
 
-#: src/properties.cpp:275
+#: src/properties.cpp:291
 msgid ""
 "An ordered array of plate names that are needed to print the document "
 "(including any in contained documents)."
 msgstr ""
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
+#, fuzzy
 msgid "Project Reference"
-msgstr ""
+msgstr "GPS referencia zemepisnej dĺžky"
 
-#: src/properties.cpp:281
+#: src/properties.cpp:297
 msgid "A reference to the project that created this file."
 msgstr ""
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "Video Frame Rate"
 msgstr "Počet snímok za sekundu vo videu"
 
-#: src/properties.cpp:282
+#: src/properties.cpp:298
 msgid "The video frame rate. One of: 24, NTSC, PAL."
 msgstr "Počet snímok za sekundu vo videu: 24, NTSC, PAL."
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "Video Frame Size"
 msgstr "Veľkosť snímky vo videu"
 
-#: src/properties.cpp:283
+#: src/properties.cpp:299
 msgid "The frame size. For example: w:720, h: 480, unit:pixels"
 msgstr "Veľkosť snímky. Napr.: š:720, v: 480, jednotka:pixely"
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "Video Pixel Aspect Ratio"
 msgstr ""
 
-#: src/properties.cpp:284
+#: src/properties.cpp:300
 msgid "The aspect ratio, expressed as ht/wd. For example: \"648/720\" = 0.9"
 msgstr ""
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
+#, fuzzy
 msgid "Video Pixel Depth"
-msgstr ""
+msgstr "Poradie video polí"
 
-#: src/properties.cpp:285
+#: src/properties.cpp:301
 msgid ""
 "The size in bits of each color component of a pixel. Standard Windows 32-bit "
 "pixels have 8 bits per component. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid "Video Color Space"
 msgstr "Farebný priestor videa"
 
-#: src/properties.cpp:287
+#: src/properties.cpp:303
 msgid ""
 "The color space. One of: sRGB (used by Photoshop), CCIR-601 (used for NTSC), "
 "CCIR-709 (used for HD)."
 msgstr ""
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
+#, fuzzy
 msgid "Video Alpha Mode"
-msgstr ""
+msgstr "Model Minolta"
 
-#: src/properties.cpp:289
+#: src/properties.cpp:305
 msgid "The alpha mode. One of: straight, pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid "Video Alpha Premultiple Color"
 msgstr ""
 
-#: src/properties.cpp:290
+#: src/properties.cpp:306
 msgid ""
 "A color in CMYK or RGB to be used as the pre-multiple color when alpha mode "
 "is pre-multiplied."
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "Video Alpha Unity Is Transparent"
 msgstr ""
 
-#: src/properties.cpp:292
+#: src/properties.cpp:308
 msgid "When true, unity is clear, when false, it is opaque."
 msgstr ""
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
 msgid "Video Compressor"
 msgstr "Kompresia videa"
 
-#: src/properties.cpp:293
+#: src/properties.cpp:309
+#, fuzzy
 msgid "Video compression used. For example, jpeg."
-msgstr ""
+msgstr "Použitý zvukový komprimátor. Napríklad MP3."
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "Video Field Order"
 msgstr "Poradie video polí"
 
-#: src/properties.cpp:294
+#: src/properties.cpp:310
 msgid "The field order for video. One of: Upper, Lower, Progressive."
 msgstr ""
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
+#, fuzzy
 msgid "Pull Down"
-msgstr ""
+msgstr "Dolu"
 
-#: src/properties.cpp:295
+#: src/properties.cpp:311
 msgid ""
 "The sampling phase of film to be converted to video (pull-down). One of: "
 "WSSWW, SSWWW, SWWWS, WWWSS, WWSSW, WSSWW_24p, SSWWW_24p, SWWWS_24p, "
 "WWWSS_24p, WWSSW_24p."
 msgstr ""
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
+#, fuzzy
 msgid "Audio Sample Rate"
-msgstr ""
+msgstr "Rýchlosť zvuku"
 
-#: src/properties.cpp:297
+#: src/properties.cpp:313
 msgid ""
 "The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000."
 msgstr ""
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
+#, fuzzy
 msgid "Audio Sample Type"
-msgstr ""
+msgstr "Typ audio"
 
-#: src/properties.cpp:298
+#: src/properties.cpp:314
 msgid "The audio sample type. One of: 8Int, 16Int, 32Int, 32Float."
 msgstr ""
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
+#, fuzzy
 msgid "Audio Channel Type"
-msgstr ""
+msgstr "Typ audio"
 
-#: src/properties.cpp:299
+#: src/properties.cpp:315
 msgid "The audio channel type. One of: Mono, Stereo, 5.1, 7.1."
 msgstr ""
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "Audio Compressor"
 msgstr "Kompresia zvuku"
 
-#: src/properties.cpp:300
+#: src/properties.cpp:316
 msgid "The audio compression used. For example, MP3."
 msgstr "Použitý zvukový komprimátor. Napríklad MP3."
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid "Speaker Placement"
 msgstr "Poloha reproduktora"
 
-#: src/properties.cpp:301
+#: src/properties.cpp:317
 msgid ""
 "A description of the speaker angles from center front in degrees. For "
-"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = -"
-"110, Right Surround = 110\""
+"example: \"Left = -30, Right = 30, Center = 0, LFE = 45, Left Surround = "
+"-110, Right Surround = 110\""
 msgstr ""
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
+#, fuzzy
 msgid "File Data Rate"
-msgstr ""
+msgstr "Dátum Minolta"
 
-#: src/properties.cpp:303
+#: src/properties.cpp:319
 msgid ""
 "The file data rate in megabytes per second. For example: \"36/10\" = 3.6 MB/"
 "sec"
 msgstr ""
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid "Tape Name"
 msgstr "Názov pásky"
 
-#: src/properties.cpp:304
+#: src/properties.cpp:320
 msgid ""
 "The name of the tape from which the clip was captured, as set during the "
 "capture process."
 msgstr ""
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
+#, fuzzy
 msgid "Alternative Tape Name"
-msgstr ""
+msgstr "Názov pásky"
 
-#: src/properties.cpp:305
+#: src/properties.cpp:321
 msgid ""
 "An alternative tape name, set via the project window or timecode dialog in "
 "Premiere. If an alternative name has been set and has not been reverted, "
 "that name is displayed."
 msgstr ""
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid "Start Time Code"
 msgstr "Kód času začiatku"
 
-#: src/properties.cpp:307
+#: src/properties.cpp:323
 msgid ""
 "The timecode of the first frame of video in the file, as obtained from the "
 "device control."
 msgstr ""
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
+#, fuzzy
 msgid "Alternative Time code"
-msgstr ""
+msgstr "Kód času začiatku"
 
-#: src/properties.cpp:308
+#: src/properties.cpp:324
 msgid ""
 "A timecode set by the user. When specified, it is used instead of the "
 "startTimecode."
 msgstr ""
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
 msgid "Duration"
 msgstr "Trvanie"
 
-#: src/properties.cpp:309
+#: src/properties.cpp:325
+#, fuzzy
 msgid "The duration of the media file."
-msgstr ""
+msgstr "Názov scény"
 
 # exif-scenetype
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 msgid "Scene"
 msgstr "Scéna"
 
-#: src/properties.cpp:310
+#: src/properties.cpp:326
 msgid "The name of the scene."
 msgstr "Názov scény"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
 msgid "Shot Name"
 msgstr "Názov záberu"
 
-#: src/properties.cpp:311
+#: src/properties.cpp:327
+#, fuzzy
 msgid "The name of the shot or take."
-msgstr ""
+msgstr "Meno autora alebo autorov"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 msgid "Shot Date"
 msgstr "Dátum záberu"
 
-#: src/properties.cpp:312
+#: src/properties.cpp:328
 msgid "The date and time when the video was shot."
 msgstr "Dátum a čas, kedy bolo video nasnímané."
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid "Shot Location"
 msgstr "Miesto záberu"
 
-#: src/properties.cpp:313
+#: src/properties.cpp:329
 msgid ""
 "The name of the location where the video was shot. For example: "
 "\"Oktoberfest, Munich Germany\" For more accurate positioning, use the EXIF "
 "GPS values."
 msgstr ""
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 msgid "Log Comment"
 msgstr "Komentár denníka"
 
-#: src/properties.cpp:315
+#: src/properties.cpp:331
 msgid "User's log comments."
 msgstr "Komentár používateľovho denníka."
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "Markers"
 msgstr "Značky"
 
-#: src/properties.cpp:316
+#: src/properties.cpp:332
 msgid "An ordered list of markers"
 msgstr ""
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
+#, fuzzy
 msgid "Contributed Media"
-msgstr ""
+msgstr "Prispievateľ"
 
-#: src/properties.cpp:317
+#: src/properties.cpp:333
 msgid "An unordered list of all media used to create this media."
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid "Absolute Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:318
+#: src/properties.cpp:334
 msgid ""
 "The absolute path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid "Relative Peak Audio File Path"
 msgstr ""
 
-#: src/properties.cpp:319
+#: src/properties.cpp:335
 msgid ""
 "The relative path to the file's peak audio file. If empty, no peak file "
 "exists."
 msgstr ""
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 msgid "Video Modified Date"
 msgstr "Dátum úpravy videa"
 
-#: src/properties.cpp:320
+#: src/properties.cpp:336
 msgid "The date and time when the video was last modified."
 msgstr "Dátum a čas, kedy bolo video naposledy zmenené."
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 msgid "Audio Modified Date"
 msgstr "Dátum úpravy zvuku"
 
-#: src/properties.cpp:321
+#: src/properties.cpp:337
 msgid "The date and time when the audio was last modified."
 msgstr "Dátum a čas, kedy bol zvuk naposledy zmenený."
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
+#, fuzzy
 msgid "Metadata Modified Date"
-msgstr ""
+msgstr "Dátum (metadáta)"
 
-#: src/properties.cpp:322
+#: src/properties.cpp:338
 msgid "The date and time when the metadata was last modified."
 msgstr "Dátum a čas, kedy boli metadáta naposledy zmenené."
 
-#: src/properties.cpp:323 src/properties.cpp:491 src/tags.cpp:459
+#: src/properties.cpp:339 src/properties.cpp:507 src/tags.cpp:554
 msgid "Artist"
 msgstr "Umelec"
 
-#: src/properties.cpp:323
+#: src/properties.cpp:339
 msgid "The name of the artist or artists."
 msgstr "Meno autora alebo autorov"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 msgid "Album"
 msgstr "Album"
 
-#: src/properties.cpp:324
+#: src/properties.cpp:340
 msgid "The name of the album."
 msgstr "Názov albumu."
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid "Track Number"
 msgstr "Číslo stopy"
 
-#: src/properties.cpp:325
+#: src/properties.cpp:341
 msgid ""
 "A numeric value indicating the order of the audio file within its original "
 "recording."
 msgstr ""
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/properties.cpp:326
+#: src/properties.cpp:342
 msgid "The name of the genre."
 msgstr "Názov žánru"
 
-#: src/properties.cpp:327
+#: src/properties.cpp:343
 msgid "The copyright information."
 msgstr "Informácie o autorských právach"
 
-#: src/properties.cpp:328
+#: src/properties.cpp:344
 msgid "The date the title was released."
 msgstr "Dátum, kedy bol titul vydaný"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "Composer"
 msgstr "Skladateľ"
 
-#: src/properties.cpp:329
+#: src/properties.cpp:345
 msgid "The composer's name."
 msgstr "Meno skladateľa"
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
+#, fuzzy
 msgid "Engineer"
-msgstr ""
+msgstr "Večer"
 
-#: src/properties.cpp:330
+#: src/properties.cpp:346
+#, fuzzy
 msgid "The engineer's name."
-msgstr ""
+msgstr "Meno skladateľa"
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "Tempo"
 msgstr "Rýchlosť"
 
-#: src/properties.cpp:331
+#: src/properties.cpp:347
 msgid "The audio's tempo."
 msgstr "Rýchlosť zvuku"
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "Instrument"
 msgstr "Nástroj"
 
-#: src/properties.cpp:332
+#: src/properties.cpp:348
 msgid "The musical instrument."
 msgstr "Hudobný nástroj"
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 msgid "Intro Time"
 msgstr "Čas vstupu"
 
-#: src/properties.cpp:333
+#: src/properties.cpp:349
 msgid "The duration of lead time for queuing music."
 msgstr ""
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "Out Cue"
 msgstr ""
 
-#: src/properties.cpp:334
+#: src/properties.cpp:350
 msgid "The time at which to fade out."
 msgstr ""
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "Relative Timestamp"
 msgstr "Relatívna časová známka"
 
-#: src/properties.cpp:335
+#: src/properties.cpp:351
 msgid "The start time of the media inside the audio project."
 msgstr ""
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "Loop"
 msgstr "Slučka"
 
-#: src/properties.cpp:336
+#: src/properties.cpp:352
 msgid "When true, the clip can be looped seemlessly."
 msgstr ""
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
+#, fuzzy
 msgid "Number Of Beats"
-msgstr ""
+msgstr "Počet stránok"
 
-#: src/properties.cpp:337
+#: src/properties.cpp:353
 msgid "The number of beats."
 msgstr "Počet úderov."
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid "Key"
 msgstr "Kľúč"
 
-#: src/properties.cpp:338
+#: src/properties.cpp:354
 msgid ""
 "The audio's musical key. One of: C, C#, D, D#, E, F, F#, G, G#, A, A#, B."
 msgstr ""
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid "Stretch Mode"
 msgstr "Režim roztiahnutia"
 
-#: src/properties.cpp:339
+#: src/properties.cpp:355
 msgid ""
 "The audio stretch mode. One of: Fixed length, Time-Scale, Resample, Beat "
 "Splice, Hybrid."
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Time Scale Parameters"
 msgstr ""
 
-#: src/properties.cpp:340
+#: src/properties.cpp:356
 msgid "Additional parameters for Time-Scale stretch mode."
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Resample Parameters"
 msgstr ""
 
-#: src/properties.cpp:341
+#: src/properties.cpp:357
 msgid "Additional parameters for Resample stretch mode."
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Beat Splice Parameters"
 msgstr ""
 
-#: src/properties.cpp:342
+#: src/properties.cpp:358
 msgid "Additional parameters for Beat Splice stretch mode."
 msgstr ""
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid "Time Signature"
 msgstr "Časová signatúra"
 
-#: src/properties.cpp:343
+#: src/properties.cpp:359
 msgid ""
 "The time signature of the music. One of: 2/4, 3/4, 4/4, 5/4, 7/4, 6/8, 9/8, "
 "12/8, other."
 msgstr ""
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid "Scale Type"
 msgstr "Typ mierky"
 
-#: src/properties.cpp:344
+#: src/properties.cpp:360
 msgid ""
 "The musical scale used in the music. One of: Major, Minor, Both, Neither. "
 "Neither is most often used for instruments with no associated scale, such as "
 "drums."
 msgstr ""
 
-#: src/properties.cpp:351 src/tags.cpp:889
+#: src/properties.cpp:367 src/tags.cpp:1076
 msgid "Camera Serial Number"
 msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:351
+#: src/properties.cpp:367
 msgid "Camera Serial Number."
 msgstr "Sériové číslo fotoaparátu."
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 msgid "Date Acquired"
 msgstr "Dátum vytvorenia"
 
-#: src/properties.cpp:352
+#: src/properties.cpp:368
 msgid "Date Acquired."
 msgstr "Dátum vytvorenia."
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 msgid "Flash Manufacturer"
 msgstr "Výrobca blesku"
 
-#: src/properties.cpp:353
+#: src/properties.cpp:369
 msgid "Flash Manufacturer."
 msgstr "Výrobca blesku."
 
-#: src/properties.cpp:354
+#: src/properties.cpp:370
 msgid "Flash Model."
 msgstr "Model blesku."
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
+#, fuzzy
 msgid "Last Keyword IPTC"
-msgstr ""
+msgstr "Posledné kľúčové slovo XMP."
 
-#: src/properties.cpp:355
+#: src/properties.cpp:371
+#, fuzzy
 msgid "Last Keyword IPTC."
-msgstr ""
+msgstr "Posledné kľúčové slovo XMP."
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
+#, fuzzy
 msgid "Last Keyword XMP"
-msgstr ""
+msgstr "Posledné kľúčové slovo XMP."
 
-#: src/properties.cpp:356
+#: src/properties.cpp:372
 msgid "Last Keyword XMP."
 msgstr "Posledné kľúčové slovo XMP."
 
-#: src/properties.cpp:357
+#: src/properties.cpp:373
 msgid "Lens Manufacturer"
 msgstr "Výrobca šošoviek"
 
-#: src/properties.cpp:357
-msgid "Lens Manufacturer."
-msgstr "Výrobca šošoviek."
-
-#: src/properties.cpp:358
-msgid "Lens Model"
-msgstr "Model šošoviek"
+#: src/properties.cpp:373
+msgid "Lens Manufacturer."
+msgstr "Výrobca šošoviek."
 
-#: src/properties.cpp:358
+#: src/properties.cpp:374
 msgid "Lens Model."
 msgstr "Model šošoviek."
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 msgid "Rating Percent"
 msgstr "Percentá hodnotenia"
 
-#: src/properties.cpp:359
+#: src/properties.cpp:375
 msgid "Rating Percent."
 msgstr "Percentá hodnotenia."
 
-#: src/properties.cpp:365
+#: src/properties.cpp:381
 msgid "Keywords."
 msgstr "Kľúčové slová."
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "PDF Version"
 msgstr "PDF verzia"
 
-#: src/properties.cpp:366
+#: src/properties.cpp:382
 msgid "The PDF file version (for example: 1.0, 1.3, and so on)."
 msgstr "Verzia PDF súboru (napríklad: 1.0, 1.3, atď)."
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "Producer"
 msgstr "Tvorca"
 
-#: src/properties.cpp:367
+#: src/properties.cpp:383
 msgid "The name of the tool that created the PDF document."
 msgstr "Názov programu, pomocou ktorého bol vytvorený PDF dokument"
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
 msgid "Authors Position"
 msgstr "Pozícia autora"
 
-#: src/properties.cpp:373
+#: src/properties.cpp:389
+#, fuzzy
 msgid "By-line title."
-msgstr ""
+msgstr "Vedľajší názov"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 msgid "Caption Writer"
 msgstr "Zapisovač titulku"
 
-#: src/properties.cpp:374
+#: src/properties.cpp:390
 msgid "Writer/editor."
 msgstr "Autor/vydavateľ"
 
-#: src/properties.cpp:375
+#: src/properties.cpp:391
 msgid "Category. Limited to 3 7-bit ASCII characters."
 msgstr ""
 
-#: src/properties.cpp:376
+#: src/properties.cpp:392
 msgid "City."
 msgstr "Mesto."
 
-#: src/properties.cpp:377
+#: src/properties.cpp:393
 msgid "Country/primary location."
 msgstr ""
 
-#: src/properties.cpp:378
+#: src/properties.cpp:394
 msgid "Credit."
 msgstr "Pôvodca."
 
-#: src/properties.cpp:379
+#: src/properties.cpp:395
 msgid ""
 "The date the intellectual content of the document was created (rather than "
 "the creation date of the physical representation), following IIM "
@@ -12360,369 +15625,382 @@
 "photo was digitized for archiving."
 msgstr ""
 
-#: src/properties.cpp:383
+#: src/properties.cpp:399
 msgid "Headline."
 msgstr "Titulok."
 
-#: src/properties.cpp:384
+#: src/properties.cpp:400
 msgid "Special instructions."
 msgstr "Špecifické pokyny."
 
-#: src/properties.cpp:385
+#: src/properties.cpp:401
 msgid "Source."
 msgstr "Zdroj."
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "State"
 msgstr "Štát"
 
-#: src/properties.cpp:386
+#: src/properties.cpp:402
 msgid "Province/state."
 msgstr "Provincia/štát"
 
-#: src/properties.cpp:387
+#: src/properties.cpp:403
 msgid "Supplemental category."
 msgstr "Doplnková kategória"
 
-#: src/properties.cpp:388
+#: src/properties.cpp:404
+#, fuzzy
 msgid "Original transmission reference."
-msgstr ""
+msgstr "Osvedčenie na prenos"
 
-#: src/properties.cpp:389
+#: src/properties.cpp:405
 msgid "Urgency. Valid range is 1-8."
 msgstr ""
 
-#: src/properties.cpp:397
+#: src/properties.cpp:413
 msgid "inches"
 msgstr "palcov"
 
-#: src/properties.cpp:398 src/tags.cpp:227
+#: src/properties.cpp:414 src/tags.cpp:247
 msgid "cm"
 msgstr "cm"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "Auto Brightness"
 msgstr "Automatický jas"
 
-#: src/properties.cpp:402
+#: src/properties.cpp:418
 msgid "When true, \"Brightness\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "Auto Contrast"
 msgstr "Automatický kontrast"
 
-#: src/properties.cpp:403
+#: src/properties.cpp:419
 msgid "When true, \"Contrast\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "Auto Exposure"
 msgstr "Automatická korekcia expozície"
 
-#: src/properties.cpp:404
+#: src/properties.cpp:420
 msgid "When true, \"Exposure\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "Auto Shadows"
 msgstr "Automatické tiene"
 
-#: src/properties.cpp:405
+#: src/properties.cpp:421
 msgid "When true,\"Shadows\" is automatically adjusted."
 msgstr ""
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 msgid "Blue Hue"
 msgstr "Modrý odtieň"
 
-#: src/properties.cpp:406
+#: src/properties.cpp:422
 msgid "\"Blue Hue\" setting. Range -100 to 100."
 msgstr "Nastavenie \"Modrý odtieň\". Rozsah -100 to 100."
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
 msgid "Blue Saturation"
 msgstr "Modrá sýtosť"
 
-#: src/properties.cpp:407
+#: src/properties.cpp:423
+#, fuzzy
 msgid "\"Blue Saturation\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:408
+#: src/properties.cpp:424
 msgid "\"Brightness\" setting. Range 0 to +150."
 msgstr "Nastavenie \"Jas\". Rozsah od 0 do +150."
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 msgid "Camera Profile"
 msgstr "Profil fotoaparátu"
 
-#: src/properties.cpp:409
+#: src/properties.cpp:425
 msgid "\"Camera Profile\" setting."
 msgstr "Nastavenie \"Profil fotoaparátu\""
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
 msgid "Chromatic Aberration Blue"
 msgstr "Chromatická aberácia modrej"
 
-#: src/properties.cpp:410
+#: src/properties.cpp:426
+#, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Blue/Yellow Fringe\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
 msgid "Chromatic Aberration Red"
 msgstr "Chromatická aberácia červenej"
 
-#: src/properties.cpp:411
+#: src/properties.cpp:427
+#, fuzzy
 msgid ""
 "\"Chromatic Aberration, Fix Red/Cyan Fringe\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
 msgid "Color Noise Reduction"
 msgstr "Redukcia farebného šumu"
 
-#: src/properties.cpp:412
+#: src/properties.cpp:428
+#, fuzzy
 msgid "\"Color Noise Reducton\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Nastavenie \"Kontrast\". Rozsah od -50 do +100."
 
-#: src/properties.cpp:413
+#: src/properties.cpp:429
 msgid "\"Contrast\" setting. Range -50 to +100."
 msgstr "Nastavenie \"Kontrast\". Rozsah od -50 do +100."
 
-#: src/properties.cpp:414
+#: src/properties.cpp:430
 msgid "When \"Has Crop\" is true, top of crop rectangle"
 msgstr ""
 
-#: src/properties.cpp:415
+#: src/properties.cpp:431
 msgid "When \"Has Crop\" is true, left of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "Crop Bottom"
 msgstr "Orezať dolu"
 
-#: src/properties.cpp:416
+#: src/properties.cpp:432
 msgid "When \"Has Crop\" is true, bottom of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "Crop Right"
 msgstr "Orezať vpravo"
 
-#: src/properties.cpp:417
+#: src/properties.cpp:433
 msgid "When \"Has Crop\" is true, right of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
+#, fuzzy
 msgid "Crop Angle"
-msgstr ""
+msgstr "Orezať vľavo"
 
-#: src/properties.cpp:418
+#: src/properties.cpp:434
 msgid "When \"Has Crop\" is true, angle of crop rectangle."
 msgstr ""
 
-#: src/properties.cpp:419
+#: src/properties.cpp:435
 msgid "Width of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:420
+#: src/properties.cpp:436
 msgid "Height of resulting cropped image in CropUnits units."
 msgstr ""
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Crop Units"
 msgstr "Jednotky pri orezávaní"
 
-#: src/properties.cpp:421
+#: src/properties.cpp:437
 msgid "Units for CropWidth and CropHeight. 0=pixels, 1=inches, 2=cm"
 msgstr ""
 
-#: src/properties.cpp:422
+#: src/properties.cpp:438
 msgid "\"Exposure\" setting. Range -4.0 to +4.0."
 msgstr "Nastavenie \"Expozícia\". Rozsah od -4.0 do +4.0."
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 msgid "GreenHue"
 msgstr "Zelený odtieň"
 
-#: src/properties.cpp:423
+#: src/properties.cpp:439
 msgid "\"Green Hue\" setting. Range -100 to +100."
 msgstr "Nastavenie \"Zelený odtieň\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
 msgid "Green Saturation"
 msgstr "Zelená sýtosť"
 
-#: src/properties.cpp:424
+#: src/properties.cpp:440
+#, fuzzy
 msgid "\"Green Saturation\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "Has Crop"
 msgstr "Orezanie"
 
-#: src/properties.cpp:425
+#: src/properties.cpp:441
 msgid "When true, image has a cropping rectangle."
 msgstr ""
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "Has Settings"
 msgstr "Nastavenia"
 
-#: src/properties.cpp:426
+#: src/properties.cpp:442
 msgid "When true, non-default camera raw settings."
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
 msgid "Luminance Smoothing"
 msgstr ""
 
-#: src/properties.cpp:427
+#: src/properties.cpp:443
+#, fuzzy
 msgid "\"Luminance Smoothing\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "Raw File Name"
 msgstr "Názov nespracovaného súboru"
 
-#: src/properties.cpp:428
+#: src/properties.cpp:444
 msgid "File name of raw file (not a complete path)."
 msgstr "Názov RAW súboru (nie kompletná cesta k nemu)."
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 msgid "Red Hue"
 msgstr "Červený odtieň"
 
-#: src/properties.cpp:429
+#: src/properties.cpp:445
 msgid "\"Red Hue\" setting. Range -100 to +100."
 msgstr "Nastavenie \"Červený odtieň\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
 msgid "Red Saturation"
 msgstr "Červená sýtosť"
 
-#: src/properties.cpp:430
+#: src/properties.cpp:446
+#, fuzzy
 msgid "\"Red Saturation\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:431
+#: src/properties.cpp:447
 msgid "\"Saturation\" setting. Range -100 to +100."
 msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 msgid "Shadows"
 msgstr "Tiene"
 
-#: src/properties.cpp:432
+#: src/properties.cpp:448
 msgid "\"Shadows\" setting. Range 0 to +100."
 msgstr "Nastavenie \"Tiene\". Rozsah od 0 do +100."
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 msgid "Shadow Tint"
 msgstr "Sfarbenie tieňa"
 
-#: src/properties.cpp:433
+#: src/properties.cpp:449
 msgid "\"Shadow Tint\" setting. Range -100 to +100."
 msgstr "Nastavenie \"Sfarbenie tieňa\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:434
+#: src/properties.cpp:450
 msgid "\"Sharpness\" setting. Range 0 to +100."
 msgstr "Nastavenie \"Ostrosť\". Rozsah od 0 do +100."
 
-#: src/properties.cpp:435
+#: src/properties.cpp:451
 msgid "\"Temperature\" setting. Range 2000 to 50000."
 msgstr "Nastavenie \"Teplota\". Rozsah od 2000 do 50000."
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 msgid "Tint"
 msgstr "Sfarbenie"
 
-#: src/properties.cpp:436
+#: src/properties.cpp:452
 msgid "\"Tint\" setting. Range -150 to +150."
 msgstr "Nastavenie \"Sfarbenie\". Rozsah od -150 do +150."
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Tone Curve"
 msgstr "Krivka tónu"
 
-#: src/properties.cpp:437
+#: src/properties.cpp:453
 msgid "Array of points (Integer, Integer) defining a \"Tone Curve\"."
 msgstr ""
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid "Tone Curve Name"
 msgstr "Názov krivky tónu"
 
-#: src/properties.cpp:438
+#: src/properties.cpp:454
 msgid ""
 "The name of the Tone Curve described by ToneCurve. One of: Linear, Medium "
 "Contrast, Strong Contrast, Custom or a user-defined preset name."
 msgstr ""
 
-#: src/properties.cpp:440
+#: src/properties.cpp:456
 msgid "Version of Camera Raw plugin."
 msgstr "Verzia RAW zásuvného modulu fotoaparátu"
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
+#, fuzzy
 msgid "Vignette Amount"
-msgstr ""
+msgstr "Diaľkové ovládanie?"
 
-#: src/properties.cpp:441
+#: src/properties.cpp:457
+#, fuzzy
 msgid "\"Vignetting Amount\" setting. Range -100 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
+#, fuzzy
 msgid "Vignette Midpoint"
-msgstr ""
+msgstr "Diaľkové ovládanie?"
 
-#: src/properties.cpp:442
+#: src/properties.cpp:458
+#, fuzzy
 msgid "\"Vignetting Midpoint\" setting. Range 0 to +100."
-msgstr ""
+msgstr "Nastavenie \"Sýtosť\". Rozsah od -100 do +100."
 
-#: src/properties.cpp:443
+#: src/properties.cpp:459
 msgid ""
 "\"White Balance\" setting. One of: As Shot, Auto, Daylight, Cloudy, Shade, "
 "Tungsten, Fluorescent, Flash, Custom"
 msgstr ""
 
-#: src/properties.cpp:450
+#: src/properties.cpp:466
 msgid "TIFF tag 256, 0x100. Image width in pixels."
 msgstr "TIFF tag 256, 0x100. Šírka obrázka v bodoch."
 
-#: src/properties.cpp:451 src/tags.cpp:354
+#: src/properties.cpp:467 src/tags.cpp:425
 msgid "Image Length"
 msgstr "Dĺžka obrázka"
 
-#: src/properties.cpp:451
+#: src/properties.cpp:467
 msgid "TIFF tag 257, 0x101. Image height in pixels."
 msgstr "TIFF tag 257, 0x101. Dĺžka obrázka v bodoch."
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "Bits Per Sample"
 msgstr "bitov na vzorku"
 
-#: src/properties.cpp:452
+#: src/properties.cpp:468
 msgid "TIFF tag 258, 0x102. Number of bits per component in each channel."
 msgstr ""
 
-#: src/properties.cpp:453 src/tags.cpp:364
+#: src/properties.cpp:469 src/tags.cpp:435
 msgid "Compression"
 msgstr "Kompresia"
 
-#: src/properties.cpp:453
+#: src/properties.cpp:469
 msgid "TIFF tag 259, 0x103. Compression scheme: 1 = uncompressed; 6 = JPEG."
 msgstr ""
 
-#: src/properties.cpp:454 src/tags.cpp:370
+#: src/properties.cpp:470 src/tags.cpp:441
 msgid "Photometric Interpretation"
 msgstr "Fotometrická interpretácia"
 
-#: src/properties.cpp:454
+#: src/properties.cpp:470
 msgid "TIFF tag 262, 0x106. Pixel Composition: 2 = RGB; 6 = YCbCr."
 msgstr ""
 
-#: src/properties.cpp:455
+#: src/properties.cpp:471
 msgid ""
 "TIFF tag 274, 0x112. Orientation:1 = 0th row at top, 0th column at left 2 = "
 "0th row at top, 0th column at right 3 = 0th row at bottom, 0th column at "
@@ -12731,119 +16009,125 @@
 "0th column at bottom 8 = 0th row at left, 0th column at bottom"
 msgstr ""
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
 msgid "Samples Per Pixel"
 msgstr "vzoriek na pixel"
 
-#: src/properties.cpp:464
+#: src/properties.cpp:480
+#, fuzzy
 msgid "TIFF tag 277, 0x115. Number of components per pixel."
-msgstr ""
+msgstr "TIFF tag 257, 0x101. Dĺžka obrázka v bodoch."
 
-#: src/properties.cpp:465 src/tags.cpp:432
+#: src/properties.cpp:481 src/tags.cpp:515
 msgid "Planar Configuration"
 msgstr "Rovinná konfigurácia"
 
-#: src/properties.cpp:465
+#: src/properties.cpp:481
 msgid "TIFF tag 284, 0x11C. Data layout:1 = chunky; 2 = planar."
 msgstr ""
 
 # exif-ycbcrsubsampling
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid "YCbCr Sub Sampling"
 msgstr "podvzorkovanie YCbCr"
 
-#: src/properties.cpp:466
+#: src/properties.cpp:482
 msgid ""
 "TIFF tag 530, 0x212. Sampling ratio of chrominance components: [2, 1] = "
 "YCbCr4:2:2; [2, 2] = YCbCr4:2:0"
 msgstr ""
 
-#: src/properties.cpp:468 src/tags.cpp:536
+#: src/properties.cpp:484 src/tags.cpp:718
 msgid "YCbCr Positioning"
 msgstr "polohovanie YCbCr"
 
-#: src/properties.cpp:468
+#: src/properties.cpp:484
 msgid ""
 "TIFF tag 531, 0x213. Position of chrominance vs. luminance components: 1 = "
 "centered; 2 = co-sited."
 msgstr ""
 
 # exif-xresolution
-#: src/properties.cpp:470
+#: src/properties.cpp:486
 msgid "X Resolution"
 msgstr "horizontálne rozlíšenie"
 
-#: src/properties.cpp:470
+#: src/properties.cpp:486
+#, fuzzy
 msgid "TIFF tag 282, 0x11A. Horizontal resolution in pixels per unit."
 msgstr ""
+"EXIF značka 41486, 0xA20E. Vodorovné ohniskové rozlíšenie v pixeloch na "
+"jednotku"
 
 # exif-xresolution
-#: src/properties.cpp:471
+#: src/properties.cpp:487
 msgid "Y Resolution"
 msgstr "horizontálne rozlíšenie"
 
-#: src/properties.cpp:471
+#: src/properties.cpp:487
+#, fuzzy
 msgid "TIFF tag 283, 0x11B. Vertical resolution in pixels per unit."
 msgstr ""
+"EXIF značka 41487, 0xA20F. Zvislé ohniskové rozlíšenie v pixeloch na jednotku"
 
 # exif-resolutionunit
-#: src/properties.cpp:472 src/tags.cpp:438
+#: src/properties.cpp:488 src/tags.cpp:533
 msgid "Resolution Unit"
 msgstr "jednotka rozlíšenia"
 
-#: src/properties.cpp:472
+#: src/properties.cpp:488
 msgid ""
 "TIFF tag 296, 0x128. Unit used for XResolution and YResolution. Value is one "
 "of: 2 = inches; 3 = centimeters."
 msgstr ""
 
 # exif-transferfunction
-#: src/properties.cpp:474 src/tags.cpp:443
+#: src/properties.cpp:490 src/tags.cpp:538
 msgid "Transfer Function"
 msgstr "prenosová funkcia"
 
-#: src/properties.cpp:474
+#: src/properties.cpp:490
 msgid ""
 "TIFF tag 301, 0x12D. Transfer function for image described in tabular style "
 "with 3 * 256 entries."
 msgstr ""
 
 # exif-whitepoint
-#: src/properties.cpp:476 src/tags.cpp:471
+#: src/properties.cpp:492 src/tags.cpp:570
 msgid "White Point"
 msgstr "biely bod"
 
-#: src/properties.cpp:476
+#: src/properties.cpp:492
 msgid "TIFF tag 318, 0x13E. Chromaticity of white point."
 msgstr ""
 
 # exif-primarychromaticities
-#: src/properties.cpp:477 src/tags.cpp:476
+#: src/properties.cpp:493 src/tags.cpp:575
 msgid "Primary Chromaticities"
 msgstr "primárne chromaticity"
 
-#: src/properties.cpp:477
+#: src/properties.cpp:493
 msgid "TIFF tag 319, 0x13F. Chromaticity of the three primary colors."
 msgstr ""
 
-#: src/properties.cpp:478
+#: src/properties.cpp:494
 msgid ""
 "TIFF tag 529, 0x211. Matrix coefficients for RGB to YCbCr transformation."
 msgstr ""
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "Reference Black White"
 msgstr "Referenčná čierna a biela"
 
-#: src/properties.cpp:479
+#: src/properties.cpp:495
 msgid "TIFF tag 532, 0x214. Reference black and white point values."
 msgstr ""
 
-#: src/properties.cpp:480 src/tags.cpp:455
+#: src/properties.cpp:496 src/tags.cpp:550
 msgid "Date and Time"
 msgstr "Dátum a čas"
 
-#: src/properties.cpp:480
+#: src/properties.cpp:496
 msgid ""
 "TIFF tag 306, 0x132 (primary) and EXIF tag 37520, 0x9290 (subseconds). Date "
 "and time of image creation (no time zone in EXIF), stored in ISO 8601 "
@@ -12852,77 +16136,71 @@
 "ModifyDate."
 msgstr ""
 
-#: src/properties.cpp:486 src/tags.cpp:380
+#: src/properties.cpp:502 src/tags.cpp:463
 msgid "Image Description"
 msgstr "Popis obrázka"
 
-#: src/properties.cpp:486
+#: src/properties.cpp:502
 msgid ""
 "TIFF tag 270, 0x10E. Description of the image. Note: This property is stored "
 "in XMP as dc:description."
 msgstr ""
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "Make"
 msgstr "Zhotoviteľ"
 
-#: src/properties.cpp:487
+#: src/properties.cpp:503
 msgid "TIFF tag 271, 0x10F. Manufacturer of recording equipment."
 msgstr ""
 
-#: src/properties.cpp:488
+#: src/properties.cpp:504
 msgid "TIFF tag 272, 0x110. Model name or number of equipment."
 msgstr ""
 
-# exif-software
-#: src/properties.cpp:489 src/sigmamn.cpp:116 src/sigmamn.cpp:117
-#: src/tags.cpp:448
-msgid "Software"
-msgstr "softvér"
-
-#: src/properties.cpp:489
+#: src/properties.cpp:505
 msgid ""
 "TIFF tag 305, 0x131. Software or firmware used to generate image. Note: This "
 "property is stored in XMP as xmp:CreatorTool. "
 msgstr ""
 
-#: src/properties.cpp:491
+#: src/properties.cpp:507
 msgid ""
 "TIFF tag 315, 0x13B. Camera owner, photographer or image creator. Note: This "
 "property is stored in XMP as the first item in the dc:creator array."
 msgstr ""
 
-#: src/properties.cpp:493
+#: src/properties.cpp:509
 msgid ""
 "TIFF tag 33432, 0x8298. Copyright information. Note: This property is stored "
 "in XMP as dc:rights."
 msgstr ""
 
-#: src/properties.cpp:500 src/tags.cpp:1198
+#: src/properties.cpp:516 src/tags.cpp:1388
 msgid "Exif Version"
 msgstr "Verzia EXIF"
 
-#: src/properties.cpp:500
+#: src/properties.cpp:516
 msgid "EXIF tag 36864, 0x9000. EXIF version number."
 msgstr "EXIF značka 36864, 0x9000. Číslo verzie EXIF."
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "Flashpix Version"
 msgstr "Verzia FlashPix"
 
-#: src/properties.cpp:501
+#: src/properties.cpp:517
 msgid "EXIF tag 40960, 0xA000. Version of FlashPix."
 msgstr "EXIF značka 40960, 0xA000. Verzia FlashPix."
 
-#: src/properties.cpp:502
+#: src/properties.cpp:518
 msgid "EXIF tag 40961, 0xA001. Color space information"
 msgstr "EXIF značka 40961, 0xA001. Informácie o farebnom priestore"
 
-#: src/properties.cpp:503 src/tags.cpp:1209
+#: src/properties.cpp:519 src/tags.cpp:1399
 msgid "Components Configuration"
 msgstr "Nastavenie zložiek"
 
-#: src/properties.cpp:503
+#: src/properties.cpp:519
 msgid ""
 "EXIF tag 37121, 0x9101. Configuration of components in data: 4 5 6 0 (if RGB "
 "compressed data), 1 2 3 0 (other cases)."
@@ -12931,11 +16209,11 @@
 "komprimované údaje), 1 2 3 0 (ostatné prípady)."
 
 # exif-compressedbitsperpixel
-#: src/properties.cpp:505 src/tags.cpp:636
+#: src/properties.cpp:521 src/tags.cpp:823
 msgid "Compressed Bits Per Pixel"
 msgstr "komprimované bity na pixel"
 
-#: src/properties.cpp:505
+#: src/properties.cpp:521
 msgid ""
 "EXIF tag 37122, 0x9102. Compression mode used for a compressed image is "
 "indicated in unit bits per pixel."
@@ -12943,45 +16221,45 @@
 "EXIF značka 37122, 0x9102. Kompresný režim komprimovaného obrázka sa "
 "označuje v jednotkách bity na pixel."
 
-#: src/properties.cpp:507 src/tags.cpp:1293
+#: src/properties.cpp:523 src/tags.cpp:1483
 msgid "Pixel X Dimension"
 msgstr "Vodorovný rozmer pixelu"
 
-#: src/properties.cpp:507
+#: src/properties.cpp:523
 msgid "EXIF tag 40962, 0xA002. Valid image width, in pixels."
 msgstr "EXIF značka 40962, 0xA002. Platná šírka obrázka v pixeloch"
 
-#: src/properties.cpp:508 src/tags.cpp:1300
+#: src/properties.cpp:524 src/tags.cpp:1490
 msgid "Pixel Y Dimension"
 msgstr "Zvislý rozmer pixelu"
 
-#: src/properties.cpp:508
+#: src/properties.cpp:524
 msgid "EXIF tag 40963, 0xA003. Valid image height, in pixels."
 msgstr "EXIF značka 40963, 0xA003. Platná výška obrázka v pixeloch"
 
-#: src/properties.cpp:509 src/tags.cpp:1267
+#: src/properties.cpp:525 src/tags.cpp:1457
 msgid "User Comment"
 msgstr "Komentár používateľa"
 
-#: src/properties.cpp:509
+#: src/properties.cpp:525
 msgid "EXIF tag 37510, 0x9286. Comments from user."
 msgstr "EXIF značka 37510, 0x9286. Komentár používateľa."
 
-#: src/properties.cpp:510 src/tags.cpp:1309
+#: src/properties.cpp:526 src/tags.cpp:1499
 msgid "Related Sound File"
 msgstr "Súvisiaci zvukový súbor"
 
-#: src/properties.cpp:510
+#: src/properties.cpp:526
 msgid ""
 "EXIF tag 40964, 0xA004. An \"8.3\" file name for the related sound file."
 msgstr ""
 "EXIF značka 40964, 0xA004. \"8.3\" názov súboru príslušného zvukového súboru."
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid "Date and Time Original"
 msgstr "Dátum a čas zhotovenia"
 
-#: src/properties.cpp:511
+#: src/properties.cpp:527
 msgid ""
 "EXIF tags 36867, 0x9003 (primary) and 37521, 0x9291 (subseconds). Date and "
 "time when original image was generated, in ISO 8601 format. Includes the "
@@ -12991,11 +16269,11 @@
 "čas, kedy bol vytvorený pôvodný obrázok, vo formáte ISO 8601. Vrátane údajov "
 "EXIF SubSecTimeOriginal."
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid "Date and Time Digitized"
 msgstr "Dátum a čas digitalizácie"
 
-#: src/properties.cpp:514
+#: src/properties.cpp:530
 msgid ""
 "EXIF tag 36868, 0x9004 (primary) and 37522, 0x9292 (subseconds). Date and "
 "time when image was stored as digital data, can be the same as "
@@ -13007,35 +16285,35 @@
 "DateTimeOriginal ak bol obrázok pôvodne uložený v digitálnej forme. Ukladá "
 "sa vo formáte ISO 8601. Vrátane údajov EXIF SubSecTimeOriginal."
 
-#: src/properties.cpp:518
+#: src/properties.cpp:534
 msgid "EXIF tag 33434, 0x829A. Exposure time in seconds."
 msgstr "EXIF značka 33434, 0x829A. Čas expozície v sekundách"
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "F Number"
 msgstr "číslo F"
 
-#: src/properties.cpp:519
+#: src/properties.cpp:535
 msgid "EXIF tag 33437, 0x829D. F number."
 msgstr "EXIF značka 33437, 0x829D. Číslo F"
 
-#: src/properties.cpp:520
+#: src/properties.cpp:536
 msgid "EXIF tag 34850, 0x8822. Class of program used for exposure."
 msgstr "EXIF značka 34850, 0x8822. Trieda expozičného programu"
 
-#: src/properties.cpp:521 src/tags.cpp:618 src/tags.cpp:1184
+#: src/properties.cpp:537 src/tags.cpp:805 src/tags.cpp:1374
 msgid "Spectral Sensitivity"
 msgstr "Spektrálna citlivosť:"
 
-#: src/properties.cpp:521
+#: src/properties.cpp:537
 msgid "EXIF tag 34852, 0x8824. Spectral sensitivity of each channel."
 msgstr "EXIF značka 34852, 0x8824. Spektrálna citlivosť každého kanála"
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 msgid "ISOSpeedRatings"
 msgstr "ISO rýchlosti"
 
-#: src/properties.cpp:522
+#: src/properties.cpp:538
 msgid ""
 "EXIF tag 34855, 0x8827. ISO Speed and ISO Latitude of the input device as "
 "specified in ISO 12232."
@@ -13043,11 +16321,11 @@
 "EXIF značka 34855, 0x8827. Označuje ISO rýchlosť a ISO zemepisnú šírku "
 "fotoaparátu alebo vstupného zariadenia podľa špecifikácie ISO 12232."
 
-#: src/properties.cpp:524 src/tags.cpp:625
+#: src/properties.cpp:540 src/tags.cpp:812
 msgid "OECF"
 msgstr "OECF"
 
-#: src/properties.cpp:524
+#: src/properties.cpp:540
 msgid ""
 "EXIF tag 34856, 0x8828. Opto-Electoric Conversion Function as specified in "
 "ISO 14524."
@@ -13055,7 +16333,7 @@
 "EXIF značka 34856, 0x8828. Opto-elektronická konverzná funkcie podľa "
 "špecifikácie ISO 14524"
 
-#: src/properties.cpp:525
+#: src/properties.cpp:541
 msgid ""
 "EXIF tag 37377, 0x9201. Shutter speed, unit is APEX. See Annex C of the EXIF "
 "specification."
@@ -13063,59 +16341,59 @@
 "EXIF značka 37377, 0x9201. Rýchlosť uzávierky, jednotka je APEX. Pozri "
 "Prílohu C Špecifikácie EXIF."
 
-#: src/properties.cpp:526
+#: src/properties.cpp:542
 msgid "EXIF tag 37378, 0x9202. Lens aperture, unit is APEX."
 msgstr "EXIF značka 37378, 0x9202. Clona šošoviek, jednotka je APEX."
 
-#: src/properties.cpp:527 src/tags.cpp:639
+#: src/properties.cpp:543 src/tags.cpp:826
 msgid "Brightness Value"
 msgstr "Hodnota jasu"
 
-#: src/properties.cpp:527
+#: src/properties.cpp:543
 msgid "EXIF tag 37379, 0x9203. Brightness, unit is APEX."
 msgstr "EXIF značka 37379, 0x9203. Jas, jednotka je APEX."
 
-#: src/properties.cpp:528
+#: src/properties.cpp:544
 msgid "EXIF tag 37380, 0x9204. Exposure bias, unit is APEX."
 msgstr "EXIF značka 37380, 0x9204. Skreslenie expozície, jednotka je APEX."
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 msgid "Maximum Aperture Value"
 msgstr "Maximálna hodnota clony"
 
-#: src/properties.cpp:529
+#: src/properties.cpp:545
 msgid "EXIF tag 37381, 0x9205. Smallest F number of lens, in APEX."
 msgstr ""
 "EXIF značka 37381, 0x9205. Najmenšie číslo F šošoviek, jednotka je APEX."
 
-#: src/properties.cpp:530
+#: src/properties.cpp:546
 msgid "EXIF tag 37382, 0x9206. Distance to subject, in meters."
 msgstr "EXIF značka 37382, 0x9206. Vzdialenosť subjektu v metroch."
 
-#: src/properties.cpp:531
+#: src/properties.cpp:547
 msgid "EXIF tag 37383, 0x9207. Metering mode."
 msgstr "EXIF značka 37383, 0x9207. Režim merania"
 
-#: src/properties.cpp:532
+#: src/properties.cpp:548
 msgid "EXIF tag 37384, 0x9208. Light source."
 msgstr "EXIF značka 37384, 0x9208. Svetelný zdroj"
 
-#: src/properties.cpp:533
+#: src/properties.cpp:549
 msgid "EXIF tag 37385, 0x9209. Strobe light (flash) source data."
 msgstr ""
 "EXIF značka 37385, 0x9209. Zdrojové údaje o impulznom osvetlení (blesk)"
 
-#: src/properties.cpp:534
+#: src/properties.cpp:550
 msgid "EXIF tag 37386, 0x920A. Focal length of the lens, in millimeters."
 msgstr ""
 "EXIF značka 37386, 0x920A. Ohnisková vzdialenosť šošoviek v milimetroch"
 
 # exif-subjectarea
-#: src/properties.cpp:535 src/tags.cpp:1259
+#: src/properties.cpp:551 src/tags.cpp:1449
 msgid "Subject Area"
 msgstr "oblasť subjektu"
 
-#: src/properties.cpp:535
+#: src/properties.cpp:551
 msgid ""
 "EXIF tag 37396, 0x9214. The location and area of the main subject in the "
 "overall scene."
@@ -13124,20 +16402,20 @@
 "subjektu v celkovej scéne."
 
 # exif-flashenergy
-#: src/properties.cpp:536 src/tags.cpp:647 src/tags.cpp:1324
+#: src/properties.cpp:552 src/tags.cpp:834 src/tags.cpp:1514
 msgid "Flash Energy"
 msgstr "energia blesku"
 
-#: src/properties.cpp:536
+#: src/properties.cpp:552
 msgid "EXIF tag 41483, 0xA20B. Strobe energy during image capture."
 msgstr "EXIF značka 41483, 0xA20B. Energia blesku počas zachytenia obrázka"
 
 # exif-spatialfrequencyresponse
-#: src/properties.cpp:537 src/tags.cpp:648 src/tags.cpp:1328
+#: src/properties.cpp:553 src/tags.cpp:835 src/tags.cpp:1518
 msgid "Spatial Frequency Response"
 msgstr "priestorová frekvenčná odozva"
 
-#: src/properties.cpp:537
+#: src/properties.cpp:553
 msgid ""
 "EXIF tag 41484, 0xA20C. Input device spatial frequency table and SFR values "
 "as specified in ISO 12233."
@@ -13146,11 +16424,11 @@
 "zariadenia a hodnoty SFR podľa špecifikácie ISO 12233"
 
 # exif-focalplanexresolution
-#: src/properties.cpp:539 src/tags.cpp:650
+#: src/properties.cpp:555 src/tags.cpp:837
 msgid "Focal Plane X Resolution"
 msgstr "vodorovné rozlíšenie ohniskovej roviny"
 
-#: src/properties.cpp:539
+#: src/properties.cpp:555
 msgid ""
 "EXIF tag 41486, 0xA20E. Horizontal focal resolution, measured pixels per "
 "unit."
@@ -13159,11 +16437,11 @@
 "jednotku"
 
 # exif-focalplanexresolution
-#: src/properties.cpp:540 src/tags.cpp:651
+#: src/properties.cpp:556 src/tags.cpp:838
 msgid "Focal Plane Y Resolution"
 msgstr "zvislé rozlíšenie ohniskovej roviny"
 
-#: src/properties.cpp:540
+#: src/properties.cpp:556
 msgid ""
 "EXIF tag 41487, 0xA20F. Vertical focal resolution, measured in pixels per "
 "unit."
@@ -13171,11 +16449,11 @@
 "EXIF značka 41487, 0xA20F. Zvislé ohniskové rozlíšenie v pixeloch na jednotku"
 
 # exif-focalplaneresolutionunit
-#: src/properties.cpp:541 src/tags.cpp:652 src/tags.cpp:1341
+#: src/properties.cpp:557 src/tags.cpp:839 src/tags.cpp:1531
 msgid "Focal Plane Resolution Unit"
 msgstr "jednotka rozlíšenia v ohniskovej rovine"
 
-#: src/properties.cpp:541
+#: src/properties.cpp:557
 msgid ""
 "EXIF tag 41488, 0xA210. Unit used for FocalPlaneXResolution and "
 "FocalPlaneYResolution."
@@ -13184,11 +16462,11 @@
 "FocalPlaneYResolution"
 
 # exif-subjectlocation
-#: src/properties.cpp:542 src/tags.cpp:656 src/tags.cpp:1345
+#: src/properties.cpp:558 src/tags.cpp:843 src/tags.cpp:1535
 msgid "Subject Location"
 msgstr "umiestnenie subjektu"
 
-#: src/properties.cpp:542
+#: src/properties.cpp:558
 msgid ""
 "EXIF tag 41492, 0xA214. Location of the main subject of the scene. The first "
 "value is the horizontal pixel and the second value is the vertical pixel at "
@@ -13197,43 +16475,43 @@
 "EXIF značka 41492, 0xA214. Umiestnenie hlavného subjektu scény. Prvá hodnota "
 "je vodorovný a druhá zvislý pixel, na ktorom sa nachádza subjekt."
 
-#: src/properties.cpp:545 src/tags.cpp:657
+#: src/properties.cpp:561 src/tags.cpp:844
 msgid "Exposure Index"
 msgstr "Index expozície"
 
-#: src/properties.cpp:545
+#: src/properties.cpp:561
 msgid "EXIF tag 41493, 0xA215. Exposure index of input device."
 msgstr "EXIF značka 41493, 0xA215. Expozičný index vstupného zariadenia"
 
 # exif-sensingmethod
-#: src/properties.cpp:546 src/tags.cpp:662 src/tags.cpp:1356
+#: src/properties.cpp:562 src/tags.cpp:849 src/tags.cpp:1546
 msgid "Sensing Method"
 msgstr "snímacia metóda"
 
-#: src/properties.cpp:546
+#: src/properties.cpp:562
 msgid "EXIF tag 41495, 0xA217. Image sensor type on input device."
 msgstr ""
 "EXIF značka 41495, 0xA217. Táto značka označuje typ obrazového snímača "
 "vstupného fotoaparátu alebo vstupného zariadenia."
 
-#: src/properties.cpp:547
+#: src/properties.cpp:563
 msgid "EXIF tag 41728, 0xA300. Indicates image source."
 msgstr "EXIF značka 41728, 0xA300. Zdroj obrázka"
 
-#: src/properties.cpp:548 src/tags.cpp:1364
+#: src/properties.cpp:564 src/tags.cpp:1554
 msgid "Scene Type"
 msgstr "Typ scény"
 
-#: src/properties.cpp:548
+#: src/properties.cpp:564
 msgid "EXIF tag 41729, 0xA301. Indicates the type of scene."
 msgstr "EXIF značka 41729, 0xA301. Typ scény"
 
 # exif-cfapattern
-#: src/properties.cpp:549 src/tags.cpp:572
+#: src/properties.cpp:565 src/tags.cpp:759
 msgid "CFA Pattern"
 msgstr "vzorka CFA"
 
-#: src/properties.cpp:549
+#: src/properties.cpp:565
 msgid ""
 "EXIF tag 41730, 0xA302. Color filter array geometric pattern of the image "
 "sense."
@@ -13242,18 +16520,18 @@
 "filtra"
 
 # exif-customrendered
-#: src/properties.cpp:550 src/tags.cpp:1374
+#: src/properties.cpp:566 src/tags.cpp:1564
 msgid "Custom Rendered"
 msgstr "ručné spracovanie obrazu"
 
-#: src/properties.cpp:550
+#: src/properties.cpp:566
 msgid ""
 "EXIF tag 41985, 0xA401. Indicates the use of special processing on image "
 "data."
 msgstr ""
 "EXIF značka 41985, 0xA401. Použitie špeciálneho spracovania obrazových údajov"
 
-#: src/properties.cpp:551
+#: src/properties.cpp:567
 msgid ""
 "EXIF tag 41986, 0xA402. Indicates the exposure mode set when the image was "
 "shot."
@@ -13261,7 +16539,7 @@
 "EXIF značka 41986, 0xA402. Táto značka označuje aký režim expozície bol "
 "zvolený pri odfotení obrázka."
 
-#: src/properties.cpp:552
+#: src/properties.cpp:568
 msgid ""
 "EXIF tag 41987, 0xA403. Indicates the white balance mode set when the image "
 "was shot."
@@ -13270,11 +16548,11 @@
 "bol zvolený pri odfotení obrázka."
 
 # exif-digitalzoomratio
-#: src/properties.cpp:553 src/tags.cpp:1388
+#: src/properties.cpp:569 src/tags.cpp:1578
 msgid "Digital Zoom Ratio"
 msgstr "pomer digitálneho priblíženia"
 
-#: src/properties.cpp:553
+#: src/properties.cpp:569
 msgid ""
 "EXIF tag 41988, 0xA404. Indicates the digital zoom ratio when the image was "
 "shot."
@@ -13283,11 +16561,11 @@
 "priblíženia bol zvolený pri odfotení obrázka."
 
 # exif-focallengthin35mmfilm
-#: src/properties.cpp:554 src/tags.cpp:1393
+#: src/properties.cpp:570 src/tags.cpp:1583
 msgid "Focal Length In 35mm Film"
 msgstr "ohnisková vzdialenosť na 35 mm filme"
 
-#: src/properties.cpp:554
+#: src/properties.cpp:570
 msgid ""
 "EXIF tag 41989, 0xA405. Indicates the equivalent focal length assuming a "
 "35mm film camera, in mm. A value of 0 means the focal length is unknown. "
@@ -13299,19 +16577,19 @@
 "FocalLength."
 
 # exif-scenecapturetype
-#: src/properties.cpp:557 src/tags.cpp:1399
+#: src/properties.cpp:573 src/tags.cpp:1589
 msgid "Scene Capture Type"
 msgstr "typ zachytenia scény"
 
-#: src/properties.cpp:557
+#: src/properties.cpp:573
 msgid "EXIF tag 41990, 0xA406. Indicates the type of scene that was shot."
 msgstr "EXIF značka 41990, 0xA406. Typ snímanej scény."
 
-#: src/properties.cpp:558 src/tags.cpp:1404
+#: src/properties.cpp:574 src/tags.cpp:1594
 msgid "Gain Control"
 msgstr "Riadenie zosilnenia"
 
-#: src/properties.cpp:558
+#: src/properties.cpp:574
 msgid ""
 "EXIF tag 41991, 0xA407. Indicates the degree of overall image gain "
 "adjustment."
@@ -13319,7 +16597,7 @@
 "EXIF značka 41991, 0xA407. Táto značka označuje stupeň celkového zosilnenia "
 "obrazu."
 
-#: src/properties.cpp:559
+#: src/properties.cpp:575
 msgid ""
 "EXIF tag 41992, 0xA408. Indicates the direction of contrast processing "
 "applied by the camera."
@@ -13327,7 +16605,7 @@
 "EXIF značka 41992, 0xA408. Táto značka označuje smer spracovania kontrastu, "
 "ktorý použil fotoaparát pri zachytení obrázka."
 
-#: src/properties.cpp:560
+#: src/properties.cpp:576
 msgid ""
 "EXIF tag 41993, 0xA409. Indicates the direction of saturation processing "
 "applied by the camera."
@@ -13335,7 +16613,7 @@
 "EXIF značka 41993, 0xA409. Táto značka označuje smer spracovania sýtosti, "
 "ktorý použil fotoaparát pri zachytení obrázka."
 
-#: src/properties.cpp:561
+#: src/properties.cpp:577
 msgid ""
 "EXIF tag 41994, 0xA40A. Indicates the direction of sharpness processing "
 "applied by the camera."
@@ -13344,11 +16622,11 @@
 "ktorý použil fotoaparát pri zachytení obrázka."
 
 # exif-devicesettingdescription
-#: src/properties.cpp:562 src/tags.cpp:1419
+#: src/properties.cpp:578 src/tags.cpp:1609
 msgid "Device Setting Description"
 msgstr "opis nastavení zariadenia"
 
-#: src/properties.cpp:562
+#: src/properties.cpp:578
 msgid ""
 "EXIF tag 41995, 0xA40B. Indicates information on the picture-taking "
 "conditions of a particular camera model."
@@ -13358,20 +16636,20 @@
 "označenie podmienok fotografovania v čítacom zariadení."
 
 # exif-subjectdistancerange
-#: src/properties.cpp:563 src/tags.cpp:1424
+#: src/properties.cpp:579 src/tags.cpp:1614
 msgid "Subject Distance Range"
 msgstr "rozsah vzdialenosti subjektu"
 
-#: src/properties.cpp:563
+#: src/properties.cpp:579
 msgid "EXIF tag 41996, 0xA40C. Indicates the distance to the subject."
 msgstr ""
 "EXIF značka 41996, 0xA40C. Táto značka označuje vzdialenosť k subjektu."
 
-#: src/properties.cpp:564 src/tags.cpp:1427
+#: src/properties.cpp:580 src/tags.cpp:1617
 msgid "Image Unique ID"
 msgstr "Jedinečný ID obrázka"
 
-#: src/properties.cpp:564
+#: src/properties.cpp:580
 msgid ""
 "EXIF tag 42016, 0xA420. An identifier assigned uniquely to each image. It is "
 "recorded as a 32 character ASCII string, equivalent to hexadecimal notation "
@@ -13381,61 +16659,62 @@
 "priradený každému obrázku. Je zaznamenaný ako ASCII reťazec zodpovedajúci "
 "hexadecimálnemu zápisu 128-bitového čísla."
 
-#: src/properties.cpp:566 src/tags.cpp:1501
+#: src/properties.cpp:582 src/tags.cpp:1691
 msgid "GPS Version ID"
 msgstr "ID verzie GPS"
 
-#: src/properties.cpp:566
+#: src/properties.cpp:582
 msgid ""
 "GPS tag 0, 0x00. A decimal encoding of each of the four EXIF bytes with "
 "period separators. The current value is \"2.0.0.0\"."
 msgstr ""
 
 # exif-gpslatitude
-#: src/properties.cpp:568 src/tags.cpp:1512
+#: src/properties.cpp:584 src/tags.cpp:1702
 msgid "GPS Latitude"
 msgstr "GPS zemepisná šírka"
 
-#: src/properties.cpp:568
+#: src/properties.cpp:584
 msgid ""
 "GPS tag 2, 0x02 (position) and 1, 0x01 (North/South). Indicates latitude."
 msgstr ""
 
 # exif-gpslongitude
-#: src/properties.cpp:569 src/tags.cpp:1524
+#: src/properties.cpp:585 src/tags.cpp:1714
 msgid "GPS Longitude"
 msgstr "GPS zemepisná dĺžka"
 
-#: src/properties.cpp:569
+#: src/properties.cpp:585
 msgid ""
 "GPS tag 4, 0x04 (position) and 3, 0x03 (East/West). Indicates longitude."
 msgstr ""
 
 # exif-gpsaltituderef
-#: src/properties.cpp:570 src/tags.cpp:1532
+#: src/properties.cpp:586 src/tags.cpp:1722
 msgid "GPS Altitude Reference"
 msgstr "GPS referencia nadmorskej výšky"
 
-#: src/properties.cpp:570
+#: src/properties.cpp:586
 #, fuzzy
 msgid ""
 "GPS tag 5, 0x05. Indicates whether the altitude is above or below sea level."
 msgstr "GPS tag 6, 0x06. Udáva nadmorskú výšku v metroch."
 
 # exif-gpsaltitude
-#: src/properties.cpp:571 src/tags.cpp:1540
+#: src/properties.cpp:587 src/tags.cpp:1730
 msgid "GPS Altitude"
 msgstr "GPS nadmorská výška"
 
-#: src/properties.cpp:571
+#: src/properties.cpp:587
 msgid "GPS tag 6, 0x06. Indicates altitude in meters."
 msgstr "GPS tag 6, 0x06. Udáva nadmorskú výšku v metroch."
 
-#: src/properties.cpp:572 src/tags.cpp:1544
+#: src/properties.cpp:588 src/tags.cpp:1734
+#, fuzzy
 msgid "GPS Time Stamp"
-msgstr ""
+msgstr "Čas odoslania"
 
-#: src/properties.cpp:572
+#: src/properties.cpp:588
 msgid ""
 "GPS tag 29 (date), 0x1D, and, and GPS tag 7 (time), 0x07. Time stamp of GPS "
 "data, in Coordinated Universal Time. Note: The GPSDateStamp tag is new in "
@@ -13445,263 +16724,282 @@
 "no date is available, do not write exif:GPSTimeStamp to XMP."
 msgstr ""
 
-#: src/properties.cpp:578 src/tags.cpp:1549
+#: src/properties.cpp:594 src/tags.cpp:1739
 msgid "GPS Satellites"
 msgstr "GPS satelity"
 
-#: src/properties.cpp:578
+#: src/properties.cpp:594
 msgid "GPS tag 8, 0x08. Satellite information, format is unspecified."
 msgstr ""
 
-#: src/properties.cpp:579 src/tags.cpp:1556
+#: src/properties.cpp:595 src/tags.cpp:1746
 msgid "GPS Status"
 msgstr "Stav GPS"
 
-#: src/properties.cpp:579
+#: src/properties.cpp:595
 msgid "GPS tag 9, 0x09. Status of GPS receiver at image creation time."
 msgstr ""
 
-#: src/properties.cpp:580 src/tags.cpp:1561
+#: src/properties.cpp:596 src/tags.cpp:1751
 msgid "GPS Measure Mode"
 msgstr "GPS Režim merania"
 
-#: src/properties.cpp:580
+#: src/properties.cpp:596
 msgid "GPS tag 10, 0x0A. GPS measurement mode, Text type."
 msgstr ""
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
 msgid "GPS DOP"
 msgstr "GPS DOP"
 
-#: src/properties.cpp:581
+#: src/properties.cpp:597
+#, fuzzy
 msgid "GPS tag 11, 0x0B. Degree of precision for GPS data."
-msgstr ""
+msgstr "Stupeň presnosti GPS údajov"
 
-#: src/properties.cpp:582 src/tags.cpp:1569
+# exif-gpsaltituderef
+#: src/properties.cpp:598 src/tags.cpp:1759
+#, fuzzy
 msgid "GPS Speed Reference"
-msgstr ""
+msgstr "GPS referencia nadmorskej výšky"
 
-#: src/properties.cpp:582
+#: src/properties.cpp:598
 msgid "GPS tag 12, 0x0C. Units used to speed measurement."
 msgstr ""
 
-#: src/properties.cpp:583 src/tags.cpp:1573
+#: src/properties.cpp:599 src/tags.cpp:1763
 msgid "GPS Speed"
 msgstr "GPS rýchlosť"
 
-#: src/properties.cpp:583
+#: src/properties.cpp:599
+#, fuzzy
 msgid "GPS tag 13, 0x0D. Speed of GPS receiver movement."
-msgstr ""
+msgstr "Označuje rýchlosť pohybu GPS prijímača."
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
+#, fuzzy
 msgid "GPS Track Reference"
-msgstr ""
+msgstr "GPS referencia zemepisnej šírky"
 
-#: src/properties.cpp:584
+#: src/properties.cpp:600
 msgid "GPS tag 14, 0x0E. Reference for movement direction."
 msgstr ""
 
-#: src/properties.cpp:585 src/tags.cpp:1580
+#: src/properties.cpp:601 src/tags.cpp:1770
 msgid "GPS Track"
 msgstr ""
 
-#: src/properties.cpp:585
+#: src/properties.cpp:601
 msgid ""
 "GPS tag 15, 0x0F. Direction of GPS movement, values range from 0 to 359.99."
 msgstr ""
 
-#: src/properties.cpp:586 src/tags.cpp:1584
+#: src/properties.cpp:602 src/tags.cpp:1774
+#, fuzzy
 msgid "GPS Image Direction Reference"
-msgstr ""
+msgstr "GPS Smer obrázka"
 
-#: src/properties.cpp:586
+#: src/properties.cpp:602
 msgid "GPS tag 16, 0x10. Reference for image direction."
 msgstr ""
 
-#: src/properties.cpp:587 src/tags.cpp:1588
+#: src/properties.cpp:603 src/tags.cpp:1778
 msgid "GPS Image Direction"
 msgstr "GPS Smer obrázka"
 
-#: src/properties.cpp:587
+#: src/properties.cpp:603
 msgid ""
 "GPS tag 17, 0x11. Direction of image when captured, values range from 0 to "
 "359.99."
 msgstr ""
 
-#: src/properties.cpp:588 src/tags.cpp:1592
+#: src/properties.cpp:604 src/tags.cpp:1782
+#, fuzzy
 msgid "GPS Map Datum"
-msgstr ""
+msgstr "Stav GPS"
 
-#: src/properties.cpp:588
+#: src/properties.cpp:604
 msgid "GPS tag 18, 0x12. Geodetic survey data."
 msgstr ""
 
-#: src/properties.cpp:589 src/tags.cpp:1600
+#: src/properties.cpp:605 src/tags.cpp:1790
+#, fuzzy
 msgid "GPS Destination Latitude"
-msgstr ""
+msgstr "GPS Vzdialenosť cieľa"
 
-#: src/properties.cpp:589
+#: src/properties.cpp:605
 msgid ""
 "GPS tag 20, 0x14 (position) and 19, 0x13 (North/South). Indicates "
 "destination latitude."
 msgstr ""
 
-#: src/properties.cpp:590 src/tags.cpp:1612
+#: src/properties.cpp:606 src/tags.cpp:1802
+#, fuzzy
 msgid "GPS Destination Longitude"
-msgstr ""
+msgstr "GPS Vzdialenosť cieľa"
 
-#: src/properties.cpp:590
+#: src/properties.cpp:606
 msgid ""
 "GPS tag 22, 0x16 (position) and 21, 0x15 (East/West). Indicates destination "
 "longitude."
 msgstr ""
 
-#: src/properties.cpp:591 src/tags.cpp:1619
+#: src/properties.cpp:607 src/tags.cpp:1809
+#, fuzzy
 msgid "GPS Destination Bearing Reference"
-msgstr ""
+msgstr "GPS Vzdialenosť cieľa"
 
-#: src/properties.cpp:591
+#: src/properties.cpp:607
 msgid "GPS tag 23, 0x17. Reference for movement direction."
 msgstr ""
 
-#: src/properties.cpp:592 src/tags.cpp:1623
+#: src/properties.cpp:608 src/tags.cpp:1813
+#, fuzzy
 msgid "GPS Destination Bearing"
-msgstr ""
+msgstr "GPS Vzdialenosť cieľa"
 
-#: src/properties.cpp:592
+#: src/properties.cpp:608
 msgid "GPS tag 24, 0x18. Destination bearing, values from 0 to 359.99."
 msgstr ""
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
+#, fuzzy
 msgid "GPS Destination Distance Refefrence"
-msgstr ""
+msgstr "GPS Vzdialenosť cieľa"
 
-#: src/properties.cpp:593
+#: src/properties.cpp:609
 msgid "GPS tag 25, 0x19. Units used for speed measurement."
 msgstr ""
 
-#: src/properties.cpp:594 src/tags.cpp:1631
+#: src/properties.cpp:610 src/tags.cpp:1821
 msgid "GPS Destination Distance"
 msgstr "GPS Vzdialenosť cieľa"
 
-#: src/properties.cpp:594
+#: src/properties.cpp:610
+#, fuzzy
 msgid "GPS tag 26, 0x1A. Distance to destination."
-msgstr ""
+msgstr "EXIF značka 37382, 0x9206. Vzdialenosť subjektu v metroch."
 
-#: src/properties.cpp:595 src/tags.cpp:1634
+#: src/properties.cpp:611 src/tags.cpp:1824
 msgid "GPS Processing Method"
 msgstr "GPS Metóda spracovania"
 
-#: src/properties.cpp:595
+#: src/properties.cpp:611
 msgid ""
 "GPS tag 27, 0x1B. A character string recording the name of the method used "
 "for location finding."
 msgstr ""
 
-#: src/properties.cpp:596 src/tags.cpp:1639
+#: src/properties.cpp:612 src/tags.cpp:1829
 msgid "GPS Area Information"
 msgstr "GPS Informácie o oblasti"
 
-#: src/properties.cpp:596
+#: src/properties.cpp:612
 msgid ""
 "GPS tag 28, 0x1C. A character string recording the name of the GPS area."
 msgstr ""
 
-#: src/properties.cpp:597 src/tags.cpp:1647
+#: src/properties.cpp:613 src/tags.cpp:1837
 msgid "GPS Differential"
 msgstr ""
 
-#: src/properties.cpp:597
+#: src/properties.cpp:613
+#, fuzzy
 msgid ""
 "GPS tag 30, 0x1E. Indicates whether differential correction is applied to "
 "the GPS receiver."
-msgstr ""
+msgstr "GPS tag 6, 0x06. Udáva nadmorskú výšku v metroch."
 
-#: src/properties.cpp:603
+#: src/properties.cpp:619
 msgid ""
 "A description of the lens used to take the photograph. For example, \"70-200 "
 "mm f/2.8-4.0\"."
 msgstr ""
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid "SerialNumber"
 msgstr "SériovéČíslo"
 
-#: src/properties.cpp:604
+#: src/properties.cpp:620
 msgid ""
 "The serial number of the camera or camera body used to take the photograph."
 msgstr ""
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
 msgid "Contact Info-City"
 msgstr "Kontaktné informácie- Mesto"
 
-#: src/properties.cpp:610
+#: src/properties.cpp:626
+#, fuzzy
 msgid "The contact information city part."
-msgstr ""
+msgstr "Časť krajina kontaktných informácií."
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 msgid "Contact Info-Country"
 msgstr "Kontaktné informácie- Krajina"
 
-#: src/properties.cpp:611
+#: src/properties.cpp:627
 msgid "The contact information country part."
 msgstr "Časť krajina kontaktných informácií."
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid "Contact Info-Address"
 msgstr "Kontaktné informácie- Adresa"
 
-#: src/properties.cpp:612
+#: src/properties.cpp:628
 msgid ""
 "The contact information address part. Comprises an optional company name and "
 "all required information to locate the building or postbox to which mail "
 "should be sent."
 msgstr ""
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
 msgid "Contact Info-Postal Code"
 msgstr "Kontaktné informácie- PSČ"
 
-#: src/properties.cpp:614
+#: src/properties.cpp:630
+#, fuzzy
 msgid "The contact information part denoting the local postal code."
-msgstr ""
+msgstr "Časť krajina kontaktných informácií."
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid "Contact Info-State/Province"
 msgstr "Kontaktné informácie- Štát/Provincia"
 
-#: src/properties.cpp:615
+#: src/properties.cpp:631
 msgid ""
 "The contact information part denoting regional information like state or "
 "province."
 msgstr ""
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
 msgid "Contact Info-Email"
 msgstr "Kontaktné informácie- E-mail"
 
-#: src/properties.cpp:616
+#: src/properties.cpp:632
+#, fuzzy
 msgid "The contact information email address part."
-msgstr ""
+msgstr "Časť krajina kontaktných informácií."
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
 msgid "Contact Info-Phone"
 msgstr "Kontaktné informácie- Tel. číslo"
 
-#: src/properties.cpp:617
+#: src/properties.cpp:633
+#, fuzzy
 msgid "The contact information phone number part."
-msgstr ""
+msgstr "Časť krajina kontaktných informácií."
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
 msgid "Contact Info-Web URL"
 msgstr "Kontaktné informácie- Web stránka"
 
-#: src/properties.cpp:618
+#: src/properties.cpp:634
+#, fuzzy
 msgid "The contact information web address part."
-msgstr ""
+msgstr "Časť krajina kontaktných informácií."
 
-#: src/properties.cpp:619
+#: src/properties.cpp:635
 msgid ""
 "Code of the country the content is focussing on -- either the country shown "
 "in visual media or referenced in text or audio media. This element is at the "
@@ -13710,28 +17008,28 @@
 "should go to the \"Country\" element."
 msgstr ""
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid "Creator's Contact Info"
 msgstr "Kontaktné informácie tvorcu"
 
-#: src/properties.cpp:623
+#: src/properties.cpp:639
 msgid ""
 "The creator's contact information provides all necessary information to get "
 "in contact with the creator of this news object and comprises a set of sub-"
 "properties for proper addressing."
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid "Intellectual Genre"
 msgstr ""
 
-#: src/properties.cpp:625
+#: src/properties.cpp:641
 msgid ""
 "Describes the nature, intellectual or journalistic characteristic of a news "
 "object, not specifically its content."
 msgstr ""
 
-#: src/properties.cpp:627
+#: src/properties.cpp:643
 msgid ""
 "Name of a location the content is focussing on -- either the location shown "
 "in visual media or referenced by text or audio media. This location name "
@@ -13741,275 +17039,282 @@
 "geographical hierarchy."
 msgstr ""
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid "IPTC Scene"
 msgstr "IPTC Scéna"
 
-#: src/properties.cpp:632
+#: src/properties.cpp:648
 msgid ""
 "Describes the scene of a photo content. Specifies one or more terms from the "
 "IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits "
 "in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid "IPTC Subject Code"
 msgstr "IPTC Kód subjektu"
 
-#: src/properties.cpp:634
+#: src/properties.cpp:650
 msgid ""
 "Specifies one or more Subjects from the IPTC \"Subject-NewsCodes\" taxonomy "
 "to categorize the content. Each Subject is represented as a string of 8 "
 "digits in an unordered list."
 msgstr ""
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
+#, fuzzy
 msgid "Additional model info"
-msgstr ""
+msgstr "Informácie o polohe automatického zaostrenia"
 
-#: src/properties.cpp:641
+#: src/properties.cpp:657
 msgid ""
 "Information about the ethnicity and other facts of the model(s) in a model-"
 "released image."
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid "Code of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:642
+#: src/properties.cpp:658
 msgid ""
 "Code from controlled vocabulary for identyfing the organisation or company "
 "which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid "Controlled Vocabulary Term"
 msgstr ""
 
-#: src/properties.cpp:643
+#: src/properties.cpp:659
 msgid ""
 "A term to describe the content of the image by a value from a Controlled "
 "Vocabulary."
 msgstr ""
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 #, fuzzy
 msgid "Model age"
 msgstr "Model"
 
-#: src/properties.cpp:644
+#: src/properties.cpp:660
 msgid ""
 "Age of the human model(s) at the time this image was taken in a model "
 "released image."
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of featured Organisation"
 msgstr ""
 
-#: src/properties.cpp:645
+#: src/properties.cpp:661
 msgid "Name of the organisation or company which is featured in the image."
 msgstr ""
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 #, fuzzy
 msgid "Person shown"
 msgstr "Verzie"
 
-#: src/properties.cpp:646
+#: src/properties.cpp:662
 msgid "Name of a person shown in the image."
 msgstr ""
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 #, fuzzy
 msgid "Digital Image Identifier"
 msgstr "Stabilizácia obrazu"
 
-#: src/properties.cpp:647
+#: src/properties.cpp:663
 msgid ""
 "Globally unique identifier for this digital image. It is created and applied "
 "by the creator of the digital image at the time of its creation. this value "
 "shall not be changed after that time."
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 msgid "Physical type of original photo"
 msgstr ""
 
-#: src/properties.cpp:648
+#: src/properties.cpp:664
 #, fuzzy
 msgid "The type of the source digital file."
 msgstr "Názov scény"
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665 src/properties.cpp:921 src/properties.cpp:930
 #, fuzzy
 msgid "Event"
 msgstr "Večer"
 
-#: src/properties.cpp:649
+#: src/properties.cpp:665
 msgid "Names or describes the specific event at which the photo was taken."
 msgstr ""
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 #, fuzzy
 msgid "Maximum available height"
 msgstr "nedostupné"
 
-#: src/properties.cpp:650
+#: src/properties.cpp:666
 msgid ""
 "The maximum available height in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
 # FUZZY exif-focallength
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 #, fuzzy
 msgid "Maximum available width"
 msgstr "Maximálna ohnisková vzdialenosť"
 
-#: src/properties.cpp:651
+#: src/properties.cpp:667
 msgid ""
 "The maximum available width in pixels of the original photo from which this "
 "photo has been derived by downsizing."
 msgstr ""
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 #, fuzzy
 msgid "Registry Entry"
 msgstr "položka poľa"
 
-#: src/properties.cpp:652
+#: src/properties.cpp:668
 msgid ""
 "Both a Registry Item Id and a Registry Organisation Id to record any "
 "registration of this digital image with a registry."
 msgstr ""
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
+#, fuzzy
 msgid "Registry Entry-Item Identifier"
-msgstr ""
+msgstr "položka poľa"
 
-#: src/properties.cpp:653
+#: src/properties.cpp:669
 msgid ""
 "A unique identifier created by a registry and applied by the creator of the "
 "digital image. This value shall not be changed after being applied. This "
 "identifier is linked to a corresponding Registry Organisation Identifier."
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid "Registry Entry-Organisation Identifier"
 msgstr ""
 
-#: src/properties.cpp:654
+#: src/properties.cpp:670
 msgid ""
 "An identifier for the registry which issued the corresponding Registry Image "
 "Id."
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 msgid "IPTC Fields Last Edited"
 msgstr ""
 
-#: src/properties.cpp:655
+#: src/properties.cpp:671
 #, fuzzy
 msgid ""
 "The date and optionally time when any of the IPTC photo metadata fields has "
 "been last edited."
 msgstr "Dátum a čas, kedy boli metadáta naposledy zmenené."
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
 #, fuzzy
 msgid "Location shown"
 msgstr "Kód umiestnenia"
 
-#: src/properties.cpp:656
+#: src/properties.cpp:672
+#, fuzzy
 msgid "A location shown in the image."
-msgstr ""
+msgstr "Posunutie náhľadu"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "Location Created"
 msgstr "Kód umiestnenia"
 
-#: src/properties.cpp:657
+#: src/properties.cpp:673
 #, fuzzy
 msgid "The location the photo was taken."
 msgstr "Dátum, kedy bol titul vydaný"
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Location-City"
 msgstr "Umiestnenie"
 
-#: src/properties.cpp:658
+#: src/properties.cpp:674
 #, fuzzy
 msgid "Name of the city of a location."
 msgstr "Meno autora alebo autorov"
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
 #, fuzzy
 msgid "Location-Country ISO-Code"
 msgstr "Kód umiestnenia"
 
-#: src/properties.cpp:659
+#: src/properties.cpp:675
+#, fuzzy
 msgid "The ISO code of a country of a location."
-msgstr ""
+msgstr "Meno autora alebo autorov"
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "Location-Country Name"
 msgstr "Názov umiestnenia"
 
-#: src/properties.cpp:660
+#: src/properties.cpp:676
 #, fuzzy
 msgid "The name of a country of a location."
 msgstr "Meno autora alebo autorov"
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
 #, fuzzy
 msgid "Location-Province/State"
 msgstr "Provincia štátu"
 
-#: src/properties.cpp:661
+#: src/properties.cpp:677
+#, fuzzy
 msgid ""
 "The name of a subregion of a country - a province or state - of a location."
-msgstr ""
+msgstr "Meno autora alebo autorov"
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 #, fuzzy
 msgid "Location-Sublocation"
 msgstr "Umiestnenie sub."
 
-#: src/properties.cpp:662
+#: src/properties.cpp:678
 msgid ""
 "Name of a sublocation. This sublocation name could either be the name of a "
 "sublocation to a city or the name of a well known location or (natural) "
 "monument outside a city."
 msgstr ""
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
 #, fuzzy
 msgid "Location-World Region"
 msgstr "Kód umiestnenia"
 
-#: src/properties.cpp:663
+#: src/properties.cpp:679
+#, fuzzy
 msgid "The name of a world region of a location."
-msgstr ""
+msgstr "Meno autora alebo autorov"
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
+#, fuzzy
 msgid "Artwork or object in the image"
-msgstr ""
+msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:664
+#: src/properties.cpp:680
 msgid "A set of metadata about artwork or an object in the image."
 msgstr ""
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 #, fuzzy
 msgid "Artwork or object-Copyright notice"
 msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:665
+#: src/properties.cpp:681
 msgid ""
 "Contains any necessary copyright notice for claiming the intellectual "
 "property for artwork or an object in the image and should identify the "
@@ -14017,1642 +17322,2195 @@
 "property rights."
 msgstr ""
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
+#, fuzzy
 msgid "Artwork or object-Creator"
-msgstr ""
+msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:666
+#: src/properties.cpp:682
 msgid ""
 "Contains the name of the artist who has created artwork or an object in the "
 "image. In cases where the artist could or should not be identified the name "
 "of a company or organisation may be appropriate."
 msgstr ""
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
+#, fuzzy
 msgid "Artwork or object-Date Created"
-msgstr ""
+msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:667
+#: src/properties.cpp:683
 msgid ""
 "Designates the date and optionally the time the artwork or object in the "
 "image was created. This relates to artwork or objects with associated "
 "intellectual property rights."
 msgstr ""
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
+#, fuzzy
 msgid "Artwork or object-Source"
-msgstr ""
+msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:668
+#: src/properties.cpp:684
 msgid ""
 "The organisation or body holding and registering the artwork or object in "
 "the image for inventory purposes."
 msgstr ""
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
+#, fuzzy
 msgid "Artwork or object-Source inventory number"
-msgstr ""
+msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:669
+#: src/properties.cpp:685
 msgid ""
 "The inventory number issued by the organisation or body holding and "
 "registering the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
+#, fuzzy
 msgid "Artwork or object-Title"
-msgstr ""
+msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:670
+#: src/properties.cpp:686
 msgid "A reference for the artwork or object in the image."
 msgstr ""
 
-#: src/properties.cpp:677
+#: src/properties.cpp:693
 msgid "Scan from film"
 msgstr ""
 
-#: src/properties.cpp:678
+#: src/properties.cpp:694
 msgid "Scan from transparency (including slide)"
 msgstr ""
 
-#: src/properties.cpp:679
+#: src/properties.cpp:695
 msgid "Scan from print"
 msgstr ""
 
-#: src/properties.cpp:680
+#: src/properties.cpp:696
 #, fuzzy
 msgid "Camera RAW"
 msgstr "ID fotoaparátu"
 
-#: src/properties.cpp:681
+#: src/properties.cpp:697
 #, fuzzy
 msgid "Camera TIFF"
 msgstr "ID fotoaparátu"
 
-#: src/properties.cpp:682
+#: src/properties.cpp:698
 #, fuzzy
 msgid "Camera JPEG"
 msgstr "ID fotoaparátu"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 #, fuzzy
 msgid "PLUS Version"
 msgstr "PDF verzia"
 
-#: src/properties.cpp:687
+#: src/properties.cpp:703
 msgid ""
 "The version number of the PLUS standards in place at the time of the "
 "transaction."
 msgstr ""
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 #, fuzzy
 msgid "Licensee"
 msgstr "šošovky"
 
-#: src/properties.cpp:688
+#: src/properties.cpp:704
 msgid ""
 "Party or parties to whom the license is granted by the Licensor/s under the "
 "license transaction."
 msgstr ""
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 #, fuzzy
 msgid "Licensee ID"
 msgstr "ID šošoviek"
 
-#: src/properties.cpp:689
+#: src/properties.cpp:705
 msgid "Optional PLUS-ID identifying each Licensee."
 msgstr ""
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Licensee Name"
 msgstr "Názov umiestnenia"
 
-#: src/properties.cpp:690
+#: src/properties.cpp:706
 #, fuzzy
 msgid "Name of each Licensee."
 msgstr "Názov scény"
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 #, fuzzy
 msgid "End User"
 msgstr "externý"
 
-#: src/properties.cpp:691
+#: src/properties.cpp:707
 msgid "Party or parties ultimately making use of the image under the license."
 msgstr ""
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
+#, fuzzy
 msgid "End User ID"
-msgstr ""
+msgstr "externý"
 
-#: src/properties.cpp:692
+#: src/properties.cpp:708
 msgid "Optional PLUS-ID identifying each End User."
 msgstr ""
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
 #, fuzzy
 msgid "End User Name"
 msgstr "Meno vlastníka"
 
-#: src/properties.cpp:693
+#: src/properties.cpp:709
+#, fuzzy
 msgid "Name of each End User."
-msgstr ""
+msgstr "Názov scény"
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 #, fuzzy
 msgid "Licensor"
 msgstr "šošovky"
 
-#: src/properties.cpp:694
+#: src/properties.cpp:710
 msgid "Party or parties granting the license to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 #, fuzzy
 msgid "Licensor ID"
 msgstr "ID šošoviek"
 
-#: src/properties.cpp:695
+#: src/properties.cpp:711
 msgid "Optional PLUS-ID identifying each Licensor."
 msgstr ""
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
 #, fuzzy
 msgid "Licensor Name"
 msgstr "Názov umiestnenia"
 
-#: src/properties.cpp:696
+#: src/properties.cpp:712
+#, fuzzy
 msgid "Name of each Licensor."
-msgstr ""
+msgstr "Názov scény"
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor Address"
-msgstr ""
+msgstr "Vlastnosti digiKam"
 
-#: src/properties.cpp:697
+#: src/properties.cpp:713
+#, fuzzy
 msgid "Licensor street address."
-msgstr ""
+msgstr "Krajina"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
+#, fuzzy
 msgid "Licensor Address Detail"
-msgstr ""
+msgstr "Kontaktné informácie- PSČ"
 
-#: src/properties.cpp:698
+#: src/properties.cpp:714
+#, fuzzy
 msgid "Additional Licensor mailing address details."
-msgstr ""
+msgstr "Informácie o polohe automatického zaostrenia"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
 #, fuzzy
 msgid "Licensor City"
 msgstr "Mexico City"
 
-#: src/properties.cpp:699
+#: src/properties.cpp:715
+#, fuzzy
 msgid "Licensor City name."
-msgstr ""
+msgstr "Krajina"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
 #, fuzzy
 msgid "Licensor State or Province"
 msgstr "Štát/provincia"
 
-#: src/properties.cpp:700
+#: src/properties.cpp:716
+#, fuzzy
 msgid "Licensor State or Province name."
-msgstr ""
+msgstr "Štát/provincia"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
 #, fuzzy
 msgid "Licensor Postal Code"
 msgstr "Kontaktné informácie- PSČ"
 
-#: src/properties.cpp:701
+#: src/properties.cpp:717
+#, fuzzy
 msgid "Licensor Postal Code or Zip Code."
-msgstr ""
+msgstr "Kontaktné informácie- PSČ"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country"
 msgstr "Krajina"
 
-#: src/properties.cpp:702
+#: src/properties.cpp:718
 #, fuzzy
 msgid "Licensor Country name."
 msgstr "Krajina"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1"
-msgstr ""
+msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:703
+#: src/properties.cpp:719
+#, fuzzy
 msgid "Licensor Telephone Type 1."
-msgstr ""
+msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
+#, fuzzy
 msgid "Licensor Telephone 1"
-msgstr ""
+msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:704
+#: src/properties.cpp:720
 #, fuzzy
 msgid "Licensor Telephone number 1."
 msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2"
-msgstr ""
+msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:705
+#: src/properties.cpp:721
+#, fuzzy
 msgid "Licensor Telephone Type 2."
-msgstr ""
+msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
+#, fuzzy
 msgid "Licensor Telephone 2"
-msgstr ""
+msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:706
+#: src/properties.cpp:722
 #, fuzzy
 msgid "Licensor Telephone number 2."
 msgstr "Sériové číslo fotoaparátu"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email"
-msgstr ""
+msgstr "Názov umiestnenia"
 
-#: src/properties.cpp:707
+#: src/properties.cpp:723
+#, fuzzy
 msgid "Licensor Email address."
-msgstr ""
+msgstr "Kontaktné informácie- PSČ"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 #, fuzzy
 msgid "Licensor URL"
 msgstr "Posledný URL"
 
-#: src/properties.cpp:708
+#: src/properties.cpp:724
 msgid "Licensor world wide web address."
 msgstr ""
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 #, fuzzy
 msgid "Licensor Notes"
 msgstr "Vlastnosti digiKam"
 
-#: src/properties.cpp:709
+#: src/properties.cpp:725
 msgid ""
 "Supplemental information for use in identifying and contacting the Licensor/"
 "s."
 msgstr ""
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 #, fuzzy
 msgid "PLUS Media Summary Code"
 msgstr "GPS Režim merania"
 
-#: src/properties.cpp:710
+#: src/properties.cpp:726
 msgid ""
 "A PLUS-standardized alphanumeric code string summarizing the media usages "
 "included in the license."
 msgstr ""
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "License Start Date"
 msgstr "Dátum Minolta"
 
-#: src/properties.cpp:711
+#: src/properties.cpp:727
 #, fuzzy
 msgid "The date on which the license takes effect."
 msgstr "Dátum a čas, kedy bolo video nasnímané."
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "License End Date"
 msgstr "Údaje šošoviek"
 
-#: src/properties.cpp:712
+#: src/properties.cpp:728
 #, fuzzy
 msgid "The date on which the license expires."
 msgstr "Názov scény"
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 #, fuzzy
 msgid "Media Constraints"
 msgstr "Kontrast"
 
-#: src/properties.cpp:713
+#: src/properties.cpp:729
 msgid ""
 "Constraints limiting the scope of PLUS Media Usage/s included in the license "
 "to particular named media or to media not yet specifically defined in the "
 "PLUS Media Matrix."
 msgstr ""
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
+#, fuzzy
 msgid "Region Constraints"
-msgstr ""
+msgstr "Kontrast"
 
-#: src/properties.cpp:714
+#: src/properties.cpp:730
 msgid ""
 "Constraints limiting the scope of geographic distribution to specific "
 "cities, states, provinces or other areas to be included in or excluded from "
 "the PLUS Regions specified in the Media Usages specified in the license."
 msgstr ""
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
+#, fuzzy
 msgid "Product or Service Constraints"
-msgstr ""
+msgstr "Automatický kontrast"
 
-#: src/properties.cpp:715
+#: src/properties.cpp:731
 msgid ""
 "Constraints limiting usage of the image to promotion of/association with a "
 "named product or service."
 msgstr ""
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 #, fuzzy
 msgid "Image File Constraints"
 msgstr "Nastavenie veľkosti obrázka"
 
-#: src/properties.cpp:716
+#: src/properties.cpp:732
 msgid ""
 "Constraints on the changing of the image file name, metadata or file type."
 msgstr ""
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
+#, fuzzy
 msgid "Image Alteration Constraints"
-msgstr ""
+msgstr "Nastavenie kvality obrázka"
 
-#: src/properties.cpp:717
+#: src/properties.cpp:733
 msgid ""
 "Constraints on alteration of the image by cropping, flipping, retouching, "
 "colorization, de-colorization or merging."
 msgstr ""
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 #, fuzzy
 msgid "Image Duplication Constraints"
 msgstr "Nastavenie kvality obrázka"
 
-#: src/properties.cpp:718
+#: src/properties.cpp:734
 msgid "Constraints on the creation of duplicates of the image."
 msgstr ""
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 #, fuzzy
 msgid "Model Release Status"
 msgstr "Dátum vydania"
 
-#: src/properties.cpp:719
+#: src/properties.cpp:735
 msgid ""
 "Summarizes the availability and scope of model releases authorizing usage of "
 "the likenesses of persons appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 #, fuzzy
 msgid "Model Release ID"
 msgstr "ID modelu"
 
-#: src/properties.cpp:720
+#: src/properties.cpp:736
 msgid "Optional identifier associated with each Model Release."
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid "Minor Model Age Disclosure"
 msgstr ""
 
-#: src/properties.cpp:721
+#: src/properties.cpp:737
 msgid ""
 "Age of the youngest model pictured in the image, at the time that the image "
 "was made."
 msgstr ""
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
+#, fuzzy
 msgid "Property Release Status"
-msgstr ""
+msgstr "Dátum vydania"
 
-#: src/properties.cpp:722
+#: src/properties.cpp:738
 msgid ""
 "Summarizes the availability and scope of property releases authorizing usage "
 "of the properties appearing in the photograph."
 msgstr ""
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
+#, fuzzy
 msgid "Property Release ID"
-msgstr ""
+msgstr "ID modelu"
 
-#: src/properties.cpp:723
+#: src/properties.cpp:739
 msgid "Optional identifier associated with each Property Release."
 msgstr ""
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
 #, fuzzy
 msgid "Other Constraints"
 msgstr "Automatický kontrast"
 
-#: src/properties.cpp:724
+#: src/properties.cpp:740
+#, fuzzy
 msgid "Additional constraints on the license."
-msgstr ""
+msgstr "Informácie o polohe automatického zaostrenia"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
+#, fuzzy
 msgid "Credit Line Required"
-msgstr ""
+msgstr "Nepoužité"
 
-#: src/properties.cpp:725
+#: src/properties.cpp:741
 msgid "Attribution requirements, if any."
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Adult Content Warning"
 msgstr ""
 
-#: src/properties.cpp:726
+#: src/properties.cpp:742
 msgid "Warning indicating the presence of content not suitable for minors."
 msgstr ""
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Other License Requirements"
-msgstr ""
+msgstr "Info o šošovkách"
 
-#: src/properties.cpp:727
+#: src/properties.cpp:743
+#, fuzzy
 msgid "Additional license requirements."
-msgstr ""
+msgstr "Informácie o polohe automatického zaostrenia"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
+#, fuzzy
 msgid "Terms and Conditions Text"
-msgstr ""
+msgstr "Podmienky zachytenia obrázka"
 
-#: src/properties.cpp:728
+#: src/properties.cpp:744
 msgid "Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
+#, fuzzy
 msgid "Terms and Conditions URL"
-msgstr ""
+msgstr "Podmienky zachytenia obrázka"
 
-#: src/properties.cpp:729
+#: src/properties.cpp:745
 msgid "URL for Terms and Conditions applying to the license."
 msgstr ""
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
 #, fuzzy
 msgid "Other License Conditions"
 msgstr "Podmienky zachytenia obrázka"
 
-#: src/properties.cpp:730
+#: src/properties.cpp:746
+#, fuzzy
 msgid "Additional license conditions."
-msgstr ""
+msgstr "Informácie o polohe automatického zaostrenia"
 
-#: src/properties.cpp:731
+#: src/properties.cpp:747
 #, fuzzy
 msgid "Identifies the type of image delivered."
 msgstr "Identifikácia poskytovateľa a produktu"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
+#, fuzzy
 msgid "Licensor Image ID"
-msgstr ""
+msgstr "ID šošoviek"
 
-#: src/properties.cpp:732
+#: src/properties.cpp:748
 msgid "Optional identifier assigned by the Licensor to the image."
 msgstr ""
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
+#, fuzzy
 msgid "Image File Name As Delivered"
-msgstr ""
+msgstr "Súvisiaci formát súboru obrázka"
 
-#: src/properties.cpp:733
+#: src/properties.cpp:749
 msgid ""
 "Name of the image file delivered to the Licensee for use under the license."
 msgstr ""
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 #, fuzzy
 msgid "Image File Format As Delivered"
 msgstr "Súvisiaci formát súboru obrázka"
 
-#: src/properties.cpp:734
+#: src/properties.cpp:750
 msgid ""
 "File format of the image file delivered to the Licensee for use under the "
 "license."
 msgstr ""
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
+#, fuzzy
 msgid "Image File Size As Delivered"
-msgstr ""
+msgstr "Súvisiaci formát súboru obrázka"
 
-#: src/properties.cpp:735
+#: src/properties.cpp:751
 msgid "Size of the image file delivered to the Licensee."
 msgstr ""
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright Status"
 msgstr "Copyright"
 
-#: src/properties.cpp:736
+#: src/properties.cpp:752
 #, fuzzy
 msgid "Copyright status of the image."
 msgstr "Oznam autorských práv"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
+#, fuzzy
 msgid "Copyright Registration Number"
-msgstr ""
+msgstr "Meno vlastníka"
 
-#: src/properties.cpp:737
+#: src/properties.cpp:753
 msgid "Copyright Registration Number, if any, applying to the licensed image."
 msgstr ""
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "First Publication Date"
 msgstr "Dátum digitalizácie"
 
-#: src/properties.cpp:738
+#: src/properties.cpp:754
 #, fuzzy
 msgid "The date on which the image was first published."
 msgstr "Dátum, kedy bol titul vydaný"
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 #, fuzzy
 msgid "Copyright Owner"
 msgstr "Copyright"
 
-#: src/properties.cpp:739
+#: src/properties.cpp:755
 msgid "Owner or owners of the copyright in the licensed image."
 msgstr ""
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 #, fuzzy
 msgid "Copyright Owner ID"
 msgstr "Copyright"
 
-#: src/properties.cpp:740
+#: src/properties.cpp:756
 msgid "Optional PLUS-ID identifying each Copyright Owner."
 msgstr ""
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
 #, fuzzy
 msgid "Copyright Owner Name"
 msgstr "Meno vlastníka"
 
-#: src/properties.cpp:741
+#: src/properties.cpp:757
+#, fuzzy
 msgid "Name of Copyright Owner."
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
+#, fuzzy
 msgid "Copyright Owner Image ID"
-msgstr ""
+msgstr "Copyright"
 
-#: src/properties.cpp:742
+#: src/properties.cpp:758
 msgid "Optional identifier assigned by the Copyright Owner to the image."
 msgstr ""
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Image Creator"
 msgstr "Orientácia obrázka"
 
-#: src/properties.cpp:743
+#: src/properties.cpp:759
 #, fuzzy
 msgid "Creator/s of the image."
 msgstr "Posunutie náhľadu"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 #, fuzzy
 msgid "Image Creator ID"
 msgstr "Orientácia obrázka"
 
-#: src/properties.cpp:744
+#: src/properties.cpp:760
 msgid "Optional PLUS-ID identifying each Image Creator."
 msgstr ""
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Image Creator Name"
 msgstr "Tón obrázka"
 
-#: src/properties.cpp:745
+#: src/properties.cpp:761
 #, fuzzy
 msgid "Name of Image Creator."
 msgstr "Počet obrázkov"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
+#, fuzzy
 msgid "Image Creator Image ID"
-msgstr ""
+msgstr "Orientácia obrázka"
 
-#: src/properties.cpp:746
+#: src/properties.cpp:762
 msgid "Optional identifier assigned by the Image Creator to the image."
 msgstr ""
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 #, fuzzy
 msgid "Image Supplier ID"
 msgstr "Jedinečný ID obrázka"
 
-#: src/properties.cpp:747
+#: src/properties.cpp:763
 msgid "Optional PLUS-ID identifying the Image Supplier."
 msgstr ""
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
 #, fuzzy
 msgid "Image Supplier Name"
 msgstr "Veľkosť obrázka"
 
-#: src/properties.cpp:748
+#: src/properties.cpp:764
+#, fuzzy
 msgid "Name of Image Supplier."
-msgstr ""
+msgstr "Počet obrázkov"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
+#, fuzzy
 msgid "Image Supplier Image ID"
-msgstr ""
+msgstr "Jedinečný ID obrázka"
 
-#: src/properties.cpp:749
+#: src/properties.cpp:765
 msgid "Optional identifier assigned by the Image Supplier to the image."
 msgstr ""
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
+#, fuzzy
 msgid "Licensee Image ID"
-msgstr ""
+msgstr "Zmazať počet obrázkov"
 
-#: src/properties.cpp:750
+#: src/properties.cpp:766
 msgid "Optional identifier assigned by the Licensee to the image."
 msgstr ""
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
 #, fuzzy
 msgid "Licensee Image Notes"
 msgstr "Zmazať počet obrázkov"
 
-#: src/properties.cpp:751
+#: src/properties.cpp:767
+#, fuzzy
 msgid "Notes added by Licensee."
-msgstr ""
+msgstr "Názov scény"
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
+#, fuzzy
 msgid "Other Image Info"
-msgstr ""
+msgstr "Info o šošovkách"
 
-#: src/properties.cpp:752
+#: src/properties.cpp:768
 #, fuzzy
 msgid "Additional image information."
 msgstr "Informácie o polohe automatického zaostrenia"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 #, fuzzy
 msgid "License ID"
 msgstr "ID šošoviek"
 
-#: src/properties.cpp:753
+#: src/properties.cpp:769
 msgid "Optional PLUS-ID assigned by the Licensor to the License."
 msgstr ""
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
+#, fuzzy
 msgid "Licensor Transaction ID"
-msgstr ""
+msgstr "Dátum expirácie"
 
-#: src/properties.cpp:754
+#: src/properties.cpp:770
 msgid ""
 "Identifier assigned by Licensor for Licensor's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
+#, fuzzy
 msgid "Licensee Transaction ID"
-msgstr ""
+msgstr "Dátum expirácie"
 
-#: src/properties.cpp:755
+#: src/properties.cpp:771
 msgid ""
 "Identifier assigned by Licensee for Licensee's reference and internal use."
 msgstr ""
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 msgid "Licensee Project Reference"
 msgstr ""
 
-#: src/properties.cpp:756
+#: src/properties.cpp:772
 msgid "Project reference name or description assigned by Licensee."
 msgstr ""
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "License Transaction Date"
 msgstr "Dátum expirácie"
 
-#: src/properties.cpp:757
+#: src/properties.cpp:773
 #, fuzzy
 msgid "The date of the License Transaction."
 msgstr "Názov scény"
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 #, fuzzy
 msgid "Reuse"
 msgstr "použité"
 
-#: src/properties.cpp:758
+#: src/properties.cpp:774
 msgid ""
 "Indicates whether a license is a repeat or an initial license.  Reuse may "
 "require that licenses stored in files previously delivered to the customer "
 "be updated."
 msgstr ""
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
+#, fuzzy
 msgid "Other License Documents"
-msgstr ""
+msgstr "Podmienky zachytenia obrázka"
 
-#: src/properties.cpp:759
+#: src/properties.cpp:775
 msgid ""
 "Reference information for additional documents associated with the license."
 msgstr ""
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Other License Info"
 msgstr "Info o šošovkách"
 
-#: src/properties.cpp:760
+#: src/properties.cpp:776
 #, fuzzy
 msgid "Additional license information."
 msgstr "Informácie o polohe automatického zaostrenia"
 
-#: src/properties.cpp:761 src/properties.cpp:762 src/properties.cpp:763
-#: src/properties.cpp:764 src/properties.cpp:765
+#: src/properties.cpp:777 src/properties.cpp:778 src/properties.cpp:779
+#: src/properties.cpp:780 src/properties.cpp:781
 msgid "Optional field for use at Licensor's discretion."
 msgstr ""
 
-#: src/properties.cpp:764
+#: src/properties.cpp:780
 #, fuzzy
 msgid "Custom 4"
 msgstr "Vlastný 1"
 
-#: src/properties.cpp:765
+#: src/properties.cpp:781
 #, fuzzy
 msgid "Custom 5"
 msgstr "Vlastný 1"
 
-#: src/properties.cpp:766
+#: src/properties.cpp:782
 #, fuzzy
 msgid "Custom 6"
 msgstr "Vlastný 1"
 
-#: src/properties.cpp:766 src/properties.cpp:767 src/properties.cpp:768
-#: src/properties.cpp:769 src/properties.cpp:770
+#: src/properties.cpp:782 src/properties.cpp:783 src/properties.cpp:784
+#: src/properties.cpp:785 src/properties.cpp:786
 msgid "Optional field for use at Licensee's discretion."
 msgstr ""
 
-#: src/properties.cpp:767
+#: src/properties.cpp:783
 #, fuzzy
 msgid "Custom 7"
 msgstr "Vlastný 1"
 
-#: src/properties.cpp:768
+#: src/properties.cpp:784
 #, fuzzy
 msgid "Custom 8"
 msgstr "Vlastný 1"
 
-#: src/properties.cpp:769
+#: src/properties.cpp:785
 #, fuzzy
 msgid "Custom 9"
 msgstr "Vlastný 1"
 
-#: src/properties.cpp:770
+#: src/properties.cpp:786
 #, fuzzy
 msgid "Custom 10"
 msgstr "Vlastný 1"
 
-#: src/properties.cpp:777
+#: src/properties.cpp:793
 msgid "Adult Content Warning Required"
 msgstr ""
 
-#: src/properties.cpp:778
+#: src/properties.cpp:794
 #, fuzzy
 msgid "Not Required"
 msgstr "Nepoužité"
 
-#: src/properties.cpp:784
+#: src/properties.cpp:800
 #, fuzzy
 msgid "Protected"
 msgstr "Identifikačné číslo výrobku"
 
-#: src/properties.cpp:785
+#: src/properties.cpp:801
 msgid "Public Domain"
 msgstr ""
 
-#: src/properties.cpp:791
+#: src/properties.cpp:807
+#, fuzzy
 msgid "Credit Adjacent To Image"
-msgstr ""
+msgstr "Zobraziť vložený obrázok"
 
-#: src/properties.cpp:792
+#: src/properties.cpp:808
 msgid "Credit in Credits Area"
 msgstr ""
 
-#: src/properties.cpp:793
+#: src/properties.cpp:809
 #, fuzzy
 msgid "Credit on Image"
 msgstr "Zobraziť vložený obrázok"
 
-#: src/properties.cpp:794
+#: src/properties.cpp:810
 #, fuzzy
 msgid "Not Require"
 msgstr "nedefinované"
 
-#: src/properties.cpp:799
+#: src/properties.cpp:815
 #, fuzzy
 msgid "No Colorization"
 msgstr "Solarizácia"
 
-#: src/properties.cpp:800
+#: src/properties.cpp:816
 msgid "No Cropping"
 msgstr ""
 
-#: src/properties.cpp:801
+#: src/properties.cpp:817
 #, fuzzy
 msgid "No De-Colorization"
 msgstr "Solarizácia"
 
-#: src/properties.cpp:802
+#: src/properties.cpp:818
 msgid "No Flipping"
 msgstr ""
 
-#: src/properties.cpp:803
+#: src/properties.cpp:819
+#, fuzzy
 msgid "No Merging"
-msgstr ""
+msgstr "Redukcia šumu"
 
-#: src/properties.cpp:804
+#: src/properties.cpp:820
 #, fuzzy
 msgid "No Retouching"
 msgstr "Redukcia šumu"
 
-#: src/properties.cpp:809
+#: src/properties.cpp:825
 msgid "Duplication Only as Necessary Under License"
 msgstr ""
 
-#: src/properties.cpp:810
+#: src/properties.cpp:826
+#, fuzzy
 msgid "No Duplication Constraints"
-msgstr ""
+msgstr "Nastavenie kvality obrázka"
 
-#: src/properties.cpp:811
+#: src/properties.cpp:827
 #, fuzzy
 msgid "No Duplication"
 msgstr "Trvanie zvuku"
 
-#: src/properties.cpp:816
+#: src/properties.cpp:832
 #, fuzzy
 msgid "Maintain File Name"
 msgstr "Názov nespracovaného súboru"
 
-#: src/properties.cpp:817
+#: src/properties.cpp:833
+#, fuzzy
 msgid "Maintain File Type"
-msgstr ""
+msgstr "Názov nespracovaného súboru"
 
-#: src/properties.cpp:818
+#: src/properties.cpp:834
 #, fuzzy
 msgid "Maintain ID in File Name"
 msgstr "Názov nespracovaného pôvodného súboru"
 
-#: src/properties.cpp:819
+#: src/properties.cpp:835
 #, fuzzy
 msgid "Maintain Metadata"
 msgstr "Dátum Minolta"
 
-#: src/properties.cpp:824
+#: src/properties.cpp:840
 #, fuzzy
 msgid "Windows Bitmap (BMP)"
 msgstr "Názov okna"
 
-#: src/properties.cpp:825
+#: src/properties.cpp:841
 msgid "Digital Negative (DNG)"
 msgstr ""
 
-#: src/properties.cpp:826
+#: src/properties.cpp:842
 msgid "Encapsulated PostScript (EPS)"
 msgstr ""
 
 # exif-jpeginterchangeformat
-#: src/properties.cpp:827
+#: src/properties.cpp:843
 #, fuzzy
 msgid "Graphics Interchange Format (GIF)"
 msgstr "formát JPEG"
 
 # exif-jpeginterchangeformat
-#: src/properties.cpp:828
+#: src/properties.cpp:844
 #, fuzzy
 msgid "JPEG Interchange Formats (JPG, JIF, JFIF)"
 msgstr "formát JPEG"
 
-#: src/properties.cpp:830
+#: src/properties.cpp:846
 msgid "Macintosh Picture (PICT)"
 msgstr ""
 
-#: src/properties.cpp:831
+#: src/properties.cpp:847
 msgid "Portable Network Graphics (PNG)"
 msgstr ""
 
-#: src/properties.cpp:832
+#: src/properties.cpp:848
 msgid "Photoshop Document (PSD)"
 msgstr ""
 
-#: src/properties.cpp:833
+#: src/properties.cpp:849
 msgid "Proprietary RAW Image Format"
 msgstr ""
 
-#: src/properties.cpp:834
+#: src/properties.cpp:850
 #, fuzzy
 msgid "Tagged Image File Format (TIFF)"
 msgstr "Súvisiaci formát súboru obrázka"
 
-#: src/properties.cpp:835
+#: src/properties.cpp:851
 msgid "Windows Media Photo (HD Photo)"
 msgstr ""
 
-#: src/properties.cpp:840
+#: src/properties.cpp:856
 msgid "Greater than 50 MB"
 msgstr ""
 
-#: src/properties.cpp:841
+#: src/properties.cpp:857
+#, fuzzy
 msgid "Up to 1 MB"
-msgstr ""
+msgstr "Optio A10"
 
-#: src/properties.cpp:842
+#: src/properties.cpp:858
 #, fuzzy
 msgid "Up to 10 MB"
 msgstr "Optio A10"
 
-#: src/properties.cpp:843
+#: src/properties.cpp:859
 #, fuzzy
 msgid "Up to 30 MB"
 msgstr "Optio 30"
 
-#: src/properties.cpp:844
+#: src/properties.cpp:860
 #, fuzzy
 msgid "Up to 50 MB"
 msgstr "Optio S50"
 
-#: src/properties.cpp:849
+#: src/properties.cpp:865
 #, fuzzy
 msgid "Illustrated Image"
 msgstr "Šírka súvisiaceho obrázka"
 
-#: src/properties.cpp:850
+#: src/properties.cpp:866
 msgid "Multimedia or Composited Image"
 msgstr ""
 
-#: src/properties.cpp:852
+#: src/properties.cpp:868
 msgid "Photographic Image"
 msgstr ""
 
-#: src/properties.cpp:853
-#, fuzzy
-msgid "Video"
-msgstr "Široké"
-
-#: src/properties.cpp:858
+#: src/properties.cpp:874
 msgid "Cell"
 msgstr ""
 
-#: src/properties.cpp:859
+#: src/properties.cpp:875
 msgid "FAX"
 msgstr ""
 
-#: src/properties.cpp:861
+#: src/properties.cpp:877
 #, fuzzy
 msgid "Pager"
 msgstr "Manažér"
 
-#: src/properties.cpp:862
+#: src/properties.cpp:878
 msgid "Work"
 msgstr ""
 
-#: src/properties.cpp:867
+#: src/properties.cpp:883
 #, fuzzy
 msgid "Age Unknown"
 msgstr "Neznáme"
 
-#: src/properties.cpp:868
+#: src/properties.cpp:884
 msgid "Age 25 or Over"
 msgstr ""
 
-#: src/properties.cpp:869
+#: src/properties.cpp:885
 msgid "Age 24"
 msgstr ""
 
-#: src/properties.cpp:870
+#: src/properties.cpp:886
 msgid "Age 23"
 msgstr ""
 
-#: src/properties.cpp:871
+#: src/properties.cpp:887
 msgid "Age 22"
 msgstr ""
 
-#: src/properties.cpp:872
+#: src/properties.cpp:888
 msgid "Age 21"
 msgstr ""
 
-#: src/properties.cpp:873
+#: src/properties.cpp:889
 msgid "Age 20"
 msgstr ""
 
-#: src/properties.cpp:874
+#: src/properties.cpp:890
 msgid "Age 19"
 msgstr ""
 
-#: src/properties.cpp:875
+#: src/properties.cpp:891
 msgid "Age 18"
 msgstr ""
 
-#: src/properties.cpp:876
+#: src/properties.cpp:892
 msgid "Age 17"
 msgstr ""
 
-#: src/properties.cpp:877
+#: src/properties.cpp:893
 msgid "Age 16"
 msgstr ""
 
-#: src/properties.cpp:878
+#: src/properties.cpp:894
 msgid "Age 15"
 msgstr ""
 
-#: src/properties.cpp:879
+#: src/properties.cpp:895
 msgid "Age 14 or Under"
 msgstr ""
 
-#: src/properties.cpp:885 src/properties.cpp:893 src/properties.cpp:900
+#: src/properties.cpp:901 src/properties.cpp:909 src/properties.cpp:916
 msgid "Not Applicable"
 msgstr ""
 
-#: src/properties.cpp:886
+#: src/properties.cpp:902
+#, fuzzy
 msgid "Unlimited Model Releases"
-msgstr ""
+msgstr "ID modelu"
 
-#: src/properties.cpp:887
+#: src/properties.cpp:903
 msgid "Limited or Incomplete Model Releases"
 msgstr ""
 
-#: src/properties.cpp:894
+#: src/properties.cpp:910
 msgid "Unlimited Property Releases"
 msgstr ""
 
-#: src/properties.cpp:895
+#: src/properties.cpp:911
 msgid "Limited or Incomplete Property Releases"
 msgstr ""
 
-#: src/properties.cpp:901
+#: src/properties.cpp:917
 msgid "Repeat Use"
 msgstr ""
 
-#: src/sigmamn.cpp:60
+#: src/properties.cpp:921 src/properties.cpp:930
+#, fuzzy
+msgid "Fixture Identification"
+msgstr "Model"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+#, fuzzy
+msgid "Status"
+msgstr "Stav GPS"
+
+#: src/properties.cpp:922 src/properties.cpp:931
+msgid "A notation making the image unique"
+msgstr ""
+
+#: src/properties.cpp:923 src/properties.cpp:932
+msgid "People"
+msgstr ""
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "CatalogSets"
+msgstr ""
+
+#: src/properties.cpp:924 src/properties.cpp:933
+msgid "Descriptive markers of catalog items by content"
+msgstr ""
+
+#: src/sigmamn.cpp:62
 msgid "Resolution Mode"
 msgstr "Režim rozlíšenia"
 
-#: src/sigmamn.cpp:61
+#: src/sigmamn.cpp:63
 msgid "Resolution mode"
 msgstr "Režim rozlíšenia"
 
-#: src/sigmamn.cpp:62
+#: src/sigmamn.cpp:65
 msgid "Autofocus Mode"
 msgstr "Režim automatického zaostrenia"
 
-#: src/sigmamn.cpp:63
+#: src/sigmamn.cpp:66
 msgid "Autofocus mode"
 msgstr "Režim automatického zaostrenia"
 
-#: src/sigmamn.cpp:65
+#: src/sigmamn.cpp:68
 msgid "Focus Setting"
 msgstr "Nastavenia zaostrenia"
 
-#: src/sigmamn.cpp:66
+#: src/sigmamn.cpp:69
 msgid "Focus setting"
 msgstr "Nastavenia zaostrenia"
 
-#: src/sigmamn.cpp:77
+#: src/sigmamn.cpp:80
 msgid "Lens Range"
 msgstr "Rozsah šošoviek:"
 
-#: src/sigmamn.cpp:78
+#: src/sigmamn.cpp:81
 msgid "Lens focal length range"
 msgstr "Rozsah ohniskovej vzdialenosti šošoviek"
 
 # exif-lightsource-11
-#: src/sigmamn.cpp:89 src/sigmamn.cpp:90
+#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
 msgid "Shadow"
 msgstr "Tieň"
 
-#: src/sigmamn.cpp:92 src/sigmamn.cpp:93
+#: src/sigmamn.cpp:95 src/sigmamn.cpp:96
 msgid "Highlight"
 msgstr "Svetlé miesta"
 
-#: src/sigmamn.cpp:101
+#: src/sigmamn.cpp:104
+#, fuzzy
 msgid "Fill Light"
-msgstr ""
+msgstr "nedostupné"
 
-#: src/sigmamn.cpp:102
+#: src/sigmamn.cpp:105
+#, fuzzy
 msgid "X3 Fill light"
-msgstr ""
+msgstr "Spustí sa blesk"
 
-#: src/sigmamn.cpp:104
+#: src/sigmamn.cpp:107
 msgid "Color Adjustment"
 msgstr "Úprava farieb"
 
-#: src/sigmamn.cpp:105
+#: src/sigmamn.cpp:108
 msgid "Color adjustment"
 msgstr "Úprava farieb"
 
-#: src/sigmamn.cpp:107
+#: src/sigmamn.cpp:110
 msgid "Adjustment Mode"
 msgstr "Režim úprav"
 
-#: src/sigmamn.cpp:108
+#: src/sigmamn.cpp:111
 msgid "Adjustment mode"
 msgstr "Režim úprav"
 
-#: src/sigmamn.cpp:113 src/sigmamn.cpp:114
-msgid "Firmware"
-msgstr "Firmvér"
-
-#: src/sigmamn.cpp:119
+#: src/sigmamn.cpp:122
 msgid "Auto Bracket"
 msgstr "Automatická uzávierka"
 
-#: src/sigmamn.cpp:120 src/tags.cpp:1124
+#: src/sigmamn.cpp:123 src/tags.cpp:1312
 msgid "Auto bracket"
 msgstr "Automatický viacnásobný záber"
 
-#: src/sigmamn.cpp:124
+#: src/sigmamn.cpp:127
 msgid "Unknown SigmaMakerNote tag"
 msgstr "Neznáma značka SigmaMakerNote"
 
-#: src/sigmamn.cpp:167
-msgid "8-Segment"
-msgstr ""
+#: src/sigmamn.cpp:170
+msgid "8-Segment"
+msgstr ""
+
+#: src/sonymn.cpp:88
+#, fuzzy
+msgid "Standard "
+msgstr "Štandardný"
+
+#: src/sonymn.cpp:91
+msgid "Advanced Lv1"
+msgstr ""
+
+#: src/sonymn.cpp:92
+msgid "Advanced Lv2"
+msgstr ""
+
+#: src/sonymn.cpp:93
+msgid "Advanced Lv3"
+msgstr ""
+
+#: src/sonymn.cpp:94
+msgid "Advanced Lv4"
+msgstr ""
+
+#: src/sonymn.cpp:95
+msgid "Advanced Lv5"
+msgstr ""
+
+# exif-scenecapturetype-1
+#: src/sonymn.cpp:109
+#, fuzzy
+msgid "Landscape "
+msgstr "krajinka"
+
+#: src/sonymn.cpp:113
+#, fuzzy
+msgid "Night Scene / Twilight"
+msgstr "Nočná scéna"
+
+#: src/sonymn.cpp:114
+msgid "Hi-Speed Shutter"
+msgstr ""
+
+#: src/sonymn.cpp:115
+#, fuzzy
+msgid "Twilight Portrait"
+msgstr "Nočný portrét"
+
+# exif-sharpness-1
+#: src/sonymn.cpp:116
+#, fuzzy
+msgid "Soft Snap"
+msgstr "mäkký"
+
+#: src/sonymn.cpp:118
+#, fuzzy
+msgid "Smile Shutter"
+msgstr "pomalá uzávierka"
+
+#: src/sonymn.cpp:120
+#, fuzzy
+msgid "High Sensitivity"
+msgstr "ISO citlivosť"
+
+#: src/sonymn.cpp:121
+msgid "Advanced Sports Shooting"
+msgstr ""
+
+#: src/sonymn.cpp:123
+#, fuzzy
+msgid "Gourmet"
+msgstr "ID dokumentu"
+
+#: src/sonymn.cpp:125
+#, fuzzy
+msgid "Handheld Twilight"
+msgstr "svetlo sviečky"
+
+#: src/sonymn.cpp:126
+#, fuzzy
+msgid "Anti Motion Blur"
+msgstr "Režim obrázka"
+
+#: src/sonymn.cpp:128
+#, fuzzy
+msgid "Backlight Correction HDR"
+msgstr "Bez korekcie"
+
+#: src/sonymn.cpp:142
+#, fuzzy
+msgid "On (Continuous)"
+msgstr "Spojitý"
+
+#: src/sonymn.cpp:143
+#, fuzzy
+msgid "On (Shooting)"
+msgstr "Režim fotenia"
+
+#: src/sonymn.cpp:151
+msgid "Plus"
+msgstr ""
+
+# exif-lightsource-15
+#: src/sonymn.cpp:167
+#, fuzzy
+msgid "White Flourescent"
+msgstr "biela, fluorescenčná"
+
+# exif-lightsource-15
+#: src/sonymn.cpp:168
+#, fuzzy
+msgid "Cool White Flourescent"
+msgstr "biela, fluorescenčná"
+
+# exif-lightsource-13
+#: src/sonymn.cpp:169
+#, fuzzy
+msgid "Day White Flourescent"
+msgstr "biely deň, fluorescenčné"
+
+#: src/sonymn.cpp:172
+#, fuzzy
+msgid "Underwater 1 (Blue Water)"
+msgstr "pod vodou"
+
+#: src/sonymn.cpp:173
+#, fuzzy
+msgid "Underwater 2 (Green Water)"
+msgstr "pod vodou"
+
+#: src/sonymn.cpp:180
+msgid "Permanent-AF"
+msgstr ""
+
+#: src/sonymn.cpp:188
+#, fuzzy
+msgid "Center AF"
+msgstr "v strede"
+
+#: src/sonymn.cpp:189
+#, fuzzy
+msgid "Spot AF"
+msgstr "Bodový"
+
+#: src/sonymn.cpp:190
+msgid "Flexible Spot AF"
+msgstr ""
+
+#: src/sonymn.cpp:191
+#, fuzzy
+msgid "Touch AF"
+msgstr "VB jedným dotykom"
+
+#: src/sonymn.cpp:192
+#, fuzzy
+msgid "Manual Focus"
+msgstr "Ručné zaostrenie"
+
+#: src/sonymn.cpp:193
+#, fuzzy
+msgid "Face Detected"
+msgstr "Nepodarilo sa prečítať"
+
+#: src/sonymn.cpp:208
+#, fuzzy
+msgid "Close Focus"
+msgstr "Automatické zaostrenie"
+
+#: src/sonymn.cpp:224
+#, fuzzy
+msgid "Exposure Bracketing"
+msgstr "Viacnásobné snímky so zmenou expozície"
+
+#: src/sonymn.cpp:298 src/sonymn.cpp:299
+#, fuzzy
+msgid "Multi Burst Mode"
+msgstr "Režim dávky"
+
+#: src/sonymn.cpp:301 src/sonymn.cpp:302
+#, fuzzy
+msgid "Multi Burst Image Width"
+msgstr "Šírka súvisiaceho obrázka"
+
+#: src/sonymn.cpp:304 src/sonymn.cpp:305
+#, fuzzy
+msgid "Multi Burst Image Height"
+msgstr "Výška obrázka"
+
+#: src/sonymn.cpp:315
+#, fuzzy
+msgid "JPEG preview image"
+msgstr "Zobraziť vložený obrázok"
+
+#: src/sonymn.cpp:341
+#, fuzzy
+msgid "Auto HDR"
+msgstr "automatický vysoký"
+
+#: src/sonymn.cpp:342
+msgid "High Definition Range Mode"
+msgstr ""
+
+#: src/sonymn.cpp:346
+#, fuzzy
+msgid "Shot Information"
+msgstr "Informácie o snímke"
+
+#: src/sonymn.cpp:351 src/sonymn.cpp:352
+#, fuzzy
+msgid "Sony Model ID"
+msgstr "ID modelu"
+
+#: src/sonymn.cpp:354 src/sonymn.cpp:355
+#, fuzzy
+msgid "Color Reproduction"
+msgstr "Redukcia farebného šumu"
+
+#: src/sonymn.cpp:369 src/sonymn.cpp:370 src/sonymn.cpp:423 src/sonymn.cpp:424
+#, fuzzy
+msgid "Dynamic Range Optimizer"
+msgstr "Nastavenie dynamického rozsahu"
+
+#: src/sonymn.cpp:378 src/sonymn.cpp:379
+#, fuzzy
+msgid "Minolta MakerNote"
+msgstr "Dátum Minolta"
+
+#: src/sonymn.cpp:384 src/sonymn.cpp:385
+#, fuzzy
+msgid "Full Image Size"
+msgstr "Veľkosť obrázka"
+
+#: src/sonymn.cpp:387
+#, fuzzy
+msgid "Preview Image Size"
+msgstr "Zobraziť vložený obrázok"
+
+#: src/sonymn.cpp:388
+#, fuzzy
+msgid "Preview image size"
+msgstr "Zobraziť vložený obrázok"
+
+#: src/sonymn.cpp:402 src/sonymn.cpp:403 src/sonymn.cpp:613 src/sonymn.cpp:614
+msgid "AF Illuminator"
+msgstr ""
+
+#: src/sonymn.cpp:405 src/sonymn.cpp:406
+#, fuzzy
+msgid "JPEG Quality"
+msgstr "Kvalita"
+
+#: src/sonymn.cpp:411 src/sonymn.cpp:412
+#, fuzzy
+msgid "Release Mode"
+msgstr "Dátum vydania"
+
+#: src/sonymn.cpp:415
+#, fuzzy
+msgid "Shot number in continous burst mode"
+msgstr "Poradové číslo (ak je zo spojitého záberu)"
+
+#: src/sonymn.cpp:417 src/sonymn.cpp:418
+#, fuzzy
+msgid "Anti-Blur"
+msgstr "Zabránenie rozostrenia"
+
+#: src/sonymn.cpp:420 src/sonymn.cpp:421 src/sonymn.cpp:621 src/sonymn.cpp:622
+#, fuzzy
+msgid "Long Exposure Noise Reduction"
+msgstr "Redukciu šumu dlhej expozície"
+
+#: src/sonymn.cpp:426 src/sonymn.cpp:427
+#, fuzzy
+msgid "Intelligent Auto"
+msgstr "Dĺžka intervalu"
+
+#: src/sonymn.cpp:434
+#, fuzzy
+msgid "Unknown Sony1MakerNote tag"
+msgstr "Neznáma značka SonyMakerNote"
+
+#: src/sonymn.cpp:448
+#, fuzzy
+msgid "Continuous High"
+msgstr "Spojitý, vysoký"
+
+#: src/sonymn.cpp:452
+#, fuzzy
+msgid "Continuous Low"
+msgstr "Spojitý, nízky"
+
+#: src/sonymn.cpp:454 src/sonymn.cpp:455
+#, fuzzy
+msgid "D-Range Optimizer Bracketing Low"
+msgstr "Optimalizácia obrázka"
+
+#: src/sonymn.cpp:487
+#, fuzzy
+msgid "Autumn"
+msgstr "Auto"
+
+#: src/sonymn.cpp:493
+msgid "ADI"
+msgstr ""
+
+#: src/sonymn.cpp:509 src/sonymn.cpp:510 src/sonymn.cpp:511
+msgid "StyleBox1"
+msgstr ""
+
+#: src/sonymn.cpp:529
+#, fuzzy
+msgid "Auto No Flash"
+msgstr "Auto (blesk)"
+
+#: src/sonymn.cpp:584 src/sonymn.cpp:585 src/sonymn.cpp:690 src/sonymn.cpp:691
+#, fuzzy
+msgid "Dynamic Range Optimizer Level"
+msgstr "Nastavenie dynamického rozsahu"
+
+#: src/sonymn.cpp:587 src/sonymn.cpp:588 src/sonymn.cpp:693 src/sonymn.cpp:694
+#, fuzzy
+msgid "Creative Style"
+msgstr "Dátum vytvorenia"
+
+#: src/sonymn.cpp:599 src/sonymn.cpp:600
+#, fuzzy
+msgid "Zone Matching Value"
+msgstr "Hodnota jasu"
+
+#: src/sonymn.cpp:617 src/sonymn.cpp:618
+#, fuzzy
+msgid "AF With Shutter"
+msgstr "rýchla uzávierka"
+
+#: src/sonymn.cpp:625 src/sonymn.cpp:626
+#, fuzzy
+msgid "High ISO NoiseReduction"
+msgstr "Vysoká redukcia šumu ISO"
+
+#: src/sonymn.cpp:629 src/sonymn.cpp:630
+#, fuzzy
+msgid "Image Style"
+msgstr "Typ obrázka"
+
+#: src/sonymn.cpp:655
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings tag"
+msgstr "Neznáma značka Nastavenie fotoaparátu Canon 1"
 
-#: src/sonymn.cpp:80
-msgid "Unknown SonyMakerNote tag"
-msgstr "Neznáma značka SonyMakerNote"
+#: src/sonymn.cpp:719
+#, fuzzy
+msgid "Unknown Sony1 Camera Settings 2 tag"
+msgstr "Neznáma značka Nastavenie fotoaparátu Canon 2"
 
-#: src/tags.cpp:175
+#: src/tags.cpp:189
 msgid "Unknown section"
 msgstr "Neznáma sekcia"
 
-#: src/tags.cpp:176
+#: src/tags.cpp:190
 msgid "Image data structure"
 msgstr "Štruktúra obrazových údajov"
 
-#: src/tags.cpp:177
+#: src/tags.cpp:191
 msgid "Recording offset"
 msgstr "Posunitie záznamu"
 
-#: src/tags.cpp:178
+#: src/tags.cpp:192
 msgid "Image data characteristics"
 msgstr "Charakteristika obrazových dát"
 
-#: src/tags.cpp:179
+#: src/tags.cpp:193
 msgid "Other data"
 msgstr "Iné údaje"
 
-#: src/tags.cpp:180
+#: src/tags.cpp:194
+#, fuzzy
 msgid "Exif data structure"
-msgstr ""
+msgstr "Štruktúra obrazových údajov"
 
-#: src/tags.cpp:182
+#: src/tags.cpp:196
 msgid "Image configuration"
 msgstr "Konfigurácia obrázka"
 
-#: src/tags.cpp:183
+#: src/tags.cpp:197
 msgid "User information"
 msgstr "Informácie o používateľovi"
 
-#: src/tags.cpp:184
+#: src/tags.cpp:198
 msgid "Related file"
 msgstr "Súviasiaci súbor"
 
-#: src/tags.cpp:185
+#: src/tags.cpp:199
 msgid "Date and time"
 msgstr "Dátum a čas"
 
-#: src/tags.cpp:186
+#: src/tags.cpp:200
 msgid "Picture taking conditions"
 msgstr "Podmienky zachytenia obrázka"
 
-#: src/tags.cpp:187
+#: src/tags.cpp:201
 msgid "GPS information"
 msgstr "Informácie GPS"
 
-#: src/tags.cpp:188
+#: src/tags.cpp:202
 msgid "Interoperability information"
 msgstr "Informácie o interoperabilite"
 
-#: src/tags.cpp:189
+#: src/tags.cpp:203
 msgid "Vendor specific information"
 msgstr "Špecifické informácie dodávateľa"
 
-#: src/tags.cpp:190
+#: src/tags.cpp:204
 msgid "Adobe DNG tags"
 msgstr "Značky Adobe DNG"
 
-#: src/tags.cpp:191
+#: src/tags.cpp:205
+#, fuzzy
 msgid "Panasonic RAW tags"
-msgstr ""
+msgstr "Neznáma značka PanasonicMakerNote"
 
-#: src/tags.cpp:192
+#: src/tags.cpp:206
 #, fuzzy
 msgid "TIFF/EP tags"
 msgstr "ID štandardu TIFF/EP"
 
-#: src/tags.cpp:193
+#: src/tags.cpp:207
+msgid "TIFF PageMaker 6.0 tags"
+msgstr ""
+
+#: src/tags.cpp:208
+#, fuzzy
+msgid "Adobe OPI tags"
+msgstr "Značky Adobe DNG"
+
+#: src/tags.cpp:209
 msgid "Last section"
 msgstr "Posledná sekcia"
 
-#: src/tags.cpp:213
+#: src/tags.cpp:225
 msgid "Primary image"
 msgstr "Primárny obrázok"
 
-#: src/tags.cpp:214
+#: src/tags.cpp:226
 msgid "Thumbnail/Preview image"
 msgstr "Náhľad"
 
-#: src/tags.cpp:215
+#: src/tags.cpp:227
+#, fuzzy
 msgid "Primary image, Multi page file"
-msgstr ""
+msgstr "Primárny obrázok"
 
-#: src/tags.cpp:216
+#: src/tags.cpp:228
+#, fuzzy
 msgid "Thumbnail/Preview image, Multi page file"
-msgstr ""
+msgstr "Náhľad"
 
-#: src/tags.cpp:217
+#: src/tags.cpp:229
 msgid "Primary image, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:218
+#: src/tags.cpp:230
+#, fuzzy
 msgid "Thumbnail/Preview image, Transparency mask"
-msgstr ""
+msgstr "Náhľad"
 
-#: src/tags.cpp:219
+#: src/tags.cpp:231
 msgid "Primary image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:220
+#: src/tags.cpp:232 src/tags.cpp:233
 msgid "Thumbnail/Preview image, Multi page file, Transparency mask"
 msgstr ""
 
-#: src/tags.cpp:226
+#: src/tags.cpp:238
+#, fuzzy
+msgid "Full-resolution image data"
+msgstr "Nepodarilo sa načítať obrazové údaje"
+
+#: src/tags.cpp:239
+msgid "Reduced-resolution image data"
+msgstr ""
+
+#: src/tags.cpp:240
+msgid "A single page of a multi-page image"
+msgstr ""
+
+#: src/tags.cpp:246
 msgid "inch"
 msgstr "palce"
 
-#: src/tags.cpp:233
+#: src/tags.cpp:253
 msgid "CCITT RLE"
 msgstr "CCITT RLE"
 
-#: src/tags.cpp:234
+#: src/tags.cpp:254
 msgid "T4/Group 3 Fax"
 msgstr "T4/Group 3 Fax"
 
-#: src/tags.cpp:235
+#: src/tags.cpp:255
 msgid "T6/Group 4 Fax"
 msgstr "T6/Group 4 Fax"
 
-#: src/tags.cpp:236
+#: src/tags.cpp:256
 msgid "LZW"
 msgstr "LZW"
 
-#: src/tags.cpp:237
+#: src/tags.cpp:257
 msgid "JPEG (old-style)"
 msgstr ""
 
-#: src/tags.cpp:238
+#: src/tags.cpp:258
 msgid "JPEG"
 msgstr "JPEG"
 
-#: src/tags.cpp:239
+#: src/tags.cpp:259
 msgid "Adobe Deflate"
 msgstr "Adobe deflate"
 
-#: src/tags.cpp:240
+#: src/tags.cpp:260
 msgid "JBIG B&W"
 msgstr "JBIG ČB"
 
-#: src/tags.cpp:241
+#: src/tags.cpp:261
 msgid "JBIG Color"
 msgstr "JBIG farby"
 
-#: src/tags.cpp:242
+#: src/tags.cpp:262
 msgid "Next 2-bits RLE"
 msgstr ""
 
-#: src/tags.cpp:243
+#: src/tags.cpp:263
 msgid "Epson ERF Compressed"
 msgstr "Kompresia Epson ERF"
 
-#: src/tags.cpp:244
+#: src/tags.cpp:264
+#, fuzzy
+msgid "Samsung SRW Compressed"
+msgstr "Kompresia Epson ERF"
+
+#: src/tags.cpp:265
 msgid "CCITT RLE 1-word"
 msgstr "CCITT RLE 1-word"
 
-#: src/tags.cpp:245
+#: src/tags.cpp:266
 msgid "PackBits (Macintosh RLE)"
 msgstr ""
 
-#: src/tags.cpp:246
+#: src/tags.cpp:267
 msgid "Thunderscan RLE"
 msgstr "Thunderscan RLE"
 
-#: src/tags.cpp:247
+#: src/tags.cpp:268
 msgid "IT8 CT Padding"
 msgstr ""
 
-#: src/tags.cpp:248
+#: src/tags.cpp:269
 msgid "IT8 Linework RLE"
 msgstr "IT8 Linework RLE"
 
-#: src/tags.cpp:249
+#: src/tags.cpp:270
 msgid "IT8 Monochrome Picture"
 msgstr "IT8 Jednofarebný obrázok"
 
-#: src/tags.cpp:250
+#: src/tags.cpp:271
 msgid "IT8 Binary Lineart"
 msgstr "IT8 Binárne čiarové umenie"
 
-#: src/tags.cpp:251
+#: src/tags.cpp:272
 msgid "Pixar Film (10-bits LZW)"
 msgstr ""
 
-#: src/tags.cpp:252
+#: src/tags.cpp:273
 msgid "Pixar Log (11-bits ZIP)"
 msgstr ""
 
-#: src/tags.cpp:253
+#: src/tags.cpp:274
+#, fuzzy
 msgid "Pixar Deflate"
-msgstr ""
+msgstr "Adobe deflate"
 
-#: src/tags.cpp:254
+#: src/tags.cpp:275
 msgid "Kodak DCS Encoding"
 msgstr ""
 
-#: src/tags.cpp:255
+#: src/tags.cpp:276
 msgid "ISO JBIG"
 msgstr "ISO JBIG"
 
-#: src/tags.cpp:256
+#: src/tags.cpp:277
 msgid "SGI Log Luminance RLE"
 msgstr ""
 
-#: src/tags.cpp:257
+#: src/tags.cpp:278
 msgid "SGI Log 24-bits packed"
 msgstr ""
 
-#: src/tags.cpp:258
+#: src/tags.cpp:279
 msgid "Leadtools JPEG 2000"
 msgstr "Leadtools JPEG 2000"
 
-#: src/tags.cpp:259
+#: src/tags.cpp:280
 msgid "Nikon NEF Compressed"
 msgstr "Kompresia Nikon NEF"
 
-#: src/tags.cpp:260
+#: src/tags.cpp:281
+#, fuzzy
 msgid "Kodak DCR Compressed"
-msgstr ""
+msgstr "Kompresia Epson ERF"
 
-#: src/tags.cpp:261
+#: src/tags.cpp:282
 msgid "Pentax PEF Compressed"
 msgstr "Kompresia Pentax PEF"
 
-#: src/tags.cpp:266
+#: src/tags.cpp:287
+#, fuzzy
 msgid "White Is Zero"
-msgstr ""
+msgstr "Čierna je nula"
 
-#: src/tags.cpp:267
+#: src/tags.cpp:288
 msgid "Black Is Zero"
 msgstr "Čierna je nula"
 
-#: src/tags.cpp:268
+#: src/tags.cpp:289
 msgid "RGB"
 msgstr "RGB"
 
-#: src/tags.cpp:269
+#: src/tags.cpp:290
 msgid "RGB Palette"
 msgstr "RGB paleta"
 
-#: src/tags.cpp:270
+#: src/tags.cpp:291
 msgid "Transparency Mask"
 msgstr ""
 
-#: src/tags.cpp:271
+#: src/tags.cpp:292 src/tags.cpp:331
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/tags.cpp:272
+#: src/tags.cpp:293
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: src/tags.cpp:273
+#: src/tags.cpp:294
 msgid "CIELab"
 msgstr "CIELab"
 
-#: src/tags.cpp:274
+#: src/tags.cpp:295
 msgid "ICCLab"
 msgstr "ICCLab"
 
-#: src/tags.cpp:275
+#: src/tags.cpp:296
 msgid "ITULab"
 msgstr "ITULab"
 
-#: src/tags.cpp:276
+#: src/tags.cpp:297
+#, fuzzy
 msgid "Color Filter Array"
-msgstr ""
+msgstr "Farebný filter"
 
-#: src/tags.cpp:277
+#: src/tags.cpp:298
 msgid "Pixar LogL"
 msgstr "Pixar LogL"
 
-#: src/tags.cpp:278
+#: src/tags.cpp:299
 msgid "Pixar LogLuv"
 msgstr "Pixar LogLuv"
 
-#: src/tags.cpp:279
+#: src/tags.cpp:300
 msgid "Linear Raw"
 msgstr "Lineárny Raw"
 
-#: src/tags.cpp:284
+#: src/tags.cpp:305
+msgid "No dithering or halftoning"
+msgstr ""
+
+#: src/tags.cpp:306
+msgid "Ordered dither or halftone technique"
+msgstr ""
+
+#: src/tags.cpp:307
+#, fuzzy
+msgid "Randomized process"
+msgstr "Bežné spracovanie"
+
+#: src/tags.cpp:312
 msgid "top, left"
 msgstr "hore, vľavo"
 
-#: src/tags.cpp:285
+#: src/tags.cpp:313
 msgid "top, right"
 msgstr "hore, vpravo"
 
-#: src/tags.cpp:286
+#: src/tags.cpp:314
 msgid "bottom, right"
 msgstr "dolu, vpravo"
 
-#: src/tags.cpp:287
+#: src/tags.cpp:315
 msgid "bottom, left"
 msgstr "dolu. vľavo"
 
-#: src/tags.cpp:288
+#: src/tags.cpp:316
 msgid "left, top"
 msgstr "hore, vľavo"
 
-#: src/tags.cpp:289
+#: src/tags.cpp:317
 msgid "right, top"
 msgstr "vpravo, hore"
 
-#: src/tags.cpp:290
+#: src/tags.cpp:318
 msgid "right, bottom"
 msgstr "vpravo, dolu"
 
-#: src/tags.cpp:291
+#: src/tags.cpp:319 src/tags.cpp:320
 msgid "left, bottom"
 msgstr "vľavo, dolu"
 
-#: src/tags.cpp:296
+#: src/tags.cpp:325
+msgid "No prediction scheme used"
+msgstr ""
+
+#: src/tags.cpp:326
+msgid "Horizontal differencing"
+msgstr ""
+
+#: src/tags.cpp:332
+#, fuzzy
+msgid "not CMYK"
+msgstr "CMYK"
+
+#: src/tags.cpp:337
+msgid "Unsigned integer data"
+msgstr ""
+
+#: src/tags.cpp:338
+msgid "Two's complement signed integer data"
+msgstr ""
+
+#: src/tags.cpp:339
+msgid "IEEE floating point data"
+msgstr ""
+
+#: src/tags.cpp:340 src/tags.cpp:341
+#, fuzzy
+msgid "Undefined data format"
+msgstr "Nepodporovaný formát dátumu"
+
+#: src/tags.cpp:346
+#, fuzzy
+msgid "Not indexed"
+msgstr "nedefinované"
+
+#: src/tags.cpp:347 src/tags.cpp:653
+msgid "Indexed"
+msgstr ""
+
+#: src/tags.cpp:352
+msgid "A"
+msgstr ""
+
+#: src/tags.cpp:353
+msgid "B"
+msgstr ""
+
+#: src/tags.cpp:354
+msgid "C"
+msgstr ""
+
+# AF = automatické zaostrenie
+#: src/tags.cpp:355
+#, fuzzy
+msgid "A+B-C"
+msgstr "AZ-C"
+
+#: src/tags.cpp:356
+msgid "A+((B-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:357
+msgid "B+((A-C)/2)"
+msgstr ""
+
+#: src/tags.cpp:358
+msgid "(A+B)/2"
+msgstr ""
+
+#: src/tags.cpp:363
 msgid "Centered"
 msgstr "Vystrednený"
 
-#: src/tags.cpp:297
+#: src/tags.cpp:364
 msgid "Co-sited"
 msgstr "Spolu umiestnený"
 
-#: src/tags.cpp:302
+#: src/tags.cpp:369
 msgid "No flash"
 msgstr "Bez blesku"
 
-#: src/tags.cpp:304
+#: src/tags.cpp:371
 msgid "Fired, strobe return light not detected"
 msgstr "Spustil sa, vracajúci sa impulz svetla nebol detekovaný."
 
-#: src/tags.cpp:305
+#: src/tags.cpp:372
 msgid "Fired, strobe return light detected"
 msgstr "Spustil sa, vracajúci sa impulz svetla bol detekovaný."
 
-#: src/tags.cpp:306
+#: src/tags.cpp:373
 msgid "Yes, did not fire"
 msgstr "Áno, blesk sa nespustil"
 
-#: src/tags.cpp:307
+#: src/tags.cpp:374
+#, fuzzy
 msgid "Yes, compulsory"
-msgstr ""
+msgstr "Áno, povinný režim blesku, korekcia červených očí"
 
-#: src/tags.cpp:308
+#: src/tags.cpp:375
 msgid "Yes, compulsory, return light not detected"
 msgstr "Áno, povinný režim blesku, vracajúce sa svetlo nedetekované."
 
-#: src/tags.cpp:309
+#: src/tags.cpp:376
 msgid "Yes, compulsory, return light detected"
 msgstr "Áno, povinný režim blesku, vracajúce sa svetlo detekované."
 
-#: src/tags.cpp:310
+#: src/tags.cpp:377
 msgid "No, compulsory"
 msgstr ""
 
-#: src/tags.cpp:311
+#: src/tags.cpp:378
 msgid "No, did not fire, return not detected"
 msgstr "Nie, nespustil sa, vracajúci sa impulz svetla nebol detekovaný."
 
-#: src/tags.cpp:312
+#: src/tags.cpp:379
 msgid "No, auto"
 msgstr "Nie, automaticky"
 
-#: src/tags.cpp:313
+#: src/tags.cpp:380
 msgid "Yes, auto"
 msgstr "Áno, automaticky"
 
-#: src/tags.cpp:314
+#: src/tags.cpp:381
 msgid "Yes, auto, return light not detected"
 msgstr "Áno, vracajúci sa impulz svetla nebol detekovaný."
 
-#: src/tags.cpp:315
+#: src/tags.cpp:382
 msgid "Yes, auto, return light detected"
 msgstr "Áno, automaticky, vracajúci sa impulz svetla bol detekovaný."
 
-#: src/tags.cpp:316
+#: src/tags.cpp:383
 msgid "No flash function"
 msgstr "Bez funkcie blesku."
 
-#: src/tags.cpp:317
+#: src/tags.cpp:384
 msgid "No, no flash function"
 msgstr "Nie, bez funkcie blesku."
 
-#: src/tags.cpp:318
+#: src/tags.cpp:385
 msgid "Yes, red-eye reduction"
 msgstr "Áno, korekcia červených očí"
 
-#: src/tags.cpp:319
+#: src/tags.cpp:386
 msgid "Yes, red-eye reduction, return light not detected"
 msgstr "Áno, korekcia červených očí, vracajúce sa svetlo nedetekované."
 
-#: src/tags.cpp:320
+#: src/tags.cpp:387
 msgid "Yes, red-eye reduction, return light detected"
 msgstr "Áno, korekcia červených očí, vracajúce sa svetlo detekované."
 
-#: src/tags.cpp:321
+#: src/tags.cpp:388
 msgid "Yes, compulsory, red-eye reduction"
 msgstr "Áno, povinný režim blesku, korekcia červených očí"
 
-#: src/tags.cpp:322
+#: src/tags.cpp:389
 msgid "Yes, compulsory, red-eye reduction, return light not detected"
 msgstr ""
 "Áno, povinný režim blesku, korekcia červených očí, vracajúce sa svetlo "
 "nedetekované."
 
-#: src/tags.cpp:323
+#: src/tags.cpp:390
 msgid "Yes, compulsory, red-eye reduction, return light detected"
 msgstr ""
 "Áno, povinný režim blesku, korekcia červených očí, vracajúce sa svetlo "
 "detekované."
 
-#: src/tags.cpp:324
+#: src/tags.cpp:391
 msgid "No, red-eye reduction"
 msgstr "Nie, korekcia červených očí"
 
-#: src/tags.cpp:325
+#: src/tags.cpp:392
 msgid "No, auto, red-eye reduction"
 msgstr "Nie, automaticky, korekcia červených očí"
 
-#: src/tags.cpp:326
+#: src/tags.cpp:393
 msgid "Yes, auto, red-eye reduction"
 msgstr "Áno, automaticky, korekcia červených očí"
 
-#: src/tags.cpp:327
+#: src/tags.cpp:394
 msgid "Yes, auto, red-eye reduction, return light not detected"
 msgstr ""
 "Áno, automaticky, korekcia červených očí, vracajúce sa svetlo nedetekované."
 
-#: src/tags.cpp:328
+#: src/tags.cpp:395
 msgid "Yes, auto, red-eye reduction, return light detected"
 msgstr ""
 "Áno, automaticky, korekcia červených očí, vracajúce sa svetlo detekované."
 
-#: src/tags.cpp:333
+#: src/tags.cpp:400
 msgid "Rectangular (or square) layout"
 msgstr ""
 
-#: src/tags.cpp:334
+#: src/tags.cpp:401
 msgid "Staggered layout A: even columns are offset down by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:335
+#: src/tags.cpp:402
 msgid "Staggered layout B: even columns are offset up by 1/2 row"
 msgstr ""
 
-#: src/tags.cpp:336
+#: src/tags.cpp:403
 msgid "Staggered layout C: even rows are offset right by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:337
+#: src/tags.cpp:404
 msgid "Staggered layout D: even rows are offset left by 1/2 column"
 msgstr ""
 
-#: src/tags.cpp:342
+#: src/tags.cpp:409
 msgid "Processing Software"
 msgstr "Softvér použitý na spracovanie"
 
-#: src/tags.cpp:343
+#: src/tags.cpp:410
 msgid "The name and version of the software used to post-process the picture."
 msgstr ""
 
-#: src/tags.cpp:346
+#: src/tags.cpp:413
 msgid "New Subfile Type"
 msgstr "Nový typ podsúboru"
 
-#: src/tags.cpp:347
+#: src/tags.cpp:414
 msgid "A general indication of the kind of data contained in this subfile."
 msgstr "Všeobecné označenie údajov obsiahnutých v tomto podsúbore."
 
-#: src/tags.cpp:350
+#: src/tags.cpp:416
+#, fuzzy
+msgid "Subfile Type"
+msgstr "Nový typ podsúboru"
+
+#: src/tags.cpp:417
+#, fuzzy
+msgid ""
+"A general indication of the kind of data contained in this subfile. This "
+"field is deprecated. The NewSubfileType field should be used instead."
+msgstr "Všeobecné označenie údajov obsiahnutých v tomto podsúbore."
+
+#: src/tags.cpp:421
 msgid ""
 "The number of columns of image data, equal to the number of pixels per row. "
 "In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -15660,7 +19518,7 @@
 "Počet stĺpcov obrazových údajov rovný počtu pixelov na riadok. V JPEG "
 "komprimovaných dátach sa namiesto tejto značky používa JPEG značka."
 
-#: src/tags.cpp:355
+#: src/tags.cpp:426
 msgid ""
 "The number of rows of image data. In JPEG compressed data a JPEG marker is "
 "used instead of this tag."
@@ -15669,11 +19527,11 @@
 "komprimovaných dátach sa namiesto tejto značky používa JPEG značka."
 
 # exif-bitspersample
-#: src/tags.cpp:358
+#: src/tags.cpp:429
 msgid "Bits per Sample"
 msgstr "bitov na vzorku"
 
-#: src/tags.cpp:359
+#: src/tags.cpp:430
 msgid ""
 "The number of bits per image component. In this standard each component of "
 "the image is 8 bits, so the value for this tag is 8. See also "
@@ -15684,41 +19542,74 @@
 "takže hodnota tejto značky je 8. Pozri aj <SamplesPerPixel>. V JPEG "
 "komprimovaných dátach sa namiesto tejto značky používa JPEG značka."
 
-#: src/tags.cpp:365
+#: src/tags.cpp:436
+msgid ""
+"The compression scheme used for the image data. When a primary image is JPEG "
+"compressed, this designation is not necessary and is omitted. When "
+"thumbnails use JPEG compression, this tag value is set to 6."
+msgstr ""
+"Kompresná schéma použitá na obrazové dáta. Keď je primárny obrázok "
+"komprimovaný ako JPEG, tento údaj nie je potrebný a vynecháva sa. Ak náhľady "
+"používajú JPEG kompresiu, hodnota tejto značky je 6."
+
+#: src/tags.cpp:442
+msgid ""
+"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
+"of this tag."
+msgstr ""
+"Kompozícia pixelov. V JPEG komprimovaných dátach sa namiesto tejto značky "
+"používa JPEG značka."
+
+#: src/tags.cpp:445
+msgid "Threshholding"
+msgstr ""
+
+#: src/tags.cpp:446
+msgid ""
+"For black and white TIFF files that represent shades of gray, the technique "
+"used to convert from gray to black and white pixels."
+msgstr ""
+
+#: src/tags.cpp:449
+#, fuzzy
+msgid "Cell Width"
+msgstr "Orezať šírku"
+
+#: src/tags.cpp:450
 msgid ""
-"The compression scheme used for the image data. When a primary image is JPEG "
-"compressed, this designation is not necessary and is omitted. When "
-"thumbnails use JPEG compression, this tag value is set to 6."
+"The width of the dithering or halftoning matrix used to create a dithered or "
+"halftoned bilevel file."
 msgstr ""
-"Kompresná schéma použitá na obrazové dáta. Keď je primárny obrázok "
-"komprimovaný ako JPEG, tento údaj nie je potrebný a vynecháva sa. Ak náhľady "
-"používajú JPEG kompresiu, hodnota tejto značky je 6."
 
-#: src/tags.cpp:371
+#: src/tags.cpp:453
+#, fuzzy
+msgid "Cell Length"
+msgstr "Dĺžka dlaždice"
+
+#: src/tags.cpp:454
 msgid ""
-"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
-"of this tag."
+"The length of the dithering or halftoning matrix used to create a dithered "
+"or halftoned bilevel file."
 msgstr ""
-"Kompozícia pixelov. V JPEG komprimovaných dátach sa namiesto tejto značky "
-"používa JPEG značka."
 
-#: src/tags.cpp:374
+#: src/tags.cpp:457
 msgid "Fill Order"
 msgstr "poradie vypĺňania"
 
-#: src/tags.cpp:375
+#: src/tags.cpp:458
 msgid "The logical order of bits within a byte"
 msgstr ""
 
-#: src/tags.cpp:377
+#: src/tags.cpp:460
 msgid "Document Name"
 msgstr "Názov dokumentu"
 
-#: src/tags.cpp:378
+#: src/tags.cpp:461
+#, fuzzy
 msgid "The name of the document from which this image was scanned"
-msgstr ""
+msgstr "Dátum, kedy bol titul vydaný"
 
-#: src/tags.cpp:381
+#: src/tags.cpp:464
 msgid ""
 "A character string giving the title of the image. It may be a comment such "
 "as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
@@ -15730,7 +19621,7 @@
 "Keď je potrebná dvojbajtová znaková sada, použite Privátnu značku Exif "
 "<UserComment>."
 
-#: src/tags.cpp:388
+#: src/tags.cpp:471
 msgid ""
 "The manufacturer of the recording equipment. This is the manufacturer of the "
 "DSC, scanner, video digitizer or other equipment that generated the image. "
@@ -15740,7 +19631,7 @@
 "skenera, videodigitalizátora alebo iného zariadenia, ktoré vytvorilo "
 "obrázok. Keď je pole prázdne, výrobca je neznámy."
 
-#: src/tags.cpp:394
+#: src/tags.cpp:477
 msgid ""
 "The model name or model number of the equipment. This is the model name or "
 "number of the DSC, scanner, video digitizer or other equipment that "
@@ -15750,7 +19641,7 @@
 "skenera, videodigitalizátora alebo iného zariadenia, ktoré vytvorilo "
 "obrázok. Keď je pole prázdne, model je neznámy."
 
-#: src/tags.cpp:400
+#: src/tags.cpp:483
 msgid ""
 "For each strip, the byte offset of that strip. It is recommended that this "
 "be selected so the number of strip bytes does not exceed 64 Kbytes. With "
@@ -15762,16 +19653,16 @@
 "dátach tento údaj nie je potrebný a vynechá sa. Pozri aj <StripOffsets> a "
 "<StripByteCounts>."
 
-#: src/tags.cpp:407
+#: src/tags.cpp:490
 msgid "The image orientation viewed in terms of rows and columns."
 msgstr "Orientácia obrázka vzhľadom na riadky a stĺpce."
 
 # exif-samplesperpixel
-#: src/tags.cpp:409
+#: src/tags.cpp:492
 msgid "Samples per Pixel"
 msgstr "vzoriek na pixel"
 
-#: src/tags.cpp:410
+#: src/tags.cpp:493
 msgid ""
 "The number of components per pixel. Since this standard applies to RGB and "
 "YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
@@ -15782,11 +19673,11 @@
 "tejto značky používa JPEG značka."
 
 # exif-rowsperstrip
-#: src/tags.cpp:414
+#: src/tags.cpp:497
 msgid "Rows per Strip"
 msgstr "riadkov na prúžok"
 
-#: src/tags.cpp:415
+#: src/tags.cpp:498
 msgid ""
 "The number of rows per strip. This is the number of rows in the image of one "
 "strip when an image is divided into strips. With JPEG compressed data this "
@@ -15798,11 +19689,11 @@
 "je potrebný a vynechá sa. Pozri aj <StripOffsets> a <StripByteCounts>."
 
 # exif-stripbytecounts
-#: src/tags.cpp:420
+#: src/tags.cpp:503
 msgid "Strip Byte Count"
 msgstr "bajtov na komprimovaný prúžok"
 
-#: src/tags.cpp:421
+#: src/tags.cpp:504
 msgid ""
 "The total number of bytes in each strip. With JPEG compressed data this "
 "designation is not needed and is omitted."
@@ -15811,11 +19702,11 @@
 "dáta tento údaj nie je potrebný a vynechá sa."
 
 # exif-xresolution
-#: src/tags.cpp:424
+#: src/tags.cpp:507
 msgid "X-Resolution"
 msgstr "vodorovné rozlíšenie"
 
-#: src/tags.cpp:425
+#: src/tags.cpp:508
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
 "When the image resolution is unknown, 72 [dpi] is designated."
@@ -15824,11 +19715,11 @@
 "obrázka neznáme, použije sa 72 [dpi]."
 
 # exif-xresolution
-#: src/tags.cpp:428
+#: src/tags.cpp:511
 msgid "Y-Resolution"
 msgstr "zvislé rozlíšenie"
 
-#: src/tags.cpp:429
+#: src/tags.cpp:512
 msgid ""
 "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
 "The same value as <XResolution> is designated."
@@ -15836,7 +19727,7 @@
 "Počet pixelov na <ResolutionUnit> v smere <ImageLength>. Použije sa rovnaká "
 "hodnota ako <XResolution>."
 
-#: src/tags.cpp:433
+#: src/tags.cpp:516
 msgid ""
 "Indicates whether pixel components are recorded in a chunky or planar "
 "format. In JPEG compressed files a JPEG marker is used instead of this tag. "
@@ -15847,7 +19738,44 @@
 "značka. Ak toto pole neexistuje, štandardná hodnota pre TIFF sa predpokladá "
 "1 (kúskový)."
 
-#: src/tags.cpp:439
+# AF = automatické zaostrenie
+#: src/tags.cpp:521
+#, fuzzy
+msgid "Gray Response Unit"
+msgstr "bod automatického zaostrenia"
+
+#: src/tags.cpp:522
+msgid "The precision of the information contained in the GrayResponseCurve."
+msgstr ""
+
+#: src/tags.cpp:524
+#, fuzzy
+msgid "Gray Response Curve"
+msgstr "Krivka tónu"
+
+#: src/tags.cpp:525
+msgid "For grayscale data, the optical density of each possible pixel value."
+msgstr ""
+
+#: src/tags.cpp:527
+#, fuzzy
+msgid "T4 Options"
+msgstr "Voľba"
+
+#: src/tags.cpp:528
+msgid "T.4-encoding options."
+msgstr ""
+
+#: src/tags.cpp:530
+#, fuzzy
+msgid "T6 Options"
+msgstr "Voľba"
+
+#: src/tags.cpp:531
+msgid "T.6-encoding options."
+msgstr ""
+
+#: src/tags.cpp:534
 msgid ""
 "The unit for measuring <XResolution> and <YResolution>. The same unit is "
 "used for both <XResolution> and <YResolution>. If the image resolution is "
@@ -15857,7 +19785,7 @@
 "používa pre <XResolution> aj <YResolution>. Ak je rozlíšenie obrázka "
 "neznáme, použije sa 2 (palce)."
 
-#: src/tags.cpp:444
+#: src/tags.cpp:539
 msgid ""
 "A transfer function for the image, described in tabular style. Normally this "
 "tag is not necessary, since color space is specified in the color space "
@@ -15867,7 +19795,7 @@
 "potrebná, keďže farebný priestor je uvedený v informačnej značke farebného "
 "priestoru (<ColorSpace>)."
 
-#: src/tags.cpp:449
+#: src/tags.cpp:544
 msgid ""
 "This tag records the name and version of the software or firmware of the "
 "camera or image input device used to generate the image. The detailed format "
@@ -15879,7 +19807,7 @@
 "je špecifikovaný, ale odporúča sa dodržiavať formát ako v dolu uvedenom "
 "príklade. Keď je pole prázdne, verzia je neznáma."
 
-#: src/tags.cpp:456
+#: src/tags.cpp:551
 msgid ""
 "The date and time of image creation. In Exif standard, it is the date and "
 "time the file was changed."
@@ -15887,7 +19815,7 @@
 "Dátum a čas vytvorenia obrázka. V tomto štandarde (EXIF-2.1) je to dátum a "
 "čas zmeny súboru."
 
-#: src/tags.cpp:460
+#: src/tags.cpp:555
 msgid ""
 "This tag records the name of the camera owner, photographer or image "
 "creator. The detailed format is not specified, but it is recommended that "
@@ -15902,17 +19830,28 @@
 "je pole prázdne, umelec je neznámy.  Príklad: \"Camera owner, John Smith; "
 "Photographer, Michael Brown; Image creator, Ken James\""
 
-#: src/tags.cpp:467
-msgid "Host computer"
+#: src/tags.cpp:562
+msgid "Host Computer"
 msgstr ""
 
-#: src/tags.cpp:468
+#: src/tags.cpp:563
 msgid ""
 "This tag records information about the host computer used to generate the "
 "image."
 msgstr ""
 
-#: src/tags.cpp:472
+#: src/tags.cpp:566
+#, fuzzy
+msgid "Predictor"
+msgstr "Pôvodca"
+
+#: src/tags.cpp:567
+msgid ""
+"A predictor is a mathematical operator that is applied to the image data "
+"before an encoding scheme is applied."
+msgstr ""
+
+#: src/tags.cpp:571
 msgid ""
 "The chromaticity of the white point of the image. Normally this tag is not "
 "necessary, since color space is specified in the colorspace information tag "
@@ -15922,7 +19861,7 @@
 "farebný priestor je uvedený v informačnej značke farebného priestoru "
 "(<ColorSpace>)."
 
-#: src/tags.cpp:477
+#: src/tags.cpp:576
 msgid ""
 "The chromaticity of the three primary colors of the image. Normally this tag "
 "is not necessary, since colorspace is specified in the colorspace "
@@ -15932,29 +19871,52 @@
 "potrebná, keďže farebný priestor je uvedený v informačnej značke farebného "
 "priestoru (<ColorSpace>)."
 
-#: src/tags.cpp:481
+#: src/tags.cpp:580
+#, fuzzy
+msgid "Color Map"
+msgstr "Matica farieb"
+
+#: src/tags.cpp:581
+msgid ""
+"A color map for palette color images. This field defines a Red-Green-Blue "
+"color map (often called a lookup table) for palette-color images. In a "
+"palette-color image, a pixel value is used to index into an RGB lookup table."
+msgstr ""
+
+#: src/tags.cpp:586
+msgid "Halftone Hints"
+msgstr ""
+
+#: src/tags.cpp:587
+msgid ""
+"The purpose of the HalftoneHints field is to convey to the halftone function "
+"the range of gray levels within a colorimetrically-specified image that "
+"should retain tonal detail."
+msgstr ""
+
+#: src/tags.cpp:591
 msgid "Tile Width"
 msgstr "Šírka dlaždice"
 
-#: src/tags.cpp:482
+#: src/tags.cpp:592
 msgid "The tile width in pixels. This is the number of columns in each tile."
 msgstr ""
 
-#: src/tags.cpp:484
+#: src/tags.cpp:594
 msgid "Tile Length"
 msgstr "Dĺžka dlaždice"
 
-#: src/tags.cpp:485
+#: src/tags.cpp:595
 msgid ""
 "The tile length (height) in pixels. This is the number of rows in each tile."
 msgstr ""
 
 # exif-stripoffsets
-#: src/tags.cpp:487
+#: src/tags.cpp:597
 msgid "Tile Offsets"
 msgstr "Ofsety dlaždíc"
 
-#: src/tags.cpp:488
+#: src/tags.cpp:598
 msgid ""
 "For each tile, the byte offset of that tile, as compressed and stored on "
 "disk. The offset is specified with respect to the beginning of the TIFF "
@@ -15963,57 +19925,194 @@
 msgstr ""
 
 # exif-stripbytecounts
-#: src/tags.cpp:493
+#: src/tags.cpp:603
 msgid "Tile Byte Counts"
 msgstr "Počet bajtov dlaždice"
 
-#: src/tags.cpp:494
+#: src/tags.cpp:604
 msgid ""
 "For each tile, the number of (compressed) bytes in that tile. See "
 "TileOffsets for a description of how the byte counts are ordered."
 msgstr ""
 
-#: src/tags.cpp:497
+#: src/tags.cpp:607
 msgid "SubIFD Offsets"
 msgstr "Umiestnenie SubIFD"
 
-#: src/tags.cpp:498
+#: src/tags.cpp:608
 msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
 msgstr "Definovala Adobe Corporation aby umožnila TIFF stromy v TIFF súboroch."
 
-#: src/tags.cpp:500
+#: src/tags.cpp:610
+#, fuzzy
+msgid "Ink Set"
+msgstr "Nastaviť"
+
+#: src/tags.cpp:611
+msgid ""
+"The set of inks used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:613
+#, fuzzy
+msgid "Ink Names"
+msgstr "Meno vlastníka"
+
+#: src/tags.cpp:614
+msgid ""
+"The name of each ink used in a separated (PhotometricInterpretation=5) image."
+msgstr ""
+
+#: src/tags.cpp:616
+#, fuzzy
+msgid "Number Of Inks"
+msgstr "Počet stránok"
+
+#: src/tags.cpp:617
+msgid ""
+"The number of inks. Usually equal to SamplesPerPixel, unless there are extra "
+"samples."
+msgstr ""
+
+#: src/tags.cpp:619
+#, fuzzy
+msgid "Dot Range"
+msgstr "Dynamický rozsah"
+
+#: src/tags.cpp:620
+#, c-format
+msgid "The component values that correspond to a 0% dot and 100% dot."
+msgstr ""
+
+#: src/tags.cpp:622
+#, fuzzy
+msgid "Target Printer"
+msgstr "Cieľová clona"
+
+#: src/tags.cpp:623
+msgid ""
+"A description of the printing environment for which this separation is "
+"intended."
+msgstr ""
+
+#: src/tags.cpp:625
+#, fuzzy
+msgid "Extra Samples"
+msgstr "bitov na vzorku"
+
+#: src/tags.cpp:626
+msgid ""
+"Specifies that each pixel has m extra components whose interpretation is "
+"defined by one of the values listed below."
+msgstr ""
+
+#: src/tags.cpp:629
+#, fuzzy
+msgid "Sample Format"
+msgstr "Formát súboru"
+
+#: src/tags.cpp:630
+msgid "This field specifies how to interpret each data sample in a pixel."
+msgstr ""
+
+#: src/tags.cpp:632
+#, fuzzy
+msgid "SMin Sample Value"
+msgstr "Ostrosť"
+
+#: src/tags.cpp:633
+msgid "This field specifies the minimum sample value."
+msgstr ""
+
+#: src/tags.cpp:635
+#, fuzzy
+msgid "SMax Sample Value"
+msgstr "Max. hodnota clony"
+
+#: src/tags.cpp:636
+msgid "This field specifies the maximum sample value."
+msgstr ""
+
+#: src/tags.cpp:638
 msgid "Transfer Range"
 msgstr "prenosový rozsah"
 
-#: src/tags.cpp:501
+#: src/tags.cpp:639
 msgid "Expands the range of the TransferFunction"
 msgstr ""
 
-#: src/tags.cpp:503
+#: src/tags.cpp:641
+msgid "Clip Path"
+msgstr ""
+
+#: src/tags.cpp:642
+msgid ""
+"A TIFF ClipPath is intended to mirror the essentials of PostScript's path "
+"creation functionality."
+msgstr ""
+
+#: src/tags.cpp:645
+msgid "X Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:646
+msgid ""
+"The number of units that span the width of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:649
+msgid "Y Clip Path Units"
+msgstr ""
+
+#: src/tags.cpp:650
+msgid ""
+"The number of units that span the height of the image, in terms of integer "
+"ClipPath coordinates."
+msgstr ""
+
+#: src/tags.cpp:654
+msgid ""
+"Indexed images are images where the 'pixels' do not represent color values, "
+"but rather an index (usually 8-bit) into a separate color table, the "
+"ColorMap."
+msgstr ""
+
+#: src/tags.cpp:658
 #, fuzzy
 msgid "JPEG tables"
 msgstr "JPEG proces"
 
-#: src/tags.cpp:504
+#: src/tags.cpp:659
 msgid ""
 "This optional tag may be used to encode the JPEG quantization andHuffman "
 "tables for subsequent use by the JPEG decompression process."
 msgstr ""
 
-#: src/tags.cpp:507
+#: src/tags.cpp:662
+msgid "OPI Proxy"
+msgstr ""
+
+#: src/tags.cpp:663
+msgid ""
+"OPIProxy gives information concerning whether this image is a low-resolution "
+"proxy of a high-resolution image (Adobe OPI)."
+msgstr ""
+
+#: src/tags.cpp:666
 msgid "JPEG Process"
 msgstr "JPEG proces"
 
-#: src/tags.cpp:508
+#: src/tags.cpp:667
 msgid "This field indicates the process used to produce the compressed data"
 msgstr ""
 
 # exif-jpeginterchangeformat
-#: src/tags.cpp:510
+#: src/tags.cpp:669
 msgid "JPEG Interchange Format"
 msgstr "formát JPEG"
 
-#: src/tags.cpp:511
+#: src/tags.cpp:670
 msgid ""
 "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
 "is not used for primary image JPEG data."
@@ -16022,11 +20121,11 @@
 "sa pre JPEG dáta primárneho obrázka."
 
 # exif-jpeginterchangeformatlength
-#: src/tags.cpp:514
+#: src/tags.cpp:673
 msgid "JPEG Interchange Format Length"
 msgstr "dĺžka JPEG dát"
 
-#: src/tags.cpp:515
+#: src/tags.cpp:674
 msgid ""
 "The number of bytes of JPEG compressed thumbnail data. This is not used for "
 "primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
@@ -16040,7 +20139,72 @@
 "Komprimované náhľady nesmú byť zaznamenané vo viac ako 64 kilobajtoch "
 "vrátane všetkých ostatných dát zaznamenaných v APP1."
 
-#: src/tags.cpp:523
+#: src/tags.cpp:681
+msgid "JPEG Restart Interval"
+msgstr ""
+
+#: src/tags.cpp:682
+#, fuzzy
+msgid ""
+"This Field indicates the length of the restart interval used in the "
+"compressed image data."
+msgstr ""
+"Táto značka označuje smer spracovania ostrosti, ktorý použil fotoaparát pri "
+"zachytení obrázka."
+
+#: src/tags.cpp:685
+msgid "JPEG Lossless Predictors"
+msgstr ""
+
+#: src/tags.cpp:686
+msgid ""
+"This Field points to a list of lossless predictor-selection values, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:689
+msgid "JPEG Point Transforms"
+msgstr ""
+
+#: src/tags.cpp:690
+msgid ""
+"This Field points to a list of point transform values, one per component."
+msgstr ""
+
+#: src/tags.cpp:692
+#, fuzzy
+msgid "JPEG Q-Tables"
+msgstr "JPEG proces"
+
+#: src/tags.cpp:693
+msgid ""
+"This Field points to a list of offsets to the quantization tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:696
+#, fuzzy
+msgid "JPEG DC-Tables"
+msgstr "JPEG proces"
+
+#: src/tags.cpp:697
+msgid ""
+"This Field points to a list of offsets to the DC Huffman tables or the "
+"lossless Huffman tables, one per component."
+msgstr ""
+
+#: src/tags.cpp:700
+#, fuzzy
+msgid "JPEG AC-Tables"
+msgstr "JPEG proces"
+
+#: src/tags.cpp:701
+msgid ""
+"This Field points to a list of offsets to the Huffman AC tables, one per "
+"component."
+msgstr ""
+
+#: src/tags.cpp:705
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
 "default is given in TIFF; but here the value given in Appendix E, \"Color "
@@ -16056,11 +20220,11 @@
 "stavu."
 
 # exif-ycbcrsubsampling
-#: src/tags.cpp:531
+#: src/tags.cpp:713
 msgid "YCbCr Sub-Sampling"
 msgstr "podvzorkovanie YCbCr"
 
-#: src/tags.cpp:532
+#: src/tags.cpp:714
 msgid ""
 "The sampling ratio of chrominance components in relation to the luminance "
 "component. In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -16068,7 +20232,7 @@
 "Vzorkovací pomer zložiek chrominancie v pomere k svietivosti. V dátach "
 "komprimovaných JPEG sa namiesto tejto značky používa značka JPEG."
 
-#: src/tags.cpp:537
+#: src/tags.cpp:719
 msgid ""
 "The position of chrominance components in relation to the luminance "
 "component. This field is designated only for JPEG compressed data or "
@@ -16095,11 +20259,11 @@
 "mieste."
 
 # exif-referenceblackwhite
-#: src/tags.cpp:551
+#: src/tags.cpp:733
 msgid "Reference Black/White"
 msgstr "referenčná čierna/biela"
 
-#: src/tags.cpp:552
+#: src/tags.cpp:734
 msgid ""
 "The reference black point value and reference white point value. No defaults "
 "are given in TIFF, but the values below are given as defaults here. The "
@@ -16113,55 +20277,64 @@
 "priestoru, pričom štandardnou hodnotou je tá, ktorá dáva optimálnu "
 "charakteristiku interoperability tohto stavu."
 
-#: src/tags.cpp:559
+#: src/tags.cpp:741
 msgid "XML Packet"
 msgstr "XML paket"
 
-#: src/tags.cpp:560
+#: src/tags.cpp:742
 msgid "XMP Metadata (Adobe technote 9-14-02)"
 msgstr ""
 
-#: src/tags.cpp:562
+#: src/tags.cpp:744
 msgid "Windows Rating"
 msgstr "Windows hodnotenie"
 
-#: src/tags.cpp:563
+#: src/tags.cpp:745
 msgid "Rating tag used by Windows"
 msgstr ""
 
-#: src/tags.cpp:565
+#: src/tags.cpp:747
+#, fuzzy
 msgid "Windows Rating Percent"
-msgstr ""
+msgstr "Percentá hodnotenia"
 
-#: src/tags.cpp:566
+#: src/tags.cpp:748
 msgid "Rating tag used by Windows, value in percent"
 msgstr ""
 
-#: src/tags.cpp:568
+#: src/tags.cpp:750
+#, fuzzy
+msgid "Image ID"
+msgstr "Jedinečný ID obrázka"
+
+#: src/tags.cpp:751
+msgid ""
+"ImageID is the full pathname of the original, high-resolution image, or any "
+"other identifying string that uniquely identifies the original image (Adobe "
+"OPI)."
+msgstr ""
+
+#: src/tags.cpp:755
 msgid "CFA Repeat Pattern Dimension"
 msgstr ""
 
-#: src/tags.cpp:569
+#: src/tags.cpp:756
 msgid ""
 "Contains two values representing the minimum rows and columns to define the "
 "repeating patterns of the color filter array"
 msgstr ""
 
-#: src/tags.cpp:573
+#: src/tags.cpp:760
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
 "methods"
 msgstr ""
 "Označuje geometrickú vzorku poľa farebného filtra (CFA) obrazového snímača "
-"pri použítí jednočipového farebného snímača oblasti. Nevzťahuje sa na všetky "
-"metódy snímania."
-
-#: src/tags.cpp:577
-msgid "Battery Level"
-msgstr "úroveň batérie"
+"pri použítí jednočipového farebného snímača oblasti. Nevzťahuje sa na všetky "
+"metódy snímania."
 
-#: src/tags.cpp:581
+#: src/tags.cpp:768
 msgid ""
 "Copyright information. In this standard the tag is used to indicate both the "
 "photographer and editor copyrights. It is the copyright notice of the person "
@@ -16192,33 +20365,33 @@
 "fotograf, je ukončené iba jedným znakom NULL (pozri príklad 2). Keď je pole "
 "nevyplnené, zaobchádza sa s ním ako s neznámym."
 
-#: src/tags.cpp:600
+#: src/tags.cpp:787
 #, fuzzy
 msgid "Exposure time, given in seconds."
 msgstr "Čas expozície v sekundách (sek)."
 
 # exif-fnumber
-#: src/tags.cpp:601 src/tags.cpp:1178
+#: src/tags.cpp:788 src/tags.cpp:1368
 msgid "The F number."
 msgstr "číslo F."
 
-#: src/tags.cpp:602
+#: src/tags.cpp:789
 msgid "IPTC/NAA"
 msgstr "IPTC/NAA"
 
-#: src/tags.cpp:603
+#: src/tags.cpp:790
 msgid "Contains an IPTC/NAA record"
 msgstr "Obsahuje IPTC/NAA nahrávku"
 
-#: src/tags.cpp:605
+#: src/tags.cpp:792
 msgid "Image Resources Block"
 msgstr "blok obrazových prostriedkov"
 
-#: src/tags.cpp:606
+#: src/tags.cpp:793
 msgid "Contains information embedded by the Adobe Photoshop application"
 msgstr ""
 
-#: src/tags.cpp:609
+#: src/tags.cpp:796
 msgid ""
 "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
 "as that of the IFD specified in TIFF. ordinarily, however, it does not "
@@ -16228,17 +20401,17 @@
 "štruktúra IFD podľa špecifikácie v TIFF. Bežne však neobsahuje obrazové dáta "
 "ako v prípade štruktúry v TIFF."
 
-#: src/tags.cpp:614
+#: src/tags.cpp:801
 msgid "Inter Color Profile"
 msgstr "Farebný profil Inter"
 
-#: src/tags.cpp:615
+#: src/tags.cpp:802
 msgid ""
 "Contains an InterColor Consortium (ICC) format color space characterization/"
 "profile"
 msgstr ""
 
-#: src/tags.cpp:617 src/tags.cpp:1181
+#: src/tags.cpp:804 src/tags.cpp:1371
 msgid ""
 "The class of the program used by the camera to set exposure when the picture "
 "is taken."
@@ -16246,12 +20419,12 @@
 "Trieda programu, ktorý fotoaparát používa na nastavenie expozície pri fotení "
 "obrázka."
 
-#: src/tags.cpp:618
+#: src/tags.cpp:805
 #, fuzzy
 msgid "Indicates the spectral sensitivity of each channel of the camera used."
 msgstr "EXIF značka 34852, 0x8824. Spektrálna citlivosť každého kanála"
 
-#: src/tags.cpp:620
+#: src/tags.cpp:807
 msgid ""
 "A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
 "Info IFD, like that of Exif IFD, has no image data."
@@ -16260,11 +20433,11 @@
 "ako pri Exif IFD, neobsahuje obrazové dáta."
 
 # exif-isospeedratings
-#: src/tags.cpp:624 src/tags.cpp:1189
+#: src/tags.cpp:811 src/tags.cpp:1379
 msgid "ISO Speed Ratings"
 msgstr "rýchlostné ohodnotenie ISO"
 
-#: src/tags.cpp:624 src/tags.cpp:1190
+#: src/tags.cpp:811 src/tags.cpp:1380
 msgid ""
 "Indicates the ISO Speed and ISO Latitude of the camera or input device as "
 "specified in ISO 12232."
@@ -16272,7 +20445,7 @@
 "Označuje ISO rýchlosť a ISO zemepisnú šírku fotoaparátu alebo vstupného "
 "zariadenia podľa špecifikácie ISO 12232."
 
-#: src/tags.cpp:625
+#: src/tags.cpp:812
 #, fuzzy
 msgid ""
 "Indicates the Opto-Electric Conversion Function (OECF) specified in ISO "
@@ -16281,23 +20454,23 @@
 "EXIF značka 34856, 0x8828. Opto-elektronická konverzná funkcie podľa "
 "špecifikácie ISO 14524"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Interlace"
 msgstr "Prekladaný"
 
-#: src/tags.cpp:626
+#: src/tags.cpp:813
 #, fuzzy
 msgid "Indicates the field number of multifield images."
 msgstr "Rozloženie obrázka."
 
 # exif-stripoffsets
-#: src/tags.cpp:627
+#: src/tags.cpp:814
 #, fuzzy
 msgid "Time Zone Offset"
 msgstr "Ofsety dlaždíc"
 
-#: src/tags.cpp:628
+#: src/tags.cpp:815
 msgid ""
 "This optional tag encodes the time zone of the camera clock (relativeto "
 "Greenwich Mean Time) used to create the DataTimeOriginal tag-valuewhen the "
@@ -16305,26 +20478,26 @@
 "to create the DateTime tag-value when the image wasmodified."
 msgstr ""
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 #, fuzzy
 msgid "Self Timer Mode"
 msgstr "Samospúšť"
 
-#: src/tags.cpp:634
+#: src/tags.cpp:821
 msgid "Number of seconds image capture was delayed from button press."
 msgstr ""
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "Date Time Original"
 msgstr "Dátum a čas zhotovenia"
 
-#: src/tags.cpp:635
+#: src/tags.cpp:822
 #, fuzzy
 msgid "The date and time when the original image data was generated."
 msgstr "Dátum a čas, kedy boli metadáta naposledy zmenené."
 
-#: src/tags.cpp:636
+#: src/tags.cpp:823
 #, fuzzy
 msgid "Specific to compressed data; states the compressed bits per pixel."
 msgstr ""
@@ -16332,78 +20505,78 @@
 "komprimovaný obrázok sa označuje v jednotkách bity na pixel."
 
 # exif-shutterspeedvalue
-#: src/tags.cpp:637
+#: src/tags.cpp:824
 #, fuzzy
 msgid "Shutter speed."
 msgstr "rýchlosť uzávierky"
 
-#: src/tags.cpp:638
+#: src/tags.cpp:825
 #, fuzzy
 msgid "The lens aperture."
 msgstr "Max. clona"
 
-#: src/tags.cpp:639
+#: src/tags.cpp:826
 #, fuzzy
 msgid "The value of brightness."
 msgstr "Počet úderov."
 
-#: src/tags.cpp:640
+#: src/tags.cpp:827
 #, fuzzy
 msgid "The exposure bias."
 msgstr "Skreslenie expozície"
 
-#: src/tags.cpp:641 src/tags.cpp:1238
+#: src/tags.cpp:828 src/tags.cpp:1428
 msgid "Max Aperture Value"
 msgstr "Max. hodnota clony"
 
-#: src/tags.cpp:641
+#: src/tags.cpp:828
 #, fuzzy
 msgid "The smallest F number of the lens."
 msgstr "Názov scény"
 
-#: src/tags.cpp:642 src/tags.cpp:1244
+#: src/tags.cpp:829 src/tags.cpp:1434
 msgid "The distance to the subject, given in meters."
 msgstr "Vzdialenosť subjektu v metroch."
 
-#: src/tags.cpp:643 src/tags.cpp:1247
+#: src/tags.cpp:830 src/tags.cpp:1437
 msgid "The metering mode."
 msgstr "Režim merania."
 
-#: src/tags.cpp:644 src/tags.cpp:1250
+#: src/tags.cpp:831 src/tags.cpp:1440
 msgid "The kind of light source."
 msgstr "Druh svetelného zdroja."
 
-#: src/tags.cpp:645
+#: src/tags.cpp:832
 #, fuzzy
 msgid "Indicates the status of flash when the image was shot."
 msgstr ""
 "Táto značka označuje aký režim vyváženia bielej bol zvolený pri odfotení "
 "obrázka."
 
-#: src/tags.cpp:646
+#: src/tags.cpp:833
 #, fuzzy
 msgid "The actual focal length of the lens, in mm."
 msgstr ""
 "EXIF značka 37386, 0x920A. Ohnisková vzdialenosť šošoviek v milimetroch"
 
-#: src/tags.cpp:647
+#: src/tags.cpp:834
 msgid "Amount of flash energy (BCPS)."
 msgstr ""
 
-#: src/tags.cpp:648
+#: src/tags.cpp:835
 msgid "SFR of the camera."
 msgstr ""
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 #, fuzzy
 msgid "Noise"
 msgstr "Nič"
 
-#: src/tags.cpp:649
+#: src/tags.cpp:836
 msgid "Noise measurement values."
 msgstr ""
 
-#: src/tags.cpp:650
+#: src/tags.cpp:837
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth "
@@ -16412,7 +20585,7 @@
 "Počet pixelov na <ResolutionUnit> v smere <ImageLength>. Použije sa rovnaká "
 "hodnota ako <XResolution>."
 
-#: src/tags.cpp:651
+#: src/tags.cpp:838
 #, fuzzy
 msgid ""
 "Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength "
@@ -16421,7 +20594,7 @@
 "Počet pixelov na <ResolutionUnit> v smere <ImageLength>. Použije sa rovnaká "
 "hodnota ako <XResolution>."
 
-#: src/tags.cpp:652
+#: src/tags.cpp:839
 #, fuzzy
 msgid ""
 "Unit of measurement for FocalPlaneXResolution(37390) and "
@@ -16430,120 +20603,117 @@
 "EXIF značka 41488, 0xA210. Jednotka pre FocalPlaneXResolution a "
 "FocalPlaneYResolution"
 
-#: src/tags.cpp:653
+#: src/tags.cpp:840
 msgid "Number assigned to an image, e.g., in a chained image burst."
 msgstr ""
 
-#: src/tags.cpp:654
+#: src/tags.cpp:841
 #, fuzzy
 msgid "Security Classification"
 msgstr "Elektromagnetické zväčšenie"
 
-#: src/tags.cpp:654
-msgid "Security classification assigned to the image."
-msgstr ""
-
-#: src/tags.cpp:655
+#: src/tags.cpp:841
 #, fuzzy
-msgid "Image History"
-msgstr "Výška obrázka"
+msgid "Security classification assigned to the image."
+msgstr "Elektromagnetické zväčšenie"
 
-#: src/tags.cpp:655
+#: src/tags.cpp:842
 msgid "Record of what has been done to the image."
 msgstr ""
 
-#: src/tags.cpp:656
+#: src/tags.cpp:843
 #, fuzzy
 msgid ""
 "Indicates the location and area of the main subject in the overall scene."
 msgstr ""
 "Táto značka označuje polohu a plochu hlavného subjektu v celkovej scéne."
 
-#: src/tags.cpp:657
+#: src/tags.cpp:844
 #, fuzzy
 msgid "Encodes the camera exposure index setting when image was captured."
 msgstr ""
 "Táto značka označuje expozičný index zvolený na fotoaparáte alebo vstupnom "
 "zariadení v čase zachytenia obrázka."
 
-#: src/tags.cpp:658
+#: src/tags.cpp:845
 msgid "TIFF/EP Standard ID"
 msgstr "ID štandardu TIFF/EP"
 
-#: src/tags.cpp:659
+#: src/tags.cpp:846
 msgid ""
 "Contains four ASCII characters representing the TIFF/EP standard version of "
 "a TIFF/EP file, eg '1', '0', '0', '0'"
 msgstr ""
 
-#: src/tags.cpp:662
+#: src/tags.cpp:849
+#, fuzzy
 msgid "Type of image sensor."
-msgstr ""
+msgstr "Počet obrázkov"
 
-#: src/tags.cpp:663
+#: src/tags.cpp:850
 msgid "Windows Title"
 msgstr "Názov okna"
 
-#: src/tags.cpp:664
+#: src/tags.cpp:851
 msgid "Title tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:666
+#: src/tags.cpp:853
 msgid "Windows Comment"
 msgstr "Windows Komentár"
 
-#: src/tags.cpp:667
+#: src/tags.cpp:854
 msgid "Comment tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:669
+#: src/tags.cpp:856
 msgid "Windows Author"
 msgstr "Windows autor"
 
-#: src/tags.cpp:670
+#: src/tags.cpp:857
 msgid "Author tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:672
+#: src/tags.cpp:859
 msgid "Windows Keywords"
 msgstr "Windows kľúčové slová"
 
-#: src/tags.cpp:673
+#: src/tags.cpp:860
 msgid "Keywords tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:675
+#: src/tags.cpp:862
 msgid "Windows Subject"
 msgstr "Windows predmet"
 
-#: src/tags.cpp:676
+#: src/tags.cpp:863
 msgid "Subject tag used by Windows, encoded in UCS2"
 msgstr ""
 
-#: src/tags.cpp:678
+#: src/tags.cpp:865
 msgid "Print Image Matching"
 msgstr ""
 
-#: src/tags.cpp:679
-msgid "Print Image Matching, descriptiont needed."
+#: src/tags.cpp:866
+msgid "Print Image Matching, description needed."
 msgstr ""
 
-#: src/tags.cpp:681
+#: src/tags.cpp:868
 msgid "DNG version"
 msgstr "Verzia DNG"
 
-#: src/tags.cpp:682
+#: src/tags.cpp:869
 msgid ""
 "This tag encodes the DNG four-tier version number. For files compliant with "
 "version 1.1.0.0 of the DNG specification, this tag should contain the bytes: "
 "1, 1, 0, 0."
 msgstr ""
 
-#: src/tags.cpp:686
+#: src/tags.cpp:873
 msgid "DNG backward version"
 msgstr "Spätná verzia DNG"
 
-#: src/tags.cpp:687
+#: src/tags.cpp:874
 msgid ""
 "This tag specifies the oldest version of the Digital Negative specification "
 "for which a file is compatible. Readers shouldnot attempt to read a file if "
@@ -16553,11 +20723,11 @@
 "values, to verify it is able to correctly read the file."
 msgstr ""
 
-#: src/tags.cpp:695
+#: src/tags.cpp:882
 msgid "Unique Camera Model"
 msgstr "Jedinečný model fotoaparátu"
 
-#: src/tags.cpp:696
+#: src/tags.cpp:883
 msgid ""
 "Defines a unique, non-localized name for the camera model that created the "
 "image in the raw file. This name should include the manufacturer's name to "
@@ -16567,35 +20737,35 @@
 "replacement profiles."
 msgstr ""
 
-#: src/tags.cpp:703
+#: src/tags.cpp:890
 msgid "Localized Camera Model"
 msgstr "Lokalizovaný model fotoaparátu"
 
-#: src/tags.cpp:704
+#: src/tags.cpp:891
 msgid ""
 "Similar to the UniqueCameraModel field, except the name can be localized for "
 "different markets to match the localization of the camera name."
 msgstr ""
 
-#: src/tags.cpp:708
+#: src/tags.cpp:895
 msgid "CFA Plane Color"
 msgstr "Farba CFA roviny"
 
-#: src/tags.cpp:709
+#: src/tags.cpp:896
 msgid ""
 "Provides a mapping between the values in the CFAPattern tag and the plane "
 "numbers in LinearRaw space. This is a required tag for non-RGB CFA images."
 msgstr ""
 
-#: src/tags.cpp:713
+#: src/tags.cpp:900
 msgid "CFA Layout"
 msgstr ""
 
-#: src/tags.cpp:714
+#: src/tags.cpp:901
 msgid "Describes the spatial layout of the CFA."
 msgstr ""
 
-#: src/tags.cpp:717
+#: src/tags.cpp:904
 msgid ""
 "Describes a lookup table that maps stored values into linear values. This "
 "tag is typically used to increase compression ratios by storing the raw data "
@@ -16604,15 +20774,15 @@
 "all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:723
+#: src/tags.cpp:910
 msgid "Black Level Repeat Dim"
 msgstr "Úroveň čiernej - stlmenie opakovania"
 
-#: src/tags.cpp:724
+#: src/tags.cpp:911
 msgid "Specifies repeat pattern size for the BlackLevel tag."
 msgstr ""
 
-#: src/tags.cpp:727
+#: src/tags.cpp:914
 msgid ""
 "Specifies the zero light (a.k.a. thermal black or black current) encoding "
 "level, as a repeating pattern. The origin of this pattern is the top-left "
@@ -16620,11 +20790,11 @@
 "sample scan order."
 msgstr ""
 
-#: src/tags.cpp:732
+#: src/tags.cpp:919
 msgid "Black Level Delta H"
 msgstr "Úroveň čiernej - vodorov. rozdiel"
 
-#: src/tags.cpp:733
+#: src/tags.cpp:920
 msgid ""
 "If the zero light encoding level is a function of the image column, "
 "BlackLevelDeltaH specifies the difference between the zero light encoding "
@@ -16633,11 +20803,11 @@
 "samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:739
+#: src/tags.cpp:926
 msgid "Black Level Delta V"
 msgstr "Úroveň čiernej - zvis. rozdiel"
 
-#: src/tags.cpp:740
+#: src/tags.cpp:927
 msgid ""
 "If the zero light encoding level is a function of the image row, this tag "
 "specifies the difference between the zero light encoding level for each row "
@@ -16645,22 +20815,22 @@
 "to one, this single table applies to all the samples for each pixel."
 msgstr ""
 
-#: src/tags.cpp:746
+#: src/tags.cpp:933
 msgid "White Level"
 msgstr "Úroveň bielej"
 
-#: src/tags.cpp:747
+#: src/tags.cpp:934
 msgid ""
 "This tag specifies the fully saturated encoding level for the raw sample "
 "values. Saturation is caused either by the sensor itself becoming highly non-"
 "linear in response, or by the camera's analog to digital converter clipping."
 msgstr ""
 
-#: src/tags.cpp:752
+#: src/tags.cpp:939
 msgid "Default Scale"
 msgstr "Štandardná škála"
 
-#: src/tags.cpp:753
+#: src/tags.cpp:940
 msgid ""
 "DefaultScale is required for cameras with non-square pixels. It specifies "
 "the default scale factors for each direction to convert the image to square "
@@ -16670,11 +20840,11 @@
 "of 2.0."
 msgstr ""
 
-#: src/tags.cpp:760
+#: src/tags.cpp:947
 msgid "Default Crop Origin"
 msgstr ""
 
-#: src/tags.cpp:761
+#: src/tags.cpp:948
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16683,11 +20853,12 @@
 "applied), relative to the top-left corner of the ActiveArea rectangle."
 msgstr ""
 
-#: src/tags.cpp:768
+#: src/tags.cpp:955
+#, fuzzy
 msgid "Default Crop Size"
-msgstr ""
+msgstr "Štandardná škála"
 
-#: src/tags.cpp:769
+#: src/tags.cpp:956
 msgid ""
 "Raw images often store extra pixels around the edges of the final image. "
 "These extra pixels help prevent interpolation artifacts near the edges of "
@@ -16695,11 +20866,11 @@
 "in raw image coordinates (i.e., before the DefaultScale has been applied)."
 msgstr ""
 
-#: src/tags.cpp:775
+#: src/tags.cpp:962
 msgid "Color Matrix 1"
 msgstr "Matica farieb 1"
 
-#: src/tags.cpp:776
+#: src/tags.cpp:963
 msgid ""
 "ColorMatrix1 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the first calibration "
@@ -16707,22 +20878,22 @@
 "tag is required for all non-monochrome DNG files."
 msgstr ""
 
-#: src/tags.cpp:782
+#: src/tags.cpp:969
 msgid "Color Matrix 2"
 msgstr "Matica farieb 2"
 
-#: src/tags.cpp:783
+#: src/tags.cpp:970
 msgid ""
 "ColorMatrix2 defines a transformation matrix that converts XYZ values to "
 "reference camera native color space values, under the second calibration "
 "illuminant. The matrix values are stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:788
+#: src/tags.cpp:975
 msgid "Camera Calibration 1"
 msgstr "Kalibrácia fotoaparátu 1"
 
-#: src/tags.cpp:789
+#: src/tags.cpp:976
 msgid ""
 "CameraClalibration1 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16733,11 +20904,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:798
+#: src/tags.cpp:985
+#, fuzzy
 msgid "Camera Calibration 2"
-msgstr ""
+msgstr "Kalibrácia fotoaparátu 1"
 
-#: src/tags.cpp:799
+#: src/tags.cpp:986
 msgid ""
 "CameraCalibration2 defines a calibration matrix that transforms reference "
 "camera native space values to individual camera native space values under "
@@ -16748,11 +20920,12 @@
 "per-individual camera calibration performed by the camera manufacturer."
 msgstr ""
 
-#: src/tags.cpp:808
+#: src/tags.cpp:995
+#, fuzzy
 msgid "Reduction Matrix 1"
-msgstr ""
+msgstr "Matica farieb 1"
 
-#: src/tags.cpp:809
+#: src/tags.cpp:996
 msgid ""
 "ReductionMatrix1 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16760,11 +20933,12 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:815
+#: src/tags.cpp:1002
+#, fuzzy
 msgid "Reduction Matrix 2"
-msgstr ""
+msgstr "Matica farieb 2"
 
-#: src/tags.cpp:816
+#: src/tags.cpp:1003
 msgid ""
 "ReductionMatrix2 defines a dimensionality reduction matrix for use as the "
 "first stage in converting color camera native space values to XYZ values, "
@@ -16772,11 +20946,11 @@
 "ColorPlanes is greater than 3. The matrix is stored in row scan order."
 msgstr ""
 
-#: src/tags.cpp:822
+#: src/tags.cpp:1009
 msgid "Analog Balance"
 msgstr "Analógové vyváženie"
 
-#: src/tags.cpp:823
+#: src/tags.cpp:1010
 msgid ""
 "Normally the stored raw values are not white balanced, since any digital "
 "white balancing will reduce the dynamic range of the final image if the user "
@@ -16787,34 +20961,34 @@
 "recommended) that has been applied the stored raw values."
 msgstr ""
 
-#: src/tags.cpp:832
+#: src/tags.cpp:1019
 msgid "As Shot Neutral"
 msgstr "Neutrálny, ako nafotený"
 
-#: src/tags.cpp:833
+#: src/tags.cpp:1020
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as the "
 "coordinates of a perfectly neutral color in linear reference space values. "
 "The inclusion of this tag precludes the inclusion of the AsShotWhiteXY tag."
 msgstr ""
 
-#: src/tags.cpp:838
+#: src/tags.cpp:1025
 msgid "As Shot White XY"
 msgstr ""
 
-#: src/tags.cpp:839
+#: src/tags.cpp:1026
 msgid ""
 "Specifies the selected white balance at time of capture, encoded as x-y "
 "chromaticity coordinates. The inclusion of this tag precludes the inclusion "
 "of the AsShotNeutral tag."
 msgstr ""
 
-#: src/tags.cpp:843
+#: src/tags.cpp:1030
 #, fuzzy
 msgid "Baseline Exposure"
 msgstr "Viacnásobná expozícia"
 
-#: src/tags.cpp:844
+#: src/tags.cpp:1031
 msgid ""
 "Camera models vary in the trade-off they make between highlight headroom and "
 "shadow noise. Some leave a significant amount of highlight headroom during a "
@@ -16829,11 +21003,12 @@
 "results, while negative values result in darker default results."
 msgstr ""
 
-#: src/tags.cpp:858
+#: src/tags.cpp:1045
+#, fuzzy
 msgid "Baseline Noise"
-msgstr ""
+msgstr "Viacnásobná expozícia"
 
-#: src/tags.cpp:859
+#: src/tags.cpp:1046
 msgid ""
 "Specifies the relative noise level of the camera model at a baseline ISO "
 "value of 100, compared to a reference camera model. Since noise levels tend "
@@ -16842,12 +21017,12 @@
 "noise level of the current image."
 msgstr ""
 
-#: src/tags.cpp:865
+#: src/tags.cpp:1052
 #, fuzzy
 msgid "Baseline Sharpness"
 msgstr "Ostrosť"
 
-#: src/tags.cpp:866
+#: src/tags.cpp:1053
 msgid ""
 "Specifies the relative amount of sharpening required for this camera model, "
 "compared to a reference camera model. Camera models vary in the strengths of "
@@ -16855,11 +21030,11 @@
 "sharpening than cameras with strong anti-aliasing filters."
 msgstr ""
 
-#: src/tags.cpp:872
+#: src/tags.cpp:1059
 msgid "Bayer Green Split"
 msgstr ""
 
-#: src/tags.cpp:873
+#: src/tags.cpp:1060
 msgid ""
 "Only applies to CFA images using a Bayer pattern filter array. This tag "
 "specifies, in arbitrary units, how closely the values of the green pixels in "
@@ -16869,11 +21044,11 @@
 "this tag is from 0 (no divergence) to about 5000 (quite large divergence)."
 msgstr ""
 
-#: src/tags.cpp:881
+#: src/tags.cpp:1068
 msgid "Linear Response Limit"
 msgstr ""
 
-#: src/tags.cpp:882
+#: src/tags.cpp:1069
 msgid ""
 "Some sensors have an unpredictable non-linearity in their response as they "
 "near the upper limit of their encoding range. This non-linearity results in "
@@ -16883,27 +21058,27 @@
 "significantly non-linear."
 msgstr ""
 
-#: src/tags.cpp:890
+#: src/tags.cpp:1077
 msgid ""
 "CameraSerialNumber contains the serial number of the camera or camera body "
 "that captured the image."
 msgstr ""
 
-#: src/tags.cpp:893
+#: src/tags.cpp:1080
 msgid "Lens Info"
 msgstr "Info o šošovkách"
 
-#: src/tags.cpp:894
+#: src/tags.cpp:1081
 msgid ""
 "Contains information about the lens that captured the image. If the minimum "
 "f-stops are unknown, they should be encoded as 0/0."
 msgstr ""
 
-#: src/tags.cpp:897
+#: src/tags.cpp:1084
 msgid "Chroma Blur Radius"
 msgstr ""
 
-#: src/tags.cpp:898
+#: src/tags.cpp:1085
 msgid ""
 "ChromaBlurRadius provides a hint to the DNG reader about how much chroma "
 "blur should be applied to the image. If this tag is omitted, the reader will "
@@ -16914,11 +21089,11 @@
 "mosaic algorithm."
 msgstr ""
 
-#: src/tags.cpp:906
+#: src/tags.cpp:1093
 msgid "Anti Alias Strength"
 msgstr "Sila antialiasingu"
 
-#: src/tags.cpp:907
+#: src/tags.cpp:1094
 msgid ""
 "Provides a hint to the DNG reader about how strong the camera's anti-alias "
 "filter is. A value of 0.0 means no anti-alias filter (i.e., the camera is "
@@ -16928,33 +21103,33 @@
 msgstr ""
 
 # exif-lightsource-11
-#: src/tags.cpp:913
+#: src/tags.cpp:1100
 #, fuzzy
 msgid "Shadow Scale"
 msgstr "Tieň"
 
-#: src/tags.cpp:914
+#: src/tags.cpp:1101
 msgid ""
 "This tag is used by Adobe Camera Raw to control the sensitivity of its "
 "'Shadows' slider."
 msgstr ""
 
-#: src/tags.cpp:917
+#: src/tags.cpp:1104
 msgid "DNG Private Data"
 msgstr "Privátne údaje DNG"
 
-#: src/tags.cpp:918
+#: src/tags.cpp:1105
 msgid ""
 "Provides a way for camera manufacturers to store private data in the DNG "
 "file for use by their own raw converters, and to have that data preserved by "
 "programs that edit DNG files."
 msgstr ""
 
-#: src/tags.cpp:922
+#: src/tags.cpp:1109
 msgid "MakerNote Safety"
 msgstr "Poistka Poznámky výrobcu"
 
-#: src/tags.cpp:923
+#: src/tags.cpp:1110
 msgid ""
 "MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote tag is "
 "safe to preserve along with the rest of the EXIF data. File browsers and "
@@ -16963,22 +21138,23 @@
 "may be stale, and may not reflect the current state of the full size image."
 msgstr ""
 
-#: src/tags.cpp:930
+#: src/tags.cpp:1117
 msgid "Calibration Illuminant 1"
 msgstr ""
 
-#: src/tags.cpp:931
+#: src/tags.cpp:1118
 msgid ""
 "The illuminant used for the first set of color calibration tags "
 "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal values for "
 "this tag are the same as the legal values for the LightSource EXIF tag."
 msgstr ""
 
-#: src/tags.cpp:936
+#: src/tags.cpp:1123
+#, fuzzy
 msgid "Calibration Illuminant 2"
-msgstr ""
+msgstr "Bez korekcie"
 
-#: src/tags.cpp:937
+#: src/tags.cpp:1124
 msgid ""
 "The illuminant used for an optional second set of color calibration tags "
 "(ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal values for "
@@ -16987,11 +21163,12 @@
 "(unknown)."
 msgstr ""
 
-#: src/tags.cpp:943
+#: src/tags.cpp:1130
+#, fuzzy
 msgid "Best Quality Scale"
-msgstr ""
+msgstr "Štandardná škála"
 
-#: src/tags.cpp:944
+#: src/tags.cpp:1131
 msgid ""
 "For some cameras, the best possible image quality is not achieved by "
 "preserving the total pixel count during conversion. For example, Fujifilm "
@@ -17000,11 +21177,11 @@
 "need to be multiplied to achieve the best quality image size."
 msgstr ""
 
-#: src/tags.cpp:951
+#: src/tags.cpp:1138
 msgid "Raw Data Unique ID"
 msgstr "Jedinečný ID nespracovaných údajov"
 
-#: src/tags.cpp:952
+#: src/tags.cpp:1139
 msgid ""
 "This tag contains a 16-byte unique identifier for the raw image data in the "
 "DNG file. DNG readers can use this tag to recognize a particular raw image, "
@@ -17014,21 +21191,22 @@
 "will end up having the same identifier."
 msgstr ""
 
-#: src/tags.cpp:960
+#: src/tags.cpp:1147
 msgid "Original Raw File Name"
 msgstr "Názov nespracovaného pôvodného súboru"
 
-#: src/tags.cpp:961
+#: src/tags.cpp:1148
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the file name of that original raw file."
 msgstr ""
 
-#: src/tags.cpp:964
+#: src/tags.cpp:1151
+#, fuzzy
 msgid "Original Raw File Data"
-msgstr ""
+msgstr "Názov nespracovaného pôvodného súboru"
 
-#: src/tags.cpp:965
+#: src/tags.cpp:1152
 msgid ""
 "If the DNG file was converted from a non-DNG raw file, then this tag "
 "contains the compressed contents of that original raw file. The contents of "
@@ -17042,21 +21220,21 @@
 msgstr ""
 
 # exif-subjectarea
-#: src/tags.cpp:975
+#: src/tags.cpp:1162
 msgid "Active Area"
 msgstr "Aktívna oblasť"
 
-#: src/tags.cpp:976
+#: src/tags.cpp:1163
 msgid ""
 "This rectangle defines the active (non-masked) pixels of the sensor. The "
 "order of the rectangle coordinates is: top, left, bottom, right."
 msgstr ""
 
-#: src/tags.cpp:979
+#: src/tags.cpp:1166
 msgid "Masked Areas"
 msgstr "Maskované oblasti"
 
-#: src/tags.cpp:980
+#: src/tags.cpp:1167
 msgid ""
 "This tag contains a list of non-overlapping rectangle coordinates of fully "
 "masked pixels, which can be optionally used by DNG readers to measure the "
@@ -17066,11 +21244,11 @@
 "masked pixels are no longer useful."
 msgstr ""
 
-#: src/tags.cpp:987
+#: src/tags.cpp:1174
 msgid "As-Shot ICC Profile"
 msgstr "ICC profil ako bolo nafotené"
 
-#: src/tags.cpp:988
+#: src/tags.cpp:1175
 msgid ""
 "This tag contains an ICC profile that, in conjunction with the "
 "AsShotPreProfileMatrix tag, provides the camera manufacturer with a way to "
@@ -17083,11 +21261,12 @@
 "scene referred values and output referred values."
 msgstr ""
 
-#: src/tags.cpp:999
+#: src/tags.cpp:1186
+#, fuzzy
 msgid "As-Shot Pre-Profile Matrix"
-msgstr ""
+msgstr "ICC profil ako bolo nafotené"
 
-#: src/tags.cpp:1000
+#: src/tags.cpp:1187
 msgid ""
 "This tag is used in conjunction with the AsShotICCProfile tag. It specifies "
 "a matrix that should be applied to the camera color space coordinates before "
@@ -17099,11 +21278,11 @@
 "input components."
 msgstr ""
 
-#: src/tags.cpp:1009
+#: src/tags.cpp:1196
 msgid "Current ICC Profile"
 msgstr "Aktuálny ICC profil"
 
-#: src/tags.cpp:1010
+#: src/tags.cpp:1197
 msgid ""
 "This tag is used in conjunction with the CurrentPreProfileMatrix tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17111,11 +21290,12 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1016
+#: src/tags.cpp:1203
+#, fuzzy
 msgid "Current Pre-Profile Matrix"
-msgstr ""
+msgstr "Aktuálny ICC profil"
 
-#: src/tags.cpp:1017
+#: src/tags.cpp:1204
 msgid ""
 "This tag is used in conjunction with the CurrentICCProfile tag. The "
 "CurrentICCProfile and CurrentPreProfileMatrix tags have the same purpose and "
@@ -17123,200 +21303,197 @@
 "they are for use by raw file editors rather than camera manufacturers."
 msgstr ""
 
-#: src/tags.cpp:1024 src/tags.cpp:1025
+#: src/tags.cpp:1211 src/tags.cpp:1212
 msgid "Unknown IFD tag"
 msgstr "Neznáma značka IFD"
 
-#: src/tags.cpp:1036 src/tags.cpp:1093
+#: src/tags.cpp:1223 src/tags.cpp:1281
 msgid "Not defined"
 msgstr "nedefinované"
 
-#: src/tags.cpp:1041
+#: src/tags.cpp:1228
 msgid "Creative program"
 msgstr "Tvorivý program"
 
-#: src/tags.cpp:1042
+#: src/tags.cpp:1229
 msgid "Action program"
 msgstr "Akčný program"
 
-#: src/tags.cpp:1043
+#: src/tags.cpp:1230
 msgid "Portrait mode"
 msgstr "Režim portrét"
 
-#: src/tags.cpp:1044
+#: src/tags.cpp:1231
 msgid "Landscape mode"
 msgstr "Režim krajinka"
 
-#: src/tags.cpp:1051
-msgid "Center weighted average"
-msgstr "Stredovo vážený priemer"
-
-#: src/tags.cpp:1053
+#: src/tags.cpp:1240
 msgid "Multi-spot"
 msgstr "Viacbodový"
 
 # exif-lightsource-3
-#: src/tags.cpp:1064
+#: src/tags.cpp:1252
 msgid "Tungsten (incandescent light)"
 msgstr "volfram (inkadescentné svetlo)"
 
 # exif-lightsource-9
-#: src/tags.cpp:1066
+#: src/tags.cpp:1254
 msgid "Fine weather"
 msgstr "pekné počasie"
 
 # exif-lightsource-10
-#: src/tags.cpp:1067
+#: src/tags.cpp:1255
 msgid "Cloudy weather"
 msgstr "oblačné počasie"
 
-#: src/tags.cpp:1069
+#: src/tags.cpp:1257
 msgid "Daylight fluorescent (D 5700 - 7100K)"
 msgstr "denné svetlo fluorescenčné (D 5700 - 7100K)"
 
-#: src/tags.cpp:1070
+#: src/tags.cpp:1258
 msgid "Day white fluorescent (N 4600 - 5400K)"
 msgstr "biely deň, fluorescenčné (N 4600 - 5400K)"
 
-#: src/tags.cpp:1071
+#: src/tags.cpp:1259
 msgid "Cool white fluorescent (W 3900 - 4500K)"
 msgstr "chladné biele fluorescenčné (W 3900 - 4500K)"
 
-#: src/tags.cpp:1072
+#: src/tags.cpp:1260
 msgid "White fluorescent (WW 3200 - 3700K)"
 msgstr "biele fluorescenčné (WW 3200 - 3700K)"
 
-#: src/tags.cpp:1073
+#: src/tags.cpp:1261
 msgid "Standard light A"
 msgstr "Štandardné svetlo A"
 
-#: src/tags.cpp:1074
+#: src/tags.cpp:1262
 msgid "Standard light B"
 msgstr "Štandardné svetlo B"
 
-#: src/tags.cpp:1075
+#: src/tags.cpp:1263
 msgid "Standard light C"
 msgstr "Štandardné svetlo C"
 
 # exif-lightsource-20
-#: src/tags.cpp:1076
+#: src/tags.cpp:1264
 msgid "D55"
 msgstr "D55"
 
 # exif-lightsource-21
-#: src/tags.cpp:1077
+#: src/tags.cpp:1265
 msgid "D65"
 msgstr "D65"
 
 # exif-lightsource-22
-#: src/tags.cpp:1078
+#: src/tags.cpp:1266
 msgid "D75"
 msgstr "D75"
 
-#: src/tags.cpp:1079
+#: src/tags.cpp:1267
 msgid "D50"
 msgstr "D50"
 
 # exif-lightsource-24
-#: src/tags.cpp:1080
+#: src/tags.cpp:1268
 msgid "ISO studio tungsten"
 msgstr "ISO štúdiový volfrám"
 
-#: src/tags.cpp:1081
+#: src/tags.cpp:1269
 msgid "Other light source"
 msgstr "Iný svetelný zdroj"
 
-#: src/tags.cpp:1088
+#: src/tags.cpp:1276
 msgid "Uncalibrated"
 msgstr "Nekalibrované"
 
 # exif-sensingmethod-2
-#: src/tags.cpp:1094
+#: src/tags.cpp:1282
 msgid "One-chip color area"
 msgstr "jednočipový farebný snímač oblasti"
 
 # exif-sensingmethod-3
-#: src/tags.cpp:1095
+#: src/tags.cpp:1283
 msgid "Two-chip color area"
 msgstr "dvojčipový farebný snímač oblasti"
 
 # exif-sensingmethod-4
-#: src/tags.cpp:1096
+#: src/tags.cpp:1284
 msgid "Three-chip color area"
 msgstr "trojčipový farebný snímač oblasti"
 
 # exif-sensingmethod-5
-#: src/tags.cpp:1097
+#: src/tags.cpp:1285
 msgid "Color sequential area"
 msgstr "sekvenčný farebný snímač oblasti"
 
 # exif-sensingmethod-7
-#: src/tags.cpp:1098
+#: src/tags.cpp:1286
 msgid "Trilinear sensor"
 msgstr "trilineárny snímač"
 
 # exif-sensingmethod-5
-#: src/tags.cpp:1099
+#: src/tags.cpp:1287
 msgid "Color sequential linear"
 msgstr "sekvenčný farebný snímač oblasti"
 
-#: src/tags.cpp:1104
+#: src/tags.cpp:1292
+#, fuzzy
 msgid "Film scanner"
-msgstr ""
+msgstr "Názov súboru"
 
-#: src/tags.cpp:1105
+#: src/tags.cpp:1293
 msgid "Reflexion print scanner"
 msgstr ""
 
-#: src/tags.cpp:1106
+#: src/tags.cpp:1294
 msgid "Digital still camera"
 msgstr "digitálny fotoaparát"
 
-#: src/tags.cpp:1111
+#: src/tags.cpp:1299
 msgid "Directly photographed"
 msgstr ""
 
-#: src/tags.cpp:1116
+#: src/tags.cpp:1304
 msgid "Normal process"
 msgstr "Bežné spracovanie"
 
-#: src/tags.cpp:1117
+#: src/tags.cpp:1305
 msgid "Custom process"
 msgstr "Vlastné spracovanie"
 
-#: src/tags.cpp:1144
+#: src/tags.cpp:1333
 msgid "Low gain up"
 msgstr "Slabé zosilnenie"
 
 # exif-gaincontrol-2
-#: src/tags.cpp:1145
+#: src/tags.cpp:1334
 msgid "High gain up"
 msgstr "vysoké zosilnenie"
 
 # exif-gaincontrol-3
-#: src/tags.cpp:1146
+#: src/tags.cpp:1335
 msgid "Low gain down"
 msgstr "nízke zoslabenie"
 
 # exif-gaincontrol-4
-#: src/tags.cpp:1147
+#: src/tags.cpp:1336
 msgid "High gain down"
 msgstr "vysoké zoslabenie"
 
 # exif-subjectdistancerange-2
-#: src/tags.cpp:1168
+#: src/tags.cpp:1357
 msgid "Close view"
 msgstr "pohľad zblízka"
 
-#: src/tags.cpp:1169
+#: src/tags.cpp:1358 src/tags.cpp:1359
 msgid "Distant view"
 msgstr "Vzdialený pohľad"
 
-#: src/tags.cpp:1175
+#: src/tags.cpp:1365
 msgid "Exposure time, given in seconds (sec)."
 msgstr "Čas expozície v sekundách (sek)."
 
-#: src/tags.cpp:1185
+#: src/tags.cpp:1375
 msgid ""
 "Indicates the spectral sensitivity of each channel of the camera used. The "
 "tag value is an ASCII string compatible with the standard developed by the "
@@ -17326,12 +21503,12 @@
 "Hodnota značky je ASCII reťazec kompatibilný so štandardom vyvinutým "
 "Technickou komisiou ASTM."
 
-#: src/tags.cpp:1193
+#: src/tags.cpp:1383
 msgid "Opto-Electoric Conversion Function"
 msgstr ""
 
 # exif-oecf
-#: src/tags.cpp:1194
+#: src/tags.cpp:1384
 msgid ""
 "Indicates the Opto-Electoric Conversion Function (OECF) specified in ISO "
 "14524. <OECF> is the relationship between the camera optical input and the "
@@ -17341,7 +21518,7 @@
 "14524. <OECF> je vzťah medzi optickým vstupom fotoaparátu a hodnotami "
 "obrázka."
 
-#: src/tags.cpp:1199
+#: src/tags.cpp:1389
 msgid ""
 "The version of this standard supported. Nonexistence of this field is taken "
 "to mean nonconformance to the standard."
@@ -17349,11 +21526,11 @@
 "Podporovaná verzia tohto štandardu. Neexistencia tohto poľa znamená "
 "nekonformnosť so štandardom."
 
-#: src/tags.cpp:1202
+#: src/tags.cpp:1392
 msgid "Date and Time (original)"
 msgstr "Dátum a čas (pôvodný)"
 
-#: src/tags.cpp:1203
+#: src/tags.cpp:1393
 msgid ""
 "The date and time when the original image data was generated. For a digital "
 "still camera the date and time the picture was taken are recorded."
@@ -17362,15 +21539,15 @@
 "fotoaparát je to dátum a čas zachytenia a zaznamenania obrázka."
 
 # exif-datetimedigitized
-#: src/tags.cpp:1206
+#: src/tags.cpp:1396
 msgid "Date and Time (digitized)"
 msgstr "dátum a čas digitalizácie"
 
-#: src/tags.cpp:1207
+#: src/tags.cpp:1397
 msgid "The date and time when the image was stored as digital data."
 msgstr "Dátum a čas, kedy bol obrázok uložený ako digitálne dáta."
 
-#: src/tags.cpp:1210
+#: src/tags.cpp:1400
 msgid ""
 "Information specific to compressed data. The channels of each component are "
 "arranged in order from the 1st component to the 4th. For uncompressed data "
@@ -17387,11 +21564,11 @@
 "sa umožnila podpora iných poradí."
 
 # exif-compressedbitsperpixel
-#: src/tags.cpp:1219
+#: src/tags.cpp:1409
 msgid "Compressed Bits per Pixel"
 msgstr "komprimované bity na pixel"
 
-#: src/tags.cpp:1220
+#: src/tags.cpp:1410
 msgid ""
 "Information specific to compressed data. The compression mode used for a "
 "compressed image is indicated in unit bits per pixel."
@@ -17399,7 +21576,7 @@
 "Informácia špecifická komprimovaným dátam. Režim kompresie použitý na "
 "komprimovaný obrázok sa označuje v jednotkách bity na pixel."
 
-#: src/tags.cpp:1224
+#: src/tags.cpp:1414
 msgid ""
 "Shutter speed. The unit is the APEX (Additive System of Photographic "
 "Exposure) setting."
@@ -17407,11 +21584,11 @@
 "Rýchlosť uzávierky. Jednotka je nastavenie APEX (Aditívny systém "
 "fotografickej expozície)."
 
-#: src/tags.cpp:1228
+#: src/tags.cpp:1418
 msgid "The lens aperture. The unit is the APEX value."
 msgstr "Clona. Jednotka je hodnota APEX."
 
-#: src/tags.cpp:1231
+#: src/tags.cpp:1421
 msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
@@ -17419,19 +21596,19 @@
 "Hodnota jasu. Jednotka je hodnota APEX. Bežne sa udáva v rozsahu -99.99 až "
 "99.99."
 
-#: src/tags.cpp:1234
+#: src/tags.cpp:1424
 msgid "Exposure Bias"
 msgstr "Skreslenie expozície"
 
-#: src/tags.cpp:1235
+#: src/tags.cpp:1425
 msgid ""
 "The exposure bias. The units is the APEX value. Ordinarily it is given in "
 "the range of -99.99 to 99.99."
 msgstr ""
-"Expozičné skreslenie. Jednotka je hodnota APEX. Bežne sa udáva v rozsahu -"
-"99.99 až 99.99."
+"Expozičné skreslenie. Jednotka je hodnota APEX. Bežne sa udáva v rozsahu "
+"-99.99 až 99.99."
 
-#: src/tags.cpp:1239
+#: src/tags.cpp:1429
 msgid ""
 "The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
 "is given in the range of 00.00 to 99.99, but it is not limited to this range."
@@ -17439,14 +21616,14 @@
 "Najmenšie číslo F šošoviek. Jednotka je hodnota APEX. Bežne sa udáva v "
 "rozsahu -99.99 až 99.99."
 
-#: src/tags.cpp:1253
+#: src/tags.cpp:1443
 msgid ""
 "This tag is recorded when an image is taken using a strobe light (flash)."
 msgstr ""
 "Táto značka sa zaznamenáva, keď je obrázok odfotený pri impulznom svetle "
 "(blesk)."
 
-#: src/tags.cpp:1256
+#: src/tags.cpp:1446
 msgid ""
 "The actual focal length of the lens, in mm. Conversion is not made to the "
 "focal length of a 35 mm film camera."
@@ -17454,18 +21631,18 @@
 "Skutočná ohnisková vzdialenosť šošoviek v mm. Nerobí sa konverzia na "
 "ohniskovú vzdialenosť fotoaparátu s 35 mm filmom."
 
-#: src/tags.cpp:1260
+#: src/tags.cpp:1450
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 "Táto značka označuje polohu a plochu hlavného subjektu v celkovej scéne."
 
-#: src/tags.cpp:1263
+#: src/tags.cpp:1453
 msgid "Maker Note"
 msgstr "Poznámka výrobcu"
 
-#: src/tags.cpp:1264
+#: src/tags.cpp:1454
 msgid ""
 "A tag for manufacturers of Exif writers to record any desired information. "
 "The contents are up to the manufacturer."
@@ -17473,51 +21650,52 @@
 "Značka pre výrobcov zariadení zapisujúcich EXIF informácie pre uloženie "
 "akejkoľvek potrebnej informácie. Obsah je na výrobcovi."
 
-#: src/tags.cpp:1268
+#: src/tags.cpp:1458
 msgid ""
 "A tag for Exif users to write keywords or comments on the image besides "
 "those in <ImageDescription>, and without the character code limitations of "
 "the <ImageDescription> tag."
 msgstr ""
 
-#: src/tags.cpp:1272
+#: src/tags.cpp:1462
+#, fuzzy
 msgid "Sub-seconds Time"
-msgstr ""
+msgstr "Pôvodný čas - zlomky sekundy"
 
-#: src/tags.cpp:1273
+#: src/tags.cpp:1463
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr "Značka, ktorá sa používa na záznam zlomkov sekundy značky <DateTime>."
 
-#: src/tags.cpp:1275
+#: src/tags.cpp:1465
 msgid "Sub-seconds Time Original"
 msgstr "Pôvodný čas - zlomky sekundy"
 
-#: src/tags.cpp:1276
+#: src/tags.cpp:1466
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 "Značka, ktorá sa používa na záznam zlomkov sekundy značky <DateTimeOriginal>."
 
-#: src/tags.cpp:1278
+#: src/tags.cpp:1468
 msgid "Sub-seconds Time Digitized"
 msgstr "Čas digitalizácie - zlomky sekundy"
 
-#: src/tags.cpp:1279
+#: src/tags.cpp:1469
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 "Značka, ktorá sa používa na záznam zlomkov sekundy značky "
 "<DateTimeDigitized>."
 
-#: src/tags.cpp:1281
+#: src/tags.cpp:1471
 msgid "FlashPix Version"
 msgstr "Verzia FlashPix"
 
-#: src/tags.cpp:1282
+#: src/tags.cpp:1472
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr "Verzia FlashPix formátu podporovaná FPXR súborom."
 
-#: src/tags.cpp:1285
+#: src/tags.cpp:1475
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB is used to define the color space based on the PC "
@@ -17532,7 +21710,7 @@
 "údajmi zaznamenanými ako Nekalibrované je možné pracovať ako s sRGB keď sa "
 "skonvertujú na FlashPix."
 
-#: src/tags.cpp:1294
+#: src/tags.cpp:1484
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -17544,7 +21722,7 @@
 "či je alebo nie je prítomná výplň alebo značka reštart. Táto značka by "
 "nemala existovať v nekomprimovanom súbore."
 
-#: src/tags.cpp:1301
+#: src/tags.cpp:1491
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
@@ -17560,7 +21738,7 @@
 "údaje v zvislom smere, počet riadkov zaznamenaných v tejto značke platnej "
 "výšky obrázka bude v skutočnosti rovnaký ako v SOF."
 
-#: src/tags.cpp:1310
+#: src/tags.cpp:1500
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
@@ -17568,11 +21746,11 @@
 "characters). The path is not recorded."
 msgstr ""
 
-#: src/tags.cpp:1316
+#: src/tags.cpp:1506
 msgid "Interoperability IFD Pointer"
 msgstr "IFD ukazovateľ interoperability"
 
-#: src/tags.cpp:1317
+#: src/tags.cpp:1507
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -17586,7 +21764,7 @@
 "definovaná v TIFF, ale neobsahuje obrazové údaje charakteristicky porovnané "
 "s normálnym TIFF IFD."
 
-#: src/tags.cpp:1325
+#: src/tags.cpp:1515
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
@@ -17594,7 +21772,7 @@
 "Označuje energiu elektronického dosvietenia v čase zachytenia obrázka meranú "
 "v Beam Candle Power Seconds (BCPS)."
 
-#: src/tags.cpp:1329
+#: src/tags.cpp:1519
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
@@ -17605,11 +21783,11 @@
 "ISO 12233."
 
 # exif-focalplanexresolution
-#: src/tags.cpp:1333
+#: src/tags.cpp:1523
 msgid "Focal Plane X-Resolution"
 msgstr "horizontálne rozlíšenie ohniskovej roviny"
 
-#: src/tags.cpp:1334
+#: src/tags.cpp:1524
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17618,11 +21796,11 @@
 "<FocalPlaneResolutionUnit> v ohniskovej rovine fotoaparátu."
 
 # exif-focalplanexresolution
-#: src/tags.cpp:1337
+#: src/tags.cpp:1527
 msgid "Focal Plane Y-Resolution"
 msgstr "horizontálne rozlíšenie ohniskovej roviny"
 
-#: src/tags.cpp:1338
+#: src/tags.cpp:1528
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
@@ -17630,7 +21808,7 @@
 "Táto značka označuje počet pixelov výšky obrázka (Y) na "
 "<FocalPlaneResolutionUnit> v ohniskovej rovine fotoaparátu."
 
-#: src/tags.cpp:1342
+#: src/tags.cpp:1532
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
@@ -17638,7 +21816,7 @@
 "Táto značka označuje jednotky, v ktorých je merané <FocalPlaneXResolution> a "
 "<FocalPlaneYResolution>. Táto hodnota je rovnaká ako <ResolutionUnit>."
 
-#: src/tags.cpp:1346
+#: src/tags.cpp:1536
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -17650,11 +21828,11 @@
 "pred procesom rotácie podľa značky <Rotation>. Prvá hodnota označuje číslo X "
 "stĺpca a druhá označuje číslo Y riadka."
 
-#: src/tags.cpp:1352
+#: src/tags.cpp:1542
 msgid "Exposure index"
 msgstr "Expozičný index"
 
-#: src/tags.cpp:1353
+#: src/tags.cpp:1543
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
@@ -17662,13 +21840,13 @@
 "Táto značka označuje expozičný index zvolený na fotoaparáte alebo vstupnom "
 "zariadení v čase zachytenia obrázka."
 
-#: src/tags.cpp:1357
+#: src/tags.cpp:1547
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 "Táto značka označuje typ obrazového snímača vstupného fotoaparátu alebo "
 "vstupného zariadenia."
 
-#: src/tags.cpp:1360
+#: src/tags.cpp:1550
 msgid ""
 "Indicates the image source. If a DSC recorded the image, this tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
@@ -17676,7 +21854,7 @@
 "Táto značka označuje zdroj obrázka. Ak obrázok zaznamenal DSC, táto značka "
 "musí byť vždy nastavená na 3, čo značí, že obrázok bol nahraný na DSC."
 
-#: src/tags.cpp:1365
+#: src/tags.cpp:1555
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
@@ -17684,11 +21862,12 @@
 "Táto značka označuje typ scény. Ak obrázok zaznamenal DSC, táto značka musí "
 "byť vždy nastavená na 1, čo značí, že obrázok bol priamo odfotografovaný."
 
-#: src/tags.cpp:1369
+#: src/tags.cpp:1559
+#, fuzzy
 msgid "Color Filter Array Pattern"
-msgstr ""
+msgstr "Farebný filter"
 
-#: src/tags.cpp:1370
+#: src/tags.cpp:1560
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
@@ -17698,7 +21877,7 @@
 "pri použití jednočipového farebného snímača oblasti. Nevzťahuje sa na všetky "
 "metódy snímania."
 
-#: src/tags.cpp:1375
+#: src/tags.cpp:1565
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
@@ -17709,7 +21888,7 @@
 "čítacieho zariadenia očakáva, že vypne alebo minimalizuje akékoľvek ďalšie "
 "spracovanie."
 
-#: src/tags.cpp:1381
+#: src/tags.cpp:1571
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
@@ -17719,13 +21898,13 @@
 "režime viacnásobných snímok so zmenou expozície fotoaparát nafotí sériu "
 "snímok rovnakej scény pri rozličných nastaveniach expozície."
 
-#: src/tags.cpp:1386
+#: src/tags.cpp:1576
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 "Táto značka označuje aký režim vyváženia bielej bol zvolený pri odfotení "
 "obrázka."
 
-#: src/tags.cpp:1389
+#: src/tags.cpp:1579
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
@@ -17734,7 +21913,7 @@
 "Táto značka označuje pomer digitálneho priblíženia v čase zachytenia snímky. "
 "Ak je zaznamenaná hodnota 0, nebolo použité digitálne priblíženie."
 
-#: src/tags.cpp:1394
+#: src/tags.cpp:1584
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
@@ -17744,7 +21923,7 @@
 "filmom. Hodnota 0 znamená, že ohnisková vzdialenosť je neznáma. Všimnite si, "
 "že táto značka sa líši od značky <FocalLength>."
 
-#: src/tags.cpp:1400
+#: src/tags.cpp:1590
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
 "record the mode in which the image was shot. Note that this differs from the "
@@ -17754,11 +21933,11 @@
 "zaznamenanie režimu, v ktorom bol obrázok odfotený. Všimnite si, že táto "
 "značka sa líši od značky <SceneType>."
 
-#: src/tags.cpp:1405
+#: src/tags.cpp:1595
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr "Táto značka označuje stupeň celkového zosilnenia obrazu."
 
-#: src/tags.cpp:1408
+#: src/tags.cpp:1598
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
@@ -17766,7 +21945,7 @@
 "Táto značka označuje smer spracovania kontrastu, ktorý použil fotoaparát pri "
 "zachytení obrázka."
 
-#: src/tags.cpp:1412
+#: src/tags.cpp:1602
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
@@ -17774,7 +21953,7 @@
 "Táto značka označuje smer spracovania sýtosti, ktorý použil fotoaparát pri "
 "zachytení obrázka."
 
-#: src/tags.cpp:1416
+#: src/tags.cpp:1606
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
@@ -17782,7 +21961,7 @@
 "Táto značka označuje smer spracovania ostrosti, ktorý použil fotoaparát pri "
 "zachytení obrázka."
 
-#: src/tags.cpp:1420
+#: src/tags.cpp:1610
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
@@ -17792,11 +21971,11 @@
 "modelom fotoaparátu. Značka sa používa iba na označenie podmienok "
 "fotografovania v čítacom zariadení."
 
-#: src/tags.cpp:1425
+#: src/tags.cpp:1615
 msgid "This tag indicates the distance to the subject."
 msgstr "Táto značka označuje vzdialenosť k subjektu."
 
-#: src/tags.cpp:1428
+#: src/tags.cpp:1618
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
@@ -17806,91 +21985,91 @@
 "zaznamenaný ako ASCII reťazec zodpovedajúci hexadecimálnemu zápisu 128-"
 "bitového čísla."
 
-#: src/tags.cpp:1433 src/tags.cpp:1434
+#: src/tags.cpp:1623 src/tags.cpp:1624
 msgid "Unknown Exif tag"
 msgstr "Neznáma značka EXIF"
 
-#: src/tags.cpp:1445
+#: src/tags.cpp:1635
 msgid "North"
 msgstr "Sever"
 
-#: src/tags.cpp:1446
+#: src/tags.cpp:1636
 msgid "South"
 msgstr "Juh"
 
-#: src/tags.cpp:1451
+#: src/tags.cpp:1641
 msgid "East"
 msgstr "Východ"
 
-#: src/tags.cpp:1452
+#: src/tags.cpp:1642
 msgid "West"
 msgstr "Západ"
 
-#: src/tags.cpp:1457
+#: src/tags.cpp:1647
 msgid "Above sea level"
 msgstr "nad hladinou mora"
 
-#: src/tags.cpp:1458
+#: src/tags.cpp:1648
 msgid "Below sea level"
 msgstr "Pod hladinou mora"
 
-#: src/tags.cpp:1463
+#: src/tags.cpp:1653
 msgid "Measurement in progress"
 msgstr "Prebieha meranie"
 
-#: src/tags.cpp:1464
+#: src/tags.cpp:1654
 msgid "Measurement Interoperability"
 msgstr "Interoperabilita merania"
 
-#: src/tags.cpp:1469
+#: src/tags.cpp:1659
 msgid "Two-dimensional measurement"
 msgstr "Dvojrozmerné meranie"
 
-#: src/tags.cpp:1470
+#: src/tags.cpp:1660
 msgid "Three-dimensional measurement"
 msgstr "Trojrozmerné meranie"
 
-#: src/tags.cpp:1475
+#: src/tags.cpp:1665
 msgid "km/h"
 msgstr "km/h"
 
-#: src/tags.cpp:1476
+#: src/tags.cpp:1666
 msgid "mph"
 msgstr "míľ za hodinu"
 
-#: src/tags.cpp:1477
+#: src/tags.cpp:1667
 msgid "knots"
 msgstr "uzlov"
 
-#: src/tags.cpp:1482
+#: src/tags.cpp:1672
 msgid "True direction"
 msgstr "Skutočný smer"
 
-#: src/tags.cpp:1483
+#: src/tags.cpp:1673
 msgid "Magnetic direction"
 msgstr "Magnetický smer"
 
-#: src/tags.cpp:1488
+#: src/tags.cpp:1678
 msgid "Kilometers"
 msgstr "Kilometrov"
 
-#: src/tags.cpp:1489
+#: src/tags.cpp:1679
 msgid "Miles"
 msgstr "Míľ"
 
-#: src/tags.cpp:1490
+#: src/tags.cpp:1680
 msgid "Knots"
 msgstr "Uzlov"
 
-#: src/tags.cpp:1495
+#: src/tags.cpp:1685
 msgid "Without correction"
 msgstr "Bez korekcie"
 
-#: src/tags.cpp:1496
+#: src/tags.cpp:1686
 msgid "Correction applied"
 msgstr "S korekciou"
 
-#: src/tags.cpp:1502
+#: src/tags.cpp:1692
 msgid ""
 "Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
 "tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
@@ -17902,11 +22081,11 @@
 "uvedená v bajtoch na rozdiel od značky <ExifVersion>. Keď je verzia 2.0.0.0, "
 "hodnota značky je 02000000.H)."
 
-#: src/tags.cpp:1508
+#: src/tags.cpp:1698
 msgid "GPS Latitude Reference"
 msgstr "GPS referencia zemepisnej šírky"
 
-#: src/tags.cpp:1509
+#: src/tags.cpp:1699
 msgid ""
 "Indicates whether the latitude is north or south latitude. The ASCII value "
 "'N' indicates north latitude, and 'S' is south latitude."
@@ -17914,7 +22093,7 @@
 "Označuje, či je zemepisná šírka severná alebo južná šírka. ASCII hodnota „N“ "
 "označuje severnú šírku a „S“ južnú šírku."
 
-#: src/tags.cpp:1513
+#: src/tags.cpp:1703
 msgid ""
 "Indicates the latitude. The latitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17928,11 +22107,11 @@
 "napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,"
 "mmmm/100,0/1."
 
-#: src/tags.cpp:1520
+#: src/tags.cpp:1710
 msgid "GPS Longitude Reference"
 msgstr "GPS referencia zemepisnej dĺžky"
 
-#: src/tags.cpp:1521
+#: src/tags.cpp:1711
 msgid ""
 "Indicates whether the longitude is east or west longitude. ASCII 'E' "
 "indicates east longitude, and 'W' is west longitude."
@@ -17940,7 +22119,7 @@
 "Označuje, či je zemepisná dĺžka východná alebo západná dĺžka. ASCII hodnota "
 "„E“ označuje východnú dĺžku a „W“ západnú dĺžku."
 
-#: src/tags.cpp:1525
+#: src/tags.cpp:1715
 msgid ""
 "Indicates the longitude. The longitude is expressed as three RATIONAL values "
 "giving the degrees, minutes, and seconds, respectively. When degrees, "
@@ -17954,7 +22133,7 @@
 "napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,"
 "mmmm/100,0/1."
 
-#: src/tags.cpp:1533
+#: src/tags.cpp:1723
 msgid ""
 "Indicates the altitude used as the reference altitude. If the reference is "
 "sea level and the altitude is above sea level, 0 is given. If the altitude "
@@ -17969,7 +22148,7 @@
 "Referenčná jednotka sú metre. Všimnite si, že táto značka je typu BAJT na "
 "rozdiel od iných referenčných značiek."
 
-#: src/tags.cpp:1541
+#: src/tags.cpp:1731
 msgid ""
 "Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
 "expressed as one RATIONAL value. The reference unit is meters."
@@ -17978,14 +22157,14 @@
 "výška je vyjadrená ako jedna RACIONÁLNA hodnota. Referenčná jednotka sú "
 "metre."
 
-#: src/tags.cpp:1545
+#: src/tags.cpp:1735
 msgid ""
 "Indicates the time as UTC (Coordinated Universal Time). <TimeStamp> is "
 "expressed as three RATIONAL values giving the hour, minute, and second "
 "(atomic clock)."
 msgstr ""
 
-#: src/tags.cpp:1550
+#: src/tags.cpp:1740
 msgid ""
 "Indicates the GPS satellites used for measurements. This tag can be used to "
 "describe the number of satellites, their ID number, angle of elevation, "
@@ -17994,80 +22173,81 @@
 "the tag is set to NULL."
 msgstr ""
 
-#: src/tags.cpp:1557
+#: src/tags.cpp:1747
 msgid ""
 "Indicates the status of the GPS receiver when the image is recorded. \"A\" "
 "means measurement is in progress, and \"V\" means the measurement is "
 "Interoperability."
 msgstr ""
 
-#: src/tags.cpp:1562
+#: src/tags.cpp:1752
 msgid ""
 "Indicates the GPS measurement mode. \"2\" means two-dimensional measurement "
 "and \"3\" means three-dimensional measurement is in progress."
 msgstr ""
 
-#: src/tags.cpp:1565
+#: src/tags.cpp:1755
 msgid "GPS Data Degree of Precision"
 msgstr "Stupeň presnosti GPS údajov"
 
-#: src/tags.cpp:1566
+#: src/tags.cpp:1756
 msgid ""
 "Indicates the GPS DOP (data degree of precision). An HDOP value is written "
 "during two-dimensional measurement, and PDOP during three-dimensional "
 "measurement."
 msgstr ""
 
-#: src/tags.cpp:1570
+#: src/tags.cpp:1760
 msgid ""
 "Indicates the unit used to express the GPS receiver speed of movement. \"K\" "
 "\"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."
 msgstr ""
 
-#: src/tags.cpp:1574
+#: src/tags.cpp:1764
 msgid "Indicates the speed of GPS receiver movement."
 msgstr "Označuje rýchlosť pohybu GPS prijímača."
 
-#: src/tags.cpp:1576
+#: src/tags.cpp:1766
 msgid "GPS Track Ref"
 msgstr ""
 
-#: src/tags.cpp:1577
+#: src/tags.cpp:1767
 msgid ""
 "Indicates the reference for giving the direction of GPS receiver movement. "
 "\"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1581
+#: src/tags.cpp:1771
 msgid ""
 "Indicates the direction of GPS receiver movement. The range of values is "
 "from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1585
+#: src/tags.cpp:1775
 msgid ""
 "Indicates the reference for giving the direction of the image when it is "
 "captured. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1589
+#: src/tags.cpp:1779
 msgid ""
 "Indicates the direction of the image when it was captured. The range of "
 "values is from 0.00 to 359.99."
 msgstr ""
 
-#: src/tags.cpp:1593
+#: src/tags.cpp:1783
 msgid ""
 "Indicates the geodetic survey data used by the GPS receiver. If the survey "
-"data is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84"
-"\"."
+"data is restricted to Japan, the value of this tag is \"TOKYO\" or "
+"\"WGS-84\"."
 msgstr ""
 
-#: src/tags.cpp:1596
+#: src/tags.cpp:1786
+#, fuzzy
 msgid "GPS Destination Latitude Refeference"
-msgstr ""
+msgstr "GPS referencia zemepisnej šírky"
 
-#: src/tags.cpp:1597
+#: src/tags.cpp:1787
 msgid ""
 "Indicates whether the latitude of the destination point is north or south "
 "latitude. The ASCII value \"N\" indicates north latitude, and \"S\" is south "
@@ -18076,7 +22256,7 @@
 "Označuje, či je zemepisná šírka severná alebo južná šírka. ASCII hodnota „N“ "
 "označuje severnú šírku a „S“ južnú šírku."
 
-#: src/tags.cpp:1601
+#: src/tags.cpp:1791
 msgid ""
 "Indicates the latitude of the destination point. The latitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -18091,11 +22271,12 @@
 "napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,"
 "mmmm/100,0/1."
 
-#: src/tags.cpp:1608
+#: src/tags.cpp:1798
+#, fuzzy
 msgid "GPS Destination Longitude Reference"
-msgstr ""
+msgstr "GPS referencia zemepisnej dĺžky"
 
-#: src/tags.cpp:1609
+#: src/tags.cpp:1799
 msgid ""
 "Indicates whether the longitude of the destination point is east or west "
 "longitude. ASCII \"E\" indicates east longitude, and \"W\" is west longitude."
@@ -18103,7 +22284,7 @@
 "Označuje, či je zemepisná dĺžka východná alebo západná dĺžka. ASCII hodnota "
 "„E“ označuje východnú dĺžku a „W“ západnú dĺžku."
 
-#: src/tags.cpp:1613
+#: src/tags.cpp:1803
 msgid ""
 "Indicates the longitude of the destination point. The longitude is expressed "
 "as three RATIONAL values giving the degrees, minutes, and seconds, "
@@ -18118,70 +22299,73 @@
 "napr. zlomky minút sú zadané na dve desatinné miesta, formát je ddd/1,"
 "mmmm/100,0/1."
 
-#: src/tags.cpp:1620
+#: src/tags.cpp:1810
 msgid ""
 "Indicates the reference used for giving the bearing to the destination "
 "point. \"T\" denotes true direction and \"M\" is magnetic direction."
 msgstr ""
 
-#: src/tags.cpp:1624
+#: src/tags.cpp:1814
+#, fuzzy
 msgid ""
 "Indicates the bearing to the destination point. The range of values is from "
 "0.00 to 359.99."
-msgstr ""
+msgstr "Táto značka označuje vzdialenosť k cieľovému bodu."
 
-#: src/tags.cpp:1627
+#: src/tags.cpp:1817
+#, fuzzy
 msgid "GPS Destination Distance Reference"
-msgstr ""
+msgstr "GPS Vzdialenosť cieľa"
 
-#: src/tags.cpp:1628
+#: src/tags.cpp:1818
 msgid ""
 "Indicates the unit used to express the distance to the destination point. \"K"
 "\", \"M\" and \"N\" represent kilometers, miles and knots."
 msgstr ""
 
-#: src/tags.cpp:1632
+#: src/tags.cpp:1822
 msgid "Indicates the distance to the destination point."
 msgstr "Táto značka označuje vzdialenosť k cieľovému bodu."
 
-#: src/tags.cpp:1635
+#: src/tags.cpp:1825
 msgid ""
 "A character string recording the name of the method used for location "
 "finding. The first byte indicates the character code used, and this is "
 "followed by the name of the method."
 msgstr ""
 
-#: src/tags.cpp:1640
+#: src/tags.cpp:1830
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
 "indicates the character code used, and this is followed by the name of the "
 "GPS area."
 msgstr ""
 
-#: src/tags.cpp:1643
+#: src/tags.cpp:1833
+#, fuzzy
 msgid "GPS Date Stamp"
-msgstr ""
+msgstr "Dátum odoslania"
 
-#: src/tags.cpp:1644
+#: src/tags.cpp:1834
 msgid ""
 "A character string recording date and time information relative to UTC "
 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."
 msgstr ""
 
-#: src/tags.cpp:1648
+#: src/tags.cpp:1838
 msgid ""
 "Indicates whether differential correction is applied to the GPS receiver."
 msgstr ""
 
-#: src/tags.cpp:1651 src/tags.cpp:1652
+#: src/tags.cpp:1841 src/tags.cpp:1842
 msgid "Unknown GPSInfo tag"
 msgstr "Neznáma značka GPSInfo"
 
-#: src/tags.cpp:1663
+#: src/tags.cpp:1853
 msgid "Interoperability Index"
 msgstr "Index interoperability"
 
-#: src/tags.cpp:1664
+#: src/tags.cpp:1854
 msgid ""
 "Indicates the identification of the Interoperability rule. Use \"R98\" for "
 "stating ExifR98 Rules. Four bytes used including the termination code "
@@ -18193,82 +22377,95 @@
 "znaku (NULL). Ďalšie značky použité v ExifR98 nájdete v samostatnom zväzku "
 "Recommended Exif Interoperability Rules (ExifR98)."
 
-#: src/tags.cpp:1670
+#: src/tags.cpp:1860
 msgid "Interoperability Version"
 msgstr "Verzia interoperability"
 
-#: src/tags.cpp:1671
+#: src/tags.cpp:1861
 msgid "Interoperability version"
 msgstr "Verzia interoperability"
 
-#: src/tags.cpp:1673
+#: src/tags.cpp:1863
 msgid "Related Image File Format"
 msgstr "Súvisiaci formát súboru obrázka"
 
-#: src/tags.cpp:1674
+#: src/tags.cpp:1864
 msgid "File format of image file"
 msgstr "Formát súboru s obrázkom"
 
-#: src/tags.cpp:1676
+#: src/tags.cpp:1866
 msgid "Related Image Width"
 msgstr "Šírka súvisiaceho obrázka"
 
-#: src/tags.cpp:1679
+#: src/tags.cpp:1869
 msgid "Related Image Length"
 msgstr "Dĺžka súvisiaceho obrázka"
 
-#: src/tags.cpp:1683 src/tags.cpp:1684
+#: src/tags.cpp:1873 src/tags.cpp:1874
 msgid "Unknown Exif Interoperability tag"
 msgstr "Neznáma EXIF značka Interoperability"
 
-#: src/tags.cpp:1695
+#: src/tags.cpp:1885
 msgid "Offset"
 msgstr "Ofset"
 
-#: src/tags.cpp:1696
+#: src/tags.cpp:1886
 msgid "Offset of the makernote from the start of the TIFF header."
 msgstr ""
 
-#: src/tags.cpp:1698
+#: src/tags.cpp:1888
 msgid "Byte Order"
 msgstr "Endianita"
 
-#: src/tags.cpp:1699
+#: src/tags.cpp:1889
 msgid ""
 "Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-"
 "endian)."
 msgstr ""
 
-#: src/tags.cpp:1702 src/tags.cpp:1703
+#: src/tags.cpp:1892 src/tags.cpp:1893
 msgid "Unknown Exiv2 Makernote info tag"
 msgstr "Neznáma značka Exiv2 MakerNote"
 
-#: src/tags.cpp:1713 src/tags.cpp:1714
+#: src/tags.cpp:1903 src/tags.cpp:1904
 msgid "Unknown tag"
 msgstr "Neznáma značka"
 
-#: src/tags.cpp:2572
+#: src/tags.cpp:2486
 msgid "Digital zoom not used"
 msgstr "Digitálne priblíženie nebolo použité"
 
-#: src/tiffimage.cpp:1445
+#: src/tiffimage.cpp:1983
 msgid "TIFF header, offset"
 msgstr "Hlavička TIFF, ofset"
 
-#: src/tiffimage.cpp:1450
+#: src/tiffimage.cpp:1988
 msgid "little endian encoded"
 msgstr ""
 
-#: src/tiffimage.cpp:1451
+#: src/tiffimage.cpp:1989
 msgid "big endian encoded"
 msgstr ""
 
+#~ msgid "Software firmware version"
+#~ msgstr "Verzia formvéru"
+
+#, fuzzy
+#~ msgid "White Balance Bracketing "
+#~ msgstr "Viacnásobné snímky so zmenou vyváženia bielej"
+
+#~ msgid "(Unknown Error)"
+#~ msgstr "(Neznáma chyba)"
+
+#~ msgid "Exposure Speed"
+#~ msgstr "Rýchlosť expozície"
+
+#~ msgid "Exposure speed"
+#~ msgstr "Rýchlosť expozície"
+
 #~ msgid "Color balance settings 1"
 #~ msgstr "Nastavenie vyváženia farieb 1"
 
-#~ msgid "Tone curve"
-#~ msgstr "Krivka tónu"
-
 #~ msgid "Compression Curve"
 #~ msgstr "Kompresná krivka"
 
@@ -18284,9 +22481,6 @@
 #~ msgid "On for ISO 1600/3200"
 #~ msgstr "Zapnuté pre ISO 1600/3200"
 
-#~ msgid "Spot Mode"
-#~ msgstr "Bodový režim"
-
 #~ msgid "ImageStabilizer"
 #~ msgstr "Stabilizátor obrazu"
 
@@ -18323,10 +22517,6 @@
 #~ msgid "component"
 #~ msgstr "komponent"
 
-# exif-meteringmode-4
-#~ msgid "element"
-#~ msgstr "element"
-
 #~ msgid "NEF Thumbnail Size"
 #~ msgstr "Veľkosť náhľadu NEF"
 
diff -Nru exiv2-0.19/README exiv2-0.21/README
--- exiv2-0.19/README	2009-12-30 06:26:57.000000000 +0000
+++ exiv2-0.21/README	2010-05-29 12:55:47.000000000 +0000
@@ -135,7 +135,7 @@
 License
 =======
 
-Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 
 Exiv2 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
@@ -165,6 +165,6 @@
 commercial version of the Exiv2 library.
 
 To do this on Windows, compile the library with the preprocessor
-symbol EXV_COMMERCIAL_VERSION defined in the file src\exv_msvc.h.
+symbol EXV_COMMERCIAL_VERSION defined in msvc\include\exv_msvc.h.
 On UNIX-like systems, run the configure script with the options
 --enable-commercial --disable-nls --disable-lensdata
diff -Nru exiv2-0.19/samples/addmoddel.cpp exiv2-0.21/samples/addmoddel.cpp
--- exiv2-0.19/samples/addmoddel.cpp	2007-10-08 09:17:20.000000000 +0000
+++ exiv2-0.21/samples/addmoddel.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,9 @@
 // ***************************************************************** -*- C++ -*-
-// addmoddel.cpp, $Rev: 1271 $
+// addmoddel.cpp, $Rev: 2286 $
 // Sample program showing how to add, modify and delete Exif metadata.
 
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
diff -Nru exiv2-0.19/samples/convert-test.cpp exiv2-0.21/samples/convert-test.cpp
--- exiv2-0.19/samples/convert-test.cpp	2008-03-17 15:45:27.000000000 +0000
+++ exiv2-0.21/samples/convert-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,9 @@
 // ***************************************************************** -*- C++ -*-
-// convert-test.cpp, $Rev: 1398 $
+// convert-test.cpp, $Rev: 2286 $
 // Conversion test driver - make sure you have a copy of the input file around!
 
-#include <exiv2/image.hpp>
-#include <exiv2/convert.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
diff -Nru exiv2-0.19/samples/easyaccess-test.cpp exiv2-0.21/samples/easyaccess-test.cpp
--- exiv2-0.19/samples/easyaccess-test.cpp	2009-03-07 15:26:00.000000000 +0000
+++ exiv2-0.21/samples/easyaccess-test.cpp	2010-11-22 14:46:09.000000000 +0000
@@ -1,11 +1,10 @@
 // ***************************************************************** -*- C++ -*-
-// easyaccess-test.cpp, $Rev: 1760 $
+// easyaccess-test.cpp, $Rev: 2380 $
 // Sample program using high-level metadata access functions
 
 // included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
-#include <exiv2/easyaccess.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
@@ -18,15 +17,28 @@
 };
 
 static const EasyAccess easyAccess[] = {
-    { "Orientation",   Exiv2::orientation  },
-    { "ISO speed",     Exiv2::isoSpeed     },
-    { "Flash bias",    Exiv2::flashBias    },
-    { "Exposure mode", Exiv2::exposureMode },
-    { "Scene mode",    Exiv2::sceneMode    },
-    { "Macro mode",    Exiv2::macroMode    },
-    { "Image quality", Exiv2::imageQuality },
-    { "White balance", Exiv2::whiteBalance },
-    { "Lens name",     Exiv2::lensName     }
+    { "Orientation",          Exiv2::orientation      },
+    { "ISO speed",            Exiv2::isoSpeed         },
+    { "Flash bias",           Exiv2::flashBias        },
+    { "Exposure mode",        Exiv2::exposureMode     },
+    { "Scene mode",           Exiv2::sceneMode        },
+    { "Macro mode",           Exiv2::macroMode        },
+    { "Image quality",        Exiv2::imageQuality     },
+    { "White balance",        Exiv2::whiteBalance     },
+    { "Lens name",            Exiv2::lensName         },
+    { "Saturation",           Exiv2::saturation       },
+    { "Sharpness",            Exiv2::sharpness        },
+    { "Contrast",             Exiv2::contrast         },
+    { "Scene capture type",   Exiv2::sceneCaptureType },
+    { "Metering mode",        Exiv2::meteringMode     },
+    { "Camera make",          Exiv2::make             },
+    { "Camera model",         Exiv2::model            },
+    { "Exposure time",        Exiv2::exposureTime     },
+    { "FNumber",              Exiv2::fNumber          },
+    { "Subject distance",     Exiv2::subjectDistance  },
+    { "Camera serial number", Exiv2::serialNumber     },
+    { "Focal length",         Exiv2::focalLength      },
+    { "AF point",             Exiv2::afPoint          }
 };
 
 int main(int argc, char **argv)
@@ -43,11 +55,14 @@
 
     for (unsigned int i = 0; i < EXV_COUNTOF(easyAccess); ++i) {
         Exiv2::ExifData::const_iterator pos = easyAccess[i].findFct_(ed);
+        std::cout << std::setw(20) << std::left << easyAccess[i].label_;
         if (pos != ed.end()) {
-            std::cout << std::setw(13) << std::left << easyAccess[i].label_ << " ("
-                      << std::setw(30) << pos->key() << ") : "
+            std::cout << " (" << std::setw(35) << pos->key() << ") : "
                       << pos->print(&ed) << "\n";
         }
+        else {
+            std::cout << " (" << std::setw(35) << " " << ") : \n";
+        }
     }
 
     return 0;
diff -Nru exiv2-0.19/samples/exifcomment.cpp exiv2-0.21/samples/exifcomment.cpp
--- exiv2-0.19/samples/exifcomment.cpp	2007-10-08 09:17:20.000000000 +0000
+++ exiv2-0.21/samples/exifcomment.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -4,15 +4,15 @@
              Exif.Photo.UserComment
 
   File:      exifcomment.cpp
-  Version  : $Rev: 1271 $
+  Version  : $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History  : 10-May-04, ahu: created
              16-Jan-05, ahu: updated using CommentValue and operator trickery
  */
 // *****************************************************************************
 // included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <cassert>
 
diff -Nru exiv2-0.19/samples/exifdata-test.cpp exiv2-0.21/samples/exifdata-test.cpp
--- exiv2-0.19/samples/exifdata-test.cpp	2008-06-21 10:28:17.000000000 +0000
+++ exiv2-0.21/samples/exifdata-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -3,15 +3,15 @@
   Abstract : ExifData assignment and copy construction unit tests
 
   File     : exifdata-test.cpp
-  Version  : $Rev: 1512 $
+  Version  : $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History  : 20-Feb-05, ahu: created
 
  */
 // *****************************************************************************
 // included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <string>
diff -Nru exiv2-0.19/samples/exifprint.cpp exiv2-0.21/samples/exifprint.cpp
--- exiv2-0.19/samples/exifprint.cpp	2009-03-07 03:23:38.000000000 +0000
+++ exiv2-0.21/samples/exifprint.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,9 @@
 // ***************************************************************** -*- C++ -*-
-// exifprint.cpp, $Rev: 1757 $
+// exifprint.cpp, $Rev: 2286 $
 // Sample program to print the Exif metadata of an image
 
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
@@ -44,7 +44,9 @@
 
     return 0;
 }
-catch (Exiv2::AnyError& e) {
-    std::cout << "Caught Exiv2 exception '" << e << "'\n";
+//catch (std::exception& e) {
+//catch (Exiv2::AnyError& e) {
+catch (Exiv2::Error& e) {
+    std::cout << "Caught Exiv2 exception '" << e.what() << "'\n";
     return -1;
 }
diff -Nru exiv2-0.19/samples/iotest.cpp exiv2-0.21/samples/iotest.cpp
--- exiv2-0.19/samples/iotest.cpp	2009-12-28 14:11:23.000000000 +0000
+++ exiv2-0.21/samples/iotest.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -23,16 +23,14 @@
         since FileIo just sits atop of FILE* streams.
 
   File     : iotest.cpp
-  Version  : $Rev: 1976 $
+  Version  : $Rev: 2286 $
   Author(s): Brad Schick (brad) <brad@robotbattle.com>
   History  : 04-Dec-04, brad: created
  */
 // *****************************************************************************
 // included header files
-#include <exiv2/types.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/futils.hpp>
-#include <exiv2/basicio.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <cstdio>                               // for EOF
 #include <cstring>
 #include <iostream>
diff -Nru exiv2-0.19/samples/iptceasy.cpp exiv2-0.21/samples/iptceasy.cpp
--- exiv2-0.19/samples/iptceasy.cpp	2008-12-15 16:24:37.000000000 +0000
+++ exiv2-0.21/samples/iptceasy.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,9 @@
 // ***************************************************************** -*- C++ -*-
-// iptceasy.cpp, $Rev: 1703 $
+// iptceasy.cpp, $Rev: 2286 $
 // The quickest way to access, set or modify IPTC metadata.
 
-#include <exiv2/iptc.hpp>
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
diff -Nru exiv2-0.19/samples/iptcprint.cpp exiv2-0.21/samples/iptcprint.cpp
--- exiv2-0.19/samples/iptcprint.cpp	2007-11-25 14:40:18.000000000 +0000
+++ exiv2-0.21/samples/iptcprint.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,9 @@
 // ***************************************************************** -*- C++ -*-
-// iptcprint.cpp, $Rev: 1328 $
+// iptcprint.cpp, $Rev: 2286 $
 // Sample program to print the IPTC metadata of an image
 
-#include <exiv2/image.hpp>
-#include <exiv2/iptc.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
diff -Nru exiv2-0.19/samples/iptctest.cpp exiv2-0.21/samples/iptctest.cpp
--- exiv2-0.19/samples/iptctest.cpp	2007-10-08 09:17:20.000000000 +0000
+++ exiv2-0.21/samples/iptctest.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -4,16 +4,14 @@
              This is not designed to be a robust application.
 
   File     : iptctest.cpp
-  Version  : $Rev: 1271 $
+  Version  : $Rev: 2286 $
   Author(s): Brad Schick (brad) <brad@robotbattle.com>
   History  : 01-Aug-04, brad: created
  */
 // *****************************************************************************
 // included header files
-#include <exiv2/image.hpp>
-#include <exiv2/iptc.hpp>
-#include <exiv2/datasets.hpp>
-#include <exiv2/value.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>
diff -Nru exiv2-0.19/samples/key-test.cpp exiv2-0.21/samples/key-test.cpp
--- exiv2-0.19/samples/key-test.cpp	2008-06-21 10:28:17.000000000 +0000
+++ exiv2-0.21/samples/key-test.cpp	2010-09-19 10:57:47.000000000 +0000
@@ -3,17 +3,18 @@
   Abstract : Key unit tests
 
   File     : key-test.cpp
-  Version  : $Rev: 1512 $
+  Version  : $Rev: 2348 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History  : 24-Aug-04, ahu: created
 
  */
 // *****************************************************************************
 // included header files
-#include <exiv2/exif.hpp>
-#include <exiv2/iptc.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <string>
+#include <cstring>
 
 using namespace Exiv2;
 
@@ -59,13 +60,13 @@
     }
     // ifdName
     tc += 1;
-    if (std::string(ek.ifdName()) != "Iop") {
+    if (std::string(ExifTags::ifdName(ek.groupName())) != "Iop") {
         std::cout << "Testcase failed (ifdName: " << std::endl;
         rc += 1;
     }
     // sectionName
     tc += 1;
-    if (ek.sectionName() != "Interoperability") {
+    if (strcmp(ExifTags::sectionName(ek), "Interoperability") != 0) {
         std::cout << "Testcase failed (sectionName)" << std::endl;
         rc += 1;
     }
@@ -109,13 +110,13 @@
     }
     // ifdName
     tc += 1;
-    if (std::string(ek2.ifdName()) != "Iop") {
+    if (std::string(ExifTags::ifdName(ek2.groupName())) != "Iop") {
         std::cout << "Testcase failed (ifdName: " << std::endl;
         rc += 1;
     }
     // sectionName
     tc += 1;
-    if (ek2.sectionName() != "Interoperability") {
+    if (strcmp(ExifTags::sectionName(ek2), "Interoperability") != 0) {
         std::cout << "Testcase failed (sectionName)" << std::endl;
         rc += 1;
     }
diff -Nru exiv2-0.19/samples/largeiptc-test.cpp exiv2-0.21/samples/largeiptc-test.cpp
--- exiv2-0.19/samples/largeiptc-test.cpp	2008-06-21 10:28:17.000000000 +0000
+++ exiv2-0.21/samples/largeiptc-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,10 +1,8 @@
 // ***************************************************************** -*- C++ -*-
 // Test for large (>65535 bytes) IPTC buffer
 
-#include <exiv2/iptc.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/jpgimage.hpp>
-#include <exiv2/futils.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <cassert>
 
diff -Nru exiv2-0.19/samples/Makefile exiv2-0.21/samples/Makefile
--- exiv2-0.19/samples/Makefile	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/samples/Makefile	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ************************************************************* -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      Makefile
-# Version:   $Rev: 1937 $
+# Version:   $Rev: 2045 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   08-Oct-07, ahu: created
 #
@@ -70,6 +70,7 @@
          prevtest.cpp         \
          stringto-test.cpp    \
          tiff-test.cpp        \
+         werror-test.cpp      \
          write-test.cpp       \
          write2-test.cpp      \
          xmpparse.cpp         \
diff -Nru exiv2-0.19/samples/mmap-test.cpp exiv2-0.21/samples/mmap-test.cpp
--- exiv2-0.19/samples/mmap-test.cpp	2009-12-27 09:56:29.000000000 +0000
+++ exiv2-0.21/samples/mmap-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,10 +1,8 @@
 // ***************************************************************** -*- C++ -*-
-// mmap-test.cpp, $Rev: 1967 $
+// mmap-test.cpp, $Rev: 2286 $
 // Simple mmap tests
 
-#include <exiv2/basicio.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/futils.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <iostream>
 #include <cstring>
diff -Nru exiv2-0.19/samples/prevtest.cpp exiv2-0.21/samples/prevtest.cpp
--- exiv2-0.19/samples/prevtest.cpp	2008-10-15 10:42:26.000000000 +0000
+++ exiv2-0.21/samples/prevtest.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,8 @@
 // ***************************************************************** -*- C++ -*-
-// prevtest.cpp, $Rev: 1629 $
+// prevtest.cpp, $Rev: 2286 $
 // Test access to preview images
 
-#include <exiv2/image.hpp>
-#include <exiv2/preview.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <string>
 #include <iostream>
diff -Nru exiv2-0.19/samples/stringto-test.cpp exiv2-0.21/samples/stringto-test.cpp
--- exiv2-0.19/samples/stringto-test.cpp	2008-03-05 07:45:16.000000000 +0000
+++ exiv2-0.21/samples/stringto-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,9 @@
 // ***************************************************************** -*- C++ -*-
-// stringto-test.cpp, $Rev: 1392 $
+// stringto-test.cpp, $Rev: 2286 $
 // Test conversions from string to long, float and Rational types.
 
-#include <exiv2/types.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 
diff -Nru exiv2-0.19/samples/tiff-test.cpp exiv2-0.21/samples/tiff-test.cpp
--- exiv2-0.19/samples/tiff-test.cpp	2008-12-15 16:24:37.000000000 +0000
+++ exiv2-0.21/samples/tiff-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,10 +1,8 @@
 // ***************************************************************** -*- C++ -*-
-// tiff-test.cpp, $Rev: 1703 $
+// tiff-test.cpp, $Rev: 2286 $
 // First and very simple TIFF write test.
 
-#include <exiv2/tiffimage.hpp>
-#include <exiv2/exif.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <string>
 #include <iostream>
diff -Nru exiv2-0.19/samples/werror-test.cpp exiv2-0.21/samples/werror-test.cpp
--- exiv2-0.19/samples/werror-test.cpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/samples/werror-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -0,0 +1,29 @@
+// ***************************************************************** -*- C++ -*-
+// werror-test.cpp, $Rev: 2286 $
+// Simple tests for the wide-string error class WError
+
+#include <iostream>
+#include <exiv2/exiv2.hpp>
+
+int main()
+{
+    try {
+        throw Exiv2::Error(-1, "ARG1", "ARG2", "ARG3");
+    }
+    catch (const Exiv2::Error& e) {
+        std::cout << "Caught Error '" << e.what() << "'\n";
+    }
+
+#ifdef EXV_UNICODE_PATH
+    try {
+        throw Exiv2::WError(-1, L"WARG1", L"WARG2", L"WARG3");
+    }
+    catch (const Exiv2::WError& e) {
+        std::wstring wmsg = e.wwhat();
+        std::string msg(wmsg.begin(), wmsg.end());
+        std::cout << "Caught WError '" << msg << "'\n";
+    }
+#endif
+
+    return 0;
+}
diff -Nru exiv2-0.19/samples/write2-test.cpp exiv2-0.21/samples/write2-test.cpp
--- exiv2-0.19/samples/write2-test.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/samples/write2-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -3,15 +3,15 @@
   Abstract : ExifData write unit tests for Exif data created from scratch
 
   File     : write2-test.cpp
-  Version  : $Rev: 1937 $
+  Version  : $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History  : 26-Jun-04, ahu: created
 
  */
 // *****************************************************************************
 // included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <string>
@@ -140,11 +140,11 @@
     write(file, edMn8);
     print(file);
 
-    std::cout <<"\n----- One Sony MakerNote tag\n";
+    std::cout <<"\n----- One Sony1 MakerNote tag\n";
     Exiv2::ExifData edMn9;
     edMn9["Exif.Image.Make"]      = "SONY";
     edMn9["Exif.Image.Model"]     = "DSC-W7";
-    edMn9["Exif.Sony.0x2000"] = "0 1 2 3 4 5";
+    edMn9["Exif.Sony1.0x2000"] = "0 1 2 3 4 5";
     write(file, edMn9);
     print(file);
 
diff -Nru exiv2-0.19/samples/write-test.cpp exiv2-0.21/samples/write-test.cpp
--- exiv2-0.19/samples/write-test.cpp	2008-06-21 10:28:17.000000000 +0000
+++ exiv2-0.21/samples/write-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -3,7 +3,7 @@
   Abstract : ExifData write unit tests
 
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
-  Version  : $Rev: 1512 $
+  Version  : $Rev: 2286 $
 
   Test procedure:
    $ rm -f test.jpg thumb.jpg iii ttt;
@@ -15,8 +15,7 @@
  */
 // *****************************************************************************
 // included header files
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <iostream>
 #include <sstream>
diff -Nru exiv2-0.19/samples/xmpparse.cpp exiv2-0.21/samples/xmpparse.cpp
--- exiv2-0.19/samples/xmpparse.cpp	2007-10-08 09:17:20.000000000 +0000
+++ exiv2-0.21/samples/xmpparse.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,10 +1,8 @@
 // ***************************************************************** -*- C++ -*-
-// xmpparse.cpp, $Rev: 1271 $
+// xmpparse.cpp, $Rev: 2286 $
 // Read an XMP packet from a file, parse it and print all (known) properties.
 
-#include <exiv2/basicio.hpp>
-#include <exiv2/xmp.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <string>
 #include <iostream>
diff -Nru exiv2-0.19/samples/xmpparser-test.cpp exiv2-0.21/samples/xmpparser-test.cpp
--- exiv2-0.19/samples/xmpparser-test.cpp	2007-12-30 04:50:43.000000000 +0000
+++ exiv2-0.21/samples/xmpparser-test.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,11 +1,8 @@
 // ***************************************************************** -*- C++ -*-
-// xmpparser-test.cpp, $Rev: 1354 $
+// xmpparser-test.cpp, $Rev: 2286 $
 // Read an XMP packet from a file, parse and re-serialize it.
 
-#include <exiv2/basicio.hpp>
-#include <exiv2/xmp.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/futils.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <string>
 #include <iostream>
diff -Nru exiv2-0.19/samples/xmpsample.cpp exiv2-0.21/samples/xmpsample.cpp
--- exiv2-0.19/samples/xmpsample.cpp	2008-06-03 17:28:46.000000000 +0000
+++ exiv2-0.21/samples/xmpsample.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,9 +1,8 @@
 // ***************************************************************** -*- C++ -*-
-// xmpsample.cpp, $Rev: 1479 $
+// xmpsample.cpp, $Rev: 2286 $
 // Sample/test for high level XMP classes. See also addmoddel.cpp
 
-#include <exiv2/xmp.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <string>
 #include <iostream>
diff -Nru exiv2-0.19/src/actions.cpp exiv2-0.21/src/actions.cpp
--- exiv2-0.19/src/actions.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/actions.cpp	2010-11-06 13:53:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      actions.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2374 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   08-Dec-03, ahu: created
              30-Apr-06, Roger Larsson: Print filename if processing multiple files
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: actions.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: actions.cpp 2374 2010-11-06 13:53:15Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -41,7 +41,7 @@
 # include "timegm.h"
 #endif
 #include "actions.hpp"
-#include "exiv2.hpp"
+#include "exiv2app.hpp"
 #include "image.hpp"
 #include "jpgimage.hpp"
 #include "xmpsidecar.hpp"
@@ -49,7 +49,6 @@
 #include "types.hpp"
 #include "exif.hpp"
 #include "easyaccess.hpp"
-#include "canonmn.hpp"
 #include "iptc.hpp"
 #include "xmp.hpp"
 #include "preview.hpp"
@@ -129,12 +128,6 @@
                  bool preserve);
 
     /*!
-      @brief Test to distinguish between Exif and other tags in TIFF-like files.
-             Only Exif tags are copyed, deleted, added.
-     */
-    bool isExifTag(const Exiv2::Exifdatum& ed);
-
-    /*!
       @brief Rename a file according to a timestamp value.
 
       @param path The original file path. Contains the new path on exit.
@@ -218,6 +211,7 @@
         registerTask(insert,  Task::AutoPtr(new Insert));
         registerTask(modify,  Task::AutoPtr(new Modify));
         registerTask(fixiso,  Task::AutoPtr(new FixIso));
+        registerTask(fixcom,  Task::AutoPtr(new FixCom));
     } // TaskFactory c'tor
 
     Task::AutoPtr TaskFactory::create(TaskType type)
@@ -487,16 +481,14 @@
 
     int Print::printList()
     {
-        int rc = 0;
         if (!Exiv2::fileExists(path_, true)) {
             std::cerr << path_
                       << ": " << _("Failed to open the file\n");
-            rc = -1;
+            return -1;
         }
         Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(path_);
         assert(image.get() != 0);
         image->readMetadata();
-        bool const manyFiles = Params::instance().files_.size() > 1;
         // Set defaults for metadata types and data columns
         if (Params::instance().printTags_ == Exiv2::mdNone) {
             Params::instance().printTags_ = Exiv2::mdExif | Exiv2::mdIptc | Exiv2::mdXmp;
@@ -504,11 +496,17 @@
         if (Params::instance().printItems_ == 0) {
             Params::instance().printItems_ = Params::prKey | Params::prType | Params::prCount | Params::prTrans;
         }
+        return printMetadata(image.get());
+    } // Print::printList
+
+    int Print::printMetadata(const Exiv2::Image* image)
+    {
+        int rc = 0;
         if (Params::instance().printTags_ & Exiv2::mdExif) {
-            Exiv2::ExifData& exifData = image->exifData();
+            const Exiv2::ExifData& exifData = image->exifData();
             for (Exiv2::ExifData::const_iterator md = exifData.begin();
                  md != exifData.end(); ++md) {
-                printMetadatum(*md, image.get(), manyFiles);
+                printMetadatum(*md, image);
             }
             if (exifData.empty()) {
                 if (Params::instance().verbose_) {
@@ -518,10 +516,10 @@
             }
         }
         if (Params::instance().printTags_ & Exiv2::mdIptc) {
-            Exiv2::IptcData& iptcData = image->iptcData();
+            const Exiv2::IptcData& iptcData = image->iptcData();
             for (Exiv2::IptcData::const_iterator md = iptcData.begin();
                  md != iptcData.end(); ++md) {
-                printMetadatum(*md, image.get(), manyFiles);
+                printMetadatum(*md, image);
             }
             if (iptcData.empty()) {
                 if (Params::instance().verbose_) {
@@ -531,10 +529,10 @@
             }
         }
         if (Params::instance().printTags_ & Exiv2::mdXmp) {
-            Exiv2::XmpData& xmpData = image->xmpData();
+            const Exiv2::XmpData& xmpData = image->xmpData();
             for (Exiv2::XmpData::const_iterator md = xmpData.begin();
                  md != xmpData.end(); ++md) {
-                printMetadatum(*md, image.get(), manyFiles);
+                printMetadatum(*md, image);
             }
             if (xmpData.empty()) {
                 if (Params::instance().verbose_) {
@@ -544,16 +542,27 @@
             }
         }
         return rc;
-    } // Print::printList
+    } // Print::printMetadata
+
+    bool Print::grepTag(const std::string& key)
+    {
+        if (Params::instance().keys_.empty()) return true;
+        for (Params::Keys::const_iterator k = Params::instance().keys_.begin();
+             k != Params::instance().keys_.end(); ++k) {
+            if (*k == key) return true;
+        }
+        return false;
+    }
 
-    void Print::printMetadatum(const Exiv2::Metadatum& md,
-                               const Exiv2::Image* pImage,
-                               bool const manyFiles)
+    void Print::printMetadatum(const Exiv2::Metadatum& md, const Exiv2::Image* pImage)
     {
+        if (!grepTag(md.key())) return;
+
         if (   Params::instance().unknown_
             && md.tagName().substr(0, 2) == "0x") {
             return;
         }
+        bool const manyFiles = Params::instance().files_.size() > 1;
         if (manyFiles) {
             std::cout << std::setfill(' ') << std::left << std::setw(20)
                       << path_ << "  ";
@@ -625,11 +634,23 @@
                 && (   md.typeId() == Exiv2::undefined
                     || md.typeId() == Exiv2::unsignedByte
                     || md.typeId() == Exiv2::signedByte)
-                && md.size() > 100) {
+                && md.size() > 128) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
             }
-            std::cout << std::dec << md.value();
+            bool done = false;
+            if (0 == strcmp(md.key().c_str(), "Exif.Photo.UserComment")) {
+                const Exiv2::CommentValue* pcv = dynamic_cast<const Exiv2::CommentValue*>(&md.value());
+                if (pcv) {
+                    Exiv2::CommentValue::CharsetId csId = pcv->charsetId();
+                    if (csId != Exiv2::CommentValue::undefined) {
+                        std::cout << "charset=\"" << Exiv2::CommentValue::CharsetInfo::name(csId) << "\" ";
+                    }
+                    std::cout << pcv->comment(Params::instance().charset_.c_str());
+                    done = true;
+                }
+            }
+            if (!done) std::cout << std::dec << md.value();
         }
         if (Params::instance().printItems_ & Params::prTrans) {
             if (!first) std::cout << "  ";
@@ -638,11 +659,19 @@
                 && (   md.typeId() == Exiv2::undefined
                     || md.typeId() == Exiv2::unsignedByte
                     || md.typeId() == Exiv2::signedByte)
-                && md.size() > 100) {
+                && md.size() > 128) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
             }
-            std::cout << std::dec << md.print(&pImage->exifData());
+            bool done = false;
+            if (0 == strcmp(md.key().c_str(), "Exif.Photo.UserComment")) {
+                const Exiv2::CommentValue* pcv = dynamic_cast<const Exiv2::CommentValue*>(&md.value());
+                if (pcv) {
+                    std::cout << pcv->comment(Params::instance().charset_.c_str());
+                    done = true;
+                }
+            }
+            if (!done) std::cout << std::dec << md.print(&pImage->exifData());
         }
         if (Params::instance().printItems_ & Params::prHex) {
             if (!first) std::cout << std::endl;
@@ -651,7 +680,7 @@
                 && (   md.typeId() == Exiv2::undefined
                     || md.typeId() == Exiv2::unsignedByte
                     || md.typeId() == Exiv2::signedByte)
-                && md.size() > 100) {
+                && md.size() > 128) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
             }
@@ -880,13 +909,7 @@
         if (Params::instance().verbose_ && image->exifData().count() > 0) {
             std::cout << _("Erasing Exif data from the file") << std::endl;
         }
-        if (0 == strcmp(image->mimeType().c_str(), "image/tiff")) {
-            Exiv2::ExifData& ed = image->exifData();
-            ed.erase(std::remove_if(ed.begin(), ed.end(), isExifTag), ed.end());
-        }
-        else {
-            image->clearExifData();
-        }
+        image->clearExifData();
         return 0;
     }
 
@@ -1399,7 +1422,7 @@
             std::cout << _("Reg ") << modifyCmd.key_ << "=\""
                       << modifyCmd.value_ << "\"" << std::endl;
         }
-        // Registration has been done immediately after parsing the command.
+        Exiv2::XmpProperties::registerNs(modifyCmd.value_, modifyCmd.key_);
     }
 
     Modify::AutoPtr Modify::clone() const
@@ -1617,6 +1640,84 @@
         return new FixIso(*this);
     }
 
+    FixCom::~FixCom()
+    {
+    }
+
+    int FixCom::run(const std::string& path)
+    {
+    try {
+        if (!Exiv2::fileExists(path, true)) {
+            std::cerr << path
+                      << ": " <<_("Failed to open the file\n");
+            return -1;
+        }
+        Timestamp ts;
+        if (Params::instance().preserve_) {
+            ts.read(path);
+        }
+        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(path);
+        assert(image.get() != 0);
+        image->readMetadata();
+        Exiv2::ExifData& exifData = image->exifData();
+        if (exifData.empty()) {
+            std::cerr << path
+                      << ": " << _("No Exif data found in the file\n");
+            return -3;
+        }
+        Exiv2::ExifData::iterator pos = exifData.findKey(Exiv2::ExifKey("Exif.Photo.UserComment"));
+        if (pos == exifData.end()) {
+            if (Params::instance().verbose_) {
+                std::cout << _("No Exif user comment found") << "\n";
+            }
+            return 0;
+        }
+        Exiv2::Value::AutoPtr v = pos->getValue();
+        const Exiv2::CommentValue* pcv = dynamic_cast<const Exiv2::CommentValue*>(v.get());
+        if (!pcv) {
+            if (Params::instance().verbose_) {
+                std::cout << _("Found Exif user comment with unexpected value type") << "\n";
+            }
+            return 0;
+        }
+        Exiv2::CommentValue::CharsetId csId = pcv->charsetId();
+        if (csId != Exiv2::CommentValue::unicode) {
+            if (Params::instance().verbose_) {
+                std::cout << _("No Exif UNICODE user comment found") << "\n";
+            }
+            return 0;
+        }
+        std::string comment = pcv->comment(Params::instance().charset_.c_str());
+        if (Params::instance().verbose_) {
+            std::cout << _("Setting Exif UNICODE user comment to") << " \"" << comment << "\"\n";
+        }
+        comment = std::string("charset=\"") + Exiv2::CommentValue::CharsetInfo::name(csId) + "\" " + comment;
+        // Remove BOM and convert value from source charset to UCS-2, but keep byte order
+        pos->setValue(comment);
+        image->writeMetadata();
+        if (Params::instance().preserve_) {
+            ts.touch(path);
+        }
+        return 0;
+    }
+    catch(const Exiv2::AnyError& e)
+    {
+        std::cerr << "Exiv2 exception in fixcom action for file " << path
+                  << ":\n" << e << "\n";
+        return 1;
+    }
+    } // FixCom::run
+
+    FixCom::AutoPtr FixCom::clone() const
+    {
+        return AutoPtr(clone_());
+    }
+
+    FixCom* FixCom::clone_() const
+    {
+        return new FixCom(*this);
+    }
+
 }                                       // namespace Action
 
 // *****************************************************************************
@@ -1681,6 +1782,13 @@
         if (!Util::strtol(timeStr.substr(17,2).c_str(), tmp)) return 10;
         tm->tm_sec = tmp;
 
+        // Conversions to set remaining fields of the tm structure
+        time_t time = timegm(tm);
+#ifdef EXV_HAVE_GMTIME_R
+        if (time == (time_t)-1 || gmtime_r(&time, tm) == 0) return 11;
+#else
+        if (time == (time_t)-1 || std::gmtime(&time)  == 0) return 11;
+#endif
         return 0;
     } // str2Tm
 
@@ -1739,22 +1847,7 @@
                 std::cout << _("Writing Exif data from") << " " << source
                           << " " << _("to") << " " << target << std::endl;
             }
-            if (0 == strcmp(targetImage->mimeType().c_str(), "image/tiff")) {
-                Exiv2::ExifData& ted = targetImage->exifData();
-                if (!preserve) {
-                    targetImage->readMetadata();
-                    ted.erase(std::remove_if(ted.begin(), ted.end(), isExifTag), ted.end());
-                }
-                const Exiv2::ExifData& sed = sourceImage->exifData();
-                for (Exiv2::ExifData::const_iterator pos = sed.begin(); pos != sed.end(); ++pos) {
-                    if (isExifTag(*pos)) {
-                        ted[pos->key()] = pos->value();
-                    }
-                }
-            }
-            else {
-                targetImage->setExifData(sourceImage->exifData());
-            }
+            targetImage->setExifData(sourceImage->exifData());
         }
         if (   Params::instance().target_ & Params::ctIptc
             && !sourceImage->iptcData().empty()) {
@@ -1800,66 +1893,6 @@
         }
     };
 
-    bool isExifTag(const Exiv2::Exifdatum& ed)
-    {
-        // A somewhat random list of IFD0 tags which are considered as "Exif tags"
-        static const String exifTags[] = {
-            { "Exif.Image.ProcessingSoftware"      },
-            { "Exif.Image.DocumentName"            },
-            { "Exif.Image.ImageDescription"        },
-            { "Exif.Image.Make"                    },
-            { "Exif.Image.Model"                   },
-            { "Exif.Image.Software"                },
-            { "Exif.Image.DateTime"                },
-            { "Exif.Image.HostComputer"            },
-            { "Exif.Image.Artist"                  },
-            { "Exif.Image.XMLPacket"               },
-            { "Exif.Image.Rating"                  },
-            { "Exif.Image.RatingPercent"           },
-            { "Exif.Image.CFARepeatPatternDim"     },
-            { "Exif.Image.CFAPattern"              },
-            { "Exif.Image.BatteryLevel"            },
-            { "Exif.Image.IPTCNAA"                 },
-            { "Exif.Image.Copyright"               },
-            { "Exif.Image.ImageResources"          },
-            { "Exif.Image.ExifTag"                 },
-            { "Exif.Image.InterColorProfile"       },
-            { "Exif.Image.GPSTag"                  },
-            { "Exif.Image.XPTitle"                 },
-            { "Exif.Image.XPComment"               },
-            { "Exif.Image.XPAuthor"                },
-            { "Exif.Image.XPKeywords"              },
-            { "Exif.Image.XPSubject"               },
-            { "Exif.Image.PrintImageMatching"      },
-            { "Exif.Image.UniqueCameraModel"       },
-            { "Exif.Image.LocalizedCameraModel"    },
-            { "Exif.Image.CFAPlaneColor"           },
-            { "Exif.Image.CFALayout"               },
-            { "Exif.Image.CameraSerialNumber"      },
-            { "Exif.Image.LensInfo"                },
-            { "Exif.Image.OriginalRawFileName"     },
-            { "Exif.Image.ActiveArea"              },
-            { "Exif.Image.MaskedAreas"             },
-            { "Exif.Image.AsShotICCProfile"        },
-            { "Exif.Image.AsShotPreProfileMatrix"  },
-            { "Exif.Image.CurrentICCProfile"       },
-            { "Exif.Image.CurrentPreProfileMatrix" }
-        };
-
-        static const Exiv2::IfdId exifIfds[] = {
-            Exiv2::exifIfdId,
-            Exiv2::gpsIfdId,
-            Exiv2::iopIfdId
-        };
-
-        if (   0 != Exiv2::find(exifIfds, ed.ifdId())
-            || Exiv2::ExifTags::isMakerIfd(ed.ifdId())
-            || 0 != Exiv2::find(exifTags, ed.key().c_str())) {
-            return true;
-        }
-        return false;
-    } // isExifTag
-
     int renameFile(std::string& newPath, const struct tm* tm)
     {
         std::string path = newPath;
diff -Nru exiv2-0.19/src/actions.hpp exiv2-0.21/src/actions.hpp
--- exiv2-0.19/src/actions.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/actions.hpp	2010-10-31 09:09:17.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   @file    actions.hpp
   @brief   Implements base class Task, TaskFactory and the various supported
            actions (derived from Task).
-  @version $Rev: 1937 $
+  @version $Rev: 2373 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    11-Dec-03, ahu: created
@@ -37,7 +37,7 @@
 #include <string>
 #include <map>
 
-#include "exiv2.hpp"
+#include "exiv2app.hpp"
 #include "image.hpp"
 #include "exif.hpp"
 #include "iptc.hpp"
@@ -61,7 +61,7 @@
 
     //! Enumerates all tasks
     enum TaskType { none, adjust, print, rename, erase, extract, insert,
-                    modify, fixiso };
+                    modify, fixiso, fixcom };
 
 // *****************************************************************************
 // class definitions
@@ -170,10 +170,12 @@
         int printSummary();
         //! Print Exif, IPTC and XMP metadata in user defined format
         int printList();
+        //! Return true if key should be printed, else false
+        bool grepTag(const std::string& key);
+        //! Print all metadata in a user defined format
+        int printMetadata(const Exiv2::Image* image);
         //! Print a metadatum in a user defined format
-        void printMetadatum(const Exiv2::Metadatum& md,
-                            const Exiv2::Image* pImage,
-                            bool const manyFiles);
+        void printMetadatum(const Exiv2::Metadatum& md, const Exiv2::Image* image);
         //! Print the label for a summary line
         void printLabel(const std::string& label) const;
         /*!
@@ -388,6 +390,24 @@
 
     }; // class FixIso
 
+    /*!
+      @brief Fix the character encoding of Exif UNICODE user comments.
+             Decodes the comment using the auto-detected or specified
+             character encoding and writes it back in UCS-2.
+     */
+    class FixCom : public Task {
+    public:
+        virtual ~FixCom();
+        virtual int run(const std::string& path);
+        typedef std::auto_ptr<FixCom> AutoPtr;
+        AutoPtr clone() const;
+
+    private:
+        virtual FixCom* clone_() const;
+        std::string path_;
+
+    }; // class FixCom
+
 }                                       // namespace Action
 
 #endif                                  // #ifndef ACTIONS_HPP_
diff -Nru exiv2-0.19/src/basicio.cpp exiv2-0.21/src/basicio.cpp
--- exiv2-0.19/src/basicio.cpp	2009-12-29 15:24:40.000000000 +0000
+++ exiv2-0.21/src/basicio.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      basicio.cpp
-  Version:   $Rev: 1983 $
+  Version:   $Rev: 2344 $
   Author(s): Brad Schick (brad) <brad@robotbattle.com>
   History:   04-Dec-04, brad: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: basicio.cpp 1983 2009-12-29 15:24:40Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: basicio.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -98,7 +98,7 @@
         // DATA
         std::string path_;              //!< (Standard) path
 #ifdef EXV_UNICODE_PATH
-        std::wstring wpath_;            //!< Unicode path 
+        std::wstring wpath_;            //!< Unicode path
         WpMode wpMode_;                 //!< Indicates which path is in use
 #endif
         std::string openMode_;          //!< File open mode
@@ -109,7 +109,7 @@
         HANDLE hFile_;                  //!< Duplicated fd
         HANDLE hMap_;                   //!< Handle from CreateFileMapping
 #endif
-        byte* pMappedArea_;             //!< Pointer to the memory-mapped area 
+        byte* pMappedArea_;             //!< Pointer to the memory-mapped area
         size_t mappedLength_;           //!< Size of the memory-mapped area
         bool isMalloced_;               //!< Is the mapped area allocated?
         bool isWriteable_;              //!< Can the mapped area be written to?
@@ -208,7 +208,15 @@
         }
         openMode_ = "r+b";
         opMode_ = opSeek;
-        fp_ = std::fopen(path_.c_str(), openMode_.c_str());
+#ifdef EXV_UNICODE_PATH
+        if (wpMode_ == wpUnicode) {
+            fp_ = ::_wfopen(wpath_.c_str(), s2ws(openMode_).c_str());
+        }
+        else
+#endif
+        {
+            fp_ = std::fopen(path_.c_str(), openMode_.c_str());
+        }
         if (!fp_) return 1;
         return std::fseek(fp_, offset, SEEK_SET);
     } // FileIo::Impl::switchMode
@@ -272,6 +280,7 @@
             p_->hFile_ = 0;
 #else
             if (p_->isWriteable_) {
+                seek(0, BasicIo::beg);
                 write(p_->pMappedArea_, p_->mappedLength_);
             }
             if (p_->isMalloced_) {
@@ -293,11 +302,29 @@
     {
         assert(p_->fp_ != 0);
         if (munmap() != 0) {
-            throw Error(2, path(), strError(), "munmap");
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), strError().c_str(), "munmap");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), strError(), "munmap");
+            }
         }
         p_->mappedLength_ = size();
         p_->isWriteable_ = isWriteable;
-        if (p_->isWriteable_ && p_->switchMode(Impl::opWrite) != 0) return 0;
+        if (p_->isWriteable_ && p_->switchMode(Impl::opWrite) != 0) {
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(16, wpath(), strError().c_str());
+            }
+            else
+#endif
+            {
+                throw Error(16, path(), strError());
+            }
+        }
 #if defined EXV_HAVE_MMAP && defined EXV_HAVE_MUNMAP
         int prot = PROT_READ;
         if (p_->isWriteable_) {
@@ -305,7 +332,15 @@
         }
         void* rc = ::mmap(0, p_->mappedLength_, prot, MAP_SHARED, fileno(p_->fp_), 0);
         if (MAP_FAILED == rc) {
-            throw Error(2, path(), strError(), "mmap");
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), strError().c_str(), "mmap");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), strError(), "mmap");
+            }
         }
         p_->pMappedArea_ = static_cast<byte*>(rc);
 
@@ -326,25 +361,77 @@
         HANDLE hPh = GetCurrentProcess();
         HANDLE hFd = (HANDLE)_get_osfhandle(fileno(p_->fp_));
         if (hFd == INVALID_HANDLE_VALUE) {
-            throw Error(2, path(), "MSG1", "_get_osfhandle");
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), "MSG1", "_get_osfhandle");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), "MSG1", "_get_osfhandle");
+            }
         }
         if (!DuplicateHandle(hPh, hFd, hPh, &p_->hFile_, 0, false, DUPLICATE_SAME_ACCESS)) {
-            throw Error(2, path(), "MSG2", "DuplicateHandle");
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), "MSG2", "DuplicateHandle");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), "MSG2", "DuplicateHandle");
+            }
         }
         p_->hMap_ = CreateFileMapping(p_->hFile_, 0, flProtect, 0, p_->mappedLength_, 0);
         if (p_->hMap_ == 0 ) {
-            throw Error(2, path(), "MSG3", "CreateFileMapping");
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), "MSG3", "CreateFileMapping");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), "MSG3", "CreateFileMapping");
+            }
         }
         void* rc = MapViewOfFile(p_->hMap_, dwAccess, 0, 0, 0);
         if (rc == 0) {
-            throw Error(2, path(), "MSG4", "CreateFileMapping");
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), "MSG4", "CreateFileMapping");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), "MSG4", "CreateFileMapping");
+            }
         }
         p_->pMappedArea_ = static_cast<byte*>(rc);
 #else
         // Workaround for platforms without mmap: Read the file into memory
         DataBuf buf(static_cast<long>(p_->mappedLength_));
-        read(buf.pData_, buf.size_);
-        if (error() || eof()) throw Error(2, path(), strError(), "FileIo::mmap");
+        if (read(buf.pData_, buf.size_) != buf.size_) {
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), strError().c_str(), "FileIo::read");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), strError(), "FileIo::read");
+            }
+        }
+        if (error() || eof()) {
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(2, wpath(), strError().c_str(), "FileIo::mmap");
+            }
+            else
+#endif
+            {
+                throw Error(2, path(), strError(), "FileIo::mmap");
+            }
+        }
         p_->pMappedArea_ = buf.release().first;
         p_->isMalloced_ = true;
 #endif
@@ -374,7 +461,15 @@
                 fileIo = std::auto_ptr<FileIo>(new FileIo(tmpname));
             }
             if (fileIo->open("w+b") != 0) {
-                throw Error(10, path(), "w+b", strError());
+#ifdef EXV_UNICODE_PATH
+                if (p_->wpMode_ == Impl::wpUnicode) {
+                    throw WError(10, wpath(), "w+b", strError().c_str());
+                }
+                else
+#endif
+                {
+                    throw Error(10, path(), "w+b", strError());
+                }
             }
             basicIo = fileIo;
         }
@@ -436,22 +531,34 @@
                 {
                     ::remove(fileIo->path().c_str());
                 }
-                throw Error(10, path(), "w+b", strError());
+#ifdef EXV_UNICODE_PATH
+                if (p_->wpMode_ == Impl::wpUnicode) {
+                    throw WError(10, wpath(), "w+b", strError().c_str());
+                }
+                else
+#endif
+                {
+                    throw Error(10, path(), "w+b", strError());
+                }
             }
             close();
 
             bool statOk = true;
             mode_t origStMode = 0;
+            std::string spf;
             char* pf = 0;
 #ifdef EXV_UNICODE_PATH
+            std::wstring wspf;
             wchar_t* wpf = 0;
             if (p_->wpMode_ == Impl::wpUnicode) {
-                wpf = const_cast<wchar_t*>(wpath().c_str());
+                wspf = wpath();
+                wpf = const_cast<wchar_t*>(wspf.c_str());
             }
             else
 #endif
             {
-                pf = const_cast<char*>(path().c_str());
+                spf = path();
+                pf = const_cast<char*>(spf.c_str());
             }
 
             // Get the permissions of the file, or linked-to file, on platforms which have lstat
@@ -464,7 +571,7 @@
             if (::lstat(pf, &buf1) == -1) {
                 statOk = false;
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: " << Error(2, pf, strError(), "::lstat") << "\n";
+                EXV_WARNING << Error(2, pf, strError(), "::lstat") << "\n";
 #endif
             }
             origStMode = buf1.st_mode;
@@ -481,7 +588,7 @@
                 if (::stat(pf, &buf1) == -1) {
                     statOk = false;
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: " << Error(2, pf, strError(), "::stat") << "\n";
+                    EXV_WARNING << Error(2, pf, strError(), "::stat") << "\n";
 #endif
                 }
                 origStMode = buf1.st_mode;
@@ -498,10 +605,10 @@
 #ifdef EXV_UNICODE_PATH
             if (p_->wpMode_ == Impl::wpUnicode) {
                 if (fileExists(wpf) && ::_wremove(wpf) != 0) {
-                    throw Error(2, wpf, strError(), "::_wremove");
+                    throw WError(2, wpf, strError().c_str(), "::_wremove");
                 }
                 if (::_wrename(fileIo->wpath().c_str(), wpf) == -1) {
-                    throw Error(17, ws2s(fileIo->wpath()), wpf, strError());
+                    throw WError(17, fileIo->wpath(), wpf, strError().c_str());
                 }
                 ::_wremove(fileIo->wpath().c_str());
                 // Check permissions of new file
@@ -509,14 +616,14 @@
                 if (statOk && ::_wstat(wpf, &buf2) == -1) {
                     statOk = false;
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: " << Error(2, wpf, strError(), "::_wstat") << "\n";
+                    EXV_WARNING << Error(2, wpf, strError(), "::_wstat") << "\n";
 #endif
                 }
                 if (statOk && origStMode != buf2.st_mode) {
                     // Set original file permissions
                     if (::_wchmod(wpf, origStMode) == -1) {
 #ifndef SUPPRESS_WARNINGS
-                        std::cerr << "Warning: " << Error(2, wpf, strError(), "::_wchmod") << "\n";
+                        EXV_WARNING << Error(2, wpf, strError(), "::_wchmod") << "\n";
 #endif
                     }
                 }
@@ -536,14 +643,14 @@
                 if (statOk && ::stat(pf, &buf2) == -1) {
                     statOk = false;
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: " << Error(2, pf, strError(), "::stat") << "\n";
+                    EXV_WARNING << Error(2, pf, strError(), "::stat") << "\n";
 #endif
                 }
                 if (statOk && origStMode != buf2.st_mode) {
                     // Set original file permissions
                     if (::chmod(pf, origStMode) == -1) {
 #ifndef SUPPRESS_WARNINGS
-                        std::cerr << "Warning: " << Error(2, pf, strError(), "::chmod") << "\n";
+                        EXV_WARNING << Error(2, pf, strError(), "::chmod") << "\n";
 #endif
                     }
                 }
@@ -552,10 +659,26 @@
         else {
             // Generic handling, reopen both to reset to start
             if (open("w+b") != 0) {
-                throw Error(10, path(), "w+b", strError());
+#ifdef EXV_UNICODE_PATH
+                if (p_->wpMode_ == Impl::wpUnicode) {
+                    throw WError(10, wpath(), "w+b", strError().c_str());
+                }
+                else
+#endif
+                {
+                    throw Error(10, path(), "w+b", strError());
+                }
             }
             if (src.open() != 0) {
-                throw Error(9, src.path(), strError());
+#ifdef EXV_UNICODE_PATH
+                if (p_->wpMode_ == Impl::wpUnicode) {
+                    throw WError(9, src.wpath(), strError().c_str());
+                }
+                else
+#endif
+                {
+                    throw Error(9, src.path(), strError());
+                }
             }
             write(src);
             src.close();
@@ -563,13 +686,31 @@
 
         if (wasOpen) {
             if (open(lastMode) != 0) {
-                throw Error(10, path(), lastMode, strError());
+#ifdef EXV_UNICODE_PATH
+                if (p_->wpMode_ == Impl::wpUnicode) {
+                    throw WError(10, wpath(), lastMode.c_str(), strError().c_str());
+                }
+                else
+#endif
+                {
+                    throw Error(10, path(), lastMode, strError());
+                }
             }
         }
         else close();
 
-        if (error() || src.error()) throw Error(18, path(), strError());
-    }
+        if (error() || src.error()) {
+#ifdef EXV_UNICODE_PATH
+            if (p_->wpMode_ == Impl::wpUnicode) {
+                throw WError(18, wpath(), strError().c_str());
+            }
+            else
+#endif
+            {
+                throw Error(18, path(), strError());
+            }
+        }
+    } // FileIo::transfer
 
     int FileIo::putb(byte data)
     {
@@ -994,16 +1135,16 @@
     {
         FileIo file(wpath);
         if (file.open("rb") != 0) {
-            throw Error(10, ws2s(wpath), "rb", strError());
+            throw WError(10, wpath, "rb", strError().c_str());
         }
         struct _stat st;
         if (0 != ::_wstat(wpath.c_str(), &st)) {
-            throw Error(2, ws2s(wpath), strError(), "::_wstat");
+            throw WError(2, wpath, strError().c_str(), "::_wstat");
         }
         DataBuf buf(st.st_size);
         long len = file.read(buf.pData_, buf.size_);
         if (len != buf.size_) {
-            throw Error(2, ws2s(wpath), strError(), "FileIo::read");
+            throw WError(2, wpath, strError().c_str(), "FileIo::read");
         }
         return buf;
     }
@@ -1023,7 +1164,7 @@
     {
         FileIo file(wpath);
         if (file.open("wb") != 0) {
-            throw Error(10, ws2s(wpath), "wb", strError());
+            throw WError(10, wpath, "wb", strError().c_str());
         }
         return file.write(buf.pData_, buf.size_);
     }
diff -Nru exiv2-0.19/src/basicio.hpp exiv2-0.21/src/basicio.hpp
--- exiv2-0.19/src/basicio.hpp	2009-12-28 11:52:13.000000000 +0000
+++ exiv2-0.21/src/basicio.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    basicio.hpp
   @brief   Simple binary IO abstraction
-  @version $Rev: 1973 $
+  @version $Rev: 2045 $
   @author  Brad Schick (brad)
            <a href="mailto:brad@robotbattle.com">brad@robotbattle.com</a>
   @date    04-Dec-04, brad: created
diff -Nru exiv2-0.19/src/bmpimage.cpp exiv2-0.21/src/bmpimage.cpp
--- exiv2-0.19/src/bmpimage.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/bmpimage.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      bmpimage.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Marco Piovanelli, Ovolab (marco)
   History:   05-Mar-2007, marco: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: bmpimage.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: bmpimage.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 //#define DEBUG 1
 
diff -Nru exiv2-0.19/src/bmpimage.hpp exiv2-0.21/src/bmpimage.hpp
--- exiv2-0.19/src/bmpimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/bmpimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    bmpimage.hpp
   @brief   Windows Bitmap (BMP) image
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Marco Piovanelli, Ovolab (marco)
            <a href="mailto:marco.piovanelli@pobox.com">marco.piovanelli@pobox.com</a>
   @date    05-Mar-2007, marco: created
diff -Nru exiv2-0.19/src/canonmn.cpp exiv2-0.21/src/canonmn.cpp
--- exiv2-0.19/src/canonmn.cpp	2009-11-28 08:28:08.000000000 +0000
+++ exiv2-0.21/src/canonmn.cpp	2010-10-16 15:23:37.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,19 +20,20 @@
  */
 /*
   File:      canonmn.cpp
-  Version:   $Rev: 1944 $
+  Version:   $Rev: 2368 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
              David Cannings (dc) <david@edeca.net>
              Andi Clemens (ac) <andi.clemens@gmx.net>
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: canonmn.cpp 1944 2009-11-28 08:28:08Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: canonmn.cpp 2368 2010-10-16 15:23:37Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "canonmn.hpp"
+#include "canonmn_int.hpp"
+#include "tags_int.hpp"
 #include "value.hpp"
 #include "exif.hpp"
 #include "i18n.h"                // NLS support.
@@ -41,6 +42,7 @@
 #include <string>
 #include <sstream>
 #include <iomanip>
+#include <ios>
 #include <algorithm>
 #include <cassert>
 #include <cstring>
@@ -49,6 +51,13 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
+
+    //! OffOn, multiple tags
+    extern const TagDetails canonOffOn[] = {
+        {  0, N_("Off") },
+        {  1, N_("On")  }
+    };
 
     //! Special treatment pretty-print function for non-unique lens ids.
     std::ostream& printCsLensByFocalLength(std::ostream& os,
@@ -158,31 +167,71 @@
         { 0x80000232, N_("EOS-1D Mark II N") },
         { 0x80000234, N_("EOS 30D") },
         { 0x80000236, N_("EOS Digital Rebel XTi / 400D / Kiss Digital X") },
+        { 0x80000250, N_("EOS 7D") },
+        { 0x80000252, N_("EOS Rebel T1i / 500D / Kiss X3") },
+        { 0x80000254, N_("EOS Rebel XS / 1000D / Kiss F") },
+        { 0x80000261, N_("EOS 50D") },
+        { 0x80000270, N_("EOS Rebel T2i / 550D / Kiss X4") },
+        { 0x80000281, N_("EOS-1D Mark IV") },
+    };
+
+    //! SerialNumberFormat, tag 0x0015
+    extern const TagDetails canonSerialNumberFormat[] = {
+        {  0x90000000, N_("Format 1") },
+        {  0xa0000000, N_("Format 2") },
+    };
+
+    //! SuperMacro, tag 0x001a
+    extern const TagDetails canonSuperMacro[] = {
+        {  0, N_("Off")     },
+        {  1, N_("On (1)")  },
+        {  2, N_("On (2)")  }
+    };
+
+    //! ColorSpace, tag 0x00b4
+    extern const TagDetails canonColorSpace[] = {
+        {  1, N_("sRGB")      },
+        {  2, N_("Adobe RGB") }
     };
 
     // Canon MakerNote Tag Info
     const TagInfo CanonMakerNote::tagInfo_[] = {
-        TagInfo(0x0000, "0x0000", "0x0000", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0001, "CameraSettings", N_("Camera Settings"), N_("Various camera settings"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0002, "FocalLength", N_("Focal Length"), N_("Focal length"), canonIfdId, makerTags, unsignedShort, printFocalLength),
-        TagInfo(0x0003, "0x0003", "0x0003", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0004, "ShotInfo", N_("Shot Info"), N_("Shot information"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0005, "Panorama", N_("Panorama"), N_("Panorama"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0006, "ImageType", N_("Image Type"), N_("Image type"), canonIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0007, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), canonIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0008, "FileNumber", N_("File Number"), N_("File number"), canonIfdId, makerTags, unsignedLong, print0x0008),
-        TagInfo(0x0009, "OwnerName", N_("Owner Name"), N_("Owner Name"), canonIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x000c, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), canonIfdId, makerTags, unsignedLong, print0x000c),
-        TagInfo(0x000d, "0x000d", "0x000d", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000f, "CustomFunctions", N_("Custom Functions"), N_("Custom Functions"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0010, "ModelID", N_("ModelID"), N_("Model ID"), canonIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(canonModelId)),
-        TagInfo(0x0012, "PictureInfo", N_("Picture Info"), N_("Picture info"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x00a9, "WhiteBalanceTable", N_("White Balance Table"), N_("White balance table"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x00b5, "0x00b5", "0x00b5", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x00c0, "0x00c0", "0x00c0", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x00c1, "0x00c1", "0x00c1", N_("Unknown"), canonIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0000, "0x0000", "0x0000", N_("Unknown"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0001, "CameraSettings", N_("Camera Settings"), N_("Various camera settings"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0002, "FocalLength", N_("Focal Length"), N_("Focal length"), canonId, makerTags, unsignedShort, -1, printFocalLength),
+        TagInfo(0x0003, "0x0003", "0x0003", N_("Unknown"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0004, "ShotInfo", N_("Shot Info"), N_("Shot information"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0005, "Panorama", N_("Panorama"), N_("Panorama"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0006, "ImageType", N_("Image Type"), N_("Image type"), canonId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0007, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), canonId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0008, "FileNumber", N_("File Number"), N_("File number"), canonId, makerTags, unsignedLong, -1, print0x0008),
+        TagInfo(0x0009, "OwnerName", N_("Owner Name"), N_("Owner Name"), canonId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x000c, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), canonId, makerTags, unsignedLong, -1, print0x000c),
+        TagInfo(0x000d, "CameraInfo", N_("Camera Info"), N_("Camera info"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x000f, "CustomFunctions", N_("Custom Functions"), N_("Custom Functions"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0010, "ModelID", N_("ModelID"), N_("Model ID"), canonId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(canonModelId)),
+        TagInfo(0x0012, "PictureInfo", N_("Picture Info"), N_("Picture info"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0013, "ThumbnailImageValidArea", N_("Thumbnail Image Valid Area"), N_("Thumbnail image valid area"), canonId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0015, "SerialNumberFormat", N_("Serial Number Format"), N_("Serial number format"), canonId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(canonSerialNumberFormat)),
+        TagInfo(0x001a, "SuperMacro", N_("Super Macro"), N_("Super macro"), canonId, makerTags, signedShort, -1, EXV_PRINT_TAG(canonSuperMacro)),
+        TagInfo(0x0026, "AFInfo", N_("AF Info"), N_("AF info"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0083, "OriginalDecisionDataOffset", N_("Original Decision Data Offset"), N_("Original decision data offset"), canonId, makerTags, signedLong, -1, printValue),
+        TagInfo(0x00a4, "WhiteBalanceTable", N_("White Balance Table"), N_("White balance table"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0095, "LensModel", N_("LensModel"), N_("LensModel"), canonId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0096, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), canonId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0097, "DustRemovalData", N_("Dust Removal Data"), N_("Dust removal data"), canonId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0099, "CustomFunctions", N_("Custom Functions"), N_("Custom functions"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x00a0, "ProcessingInfo", N_("Processing Info"), N_("Processing info"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x00aa, "MeasuredColor", N_("Measured Color"), N_("Measured color"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x00b4, "ColorSpace", N_("ColorSpace"), N_("ColorSpace"), canonId, makerTags, signedShort,  -1, EXV_PRINT_TAG(canonColorSpace)),
+        TagInfo(0x00b5, "0x00b5", "0x00b5", N_("Unknown"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x00c0, "0x00c0", "0x00c0", N_("Unknown"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x00c1, "0x00c1", "0x00c1", N_("Unknown"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x00d0, "VRDOffset", N_("VRD Offset"), N_("VRD offset"), canonId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x00e0, "SensorInfo", N_("Sensor Info"), N_("Sensor info"), canonId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x4001, "ColorData", N_("Color Data"), N_("Color data"), canonId, makerTags, unsignedShort, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonMakerNoteTag)", "(UnknownCanonMakerNoteTag)", N_("Unknown CanonMakerNote tag"), canonIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownCanonMakerNoteTag)", "(UnknownCanonMakerNoteTag)", N_("Unknown CanonMakerNote tag"), canonId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagList()
@@ -215,7 +264,8 @@
         {  4, N_("Slow sync")      },
         {  5, N_("Auto + red-eye") },
         {  6, N_("On + red-eye")   },
-        { 16, N_("External")       }
+        { 16, N_("External")       },
+        { 16, N_("External")       }    // To silence compiler warning
     };
 
     //! DriveMode, tag 0x0005
@@ -237,7 +287,8 @@
         {  4, N_("Single")       },
         {  5, N_("Continuous")   },
         {  6, N_("Manual focus") },
-        { 16, N_("Pan focus")    }
+        { 16, N_("Pan focus")    },
+        { 16, N_("Pan focus")    }    // To silence compiler warning
     };
 
     //! ImageSize, tag 0x000a
@@ -288,7 +339,8 @@
         { 0, N_("None")  },
         { 1, "2x"        },
         { 2, "4x"        },
-        { 3, N_("Other") }
+        { 3, N_("Other") },
+        { 3, N_("Other") }                      // To silence compiler warning
     };
 
     //! Contrast, Saturation Sharpness, tags 0x000d, 0x000e, 0x000f
@@ -405,6 +457,7 @@
         {  26, "Cosina 100mm f/3.5 Macro AF"                                }, // 1
         {  26, "Tamron SP AF 90mm f/2.8 Di Macro"                           }, // 2
         {  26, "Tamron SP AF 180mm f/3.5 Di Macro"                          }, // 3
+        {  26, "Carl Zeiss Planar T* 50mm f/1.4"                            }, // 4
         {  27, "Canon EF 35-80mm f/4-5.6"                                   },
         {  28, "Canon EF 80-200mm f/4.5-5.6"                                }, // 0
         {  28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"               }, // 1
@@ -417,10 +470,15 @@
         {  31, "Tamron SP AF 300mm f/2.8 LD IF"                             }, // 1
         {  32, "Canon EF 24mm f/2.8"                                        }, // 0
         {  32, "Sigma 15mm f/2.8 EX Fisheye"                                }, // 1
+        {  33, "Voigtlander or Zeiss Lens"                                  }, // 0
+        {  33, "Voigtlander Ultron 40mm f/2 SLII Aspherical"                }, // 1
+        {  33, "Zeiss Distagon 35mm T* f/2 ZE"                              }, // 2
         {  35, "Canon EF 35-80mm f/4-5.6"                                   },
         {  36, "Canon EF 38-76mm f/4.5-5.6"                                 },
         {  37, "Canon EF 35-80mm f/4-5.6"                                   }, // 0
         {  37, "Tamron 70-200mm f/2.8 Di LD IF Macro"                       }, // 1
+        {  37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20" }, // 2
+        {  37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF] " }, // 3
         {  38, "Canon EF 80-200mm f/4.5-5.6"                                },
         {  39, "Canon EF 75-300mm f/4-5.6"                                  },
         {  40, "Canon EF 28-80mm f/3.5-5.6"                                 },
@@ -434,6 +492,9 @@
         {  48, "Canon EF-S 18-55mm f/3.5-5.6 IS"                            },
         {  49, "Canon EF-S 55-250mm f/4-5.6 IS"                             },
         {  50, "Canon EF-S 18-200mm f/3.5-5.6 IS"                           },
+        {  51, "Canon EF-S 18-135mm f/3.5-5.6 IS"                           },
+        {  94, "Canon TS-E 17mm f/4L"                                       },
+        {  95, "Canon TS-E 24.0mm f/3.5 L II"                               },
         { 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo"                     },
         { 125, "Canon TS-E 24mm f/3.5L"                                     },
         { 126, "Canon TS-E 45mm f/2.8"                                      },
@@ -450,7 +511,14 @@
         { 134, "Canon EF 600mm f/4L IS"                                     },
         { 135, "Canon EF 200mm f/1.8L"                                      },
         { 136, "Canon EF 300mm f/2.8L"                                      },
-        { 137, "Canon EF 85mm f/1.2L"                                       },
+        { 137, "Canon EF 85mm f/1.2L"                                       }, // 0
+        { 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM"                          }, // 1
+        { 137, "Sigma 50-200mm f/4-5.6 DC OS HSM"                           }, // 2
+        { 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"                         }, // 3
+        { 137, "Sigma 24-70mm f/2.8 IF EX DG HSM"                           }, // 4
+        { 137, "Sigma 18-125mm f/3.8-5.6 DC OS HSM"                         }, // 5
+        { 137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"                      }, // 6
+        { 137, "Sigma 17-50mm f/2.8 OS HSM"                                 }, // 7
         { 138, "Canon EF 28-80mm f/2.8-4L"                                  },
         { 139, "Canon EF 400mm f/2.8L"                                      },
         { 140, "Canon EF 500mm f/4.5L"                                      },
@@ -477,14 +545,17 @@
         { 153, "Sigma 50-500mm f/4-6.3 APO HSM EX"                          }, // 1
         { 153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"   }, // 2
         { 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14" }, // 3
-        { 153, "Tamron 18-250mm f/3.5-6.3 Di II_LD Aspherical [IF] Macro"   }, // 4
+        { 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro"   }, // 4
         { 154, "Canon EF 20mm f/2.8 USM"                                    },
         { 155, "Canon EF 85mm f/1.8 USM"                                    },
         { 156, "Canon EF 28-105mm f/3.5-4.5 USM"                            },
-        { 160, "Canon EF 20-35mm f/3.5-4.5 USM"                             },
+        { 160, "Canon EF 20-35mm f/3.5-4.5 USM"                             }, // 0
+        { 160, "Tamron AF 19-35mm f/3.5-4.5"                                }, // 1
         { 161, "Canon EF 28-70mm f/2.8L"                                    }, // 0
         { 161, "Sigma 24-70mm EX f/2.8"                                     }, // 1
-        { 161, "Tamron 90mm f/2.8"                                          }, // 2
+        { 161, "Sigma 28-70mm f/2.8 EX"                                     }, // 2
+        { 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"                }, // 3
+        { 161, "Tamron 90mm f/2.8"                                          }, // 4
         { 162, "Canon EF 200mm f/2.8L"                                      },
         { 163, "Canon EF 300mm f/4L"                                        },
         { 164, "Canon EF 400mm f/5.6L"                                      },
@@ -496,13 +567,15 @@
         { 169, "Sigma 18-200mm f/3.5-6.3 DC OS"                             }, // 1
         { 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"                   }, // 2
         { 169, "Sigma 18-50mm f/2.8 Macro"                                  }, // 3
+        { 169, "Sigma 50mm f/1.4 EX DG HSM"                                 }, // 4
         { 170, "Canon EF 200mm f/2.8L II"                                   },
         { 171, "Canon EF 300mm f/4L"                                        },
         { 172, "Canon EF 400mm f/5.6L"                                      },
         { 173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"                  }, // 0
         { 173, "Sigma 180mm EX HSM Macro f/3.5"                             }, // 1
         { 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM"                   }, // 2
-        { 174, "Canon EF 135mm f/2L"                                        },
+        { 174, "Canon EF 135mm f/2L"                                        }, // 0
+        { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"                      }, // 1
         { 175, "Canon EF 400mm f/2.8L"                                      },
         { 176, "Canon EF 24-85mm f/3.5-4.5 USM"                             },
         { 177, "Canon EF 300mm f/4L IS"                                     },
@@ -536,7 +609,7 @@
         { 211, "Canon EF 28-200mm f/3.5-5.6 USM"                            },
         { 212, "Canon EF 28-105mm f/4-5.6 USM"                              },
         { 213, "Canon EF 90-300mm f/4.5-5.6 USM"                            },
-        { 214, "Canon EF-S 18-55mm f/3.5-4.5 USM"                           },
+        { 214, "Canon EF-S 18-55mm f/3.5-5.6 USM"                           },
         { 215, "Canon EF 55-200mm f/4.5-5.6 II USM"                         },
         { 224, "Canon EF 70-200mm f/2.8L IS"                                },
         { 225, "Canon EF 70-200mm f/2.8L IS + 1.4x"                         },
@@ -561,7 +634,13 @@
         { 244, "Canon EF 70-200mm f/4L IS + 2x"                             },
         { 245, "Canon EF 70-200mm f/4L IS + 2.8x"                           },
         { 246, "Canon EF 16-35mm f/2.8L II"                                 },
-        { 247, "Canon EF 14mm f/2.8L II USM"                                }
+        { 247, "Canon EF 14mm f/2.8L II USM"                                },
+        { 248, "Canon EF 200mm f/2L IS"                                     },
+        { 249, "Canon EF 800mm f/5.6L IS"                                   },
+        { 250, "Canon EF 24 f/1.4L II"                                      },
+        { 251, "Canon EF 70-200mm f/2.8L IS II USM"                         },
+        { 254, "Canon EF 100mm f/2.8L Macro IS USM"                         },
+        { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"                        }
     };
 
     //! A lens id and a pretty-print function for special treatment of the id.
@@ -584,15 +663,18 @@
         {  28, printCsLensByFocalLength },
         {  31, printCsLensByFocalLength },
         {  32, printCsLensByFocalLength },
+        {  33, printCsLensByFocalLength }, // not tested
         {  37, printCsLensByFocalLength },
         {  42, printCsLensByFocalLength },
         { 131, printCsLensByFocalLength },
+        { 137, printCsLensByFocalLength }, // not tested
         { 150, printCsLensByFocalLength },
         { 152, printCsLensByFocalLength },
         { 153, printCsLensByFocalLength },
         { 161, printCsLensByFocalLength },
         { 169, printCsLensByFocalLength },
-        { 173, printCsLensByFocalLength }  // works partly
+        { 173, printCsLensByFocalLength }, // works partly
+        { 174, printCsLensByFocalLength }  // not tested
     };
 
     //! FlashActivity, tag 0x001c
@@ -636,6 +718,12 @@
         { 2, N_("On, shot only") }
     };
 
+    //! SpotMeteringMode, tag 0x0027
+    extern const TagDetails canonCsSpotMeteringMode[] = {
+        { 0,   N_("Center")   },
+        { 1,   N_("AF Point") }
+    };
+
     //! PhotoEffect, tag 0x0028
     extern const TagDetails canonCsPhotoEffect[] = {
         { 0,   N_("Off")           },
@@ -645,55 +733,73 @@
         { 4,   N_("Sepia")         },
         { 5,   N_("B&W")           },
         { 6,   N_("Custom")        },
-        { 100, N_("My color data") }
+        { 100, N_("My color data") },
+        { 100, N_("My color data") }    // To silence compiler warning
+    };
+
+    //! ManualFlashOutput, tag 0x0029
+    extern const TagDetails canonCsManualFlashOutput[] = {
+        { 0x0000, N_("n/a")    },
+        { 0x0500, N_("Full")   },
+        { 0x0502, N_("Medium") },
+        { 0x0504, N_("Low")    },
+        { 0x7fff, N_("n/a")    }
+    };
+
+    //! SRAWQuality, tag 0x002e
+    extern const TagDetails canonCsSRAWQuality[] = {
+        { 0, N_("n/a")          },
+        { 1, N_("sRAW1 (mRAW)") },
+        { 2, N_("sRAW2 (sRAW)") }
     };
 
     // Canon Camera Settings Tag Info
     const TagInfo CanonMakerNote::tagInfoCs_[] = {
-        TagInfo(0x0001, "Macro", N_("Macro"), N_("Macro mode"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsMacro)),
-        TagInfo(0x0002, "Selftimer", N_("Selftimer"), N_("Self timer"), canonCsIfdId, makerTags, unsignedShort, printCs0x0002),
-        TagInfo(0x0003, "Quality", N_("Quality"), N_("Quality"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsQuality)),
-        TagInfo(0x0004, "FlashMode", N_("Flash Mode"), N_("Flash mode setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsFlashMode)),
-        TagInfo(0x0005, "DriveMode", N_("Drive Mode"), N_("Drive mode setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsDriveMode)),
-        TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsFocusMode)),
-        TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0009, "0x0009", "0x0009", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000a, "ImageSize", N_("Image Size"), N_("Image size"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsImageSize)),
-        TagInfo(0x000b, "EasyMode", N_("Easy Mode"), N_("Easy shooting mode"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsEasyMode)),
-        TagInfo(0x000c, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsDigitalZoom)),
-        TagInfo(0x000d, "Contrast", N_("Contrast"), N_("Contrast setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsLnh)),
-        TagInfo(0x000e, "Saturation", N_("Saturation"), N_("Saturation setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsLnh)),
-        TagInfo(0x000f, "Sharpness", N_("Sharpness"), N_("Sharpness setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsLnh)),
-        TagInfo(0x0010, "ISOSpeed", N_("ISO Speed Mode"), N_("ISO speed setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsISOSpeed)),
-        TagInfo(0x0011, "MeteringMode", N_("Metering Mode"), N_("Metering mode setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsMeteringMode)),
-        TagInfo(0x0012, "FocusType", N_("Focus Type"), N_("Focus type setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsFocusType)),
-        TagInfo(0x0013, "AFPoint", N_("AF Point"), N_("AF point selected"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsAfPoint)),
-        TagInfo(0x0014, "ExposureProgram", N_("Exposure Program"), N_("Exposure mode setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsExposureProgram)),
-        TagInfo(0x0015, "0x0015", "0x0015", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0016, "LensType", N_("Lens Type"), N_("Lens type"), canonCsIfdId, makerTags, unsignedShort, printCsLensType),
-        TagInfo(0x0017, "Lens", N_("Lens"), N_("'long' and 'short' focal length of lens (in 'focal units') and 'focal units' per mm"), canonCsIfdId, makerTags, unsignedShort, printCsLens),
-        TagInfo(0x0018, "0x0018", "0x0018", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0019, "0x0019", "0x0019", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x001a, "MaxAperture", N_("Max Aperture"), N_("Max aperture"), canonCsIfdId, makerTags, unsignedShort, printSi0x0015),
-        TagInfo(0x001b, "MinAperture", N_("Min Aperture"), N_("Min aperture"), canonCsIfdId, makerTags, unsignedShort, printSi0x0015),
-        TagInfo(0x001c, "FlashActivity", N_("Flash Activity"), N_("Flash activity"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsFlashActivity)),
-        TagInfo(0x001d, "FlashDetails", N_("Flash Details"), N_("Flash details"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonCsFlashDetails)),
-        TagInfo(0x001e, "0x001e", "0x001e", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x001f, "0x001f", "0x001f", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0020, "FocusContinuous", N_("Focus Continuous"), N_("Focus continuous setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsFocusContinuous)),
-        TagInfo(0x0021, "AESetting", N_("AESetting"), N_("AE setting"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsAESetting)),
-        TagInfo(0x0022, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsImageStabilization)),
-        TagInfo(0x0023, "DisplayAperture", N_("Display Aperture"), N_("Display aperture"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0024, "ZoomSourceWidth", N_("Zoom Source Width"), N_("Zoom source width"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0025, "ZoomTargetWidth", N_("Zoom Target Width"), N_("Zoom target width"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0026, "0x0026", "0x0026", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0027, "0x0027", "0x0027", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0028, "PhotoEffect", N_("Photo Effect"), N_("Photo effect"), canonCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCsPhotoEffect)),
-        TagInfo(0x0029, "0x0029", "0x0029", N_("Unknown"), canonCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x002a, "ColorTone", N_("Color Tone"), N_("Color tone"), canonCsIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0001, "Macro", N_("Macro"), N_("Macro mode"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsMacro)),
+        TagInfo(0x0002, "Selftimer", N_("Selftimer"), N_("Self timer"), canonCsId, makerTags, signedShort, 1, printCs0x0002),
+        TagInfo(0x0003, "Quality", N_("Quality"), N_("Quality"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsQuality)),
+        TagInfo(0x0004, "FlashMode", N_("Flash Mode"), N_("Flash mode setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsFlashMode)),
+        TagInfo(0x0005, "DriveMode", N_("Drive Mode"), N_("Drive mode setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsDriveMode)),
+        TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonCsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsFocusMode)),
+        TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0009, "0x0009", "0x0009", N_("Unknown"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x000a, "ImageSize", N_("Image Size"), N_("Image size"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsImageSize)),
+        TagInfo(0x000b, "EasyMode", N_("Easy Mode"), N_("Easy shooting mode"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsEasyMode)),
+        TagInfo(0x000c, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsDigitalZoom)),
+        TagInfo(0x000d, "Contrast", N_("Contrast"), N_("Contrast setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsLnh)),
+        TagInfo(0x000e, "Saturation", N_("Saturation"), N_("Saturation setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsLnh)),
+        TagInfo(0x000f, "Sharpness", N_("Sharpness"), N_("Sharpness setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsLnh)),
+        TagInfo(0x0010, "ISOSpeed", N_("ISO Speed Mode"), N_("ISO speed setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsISOSpeed)),
+        TagInfo(0x0011, "MeteringMode", N_("Metering Mode"), N_("Metering mode setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsMeteringMode)),
+        TagInfo(0x0012, "FocusType", N_("Focus Type"), N_("Focus type setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsFocusType)),
+        TagInfo(0x0013, "AFPoint", N_("AF Point"), N_("AF point selected"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsAfPoint)),
+        TagInfo(0x0014, "ExposureProgram", N_("Exposure Program"), N_("Exposure mode setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsExposureProgram)),
+        TagInfo(0x0015, "0x0015", "0x0015", N_("Unknown"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0016, "LensType", N_("Lens Type"), N_("Lens type"), canonCsId, makerTags, signedShort, 1, printCsLensType),
+        TagInfo(0x0017, "Lens", N_("Lens"), N_("'long' and 'short' focal length of lens (in 'focal units') and 'focal units' per mm"), canonCsId, makerTags, unsignedShort, 3, printCsLens),
+        TagInfo(0x0018, "ShortFocal", N_("Short Focal"), N_("Short focal"), canonCsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0019, "FocalUnits", N_("Focal Units"), N_("Focal units"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x001a, "MaxAperture", N_("Max Aperture"), N_("Max aperture"), canonCsId, makerTags, signedShort, 1, printSi0x0015),
+        TagInfo(0x001b, "MinAperture", N_("Min Aperture"), N_("Min aperture"), canonCsId, makerTags, signedShort, 1, printSi0x0015),
+        TagInfo(0x001c, "FlashActivity", N_("Flash Activity"), N_("Flash activity"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsFlashActivity)),
+        TagInfo(0x001d, "FlashDetails", N_("Flash Details"), N_("Flash details"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG_BITMASK(canonCsFlashDetails)),
+        TagInfo(0x001e, "0x001e", "0x001e", N_("Unknown"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x001f, "0x001f", "0x001f", N_("Unknown"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0020, "FocusContinuous", N_("Focus Continuous"), N_("Focus continuous setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsFocusContinuous)),
+        TagInfo(0x0021, "AESetting", N_("AESetting"), N_("AE setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsAESetting)),
+        TagInfo(0x0022, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsImageStabilization)),
+        TagInfo(0x0023, "DisplayAperture", N_("Display Aperture"), N_("Display aperture"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0024, "ZoomSourceWidth", N_("Zoom Source Width"), N_("Zoom source width"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0025, "ZoomTargetWidth", N_("Zoom Target Width"), N_("Zoom target width"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0026, "0x0026", "0x0026", N_("Unknown"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0027, "SpotMeteringMode", N_("Spot Metering Mode"), N_("Spot metering mode"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsSpotMeteringMode)),
+        TagInfo(0x0028, "PhotoEffect", N_("Photo Effect"), N_("Photo effect"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsPhotoEffect)),
+        TagInfo(0x0029, "ManualFlashOutput", N_("Manual Flash Output"), N_("Manual flash output"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsSRAWQuality)),
+        TagInfo(0x002a, "ColorTone", N_("Color Tone"), N_("Color tone"), canonCsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x002e, "SRAWQuality", N_("SRAW Quality Tone"), N_("SRAW quality"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsSRAWQuality)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", N_("Unknown Canon Camera Settings 1 tag"), canonCsIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownCanonCsTag)", "(UnknownCanonCsTag)", N_("Unknown Canon Camera Settings 1 tag"), canonCsId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListCs()
@@ -701,7 +807,7 @@
         return tagInfoCs_;
     }
 
-    //! WhiteBalance, tag 0x0007
+    //! WhiteBalance, multiple tags
     extern const TagDetails canonSiWhiteBalance[] = {
         {  0, N_("Auto")                        },
         {  1, N_("Sunny")                       },
@@ -719,7 +825,11 @@
         { 14, N_("Daylight Fluorescent")        },
         { 15, N_("Custom 1")                    },
         { 16, N_("Custom 2")                    },
-        { 17, N_("Underwater")                  }
+        { 17, N_("Underwater")                  },
+        { 18, N_("Custom 3")                    },
+        { 19, N_("Custom 3")                    },
+        { 20, N_("PC Set 4")                    },
+        { 21, N_("PC Set 5")                    }
     };
 
     //! AFPointUsed, tag 0x000e
@@ -752,34 +862,34 @@
 
     // Canon Shot Info Tag
     const TagInfo CanonMakerNote::tagInfoSi_[] = {
-        TagInfo(0x0001, "0x0001", "0x0001", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0002, "ISOSpeed", N_("ISO Speed Used"), N_("ISO speed used"), canonSiIfdId, makerTags, unsignedShort, printSi0x0002),
-        TagInfo(0x0003, "0x0003", "0x0003", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0004, "TargetAperture", N_("Target Aperture"), N_("Target Aperture"), canonSiIfdId, makerTags, unsignedShort, printSi0x0015),
-        TagInfo(0x0005, "TargetShutterSpeed", N_("Target Shutter Speed"), N_("Target shutter speed"), canonSiIfdId, makerTags, unsignedShort, printSi0x0016),
-        TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0007, "WhiteBalance", N_("White Balance"), N_("White balance setting"), canonSiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonSiWhiteBalance)),
-        TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0009, "Sequence", N_("Sequence"), N_("Sequence number (if in a continuous burst)"), canonSiIfdId, makerTags, unsignedShort, printSi0x0009),
-        TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000b, "0x000b", "0x000b", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000c, "0x000c", "0x000c", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000d, "0x000d", "0x000d", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000e, "AFPointUsed", N_("AF Point Used"), N_("AF point used"), canonSiIfdId, makerTags, unsignedShort, printSi0x000e),
-        TagInfo(0x000f, "FlashBias", N_("Flash Bias"), N_("Flash bias"), canonSiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonSiFlashBias)),
-        TagInfo(0x0010, "0x0010", "0x0010", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0011, "0x0011", "0x0011", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0012, "0x0012", "0x0012", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0013, "SubjectDistance", N_("Subject Distance"), N_("Subject distance (units are not clear)"), canonSiIfdId, makerTags, unsignedShort, printSi0x0013),
-        TagInfo(0x0014, "0x0014", "0x0014", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0015, "ApertureValue", N_("Aperture Value"), N_("Aperture"), canonSiIfdId, makerTags, unsignedShort, printSi0x0015),
-        TagInfo(0x0016, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed"), canonSiIfdId, makerTags, unsignedShort, printSi0x0016),
-        TagInfo(0x0017, "0x0017", "0x0017", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0018, "0x0018", "0x0018", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0019, "0x0019", "0x0019", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x001a, "0x001a", "0x001a", N_("Unknown"), canonSiIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0001, "0x0001", "0x0001", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0002, "ISOSpeed", N_("ISO Speed Used"), N_("ISO speed used"), canonSiId, makerTags, unsignedShort, 1, printSi0x0002),
+        TagInfo(0x0003, "MeasuredEV", N_("Measured EV"), N_("Measured EV"), canonSiId, makerTags, unsignedShort, 1, printSi0x0003),
+        TagInfo(0x0004, "TargetAperture", N_("Target Aperture"), N_("Target Aperture"), canonSiId, makerTags, unsignedShort, 1, printSi0x0015),
+        TagInfo(0x0005, "TargetShutterSpeed", N_("Target Shutter Speed"), N_("Target shutter speed"), canonSiId, makerTags, unsignedShort, 1, printSi0x0016),
+        TagInfo(0x0006, "0x0006", "0x0006", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0007, "WhiteBalance", N_("White Balance"), N_("White balance setting"), canonSiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(canonSiWhiteBalance)),
+        TagInfo(0x0008, "0x0008", "0x0008", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0009, "Sequence", N_("Sequence"), N_("Sequence number (if in a continuous burst)"), canonSiId, makerTags, unsignedShort, 1, printSi0x0009),
+        TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000b, "0x000b", "0x000b", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000c, "0x000c", "0x000c", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000d, "0x000d", "0x000d", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000e, "AFPointUsed", N_("AF Point Used"), N_("AF point used"), canonSiId, makerTags, unsignedShort, 1, printSi0x000e),
+        TagInfo(0x000f, "FlashBias", N_("Flash Bias"), N_("Flash bias"), canonSiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(canonSiFlashBias)),
+        TagInfo(0x0010, "0x0010", "0x0010", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0011, "0x0011", "0x0011", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0012, "0x0012", "0x0012", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0013, "SubjectDistance", N_("Subject Distance"), N_("Subject distance (units are not clear)"), canonSiId, makerTags, unsignedShort, 1, printSi0x0013),
+        TagInfo(0x0014, "0x0014", "0x0014", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0015, "ApertureValue", N_("Aperture Value"), N_("Aperture"), canonSiId, makerTags, unsignedShort, 1, printSi0x0015),
+        TagInfo(0x0016, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed"), canonSiId, makerTags, unsignedShort, 1, printSi0x0016),
+        TagInfo(0x0017, "MeasuredEV2", N_("Measured EV 2"), N_("Measured EV 2"), canonSiId, makerTags, unsignedShort, 1, printSi0x0017),
+        TagInfo(0x0018, "0x0018", "0x0018", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0019, "0x0019", "0x0019", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001a, "0x001a", "0x001a", N_("Unknown"), canonSiId, makerTags, unsignedShort, 1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonSiTag)", "(UnknownCanonSiTag)", N_("Unknown Canon Camera Settings 2 tag"), canonSiIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownCanonSiTag)", "(UnknownCanonSiTag)", N_("Unknown Canon Camera Settings 2 tag"), canonSiId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListSi()
@@ -798,10 +908,10 @@
 
     // Canon Panorama Info
     const TagInfo CanonMakerNote::tagInfoPa_[] = {
-        TagInfo(0x0002, "PanoramaFrame", N_("Panorama Frame"), N_("Panorama frame number"), canonPaIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0005, "PanoramaDirection", N_("Panorama Direction"), N_("Panorama direction"), canonPaIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonPaDirection)),
+        TagInfo(0x0002, "PanoramaFrame", N_("Panorama Frame"), N_("Panorama frame number"), canonPaId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0005, "PanoramaDirection", N_("Panorama Direction"), N_("Panorama direction"), canonPaId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(canonPaDirection)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonCs2Tag)", "(UnknownCanonCs2Tag)", N_("Unknown Canon Panorama tag"), canonPaIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownCanonCs2Tag)", "(UnknownCanonCs2Tag)", N_("Unknown Canon Panorama tag"), canonPaId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListPa()
@@ -811,23 +921,23 @@
 
     // Canon Custom Function Tag Info
     const TagInfo CanonMakerNote::tagInfoCf_[] = {
-        TagInfo(0x0001, "NoiseReduction", N_("Noise Reduction"), N_("Long exposure noise reduction"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0002, "ShutterAeLock", N_("Shutter Ae Lock"), N_("Shutter/AE lock buttons"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0003, "MirrorLockup", N_("Mirror Lockup"), N_("Mirror lockup"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0004, "ExposureLevelIncrements", N_("Exposure Level Increments"), N_("Tv/Av and exposure level"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0005, "AFAssist", N_("AF Assist"), N_("AF assist light"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0006, "FlashSyncSpeedAv", N_("Flash Sync Speed Av"), N_("Shutter speed in Av mode"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0007, "AEBSequence", N_("AEB Sequence"), N_("AEB sequence/auto cancellation"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0008, "ShutterCurtainSync", N_("Shutter Curtain Sync"), N_("Shutter curtain sync"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0009, "LensAFStopButton", N_("Lens AF Stop Button"), N_("Lens AF stop button Fn. Switch"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000a, "FillFlashAutoReduction", N_("Fill Flash Auto Reduction"), N_("Auto reduction of fill flash"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000b, "MenuButtonReturn", N_("Menu Button Return"), N_("Menu button return position"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000c, "SetButtonFunction", N_("Set Button Function"), N_("SET button func. when shooting"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000d, "SensorCleaning", N_("Sensor Cleaning"), N_("Sensor cleaning"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000e, "SuperimposedDisplay", N_("Superimposed Display"), N_("Superimposed display"), canonCfIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x000f, "ShutterReleaseNoCFCard", N_("Shutter Release No CF Card"), N_("Shutter Release W/O CF Card"), canonCfIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0001, "NoiseReduction", N_("Noise Reduction"), N_("Long exposure noise reduction"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0002, "ShutterAeLock", N_("Shutter Ae Lock"), N_("Shutter/AE lock buttons"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0003, "MirrorLockup", N_("Mirror Lockup"), N_("Mirror lockup"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0004, "ExposureLevelIncrements", N_("Exposure Level Increments"), N_("Tv/Av and exposure level"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0005, "AFAssist", N_("AF Assist"), N_("AF assist light"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0006, "FlashSyncSpeedAv", N_("Flash Sync Speed Av"), N_("Shutter speed in Av mode"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0007, "AEBSequence", N_("AEB Sequence"), N_("AEB sequence/auto cancellation"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0008, "ShutterCurtainSync", N_("Shutter Curtain Sync"), N_("Shutter curtain sync"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0009, "LensAFStopButton", N_("Lens AF Stop Button"), N_("Lens AF stop button Fn. Switch"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000a, "FillFlashAutoReduction", N_("Fill Flash Auto Reduction"), N_("Auto reduction of fill flash"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000b, "MenuButtonReturn", N_("Menu Button Return"), N_("Menu button return position"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000c, "SetButtonFunction", N_("Set Button Function"), N_("SET button func. when shooting"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000d, "SensorCleaning", N_("Sensor Cleaning"), N_("Sensor cleaning"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000e, "SuperimposedDisplay", N_("Superimposed Display"), N_("Superimposed display"), canonCfId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000f, "ShutterReleaseNoCFCard", N_("Shutter Release No CF Card"), N_("Shutter Release W/O CF Card"), canonCfId, makerTags, unsignedShort, 1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonCfTag)", "(UnknownCanonCfTag)", N_("Unknown Canon Custom Function tag"), canonCfIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownCanonCfTag)", "(UnknownCanonCfTag)", N_("Unknown Canon Custom Function tag"), canonCfId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListCf()
@@ -861,14 +971,14 @@
 
     // Canon Picture Info Tag
     const TagInfo CanonMakerNote::tagInfoPi_[] = {
-        TagInfo(0x0002, "ImageWidth", N_("Image Width"), N_("Image width"), canonPiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0003, "ImageHeight", N_("Image Height"), N_("Image height"), canonPiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0004, "ImageWidthAsShot", N_("Image Width As Shot"), N_("Image width (as shot)"), canonPiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0005, "ImageHeightAsShot", N_("Image Height As Shot"), N_("Image height (as shot)"), canonPiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0016, "AFPointsUsed", N_("AF Points Used"), N_("AF points used"), canonPiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed)),
-        TagInfo(0x001a, "AFPointsUsed20D", N_("AF Points Used 20D"), N_("AF points used (20D)"), canonPiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed20D)),
+        TagInfo(0x0002, "ImageWidth", N_("Image Width"), N_("Image width"), canonPiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0003, "ImageHeight", N_("Image Height"), N_("Image height"), canonPiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0004, "ImageWidthAsShot", N_("Image Width As Shot"), N_("Image width (as shot)"), canonPiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0005, "ImageHeightAsShot", N_("Image Height As Shot"), N_("Image height (as shot)"), canonPiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0016, "AFPointsUsed", N_("AF Points Used"), N_("AF points used"), canonPiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed)),
+        TagInfo(0x001a, "AFPointsUsed20D", N_("AF Points Used 20D"), N_("AF points used (20D)"), canonPiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed20D)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonPiTag)", "(UnknownCanonPiTag)", N_("Unknown Canon Picture Info tag"), canonPiIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownCanonPiTag)", "(UnknownCanonPiTag)", N_("Unknown Canon Picture Info tag"), canonPiId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListPi()
@@ -935,20 +1045,23 @@
 
     // Canon File Info Tag
     const TagInfo CanonMakerNote::tagInfoFi_[] = {
-        TagInfo(0x0001, "FileNumber", N_("File Number"), N_("File Number"), canonFiIfdId, makerTags, unsignedLong, printFiFileNumber),
-        TagInfo(0x0003, "BracketMode", N_("Bracket Mode"), N_("Bracket Mode"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonBracketMode)),
-        TagInfo(0x0004, "BracketValue", N_("Bracket Value"), N_("Bracket Value"), canonFiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0005, "BracketShotNumber", N_("Bracket Shot Number"), N_("Bracket Shot Number"), canonFiIfdId, makerTags, signedShort,  printValue),
-        TagInfo(0x0006, "RawJpgQuality", N_("Raw Jpg Quality"), N_("Raw Jpg Quality"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonCsQuality)),
-        TagInfo(0x0007, "RawJpgSize", N_("Raw Jpg Size"), N_("Raw Jpg Size"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonRawJpgSize)),
-        TagInfo(0x0008, "NoiseReduction", N_("Noise Reduction"), N_("Noise Reduction"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonNoiseReduction)),
-        TagInfo(0x0009, "WBBracketMode", N_("WB Bracket Mode"), N_("WB Bracket Mode"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonWBBracketMode)),
-        TagInfo(0x000c, "WBBracketValueAB", N_("WB Bracket Value AB"), N_("WB Bracket Value AB"), canonFiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x000d, "WBBracketValueGM", N_("WB Bracket Value GM"), N_("WB Bracket Value GM"), canonFiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x000e, "FilterEffect", N_("Filter Effect"), N_("Filter Effect"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonFilterEffect)),
-        TagInfo(0x000f, "ToningEffect", N_("Toning Effect"), N_("Toning Effect"), canonFiIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonToningEffect)),
+        TagInfo(0x0001, "FileNumber", N_("File Number"), N_("File Number"), canonFiId, makerTags, unsignedLong, 1, printFiFileNumber),
+        TagInfo(0x0003, "BracketMode", N_("Bracket Mode"), N_("Bracket Mode"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonBracketMode)),
+        TagInfo(0x0004, "BracketValue", N_("Bracket Value"), N_("Bracket Value"), canonFiId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0005, "BracketShotNumber", N_("Bracket Shot Number"), N_("Bracket Shot Number"), canonFiId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0006, "RawJpgQuality", N_("Raw Jpg Quality"), N_("Raw Jpg Quality"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsQuality)),
+        TagInfo(0x0007, "RawJpgSize", N_("Raw Jpg Size"), N_("Raw Jpg Size"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonRawJpgSize)),
+        TagInfo(0x0008, "NoiseReduction", N_("Noise Reduction"), N_("Noise Reduction"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonNoiseReduction)),
+        TagInfo(0x0009, "WBBracketMode", N_("WB Bracket Mode"), N_("WB Bracket Mode"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonWBBracketMode)),
+        TagInfo(0x000c, "WBBracketValueAB", N_("WB Bracket Value AB"), N_("WB Bracket Value AB"), canonFiId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x000d, "WBBracketValueGM", N_("WB Bracket Value GM"), N_("WB Bracket Value GM"), canonFiId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x000e, "FilterEffect", N_("Filter Effect"), N_("Filter Effect"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonFilterEffect)),
+        TagInfo(0x000f, "ToningEffect", N_("Toning Effect"), N_("Toning Effect"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonToningEffect)),
+        TagInfo(0x0010, "MacroMagnification", N_("Macro Magnification"), N_("Macro magnification"), canonFiId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0013, "LiveViewShooting", N_("Live View Shooting"), N_("Live view shooting"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonOffOn)),
+        TagInfo(0x0019, "FlashExposureLock", N_("Flash Exposure Lock"), N_("Flash exposure lock"), canonFiId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonOffOn)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownCanonFiTag)", "(UnknownCanonFiTag)", N_("Unknown Canon File Info tag"), canonFiIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownCanonFiTag)", "(UnknownCanonFiTag)", N_("Unknown Canon File Info tag"), canonFiId, makerTags, signedShort, 1, printValue)
     };
 
     const TagInfo* CanonMakerNote::tagListFi()
@@ -956,11 +1069,77 @@
         return tagInfoFi_;
     }
 
+    //! Tone Curve Values
+    extern const TagDetails canonToneCurve[] = {
+        { 0, N_("Standard") },
+	{ 1, N_("Manual")   },
+	{ 2, N_("Custom")   }
+    };
+
+    //! Sharpness Frequency Values
+    extern const TagDetails canonSharpnessFrequency[] = {
+        { 0, N_("n/a")      },
+        { 1, N_("Lowest")   },
+        { 2, N_("Low")      },
+        { 3, N_("Standard") },
+        { 4, N_("High")     },
+        { 5, N_("Highest")  }
+    };
+
+    //! PictureStyle Values
+    extern const TagDetails canonPictureStyle[] = {
+        { 0x00, N_("None")            },
+        { 0x01, N_("Standard")        },
+        { 0x02, N_("Portrait")        },
+        { 0x03, N_("High Saturation") },
+        { 0x04, N_("Adobe RGB")       },
+        { 0x05, N_("Low Saturation")  },
+        { 0x06, N_("CM Set 1")        },
+        { 0x07, N_("CM Set 2")        },
+        { 0x21, N_("User Def. 1")     },
+        { 0x22, N_("User Def. 2")     },
+        { 0x23, N_("User Def. 3")     },
+        { 0x41, N_("PC 1")            },
+        { 0x42, N_("PC 2")            },
+        { 0x43, N_("PC 3")            },
+        { 0x81, N_("Standard")        },
+        { 0x82, N_("Portrait")        },
+        { 0x83, N_("Landscape")       },
+        { 0x84, N_("Neutral")         },
+        { 0x85, N_("Faithful")        },
+        { 0x86, N_("Monochrome")      },
+    };
+
+    // Canon Processing Info Tag
+    const TagInfo CanonMakerNote::tagInfoPr_[] = {
+        TagInfo(0x0001, "ToneCurve", N_("ToneCurve"), N_("Tone curve"), canonPrId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonToneCurve)),
+        TagInfo(0x0002, "Sharpness", N_("Sharpness"), N_("Sharpness"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0003, "SharpnessFrequency", N_("SharpnessFrequency"), N_("Sharpness frequency"), canonPrId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonSharpnessFrequency)),
+        TagInfo(0x0004, "SensorRedLevel", N_("SensorRedLevel"), N_("Sensor red level"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0005, "SensorBlueLevel", N_("SensorBlueLevel"), N_("Sensor blue level"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0006, "WhiteBalanceRed", N_("WhiteBalanceRed"), N_("White balance red"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0007, "WhiteBalanceBlue", N_("WhiteBalanceBlue"), N_("White balance blue"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0008, "WhiteBalance", N_("WhiteBalance"), N_("White balance"), canonPrId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonSiWhiteBalance)),
+        TagInfo(0x0009, "ColorTemperature", N_("ColorTemperature"), N_("Color Temperature"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x000a, "PictureStyle", N_("PictureStyle"), N_("Picture style"), canonPrId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonPictureStyle)),
+        TagInfo(0x000b, "DigitalGain", N_("DigitalGain"), N_("Digital gain"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x000c, "WBShiftAB", N_("WBShiftAB"), N_("WBShift AB"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x000d, "WBShiftGM", N_("WBShiftGM"), N_("WB Shift GM"), canonPrId, makerTags, signedShort, 1, printValue),
+        TagInfo(0xffff, "(UnknownCanonPrTag)", "(UnknownCanonPrTag)", N_("Unknown Canon Processing Info tag"), canonPrId, makerTags, signedShort, 1, printValue)
+    };
+
+    const TagInfo* CanonMakerNote::tagListPr()
+    {
+        return tagInfoPr_;
+    }
+
     std::ostream& CanonMakerNote::printFiFileNumber(std::ostream& os,
                                                     const Value& value,
                                                     const ExifData* metadata)
     {
-        if (!metadata || value.typeId() != unsignedLong) return os << "(" << value << ")";
+        if (   !metadata || value.typeId() != unsignedLong
+            || value.count() == 0) return os << "(" << value << ")";
+
         ExifData::const_iterator pos = metadata->findKey(ExifKey("Exif.Image.Model"));
         if (pos == metadata->end()) return os << "(" << value << ")";
 
@@ -1047,7 +1226,9 @@
                                                 const Value& value,
                                                 const ExifData*)
     {
-        if (value.typeId() != unsignedShort) return os << value;
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
+
         long l = value.toLong();
         if (l == 0) {
             os << "Off";
@@ -1074,7 +1255,8 @@
                                            const Value& value,
                                            const ExifData* metadata)
     {
-        if (!metadata || value.typeId() != unsignedShort) return os << value;
+        if (   !metadata || value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
 
         LensTypeAndFocalLength ltfl;
         ltfl.lensType_ = value.toLong();
@@ -1109,7 +1291,8 @@
                                                   const Value& value,
                                                   const ExifData* metadata)
     {
-        if (value.typeId() != unsignedShort) return os << "(" << value << ")";
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << "(" << value << ")";
 
         const LensIdFct* lif = find(lensIdFct, value.toLong());
         if (!lif) {
@@ -1150,15 +1333,40 @@
                                                 const Value& value,
                                                 const ExifData*)
     {
-        // Ported from Exiftool by Will Stokes
-        return os << exp(canonEv(value.toLong()) * log(2.0)) * 100.0 / 32.0;
+        if (   value.typeId() == unsignedShort
+            && value.count() > 0) {
+            // Ported from Exiftool by Will Stokes
+            os << exp(canonEv(value.toLong()) * log(2.0)) * 100.0 / 32.0;
+        }
+        return os;
+    }
+
+    std::ostream& CanonMakerNote::printSi0x0003(std::ostream& os,
+                                                const Value& value,
+                                                const ExifData*)
+    {
+        if (   value.typeId() == unsignedShort
+            && value.count() > 0) {
+            // The offset of '5' seems to be ok for most Canons (see Exiftool)
+            // It might be explained by the fakt, that most Canons have a longest
+            // exposure of 30s which is 5 EV below 1s
+            // see also printSi0x0017
+            std::ostringstream oss;
+            oss.copyfmt(os);
+            os << std::fixed << std::setprecision(2)
+               << value.toLong() / 32.0 + 5.0;
+            os.copyfmt(oss);
+        }
+        return os;
     }
 
     std::ostream& CanonMakerNote::printSi0x0009(std::ostream& os,
                                                 const Value& value,
                                                 const ExifData*)
     {
-        if (value.typeId() != unsignedShort) return os << value;
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
+
         long l = value.toLong();
         os << l << "";
         // Todo: determine unit
@@ -1169,7 +1377,9 @@
                                                 const Value& value,
                                                 const ExifData* pExifData)
     {
-        if (value.typeId() != unsignedShort) return os << value;
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
+
         long l = value.toLong();
         long num = (l & 0xf000) >> 12;
         os << num << " focus points; ";
@@ -1188,7 +1398,9 @@
                                                 const Value& value,
                                                 const ExifData*)
     {
-        if (value.typeId() != unsignedShort) return os << value;
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
+
         long l = value.toLong();
         if (l == 0xffff) {
             os << "Infinite";
@@ -1203,7 +1415,8 @@
                                                 const Value& value,
                                                 const ExifData*)
     {
-        if (value.typeId() != unsignedShort) return os << value;
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
 
         std::ostringstream oss;
         oss.copyfmt(os);
@@ -1212,7 +1425,6 @@
         os << std::setprecision(2)
            << "F" << fnumber(canonEv(val));
         os.copyfmt(oss);
-
         return os;
     }
 
@@ -1220,7 +1432,8 @@
                                                 const Value& value,
                                                 const ExifData*)
     {
-        if (value.typeId() != unsignedShort) return os << value;
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
 
         URational ur = exposureTime(canonEv(value.toLong()));
         os << ur.first;
@@ -1230,6 +1443,21 @@
         return os << " s";
     }
 
+    std::ostream& CanonMakerNote::printSi0x0017(std::ostream& os,
+                                                const Value& value,
+                                                const ExifData*)
+    {
+        if (   value.typeId() != unsignedShort
+            || value.count() == 0) return os << value;
+
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(2)
+           << value.toLong() / 8.0 - 6.0;
+        os.copyfmt(oss);
+        return os;
+    }
+
 // *****************************************************************************
 // free functions
 
@@ -1254,4 +1482,4 @@
         return sign * (val + frac) / 32.0f;
     }
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/canonmn.hpp exiv2-0.21/src/canonmn.hpp
--- exiv2-0.19/src/canonmn.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/canonmn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    canonmn.hpp
-  @brief   Canon makernote tags.<BR>References:<BR>
-           [1] <a href="http://www.burren.cx/david/canon.html">EXIF MakerNote of Canon</a> by David Burren<br>
-           [2] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html">Canon makernote tags</a> by Phil Harvey
-  @version $Rev: 1937 $
-  @author  <a href="mailto:ahuggel@gmx.net">Andreas Huggel (ahu)</a><br>
-           <a href="mailto:david@edeca.net">David Cannings (dc)</a>
-           <a href="mailto:andi.clemens@gmx.net">Andi Clemens (ac)</a>
-  @date    18-Feb-04, ahu: created<BR>
-           07-Mar-04, ahu: isolated as a separate component<BR>
-           12-Aug-06,  dc: started updating all tags
- */
-#ifndef CANONMN_HPP_
-#define CANONMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <iosfwd>
-#include <memory>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class declarations
-    class Value;
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Canon cameras
-    class EXIV2API CanonMakerNote {
-    public:
-        //! Return read-only list of built-in Canon tags
-        static const TagInfo* tagList();
-        //! Return read-only list of built-in Canon Camera Settings tags
-        static const TagInfo* tagListCs();
-        //! Return read-only list of built-in Canon Shot Info tags
-        static const TagInfo* tagListSi();
-        //! Return read-only list of built-in Canon Panorama tags
-        static const TagInfo* tagListPa();
-        //! Return read-only list of built-in Canon Custom Function tags
-        static const TagInfo* tagListCf();
-        //! Return read-only list of built-in Canon Picture Info tags
-        static const TagInfo* tagListPi();
-        //! Return read-only list of built-in Canon File Info tags
-        static const TagInfo* tagListFi();
-
-        //! @name Print functions for Canon %MakerNote tags
-        //@{
-        //! Print the FileInfo FileNumber
-        static std::ostream& printFiFileNumber(std::ostream& os, const Value& value, const ExifData* metadata);
-        //! Print the focal length
-        static std::ostream& printFocalLength(std::ostream& os, const Value& value, const ExifData*);
-        //! Print the image number
-        static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
-        //! Print the serial number of the camera
-        static std::ostream& print0x000c(std::ostream& os, const Value& value, const ExifData*);
-        //! Self timer
-        static std::ostream& printCs0x0002(std::ostream& os, const Value& value, const ExifData*);
-        //! Camera lens type. For some values, the exact type can only be determined if \em metadata is provided.
-        static std::ostream& printCsLensType(std::ostream& os, const Value& value, const ExifData* metadata);
-        //! Camera lens information
-        static std::ostream& printCsLens(std::ostream& os, const Value& value, const ExifData*);
-        //! ISO speed used
-        static std::ostream& printSi0x0002(std::ostream& os, const Value& value, const ExifData*);
-        //! Sequence number
-        static std::ostream& printSi0x0009(std::ostream& os, const Value& value, const ExifData*);
-        //! AF point used
-        static std::ostream& printSi0x000e(std::ostream& os, const Value& value, const ExifData* pExifData);
-        //! Subject distance
-        static std::ostream& printSi0x0013(std::ostream& os, const Value& value, const ExifData*);
-        //! Aperture
-        static std::ostream& printSi0x0015(std::ostream& os, const Value& value, const ExifData*);
-        //! Shutter speed
-        static std::ostream& printSi0x0016(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        // DATA
-
-        //! Tag information
-        static const TagInfo tagInfo_[];
-        static const TagInfo tagInfoCs_[];
-        static const TagInfo tagInfoSi_[];
-        static const TagInfo tagInfoCf_[];
-        static const TagInfo tagInfoPi_[];
-        static const TagInfo tagInfoFi_[];
-        static const TagInfo tagInfoPa_[];
-
-    }; // class CanonMakerNote
-
-// *****************************************************************************
-// template, inline and free functions
-
-    /*!
-       @brief Convert Canon hex-based EV (modulo 0x20) to real number
-              Ported from Phil Harvey's Image::ExifTool::Canon::CanonEv
-              by Will Stokes
-
-       0x00 -> 0
-       0x0c -> 0.33333
-       0x10 -> 0.5
-       0x14 -> 0.66666
-       0x20 -> 1
-       ..
-       160 -> 5
-       128 -> 4
-       143 -> 4.46875
-     */
-    EXIV2API float canonEv(long val);
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef CANONMN_HPP_
diff -Nru exiv2-0.19/src/canonmn_int.hpp exiv2-0.21/src/canonmn_int.hpp
--- exiv2-0.19/src/canonmn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/canonmn_int.hpp	2010-08-16 14:14:42.000000000 +0000
@@ -0,0 +1,148 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    canonmn_int.hpp
+  @brief   Canon makernote tags.<BR>References:<BR>
+           [1] <a href="http://www.burren.cx/david/canon.html">EXIF MakerNote of Canon</a> by David Burren<br>
+           [2] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html">Canon makernote tags</a> by Phil Harvey
+  @version $Rev: 2323 $
+  @author  <a href="mailto:ahuggel@gmx.net">Andreas Huggel (ahu)</a><br>
+           <a href="mailto:david@edeca.net">David Cannings (dc)</a>
+           <a href="mailto:andi.clemens@gmx.net">Andi Clemens (ac)</a>
+  @date    18-Feb-04, ahu: created<BR>
+           07-Mar-04, ahu: isolated as a separate component<BR>
+           12-Aug-06,  dc: started updating all tags
+ */
+#ifndef CANONMN_INT_HPP_
+#define CANONMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+#include <memory>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    class Value;
+
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Canon cameras
+    class CanonMakerNote {
+    public:
+        //! Return read-only list of built-in Canon tags
+        static const TagInfo* tagList();
+        //! Return read-only list of built-in Canon Camera Settings tags
+        static const TagInfo* tagListCs();
+        //! Return read-only list of built-in Canon Shot Info tags
+        static const TagInfo* tagListSi();
+        //! Return read-only list of built-in Canon Panorama tags
+        static const TagInfo* tagListPa();
+        //! Return read-only list of built-in Canon Custom Function tags
+        static const TagInfo* tagListCf();
+        //! Return read-only list of built-in Canon Picture Info tags
+        static const TagInfo* tagListPi();
+        //! Return read-only list of built-in Canon File Info tags
+        static const TagInfo* tagListFi();
+        //! Return read-only list of built-in Canon Processing Info tags
+        static const TagInfo* tagListPr();
+
+        //! @name Print functions for Canon %MakerNote tags
+        //@{
+        //! Print the FileInfo FileNumber
+        static std::ostream& printFiFileNumber(std::ostream& os, const Value& value, const ExifData* metadata);
+        //! Print the focal length
+        static std::ostream& printFocalLength(std::ostream& os, const Value& value, const ExifData*);
+        //! Print the image number
+        static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
+        //! Print the serial number of the camera
+        static std::ostream& print0x000c(std::ostream& os, const Value& value, const ExifData*);
+        //! Self timer
+        static std::ostream& printCs0x0002(std::ostream& os, const Value& value, const ExifData*);
+        //! Camera lens type. For some values, the exact type can only be determined if \em metadata is provided.
+        static std::ostream& printCsLensType(std::ostream& os, const Value& value, const ExifData* metadata);
+        //! Camera lens information
+        static std::ostream& printCsLens(std::ostream& os, const Value& value, const ExifData*);
+        //! ISO speed used
+        static std::ostream& printSi0x0002(std::ostream& os, const Value& value, const ExifData*);
+        //! MeasuredEV
+        static std::ostream& printSi0x0003(std::ostream& os, const Value& value, const ExifData*);
+        //! Sequence number
+        static std::ostream& printSi0x0009(std::ostream& os, const Value& value, const ExifData*);
+        //! AF point used
+        static std::ostream& printSi0x000e(std::ostream& os, const Value& value, const ExifData* pExifData);
+        //! Subject distance
+        static std::ostream& printSi0x0013(std::ostream& os, const Value& value, const ExifData*);
+        //! Aperture
+        static std::ostream& printSi0x0015(std::ostream& os, const Value& value, const ExifData*);
+        //! Shutter speed
+        static std::ostream& printSi0x0016(std::ostream& os, const Value& value, const ExifData*);
+        //! MeasuredEV2
+        static std::ostream& printSi0x0017(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        // DATA
+
+        //! Tag information
+        static const TagInfo tagInfo_[];
+        static const TagInfo tagInfoCs_[];
+        static const TagInfo tagInfoSi_[];
+        static const TagInfo tagInfoCf_[];
+        static const TagInfo tagInfoPi_[];
+        static const TagInfo tagInfoFi_[];
+        static const TagInfo tagInfoPa_[];
+        static const TagInfo tagInfoPr_[];
+
+    }; // class CanonMakerNote
+
+// *****************************************************************************
+// template, inline and free functions
+
+    /*!
+       @brief Convert Canon hex-based EV (modulo 0x20) to real number
+              Ported from Phil Harvey's Image::ExifTool::Canon::CanonEv
+              by Will Stokes
+
+       0x00 -> 0
+       0x0c -> 0.33333
+       0x10 -> 0.5
+       0x14 -> 0.66666
+       0x20 -> 1
+       ..
+       160 -> 5
+       128 -> 4
+       143 -> 4.46875
+     */
+    float canonEv(long val);
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef CANONMN_INT_HPP_
diff -Nru exiv2-0.19/src/convert.cpp exiv2-0.21/src/convert.cpp
--- exiv2-0.19/src/convert.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/convert.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,15 +20,15 @@
  */
 /*
   File:      convert.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2344 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
              Vladimir Nadvornik (vn) <nadvornik@suse.cz>
   History:   17-Mar-08, ahu: created basic converter framework
              20-May-08, vn:  added actual conversion logic
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: convert.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: convert.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -42,6 +42,7 @@
 // + standard includes
 #include <iostream>
 #include <iomanip>
+#include <ios>
 #include <sstream>
 #include <stdio.h> // for snprintf (C99)
 #ifdef _MSC_VER
@@ -73,12 +74,6 @@
       The return code indicates if the operation was successful.
      */
     bool getTextValue(std::string& value, const Exiv2::XmpData::iterator& pos);
-
-    /*!
-      @brief Convert string charset with iconv.
-     */
-    bool convertStringCharset(std::string &str, const char* from, const char* to);
-
 }
 
 // *****************************************************************************
@@ -406,7 +401,7 @@
         { mdIptc, "Iptc.Application2.SuppCategory",       "Xmp.photoshop.SupplementalCategory", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
         { mdIptc, "Iptc.Application2.Keywords",           "Xmp.dc.subject",                     &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
         { mdIptc, "Iptc.Application2.SubLocation",        "Xmp.iptc.Location",                  &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
-        { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instruction",          &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
+        { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instructions",         &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
         { mdIptc, "Iptc.Application2.DateCreated",        "Xmp.photoshop.DateCreated",          &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
         { mdIptc, "Iptc.Application2.Byline",             "Xmp.dc.creator",                     &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
         { mdIptc, "Iptc.Application2.BylineTitle",        "Xmp.photoshop.AuthorsPosition",      &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
@@ -492,7 +487,7 @@
         std::string value = pos->toString();
         if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -509,7 +504,7 @@
         const CommentValue* cv = dynamic_cast<const CommentValue*>(&pos->value());
         if (cv == 0) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -527,7 +522,7 @@
             std::string value = pos->toString(i);
             if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
@@ -549,14 +544,14 @@
             std::string value = pos->toString();
             if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
             if (sscanf(value.c_str(), "%d:%d:%d %d:%d:%d", &year, &month, &day, &hour, &min, &sec) != 6) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to
-                          << ", unable to parse '" << value << "'\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to
+                            << ", unable to parse '" << value << "'\n";
 #endif
                 return;
             }
@@ -575,7 +570,7 @@
             }
             if (!ok) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
@@ -588,7 +583,7 @@
 
             if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
@@ -616,15 +611,15 @@
             }
             if (datePos == exifData_->end()) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
             std::string value = datePos->toString();
             if (sscanf(value.c_str(), "%d:%d:%d", &year, &month, &day) != 3) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to
-                          << ", unable to parse '" << value << "'\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to
+                            << ", unable to parse '" << value << "'\n";
 #endif
                 return;
             }
@@ -699,7 +694,7 @@
         int value = pos->toLong();
         if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -720,14 +715,14 @@
         if (!prepareXmpTarget(to)) return;
         if (pos->count() != 3) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
         Exiv2::ExifData::iterator refPos = exifData_->findKey(ExifKey(std::string(from) + "Ref"));
         if (refPos == exifData_->end()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -737,7 +732,7 @@
             const int32_t d = pos->toRational(i).second;
             if (d == 0) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
@@ -765,7 +760,7 @@
         std::string value;
         if (!getTextValue(value, pos)) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -786,7 +781,7 @@
         std::string value;
         if (!getTextValue(value, pos)) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -805,11 +800,12 @@
             std::string value = pos->toString(i);
             if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
-            array << value << " ";
+            array << value;
+            if (i != pos->count() - 1) array << " ";
         }
         (*exifData_)[to] = array.str();
         if (erase_) xmpData_->erase(pos);
@@ -824,7 +820,7 @@
         std::string value = pos->toString();
         if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -832,12 +828,16 @@
         try {
             SXMPUtils::ConvertToDate(value, &datetime);
         }
-        catch (const XMP_Error& e) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << " (" << e.GetErrMsg() << ")\n";
-#endif
+        catch (const XMP_Error& e) {
+            EXV_WARNING << "Failed to convert " << from << " to " << to << " (" << e.GetErrMsg() << ")\n";
+            return;
+        }
+#else
+        catch (const XMP_Error&) {
             return;
         }
+#endif // SUPPRESS_WARNINGS
         char buf[30];
         if (std::string(to) != "Exif.GPSInfo.GPSTimeStamp") {
 
@@ -904,7 +904,7 @@
         if (erase_) xmpData_->erase(pos);
 #else
 # ifndef SUPPRESS_WARNINGS
-        std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+        EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 # endif
 #endif // !EXV_HAVE_XMP_TOOLKIT
     }
@@ -917,7 +917,7 @@
         std::string value = pos->toString();
         if (!pos->value().ok() || value.length() < 4) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -940,7 +940,7 @@
         std::string value = pos->toString();
         if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -966,7 +966,7 @@
                 value |= fired & 1;
 #ifndef SUPPRESS_WARNINGS
             else
-                std::cerr << "Warning: Failed to convert " << std::string(from) + "/exif:Fired" << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Fired" << " to " << to << "\n";
 #endif
         }
         pos = xmpData_->findKey(XmpKey(std::string(from) + "/exif:Return"));
@@ -976,7 +976,7 @@
                 value |= (ret & 3) << 1;
 #ifndef SUPPRESS_WARNINGS
             else
-                std::cerr << "Warning: Failed to convert " << std::string(from) + "/exif:Return" << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Return" << " to " << to << "\n";
 #endif
         }
         pos = xmpData_->findKey(XmpKey(std::string(from) + "/exif:Mode"));
@@ -986,7 +986,7 @@
                 value |= (mode & 3) << 3;
 #ifndef SUPPRESS_WARNINGS
             else
-                std::cerr << "Warning: Failed to convert " << std::string(from) + "/exif:Mode" << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Mode" << " to " << to << "\n";
 #endif
         }
         pos = xmpData_->findKey(XmpKey(std::string(from) + "/exif:Function"));
@@ -996,7 +996,7 @@
                 value |= (function & 1) << 5;
 #ifndef SUPPRESS_WARNINGS
             else
-                std::cerr << "Warning: Failed to convert " << std::string(from) + "/exif:Function" << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Function" << " to " << to << "\n";
 #endif
         }
         pos = xmpData_->findKey(XmpKey(std::string(from) + "/exif:RedEyeMode"));
@@ -1006,7 +1006,7 @@
                 value |= (red & 1) << 6;
 #ifndef SUPPRESS_WARNINGS
             else
-                std::cerr << "Warning: Failed to convert " << std::string(from) + "/exif:RedEyeMode" << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:RedEyeMode" << " to " << to << "\n";
 #endif
         }
 
@@ -1022,13 +1022,13 @@
         std::string value = pos->toString();
         if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
         if (value.empty()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: " << from << " is empty\n";
+            EXV_WARNING << from << " is empty\n";
 #endif
             return;
         }
@@ -1059,7 +1059,7 @@
         if (   in.bad() || !(ref == 'N' || ref == 'S' || ref == 'E' || ref == 'W')
             || sep1 != ',' || sep2 != ',' || !in.eof()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+            EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
             return;
         }
@@ -1089,7 +1089,7 @@
                 std::string value = pos->toString();
                 if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                    EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                     ++pos;
                     continue;
@@ -1115,7 +1115,7 @@
             std::string value;
             if (!getTextValue(value, pos)) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 return;
             }
@@ -1131,7 +1131,7 @@
             std::string value = pos->toString(i);
             if (!pos->value().ok()) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to convert " << from << " to " << to << "\n";
+                EXV_WARNING << "Failed to convert " << from << " to " << to << "\n";
 #endif
                 continue;
             }
@@ -1315,39 +1315,6 @@
         converter.cnvFromXmp();
     }
 
-}                                       // namespace Exiv2
-
-// *****************************************************************************
-// local definitions
-namespace {
-
-    bool getTextValue(std::string& value, const Exiv2::XmpData::iterator& pos)
-    {
-        if (pos->typeId() == Exiv2::langAlt) {
-            // get the default language entry without x-default qualifier
-            value = pos->toString(0);
-            if (!pos->value().ok() && pos->count() == 1) {
-                // If there is no default but exactly one entry, take that
-                // without the qualifier
-                value = pos->toString();
-                if (   pos->value().ok()
-                    && value.length() > 5 && value.substr(0, 5) == "lang=") {
-                    std::string::size_type pos = value.find_first_of(' ');
-                    if (pos != std::string::npos) {
-                        value = value.substr(pos + 1);
-                    }
-                    else {
-                        value.clear();
-                    }
-                }
-            }
-        }
-        else {
-            value = pos->toString();
-        }
-        return pos->value().ok();
-    }
-
     bool convertStringCharset(std::string &str, const char* from, const char* to)
     {
         if (0 == strcmp(from, to)) return true; // nothing to do
@@ -1357,14 +1324,13 @@
         cd = iconv_open(to, from);
         if (cd == (iconv_t)(-1)) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: iconv_open: " << Exiv2::strError() << "\n";
+            EXV_WARNING << "iconv_open: " << strError() << "\n";
 #endif
             return false;
         }
         std::string outstr;
         EXV_ICONV_CONST char *inptr = const_cast<char *>(str.c_str());
         size_t inbytesleft = str.length();
-
         while (inbytesleft) {
             char outbuf[100];
             char *outptr = outbuf;
@@ -1374,17 +1340,17 @@
                               &inbytesleft,
                               &outptr,
                               &outbytesleft);
+            int outbytesProduced = sizeof(outbuf) - 1 - outbytesleft;
             if (rc == size_t(-1) && errno != E2BIG) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: iconv: "
-                          << Exiv2::strError()
-                          << " inbytesleft = " << inbytesleft << "\n";
+                EXV_WARNING << "iconv: " << strError()
+                            << " inbytesleft = " << inbytesleft << "\n";
 #endif
                 ret = false;
                 break;
             }
             *outptr = '\0';
-            outstr.append(outbuf);
+            outstr.append(std::string(outbuf, outbytesProduced));
         }
         if (cd != (iconv_t)(-1)) {
             iconv_close(cd);
@@ -1397,4 +1363,37 @@
 #endif // EXV_HAVE_ICONV
     }
 
+}                                       // namespace Exiv2
+
+// *****************************************************************************
+// local definitions
+namespace {
+
+    bool getTextValue(std::string& value, const Exiv2::XmpData::iterator& pos)
+    {
+        if (pos->typeId() == Exiv2::langAlt) {
+            // get the default language entry without x-default qualifier
+            value = pos->toString(0);
+            if (!pos->value().ok() && pos->count() == 1) {
+                // If there is no default but exactly one entry, take that
+                // without the qualifier
+                value = pos->toString();
+                if (   pos->value().ok()
+                    && value.length() > 5 && value.substr(0, 5) == "lang=") {
+                    std::string::size_type pos = value.find_first_of(' ');
+                    if (pos != std::string::npos) {
+                        value = value.substr(pos + 1);
+                    }
+                    else {
+                        value.clear();
+                    }
+                }
+            }
+        }
+        else {
+            value = pos->toString();
+        }
+        return pos->value().ok();
+    }
+
 }
diff -Nru exiv2-0.19/src/convert.hpp exiv2-0.21/src/convert.hpp
--- exiv2-0.19/src/convert.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/convert.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    convert.hpp
   @brief   Exif and IPTC conversions to and from XMP
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a><BR>
            Vladimir Nadvornik (vn)
@@ -41,6 +41,7 @@
 #endif
 
 // + standard includes
+#include <string>
 
 // *****************************************************************************
 // namespace extensions
@@ -78,6 +79,9 @@
     //! Convert (move) XMP properties to IPTC tags, remove converted XMP properties.
     EXIV2API void moveXmpToIptc(XmpData& xmpData, IptcData& iptcData);
 
+    //! Convert string charset with iconv.
+    EXIV2API bool convertStringCharset(std::string& str, const char* from, const char* to);
+
 }                                       // namespace Exiv2
 
 #endif                                  // #ifndef CONVERT_HPP_
diff -Nru exiv2-0.19/src/cr2image.cpp exiv2-0.21/src/cr2image.cpp
--- exiv2-0.19/src/cr2image.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/cr2image.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      cr2image.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   22-Apr-06, ahu: created
 
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: cr2image.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: cr2image.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -154,11 +154,11 @@
 
     WriteMethod Cr2Parser::encode(
               Blob&     blob,
-        const byte*     pData,
-              uint32_t  size,
-        const ExifData& exifData,
-        const IptcData& iptcData,
-        const XmpData&  xmpData
+        const byte*     /*pData*/,
+              uint32_t  /*size*/,
+        const ExifData& /*exifData*/,
+        const IptcData& /*iptcData*/,
+        const XmpData&  /*xmpData*/
     )
     {
         /* Todo: Implement me!
diff -Nru exiv2-0.19/src/cr2image.hpp exiv2-0.21/src/cr2image.hpp
--- exiv2-0.19/src/cr2image.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/cr2image.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    cr2image.hpp
   @brief   Class Cr2Image
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    22-Apr-06, ahu: created
diff -Nru exiv2-0.19/src/cr2image_int.hpp exiv2-0.21/src/cr2image_int.hpp
--- exiv2-0.19/src/cr2image_int.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/cr2image_int.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    cr2image_int.hpp
   @brief   Internal classes to support CR2 image format
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    23-Apr-08, ahu: created
diff -Nru exiv2-0.19/src/crwimage.cpp exiv2-0.21/src/crwimage.cpp
--- exiv2-0.19/src/crwimage.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/crwimage.cpp	2010-08-30 19:33:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      crwimage.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2336 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   28-Aug-05, ahu: created
 
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: crwimage.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: crwimage.cpp 2336 2010-08-30 19:33:07Z ahuggel $")
 
 // Define DEBUG to output debug information to std::cerr, e.g, by calling make
 // like this: make DEFS=-DDEBUG crwimage.o
@@ -47,7 +47,8 @@
 #include "futils.hpp"
 #include "value.hpp"
 #include "tags.hpp"
-#include "canonmn.hpp"
+#include "tags_int.hpp"
+#include "canonmn_int.hpp"
 #include "i18n.h"                // NLS support.
 
 // + standard includes
@@ -269,33 +270,33 @@
       the other parameters in the mapping structure.
     */
     const CrwMapping CrwMap::crwMapping_[] = {
-        //         CrwTag  CrwDir  Size ExifTag IfdId        decodeFct     encodeFct
-        //         ------  ------  ---- ------- -----        ---------     ---------
-        CrwMapping(0x0805, 0x300a,   0, 0,      canonIfdId,  decode0x0805, encode0x0805),
-        CrwMapping(0x080a, 0x2807,   0, 0,      canonIfdId,  decode0x080a, encode0x080a),
-        CrwMapping(0x080b, 0x3004,   0, 0x0007, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x0810, 0x2807,   0, 0x0009, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x0815, 0x2804,   0, 0x0006, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x1029, 0x300b,   0, 0x0002, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x102a, 0x300b,   0, 0x0004, canonIfdId,  decodeArray,  encodeArray),
-        CrwMapping(0x102d, 0x300b,   0, 0x0001, canonIfdId,  decodeArray,  encodeArray),
-        CrwMapping(0x1033, 0x300b,   0, 0x000f, canonIfdId,  decodeArray,  encodeArray),
-        CrwMapping(0x1038, 0x300b,   0, 0x0012, canonIfdId,  decodeArray,  encodeArray),
-        CrwMapping(0x10a9, 0x300b,   0, 0x00a9, canonIfdId,  decodeBasic,  encodeBasic),
+        //         CrwTag  CrwDir  Size ExifTag IfdId    decodeFct     encodeFct
+        //         ------  ------  ---- ------- -----    ---------     ---------
+        CrwMapping(0x0805, 0x300a,   0, 0,      canonId, decode0x0805, encode0x0805),
+        CrwMapping(0x080a, 0x2807,   0, 0,      canonId, decode0x080a, encode0x080a),
+        CrwMapping(0x080b, 0x3004,   0, 0x0007, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x0810, 0x2807,   0, 0x0009, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x0815, 0x2804,   0, 0x0006, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x1029, 0x300b,   0, 0x0002, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x102a, 0x300b,   0, 0x0004, canonId, decodeArray,  encodeArray),
+        CrwMapping(0x102d, 0x300b,   0, 0x0001, canonId, decodeArray,  encodeArray),
+        CrwMapping(0x1033, 0x300b,   0, 0x000f, canonId, decodeArray,  encodeArray),
+        CrwMapping(0x1038, 0x300b,   0, 0x0012, canonId, decodeArray,  encodeArray),
+        CrwMapping(0x10a9, 0x300b,   0, 0x00a9, canonId, decodeBasic,  encodeBasic),
         // Mapped to Exif.Photo.ColorSpace instead (see below)
-        //CrwMapping(0x10b4, 0x300b,   0, 0x00b4, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x10b4, 0x300b,   0, 0xa001, exifIfdId,   decodeBasic,  encodeBasic),
-        CrwMapping(0x10b5, 0x300b,   0, 0x00b5, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x10c0, 0x300b,   0, 0x00c0, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x10c1, 0x300b,   0, 0x00c1, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x1807, 0x3002,   0, 0x9206, exifIfdId,   decodeBasic,  encodeBasic),
-        CrwMapping(0x180b, 0x3004,   0, 0x000c, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x180e, 0x300a,   0, 0x9003, exifIfdId,   decode0x180e, encode0x180e),
-        CrwMapping(0x1810, 0x300a,   0, 0xa002, exifIfdId,   decode0x1810, encode0x1810),
-        CrwMapping(0x1817, 0x300a,   4, 0x0008, canonIfdId,  decodeBasic,  encodeBasic),
-        //CrwMapping(0x1818, 0x3002,   0, 0x9204, exifIfdId,   decodeBasic,  encodeBasic),
-        CrwMapping(0x183b, 0x300b,   0, 0x0015, canonIfdId,  decodeBasic,  encodeBasic),
-        CrwMapping(0x2008, 0x0000,   0, 0,      ifd1Id,      decode0x2008, encode0x2008),
+        //CrwMapping(0x10b4, 0x300b,   0, 0x00b4, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x10b4, 0x300b,   0, 0xa001, exifId,  decodeBasic,  encodeBasic),
+        CrwMapping(0x10b5, 0x300b,   0, 0x00b5, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x10c0, 0x300b,   0, 0x00c0, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x10c1, 0x300b,   0, 0x00c1, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x1807, 0x3002,   0, 0x9206, exifId,  decodeBasic,  encodeBasic),
+        CrwMapping(0x180b, 0x3004,   0, 0x000c, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x180e, 0x300a,   0, 0x9003, exifId,  decode0x180e, encode0x180e),
+        CrwMapping(0x1810, 0x300a,   0, 0xa002, exifId,  decode0x1810, encode0x1810),
+        CrwMapping(0x1817, 0x300a,   4, 0x0008, canonId, decodeBasic,  encodeBasic),
+        //CrwMapping(0x1818, 0x3002,   0, 0x9204, exifId, decodeBasic,  encodeBasic),
+        CrwMapping(0x183b, 0x300b,   0, 0x0015, canonId, decodeBasic,  encodeBasic),
+        CrwMapping(0x2008, 0x0000,   0, 0,      ifd1Id,  decode0x2008, encode0x2008),
         // End of list marker
         CrwMapping(0x0000, 0x0000,   0, 0x0000, ifdIdNotSet, 0,            0)
     }; // CrwMap::crwMapping_[]
@@ -1010,28 +1011,28 @@
 
         IfdId ifdId = ifdIdNotSet;
         switch (pCrwMapping->tag_) {
-        case 0x0001: ifdId = canonCsIfdId; break;
-        case 0x0004: ifdId = canonSiIfdId; break;
-        case 0x000f: ifdId = canonCfIfdId; break;
-        case 0x0012: ifdId = canonPiIfdId; break;
+        case 0x0001: ifdId = canonCsId; break;
+        case 0x0004: ifdId = canonSiId; break;
+        case 0x000f: ifdId = canonCfId; break;
+        case 0x0012: ifdId = canonPiId; break;
         }
         assert(ifdId != ifdIdNotSet);
 
-        std::string ifdItem(ExifTags::ifdItem(ifdId));
+        std::string groupName(Internal::groupName(ifdId));
         uint16_t c = 1;
         while (uint32_t(c)*2 < ciffComponent.size()) {
             uint16_t n = 1;
-            ExifKey key(c, ifdItem);
+            ExifKey key(c, groupName);
             UShortValue value;
-            if (ifdId == canonCsIfdId && c == 23 && ciffComponent.size() > 50) n = 3;
+            if (ifdId == canonCsId && c == 23 && ciffComponent.size() > 50) n = 3;
             value.read(ciffComponent.pData() + c*2, n*2, byteOrder);
             image.exifData().add(key, &value);
-            if (ifdId == canonSiIfdId && c == 21) aperture = value.toLong();
-            if (ifdId == canonSiIfdId && c == 22) shutterSpeed = value.toLong();
+            if (ifdId == canonSiId && c == 21) aperture = value.toLong();
+            if (ifdId == canonSiId && c == 22) shutterSpeed = value.toLong();
             c += n;
         }
 
-        if (ifdId == canonSiIfdId) {
+        if (ifdId == canonSiId) {
             // Exif.Photo.FNumber
             float f = fnumber(canonEv(aperture));
             URational ur = floatToRationalCast(f);
@@ -1071,7 +1072,7 @@
             char s[m];
             std::strftime(s, m, "%Y:%m:%d %H:%M:%S", tm);
 
-            ExifKey key(pCrwMapping->tag_, ExifTags::ifdItem(pCrwMapping->ifdId_));
+            ExifKey key(pCrwMapping->tag_, Internal::groupName(pCrwMapping->ifdId_));
             AsciiValue value;
             value.read(std::string(s));
             image.exifData().add(key, &value);
@@ -1119,7 +1120,7 @@
     {
         assert(pCrwMapping != 0);
         // create a key and value pair
-        ExifKey key(pCrwMapping->tag_, ExifTags::ifdItem(pCrwMapping->ifdId_));
+        ExifKey key(pCrwMapping->tag_, Internal::groupName(pCrwMapping->ifdId_));
         Value::AutoPtr value;
         if (ciffComponent.typeId() != directory) {
             value = Value::create(ciffComponent.typeId());
@@ -1174,7 +1175,7 @@
         assert(pHead != 0);
 
         // Determine the source Exif metadatum
-        ExifKey ek(pCrwMapping->tag_, ExifTags::ifdItem(pCrwMapping->ifdId_));
+        ExifKey ek(pCrwMapping->tag_, Internal::groupName(pCrwMapping->ifdId_));
         ExifData::const_iterator ed = image.exifData().findKey(ek);
 
         // Set the new value or remove the entry
@@ -1253,10 +1254,10 @@
 
         IfdId ifdId = ifdIdNotSet;
         switch (pCrwMapping->tag_) {
-        case 0x0001: ifdId = canonCsIfdId; break;
-        case 0x0004: ifdId = canonSiIfdId; break;
-        case 0x000f: ifdId = canonCfIfdId; break;
-        case 0x0012: ifdId = canonPiIfdId; break;
+        case 0x0001: ifdId = canonCsId; break;
+        case 0x0004: ifdId = canonSiId; break;
+        case 0x000f: ifdId = canonCfId; break;
+        case 0x0012: ifdId = canonPiId; break;
         }
         assert(ifdId != ifdIdNotSet);
         DataBuf buf = packIfdId(image.exifData(), ifdId, pHead->byteOrder());
@@ -1282,7 +1283,7 @@
         assert(pHead != 0);
 
         time_t t = 0;
-        const ExifKey key(pCrwMapping->tag_, ExifTags::ifdItem(pCrwMapping->ifdId_));
+        const ExifKey key(pCrwMapping->tag_, Internal::groupName(pCrwMapping->ifdId_));
         const ExifData::const_iterator ed = image.exifData().findKey(key);
         if (ed != image.exifData().end()) {
             struct tm tm;
diff -Nru exiv2-0.19/src/crwimage.hpp exiv2-0.21/src/crwimage.hpp
--- exiv2-0.19/src/crwimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/crwimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -23,7 +23,7 @@
   @brief   Class CrwImage to access Canon CRW images.<BR>
            References:<BR>
            <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/canon_raw.html">The Canon RAW (CRW) File Format</a> by Phil Harvey
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    28-Aug-05, ahu: created
diff -Nru exiv2-0.19/src/crwimage_int.hpp exiv2-0.21/src/crwimage_int.hpp
--- exiv2-0.19/src/crwimage_int.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/crwimage_int.hpp	2010-08-28 17:47:45.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    crwimage_int.hpp
   @brief   Internal classes to support CRW/CIFF format.
-  @version $Rev: 1937 $
+  @version $Rev: 2331 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    28-Aug-05, ahu: created
@@ -32,6 +32,7 @@
 // *****************************************************************************
 // included header files
 #include "types.hpp"
+#include "tags_int.hpp"
 #include "image.hpp"
 #include "basicio.hpp"
 
@@ -556,7 +557,7 @@
             uint16_t      crwDir,
             uint32_t      size,
             uint16_t      tag,
-            IfdId         ifdId,
+            Internal::IfdId ifdId,
             CrwDecodeFct  toExif,
             CrwEncodeFct  fromExif)
             : crwTagId_ (crwTagId),
diff -Nru exiv2-0.19/src/datasets.cpp exiv2-0.21/src/datasets.cpp
--- exiv2-0.19/src/datasets.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/datasets.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      datasets.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Brad Schick (brad) <brad@robotbattle.com>
-             Gilles Caulier (gc) <caulier.gilles@kdemail.net>
+             Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
   History:   24-Jul-04, brad: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: datasets.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: datasets.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
diff -Nru exiv2-0.19/src/datasets.hpp exiv2-0.21/src/datasets.hpp
--- exiv2-0.19/src/datasets.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/datasets.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    datasets.hpp
   @brief   IPTC dataset and type information
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Brad Schick (brad) <brad@robotbattle.com>
   @date    24-Jul-04, brad: created
  */
diff -Nru exiv2-0.19/src/doxygen.hpp.in exiv2-0.21/src/doxygen.hpp.in
--- exiv2-0.19/src/doxygen.hpp.in	2009-07-05 05:49:08.000000000 +0000
+++ exiv2-0.21/src/doxygen.hpp.in	2010-11-30 17:01:21.000000000 +0000
@@ -2,7 +2,7 @@
 /*!
   @file    doxygen.hpp
   @brief   Additional documentation, this file contains no source code
-  @version $Rev: 1850 $
+  @version $Rev: 2387 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    07-Feb-04, ahu: created
@@ -49,6 +49,7 @@
   - <A HREF="tags-olympus.html">Olympus MakerNote tags</A>
   - <A HREF="tags-panasonic.html">Panasonic MakerNote tags</A>
   - <A HREF="tags-pentax.html">Pentax MakerNote tags</A>
+  - <A HREF="tags-samsung.html">Samsung MakerNote tags</A>
   - <A HREF="tags-sigma.html">Sigma/Foveon MakerNote tags</A>
   - <A HREF="tags-sony.html">Sony MakerNote tags</A>
 
@@ -73,7 +74,10 @@
   - <a href="tags-xmp-iptcExt.html">Iptc4xmpExt schema</a>
   - <a href="tags-xmp-plus.html">PLUS schema</a>
   - <a href="tags-xmp-digiKam.html">digiKam schema</a>
+  - <a href="tags-xmp-kipi.html">KDE Image Program Interface schema</a>
   - <a href="tags-xmp-MicrosoftPhoto.html">MicrosoftPhoto schema</a>
+  - <a href="tags-xmp-mediapro.html">iView Media Pro schema</a>
+  - <a href="tags-xmp-expressionmedia.html">Microsoft Expression Media schema</a>
 
   @section formats File Formats
 
@@ -90,7 +94,7 @@
 
   @section license License
 
-  <P>Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net></P>
+  <P>Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net></P>
 
   <P>%Exiv2 is free software; you can redistribute it and/or modify it under the
   terms of the <a href="gpl-license.html">GNU General Public License</a> as
diff -Nru exiv2-0.19/src/easyaccess.cpp exiv2-0.21/src/easyaccess.cpp
--- exiv2-0.19/src/easyaccess.cpp	2009-12-20 23:54:11.000000000 +0000
+++ exiv2-0.21/src/easyaccess.cpp	2010-11-22 14:46:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      easyaccess.cpp
-  Version:   $Rev: 1960 $
+  Version:   $Rev: 2380 $
   Author(s): Carsten Pfeiffer <pfeiffer@kde.org>
              Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   28-Feb-09, gis: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: easyaccess.cpp 1960 2009-12-20 23:54:11Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: easyaccess.cpp 2380 2010-11-22 14:46:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -70,7 +70,14 @@
             "Exif.Image.Orientation",
             "Exif.Panasonic.Rotation",
             "Exif.MinoltaCs5D.Rotation",
-            "Exif.MinoltaCs7D.Rotation"
+            "Exif.MinoltaCs5D.Rotation2",
+            "Exif.MinoltaCs7D.Rotation",
+            "Exif.Sony1MltCsA100.Rotation",
+            "Exif.Sony1Cs.Rotation",
+            "Exif.Sony2Cs.Rotation",
+            "Exif.Sony1Cs2.Rotation",
+            "Exif.Sony2Cs2.Rotation",
+            "Exif.Sony1MltCsA100.Rotation"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
@@ -87,12 +94,18 @@
             "Exif.Nikon3.ISOSpeed",
             "Exif.NikonIi.ISO",
             "Exif.NikonIi.ISO2",
-            "Exif.MinoltaCsNew.ISOSpeed",
-            "Exif.MinoltaCsOld.ISOSpeed",
+            "Exif.MinoltaCsNew.ISOSetting",
+            "Exif.MinoltaCsOld.ISOSetting",
             "Exif.MinoltaCs5D.ISOSpeed",
             "Exif.MinoltaCs7D.ISOSpeed",
+            "Exif.Sony1Cs.ISOSetting",
+            "Exif.Sony2Cs.ISOSetting",
+            "Exif.Sony1Cs2.ISOSetting",
+            "Exif.Sony2Cs2.ISOSetting",
+            "Exif.Sony1MltCsA100.ISOSetting",
             "Exif.Pentax.ISO",
-            "Exif.Olympus.ISOSpeed"
+            "Exif.Olympus.ISOSpeed",
+            "Exif.Samsung2.ISO"
         };
 
         // Find the first ISO value which is not "0"
@@ -119,7 +132,11 @@
             "Exif.CanonSi.FlashBias",
             "Exif.Panasonic.FlashBias",
             "Exif.Olympus.FlashBias",
-            "Exif.OlympusCs.FlashExposureComp"
+            "Exif.OlympusCs.FlashExposureComp",
+            "Exif.Minolta.FlashExposureComp",
+            "Exif.SonyMinolta.FlashExposureComp",
+            "Exif.Sony1.FlashExposureComp",
+            "Exif.Sony2.FlashExposureComp"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
@@ -134,6 +151,9 @@
             "Exif.MinoltaCs5D.ExposureMode",
             "Exif.MinoltaCsNew.ExposureMode",
             "Exif.MinoltaCsOld.ExposureMode",
+            "Exif.Sony1MltCsA100.ExposureMode",
+            "Exif.Sony1Cs.ExposureProgram",
+            "Exif.Sony2Cs.ExposureProgram",
             "Exif.Sigma.ExposureMode"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
@@ -145,10 +165,16 @@
             "Exif.CanonCs.EasyMode",
             "Exif.Fujifilm.PictureMode",
             "Exif.MinoltaCsNew.SubjectProgram",
+            "Exif.MinoltaCsOld.SubjectProgram",
+            "Exif.Minolta.SceneMode",
+            "Exif.SonyMinolta.SceneMode",
+            "Exif.Sony1.SceneMode",
+            "Exif.Sony2.SceneMode",
             "Exif.OlympusCs.SceneMode",
             "Exif.Panasonic.ShootingMode",
             "Exif.Panasonic.SceneMode",
-            "Exif.Pentax.PictureMode"
+            "Exif.Pentax.PictureMode",
+            "Exif.Photo.SceneCaptureType"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
@@ -162,7 +188,9 @@
             "Exif.OlympusCs.MacroMode",
             "Exif.Panasonic.Macro",
             "Exif.MinoltaCsNew.MacroMode",
-            "Exif.MinoltaCsOld.MacroMode"
+            "Exif.MinoltaCsOld.MacroMode",
+            "Exif.Sony1.Macro",
+            "Exif.Sony2.Macro"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
@@ -183,7 +211,14 @@
             "Exif.MinoltaCsNew.Quality",
             "Exif.MinoltaCsOld.Quality",
             "Exif.MinoltaCs5D.Quality",
-            "Exif.MinoltaCs7D.Quality"
+            "Exif.MinoltaCs7D.Quality",
+            "Exif.Sony1MltCsA100.Quality",
+            "Exif.Sony1.JPEGQuality",
+            "Exif.Sony1.Quality",
+            "Exif.Sony1Cs.Quality",
+            "Exif.Sony2.JPEGQuality",
+            "Exif.Sony2.Quality",
+            "Exif.Sony2Cs.Quality"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
@@ -204,6 +239,13 @@
             "Exif.MinoltaCs7D.WhiteBalance",
             "Exif.MinoltaCsNew.WhiteBalance",
             "Exif.MinoltaCsOld.WhiteBalance",
+            "Exif.Minolta.WhiteBalance",
+            "Exif.Sony1MltCsA100.WhiteBalance",
+            "Exif.SonyMinolta.WhiteBalance",
+            "Exif.Sony1.WhiteBalance",
+            "Exif.Sony2.WhiteBalance",
+            "Exif.Sony1.WhiteBalance2",
+            "Exif.Sony2.WhiteBalance2",
             "Exif.Photo.WhiteBalance"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
@@ -216,8 +258,12 @@
             "Exif.NikonLd1.LensIDNumber",
             "Exif.NikonLd2.LensIDNumber",
             "Exif.NikonLd3.LensIDNumber",
+            "Exif.Pentax.LensType",
             "Exif.Minolta.LensID",
-            "Exif.Pentax.LensType"
+            "Exif.SonyMinolta.LensID",
+            "Exif.Sony1.LensID",
+            "Exif.Sony2.LensID",
+            "Exif.Samsung2.LensType"
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
@@ -284,4 +330,122 @@
         };
         return findMetadatum(ed, keys, EXV_COUNTOF(keys));
     }
+
+    ExifData::const_iterator meteringMode(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Photo.MeteringMode",
+            "Exif.Image.MeteringMode",
+            "Exif.CanonCs.MeteringMode",
+            "Exif.Sony1MltCsA100.MeteringMode"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator make(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Image.Make"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator model(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Image.Model"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator exposureTime(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Photo.ExposureTime",
+            "Exif.Image.ExposureTime",
+            "Exif.Samsung2.ExposureTime"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator fNumber(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Photo.FNumber",
+            "Exif.Image.FNumber",
+            "Exif.Samsung2.FNumber"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator subjectDistance(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Photo.SubjectDistance",
+            "Exif.Image.SubjectDistance",
+            "Exif.CanonSi.SubjectDistance",
+            "Exif.MinoltaCsNew.FocusDistance",
+            "Exif.Nikon1.FocusDistance",
+            "Exif.Nikon3.FocusDistance",
+            "Exif.NikonLd2.FocusDistance",
+            "Exif.NikonLd3.FocusDistance",
+            "Exif.Olympus.FocusDistance",
+            "Exif.OlympusFi.FocusDistance"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator serialNumber(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Image.CameraSerialNumber",
+            "Exif.Canon.SerialNumber",
+            "Exif.Nikon3.SerialNumber",
+            "Exif.Nikon3.SerialNO",
+            "Exif.Fujifilm.SerialNumber",
+            "Exif.Olympus.SerialNumber2",
+            "Exif.Sigma.SerialNumber"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator focalLength(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.Photo.FocalLength",
+            "Exif.Image.FocalLength",
+            "Exif.Canon.FocalLength",
+            "Exif.NikonLd2.FocalLength",
+            "Exif.NikonLd3.FocalLength",
+            "Exif.MinoltaCsNew.FocalLength",
+            "Exif.Pentax.FocalLength"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
+    ExifData::const_iterator afPoint(const ExifData& ed)
+    {
+        static const char* keys[] = {
+            "Exif.CanonPi.AFPointsUsed",
+            "Exif.CanonPi.AFPointsUsed20D",
+            "Exif.CanonSi.AFPointUsed",
+            "Exif.CanonCs.AFPoint",
+            "Exif.MinoltaCs7D.AFPoints",
+            "Exif.Nikon1.AFFocusPos",
+            "Exif.NikonAf.AFPoint",
+            "Exif.NikonAf.AFPointsInFocus",
+            "Exif.NikonAf2.AFPointsUsed",
+            "Exif.NikonAf2.PrimaryAFPoint",
+            "Exif.OlympusFi.AFPoint",
+            "Exif.Pentax.AFPoint",
+            "Exif.Pentax.AFPointInFocus",
+            "Exif.Sony1Cs.LocalAFAreaPoint",
+            "Exif.Sony2Cs.LocalAFAreaPoint",
+            "Exif.Sony1Cs2.LocalAFAreaPoint",
+            "Exif.Sony2Cs2.LocalAFAreaPoint",
+            "Exif.Sony1MltCsA100.LocalAFAreaPoint"
+        };
+        return findMetadatum(ed, keys, EXV_COUNTOF(keys));
+    }
+
 }                                       // namespace Exiv2
diff -Nru exiv2-0.19/src/easyaccess.hpp exiv2-0.21/src/easyaccess.hpp
--- exiv2-0.19/src/easyaccess.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/easyaccess.hpp	2010-11-22 14:46:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    easyaccess.hpp
   @brief   Provides easy (high-level) access to some Exif meta data.
-  @version $Rev: 1937 $
+  @version $Rev: 2380 $
   @author  Carsten Pfeiffer <pfeiffer@kde.org>
   @date    28-Feb-09, gis: created
  */
@@ -64,6 +64,24 @@
     EXIV2API ExifData::const_iterator contrast(const ExifData& ed);
     //! Return the scene capture type
     EXIV2API ExifData::const_iterator sceneCaptureType(const ExifData& ed);
+    //! Return the metering mode setting
+    EXIV2API ExifData::const_iterator meteringMode(const ExifData& ed);
+    //! Return the camera make
+    EXIV2API ExifData::const_iterator make(const ExifData& ed);
+    //! Return the camera model
+    EXIV2API ExifData::const_iterator model(const ExifData& ed);
+    //! Return the exposure time
+    EXIV2API ExifData::const_iterator exposureTime(const ExifData& ed);
+    //! Return the F number
+    EXIV2API ExifData::const_iterator fNumber(const ExifData& ed);
+    //! Return the subject distance
+    EXIV2API ExifData::const_iterator subjectDistance(const ExifData& ed);
+    //! Return the camera serial number
+    EXIV2API ExifData::const_iterator serialNumber(const ExifData& ed);
+    //! Return the focal length setting
+    EXIV2API ExifData::const_iterator focalLength(const ExifData& ed);
+    //! Return the AF point
+    EXIV2API ExifData::const_iterator afPoint(const ExifData& ed);
 
 } // namespace Exiv2
 
diff -Nru exiv2-0.19/src/error.cpp exiv2-0.21/src/error.cpp
--- exiv2-0.19/src/error.cpp	2009-12-13 10:27:43.000000000 +0000
+++ exiv2-0.21/src/error.cpp	2010-09-21 15:45:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      error.cpp
-  Version:   $Rev: 1957 $
+  Version:   $Rev: 2353 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   02-Apr-05, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: error.cpp 1957 2009-12-13 10:27:43Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: error.cpp 2353 2010-09-21 15:45:07Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -34,19 +34,25 @@
 #include "i18n.h"                // NLS support.
 
 // + standard includes
+#include <iostream>
 #include <string>
+#include <cassert>
 
 // *****************************************************************************
 namespace {
 
     //! Helper structure defining an error message.
     struct ErrMsg {
+        //! Comparison operator
+        bool operator==(int code) const { return code_ == code; }
+
         int code_;                              //!< Error code
         const char* message_;                   //!< Error message
     };
 
-    const ErrMsg errMsg[] = {
-        { -1, N_("Error %0: arg1=%1, arg2=%2, arg3=%3.") },
+    //! Complete list of Exiv2 exception error messages
+    const ErrMsg errList[] = {
+        { -1, N_("Error %0: arg2=%2, arg3=%3, arg1=%1.") },
         {  0, N_("Success") },
         {  1, "%1" }, // %1=error message
         {  2, "%1: Call to `%3' failed: %2" }, // %1=path, %2=strerror, %3=function that failed
@@ -63,7 +69,7 @@
         { 13, N_("Image type %1 is not supported") }, // %1=image type
         { 14, N_("Failed to read image data") },
         { 15, N_("This does not look like a JPEG image") },
-//      { 16, N_("") }, -- currently not used
+        { 16, N_("%1: Failed to map file for reading and writing: %2") }, // %1=path, %2=strerror
         { 17, N_("%1: Failed to rename file to %2: %3") }, // %1=old path, %2=new path, %3=strerror
         { 18, N_("%1: Transfer failed: %2") }, // %1=path, %2=strerror
         { 19, N_("Memory transfer failed: %1") }, // %1=strerror
@@ -98,9 +104,7 @@
         { 48, N_("Invalid XmpText type `%1'") }, // %1=type
         { 49, N_("TIFF directory %1 has too many entries") }, // %1=TIFF directory name
         { 50, N_("Multiple TIFF array element tags %1 in one directory") }, // %1=tag number
-        { 51, N_("TIFF array element tag %1 has wrong type") }, // %1=tag number
-        // Last error message (message is not used)
-        { -2, N_("(Unknown Error)") }
+        { 51, N_("TIFF array element tag %1 has wrong type") } // %1=tag number
     };
 
 }
@@ -109,66 +113,98 @@
 // class member definitions
 namespace Exiv2 {
 
-    AnyError::~AnyError() throw()
-    {
-    }
-
-    Error::Error(int code)
-        : code_(code), count_(0)
-    {
-        setMsg();
-    }
+    LogMsg::Level LogMsg::level_ = LogMsg::info; // Default output level
+    LogMsg::Handler LogMsg::handler_ = LogMsg::defaultHandler;
 
-    Error::~Error() throw()
+    void LogMsg::defaultHandler(int level, const char* s)
     {
+        switch (static_cast<LogMsg::Level>(level)) {
+        case LogMsg::debug: std::cerr << "Debug: "; break;
+        case LogMsg::info:  break;
+        case LogMsg::warn:  std::cerr << "Warning: "; break;
+        case LogMsg::error: std::cerr << "Error: "; break;
+        case LogMsg::mute:  assert(false);
+        }
+        std::cerr << s;
     }
 
-    int Error::code() const throw()
-    {
-        return code_;
-    }
-
-    const char* Error::what() const throw()
+    AnyError::~AnyError() throw()
     {
-        return msg_.c_str();
     }
 
-    int Error::errorIdx(int code)
+    //! @cond IGNORE
+    template<>
+    void BasicError<char>::setMsg()
     {
-        int idx;
-        for (idx = 0; errMsg[idx].code_ != code; ++idx) {
-            if (errMsg[idx].code_ == -2) return 0;
-        }
-        return idx;
-    }
-
-    void Error::setMsg()
-    {
-        int idx = errorIdx(code_);
-        msg_ = std::string(_(errMsg[idx].message_));
+        std::string msg = _(errMsg(code_));
         std::string::size_type pos;
-        pos = msg_.find("%0");
+        pos = msg.find("%0");
         if (pos != std::string::npos) {
-            msg_.replace(pos, 2, toString(code_));
+            msg.replace(pos, 2, toString(code_));
         }
         if (count_ > 0) {
-            pos = msg_.find("%1");
+            pos = msg.find("%1");
             if (pos != std::string::npos) {
-                msg_.replace(pos, 2, arg1_);
+                msg.replace(pos, 2, arg1_);
             }
         }
         if (count_ > 1) {
-            pos = msg_.find("%2");
+            pos = msg.find("%2");
             if (pos != std::string::npos) {
-                msg_.replace(pos, 2, arg2_);
+                msg.replace(pos, 2, arg2_);
             }
         }
         if (count_ > 2) {
-            pos = msg_.find("%3");
+            pos = msg.find("%3");
             if (pos != std::string::npos) {
-                msg_.replace(pos, 2, arg3_);
+                msg.replace(pos, 2, arg3_);
+            }
+        }
+        msg_ = msg;
+#ifdef EXV_UNICODE_PATH
+        wmsg_ = s2ws(msg);
+#endif
+    }
+    //! @endcond
+
+#ifdef EXV_UNICODE_PATH
+    template<>
+    void BasicError<wchar_t>::setMsg()
+    {
+        std::string s = _(errMsg(code_));
+        std::wstring wmsg(s.begin(), s.end());
+        std::wstring::size_type pos;
+        pos = wmsg.find(L"%0");
+        if (pos != std::wstring::npos) {
+            wmsg.replace(pos, 2, toBasicString<wchar_t>(code_));
+        }
+        if (count_ > 0) {
+            pos = wmsg.find(L"%1");
+            if (pos != std::wstring::npos) {
+                wmsg.replace(pos, 2, arg1_);
+            }
+        }
+        if (count_ > 1) {
+            pos = wmsg.find(L"%2");
+            if (pos != std::wstring::npos) {
+                wmsg.replace(pos, 2, arg2_);
+            }
+        }
+        if (count_ > 2) {
+            pos = wmsg.find(L"%3");
+            if (pos != std::wstring::npos) {
+                wmsg.replace(pos, 2, arg3_);
             }
         }
+        wmsg_ = wmsg;
+        msg_ = ws2s(wmsg);
+    }
+#endif
+
+    const char* errMsg(int code)
+    {
+        const ErrMsg* em = find(errList, code);
+        return em ? em->message_ : "";
     }
 
 }                                       // namespace Exiv2
diff -Nru exiv2-0.19/src/error.hpp exiv2-0.21/src/error.hpp
--- exiv2-0.19/src/error.hpp	2009-12-13 10:27:43.000000000 +0000
+++ exiv2-0.21/src/error.hpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,8 +20,8 @@
  */
 /*!
   @file    error.hpp
-  @brief   Error class for exceptions
-  @version $Rev: 1957 $
+  @brief   Error class for exceptions, log message class
+  @version $Rev: 2344 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    15-Jan-04, ahu: created<BR>
@@ -38,6 +38,7 @@
 #include <exception>
 #include <string>
 #include <iosfwd>
+#include <sstream>
 
 // *****************************************************************************
 // namespace extensions
@@ -46,12 +47,112 @@
 // *****************************************************************************
 // class definitions
 
+    /*!
+      @brief Class for a log message, used by the library. Applications can set
+             the log level and provide a customer log message handler (callback
+             function).
+
+             This class is meant to be used as a temporary object like this:
+
+             <code>
+             LogMsg(LogMsg::warn) << "Warning! Something looks fishy.\n";
+             </code>
+
+             The convenience macros EXV_DEBUG, EXV_INFO, EXV_WARN and EXV_ERROR
+             are just shorthands for the constructor calls.
+     */
+    class EXIV2API LogMsg {
+    public:
+        /*!
+          @brief Defined log levels. To suppress all log messages, either set the
+                 log level to \c mute or set the log message handler to 0.
+         */
+        enum Level { debug = 0, info = 1, warn = 2, error = 3, mute = 4 };
+        /*!
+          @brief Type for a log message handler function. The function receives
+                 the log level and message and can process it in an application
+                 specific way.  The default handler sends the log message to
+                 standard error.
+         */
+        typedef void (*Handler)(int, const char*);
+
+        //! @name Creators
+        //@{
+        //! Constructor, takes the log message type as an argument
+        explicit LogMsg(Level msgType) : msgType_(msgType) {}
+        //! Destructor, passes the log message to the message handler depending on the log level
+        ~LogMsg() { if (msgType_ >= level_ && handler_) handler_(msgType_, os_.str().c_str()); }
+        //@}
+
+        //! @name Manipulators
+        //@{
+        /*!
+          @brief Output operator, to pass the message to a log message object.
+                 (This is not perfect. It can deal with some std manipulators
+                 but not all, e.g., not std::endl.)
+         */
+        template<typename T>
+        LogMsg& operator<<(const T& t)
+        {
+            os_ << t;
+            return *this;
+        }
+        //@}
+
+        /*!
+          @brief Set the log level. Only log messages with a level greater or
+                 equal \em level are sent to the log message handler. Default
+                 log level is \c info. To suppress all log messages, set the log
+                 level to \c mute (or set the log message handler to 0).
+        */
+        static void setLevel(Level level) { level_ = level; }
+        /*!
+          @brief Set the log message handler. The default handler writes log
+                 messages to standard error. To suppress all log messages, set
+                 the log message handler to 0 (or set the log level to \c mute).
+         */
+        static void setHandler(Handler handler) { handler_ = handler; }
+        //! Return the current log level
+        static Level level() { return level_; }
+        //! Return the current log message handler
+        static Handler handler() { return handler_; }
+        //! The default log handler. Sends the log message to standard error.
+        static void defaultHandler(int level, const char* s);
+
+    private:
+        // DATA
+        // The output level. Only messages with type >= level_ will be written
+        static Level level_;
+        // The log handler in use
+        static Handler handler_;
+        // The type of this log message
+        const Level msgType_;
+        // Holds the log message until it is passed to the message handler
+        std::ostringstream os_;
+
+    }; // class LogMsg
+
+// Macros for simple access
+#define EXV_DEBUG   LogMsg(LogMsg::debug)  //!< Shorthand for a debug log message object
+#define EXV_INFO    LogMsg(LogMsg::info)   //!< Shorthand for an info log message object
+#define EXV_WARNING LogMsg(LogMsg::warn)   //!< Shorthand for a warning log message object
+#define EXV_ERROR   LogMsg(LogMsg::error)  //!< Shorthand for an error log message object
+
 #ifdef _MSC_VER
 // Disable MSVC warnings "non - DLL-interface classkey 'identifier' used as base
 // for DLL-interface classkey 'identifier'"
 # pragma warning( disable : 4275 )
 #endif
 
+    //! Generalised toString function
+    template<typename charT, typename T>
+    std::basic_string<charT> toBasicString(const T& arg)
+    {
+        std::basic_ostringstream<charT> os;
+        os << arg;
+        return os.str();
+    }
+
     /*!
       @brief Error class interface. Allows the definition and use of a hierarchy
              of error classes which can all be handled in one catch block.
@@ -74,7 +175,7 @@
         //@}
     }; // AnyError
 
-    //! %AnyBase output operator
+    //! %AnyError output operator
     inline std::ostream& operator<<(std::ostream& os, const AnyError& error)
     {
         return os << error.what();
@@ -84,79 +185,132 @@
       @brief Simple error class used for exceptions. An output operator is
              provided to print errors to a stream.
      */
-    class EXIV2API Error : public AnyError {
+    template<typename charT>
+    class EXV_DLLPUBLIC BasicError : public AnyError {
     public:
         //! @name Creators
         //@{
         //! Constructor taking only an error code
-        explicit Error(int code);
+        EXV_DLLLOCAL explicit BasicError(int code);
         //! Constructor taking an error code and one argument
         template<typename A>
-        EXV_DLLLOCAL Error(int code, const A& arg1);
+        EXV_DLLLOCAL BasicError(int code, const A& arg1);
         //! Constructor taking an error code and two arguments
         template<typename A, typename B>
-        EXV_DLLLOCAL Error(int code, const A& arg1, const B& arg2);
+        EXV_DLLLOCAL BasicError(int code, const A& arg1, const B& arg2);
         //! Constructor taking an error code and three arguments
         template<typename A, typename B, typename C>
-        EXV_DLLLOCAL Error(int code, const A& arg1, const B& arg2, const C& arg3);
+        EXV_DLLLOCAL BasicError(int code, const A& arg1, const B& arg2, const C& arg3);
         //! Virtual destructor. (Needed because of throw())
-        virtual ~Error() throw();
+        EXV_DLLLOCAL virtual ~BasicError() throw();
         //@}
 
         //! @name Accessors
         //@{
-        virtual int code() const throw();
+        EXV_DLLLOCAL virtual int code() const throw();
         /*!
-          @brief Return the error message. The pointer returned by what()
-                 is valid only as long as the Error object exists.
+          @brief Return the error message as a C-string. The pointer returned by what()
+                 is valid only as long as the BasicError object exists.
          */
-        virtual const char* what() const throw();
+        EXV_DLLLOCAL virtual const char* what() const throw();
+#ifdef EXV_UNICODE_PATH
+        /*!
+          @brief Return the error message as a wchar_t-string. The pointer returned by
+                 wwhat() is valid only as long as the BasicError object exists.
+         */
+        EXV_DLLLOCAL virtual const wchar_t* wwhat() const throw();
+#endif
         //@}
 
     private:
         //! @name Manipulators
         //@{
-        void setMsg();
+        //! Assemble the error message from the arguments
+        EXIV2API void setMsg();
         //@}
 
-        static int errorIdx(int code);
-
         // DATA
         int code_;                              //!< Error code
         int count_;                             //!< Number of arguments
-        std::string arg1_;                      //!< First argument
-        std::string arg2_;                      //!< Second argument
-        std::string arg3_;                      //!< Third argument
-        std::string msg_;                       //!< Complete error message
+        std::basic_string<charT> arg1_;         //!< First argument
+        std::basic_string<charT> arg2_;         //!< Second argument
+        std::basic_string<charT> arg3_;         //!< Third argument
+        std::string              msg_;          //!< Complete error message
+#ifdef EXV_UNICODE_PATH
+	std::wstring             wmsg_;         //!< Complete error message as a wide string
+#endif
+    }; // class BasicError
 
-    }; // class Error
+    //! Error class used for exceptions (std::string based)
+    typedef BasicError<char> Error;
+#ifdef EXV_UNICODE_PATH
+    //! Error class used for exceptions (std::wstring based)
+    typedef BasicError<wchar_t> WError;
+#endif
 
 // *****************************************************************************
-// template and inline definitions
+// free functions, template and inline definitions
+
+    //! Return the error message for the error with code \em code.
+    EXIV2API const char* errMsg(int code);
+
+    template<typename charT>
+    BasicError<charT>::BasicError(int code)
+        : code_(code), count_(0)
+    {
+        setMsg();
+    }
 
-    template<typename A>
-    Error::Error(int code, const A& arg1)
-        : code_(code), count_(1), arg1_(toString(arg1))
+    template<typename charT> template<typename A>
+    BasicError<charT>::BasicError(int code, const A& arg1)
+        : code_(code), count_(1), arg1_(toBasicString<charT>(arg1))
     {
         setMsg();
     }
 
-    template<typename A, typename B>
-    Error::Error(int code, const A& arg1, const B& arg2)
+    template<typename charT> template<typename A, typename B>
+    BasicError<charT>::BasicError(int code, const A& arg1, const B& arg2)
         : code_(code), count_(2),
-          arg1_(toString(arg1)), arg2_(toString(arg2))
+          arg1_(toBasicString<charT>(arg1)),
+          arg2_(toBasicString<charT>(arg2))
     {
         setMsg();
     }
 
-    template<typename A, typename B, typename C>
-    Error::Error(int code, const A& arg1, const B& arg2, const C& arg3)
+    template<typename charT> template<typename A, typename B, typename C>
+    BasicError<charT>::BasicError(int code, const A& arg1, const B& arg2, const C& arg3)
         : code_(code), count_(3),
-          arg1_(toString(arg1)), arg2_(toString(arg2)), arg3_(toString(arg3))
+          arg1_(toBasicString<charT>(arg1)),
+          arg2_(toBasicString<charT>(arg2)),
+          arg3_(toBasicString<charT>(arg3))
     {
         setMsg();
     }
 
+    template<typename charT>
+    BasicError<charT>::~BasicError() throw()
+    {
+    }
+
+    template<typename charT>
+    int BasicError<charT>::code() const throw()
+    {
+        return code_;
+    }
+
+    template<typename charT>
+    const char* BasicError<charT>::what() const throw()
+    {
+        return msg_.c_str();
+    }
+
+#ifdef EXV_UNICODE_PATH
+    template<typename charT>
+    const wchar_t* BasicError<charT>::wwhat() const throw()
+    {
+        return wmsg_.c_str();
+    }
+#endif
 #ifdef _MSC_VER
 # pragma warning( default : 4275 )
 #endif
diff -Nru exiv2-0.19/src/exif.cpp exiv2-0.21/src/exif.cpp
--- exiv2-0.19/src/exif.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/exif.cpp	2010-09-21 15:45:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2353 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: exif.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: exif.cpp 2353 2010-09-21 15:45:07Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -40,6 +40,7 @@
 #include "exif.hpp"
 #include "metadatum.hpp"
 #include "tags.hpp"
+#include "tags_int.hpp"
 #include "value.hpp"
 #include "types.hpp"
 #include "error.hpp"
@@ -75,7 +76,7 @@
         }
 
     private:
-        std::string key_;
+        const std::string& key_;
 
     }; // class FindExifdatumByKey
 
@@ -180,7 +181,7 @@
     long sumToLong(const Exiv2::Exifdatum& md);
 
     //! Helper function to delete all tags of a specific IFD from the metadata.
-    void eraseIfd(Exiv2::ExifData& ed, Exiv2::IfdId ifdId);
+    void eraseIfd(Exiv2::ExifData& ed, Exiv2::Internal::IfdId ifdId);
 
 }
 
@@ -227,7 +228,11 @@
 
     std::ostream& Exifdatum::write(std::ostream& os, const ExifData* pMetadata) const
     {
-        return ExifTags::printTag(os, tag(), ifdId(), value(), pMetadata);
+        if (value().count() == 0) return os;
+        PrintFct fct = printValue;
+        const TagInfo* ti = Internal::tagInfo(tag(), static_cast<IfdId>(ifdId()));
+        if (ti != 0) fct = ti->printFct_;
+        return fct(os, value(), pMetadata);
     }
 
     const Value& Exifdatum::value() const
@@ -301,7 +306,7 @@
     int Exifdatum::setValue(const std::string& value)
     {
         if (value_.get() == 0) {
-            TypeId type = ExifTags::tagType(tag(), ifdId());
+            TypeId type = key_->defaultTypeId();
             value_ = Value::create(type);
         }
         return value_->read(value);
@@ -342,19 +347,14 @@
         return key_.get() == 0 ? 0xffff : key_->tag();
     }
 
-    IfdId Exifdatum::ifdId() const
+    int Exifdatum::ifdId() const
     {
         return key_.get() == 0 ? ifdIdNotSet : key_->ifdId();
     }
 
     const char* Exifdatum::ifdName() const
     {
-        return key_.get() == 0 ? "" : key_->ifdName();
-    }
-
-    std::string Exifdatum::ifdItem() const
-    {
-        return key_.get() == 0 ? "" : key_->ifdItem();
+        return key_.get() == 0 ? "" : Internal::ifdName(static_cast<Internal::IfdId>(key_->ifdId()));
     }
 
     int Exifdatum::idx() const
@@ -601,12 +601,12 @@
 
     void ExifData::sortByKey()
     {
-        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByKey);
+        exifMetadata_.sort(cmpMetadataByKey);
     }
 
     void ExifData::sortByTag()
     {
-        std::sort(exifMetadata_.begin(), exifMetadata_.end(), cmpMetadataByTag);
+        exifMetadata_.sort(cmpMetadataByTag);
     }
 
     ExifData::iterator ExifData::erase(ExifData::iterator beg, ExifData::iterator end)
@@ -634,10 +634,10 @@
                                           size);
 #ifndef SUPPRESS_WARNINGS
         if (!iptcData.empty()) {
-            std::cerr << "Warning: Ignoring IPTC information encoded in the Exif data.\n";
+            EXV_WARNING << "Ignoring IPTC information encoded in the Exif data.\n";
         }
         if (!xmpData.empty()) {
-            std::cerr << "Warning: Ignoring XMP information encoded in the Exif data.\n";
+            EXV_WARNING << "Ignoring XMP information encoded in the Exif data.\n";
         }
 #endif
         return bo;
@@ -688,7 +688,13 @@
             subImage2Id,
             subImage3Id,
             subImage4Id,
-            panaRawIfdId,
+            subImage5Id,
+            subImage6Id,
+            subImage7Id,
+            subImage8Id,
+            subImage9Id,
+            subThumb1Id,
+            panaRawId,
             ifd2Id,
             ifd3Id
         };
@@ -700,12 +706,12 @@
         }
 
         // IPTC and XMP are stored elsewhere, not in the Exif APP1 segment.
-        const IptcData emptyIptc;
-        const XmpData  emptyXmp;
+        IptcData emptyIptc;
+        XmpData  emptyXmp;
 
         // Encode and check if the result fits into a JPEG Exif APP1 segment
         MemIo mio1;
-        std::auto_ptr<TiffHeaderBase> header(new TiffHeader(byteOrder));
+        std::auto_ptr<TiffHeaderBase> header(new TiffHeader(byteOrder, 0x00000008, false));
         WriteMethod wm = TiffParserWorker::encode(mio1,
                                                   pData,
                                                   size,
@@ -760,7 +766,7 @@
                 if (pos != ed.end() && sumToLong(*pos) > 32768) {
                     delTags = true;
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Exif tag " << pos->key() << " not encoded\n";
+                    EXV_WARNING << "Exif tag " << pos->key() << " not encoded\n";
 #endif
                     ed.erase(pos);
                 }
@@ -770,7 +776,7 @@
                     pos = ed.findKey(ExifKey(filteredPvTags[i].key_));
                     if (pos != ed.end()) {
 #ifndef SUPPRESS_WARNINGS
-                        std::cerr << "Warning: Exif tag " << pos->key() << " not encoded\n";
+                        EXV_WARNING << "Exif tag " << pos->key() << " not encoded\n";
 #endif
                         ed.erase(pos);
                     }
@@ -779,9 +785,9 @@
             case pttIfd:
                 if (delTags) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Exif IFD " << filteredPvTags[i].key_ << " not encoded\n";
+                    EXV_WARNING << "Exif IFD " << filteredPvTags[i].key_ << " not encoded\n";
 #endif
-                    eraseIfd(ed, ExifTags::ifdIdByIfdItem(filteredPvTags[i].key_));
+                    eraseIfd(ed, Internal::groupId(filteredPvTags[i].key_));
                 }
                 break;
             }
@@ -792,7 +798,7 @@
             if (   pos->size() > 4096
                 && pos->tagName().substr(0, 2) == "0x") {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Exif tag " << pos->key() << " not encoded\n";
+                EXV_WARNING << "Exif tag " << pos->key() << " not encoded\n";
 #endif
                 pos = ed.erase(pos);
             }
@@ -886,8 +892,8 @@
         }
 
         Exiv2::MemIo io;
-        const Exiv2::IptcData emptyIptc;
-        const Exiv2::XmpData  emptyXmp;
+        Exiv2::IptcData emptyIptc;
+        Exiv2::XmpData  emptyXmp;
         Exiv2::TiffParser::encode(io, 0, 0, Exiv2::littleEndian, thumb, emptyIptc, emptyXmp);
         return io.read(io.size());
     }
@@ -930,7 +936,7 @@
     {
         ed.erase(std::remove_if(ed.begin(),
                                 ed.end(),
-                                Exiv2::Internal::FindExifdatum(ifdId)),
+                                Exiv2::FindExifdatum(ifdId)),
                  ed.end());
     }
     //! @endcond
diff -Nru exiv2-0.19/src/exif.hpp exiv2-0.21/src/exif.hpp
--- exiv2-0.19/src/exif.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/exif.hpp	2010-08-28 17:47:45.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    exif.hpp
   @brief   Encoding and decoding of Exif data
-  @version $Rev: 1937 $
+  @version $Rev: 2331 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -38,7 +38,7 @@
 
 // + standard includes
 #include <string>
-#include <vector>
+#include <list>
 #include <memory>
 
 // *****************************************************************************
@@ -161,12 +161,10 @@
         std::string tagName() const;
         std::string tagLabel() const;
         uint16_t tag() const;
-        //! Return the IFD id
-        IfdId ifdId() const;
+        //! Return the IFD id as an integer. (Do not use, this is meant for library internal use.)
+        int ifdId() const;
         //! Return the name of the IFD
         const char* ifdName() const;
-        //! Return the related image item (deprecated)
-        std::string ifdItem() const;
         //! Return the index (unique id of this key within the original IFD)
         int idx() const;
         /*!
@@ -423,7 +421,7 @@
     }; // class ExifThumb
 
     //! Container type to hold all metadata
-    typedef std::vector<Exifdatum> ExifMetadata;
+    typedef std::list<Exifdatum> ExifMetadata;
 
     /*!
       @brief A container for Exif data.  This is a top-level class of the %Exiv2
diff -Nru exiv2-0.19/src/exiv2.1 exiv2-0.21/src/exiv2.1
--- exiv2-0.19/src/exiv2.1	2009-12-29 14:36:52.000000000 +0000
+++ exiv2-0.21/src/exiv2.1	2010-11-22 16:19:15.000000000 +0000
@@ -1,9 +1,9 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.\" @(#) $Id: exiv2.1 1982 2009-12-29 14:36:52Z ahuggel $
+.\" @(#) $Id: exiv2.1 2385 2010-11-22 16:19:15Z ahuggel $
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "Dec 29th, 2009"
+.TH EXIV2 1 "Sep 10, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -35,28 +35,29 @@
 _	_	_	_	_
 l l l l l.
 Type	Exif	IPTC	XMP	Image comments
-JPEG	ReadWrite	ReadWrite	ReadWrite	ReadWrite
-EXV	ReadWrite	ReadWrite	ReadWrite	ReadWrite
+JPEG	Read/Write	Read/Write	Read/Write	Read/Write
+EXV	Read/Write	Read/Write	Read/Write	Read/Write
 CR2	Read	Read	Read	-
-CRW	ReadWrite	-	-	ReadWrite
+CRW	Read/Write	-	-	Read/Write
 MRW	Read	Read	Read	-
-TIFF	ReadWrite	ReadWrite	ReadWrite	-
-DNG	ReadWrite	ReadWrite	ReadWrite	-
-NEF	ReadWrite	ReadWrite	ReadWrite	-
-PEF	ReadWrite	ReadWrite	ReadWrite	-
+TIFF	Read/Write	Read/Write	Read/Write	-
+DNG	Read/Write	Read/Write	Read/Write	-
+NEF	Read/Write	Read/Write	Read/Write	-
+PEF	Read/Write	Read/Write	Read/Write	-
 ARW	Read	Read	Read	-
 RW2	Read	Read	Read	-
 SR2	Read	Read	Read	-
-ORF	Read	Read	Read	-
-PNG	ReadWrite	ReadWrite	ReadWrite	ReadWrite
-PGF	ReadWrite	ReadWrite	ReadWrite	ReadWrite
+SRW	Read/Write	Read/Write	Read/Write	-
+ORF	Read/Write	Read/Write	Read/Write	-
+PNG	Read/Write	Read/Write	Read/Write	Read/Write
+PGF	Read/Write	Read/Write	Read/Write	Read/Write
 RAF	Read	Read	Read	-
-XMP	-	-	ReadWrite	-
+XMP	-	-	Read/Write	-
 GIF	-	-	-	-
-PSD	ReadWrite	ReadWrite	ReadWrite	-
+PSD	Read/Write	Read/Write	Read/Write	-
 TGA	-	-	-	-
 BMP	-	-	-	-
-JP2	ReadWrite	ReadWrite	ReadWrite	-
+JP2	Read/Write	Read/Write	Read/Write	-
 .TE
 .IP \(bu 2
 Support for GIF, TGA and BMP images is minimal: the image format is
@@ -110,6 +111,12 @@
 makernote ISO tags to the regular Exif ISO tag,
 Exif.Photo.ISOSpeedRatings. Does not overwrite an existing standard
 Exif ISO tag.
+.TP
+.B fc | fixcom
+Fix the character encoding of Exif Unicode user comments.  Decodes the
+comment using the auto-detected or specified character encoding and
+writes it back in UCS-2. Use option \fB\-n\fP to specify the current
+encoding of the comment if necessary.
 .SH OPTIONS
 .TP
 .B \-h
@@ -121,12 +128,25 @@
 .B \-v
 Be verbose during the program run.
 .TP
+.B \-q
+Silence warnings and error messages from the Exiv2 library during the
+program run (quiet). Note that options \fB\-v\fP and \fB\-q\fP can be
+used at the same time.
+.TP
 .B \-b
 Show large binary values (default is to suppress them).
 .TP
 .B \-u
 Show unknown tags (default is to suppress tags which don't have a name).
 .TP
+.B \-g \fIkey\fP
+Only output info for this Exiv2 key (grep). Multiple \fB\-g\fP options
+can be used to grep info for several keys.
+.TP
+.B \-n \fIenc\fP
+Charset to use to decode Exif Unicode user comments. \fIenc\fP is
+a name understood by \fBiconv_open\fP(3), e.g., 'UTF-8'.
+.TP
 .B \-k
 Preserve file timestamps when updating files (keep). Can be used with
 all options which update files. The flag is ignored by read-only
@@ -339,7 +359,7 @@
 Delete all occurrences of a tag (requires only a \fIkey\fP).
 .TP
 .I key
-Exiv2 Exif or IPTC key.
+Exiv2 Exif, IPTC or XMP key.
 .TP
 .I type
 .B Byte | Ascii | Short | Long | Rational | Undefined | SShort | SLong | SRational | Comment
diff -Nru exiv2-0.19/src/exiv2app.hpp exiv2-0.21/src/exiv2app.hpp
--- exiv2-0.19/src/exiv2app.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/exiv2app.hpp	2010-09-10 15:00:15.000000000 +0000
@@ -0,0 +1,295 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    exiv2app.hpp
+  @brief   Defines class Params, used for the command line handling of exiv2
+  @version $Rev: 2345 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @date    08-Dec-03, ahu: created
+ */
+#ifndef EXIV2APP_HPP_
+#define EXIV2APP_HPP_
+
+// *****************************************************************************
+// included header files
+#include "utils.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <vector>
+#include <set>
+#include <iostream>
+
+// *****************************************************************************
+// class definitions
+
+//! Command identifiers
+enum CmdId { invalidCmdId, add, set, del, reg };
+//! Metadata identifiers
+enum MetadataId { invalidMetadataId, iptc, exif, xmp };
+//! Structure for one parsed modification command
+struct ModifyCmd {
+    //! C'tor
+    ModifyCmd() :
+        cmdId_(invalidCmdId), metadataId_(invalidMetadataId),
+        typeId_(Exiv2::invalidTypeId), explicitType_(false) {}
+    CmdId cmdId_;                               //!< Command identifier
+    std::string key_;                           //!< Exiv2 key string
+    MetadataId metadataId_;                     //!< Metadata identifier
+    Exiv2::TypeId typeId_;                      //!< Exiv2 type identifier
+    //! Flag to indicate if the type was explicitely specified (true)
+    bool explicitType_;
+    std::string value_;                         //!< Data
+};
+//! Container for modification commands
+typedef std::vector<ModifyCmd> ModifyCmds;
+//! Structure to link command identifiers to strings
+struct CmdIdAndString {
+    CmdId cmdId_;                               //!< Commands identifier
+    std::string cmdString_;                     //!< Command string
+};
+
+/*!
+  @brief Implements the command line handling for the program.
+
+  Derives from Util::Getopt to use the command line argument parsing
+  functionality provided there. This class is implemented as a singleton,
+  i.e., there is only one global instance of it, which can be accessed
+  from everywhere.
+
+  <b>Usage example:</b> <br>
+  @code
+  #include "params.h"
+
+  int main(int argc, char* const argv[])
+  {
+      Params& params = Params::instance();
+      if (params.getopt(argc, argv)) {
+          params.usage();
+          return 1;
+      }
+      if (params.help_) {
+          params.help();
+          return 0;
+      }
+      if (params.version_) {
+          params.version();
+          return 0;
+      }
+
+      // do something useful here...
+
+      return 0;
+  }
+  @endcode
+ */
+class Params : public Util::Getopt {
+private:
+    std::string optstring_;
+
+public:
+    //! Container for command files
+    typedef std::vector<std::string> CmdFiles;
+    //! Container for commands from the command line
+    typedef std::vector<std::string> CmdLines;
+    //! Container to store filenames.
+    typedef std::vector<std::string> Files;
+    //! Container for preview image numbers
+    typedef std::set<int> PreviewNumbers;
+    //! Container for keys
+    typedef std::vector<std::string> Keys;
+
+    /*!
+      @brief Controls all access to the global Params instance.
+      @return Reference to the global Params instance.
+    */
+    static Params& instance();
+    //! Destructor
+    void cleanup();
+
+    //! Enumerates print modes
+    enum PrintMode {
+        pmSummary,
+        pmList,
+        pmComment,
+        pmPreview
+    };
+
+    //! Individual items to print, bitmap
+    enum PrintItem {
+        prTag   =    1,
+        prGroup =    2,
+        prKey   =    4,
+        prName  =    8,
+        prLabel =   16,
+        prType  =   32,
+        prCount =   64,
+        prSize  =  128,
+        prValue =  256,
+        prTrans =  512,
+        prHex   = 1024
+    };
+
+    //! Enumerates common targets, bitmap
+    enum CommonTarget {
+        ctExif       =  1,
+        ctIptc       =  2,
+        ctComment    =  4,
+        ctThumb      =  8,
+        ctXmp        = 16,
+        ctXmpSidecar = 32,
+        ctPreview    = 64
+    };
+
+    //! Enumerates the policies to handle existing files in rename action
+    enum FileExistsPolicy { overwritePolicy, renamePolicy, askPolicy };
+
+    //! Enumerates year, month and day adjustments.
+    enum Yod { yodYear, yodMonth, yodDay };
+
+    //! Structure for year, month and day adjustment command line arguments.
+    struct YodAdjust {
+        bool        flag_;              //!< Adjustment flag.
+        const char* option_;            //!< Adjustment option string.
+        long        adjustment_;        //!< Adjustment value.
+    };
+
+    bool help_;                         //!< Help option flag.
+    bool version_;                      //!< Version option flag.
+    bool verbose_;                      //!< Verbose (talkative) option flag.
+    bool force_;                        //!< Force overwrites flag.
+    bool binary_;                       //!< Suppress long binary values.
+    bool unknown_;                      //!< Suppress unknown tags.
+    bool preserve_;                     //!< Preserve timestamps flag.
+    bool timestamp_;                    //!< Rename also sets the file timestamp.
+    bool timestampOnly_;                //!< Rename only sets the file timestamp.
+    FileExistsPolicy fileExistsPolicy_; //!< What to do if file to rename exists.
+    bool adjust_;                       //!< Adjustment flag.
+    PrintMode printMode_;               //!< Print mode.
+    unsigned long printItems_;          //!< Print items.
+    unsigned long printTags_;           //!< Print tags (bitmap of MetadataId flags).
+    //! %Action (integer rather than TaskType to avoid dependency).
+    int  action_;
+    int  target_;                       //!< What common target to process.
+
+    long adjustment_;                   //!< Adjustment in seconds.
+    YodAdjust yodAdjust_[3];            //!< Year, month and day adjustment info.
+    std::string format_;                //!< Filename format (-r option arg).
+    bool formatSet_;                    //!< Whether the format is set with -r
+    CmdFiles cmdFiles_;                 //!< Names of the modification command files
+    CmdLines cmdLines_;                 //!< Commands from the command line
+    ModifyCmds modifyCmds_;             //!< Parsed modification commands
+    std::string jpegComment_;           //!< Jpeg comment to set in the image
+    std::string directory_;             //!< Location for files to extract/insert
+    std::string suffix_;                //!< File extension of the file to insert
+    Files files_;                       //!< List of non-option arguments.
+    PreviewNumbers previewNumbers_;     //!< List of preview numbers
+    Keys keys_;                         //!< List of keys to 'grep' from the metadata
+    std::string charset_;               //!< Charset to use for UNICODE Exif user comment
+
+private:
+    //! Pointer to the global Params object.
+    static Params* instance_;
+    //! Initializer for year, month and day adjustment info.
+    static const YodAdjust emptyYodAdjust_[];
+
+    bool first_;
+
+private:
+    /*!
+      @brief Default constructor. Note that optstring_ is initialized here.
+             The c'tor is private to force instantiation through instance().
+     */
+    Params() : optstring_(":hVvqfbuktTFa:Y:O:D:r:p:P:d:e:i:c:m:M:l:S:g:n:"),
+               help_(false),
+               version_(false),
+               verbose_(false),
+               force_(false),
+               binary_(true),
+               unknown_(true),
+               preserve_(false),
+               timestamp_(false),
+               timestampOnly_(false),
+               fileExistsPolicy_(askPolicy),
+               adjust_(false),
+               printMode_(pmSummary),
+               printItems_(0),
+               printTags_(Exiv2::mdNone),
+               action_(0),
+               target_(ctExif|ctIptc|ctComment|ctXmp),
+               adjustment_(0),
+               format_("%Y%m%d_%H%M%S"),
+               formatSet_(false),
+               first_(true)
+    {
+        yodAdjust_[yodYear]  = emptyYodAdjust_[yodYear];
+        yodAdjust_[yodMonth] = emptyYodAdjust_[yodMonth];
+        yodAdjust_[yodDay]   = emptyYodAdjust_[yodDay];
+    }
+
+    //! Prevent copy-construction: not implemented.
+    Params(const Params& rhs);
+
+    //! @name Helpers
+    //@{
+    int evalRename(int opt, const std::string& optarg);
+    int evalAdjust(const std::string& optarg);
+    int evalYodAdjust(const Yod& yod, const std::string& optarg);
+    int evalPrint(const std::string& optarg);
+    int evalPrintFlags(const std::string& optarg);
+    int evalDelete(const std::string& optarg);
+    int evalExtract(const std::string& optarg);
+    int evalInsert(const std::string& optarg);
+    int evalModify(int opt, const std::string& optarg);
+    //@}
+
+public:
+    /*!
+      @brief Call Getopt::getopt() with optstring, to inititate command line
+             argument parsing, perform consistency checks after all command line
+             arguments are parsed.
+
+      @param argc Argument count as passed to main() on program invocation.
+      @param argv Argument array as passed to main() on program invocation.
+
+      @return 0 if successful, >0 in case of errors.
+     */
+    int getopt(int argc, char* const argv[]);
+
+    //! Handle options and their arguments.
+    virtual int option(int opt, const std::string& optarg, int optopt);
+
+    //! Handle non-option parameters.
+    virtual int nonoption(const std::string& argv);
+
+    //! Print a minimal usage note to an output stream.
+    void usage(std::ostream& os =std::cout) const;
+
+    //! Print further usage explanations to an output stream.
+    void help(std::ostream& os =std::cout) const;
+
+    //! Print version information to an output stream.
+    void version(std::ostream& os =std::cout) const;
+}; // class Params
+
+#endif                                  // #ifndef EXIV2APP_HPP_
diff -Nru exiv2-0.19/src/exiv2.cpp exiv2-0.21/src/exiv2.cpp
--- exiv2-0.19/src/exiv2.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/exiv2.cpp	2010-11-06 13:53:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,13 +22,13 @@
   Abstract:  Command line program to display and manipulate image metadata.
 
   File:      exiv2.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2374 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   10-Dec-03, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: exiv2.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: exiv2.cpp 2374 2010-11-06 13:53:15Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -38,9 +38,10 @@
 # include "exv_conf.h"
 #endif
 
-#include "exiv2.hpp"
+#include "exiv2app.hpp"
 #include "actions.hpp"
 #include "utils.hpp"
+#include "convert.hpp"
 #include "i18n.h"      // NLS support.
 #include "xmp.hpp"
 
@@ -118,6 +119,11 @@
     bool parseLine(ModifyCmd& modifyCmd,
                    const std::string& line, int num);
 
+    /*!
+      @brief Parses a string containing backslash-escapes
+      @param input Input string, assumed to be UTF-8
+     */
+    std::string parseEscapes(const std::string& input);
 }
 
 // *****************************************************************************
@@ -200,7 +206,7 @@
 void Params::version(std::ostream& os) const
 {
     os << EXV_PACKAGE_STRING << "\n"
-       << _("Copyright (C) 2004-2009 Andreas Huggel.\n")
+       << _("Copyright (C) 2004-2010 Andreas Huggel.\n")
        << "\n"
        << _("This program is free software; you can redistribute it and/or\n"
             "modify it under the terms of the GNU General Public License\n"
@@ -244,12 +250,17 @@
             "                Requires option -c, -m or -M.\n")
        << _("  fi | fixiso   Copy ISO setting from the Nikon Makernote to the regular\n"
             "                Exif tag.\n")
+       << _("  fc | fixcom   Convert the UNICODE Exif user comment to UCS-2. Its current\n"
+            "                character encoding can be specified with the -n option.\n")
        << _("\nOptions:\n")
        << _("   -h      Display this help and exit.\n")
        << _("   -V      Show the program version and exit.\n")
        << _("   -v      Be verbose during the program run.\n")
+       << _("   -q      Silence warnings and error messages during the program run (quiet).\n")
        << _("   -b      Show large binary values.\n")
        << _("   -u      Show unknown tags.\n")
+       << _("   -g key  Only output info for this key (grep).\n")
+       << _("   -n enc  Charset to use to decode UNICODE Exif user comments.\n")
        << _("   -k      Preserve file timestamps (keep).\n")
        << _("   -t      Also set the file timestamp in 'rename' action (overrides -k).\n")
        << _("   -T      Only set the file timestamp in 'rename' action, do not rename\n"
@@ -326,11 +337,14 @@
     case 'h': help_ = true; break;
     case 'V': version_ = true; break;
     case 'v': verbose_ = true; break;
+    case 'q': Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute); break;
     case 'k': preserve_ = true; break;
     case 'b': binary_ = false; break;
     case 'u': unknown_ = false; break;
     case 'f': force_ = true; fileExistsPolicy_ = overwritePolicy; break;
     case 'F': force_ = true; fileExistsPolicy_ = renamePolicy; break;
+    case 'g': keys_.push_back(optarg); printMode_ = pmList; break;
+    case 'n': charset_ = optarg; break;
     case 'r': rc = evalRename(opt, optarg); break;
     case 't': rc = evalRename(opt, optarg); break;
     case 'T': rc = evalRename(opt, optarg); break;
@@ -635,7 +649,7 @@
     case Action::modify:
     case Action::extract:
     case Action::insert:
-        if (opt == 'c') jpegComment_ = optarg;
+        if (opt == 'c') jpegComment_ = parseEscapes(optarg);
         if (opt == 'm') cmdFiles_.push_back(optarg);  // parse the files later
         if (opt == 'M') cmdLines_.push_back(optarg);  // parse the commands later
         break;
@@ -732,6 +746,15 @@
             action = true;
             action_ = Action::fixiso;
         }
+        if (argv == "fc" || argv == "fixcom" || argv == "fixcomment") {
+            if (action_ != Action::none && action_ != Action::fixcom) {
+                std::cerr << progname() << ": "
+                          << _("Action fixcom is not compatible with the given options\n");
+                rc = 1;
+            }
+            action = true;
+            action_ = Action::fixcom;
+        }
         if (action_ == Action::none) {
             // if everything else fails, assume print as the default action
             action_ = Action::print;
@@ -786,6 +809,10 @@
             rc = 1;
         }
     }
+    if (rc == 0 && (!cmdFiles_.empty() || !cmdLines_.empty())) {
+        // We'll set them again, after reading the file
+        Exiv2::XmpProperties::unregisterNs();
+    }
     if (   !directory_.empty()
         && !(action_ == Action::insert || action_ == Action::extract)) {
         std::cerr << progname() << ": "
@@ -1025,8 +1052,7 @@
                 try {
                     Exiv2::ExifKey exifKey(key);
                     metadataId = exif;
-                    defaultType = Exiv2::ExifTags::tagType(exifKey.tag(),
-                                                           exifKey.ifdId());
+                    defaultType = exifKey.defaultTypeId();
                 }
                 catch (const Exiv2::AnyError&) {}
             }
@@ -1076,7 +1102,7 @@
                 }
             }
 
-            value = line.substr(valStart, valEnd+1-valStart);
+            value = parseEscapes(line.substr(valStart, valEnd+1-valStart));
             std::string::size_type last = value.length()-1;
             if (   (value[0] == '"' && value[last] == '"')
                 || (value[0] == '\'' && value[last] == '\'')) {
@@ -1108,4 +1134,81 @@
         return cmdIdAndString[i].cmdId_;
     }
 
+    std::string parseEscapes(const std::string& input) 
+    {
+        std::string result = "";
+        for (unsigned int i = 0; i < input.length(); ++i) {
+            char ch = input[i];
+            if (ch != '\\') {
+                result.push_back(ch);
+                continue;
+            }
+            int escapeStart = i;
+            if (!(input.length() - 1 > i)) {
+                result.push_back(ch);
+                continue;
+            }
+            ++i;
+            ch = input[i];
+            switch (ch) {
+            case '\\':                          // Escaping of backslash
+                result.push_back('\\');
+                break;
+            case 'r':                           // Escaping of carriage return
+                result.push_back('\r');
+                break;
+            case 'n':                           // Escaping of newline
+                result.push_back('\n');
+                break;
+            case 't':                           // Escaping of tab
+                result.push_back('\t');
+                break;
+            case 'u':                           // Escaping of unicode
+                if (input.length() - 4 > i) {
+                    int acc = 0;
+                    for (int j = 0; j < 4; ++j) {
+                        ++i;
+                        acc <<= 4;
+                        if (input[i] >= '0' && input[i] <= '9') {
+                            acc |= input[i] - '0';
+                        }
+                        else if (input[i] >= 'a' && input[i] <= 'f') {
+                            acc |= input[i] - 'a' + 10;
+                        }
+                        else if (input[i] >= 'A' && input[i] <= 'F') {
+                            acc |= input[i] - 'A' + 10;
+                        }
+                        else {
+                            acc = -1;
+                            break;
+                        }
+                    }
+                    if (acc == -1) {
+                        result.push_back('\\');
+                        i = escapeStart;
+                        break;
+                    }
+
+                    std::string ucs2toUtf8 = "";
+                    ucs2toUtf8.push_back((char) ((acc & 0xff00) >> 8));
+                    ucs2toUtf8.push_back((char) (acc & 0x00ff));
+
+                    if (Exiv2::convertStringCharset (ucs2toUtf8, "UCS-2BE", "UTF-8")) {
+                        result.append (ucs2toUtf8);
+                    }
+                }
+                else {
+                    result.push_back('\\');
+                    result.push_back(ch);
+                }
+                break;
+            default:
+                result.push_back('\\');
+                result.push_back(ch);
+            }
+        }
+        return result;
+    }
+
 }
+        
diff -Nru exiv2-0.19/src/exiv2.hpp exiv2-0.21/src/exiv2.hpp
--- exiv2-0.19/src/exiv2.hpp	2009-12-02 14:26:49.000000000 +0000
+++ exiv2-0.21/src/exiv2.hpp	2010-09-04 09:20:04.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,272 +20,49 @@
  */
 /*!
   @file    exiv2.hpp
-  @brief   Defines class Params, used for the command line handling of exiv2
-  @version $Rev: 1952 $
+  @brief   Include all Exiv2 header files.
+  @version $Rev: 2340 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @date    08-Dec-03, ahu: created
+  @date    21-Jun-10, ahu: created
  */
 #ifndef EXIV2_HPP_
 #define EXIV2_HPP_
 
 // *****************************************************************************
 // included header files
-#include "utils.hpp"
+#include "basicio.hpp"
+#include "bmpimage.hpp"
+#include "convert.hpp"
+#include "cr2image.hpp"
+#include "crwimage.hpp"
+#include "datasets.hpp"
+#include "easyaccess.hpp"
+#include "error.hpp"
+#include "exif.hpp"
+#include "futils.hpp"
+#include "gifimage.hpp"
+#include "image.hpp"
+#include "iptc.hpp"
+#include "jp2image.hpp"
+#include "jpgimage.hpp"
+#include "metadatum.hpp"
+#include "mrwimage.hpp"
+#include "orfimage.hpp"
+#include "pgfimage.hpp"
+#include "pngimage.hpp"
+#include "preview.hpp"
+#include "properties.hpp"
+#include "psdimage.hpp"
+#include "rafimage.hpp"
+#include "rw2image.hpp"
+#include "tags.hpp"
+#include "tgaimage.hpp"
+#include "tiffimage.hpp"
 #include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <vector>
-#include <set>
-#include <iostream>
-
-// *****************************************************************************
-// class definitions
-
-//! Command identifiers
-enum CmdId { invalidCmdId, add, set, del, reg };
-//! Metadata identifiers
-enum MetadataId { invalidMetadataId, iptc, exif, xmp };
-//! Structure for one parsed modification command
-struct ModifyCmd {
-    //! C'tor
-    ModifyCmd() :
-        cmdId_(invalidCmdId), metadataId_(invalidMetadataId),
-        typeId_(Exiv2::invalidTypeId), explicitType_(false) {}
-    CmdId cmdId_;                               //!< Command identifier
-    std::string key_;                           //!< Exiv2 key string
-    MetadataId metadataId_;                     //!< Metadata identifier
-    Exiv2::TypeId typeId_;                      //!< Exiv2 type identifier
-    //! Flag to indicate if the type was explicitely specified (true)
-    bool explicitType_;
-    std::string value_;                         //!< Data
-};
-//! Container for modification commands
-typedef std::vector<ModifyCmd> ModifyCmds;
-//! Structure to link command identifiers to strings
-struct CmdIdAndString {
-    CmdId cmdId_;                               //!< Commands identifier
-    std::string cmdString_;                     //!< Command string
-};
-
-/*!
-  @brief Implements the command line handling for the program.
-
-  Derives from Util::Getopt to use the command line argument parsing
-  functionality provided there. This class is implemented as a singleton,
-  i.e., there is only one global instance of it, which can be accessed
-  from everywhere.
-
-  <b>Usage example:</b> <br>
-  @code
-  #include "params.h"
-
-  int main(int argc, char* const argv[])
-  {
-      Params& params = Params::instance();
-      if (params.getopt(argc, argv)) {
-          params.usage();
-          return 1;
-      }
-      if (params.help_) {
-          params.help();
-          return 0;
-      }
-      if (params.version_) {
-          params.version();
-          return 0;
-      }
-
-      // do something useful here...
-
-      return 0;
-  }
-  @endcode
- */
-class Params : public Util::Getopt {
-private:
-    std::string optstring_;
-
-public:
-    //! Container for command files
-    typedef std::vector<std::string> CmdFiles;
-    //! Container for commands from the command line
-    typedef std::vector<std::string> CmdLines;
-    //! Container to store filenames.
-    typedef std::vector<std::string> Files;
-    //! Container for preview image numbers
-    typedef std::set<int> PreviewNumbers;
-
-    /*!
-      @brief Controls all access to the global Params instance.
-      @return Reference to the global Params instance.
-    */
-    static Params& instance();
-    //! Destructor
-    void cleanup();
-
-    //! Enumerates print modes
-    enum PrintMode {
-        pmSummary,
-        pmList,
-        pmComment,
-        pmPreview
-    };
-
-    //! Individual items to print, bitmap
-    enum PrintItem {
-        prTag   =    1,
-        prGroup =    2,
-        prKey   =    4,
-        prName  =    8,
-        prLabel =   16,
-        prType  =   32,
-        prCount =   64,
-        prSize  =  128,
-        prValue =  256,
-        prTrans =  512,
-        prHex   = 1024
-    };
-
-    //! Enumerates common targets, bitmap
-    enum CommonTarget {
-        ctExif       =  1,
-        ctIptc       =  2,
-        ctComment    =  4,
-        ctThumb      =  8,
-        ctXmp        = 16,
-        ctXmpSidecar = 32,
-        ctPreview    = 64
-    };
-
-    //! Enumerates the policies to handle existing files in rename action
-    enum FileExistsPolicy { overwritePolicy, renamePolicy, askPolicy };
-
-    //! Enumerates year, month and day adjustments.
-    enum Yod { yodYear, yodMonth, yodDay };
-
-    //! Structure for year, month and day adjustment command line arguments.
-    struct YodAdjust {
-        bool        flag_;              //!< Adjustment flag.
-        const char* option_;            //!< Adjustment option string.
-        long        adjustment_;        //!< Adjustment value.
-    };
-
-    bool help_;                         //!< Help option flag.
-    bool version_;                      //!< Version option flag.
-    bool verbose_;                      //!< Verbose (talkative) option flag.
-    bool force_;                        //!< Force overwrites flag.
-    bool binary_;                       //!< Suppress long binary values.
-    bool unknown_;                      //!< Suppress unknown tags.
-    bool preserve_;                     //!< Preserve timestamps flag.
-    bool timestamp_;                    //!< Rename also sets the file timestamp.
-    bool timestampOnly_;                //!< Rename only sets the file timestamp.
-    FileExistsPolicy fileExistsPolicy_; //!< What to do if file to rename exists.
-    bool adjust_;                       //!< Adjustment flag.
-    PrintMode printMode_;               //!< Print mode.
-    unsigned long printItems_;          //!< Print items.
-    unsigned long printTags_;           //!< Print tags (bitmap of MetadataId flags).
-    //! %Action (integer rather than TaskType to avoid dependency).
-    int  action_;
-    int  target_;                       //!< What common target to process.
-
-    long adjustment_;                   //!< Adjustment in seconds.
-    YodAdjust yodAdjust_[3];            //!< Year, month and day adjustment info.
-    std::string format_;                //!< Filename format (-r option arg).
-    bool formatSet_;                    //!< Whether the format is set with -r
-    CmdFiles cmdFiles_;                 //!< Names of the modification command files
-    CmdLines cmdLines_;                 //!< Commands from the command line
-    ModifyCmds modifyCmds_;             //!< Parsed modification commands
-    std::string jpegComment_;           //!< Jpeg comment to set in the image
-    std::string directory_;             //!< Location for files to extract/insert
-    std::string suffix_;                //!< File extension of the file to insert
-    Files files_;                       //!< List of non-option arguments.
-    PreviewNumbers previewNumbers_;     //!< List of preview numbers
-
-private:
-    //! Pointer to the global Params object.
-    static Params* instance_;
-    //! Initializer for year, month and day adjustment info.
-    static const YodAdjust emptyYodAdjust_[];
-
-    bool first_;
-
-private:
-    /*!
-      @brief Default constructor. Note that optstring_ is initialized here.
-             The c'tor is private to force instantiation through instance().
-     */
-    Params() : optstring_(":hVvfbuktTFa:Y:O:D:r:p:P:d:e:i:c:m:M:l:S:"),
-               help_(false),
-               version_(false),
-               verbose_(false),
-               force_(false),
-               binary_(true),
-               unknown_(true),
-               preserve_(false),
-               timestamp_(false),
-               timestampOnly_(false),
-               fileExistsPolicy_(askPolicy),
-               adjust_(false),
-               printMode_(pmSummary),
-               printItems_(0),
-               printTags_(Exiv2::mdNone),
-               action_(0),
-               target_(ctExif|ctIptc|ctComment|ctXmp),
-               adjustment_(0),
-               format_("%Y%m%d_%H%M%S"),
-               formatSet_(false),
-               first_(true)
-    {
-        yodAdjust_[yodYear]  = emptyYodAdjust_[yodYear];
-        yodAdjust_[yodMonth] = emptyYodAdjust_[yodMonth];
-        yodAdjust_[yodDay]   = emptyYodAdjust_[yodDay];
-    }
-
-    //! Prevent copy-construction: not implemented.
-    Params(const Params& rhs);
-
-    //! @name Helpers
-    //@{
-    int evalRename(int opt, const std::string& optarg);
-    int evalAdjust(const std::string& optarg);
-    int evalYodAdjust(const Yod& yod, const std::string& optarg);
-    int evalPrint(const std::string& optarg);
-    int evalPrintFlags(const std::string& optarg);
-    int evalDelete(const std::string& optarg);
-    int evalExtract(const std::string& optarg);
-    int evalInsert(const std::string& optarg);
-    int evalModify(int opt, const std::string& optarg);
-    //@}
-
-public:
-    /*!
-      @brief Call Getopt::getopt() with optstring, to inititate command line
-             argument parsing, perform consistency checks after all command line
-             arguments are parsed.
-
-      @param argc Argument count as passed to main() on program invocation.
-      @param argv Argument array as passed to main() on program invocation.
-
-      @return 0 if successful, >0 in case of errors.
-     */
-    int getopt(int argc, char* const argv[]);
-
-    //! Handle options and their arguments.
-    virtual int option(int opt, const std::string& optarg, int optopt);
-
-    //! Handle non-option parameters.
-    virtual int nonoption(const std::string& argv);
-
-    //! Print a minimal usage note to an output stream.
-    void usage(std::ostream& os =std::cout) const;
-
-    //! Print further usage explanations to an output stream.
-    void help(std::ostream& os =std::cout) const;
-
-    //! Print version information to an output stream.
-    void version(std::ostream& os =std::cout) const;
-}; // class Params
+#include "value.hpp"
+#include "version.hpp"
+#include "xmp.hpp"
+#include "xmpsidecar.hpp"
 
 #endif                                  // #ifndef EXIV2_HPP_
diff -Nru exiv2-0.19/src/fujimn.cpp exiv2-0.21/src/fujimn.cpp
--- exiv2-0.19/src/fujimn.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/fujimn.cpp	2010-09-10 16:36:33.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,21 +20,22 @@
  */
 /*
   File:      fujimn.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2346 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
-             Gilles Caulier (gc) <caulier.gilles@kdemail.net>
+             Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
   History:   18-Feb-04, ahu: created
              07-Mar-04, ahu: isolated as a separate component
   Credits:   See header file.
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: fujimn.cpp 1750 2009-02-16 14:30:51Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: fujimn.cpp 2346 2010-09-10 16:36:33Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "fujimn.hpp"
+#include "fujimn_int.hpp"
+#include "tags_int.hpp"
 #include "value.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -48,6 +49,7 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     //! OffOn, multiple tags
     extern const TagDetails fujiOffOn[] = {
@@ -73,7 +75,8 @@
         {  769, N_("Fluorescent (warm white)") },
         {  770, N_("Fluorescent (cool white)") },
         { 1024, N_("Incandescent")             },
-        { 3480, N_("Custom")                   }
+        { 3480, N_("Custom")                   },
+        { 3480, N_("Custom")                   } // To silence compiler warning
     };
 
     //! Color, tag 0x1003
@@ -81,7 +84,8 @@
         {   0, N_("Normal")               },
         { 256, N_("High")                 },
         { 512, N_("Low")                  },
-        { 768, N_("None (black & white)") }
+        { 768, N_("None (black & white)") },
+        { 768, N_("None (black & white)") }     // To silence compiler warning
     };
 
     //! Tone, tag 0x1004
@@ -96,7 +100,8 @@
         { 0, N_("Auto")              },
         { 1, N_("On")                },
         { 2, N_("Off")               },
-        { 3, N_("Red-eye reduction") }
+        { 3, N_("Red-eye reduction") },
+        { 3, N_("Red-eye reduction") }          // To silence compiler warning
     };
 
     //! FocusMode, tag 0x1021
@@ -173,109 +178,108 @@
     const TagInfo FujiMakerNote::tagInfo_[] = {
         TagInfo(0x0000, "Version", N_("Version"),
                 N_("Fujifilm Makernote version"),
-                fujiIfdId, makerTags, undefined, printValue),
+                fujiId, makerTags, undefined, -1, printValue),
         TagInfo(0x0010, "SerialNumber", N_("Serial Number"),
                 N_("This number is unique, and contains the date of manufacture, "
                    "but is not the same as the number printed on the camera body."),
-                fujiIfdId, makerTags, asciiString, printValue),
+                fujiId, makerTags, asciiString, -1, printValue),
         TagInfo(0x1000, "Quality", N_("Quality"),
                 N_("Image quality setting"),
-                fujiIfdId, makerTags, asciiString, printValue),
+                fujiId, makerTags, asciiString, -1, printValue),
         TagInfo(0x1001, N_("Sharpness"), N_("Sharpness"),
                 N_("Sharpness setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiSharpness)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiSharpness)),
         TagInfo(0x1002, "WhiteBalance", N_("White Balance"),
                 N_("White balance setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiWhiteBalance)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiWhiteBalance)),
         TagInfo(0x1003, "Color", N_("Color"),
                 N_("Chroma saturation setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiColor)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiColor)),
         TagInfo(0x1004, "Tone", N_("Tone"),
                 N_("Contrast setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiTone)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiTone)),
         TagInfo(0x1010, "FlashMode", N_("Flash Mode"),
                 N_("Flash firing mode setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFlashMode)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFlashMode)),
         TagInfo(0x1011, "FlashStrength", N_("Flash Strength"),
                 N_("Flash firing strength compensation setting"),
-                fujiIfdId, makerTags, signedRational, printValue),
+                fujiId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1020, "Macro", N_("Macro"),
                 N_("Macro mode setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1021, "FocusMode", N_("Focus Mode"),
                 N_("Focusing mode setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFocusMode)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFocusMode)),
         TagInfo(0x1022, "0x1022", "0x1022",
                 N_("Unknown"),
-                fujiIfdId, makerTags, unsignedShort, printValue),
+                fujiId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1030, "SlowSync", N_("Slow Sync"),
                 N_("Slow synchro mode setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1031, "PictureMode", N_("Picture Mode"),
                 N_("Picture mode setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiPictureMode)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiPictureMode)),
         TagInfo(0x1032, "0x1032", "0x1032",
                 N_("Unknown"),
-                fujiIfdId, makerTags, unsignedShort, printValue),
+                fujiId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1100, "Continuous", N_("Continuous"),
                 N_("Continuous shooting or auto bracketing setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiContinuous)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiContinuous)),
         TagInfo(0x1101, "SequenceNumber", N_("Sequence Number"),
                 N_("Sequence number"),
-                fujiIfdId, makerTags, unsignedShort, printValue),
+                fujiId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1200, "0x1200", "0x1200",
                 N_("Unknown"),
-                fujiIfdId, makerTags, unsignedShort, printValue),
+                fujiId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1210, "FinePixColor", N_("FinePix Color"),
                 N_("Fuji FinePix color setting"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFinePixColor)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFinePixColor)),
         TagInfo(0x1300, "BlurWarning", N_("Blur Warning"),
                 N_("Blur warning status"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1301, "FocusWarning", N_("Focus Warning"),
                 N_("Auto Focus warning status"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1302, "ExposureWarning", N_("Exposure Warning"),
                 N_("Auto exposure warning status"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiOffOn)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiOffOn)),
         TagInfo(0x1400, "DynamicRange", N_("Dynamic Range"),
                 N_("Dynamic range"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiDynamicRange)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRange)),
         TagInfo(0x1401, "FilmMode", N_("Film Mode"),
                 N_("Film mode"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiFilmMode)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiFilmMode)),
         TagInfo(0x1402, "DynamicRangeSetting", N_("Dynamic Range Setting"),
                 N_("Dynamic range settings"),
-                fujiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(fujiDynamicRangeSetting)),
+                fujiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(fujiDynamicRangeSetting)),
         TagInfo(0x1403, "DevelopmentDynamicRange", N_("Development Dynamic Range"),
                 N_("Development dynamic range"),
-                fujiIfdId, makerTags, unsignedShort, printValue),
+                fujiId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1404, "MinFocalLength", N_("Minimum Focal Length"),
                 N_("Minimum focal length"),
-                fujiIfdId, makerTags, unsignedRational, printValue),
+                fujiId, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x1405, "MaxFocalLength", N_("Maximum Focal Length"),
                 N_("Maximum focal length"),
-                fujiIfdId, makerTags, unsignedRational, printValue),
+                fujiId, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x1406, "MaxApertureAtMinFocal", N_("Maximum Aperture at Mininimum Focal"),
                 N_("Maximum aperture at mininimum focal"),
-                fujiIfdId, makerTags, unsignedRational, printValue),
+                fujiId, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x1407, "MaxApertureAtMaxFocal", N_("Maximum Aperture at Maxinimum Focal"),
                 N_("Maximum aperture at maxinimum focal"),
-                fujiIfdId, makerTags, unsignedRational, printValue),
+                fujiId, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x8000, "FileSource", N_("File Source"),
                 N_("File source"),
-                fujiIfdId, makerTags, asciiString, printValue),
+                fujiId, makerTags, asciiString, -1, printValue),
         TagInfo(0x8002, "OrderNumber", N_("Order Number"),
                 N_("Order number"),
-                fujiIfdId, makerTags, unsignedLong, printValue),
+                fujiId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x8003, "FrameNumber", N_("Frame Number"),
                 N_("Frame number"),
-                fujiIfdId, makerTags, unsignedShort, printValue),
-
+                fujiId, makerTags, unsignedShort, -1, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownFujiMakerNoteTag)", "(UnknownFujiMakerNoteTag)",
                 N_("Unknown FujiMakerNote tag"),
-                fujiIfdId, makerTags, invalidTypeId, printValue)
+                fujiId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* FujiMakerNote::tagList()
@@ -283,4 +287,4 @@
         return tagInfo_;
     }
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/fujimn.hpp exiv2-0.21/src/fujimn.hpp
--- exiv2-0.19/src/fujimn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/fujimn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    fujimn.hpp
-  @brief   Fujifilm MakerNote implemented according to the specification
-           in Appendix 4: Makernote of Fujifilm of the document
-           <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">
-           Exif file format</a> by TsuruZoh Tachibanaya<br>
-           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Fuji.html">Fuji Makernote list</a> by Phil Harvey<br>
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @author  Gilles Caulier (gc)
-           <a href="mailto:caulier dot gilles at kdemail dot net">caulier dot gilles at kdemail dot net</a>
-  @date    11-Feb-04, ahu: created
- */
-#ifndef FUJIMN_HPP_
-#define FUJIMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Fujifilm cameras
-    class EXIV2API FujiMakerNote {
-    public:
-        //! Return read-only list of built-in Fujifilm tags
-        static const TagInfo* tagList();
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-
-    }; // class FujiMakerNote
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef FUJIMN_HPP_
diff -Nru exiv2-0.19/src/fujimn_int.hpp exiv2-0.21/src/fujimn_int.hpp
--- exiv2-0.19/src/fujimn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/fujimn_int.hpp	2010-08-14 08:01:47.000000000 +0000
@@ -0,0 +1,65 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    fujimn_int.hpp
+  @brief   Fujifilm MakerNote implemented according to the specification
+           in Appendix 4: Makernote of Fujifilm of the document
+           <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">
+           Exif file format</a> by TsuruZoh Tachibanaya<br>
+           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Fuji.html">Fuji Makernote list</a> by Phil Harvey<br>
+  @version $Rev: 2316 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @author  Gilles Caulier (gc)
+           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  @date    11-Feb-04, ahu: created
+ */
+#ifndef FUJIMN_INT_HPP_
+#define FUJIMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Fujifilm cameras
+    class FujiMakerNote {
+    public:
+        //! Return read-only list of built-in Fujifilm tags
+        static const TagInfo* tagList();
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+
+    }; // class FujiMakerNote
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef FUJIMN_INT_HPP_
diff -Nru exiv2-0.19/src/futils.cpp exiv2-0.21/src/futils.cpp
--- exiv2-0.19/src/futils.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/futils.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      futils.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   08-Dec-03, ahu: created
              02-Apr-05, ahu: moved to Exiv2 namespace
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: futils.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: futils.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -93,7 +93,7 @@
 #ifdef EXV_HAVE_STRERROR_R
         const size_t n = 1024;
 // _GNU_SOURCE: See Debian bug #485135
-# if defined EXV_STRERROR_R_CHAR_P || defined _GNU_SOURCE
+# if defined EXV_STRERROR_R_CHAR_P && defined _GNU_SOURCE
         char *buf = 0;
         char buf2[n];
         std::memset(buf2, 0x0, n);
diff -Nru exiv2-0.19/src/futils.hpp exiv2-0.21/src/futils.hpp
--- exiv2-0.19/src/futils.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/futils.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ********************************************************* -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    futils.hpp
   @brief   Basic file utility functions required by Exiv2
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    12-Dec-03, ahu: created<BR>
diff -Nru exiv2-0.19/src/gifimage.cpp exiv2-0.21/src/gifimage.cpp
--- exiv2-0.19/src/gifimage.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/gifimage.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      gifimage.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Marco Piovanelli, Ovolab (marco)
   History:   26-Feb-2007, marco: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: gifimage.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: gifimage.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 //#define DEBUG 1
 
diff -Nru exiv2-0.19/src/gifimage.hpp exiv2-0.21/src/gifimage.hpp
--- exiv2-0.19/src/gifimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/gifimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   @file    gifimage.hpp
   @brief   GIF image, implemented using the following references:
            <a href="http://www.w3.org/Graphics/GIF/spec-gif89a.txt">GIF89 specification</a> by W3C<br>
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Marco Piovanelli, Ovolab (marco)
            <a href="mailto:marco.piovanelli@pobox.com">marco.piovanelli@pobox.com</a>
   @date    26-Feb-2007, marco: created
diff -Nru exiv2-0.19/src/i18n.h exiv2-0.21/src/i18n.h
--- exiv2-0.19/src/i18n.h	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/i18n.h	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 /* **************************************************************** -*- C -*- */
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*
   File:      i18n.h
   Brief:     i18n definitions. Do not use. This is an Exiv2 internal header.
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2045 $
   Author(s): Gilles Caulier (gc) <caulier.gilles@kdemail.net>
   History:   01-Nov-06, gc: created
  */
diff -Nru exiv2-0.19/src/image.cpp exiv2-0.21/src/image.cpp
--- exiv2-0.19/src/image.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/image.cpp	2010-11-21 15:06:26.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,7 +20,7 @@
  */
 /*
   File:      image.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2377 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
              Brad Schick (brad) <brad@robotbattle.com>
   History:   26-Jan-04, ahu: created
@@ -29,8 +29,8 @@
              15-Jan-05, brad: inside-out design changes
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: image.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: image.cpp 2377 2010-11-21 15:06:26Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -106,10 +106,18 @@
         { ImageType::crw,  newCrwInstance,  isCrwType,  amReadWrite, amNone,      amNone,      amReadWrite },
         { ImageType::mrw,  newMrwInstance,  isMrwType,  amRead,      amRead,      amRead,      amNone      },
         { ImageType::tiff, newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
-        { ImageType::orf,  newOrfInstance,  isOrfType,  amRead,      amRead,      amRead,      amNone      },
+        { ImageType::dng,  newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
+        { ImageType::nef,  newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
+        { ImageType::pef,  newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
+        { ImageType::arw,  newTiffInstance, isTiffType, amRead,      amRead,      amRead,      amNone      },
+        { ImageType::rw2,  newRw2Instance,  isRw2Type,  amRead,      amRead,      amRead,      amNone      },
+        { ImageType::sr2,  newTiffInstance, isTiffType, amRead,      amRead,      amRead,      amNone      },
+        { ImageType::srw,  newTiffInstance, isTiffType, amReadWrite, amReadWrite, amReadWrite, amNone      },
+        { ImageType::orf,  newOrfInstance,  isOrfType,  amReadWrite, amReadWrite, amReadWrite, amNone      },
 #ifdef EXV_HAVE_LIBZ
         { ImageType::png,  newPngInstance,  isPngType,  amReadWrite, amReadWrite, amReadWrite, amReadWrite },
 #endif // EXV_HAVE_LIBZ
+        { ImageType::pgf,  newPgfInstance,  isPgfType,  amReadWrite, amReadWrite, amReadWrite, amReadWrite },
         { ImageType::raf,  newRafInstance,  isRafType,  amRead,      amRead,      amRead,      amNone      },
         { ImageType::xmp,  newXmpInstance,  isXmpType,  amNone,      amNone,      amReadWrite, amNone      },
         { ImageType::gif,  newGifInstance,  isGifType,  amNone,      amNone,      amNone,      amNone      },
@@ -117,8 +125,6 @@
         { ImageType::tga,  newTgaInstance,  isTgaType,  amNone,      amNone,      amNone,      amNone      },
         { ImageType::bmp,  newBmpInstance,  isBmpType,  amNone,      amNone,      amNone,      amNone      },
         { ImageType::jp2,  newJp2Instance,  isJp2Type,  amReadWrite, amReadWrite, amReadWrite, amNone      },
-        { ImageType::rw2,  newRw2Instance,  isRw2Type,  amRead,      amRead,      amRead,      amNone      },
-        { ImageType::pgf,  newPgfInstance,  isPgfType,  amReadWrite, amReadWrite, amReadWrite, amReadWrite },
         // End of list marker
         { ImageType::none, 0,               0,          amNone,      amNone,      amNone,      amNone      }
     };
@@ -400,7 +406,7 @@
     {
         BasicIo::AutoPtr io(new FileIo(wpath));
         Image::AutoPtr image = open(io); // may throw
-        if (image.get() == 0) throw Error(11, ws2s(wpath));
+        if (image.get() == 0) throw WError(11, wpath);
         return image;
     }
 
@@ -448,7 +454,7 @@
         std::auto_ptr<FileIo> fileIo(new FileIo(wpath));
         // Create or overwrite the file, then close it
         if (fileIo->open("w+b") != 0) {
-            throw Error(10, ws2s(wpath), "w+b", strError());
+            throw WError(10, wpath, "w+b", strError().c_str());
         }
         fileIo->close();
         BasicIo::AutoPtr io(fileIo);
diff -Nru exiv2-0.19/src/image.hpp exiv2-0.21/src/image.hpp
--- exiv2-0.19/src/image.hpp	2009-11-28 08:28:08.000000000 +0000
+++ exiv2-0.21/src/image.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    image.hpp
   @brief   Class Image, defining the interface for all Image subclasses.
-  @version $Rev: 1944 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @author  Brad Schick (brad)
diff -Nru exiv2-0.19/src/iptc.cpp exiv2-0.21/src/iptc.cpp
--- exiv2-0.19/src/iptc.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/iptc.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      iptc.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2344 $
   Author(s): Brad Schick (brad) <brad@robotbattle.com>
   History:   31-July-04, brad: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: iptc.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: iptc.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -451,18 +451,16 @@
                 int rc = 0;
                 if ((rc = readData(iptcData, dataSet, record, pRead, sizeData)) != 0) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: "
-                              << "Failed to read IPTC dataset "
-                              << IptcKey(dataSet, record)
-                              << " (rc = " << rc << "); skipped.\n";
+                    EXV_WARNING << "Failed to read IPTC dataset "
+                                << IptcKey(dataSet, record)
+                                << " (rc = " << rc << "); skipped.\n";
 #endif
                 }
             }
 #ifndef SUPPRESS_WARNINGS
             else {
-                std::cerr << "Warning: "
-                          << "IPTC dataset " << IptcKey(dataSet, record)
-                          << " has invalid size " << sizeData << "; skipped.\n";
+                EXV_WARNING << "IPTC dataset " << IptcKey(dataSet, record)
+                            << " has invalid size " << sizeData << "; skipped.\n";
             }
 #endif
             pRead += sizeData;
diff -Nru exiv2-0.19/src/iptc.hpp exiv2-0.21/src/iptc.hpp
--- exiv2-0.19/src/iptc.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/iptc.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    iptc.hpp
   @brief   Encoding and decoding of IPTC data
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Brad Schick (brad)
            <a href="mailto:brad@robotbattle.com">brad@robotbattle.com</a>
   @date    31-Jul-04, brad: created
diff -Nru exiv2-0.19/src/jp2image.cpp exiv2-0.21/src/jp2image.cpp
--- exiv2-0.19/src/jp2image.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/jp2image.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      jp2image.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2344 $
   Author(s): Marco Piovanelli, Ovolab (marco)
   Author(s): Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
   History:   12-Mar-2007, marco: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: jp2image.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: jp2image.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 
@@ -286,7 +286,7 @@
                             else
                             {
 #ifndef SUPPRESS_WARNINGS
-                                std::cerr << "Exiv2::Jp2Image::readMetadata: Failed to decode Exif metadata.\n";
+                                EXV_WARNING << "Failed to decode Exif metadata.\n";
 #endif
                                 exifData_.clear();
                             }
@@ -305,7 +305,7 @@
                             if (IptcParser::decode(iptcData_, rawData.pData_, rawData.size_))
                             {
 #ifndef SUPPRESS_WARNINGS
-                                std::cerr << "Warning: Failed to decode IPTC metadata.\n";
+                                EXV_WARNING << "Failed to decode IPTC metadata.\n";
 #endif
                                 iptcData_.clear();
                             }
@@ -327,9 +327,8 @@
                             if (idx != std::string::npos && idx > 0)
                             {
 #ifndef SUPPRESS_WARNINGS
-                                std::cerr << "Exiv2::Jp2Image::readMetadata: Removing "
-                                          << static_cast<uint32_t>(idx)
-                                          << " characters from the beginning of the XMP packet\n";
+                                EXV_WARNING << "Removing " << static_cast<uint32_t>(idx)
+                                            << " characters from the beginning of the XMP packet\n";
 #endif
                                 xmpPacket_ = xmpPacket_.substr(idx);
                             }
@@ -337,7 +336,7 @@
                             if (xmpPacket_.size() > 0 && XmpParser::decode(xmpData_, xmpPacket_))
                             {
 #ifndef SUPPRESS_WARNINGS
-                                std::cerr << "Exiv2::Jp2Image::readMetadata: Failed to decode XMP metadata.\n";
+                                EXV_WARNING << "Failed to decode XMP metadata.\n";
 #endif
                             }
                         }
@@ -532,7 +531,7 @@
                         if (XmpParser::encode(xmpPacket_, xmpData_) > 1)
                         {
 #ifndef SUPPRESS_WARNINGS
-                            std::cerr << "Error: Failed to encode XMP metadata.\n";
+                            EXV_ERROR << "Failed to encode XMP metadata.\n";
 #endif
                         }
                     }
diff -Nru exiv2-0.19/src/jp2image.hpp exiv2-0.21/src/jp2image.hpp
--- exiv2-0.19/src/jp2image.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/jp2image.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   @file    jp2image.hpp
   @brief   JPEG-2000 image, implemented using the following references:
            <a href="http://jpeg.org/public/fcd15444-6.pdf">ISO/IEC JTC 1/SC 29/WG1 N2401: JPEG 2000 Part 6 FCD 15444-6</a><br>
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Gilles Caulier (cgilles)
            <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
   @author  Marco Piovanelli, Ovolab (marco)
diff -Nru exiv2-0.19/src/jpgimage.cpp exiv2-0.21/src/jpgimage.cpp
--- exiv2-0.19/src/jpgimage.cpp	2009-12-28 14:11:23.000000000 +0000
+++ exiv2-0.21/src/jpgimage.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,7 +20,7 @@
  */
 /*
   File:      jpgimage.cpp
-  Version:   $Rev: 1976 $
+  Version:   $Rev: 2344 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
              Brad Schick (brad) <brad@robotbattle.com>
              Volker Grabsch (vog) <vog@notjusthosting.com>
@@ -28,8 +28,8 @@
   History:   15-Jan-05, brad: split out from image.cpp
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: jpgimage.cpp 1976 2009-12-28 14:11:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: jpgimage.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -347,7 +347,7 @@
                 setByteOrder(bo);
                 if (rawExif.size_ > 0 && byteOrder() == invalidByteOrder) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode Exif metadata.\n";
+                    EXV_WARNING << "Failed to decode Exif metadata.\n";
 #endif
                     exifData_.clear();
                 }
@@ -368,7 +368,7 @@
                 xmpPacket_.assign(reinterpret_cast<char*>(xmpPacket.pData_), xmpPacket.size_);
                 if (xmpPacket_.size() > 0 && XmpParser::decode(xmpData_, xmpPacket_)) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode XMP metadata.\n";
+                    EXV_WARNING << "Failed to decode XMP metadata.\n";
 #endif
                 }
                 --search;
@@ -474,7 +474,7 @@
                                       &iptcBlob[0],
                                       static_cast<uint32_t>(iptcBlob.size()))) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to decode IPTC metadata.\n";
+                EXV_WARNING << "Failed to decode IPTC metadata.\n";
 #endif
                 iptcData_.clear();
             }
@@ -482,7 +482,7 @@
 
         if (rc != 0) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: JPEG format error, rc = " << rc << "\n";
+            EXV_WARNING << "JPEG format error, rc = " << rc << "\n";
 #endif
         }
     } // JpegBase::readMetadata
@@ -696,9 +696,9 @@
                     }
                 }
                 if (writeXmpFromPacket() == false) {
-                    if (XmpParser::encode(xmpPacket_, xmpData_) > 1) {
+                    if (XmpParser::encode(xmpPacket_, xmpData_, XmpParser::useCompactFormat | XmpParser::omitAllFormatting) > 1) {
 #ifndef SUPPRESS_WARNINGS
-                        std::cerr << "Error: Failed to encode XMP metadata.\n";
+                        EXV_ERROR << "Failed to encode XMP metadata.\n";
 #endif
                     }
                 }
diff -Nru exiv2-0.19/src/jpgimage.hpp exiv2-0.21/src/jpgimage.hpp
--- exiv2-0.19/src/jpgimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/jpgimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    jpgimage.hpp
   @brief   Class JpegImage to access JPEG images
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @author  Brad Schick (brad)
diff -Nru exiv2-0.19/src/localtime.c exiv2-0.21/src/localtime.c
--- exiv2-0.19/src/localtime.c	2009-05-19 03:48:42.000000000 +0000
+++ exiv2-0.21/src/localtime.c	2010-09-11 20:02:32.000000000 +0000
@@ -1,7 +1,7 @@
 /*!
   @file    localtime.c
   @brief   This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
-  @version $Rev: 1800 $
+  @version $Rev: 2347 $
 */
 
 #ifdef _MSC_VER
diff -Nru exiv2-0.19/src/Makefile exiv2-0.21/src/Makefile
--- exiv2-0.19/src/Makefile	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/Makefile	2010-11-22 15:44:15.000000000 +0000
@@ -1,6 +1,6 @@
 # ************************************************************* -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      Makefile
-# Version:   $Rev: 1937 $
+# Version:   $Rev: 2383 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   10-Dec-03, ahu: created
 #
@@ -59,60 +59,60 @@
 # Source files
 
 # Add standalone C++ header files to this list
-CCHDR =  exv_conf.h           \
-         exv_msvc.h           \
-         mn.hpp               \
-         rcsid.hpp            \
+CCHDR =  exiv2.hpp             \
+         exv_conf.h            \
+         exv_msvc.h            \
          version.hpp
 
 # Add library C++ source files to this list
-CCSRC =  basicio.cpp          \
-	 bmpimage.cpp         \
-	 canonmn.cpp          \
-	 convert.cpp          \
-	 cr2image.cpp         \
-	 crwimage.cpp         \
-	 datasets.cpp         \
-	 easyaccess.cpp       \
-	 error.cpp            \
-	 exif.cpp             \
-	 futils.cpp           \
-	 fujimn.cpp           \
-	 gifimage.cpp         \
-	 image.cpp            \
-	 iptc.cpp             \
-	 jp2image.cpp         \
-	 jpgimage.cpp         \
-	 makernote.cpp        \
-	 metadatum.cpp        \
-	 minoltamn.cpp        \
-	 mrwimage.cpp         \
-	 nikonmn.cpp          \
-	 olympusmn.cpp        \
-	 orfimage.cpp         \
-	 panasonicmn.cpp      \
+CCSRC =  basicio.cpp           \
+	 bmpimage.cpp          \
+	 canonmn.cpp           \
+	 convert.cpp           \
+	 cr2image.cpp          \
+	 crwimage.cpp          \
+	 datasets.cpp          \
+	 easyaccess.cpp        \
+	 error.cpp             \
+	 exif.cpp              \
+	 futils.cpp            \
+	 fujimn.cpp            \
+	 gifimage.cpp          \
+	 image.cpp             \
+	 iptc.cpp              \
+	 jp2image.cpp          \
+	 jpgimage.cpp          \
+	 makernote.cpp         \
+	 metadatum.cpp         \
+	 minoltamn.cpp         \
+	 mrwimage.cpp          \
+	 nikonmn.cpp           \
+	 olympusmn.cpp         \
+	 orfimage.cpp          \
+	 panasonicmn.cpp       \
 	 pgfimage.cpp
 ifdef HAVE_LIBZ
-CCSRC += pngimage.cpp         \
+CCSRC += pngimage.cpp          \
 	 pngchunk.cpp
 endif
-CCSRC += preview.cpp          \
-	 properties.cpp       \
-	 psdimage.cpp         \
-	 rafimage.cpp         \
-	 rw2image.cpp         \
-	 sigmamn.cpp          \
-	 pentaxmn.cpp         \
-	 sonymn.cpp           \
-	 tags.cpp             \
-	 tgaimage.cpp         \
-	 tiffcomposite.cpp    \
-	 tiffimage.cpp        \
-	 tiffvisitor.cpp      \
-	 types.cpp            \
-	 value.cpp            \
-	 version.cpp          \
-	 xmp.cpp              \
+CCSRC += preview.cpp           \
+	 properties.cpp        \
+	 psdimage.cpp          \
+	 rafimage.cpp          \
+	 rw2image.cpp          \
+	 samsungmn.cpp         \
+	 sigmamn.cpp           \
+	 pentaxmn.cpp          \
+	 sonymn.cpp            \
+	 tags.cpp              \
+	 tgaimage.cpp          \
+	 tiffcomposite.cpp     \
+	 tiffimage.cpp         \
+	 tiffvisitor.cpp       \
+	 types.cpp             \
+	 value.cpp             \
+	 version.cpp           \
+	 xmp.cpp               \
 	 xmpsidecar.cpp
 
 # Add library C source files to this list
@@ -331,3 +331,5 @@
 # This command is intended for maintainers to use; it deletes files
 # that may need special tools to rebuild.
 maintainer-clean: uninstall distclean
+	-$(RM) -r .deps
+	-$(RM) -r .libs
diff -Nru exiv2-0.19/src/makernote.cpp exiv2-0.21/src/makernote.cpp
--- exiv2-0.19/src/makernote.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/makernote.cpp	2010-10-15 07:44:48.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      makernote.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2364 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   11-Apr-06, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: makernote.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: makernote.cpp 2364 2010-10-15 07:44:48Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -48,6 +48,9 @@
 
 // *****************************************************************************
 namespace {
+    // Todo: Can be generalized further - get any tag as a string/long/...
+    //! Get the model name from tag Exif.Image.Model
+    std::string getExifModel(Exiv2::Internal::TiffComponent* const pRoot);
     //! Nikon en/decryption function
     void ncrypt(Exiv2::byte* pData, uint32_t size, uint32_t count, uint32_t serial);
 }
@@ -58,40 +61,42 @@
     namespace Internal {
 
     const TiffMnRegistry TiffMnCreator::registry_[] = {
-        { "Canon",          Group::canonmn,   newIfdMn,       newIfdMn2       },
-        { "FOVEON",         Group::sigmamn,   newSigmaMn,     newSigmaMn2     },
-        { "FUJI",           Group::fujimn,    newFujiMn,      newFujiMn2      },
-        { "KONICA MINOLTA", Group::minoltamn, newIfdMn,       newIfdMn2       },
-        { "Minolta",        Group::minoltamn, newIfdMn,       newIfdMn2       },
-        { "NIKON",          Group::nikonmn,   newNikonMn,     0               },
-        { "OLYMPUS",        Group::olympmn,   newOlympusMn,   0               },
-        { "Panasonic",      Group::panamn,    newPanasonicMn, newPanasonicMn2 },
-        { "PENTAX",         Group::pentaxmn,  newPentaxMn,    newPentaxMn2    },
-        { "SIGMA",          Group::sigmamn,   newSigmaMn,     newSigmaMn2     },
-        { "SONY",           Group::sonymn,    newSonyMn,      0               },
+        { "Canon",          canonId,     newIfdMn,       newIfdMn2       },
+        { "FOVEON",         sigmaId,     newSigmaMn,     newSigmaMn2     },
+        { "FUJI",           fujiId,      newFujiMn,      newFujiMn2      },
+        { "KONICA MINOLTA", minoltaId,   newIfdMn,       newIfdMn2       },
+        { "Minolta",        minoltaId,   newIfdMn,       newIfdMn2       },
+        { "NIKON",          ifdIdNotSet, newNikonMn,     0               }, // mnGroup_ is not used
+        { "OLYMPUS",        ifdIdNotSet, newOlympusMn,   0               }, // mnGroup_ is not used
+        { "Panasonic",      panasonicId, newPanasonicMn, newPanasonicMn2 },
+        { "PENTAX",         pentaxId,    newPentaxMn,    newPentaxMn2    },
+        { "SAMSUNG",        samsung2Id,  newSamsungMn,   newSamsungMn2   },
+        { "SIGMA",          sigmaId,     newSigmaMn,     newSigmaMn2     },
+        { "SONY",           ifdIdNotSet, newSonyMn,      0               }, // mnGroup_ is not used
         // Entries below are only used for lookup by group
-        { "-",              Group::nikon1mn,  0,              newIfdMn2       },
-        { "-",              Group::nikon2mn,  0,              newNikon2Mn2    },
-        { "-",              Group::nikon3mn,  0,              newNikon3Mn2    },
-        { "-",              Group::sony1mn,   0,              newSony1Mn2     },
-        { "-",              Group::sony2mn,   0,              newSony2Mn2     },
-        { "-",              Group::olymp1mn,  0,              newOlympusMn2   },
-        { "-",              Group::olymp2mn,  0,              newOlympus2Mn2  }
+        { "-",              nikon1Id,    0,              newIfdMn2       },
+        { "-",              nikon2Id,    0,              newNikon2Mn2    },
+        { "-",              nikon3Id,    0,              newNikon3Mn2    },
+        { "-",              sony1Id,     0,              newSony1Mn2     },
+        { "-",              sony2Id,     0,              newSony2Mn2     },
+        { "-",              olympusId,   0,              newOlympusMn2   },
+        { "-",              olympus2Id,  0,              newOlympus2Mn2  }
     };
 
     bool TiffMnRegistry::operator==(const std::string& key) const
     {
         std::string make(make_);
+        if (key.size() > 0 && key[0] == '-') return false;
         return make == key.substr(0, make.length());
     }
 
-    bool TiffMnRegistry::operator==(const uint16_t& key) const
+    bool TiffMnRegistry::operator==(IfdId key) const
     {
         return mnGroup_ == key;
     }
 
     TiffComponent* TiffMnCreator::create(uint16_t           tag,
-                                         uint16_t           group,
+                                         IfdId              group,
                                          const std::string& make,
                                          const byte*        pData,
                                          uint32_t           size,
@@ -112,12 +117,19 @@
     } // TiffMnCreator::create
 
     TiffComponent* TiffMnCreator::create(uint16_t           tag,
-                                         uint16_t           group,
-                                         uint16_t           mnGroup)
+                                         IfdId              group,
+                                         IfdId              mnGroup)
     {
         TiffComponent* tc = 0;
         const TiffMnRegistry* tmr = find(registry_, mnGroup);
         if (tmr) {
+
+            if (tmr->newMnFct2_ == 0) {
+
+                std::cout << "mnGroup = " << mnGroup << "\n";
+
+            }
+
             assert(tmr->newMnFct2_);
             tc = tmr->newMnFct2_(tag, group, mnGroup);
         }
@@ -504,6 +516,34 @@
         return size_;
     } // PentaxMnHeader::write
 
+    SamsungMnHeader::SamsungMnHeader()
+    {
+        read(0, 0, invalidByteOrder);
+    }
+
+    uint32_t SamsungMnHeader::size() const
+    {
+        return 0;
+    }
+
+    uint32_t SamsungMnHeader::baseOffset(uint32_t mnOffset) const
+    {
+        return mnOffset;
+    }
+
+    bool SamsungMnHeader::read(const byte* /*pData*/,
+                               uint32_t    /*size*/,
+                               ByteOrder   /*byteOrder*/)
+    {
+        return true;
+    } // SamsungMnHeader::read
+
+    uint32_t SamsungMnHeader::write(IoWrapper& /*ioWrapper*/,
+                                    ByteOrder /*byteOrder*/) const
+    {
+        return 0;
+    } // SamsungMnHeader::write
+
     const byte SigmaMnHeader::signature1_[] = {
         'S', 'I', 'G', 'M', 'A', '\0', '\0', '\0', 0x01, 0x00
     };
@@ -598,8 +638,8 @@
     // free functions
 
     TiffComponent* newIfdMn(uint16_t    tag,
-                            uint16_t    group,
-                            uint16_t    mnGroup,
+                            IfdId       group,
+                            IfdId       mnGroup,
                             const byte* /*pData*/,
                             uint32_t    /*size*/,
                             ByteOrder   /*byteOrder*/)
@@ -608,43 +648,43 @@
     }
 
     TiffComponent* newIfdMn2(uint16_t tag,
-                             uint16_t group,
-                             uint16_t mnGroup)
+                             IfdId    group,
+                             IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, 0);
     }
 
     TiffComponent* newOlympusMn(uint16_t    tag,
-                                uint16_t    group,
-                                uint16_t    /*mnGroup*/,
+                                IfdId       group,
+                                IfdId       /*mnGroup*/,
                                 const byte* pData,
                                 uint32_t    size,
                                 ByteOrder   /*byteOrder*/)
     {
         if (size < 10 ||   std::string(reinterpret_cast<const char*>(pData), 10)
                         != std::string("OLYMPUS\0II", 10)) {
-            return newOlympusMn2(tag, group, Group::olymp1mn);
+            return newOlympusMn2(tag, group, olympusId);
         }
-        return newOlympus2Mn2(tag, group, Group::olymp2mn);
+        return newOlympus2Mn2(tag, group, olympus2Id);
     }
 
     TiffComponent* newOlympusMn2(uint16_t tag,
-                                 uint16_t group,
-                                 uint16_t mnGroup)
+                                 IfdId    group,
+                                 IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new OlympusMnHeader);
     }
 
     TiffComponent* newOlympus2Mn2(uint16_t tag,
-                                 uint16_t group,
-                                 uint16_t mnGroup)
+                                  IfdId    group,
+                                  IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new Olympus2MnHeader);
     }
 
     TiffComponent* newFujiMn(uint16_t    tag,
-                             uint16_t    group,
-                             uint16_t    mnGroup,
+                             IfdId       group,
+                             IfdId       mnGroup,
                              const byte* /*pData*/,
                              uint32_t    /*size*/,
                              ByteOrder   /*byteOrder*/)
@@ -653,15 +693,15 @@
     }
 
     TiffComponent* newFujiMn2(uint16_t tag,
-                              uint16_t group,
-                              uint16_t mnGroup)
+                              IfdId    group,
+                              IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new FujiMnHeader);
     }
 
     TiffComponent* newNikonMn(uint16_t    tag,
-                              uint16_t    group,
-                              uint16_t    /*mnGroup*/,
+                              IfdId       group,
+                              IfdId       /*mnGroup*/,
                               const byte* pData,
                               uint32_t    size,
                               ByteOrder   /*byteOrder*/)
@@ -669,7 +709,7 @@
         // If there is no "Nikon" string it must be Nikon1 format
         if (size < 6 ||    std::string(reinterpret_cast<const char*>(pData), 6)
                         != std::string("Nikon\0", 6)) {
-            return newIfdMn2(tag, group, Group::nikon1mn);
+            return newIfdMn2(tag, group, nikon1Id);
         }
         // If the "Nikon" string is not followed by a TIFF header, we assume
         // Nikon2 format
@@ -677,29 +717,29 @@
         if (   size < 18
             || !tiffHeader.read(pData + 10, size - 10)
             || tiffHeader.tag() != 0x002a) {
-            return newNikon2Mn2(tag, group, Group::nikon2mn);
+            return newNikon2Mn2(tag, group, nikon2Id);
         }
         // Else we have a Nikon3 makernote
-        return newNikon3Mn2(tag, group, Group::nikon3mn);
+        return newNikon3Mn2(tag, group, nikon3Id);
     }
 
     TiffComponent* newNikon2Mn2(uint16_t tag,
-                                uint16_t group,
-                                uint16_t mnGroup)
+                                IfdId    group,
+                                IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new Nikon2MnHeader);
     }
 
     TiffComponent* newNikon3Mn2(uint16_t tag,
-                                uint16_t group,
-                                uint16_t mnGroup)
+                                IfdId    group,
+                                IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new Nikon3MnHeader);
     }
 
     TiffComponent* newPanasonicMn(uint16_t    tag,
-                                  uint16_t    group,
-                                  uint16_t    mnGroup,
+                                  IfdId       group,
+                                  IfdId       mnGroup,
                                   const byte* /*pData*/,
                                   uint32_t    /*size*/,
                                   ByteOrder   /*byteOrder*/)
@@ -708,32 +748,49 @@
     }
 
     TiffComponent* newPanasonicMn2(uint16_t tag,
-                                   uint16_t group,
-                                   uint16_t mnGroup)
+                                   IfdId    group,
+                                   IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new PanasonicMnHeader, false);
     }
 
     TiffComponent* newPentaxMn(uint16_t    tag,
-                                uint16_t    group,
-                                uint16_t    mnGroup,
-                                const byte* /*pData*/,
-                                uint32_t    /*size*/,
-                                ByteOrder   /*byteOrder*/)
+                               IfdId       group,
+                               IfdId       mnGroup,
+                               const byte* /*pData*/,
+                               uint32_t    /*size*/,
+                               ByteOrder   /*byteOrder*/)
     {
         return newPentaxMn2(tag, group, mnGroup);
     }
 
     TiffComponent* newPentaxMn2(uint16_t tag,
-                                uint16_t group,
-                                uint16_t mnGroup)
+                                IfdId    group,
+                                IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new PentaxMnHeader);
     }
 
+    TiffComponent* newSamsungMn(uint16_t    tag,
+                                IfdId       group,
+                                IfdId       mnGroup,
+                                const byte* /*pData*/,
+                                uint32_t    /*size*/,
+                                ByteOrder   /*byteOrder*/)
+    {
+        return newSamsungMn2(tag, group, mnGroup);
+    }
+
+    TiffComponent* newSamsungMn2(uint16_t tag,
+                                 IfdId    group,
+                                 IfdId    mnGroup)
+    {
+        return new TiffIfdMakernote(tag, group, mnGroup, new SamsungMnHeader);
+    }
+
     TiffComponent* newSigmaMn(uint16_t    tag,
-                              uint16_t    group,
-                              uint16_t    mnGroup,
+                              IfdId       group,
+                              IfdId       mnGroup,
                               const byte* /*pData*/,
                               uint32_t    /*size*/,
                               ByteOrder   /*byteOrder*/)
@@ -742,15 +799,15 @@
     }
 
     TiffComponent* newSigmaMn2(uint16_t tag,
-                               uint16_t group,
-                               uint16_t mnGroup)
+                               IfdId    group,
+                               IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new SigmaMnHeader);
     }
 
     TiffComponent* newSonyMn(uint16_t    tag,
-                             uint16_t    group,
-                             uint16_t    /*mnGroup*/,
+                             IfdId       group,
+                             IfdId       /*mnGroup*/,
                              const byte* pData,
                              uint32_t    size,
                              ByteOrder   /*byteOrder*/)
@@ -758,21 +815,21 @@
         // If there is no "SONY DSC " string we assume it's a simple IFD Makernote
         if (size < 12 ||   std::string(reinterpret_cast<const char*>(pData), 12)
                         != std::string("SONY DSC \0\0\0", 12)) {
-            return newSony2Mn2(tag, group, Group::sony2mn);
+            return newSony2Mn2(tag, group, sony2Id);
         }
-        return newSony1Mn2(tag, group, Group::sony1mn);
+        return newSony1Mn2(tag, group, sony1Id);
     }
 
     TiffComponent* newSony1Mn2(uint16_t tag,
-                               uint16_t group,
-                               uint16_t mnGroup)
+                               IfdId    group,
+                               IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, new SonyMnHeader, false);
     }
 
     TiffComponent* newSony2Mn2(uint16_t tag,
-                               uint16_t group,
-                               uint16_t mnGroup)
+                               IfdId    group,
+                               IfdId    mnGroup)
     {
         return new TiffIfdMakernote(tag, group, mnGroup, 0, true);
     }
@@ -823,13 +880,19 @@
         { 0x0097, "0207",    0, 3, 284 },
         { 0x0097, "0208",    0, 3, 284 },
         { 0x0097, "0209",    0, 5, 284 },
+        { 0x0097, "02",      0, 3, 284 },
         // NikonLd
         { 0x0098, "0100",    0, 0,  NA },
         { 0x0098, "0101",    0, 1,  NA },
         { 0x0098, "0201",    0, 1,   4 },
         { 0x0098, "0202",    0, 1,   4 },
         { 0x0098, "0203",    0, 1,   4 },
-        { 0x0098, "0204",    0, 2,   4 }
+        { 0x0098, "0204",    0, 2,   4 },
+        // NikonFl
+        { 0x00a8, "0100",    0, 0,  NA },
+        { 0x00a8, "0101",    0, 0,  NA },
+        { 0x00a8, "0102",    0, 1,  NA },
+        { 0x00a8, "0103",    0, 2,  NA },
     };
 
     int nikonSelector(uint16_t tag, const byte* pData, uint32_t size, TiffComponent* const /*pRoot*/)
@@ -848,26 +911,22 @@
         if (nci == 0 || nci->start_ == NA || size <= nci->start_) return buf;
 
         // Find Exif.Nikon3.ShutterCount
-        TiffFinder finder(0x00a7, Group::nikon3mn);
+        TiffFinder finder(0x00a7, nikon3Id);
         pRoot->accept(finder);
         TiffEntryBase* te = dynamic_cast<TiffEntryBase*>(finder.result());
         if (!te || !te->pValue() || te->pValue()->count() == 0) return buf;
         uint32_t count = static_cast<uint32_t>(te->pValue()->toLong());
 
         // Find Exif.Nikon3.SerialNumber
-        finder.init(0x001d, Group::nikon3mn);
+        finder.init(0x001d, nikon3Id);
         pRoot->accept(finder);
         te = dynamic_cast<TiffEntryBase*>(finder.result());
         if (!te || !te->pValue() || te->pValue()->count() == 0) return buf;
         bool ok(false);
         uint32_t serial = stringTo<uint32_t>(te->pValue()->toString(), ok);
         if (!ok) {
-            // Find Exif.Image.Model
-            finder.init(0x0110, Group::ifd0);
-            pRoot->accept(finder);
-            te = dynamic_cast<TiffEntryBase*>(finder.result());
-            if (!te || !te->pValue() || te->pValue()->count() == 0) return buf;
-            std::string model = te->pValue()->toString();
+            std::string model = getExifModel(pRoot);
+            if (model.empty()) return buf;
             if (model.find("D50") != std::string::npos) {
                 serial = 0x22;
             }
@@ -881,11 +940,31 @@
         return buf;
     }
 
+    int sonyCsSelector(uint16_t /*tag*/, const byte* /*pData*/, uint32_t /*size*/, TiffComponent* const pRoot)
+    {
+        std::string model = getExifModel(pRoot);
+        if (model.empty()) return -1;
+        int idx = 0;
+        if (   model.find("DSLR-A330") != std::string::npos
+            || model.find("DSLR-A380") != std::string::npos) {
+            idx = 1;
+        }
+        return idx;
+    }
 }}                                      // namespace Internal, Exiv2
 
 // *****************************************************************************
 // local definitions
 namespace {
+    std::string getExifModel(Exiv2::Internal::TiffComponent* const pRoot)
+    {
+        Exiv2::Internal::TiffFinder finder(0x0110, Exiv2::Internal::ifd0Id); // Exif.Image.Model
+        pRoot->accept(finder);
+        Exiv2::Internal::TiffEntryBase* te = dynamic_cast<Exiv2::Internal::TiffEntryBase*>(finder.result());
+        if (!te || !te->pValue() || te->pValue()->count() == 0) return std::string();
+        return te->pValue()->toString();
+    }
+
     void ncrypt(Exiv2::byte* pData, uint32_t size, uint32_t count, uint32_t serial)
     {
         static const Exiv2::byte xlat[2][256] = {
diff -Nru exiv2-0.19/src/makernote_int.hpp exiv2-0.21/src/makernote_int.hpp
--- exiv2-0.19/src/makernote_int.hpp	2009-12-04 17:40:42.000000000 +0000
+++ exiv2-0.21/src/makernote_int.hpp	2010-09-28 17:05:23.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -24,7 +24,7 @@
            vendor specific makernote implementations.<BR>References:<BR>
   [1] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey<BR>
   [2] <a href="http://www.cybercom.net/~dcoffin/dcraw/">Decoding raw digital photos in Linux</a> by Dave Coffin
-  @version $Rev: 1953 $
+  @version $Rev: 2357 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    11-Apr-06, ahu: created
@@ -35,6 +35,7 @@
 // *****************************************************************************
 // included header files
 #include "tifffwd_int.hpp"
+#include "tags_int.hpp"
 #include "types.hpp"
 
 // + standard includes
@@ -45,87 +46,21 @@
 namespace Exiv2 {
     namespace Internal {
 
-    namespace Group {
-        const uint16_t olympmn   = 257; //!< any Olympus makernote
-        const uint16_t fujimn    = 258; //!< Fujifilm makernote
-        const uint16_t canonmn   = 259; //!< Canon makernote
-        const uint16_t canoncs   = 260; //!< Canon camera settings
-        const uint16_t canonsi   = 261; //!< Canon shot info
-        const uint16_t canoncf   = 262; //!< Canon custom functions
-        const uint16_t nikonmn   = 263; //!< Any Nikon makernote (pseudo group)
-        const uint16_t nikon1mn  = 264; //!< Nikon1 makernote
-        const uint16_t nikon2mn  = 265; //!< Nikon2 makernote
-        const uint16_t nikon3mn  = 266; //!< Nikon3 makernote
-        const uint16_t panamn    = 267; //!< Panasonic makernote
-        const uint16_t sigmamn   = 268; //!< Sigma makernote
-        const uint16_t sonymn    = 269; //!< Any Sony makernote (pseudo group)
-        const uint16_t sony1mn   = 270; //!< Sony1 makernote
-        const uint16_t sony2mn   = 271; //!< Sony2 makernote
-        const uint16_t minoltamn = 272; //!< Minolta makernote
-        const uint16_t minocso   = 273; //!< Minolta camera settings (old)
-        const uint16_t minocsn   = 274; //!< Minolta camera settings (new)
-        const uint16_t minocs5   = 275; //!< Minolta camera settings (D5)
-        const uint16_t minocs7   = 276; //!< Minolta camera settings (D7)
-        const uint16_t canonpi   = 277; //!< Canon picture info
-        const uint16_t canonpa   = 278; //!< Canon panorama
-        const uint16_t pentaxmn  = 279; //!< Pentax makernote
-        const uint16_t nikonpv   = 280; //!< Nikon preview sub-IFD
-        const uint16_t olymp1mn  = 281; //!< Olympus makernote
-        const uint16_t olymp2mn  = 282; //!< Olympus II makernote
-        const uint16_t olympcs   = 283; //!< Olympus camera settings
-        const uint16_t olympeq   = 284; //!< Olympus equipment tags
-        const uint16_t olymprd   = 285; //!< Olympus raw development tags
-        const uint16_t olymprd2  = 286; //!< Olympus raw development 2 tags
-        const uint16_t olympip   = 287; //!< Olympus image processing tags
-        const uint16_t olympfi   = 288; //!< Olympus focus info tags
-        const uint16_t olympfe1  = 289; //!< Olympus FE 1 tags
-        const uint16_t olympfe2  = 290; //!< Olympus FE 2 tags
-        const uint16_t olympfe3  = 291; //!< Olympus FE 3 tags
-        const uint16_t olympfe4  = 292; //!< Olympus FE 4 tags
-        const uint16_t olympfe5  = 293; //!< Olympus FE 5 tags
-        const uint16_t olympfe6  = 294; //!< Olympus FE 6 tags
-        const uint16_t olympfe7  = 295; //!< Olympus FE 7 tags
-        const uint16_t olympfe8  = 296; //!< Olympus FE 8 tags
-        const uint16_t olympfe9  = 297; //!< Olympus FE 9 tags
-        const uint16_t olympri   = 298; //!< Olympus raw info tags
-        const uint16_t nikonwt   = 299; //!< Nikon World Time tags
-        const uint16_t nikonii   = 300; //!< Nikon ISO Info tags
-        const uint16_t nikonld1  = 301; //!< Nikon Lens Data 1 tags
-        const uint16_t nikonld2  = 302; //!< Nikon Lens Data 2 tags
-        const uint16_t nikonld3  = 303; //!< Nikon Lens Data 3 tags
-        const uint16_t nikoncb1  = 304; //!< Nikon Color Balance 1 Tags
-        const uint16_t nikoncb2  = 305; //!< Nikon Color Balance 2 Tags
-        const uint16_t nikoncb2a = 306; //!< Nikon Color Balance 2 Tags
-        const uint16_t nikoncb2b = 307; //!< Nikon Color Balance 2 Tags
-        const uint16_t nikoncb3  = 308; //!< Nikon Color Balance 3 Tags
-        const uint16_t nikoncb4  = 309; //!< Nikon Color Balance 4 Tags
-        const uint16_t nikonvr   = 310; //!< Nikon Vibration Reduction Tags
-        const uint16_t nikonpc   = 311; //!< Nikon Picture Control Tags
-        const uint16_t nikonaf   = 312; //!< Nikon Auto Focus Tags
-        const uint16_t nikonsi1  = 313; //!< Nikon Shot Info D80 Tags
-        const uint16_t nikonsi2  = 314; //!< Nikon Shot Info D40 Tags
-        const uint16_t nikonsi3  = 315; //!< Nikon Shot Info D300 Tags (a)
-        const uint16_t nikonsi4  = 316; //!< Nikon Shot Info D300 Tags (b)
-        const uint16_t nikonsi5  = 317; //!< Nikon Shot Info v2.* Tags
-        const uint16_t nikonsi6  = 318; //!< Nikon Shot Info v1.* Tags
-        const uint16_t canonfi   = 320; //!< Canon File Info
-    }
-
 // *****************************************************************************
 // class definitions
 
     //! Type for a pointer to a function creating a makernote (image)
     typedef TiffComponent* (*NewMnFct)(uint16_t    tag,
-                                       uint16_t    group,
-                                       uint16_t    mnGroup,
+                                       IfdId       group,
+                                       IfdId       mnGroup,
                                        const byte* pData,
                                        uint32_t    size,
                                        ByteOrder   byteOrder);
 
     //! Type for a pointer to a function creating a makernote (group)
     typedef TiffComponent* (*NewMnFct2)(uint16_t   tag,
-                                        uint16_t   group,
-                                        uint16_t   mnGroup);
+                                        IfdId      group,
+                                        IfdId      mnGroup);
 
     //! Makernote registry structure
     struct TiffMnRegistry {
@@ -140,11 +75,11 @@
         bool operator==(const std::string& key) const;
 
         //! Compare a TiffMnRegistry structure with a makernote group
-        bool operator==(const uint16_t& key) const;
+        bool operator==(IfdId key) const;
 
         // DATA
         const char* make_;                      //!< Camera make
-        uint16_t    mnGroup_;                   //!< Group identifier
+        IfdId       mnGroup_;                   //!< Group identifier
         NewMnFct    newMnFct_;                  //!< Makernote create function (image)
         NewMnFct2   newMnFct2_;                 //!< Makernote create function (group)
     };
@@ -166,7 +101,7 @@
                  file dependencies.
         */
         static TiffComponent* create(uint16_t           tag,
-                                     uint16_t           group,
+                                     IfdId              group,
                                      const std::string& make,
                                      const byte*        pData,
                                      uint32_t           size,
@@ -176,8 +111,8 @@
                  when a makernote is written back from Exif tags.
          */
         static TiffComponent* create(uint16_t           tag,
-                                     uint16_t           group,
-                                     uint16_t           mnGroup);
+                                     IfdId              group,
+                                     IfdId              mnGroup);
 
     protected:
         //! Prevent destruction (needed if used as a policy class)
@@ -228,7 +163,7 @@
                  to the start of the TIFF header. \em mnOffset is the offset
                  to the makernote from the start of the TIFF header.
          */
-        virtual uint32_t baseOffset(uint32_t /*mnOffset*/) const;
+        virtual uint32_t baseOffset(uint32_t mnOffset) const;
         //@}
 
     }; // class MnHeader
@@ -456,6 +391,29 @@
 
     }; // class PentaxMnHeader
 
+    //! Header of a Samsung Makernote, only used for the relative offset
+    class SamsungMnHeader : public MnHeader {
+    public:
+        //! @name Creators
+        //@{
+        //! Default constructor
+        SamsungMnHeader();
+        //@}
+        //! @name Manipulators
+        //@{
+        virtual bool read(const byte* pData,
+                          uint32_t    size,
+                          ByteOrder   byteOrder);
+        //@}
+        //! @name Accessors
+        //@{
+        virtual uint32_t size() const;
+        virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
+        virtual uint32_t baseOffset(uint32_t mnOffset) const;
+        //@}
+
+    }; // class SamsungMnHeader
+
     //! Header of a Sigma Makernote
     class SigmaMnHeader : public MnHeader {
     public:
@@ -524,125 +482,149 @@
 
     //! Function to create a simple IFD makernote (Canon, Minolta, Nikon1)
     TiffComponent* newIfdMn(uint16_t    tag,
-                            uint16_t    group,
-                            uint16_t    mnGroup,
+                            IfdId       group,
+                            IfdId       mnGroup,
                             const byte* pData,
                             uint32_t    size,
                             ByteOrder   byteOrder);
 
     //! Function to create a simple IFD makernote (Canon, Minolta, Nikon1)
     TiffComponent* newIfdMn2(uint16_t tag,
-                             uint16_t group,
-                             uint16_t mnGroup);
+                             IfdId    group,
+                             IfdId    mnGroup);
 
     //! Function to create an Olympus makernote
     TiffComponent* newOlympusMn(uint16_t    tag,
-                                uint16_t    group,
-                                uint16_t    mnGroup,
+                                IfdId       group,
+                                IfdId       mnGroup,
                                 const byte* pData,
                                 uint32_t    size,
                                 ByteOrder   byteOrder);
 
     //! Function to create an Olympus makernote
     TiffComponent* newOlympusMn2(uint16_t tag,
-                                 uint16_t group,
-                                 uint16_t mnGroup);
+                                 IfdId    group,
+                                 IfdId    mnGroup);
 
     //! Function to create an Olympus II makernote
     TiffComponent* newOlympus2Mn2(uint16_t tag,
-                                 uint16_t group,
-                                 uint16_t mnGroup);
+                                 IfdId     group,
+                                 IfdId     mnGroup);
 
     //! Function to create a Fujifilm makernote
     TiffComponent* newFujiMn(uint16_t    tag,
-                             uint16_t    group,
-                             uint16_t    mnGroup,
+                             IfdId       group,
+                             IfdId       mnGroup,
                              const byte* pData,
                              uint32_t    size,
                              ByteOrder   byteOrder);
 
     //! Function to create a Fujifilm makernote
     TiffComponent* newFujiMn2(uint16_t tag,
-                              uint16_t group,
-                              uint16_t mnGroup);
+                              IfdId    group,
+                              IfdId    mnGroup);
 
     /*!
       @brief Function to create a Nikon makernote. This will create the
              appropriate Nikon 1, 2 or 3 makernote, based on the arguments.
      */
     TiffComponent* newNikonMn(uint16_t    tag,
-                              uint16_t    group,
-                              uint16_t    mnGroup,
+                              IfdId       group,
+                              IfdId       mnGroup,
                               const byte* pData,
                               uint32_t    size,
                               ByteOrder   byteOrder);
 
     //! Function to create a Nikon2 makernote
     TiffComponent* newNikon2Mn2(uint16_t tag,
-                                uint16_t group,
-                                uint16_t mnGroup);
+                                IfdId    group,
+                                IfdId    mnGroup);
 
     //! Function to create a Nikon3 makernote
     TiffComponent* newNikon3Mn2(uint16_t tag,
-                                uint16_t group,
-                                uint16_t mnGroup);
+                                IfdId    group,
+                                IfdId    mnGroup);
 
     //! Function to create a Panasonic makernote
     TiffComponent* newPanasonicMn(uint16_t    tag,
-                                  uint16_t    group,
-                                  uint16_t    mnGroup,
+                                  IfdId       group,
+                                  IfdId       mnGroup,
                                   const byte* pData,
                                   uint32_t    size,
                                   ByteOrder   byteOrder);
 
     //! Function to create a Panasonic makernote
     TiffComponent* newPanasonicMn2(uint16_t tag,
-                                   uint16_t group,
-                                   uint16_t mnGroup);
+                                   IfdId    group,
+                                   IfdId    mnGroup);
 
     //! Function to create an Pentax makernote
     TiffComponent* newPentaxMn(uint16_t    tag,
-                               uint16_t    group,
-                               uint16_t    mnGroup,
+                               IfdId       group,
+                               IfdId       mnGroup,
                                const byte* pData,
                                uint32_t    size,
                                ByteOrder   byteOrder);
 
     //! Function to create an Pentax makernote
     TiffComponent* newPentaxMn2(uint16_t tag,
-                                uint16_t group,
-                                uint16_t mnGroup);
+                                IfdId    group,
+                                IfdId    mnGroup);
+
+    //! Function to create a Samsung makernote
+    TiffComponent* newSamsungMn(uint16_t    tag,
+                                IfdId       group,
+                                IfdId       mnGroup,
+                                const byte* pData,
+                                uint32_t    size,
+                                ByteOrder   byteOrder);
+
+    //! Function to create a Samsung makernote
+    TiffComponent* newSamsungMn2(uint16_t tag,
+                                 IfdId    group,
+                                 IfdId    mnGroup);
 
     //! Function to create a Sigma makernote
     TiffComponent* newSigmaMn(uint16_t    tag,
-                              uint16_t    group,
-                              uint16_t    mnGroup,
+                              IfdId       group,
+                              IfdId       mnGroup,
                               const byte* pData,
                               uint32_t    size,
                               ByteOrder   byteOrder);
 
     //! Function to create a Sigma makernote
     TiffComponent* newSigmaMn2(uint16_t tag,
-                               uint16_t group,
-                               uint16_t mnGroup);
+                               IfdId    group,
+                               IfdId    mnGroup);
 
     //! Function to create a Sony makernote
     TiffComponent* newSonyMn(uint16_t    tag,
-                             uint16_t    group,
-                             uint16_t    mnGroup,
+                             IfdId       group,
+                             IfdId       mnGroup,
                              const byte* pData,
                              uint32_t    size,
                              ByteOrder   byteOrder);
 
     //! Function to create a Sony1 makernote
     TiffComponent* newSony1Mn2(uint16_t tag,
-                               uint16_t group,
-                               uint16_t mnGroup);
+                               IfdId    group,
+                               IfdId    mnGroup);
 
     //! Function to create a Sony2 makernote
     TiffComponent* newSony2Mn2(uint16_t tag,
-                               uint16_t group,
-                               uint16_t mnGroup);
+                               IfdId    group,
+                               IfdId    mnGroup);
+
+    /*!
+      @brief Function to select cfg + def of the Sony Camera Settings complex binary array.
+
+      @param tag Tag number of the binary array
+      @param pData Pointer to the raw array data.
+      @param size Size of the array data.
+      @param pRoot Pointer to the root component of the TIFF tree.
+      @return An index into the array set, -1 if no match was found.
+     */
+    int sonyCsSelector(uint16_t tag, const byte* pData, uint32_t size, TiffComponent* const pRoot);
 
     /*!
       @brief Function to select cfg + def of a Nikon complex binary array.
diff -Nru exiv2-0.19/src/metacopy.cpp exiv2-0.21/src/metacopy.cpp
--- exiv2-0.19/src/metacopy.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/metacopy.cpp	2010-04-14 16:32:55.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   Abstract : Tester application for image file handling
 
   File     : metacopy.cpp
-  Version  : $Rev: 1750 $
+  Version  : $Rev: 2091 $
   Author(s): Brad Schick (brad) <brad@robotbattle.com>
   History  : 13-Jul-04, brad: created
  */
@@ -74,6 +74,9 @@
     if (params.comment_) {
         writeImg->setComment(readImg->comment());
     }
+    if (params.xmp_) {
+        writeImg->setXmpData(readImg->xmpData());
+    }
 
     try {
         writeImg->writeMetadata();
@@ -100,11 +103,13 @@
     case 'i': iptc_ = true; break;
     case 'e': exif_ = true; break;
     case 'c': comment_ = true; break;
+    case 'x': xmp_ = true; break;
     case 'p': preserve_ = true; break;
     case 'a':
         iptc_ =true;
         exif_ =true;
         comment_ =true;
+        xmp_ =true;
         break;
     case ':':
         std::cerr << progname() << ": Option -" << static_cast<char>(optopt)
@@ -152,7 +157,7 @@
             std::cerr << progname() << ": Write file must be specified\n";
             rc = 1;
         }
-        if (preserve_ && iptc_ && exif_ && comment_ ) {
+        if (preserve_ && iptc_ && exif_ && comment_ && xmp_ ) {
             std::cerr << progname() << ": Option -p has no effect when all metadata types are specified.\n";
             rc = 1;
         }
@@ -175,6 +180,7 @@
        << "   -i      Read Iptc data from readfile and write to writefile.\n"
        << "   -e      Read Exif data from readfile and write to writefile.\n"
        << "   -c      Read Jpeg comment from readfile and write to writefile.\n"
+       << "   -x      Read XMP data from readfile and write to writefile.\n"
        << "   -a      Read all metadata from readfile and write to writefile.\n"
        << "   -p      Preserve existing metadata in writefile if not replaced.\n"
        << "   -h      Display this help and exit.\n\n";
diff -Nru exiv2-0.19/src/metacopy.hpp exiv2-0.21/src/metacopy.hpp
--- exiv2-0.19/src/metacopy.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/metacopy.hpp	2010-04-14 16:32:55.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    metacopy.hpp
   @brief   Defines class Params, used for the command line handling
-  @version $Rev: 1750 $
+  @version $Rev: 2091 $
   @author  Brad Schick (brad) <brad@robotbattle.com>
   @date    13-Jul-04, brad: created
  */
@@ -40,6 +40,7 @@
     bool iptc_;                    //!< Iptc option flag.
     bool exif_;                    //!< Exif option flag.
     bool comment_;                 //!< JPEG comment option flag.
+    bool xmp_;                     //!< XMP option flag.
     bool preserve_;                //!< Preserve existing metadata option flag.
     std::string read_;             //!< Source file
     std::string write_;            //!< Destination file
@@ -54,6 +55,7 @@
                iptc_(false),
                exif_(false),
                comment_(false),
+               xmp_(false),
                preserve_(false)
         {}
 
diff -Nru exiv2-0.19/src/metadatum.cpp exiv2-0.21/src/metadatum.cpp
--- exiv2-0.19/src/metadatum.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/metadatum.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,15 +20,15 @@
  */
 /*
   File:      metadatum.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
              Brad Schick (brad) <brad@robotbattle.com>
   History:   26-Jan-04, ahu: created
              31-Jul-04, brad: isolated as a component
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: metadatum.cpp 1750 2009-02-16 14:30:51Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: metadatum.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
diff -Nru exiv2-0.19/src/metadatum.hpp exiv2-0.21/src/metadatum.hpp
--- exiv2-0.19/src/metadatum.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/metadatum.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    metadatum.hpp
   @brief   Provides abstract base classes Metadatum and Key
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @author  Brad Schick (brad)
diff -Nru exiv2-0.19/src/minoltamn.cpp exiv2-0.21/src/minoltamn.cpp
--- exiv2-0.19/src/minoltamn.cpp	2009-05-05 07:52:08.000000000 +0000
+++ exiv2-0.21/src/minoltamn.cpp	2010-09-10 16:36:33.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,7 +20,7 @@
  */
 /*
   File:      minoltamn.cpp
-  Version:   $Rev: 1786 $
+  Version:   $Rev: 2346 $
   Author(s): Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
              Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   06-May-06, gc: submitted
@@ -28,15 +28,14 @@
  */
 
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: minoltamn.cpp 1786 2009-05-05 07:52:08Z cgilles $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: minoltamn.cpp 2346 2010-09-10 16:36:33Z ahuggel $")
 
 // *****************************************************************************
 // included header files
-#include "types.hpp"
-#include "minoltamn.hpp"
+#include "minoltamn_int.hpp"
+#include "tags_int.hpp"
 #include "value.hpp"
-#include "tags.hpp"
 #include "i18n.h"                // NLS support.
 
 #include <string>
@@ -48,6 +47,7 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     // -- Standard Minolta Makernotes tags ---------------------------------------------------------------
 
@@ -64,7 +64,7 @@
         { 13, N_("Natural sRGB")   },
         { 14, N_("Natural+ sRGB")  },
         { 15, N_("Landscape")      },
-        { 16, N_("Evening")        },	
+        { 16, N_("Evening")        },
         { 17, N_("Night Scene")    },
         { 18, N_("Night Portrait") }
     };
@@ -79,218 +79,114 @@
         { 5, N_("Extra Fine") }
     };
 
-    //! Lookup table to translate Minolta zone matching values
-    extern const TagDetails minoltaZoneMatching[] = {
-        { 0, N_("ISO Setting Used") },
-        { 1, N_("High Key")         },
-        { 2, N_("Low Key")          }
-    };
-
     //! Lookup table to translate Minolta image stabilization values
     extern const TagDetails minoltaImageStabilization[] = {
         { 1, N_("Off") },
         { 5, N_("On")  }
     };
 
-    //! Lookup table to translate Minolta Lens id values to readable labels
-    /* NOTE:
-       - duplicate tags value are:
-       0/25520, 4/25920, 13/25610, 19/25910, 22/26050/26070,
-       25500/25501/26130, 25540/25541/25850, 25580/25581, 2564025641,
-       25720/25721, 25790/25791, 25960/25961, 25980/25981, 26150/26151
-       - No need to i18n these string.
-    */
-    extern const TagDetails minoltaLensID[] = {
-        { 0,     "AF28-85mm F3.5-4.5"                                                                   },
-        { 1,     "AF80-200mm F2.8G"                                                                     },
-        { 2,     "AF28-70mm F2.8G"                                                                      },
-        { 3,     "AF28-80mm F4-5.6"                                                                     },
-        { 4,     "AF85mm F1.4G"                                                                         },
-        { 5,     "AF35-70mm F3.5-4.5"                                                                   },
-        { 6,     "AF24-85mm F3.5-4.5"                                                                   },
-        { 7,     "AF100-300mm F4.5-5.6(D) APO | AF100-400mm F4.5-6.7(D)"                                },
-        { 8,     "AF70-210mm F4.5-5.6"                                                                  },
-        { 9,     "AF50mm F3.5 Macro"                                                                    },
-        { 10,    "AF28-105mm F3.5-4.5"                                                                  },
-        { 11,    "AF300mm F4G APO"                                                                      },
-        { 12,    "AF100mm F2.8 Soft Focus"                                                              },
-        { 13,    "AF75-300mm F4.5-5.6"                                                                  },
-        { 14,    "AF100-400mm F4.5-6.7 APO"                                                             },
-        { 15,    "AF400mm F4.5G APO"                                                                    },
-        { 16,    "AF17-35mm F3.5G"                                                                      },
-        { 17,    "AF20-35mm F3.5-4.5"                                                                   },
-        { 18,    "AF28-80mm F3.5-5.6"                                                                   },
-        { 19,    "AF35mm F1.4G"                                                                         },
-        { 20,    "STF135mm F2.8[T4.5]"                                                                  },
-        { 22,    "AF35-80mm F4-5.6"                                                                     },
-        { 23,    "AF200mm F4G APO Macro"                                                                },
-        { 24,    "AF24-105mm F3.5-4.5(D) | SIGMA 18-50mm F2.8 | Sigma DC 18-125mm F4-5,6 D"             },
-        { 25,    "AF100-300mm F4.5-5.6 APO(D) | SIGMA 30mm F1.4"                                        },
-        { 27,    "AF85mm F1.4G(D)"                                                                      },
-        { 28,    "AF100mm F2.8 Macro(D)"                                                                },
-        { 29,    "AF75-300mm F4.5-5.6(D)"                                                               },
-        { 30,    "AF28-80mm F3.5-5.6(D)"                                                                },
-        { 31,    "AF50mm F2.8 Macro(D) | AF50mm F3.5 Macro"                                             },
-        { 32,    "AF100-400mm F4.5-6.7(D) x1.5 | AF300mm F2.8G APO(D) SSM"                              },
-        { 33,    "AF70-200mm F2.8G APO(D) SSM"                                                          },
-        { 35,    "AF85mm F1.4G(D) Limited"                                                              },
-        { 36,    "AF28-100mm F3.5-5.6(D)"                                                               },
-        { 38,    "AF17-35mm F2.8-4(D)"                                                                  },
-        { 39,    "AF28-75mm F2.8(D)"                                                                    },
-        { 40,    "AFDT18-70mm F3.5-5.6(D)"                                                              },
-        { 41,    "AFDT11-18mm F4.5-5.6(D)"                                                              },
-        { 42,    "AFDT18-200mm F3.5-6.3(D)"                                                             },
-        { 45,    "CZ Planar T* AF85mm F1.4"                                                             },
-        { 46,    "CZ Vario-Sonnar T* AFDT16-80mm F3.5-4.5"                                              },
-        { 47,    "CZ Sonnar T* 135mm F1.8"                                                              },
-        { 128,   "SIGMA 70-200mm F2.8 APO EX DG MACRO | TAMRON 18-200, 28-300 | 80-300mm F3.5-6.3"      },
-        { 193,   "AF 1.4x APO II"                                                                       },
-        { 25500, "AF50mm F1.7"                                                                          },
-        { 25501, "AF50mm F1.7"                                                                          },
-        { 25510, "AF35-70mm F1.4"                                                                       },
-        { 25511, "AF35-70mm F4"                                                                         },
-        { 25520, "AF28-85mm F3.5-4.5"                                                                   },
-        { 25521, "TOKINA 19-35mm F3.5-4.5 | TOKINA 28-70mm F2.8 AT-X"                                   },
-        { 25530, "AF28-135mm F4-4.5"                                                                    },
-        { 25531, "AF28-135mm F4-4.5"                                                                    },
-        { 25540, "AF35-105mm F3.5-4.5"                                                                  },
-        { 25541, "AF35-105mm F3.5-4.5"                                                                  },
-        { 25550, "AF70-210mm F4"                                                                        },
-        { 25551, "AF70-210mm F4 Macro | SIGMA 70-210mm F4-5.6 APO"                                      },
-        { 25560, "AF135mm F2.8"                                                                         },
-        { 25561, "AF135mm F2.8"                                                                         },
-        { 25570, "AF28mm F2.8"                                                                          },
-        { 25571, "AF28mm F2.8"                                                                          },
-        { 25580, "AF24-50mm F4"                                                                         },
-        { 25581, "AF24-50mm F4"                                                                         },
-        { 25600, "AF100-200mm F4.5"                                                                     },
-        { 25601, "AF100-200mm F4.5"                                                                     },
-        { 25610, "AF75-300mm F4.5-5.6"                                                                  },
-        { 25611, "SIGMA 70-300mm F4-5.6 | SIGMA 300mm F4 APO Macro"                                     },
-        { 25620, "AF50mm F1.4"                                                                          },
-        { 25621, "AF50mm F1.4 NEW"                                                                      },
-        { 25630, "AF300mm F2.8G APO"                                                                    },
-        { 25631, "AF300mm F2.8G"                                                                        },
-        { 25640, "AF50mm F2.8 Macro"                                                                    },
-        { 25641, "AF50mm F2.8 Macro"                                                                    },
-        { 25650, "AF600mm F4 APO"                                                                       },
-        { 25660, "AF24mm F2.8"                                                                          },
-        { 25661, "AF24mm F2.8 | SIGMA 17-35mm F2.8-4.0 EX-D"                                            },
-        { 25720, "AF500mm F8 Reflex"                                                                    },
-        { 25721, "AF500mm F8 Reflex"                                                                    },
-        { 25780, "AF16mm F2.8 Fisheye"                                                                  },
-        { 25781, "AF16mm F2.8 Fisheye | SIGMA 8mm F4 Fisheye"                                           },
-        { 25790, "AF20mm F2.8"                                                                          },
-        { 25791, "AF20mm F2.8"                                                                          },
-        { 25810, "AF100mm F2.8 Macro"                                                                   },
-        { 25811, "AF100mm F2.8 Macro(D) | TAMRON 90mm F2.8 Macro | SIGMA 180mm F5.6 Macro"              },
-        { 25850, "AF35-105mm F3.5-4.5"                                                                  },
-        { 25858, "TAMRON 24-135mm F3.5-5.6"                                                             },
-        { 25880, "AF70-210mm F3.5-4.5"                                                                  },
-        { 25890, "AF80-200mm F2.8 APO"                                                                  },
-        { 25891, "TOKINA 80-200mm F2.8"                                                                 },
-        { 25910, "AF35mm F1.4G"                                                                         },
-        { 25911, "AF35mm F1.4G"                                                                         },
-        { 25920, "AF85mm F1.4G"                                                                         },
-        { 25921, "AF85mm F1.4G(D)"                                                                      },
-        { 25930, "AF200mm F2.8 APO"                                                                     },
-        { 25931, "AF200mm F2.8G"                                                                        },
-        { 25940, "AF 3X-1X F1.7-2.8 Macro"                                                              },
-        { 25960, "AF28mm F2"                                                                            },
-        { 25961, "AF28mm F2"                                                                            },
-        { 25970, "AF35mm F2"                                                                            },
-        { 25971, "AF35mm F2"                                                                            },
-        { 25980, "AF100mm F2"                                                                           },
-        { 25981, "AF100mm F2"                                                                           },
-        { 26040, "AF80-200mm F4.5-5.6"                                                                  },
-        { 26050, "AF35-80mm F4-5.6"                                                                     },
-        { 26060, "AF100-300mm F4.5-5.6"                                                                 },
-        { 26061, "AF100-300mm F4.5-5.6(D) | SIGMA 105mm F2.8 Macro EX-DG"                               },
-        { 26070, "AF35-80mm F4-5.6"                                                                     },
-        { 26071, "AF35-80mm F4-5.6"                                                                     },
-        { 26080, "AF300mm F2.8G APO High Speed"                                                         },
-        { 26081, "AF300mm F2.8G"                                                                        },
-        { 26090, "AF600mm F4G APO High Speed"                                                           },
-        { 26120, "AF200mm F2.8G APO High Speed"                                                         },
-        { 26121, "AF200mm F2.8G(D)"                                                                     },
-        { 26130, "AF50mm F1.7"                                                                          },
-        { 26131, "AF50mm F1.7"                                                                          },
-        { 26150, "AF28-105mm F3.5-4.5 Xi"                                                               },
-        { 26151, "AF28-105mm F3.5-4.5 Xi"                                                               },
-        { 26160, "AF35-200mm F4.5-5.6 Xi"                                                               },
-        { 26161, "AF35-200mm F4.5-5.6 Xi"                                                               },
-        { 26180, "AF28-80mm F4-5.6 Xi"                                                                  },
-        { 26190, "AF80-200mm F4.5-5.6 Xi"                                                               },
-        { 26210, "AF100-300mm F4.5-5.6 Xi"                                                              },
-        { 26240, "AF35-80mm F4-5.6 Power"                                                               },
-        { 26241, "AF35-80mm F4-5.6"                                                                     },
-        { 45741, "AF200mm F2.8G x2 | TOKINA 300mm F2.8 x2"                                              }
-    };
-
     // Minolta Tag Info
     const TagInfo MinoltaMakerNote::tagInfo_[] = {
         TagInfo(0x0000, "Version", N_("Makernote Version"),
                 N_("String 'MLT0' (not null terminated)"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
         TagInfo(0x0001, "CameraSettingsStdOld", N_("Camera Settings (Std Old)"),
                 N_("Standard Camera settings (Old Camera models like D5, D7, S304, and S404)"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
         TagInfo(0x0003, "CameraSettingsStdNew", N_("Camera Settings (Std New)"),
                 N_("Standard Camera settings (New Camera Models like D7u, D7i, and D7hi)"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
         TagInfo(0x0004, "CameraSettings7D", N_("Camera Settings (7D)"),
                 N_("Camera Settings (for Dynax 7D model)"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
         TagInfo(0x0018, "ImageStabilizationData", N_("Image Stabilization Data"),
                 N_("Image stabilization data"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
+
+        // TODO: Implement WB Info A100 tags decoding.
+        TagInfo(0x0020, "WBInfoA100", N_("WB Info A100"),
+                N_("White balance information for the Sony DSLR-A100"),
+                minoltaId, makerTags, undefined, -1, printValue),
+
         TagInfo(0x0040, "CompressedImageSize", N_("Compressed Image Size"),
                 N_("Compressed image size"),
-                minoltaIfdId, makerTags, unsignedLong, printValue),
+                minoltaId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x0081, "Thumbnail", N_("Thumbnail"),
                 N_("Jpeg thumbnail 640x480 pixels"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
         TagInfo(0x0088, "ThumbnailOffset", N_("Thumbnail Offset"),
                 N_("Offset of the thumbnail"),
-                minoltaIfdId, makerTags, unsignedLong, printValue),
+                minoltaId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x0089, "ThumbnailLength", N_("Thumbnail Length"),
                 N_("Size of the thumbnail"),
-                minoltaIfdId, makerTags, unsignedLong, printValue),
+                minoltaId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0100, "SceneMode", N_("Scene Mode"),
+                N_("Scene Mode"),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonySceneMode),
+
+        // TODO: for A100, use Sony table from printMinoltaSonyColorMode().
         TagInfo(0x0101, "ColorMode", N_("Color Mode"),
                 N_("Color mode"),
-                minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaColorMode)),
+                minoltaId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaColorMode)),
+
         TagInfo(0x0102, "Quality", N_("Image Quality"),
                 N_("Image quality"),
-                minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageQuality)),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonyImageQuality),
 
         // TODO: Tag 0x0103 : quality or image size (see ExifTool doc).
+        TagInfo(0x0103, "0x0103", N_("0x0103"),
+                N_("0x0103"),
+                minoltaId, makerTags, unsignedLong, -1, printValue),
 
+        TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"),
+                N_("Flash exposure compensation in EV"),
+                minoltaId, makerTags, signedRational, -1, print0x9204),
+        TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"),
+                N_("Teleconverter Model"),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonyTeleconverterModel),
         TagInfo(0x0107, "ImageStabilization", N_("Image Stabilization"),
                 N_("Image stabilization"),
-                minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageStabilization)),
+                minoltaId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(minoltaImageStabilization)),
+        TagInfo(0x0109, "RawAndJpgRecording", N_("RAW+JPG Recording"),
+                N_("RAW and JPG files recording"),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue),
         TagInfo(0x010a, "ZoneMatching", N_("Zone Matching"),
                 N_("Zone matching"),
-                minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaZoneMatching)),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonyZoneMatching),
         TagInfo(0x010b, "ColorTemperature", N_("Color Temperature"),
                 N_("Color temperature"),
-                minoltaIfdId, makerTags, unsignedLong, printValue),
+                minoltaId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x010c, "LensID", N_("Lens ID"),
                 N_("Lens identifier"),
-                minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaLensID)),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonyLensID),
+        TagInfo(0x0111, "ColorCompensationFilter", N_("Color Compensation Filter"),
+                N_("Color Compensation Filter: negative is green, positive is magenta"),
+                minoltaId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0112, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
+                N_("White Balance Fine Tune Value"),
+                minoltaId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0113, "ImageStabilizationA100", N_("Image Stabilization A100"),
+                N_("Image Stabilization for the Sony DSLR-A100"),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue),
+
+        // TODO: implement CameraSettingsA100 tags decoding.
         TagInfo(0x0114, "CameraSettings5D", N_("Camera Settings (5D)"),
                 N_("Camera Settings (for Dynax 5D model)"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
+
+        TagInfo(0x0115, "WhiteBalance", N_("White Balance"),
+                N_("White balance"),
+                minoltaId, makerTags, unsignedLong, -1, printMinoltaSonyWhiteBalanceStd),
         TagInfo(0x0e00, "PrintIM", N_("Print IM"),
                 N_("PrintIM information"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
         TagInfo(0x0f00, "CameraSettingsZ1", N_("Camera Settings (Z1)"),
                 N_("Camera Settings (for Z1, DImage X, and F100 models)"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                minoltaId, makerTags, undefined, -1, printValue),
         // End of list marker
-
         TagInfo(0xffff, "(UnknownMinoltaMakerNoteTag)", "(UnknownMinoltaMakerNoteTag)",
                 N_("Unknown Minolta MakerNote tag"),
-                minoltaIfdId, makerTags, invalidTypeId, printValue)
+                minoltaId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* MinoltaMakerNote::tagList()
@@ -308,12 +204,13 @@
         { 3, N_("Manual")            }
     };
 
-    //! Lookup table to translate Minolta Std camera settings exposure mode values to readable labels
+    //! Lookup table to translate Minolta Std camera settings flash mode values to readable labels
     extern const TagDetails minoltaFlashModeStd[] = {
         { 0, N_("Fill flash")        },
         { 1, N_("Red-eye reduction") },
         { 2, N_("Rear flash sync")   },
-        { 3, N_("Wireless")          }
+        { 3, N_("Wireless")          },
+        { 4, N_("Off")               }
     };
 
     //! Lookup table to translate Minolta Std camera settings white balance values to readable labels
@@ -352,7 +249,7 @@
 
     //! Lookup table to translate Minolta Std camera settings drive mode values to readable labels
     extern const TagDetails minoltaDriveModeStd[] = {
-        { 0, N_("Single")         },
+        { 0, N_("Single Frame")   },
         { 1, N_("Continuous")     },
         { 2, N_("Self-timer")     },
         { 4, N_("Bracketing")     },
@@ -363,15 +260,9 @@
 
     //! Lookup table to translate Minolta Std camera settings metering mode values to readable labels
     extern const TagDetails minoltaMeteringModeStd[] = {
-        { 0, N_("Multi-segment")   },
-        { 1, N_("Center weighted") },
-        { 2, N_("Spot")            }
-    };
-
-    //! Lookup table to translate Minolta Std camera settings macro mode values to readable labels
-    extern const TagDetails minoltaMacroModeStd[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
+        { 0, N_("Multi-segment")           },
+        { 1, N_("Center weighted average") },
+        { 2, N_("Spot")                    }
     };
 
     //! Lookup table to translate Minolta Std camera settings digital zoom values to readable labels
@@ -401,18 +292,12 @@
         { 8, N_("Top-left")     }
     };
 
-    //! Lookup table to translate Minolta Std camera settings white balance values to readable labels
-    extern const TagDetails minoltaFlashStd[] = {
+    //! Lookup table to translate Minolta Std camera settings flash fired values to readable labels
+    extern const TagDetails minoltaFlashFired[] = {
         { 0, N_("Did not fire") },
         { 1, N_("Fired")        }
     };
 
-    //! Lookup table to translate Minolta Std camera settings file number memory values to readable labels
-    extern const TagDetails minoltaFileNumberMemoryStd[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
-    };
-
     //! Lookup table to translate Minolta Std camera settings sharpness values to readable labels
     extern const TagDetails minoltaSharpnessStd[] = {
         { 0, N_("Hard")   },
@@ -449,7 +334,8 @@
         { 4, "DiMAGE 7i"                 },
         { 5, "DiMAGE 7Hi"                },
         { 6, "DiMAGE A1"                 },
-        { 7, "DiMAGE A2 | S414"          }
+        { 7, "DiMAGE A2 | S414"          },
+        { 7, "DiMAGE A2 | S414"          }      // To silence compiler warning
     };
 
     //! Lookup table to translate Minolta Std camera settings interval mode values to readable labels
@@ -473,12 +359,6 @@
         { 4, N_("Adobe RGB")       }
     };
 
-    //! Lookup table to translate Minolta Std camera settings internal flash values to readable labels
-    extern const TagDetails minoltaInternalFlashStd[] = {
-        { 0, N_("Did not fire") },
-        { 1, N_("Fired")        }
-    };
-
     //! Lookup table to translate Minolta Std camera settings wide focus zone values to readable labels
     extern const TagDetails minoltaWideFocusZoneStd[] = {
         { 0, N_("No zone")                              },
@@ -609,159 +489,158 @@
     const TagInfo MinoltaMakerNote::tagInfoCsStd_[] = {
         TagInfo(0x0001, "ExposureMode", N_("Exposure Mode"),
                 N_("Exposure mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaExposureModeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaExposureModeStd)),
         TagInfo(0x0002, "FlashMode", N_("Flash Mode"),
                 N_("Flash mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashModeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFlashModeStd)),
         TagInfo(0x0003, "WhiteBalance", N_("White Balance"),
                 N_("White balance"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaWhiteBalanceStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaWhiteBalanceStd)),
         TagInfo(0x0004, "ImageSize", N_("Image Size"),
                 N_("Image size"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageSizeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaImageSizeStd)),
         TagInfo(0x0005, "Quality", N_("Image Quality"),
                 N_("Image quality"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageQualityStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaImageQualityStd)),
         TagInfo(0x0006, "DriveMode", N_("Drive Mode"),
                 N_("Drive mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDriveModeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaDriveModeStd)),
         TagInfo(0x0007, "MeteringMode", N_("Metering Mode"),
                 N_("Metering mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaMeteringModeStd)),
-        TagInfo(0x0008, "ExposureSpeed", N_("Exposure Speed"),
-                N_("Exposure speed"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaExposureSpeedStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaMeteringModeStd)),
+        TagInfo(0x0008, "ISO", N_("ISO"),
+                N_("ISO Value"),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaExposureSpeedStd),
         TagInfo(0x0009, "ExposureTime", N_("Exposure Time"),
                 N_("Exposure time"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaExposureTimeStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaExposureTimeStd),
         TagInfo(0x000A, "FNumber", N_("FNumber"),
                 N_("The F-Number"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaFNumberStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaFNumberStd),
         TagInfo(0x000B, "MacroMode", N_("Macro Mode"),
                 N_("Macro mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaMacroModeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaSonyBoolValue),
         TagInfo(0x000C, "DigitalZoom", N_("Digital Zoom"),
                 N_("Digital zoom"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDigitalZoomStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaDigitalZoomStd)),
         TagInfo(0x000D, "ExposureCompensation", N_("Exposure Compensation"),
                 N_("Exposure compensation"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaExposureCompensationStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaExposureCompensationStd),
         TagInfo(0x000E, "BracketStep", N_("Bracket Step"),
                 N_("Bracket step"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaBracketStepStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaBracketStepStd)),
         TagInfo(0x0010, "IntervalLength", N_("Interval Length"),
                 N_("Interval length"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x0011, "IntervalNumber", N_("Interval Number"),
                 N_("Interval number"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x0012, "FocalLength", N_("Focal Length"),
                 N_("Focal length"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaFocalLengthStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaFocalLengthStd),
         TagInfo(0x0013, "FocusDistance", N_("Focus Distance"),
                 N_("Focus distance"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0014, "Flash", N_("Flash"),
-                N_("Flash mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
+        TagInfo(0x0014, "FlashFired", N_("Flash Fired"),
+                N_("Flash fired"),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFlashFired)),
         TagInfo(0x0015, "MinoltaDate", N_("Minolta Date"),
                 N_("Minolta date"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaDateStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaDateStd),
         TagInfo(0x0016, "MinoltaTime", N_("Minolta Time"),
                 N_("Minolta time"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaTimeStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaTimeStd),
         TagInfo(0x0017, "MaxAperture", N_("Max Aperture"),
                 N_("Max aperture"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x001A, "FileNumberMemory", N_("File Number Memory"),
                 N_("File number memory"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFileNumberMemoryStd)),
-        TagInfo(0x001B, "ImageNumber", N_("Image Number"),
-                N_("Image number"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaSonyBoolValue),
+        TagInfo(0x001B, "LastFileNumber", N_("Last Image Number"),
+                N_("Last image number"),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x001C, "ColorBalanceRed", N_("Color Balance Red"),
                 N_("Color balance red"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaWhiteBalanceStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaWhiteBalanceStd),
         TagInfo(0x001D, "ColorBalanceGreen", N_("Color Balance Green"),
                 N_("Color balance green"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaWhiteBalanceStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaWhiteBalanceStd),
         TagInfo(0x001E, "ColorBalanceBlue", N_("Color Balance Blue"),
                 N_("Color balance blue"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaWhiteBalanceStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaWhiteBalanceStd),
         TagInfo(0x001F, "Saturation", N_("Saturation"),
                 N_("Saturation"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x0020, "Contrast", N_("Contrast"),
                 N_("Contrast"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x0021, "Sharpness", N_("Sharpness"),
                 N_("Sharpness"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaSharpnessStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaSharpnessStd)),
         TagInfo(0x0022, "SubjectProgram", N_("Subject Program"),
                 N_("Subject program"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaSubjectProgramStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaSubjectProgramStd)),
         TagInfo(0x0023, "FlashExposureComp", N_("Flash Exposure Compensation"),
                 N_("Flash exposure compensation in EV"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaFlashExposureCompStd),
-        TagInfo(0x0024, "ISOSpeed", N_("ISO Speed Mode"),
-                N_("ISO speed setting"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaISOSettingStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaFlashExposureCompStd),
+        TagInfo(0x0024, "ISOSetting", N_("ISO Settings"),
+                N_("ISO setting"),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaISOSettingStd)),
         TagInfo(0x0025, "MinoltaModel", N_("Minolta Model"),
                 N_("Minolta model"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaModelStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaModelStd)),
         TagInfo(0x0026, "IntervalMode", N_("Interval Mode"),
                 N_("Interval mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaIntervalModeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaIntervalModeStd)),
         TagInfo(0x0027, "FolderName", N_("Folder Name"),
                 N_("Folder name"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFolderNameStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFolderNameStd)),
         TagInfo(0x0028, "ColorMode", N_("ColorMode"),
                 N_("ColorMode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaColorModeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaColorModeStd)),
         TagInfo(0x0029, "ColorFilter", N_("Color Filter"),
                 N_("Color filter"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x002A, "BWFilter", N_("Black and White Filter"),
                 N_("Black and white filter"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x002B, "InternalFlash", N_("Internal Flash"),
-                N_("Internal flash"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaInternalFlashStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
+        TagInfo(0x002B, "Internal Flash", N_("Internal Flash"),
+                N_("Internal Flash"),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFlashFired)),
         TagInfo(0x002C, "Brightness", N_("Brightness"),
                 N_("Brightness"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printMinoltaBrightnessStd),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printMinoltaBrightnessStd),
         TagInfo(0x002D, "SpotFocusPointX", N_("Spot Focus Point X"),
                 N_("Spot focus point X"),
-        minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x002E, "SpotFocusPointY", N_("Spot Focus Point Y"),
                 N_("Spot focus point Y"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, printValue),
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x002F, "WideFocusZone", N_("Wide Focus Zone"),
                 N_("Wide focus zone"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaWideFocusZoneStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaWideFocusZoneStd)),
         TagInfo(0x0030, "FocusMode", N_("Focus Mode"),
                 N_("Focus mode"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFocusModeStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFocusModeStd)),
         TagInfo(0x0031, "FocusArea", N_("Focus area"),
                 N_("Focus area"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFocusAreaStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFocusAreaStd)),
         TagInfo(0x0032, "DECPosition", N_("DEC Switch Position"),
                 N_("DEC switch position"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDECPositionStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaDECPositionStd)),
         TagInfo(0x0033, "ColorProfile", N_("Color Profile"),
                 N_("Color profile"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaColorProfileStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaColorProfileStd)),
         TagInfo(0x0034, "DataImprint", N_("Data Imprint"),
                 N_("Data Imprint"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaDataImprintStd)),
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaDataImprintStd)),
         TagInfo(0x003F, "FlashMetering", N_("Flash Metering"),
                 N_("Flash metering"),
-                minoltaCsNewIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashMeteringStd)),
-
+                minoltaCsNewId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFlashMeteringStd)),
         // End of list marker
         TagInfo(0xffff, "(UnknownMinoltaCsStdTag)", "(UnknownMinoltaCsStdTag)",
                 N_("Unknown Minolta Camera Settings tag"),
-                minoltaCsNewIfdId, makerTags, invalidTypeId, printValue)
+                minoltaCsNewId, makerTags, unsignedLong, 1, printValue)
     };
 
     const TagInfo* MinoltaMakerNote::tagListCsStd()
@@ -807,15 +686,16 @@
         { 4,   N_("Tungsten")    },
         { 5,   N_("Fluorescent") },
         { 256, N_("Kelvin")      },
-        { 512, N_("Manual")      }
+        { 512, N_("Manual")      },
+        { 512, N_("Manual")      }              // To silence compiler warning
     };
 
     //! Lookup table to translate Minolta Dynax 7D camera settings focus mode values to readable labels
     extern const TagDetails minoltaFocusMode7D[] = {
         { 0, N_("Single-shot AF") },
         { 1, N_("Continuous AF")  },
-        { 3, N_("Automatic AF")   },
-        { 4, N_("Manual")         }
+        { 3, N_("Manual")         },
+        { 4, N_("Automatic AF")   }
     };
 
     //! Lookup table to translate Minolta Dynax 7D camera settings AF points values to readable labels
@@ -831,12 +711,6 @@
         { 256, N_("Top-left")     }
     };
 
-    //! Lookup table to translate Minolta Dynax 7D camera settings white balance values to readable labels
-    extern const TagDetails minoltaFlash7D[] = {
-        { 0, N_("Did not fire") },
-        { 1, N_("Fired")        }
-    };
-
     //! Lookup table to translate Minolta Dynax 7D camera settings ISO settings values to readable labels
     extern const TagDetails minoltaISOSetting7D[] = {
         { 0, N_("Auto") },
@@ -862,110 +736,91 @@
         { 82, N_("Rotate 270 CW")       }
     };
 
-    //! Lookup table to translate Minolta Dynax 7D camera settings noise reduction values to readable labels
-    extern const TagDetails minoltaNoiseReduction7D[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
-    };
-
-    //! Lookup table to translate Minolta Dynax 7D camera settings image stabilization values to readable labels
-    extern const TagDetails minoltaImageStabilization7D[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
-    };
-
-    //! Lookup table to translate Minolta Dynax 7D camera settings zone matching on values to readable labels
-    extern const TagDetails minoltaZoneMatchingOn7D[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
-    };
-
     // Minolta Dynax 7D Camera Settings Tag Info
     const TagInfo MinoltaMakerNote::tagInfoCs7D_[] = {
         TagInfo(0x0000, "ExposureMode", N_("Exposure Mode"),
                 N_("Exposure mode"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaExposureMode7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaExposureMode7D)),
         TagInfo(0x0002, "ImageSize", N_("Image Size"),
                 N_("Image size"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageSize7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaImageSize7D)),
         TagInfo(0x0003, "Quality", N_("Image Quality"),
                 N_("Image quality"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageQuality7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaImageQuality7D)),
         TagInfo(0x0004, "WhiteBalance", N_("White Balance"),
                 N_("White balance"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaWhiteBalance7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaWhiteBalance7D)),
         TagInfo(0x000E, "FocusMode", N_("Focus Mode"),
                 N_("Focus mode"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusMode7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaFocusMode7D)),
         TagInfo(0x0010, "AFPoints", N_("AF Points"),
                 N_("AF points"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaAFPoints7D)),
-        TagInfo(0x0015, "Flash", N_("Flash"),
-                N_("Flash"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFlash7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaAFPoints7D)),
+        TagInfo(0x0015, "FlashFired", N_("Flash Fired"),
+                N_("Flash fired"),
+                minoltaCs7DId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(minoltaFlashFired)),
         TagInfo(0x0016, "FlashMode", N_("Flash Mode"),
                 N_("Flash mode"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x001C, "ISOSpeed", N_("ISO Speed Mode"),
                 N_("ISO speed setting"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaISOSetting7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaISOSetting7D)),
         TagInfo(0x001E, "ExposureCompensation", N_("Exposure Compensation"),
                 N_("Exposure compensation"),
-                minoltaCs7DIfdId, makerTags, signedShort, printValue),
+                minoltaCs7DId, makerTags, signedShort, 1, printValue),
         TagInfo(0x0025, "ColorSpace", N_("Color Space"),
                 N_("Color space"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaColorSpace7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaColorSpace7D)),
         TagInfo(0x0026, "Sharpness", N_("Sharpness"),
                 N_("Sharpness"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0027, "Contrast", N_("Contrast"),
                 N_("Contrast"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0028, "Saturation", N_("Saturation"),
                 N_("Saturation"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x002D, "FreeMemoryCardImages", N_("Free Memory Card Images"),
                 N_("Free memory card images"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x003F, "ColorTemperature", N_("Color Temperature"),
                 N_("Color temperature"),
-                minoltaCs7DIfdId, makerTags, signedShort, printValue),
+                minoltaCs7DId, makerTags, signedShort, 1, printValue),
         TagInfo(0x0040, "Hue", N_("Hue"), N_("Hue"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0046, "Rotation", N_("Rotation"),
                 N_("Rotation"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaRotation7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaRotation7D)),
         TagInfo(0x0047, "FNumber", N_("FNumber"),
                 N_("The F-Number"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0048, "ExposureTime", N_("Exposure Time"),
                 N_("Exposure time"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         // 0x004A is a dupplicate than 0x002D.
         TagInfo(0x004A, "FreeMemoryCardImages", N_("Free Memory Card Images"),
                 N_("Free memory card images"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x005E, "ImageNumber", N_("Image Number"),
                 N_("Image number"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0060, "NoiseReduction", N_("Noise Reduction"),
                 N_("Noise reduction"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaNoiseReduction7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
         // 0x0062 is a dupplicate than 0x005E.
         TagInfo(0x0062, "ImageNumber", N_("Image Number"),
                 N_("Image number"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue),
         TagInfo(0x0071, "ImageStabilization", N_("Image Stabilization"),
                 N_("Image stabilization"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageStabilization7D)),
+                minoltaCs7DId, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
         TagInfo(0x0075, "ZoneMatchingOn", N_("Zone Matching On"),
                 N_("Zone matching on"),
-                minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaZoneMatchingOn7D)),
-
+                minoltaCs7DId, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownMinoltaCs7DTag)", "(UnknownMinoltaCs7DTag)",
                 N_("Unknown Minolta Camera Settings 7D tag"),
-                minoltaCs7DIfdId, makerTags, invalidTypeId, printValue)
+                minoltaCs7DId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* MinoltaMakerNote::tagListCs7D()
@@ -977,12 +832,19 @@
 
     //! Lookup table to translate Minolta Dynax 5D camera settings exposure mode values to readable labels
     extern const TagDetails minoltaExposureMode5D[] = {
-        { 0,    N_("Program")           },
-        { 1,    N_("Aperture priority") },
-        { 2,    N_("Shutter priority")  },
-        { 3,    N_("Manual")            },
-        { 4,    N_("Auto")              },
-        { 4131, N_("Connected copying") }
+        { 0,      N_("Program")             },
+        { 1,      N_("Aperture priority")   },
+        { 2,      N_("Shutter priority")    },
+        { 3,      N_("Manual")              },
+        { 4,      N_("Auto")                },
+        { 5,      N_("Program Shift A")     },
+        { 6,      N_("Program Shift S")     },
+        { 0x1013, N_("Portrait")            },
+        { 0x1023, N_("Sports")              },
+        { 0x1033, N_("Sunset")              },
+        { 0x1043, N_("Night View/Portrait") },
+        { 0x1053, N_("Landscape")           },
+        { 0x1083, N_("Macro")               }
     };
 
     //! Lookup table to translate Minolta Dynax 5D camera settings image size values to readable labels
@@ -1014,12 +876,6 @@
         { 512, N_("Manual")      }
     };
 
-    //! Lookup table to translate Minolta Dynax 5D camera settings flash labels
-    extern const TagDetails minoltaFlash5D[] = {
-        { 0, N_("Did not fire") },
-        { 1, N_("Fired")        }
-    };
-
     //! Lookup table to translate Minolta Dynax 5D camera settings metering mode values to readable labels
     extern const TagDetails minoltaMeteringMode5D[] = {
         { 0, N_("Multi-segment")   },
@@ -1040,6 +896,15 @@
         { 10, N_("80 (Zone Matching Low)")   }
     };
 
+    //! Lookup table to translate Minolta Dynax 5D camera settings color space values to readable labels
+    extern const TagDetails minoltaColorSpace5D[] = {
+        { 0, N_("sRGB (Natural)")  },
+        { 1, N_("sRGB (Natural+)") },
+        { 2, N_("Monochrome")      },
+        { 3, N_("Adobe RGB (ICC)") },
+        { 4, N_("Adobe RGB")       }
+    };
+
     //! Lookup table to translate Minolta Dynax 5D camera settings rotation values to readable labels
     extern const TagDetails minoltaRotation5D[] = {
         { 72, N_("Horizontal (normal)") },
@@ -1047,18 +912,6 @@
         { 82, N_("Rotate 270 CW")       }
     };
 
-    //! Lookup table to translate Minolta Dynax 5D camera settings noise reduction values to readable labels
-    extern const TagDetails minoltaNoiseReduction5D[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
-    };
-
-    //! Lookup table to translate Minolta Dynax 5D camera settings image stabilization values to readable labels
-    extern const TagDetails minoltaImageStabilization5D[] = {
-        { 0, N_("Off") },
-        { 1, N_("On")  }
-    };
-
     //! Lookup table to translate Minolta Dynax 5D camera settings focus position values to readable labels
     extern const TagDetails minoltaFocusPosition5D[] = {
         { 0, N_("Wide")       },
@@ -1088,10 +941,18 @@
         { 3, "DMF"  }
     };
 
-    //! Lookup table to translate Minolta Dynax 5D camera settings focus mode values to readable labels
-    extern const TagDetails minoltaFocusMode5D[] = {
-        { 0, "AF" },
-        { 1, "MF" }
+    //! Lookup table to translate Minolta Dynax 5D camera settings picture finish values to readable labels
+    extern const TagDetails minoltaPictureFinish5D[] = {
+        { 0, N_("Natural")         },
+        { 1, N_("Natural+")        },
+        { 2, N_("Portrait")        },
+        { 3, N_("Wind Scene")      },
+        { 4, N_("Evening Scene")   },
+        { 5, N_("Night Scene")     },
+        { 6, N_("Night Portrait")  },
+        { 7, N_("Monochrome")      },
+        { 8, N_("Adobe RGB")       },
+        { 9, N_("Adobe RGB (ICC)") }
     };
 
     //! Method to convert Minolta Dynax 5D exposure manual bias values.
@@ -1122,82 +983,94 @@
     const TagInfo MinoltaMakerNote::tagInfoCs5D_[] = {
         TagInfo(0x000A, "ExposureMode", N_("Exposure Mode"),
                 N_("Exposure mode"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaExposureMode5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaExposureMode5D)),
         TagInfo(0x000C, "ImageSize", N_("Image Size"),
                 N_("Image size"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageSize5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaImageSize5D)),
         TagInfo(0x000D, "Quality", N_("Image Quality"),
                 N_("Image quality"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageQuality5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaImageQuality5D)),
         TagInfo(0x000E, "WhiteBalance", N_("White Balance"),
                 N_("White balance"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaWhiteBalance5D)),
-        TagInfo(0x001a, "FocusPosition", N_("Focus Position"),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaWhiteBalance5D)),
+        TagInfo(0x001A, "FocusPosition", N_("Focus Position"),
                 N_("Focus position"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusPosition5D)),
-        TagInfo(0x001b, "FocusArea", N_("Focus Area"),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFocusPosition5D)),
+        TagInfo(0x001B, "FocusArea", N_("Focus Area"),
                 N_("Focus area"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusArea5D)),
-        TagInfo(0x001F, "Flash", N_("Flash"),
-                N_("Flash"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFlash5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFocusArea5D)),
+        TagInfo(0x001F, "FlashFired", N_("Flash Fired"),
+                N_("Flash fired"),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFlashFired)),
         TagInfo(0x0025, "MeteringMode", N_("Metering Mode"),
                 N_("Metering mode"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaMeteringMode5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaMeteringMode5D)),
         TagInfo(0x0026, "ISOSpeed", N_("ISO Speed Mode"),
                 N_("ISO speed setting"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaISOSetting5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaISOSetting5D)),
+        TagInfo(0x002F, "ColorSpace", N_("Color Space"),
+                N_("Color space"),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaColorSpace5D)),
         TagInfo(0x0030, "Sharpness", N_("Sharpness"),
                 N_("Sharpness"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0031, "Contrast", N_("Contrast"),
                 N_("Contrast"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0032, "Saturation", N_("Saturation"),
                 N_("Saturation"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0035, "ExposureTime", N_("Exposure Time"),
                 N_("Exposure time"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0036, "FNumber", N_("FNumber"),
                 N_("The F-Number"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0037, "FreeMemoryCardImages", N_("Free Memory Card Images"),
                 N_("Free memory card images"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0038, "ExposureRevision", N_("Exposure Revision"),
                 N_("Exposure revision"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0048, "FocusMode", N_("Focus Mode"),
                 N_("Focus mode"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaFocusMode5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaFocusModeStd)),
         TagInfo(0x0049, "ColorTemperature", N_("Color Temperature"),
                 N_("Color temperature"),
-                minoltaCs5DIfdId, makerTags, signedShort, printValue),
+                minoltaCs5DId, makerTags, signedShort, -1, printValue),
         TagInfo(0x0050, "Rotation", N_("Rotation"),
                 N_("Rotation"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaRotation5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaRotation5D)),
         TagInfo(0x0053, "ExposureCompensation", N_("Exposure Compensation"),
                 N_("Exposure compensation"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaExposureCompensation5D),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printMinoltaExposureCompensation5D),
         TagInfo(0x0054, "FreeMemoryCardImages", N_("Free Memory Card Images"),
                 N_("Free memory card images"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0065, "Rotation2", N_("Rotation2"),
+                N_("Rotation2"),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printMinoltaSonyRotation),
+        TagInfo(0x006E, "Color Temperature", N_("Color Temperature"),
+                N_("Color Temperature"),
+                minoltaCs5DId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0071, "PictureFinish", N_("Picture Finish"),
+                N_("Picture Finish"),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaPictureFinish5D)),
         TagInfo(0x0091, "ExposureManualBias", N_("Exposure Manual Bias"),
                 N_("Exposure manual bias"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printMinoltaExposureManualBias5D),
-        TagInfo(0x009e, "AFMode", N_("AF Mode"),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printMinoltaExposureManualBias5D),
+        TagInfo(0x009E, "AFMode", N_("AF Mode"),
                 N_("AF mode"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaAFMode5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(minoltaAFMode5D)),
         TagInfo(0x00AE, "ImageNumber", N_("Image Number"),
                 N_("Image number"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, printValue),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x00B0, "NoiseReduction", N_("Noise Reduction"),
                 N_("Noise reduction"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaNoiseReduction5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue),
         TagInfo(0x00BD, "ImageStabilization", N_("Image Stabilization"),
                 N_("Image stabilization"),
-                minoltaCs5DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaImageStabilization5D)),
+                minoltaCs5DId, makerTags, unsignedShort, -1, printMinoltaSonyBoolValue),
 
         // From Xavier Raynaud: some notes on missing tags.
         // 0x0051 seems to be identical to FNumber (0x0036). An approx. relation between Tag value
@@ -1206,9 +1079,9 @@
         // value and Exposure time is exp(-4+value*0.085)
 
         // End of list marker
-        TagInfo(0xffff, "(UnknownMinoltaCs5DTag)", "(UnknownMinoltaCs5DTag)",
+        TagInfo(0xFFFF, "(UnknownMinoltaCs5DTag)", "(UnknownMinoltaCs5DTag)",
                 N_("Unknown Minolta Camera Settings 5D tag"),
-                minoltaCs5DIfdId, makerTags, invalidTypeId, printValue)
+                minoltaCs5DId, makerTags, invalidTypeId, -1, printValue)
     };
 
     const TagInfo* MinoltaMakerNote::tagListCs5D()
@@ -1216,6 +1089,1040 @@
         return tagInfoCs5D_;
     }
 
+    // -- Sony A100 camera settings ---------------------------------------------------------------
+
+    //! Lookup table to translate Sony A100 camera settings drive mode 2 values to readable labels
+    extern const TagDetails sonyDriveMode2A100[] = {
+        { 0,    N_("Self-timer 10 sec")             },
+        { 1,    N_("Continuous")                    },
+        { 4,    N_("Self-timer 2 sec")              },
+        { 5,    N_("Single Frame")                  },
+        { 8,    N_("White Balance Bracketing Low")  },
+        { 9,    N_("White Balance Bracketing High") },
+        { 770,  N_("Single-frame Bracketing Low")   },
+        { 771,  N_("Continous Bracketing Low")      },
+        { 1794, N_("Single-frame Bracketing High")  },
+        { 1795, N_("Continous Bracketing High")     }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings focus mode values to readable labels
+    extern const TagDetails sonyFocusModeA100[] = {
+        { 0, "AF-S"   },
+        { 1, "AF-C"   },
+        { 4, "AF-A"   },
+        { 5, "Manual" },
+        { 6, "DMF"    }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings flash mode values to readable labels
+    extern const TagDetails sonyFlashModeA100[] = {
+        { 0, N_("Auto")            },
+        { 2, N_("Rear flash sync") },
+        { 3, N_("Wireless")        },
+        { 4, N_("Fill flash")      }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings metering mode values to readable labels
+    extern const TagDetails sonyMeteringModeA100[] = {
+        { 0, N_("Multi-segment")           },
+        { 1, N_("Center weighted average") },
+        { 2, N_("Spot")                    }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings zone matching mode values to readable labels
+    extern const TagDetails sonyZoneMatchingModeA100[] = {
+        { 0,    N_("Off")      },
+        { 1,    N_("Standard") },
+        { 2,    N_("Advanced") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings color space values to readable labels
+
+    extern const TagDetails sonyColorSpaceA100[] = {
+        { 0, N_("sRGB")      },
+        { 5, N_("Adobe RGB") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings drive mode values to readable labels
+    extern const TagDetails sonyDriveModeA100[] = {
+        { 0, N_("Single Frame")             },
+        { 1, N_("Continuous")               },
+        { 2, N_("Self-timer")               },
+        { 3, N_("Continuous Bracketing")    },
+        { 4, N_("Single-Frame Bracketing")  },
+        { 5, N_("White Balance Bracketing") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings self timer time values to readable labels
+    extern const TagDetails sonySelfTimerTimeA100[] = {
+        { 0, "10s" },
+        { 4, "2s"  }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings continuous bracketing values to readable labels
+    extern const TagDetails sonyContinuousBracketingA100[] = {
+        { 0x303, N_("Low")  },
+        { 0x703, N_("High") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings single frame bracketing values to readable labels
+    extern const TagDetails sonySingleFrameBracketingA100[] = {
+        { 0x302, N_("Low")  },
+        { 0x702, N_("High") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings white balance bracketing values to readable labels
+    extern const TagDetails sonyWhiteBalanceBracketingA100[] = {
+        { 0x8, N_("Low")  },
+        { 0x9, N_("High") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings white balance setting values to readable labels
+    extern const TagDetails sonyWhiteBalanceSettingA100[] = {
+        { 0x0000, N_("Auto")                           },
+        { 0x0001, N_("Preset")                         },
+        { 0x0002, N_("Custom")                         },
+        { 0x0003, N_("Color Temperature/Color Filter") },
+        { 0x8001, N_("Preset")                         },
+        { 0x8002, N_("Custom")                         },
+        { 0x8003, N_("Color Temperature/Color Filter") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings preset white balance values to readable labels
+    extern const TagDetails sonyPresetWhiteBalanceA100[] = {
+        { 1, N_("Daylight")    },
+        { 2, N_("Cloudy")      },
+        { 3, N_("Shade")       },
+        { 4, N_("Tungsten")    },
+        { 5, N_("Fluorescent") },
+        { 6, N_("Flash")       }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings color temperature setting values to readable labels
+    extern const TagDetails sonyColorTemperatureSettingA100[] = {
+        { 0, N_("Temperature")  },
+        { 2, N_("Color Filter") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings custom WB setting values to readable labels
+    extern const TagDetails sonyCustomWBSettingA100[] = {
+        { 0, N_("Setup")  },
+        { 2, N_("Recall") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings custom WB error values to readable labels
+    extern const TagDetails sonyCustomWBErrorA100[] = {
+        { 0, N_("Ok")    },
+        { 2, N_("Error") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings image size values to readable labels
+    extern const TagDetails sonyImageSizeA100[] = {
+        { 0, N_("Standard") },
+        { 1, N_("Medium")   },
+        { 2, N_("Small")    }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings instant playback setup values to readable labels
+    extern const TagDetails sonyInstantPlaybackSetupA100[] = {
+        { 0, N_("Image and Information") },
+        { 1, N_("Image Only")            },
+        { 3, N_("Image and Histogram")   }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings flash default setup values to readable labels
+    extern const TagDetails sonyFlashDefaultA100[] = {
+        { 0, N_("Auto")       },
+        { 1, N_("Fill Flash") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings auto bracket order values to readable labels
+    extern const TagDetails sonyAutoBracketOrderA100[] = {
+        { 0, "0-+" },
+        { 1, "-0+" }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings focus hold button values to readable labels
+    extern const TagDetails sonyFocusHoldButtonA100[] = {
+        { 0, N_("Focus Hold")  },
+        { 1, N_("DOF Preview") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings AEL button values to readable labels
+    extern const TagDetails sonyAELButtonA100[] = {
+        { 0, N_("Hold")        },
+        { 1, N_("Toggle")      },
+        { 2, N_("Spot Hold")   },
+        { 3, N_("Spot Toggle") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings control dial set values to readable labels
+    extern const TagDetails sonyControlDialSetA100[] = {
+        { 0, N_("Shutter Speed") },
+        { 1, N_("Aperture")      }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings exposure compensation mode values to readable labels
+    extern const TagDetails sonyExposureCompensationModeA100[] = {
+        { 0, N_("Ambient and Flash") },
+        { 1, N_("Ambient Only")      }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings sony AF area illumination values to readable labels
+    extern const TagDetails sonyAFAreaIlluminationA100[] = {
+        { 0, N_("0.3 seconds") },
+        { 1, N_("0.6 seconds") },
+        { 2, N_("Off")         }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings monitor display off values to readable labels
+    extern const TagDetails sonyMonitorDisplayOffA100[] = {
+        { 0, N_("Automatic") },
+        { 1, N_("Manual")    }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings record display values to readable labels
+    extern const TagDetails sonyRecordDisplayA100[] = {
+        { 0, N_("Auto-rotate") },
+        { 1, N_("Horizontal")  }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings play display values to readable labels
+    extern const TagDetails sonyPlayDisplayA100[] = {
+        { 0, N_("Auto-rotate")   },
+        { 1, N_("Manual Rotate") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings metering off scale indicator values to readable labels
+    extern const TagDetails sonyMeteringOffScaleIndicatorA100[] = {
+        { 0,   N_("Within Range")     },
+        { 1,   N_("Under/Over Range") },
+        { 255, N_("Out of Range")     }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings exposure indicator values to readable labels
+    extern const TagDetails sonyExposureIndicatorA100[] = {
+        { 0,   N_("Not Indicated")   },
+        { 1,   N_("Under Scale")     },
+        { 119, N_("Bottom of Scale") },
+        { 120, "-2.0"                },
+        { 121, "-1.7"                },
+        { 122, "-1.5"                },
+        { 123, "-1.3"                },
+        { 124, "-1.0"                },
+        { 125, "-0.7"                },
+        { 126, "-0.5"                },
+        { 127, "-0.3"                },
+        { 128, "-0.0"                },
+        { 129, "+0.3"                },
+        { 130, "+0.5"                },
+        { 131, "+0.7"                },
+        { 132, "+1.0"                },
+        { 133, "+1.3"                },
+        { 134, "+1.5"                },
+        { 135, "+1.7"                },
+        { 136, "+2.0"                },
+        { 253, N_("Top of Scale")    },
+        { 254, N_("Over Scale")      }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings focus mode switch values to readable labels
+    extern const TagDetails sonyFocusModeSwitchA100[] = {
+        { 0, N_("AM") },
+        { 1, N_("MF") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings flash type switch values to readable labels
+    extern const TagDetails sonyFlashTypeA100[] = {
+        { 0, N_("Off")      },
+        { 1, N_("Built-in") },
+        { 2, N_("External") }
+    };
+
+    //! Lookup table to translate Sony A100 camera settings battery level switch values to readable labels
+    extern const TagDetails sonyBatteryLevelA100[] = {
+        { 3, N_("Very Low")                   },
+        { 4, N_("Low")                        },
+        { 5, N_("Half Full")                  },
+        { 6, N_("Sufficient Power Remaining") }
+    };
+
+    // Sony A100 Camera Settings Tag Info
+    const TagInfo MinoltaMakerNote::tagInfoCsA100_[] = {
+        TagInfo(0x0000, "ExposureMode", N_("Exposure Mode"),
+                N_("Exposure mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaExposureMode5D)),
+        TagInfo(0x0001, "ExposureCompensationSetting", N_("Exposure Compensation Setting"),
+                N_("Exposure compensation setting"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0005, "HighSpeedSync", N_("High Speed Sync"),
+                N_("High speed sync"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
+        TagInfo(0x0006, "ManualExposureTime", N_("Manual Exposure Time"),
+                N_("Manual exposure time"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0007, "ManualFNumber", N_("Manual FNumber"),
+                N_("Manual FNumber"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0008, "ExposureTime", N_("Exposure Time"),
+                N_("Exposure time"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0009, "FNumber", N_("FNumber"),
+                N_("FNumber"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x000A, "DriveMode2", N_("Drive Mode 2"),
+                N_("Drive mode 2"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyDriveMode2A100)),
+        TagInfo(0x000B, "WhiteBalance", N_("White Balance"),
+                N_("White balance"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaWhiteBalance5D)),
+        TagInfo(0x000C, "FocusMode", N_("Focus Mode"),
+                N_("Focus mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFocusModeA100)),
+        TagInfo(0x000D, "LocalAFAreaPoint", N_("Local AF Area Point"),
+                N_("Local AF Area Point"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyLocalAFAreaPoint),
+        TagInfo(0x000E, "AFAreaMode", N_("AF Area Mode"),
+                N_("AF Area Mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyAFAreaMode),
+        TagInfo(0x000F, "FlashMode", N_("FlashMode"),
+                N_("FlashMode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFlashModeA100)),
+        TagInfo(0x0010, "FlashExposureCompSetting", N_("Flash Exposure Comp Setting"),
+                N_("Flash exposure compensation setting"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0012, "MeteringMode", N_("Metering Mode"),
+                N_("Metering mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyMeteringModeA100)),
+        TagInfo(0x0013, "ISOSetting", N_("ISO Setting"),
+                N_("ISO setting"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0014, "ZoneMatchingMode", N_("Zone Matching Mode"),
+                N_("Zone Matching Mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyZoneMatchingModeA100)),
+        TagInfo(0x0015, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"),
+                N_("Dynamic range optimizer mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyDynamicRangeOptimizerMode),
+        TagInfo(0x0016, "ColorMode", N_("Color Mode"),
+                N_("Color mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyColorMode),
+        TagInfo(0x0017, "ColorSpace", N_("Color Space"),
+                N_("Color space"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyColorSpaceA100)),
+        TagInfo(0x0018, "Sharpness", N_("Sharpness"),
+                N_("Sharpness"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0019, "Contrast", N_("Contrast"),
+                N_("Contrast"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001A, "Saturation", N_("Saturation"),
+                N_("Saturation"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001C, "FlashMetering", N_("Flash Metering"),
+                N_("Flash metering"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(minoltaFlashMeteringStd)),
+        TagInfo(0x001D, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"),
+                N_("Priority Setup Shutter Release"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyPrioritySetupShutterRelease),
+        TagInfo(0x001E, "DriveMode", N_("Drive Mode"),
+                N_("Drive mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyDriveModeA100)),
+        TagInfo(0x001F, "SelfTimerTime", N_("Self Timer Time"),
+                N_("Self timer time"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonySelfTimerTimeA100)),
+        TagInfo(0x0020, "ContinuousBracketing", N_("Continuous Bracketing"),
+                N_("Continuous bracketing"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyContinuousBracketingA100)),
+        TagInfo(0x0021, "SingleFrameBracketing", N_("Single Frame Bracketing"),
+                N_("Single frame bracketing"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonySingleFrameBracketingA100)),
+        TagInfo(0x0022, "WhiteBalanceBracketing", N_("White Balance Bracketing"),
+                N_("White balance bracketing"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyWhiteBalanceBracketingA100)),
+        TagInfo(0x0023, "WhiteBalanceSetting", N_("White Balance Setting"),
+                N_("White balance setting"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyWhiteBalanceSettingA100)),
+        TagInfo(0x0024, "PresetWhiteBalance", N_("Preset White Balance"),
+                N_("Preset white balance"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyPresetWhiteBalanceA100)),
+        TagInfo(0x0025, "ColorTemperatureSetting", N_("Color Temperature Setting"),
+                N_("Color temperature setting"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyColorTemperatureSettingA100)),
+        TagInfo(0x0026, "CustomWBSetting", N_("Custom WB Setting"),
+                N_("Custom WB setting"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyCustomWBSettingA100)),
+        TagInfo(0x0027, "DynamicRangeOptimizerSettings", N_("Dynamic Range Optimizer Settings"),
+                N_("Dynamic Range Optimizer Settings"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyDynamicRangeOptimizerMode),
+        TagInfo(0x0032, "FreeMemoryCardImages", N_("Free Memory Card Images"),
+                N_("Free memory card images"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0034, "CustomWBRedLevel", N_("Custom WB Red Level"),
+                N_("Custom WB red level"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0035, "CustomWBGreenLevel", N_("Custom WB Green Level"),
+                N_("Custom WB green level"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0036, "CustomWBBlueLevel", N_("Custom WB Blue Level"),
+                N_("CustomWB blue level"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0037, "CustomWBError", N_("Custom WB Error"),
+                N_("Custom WB Error"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyCustomWBErrorA100)),
+        TagInfo(0x0038, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
+                N_("White balance fine tune"),
+                sony1MltCsA100Id, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0039, "ColorTemperature", N_("Color Temperature"),
+                N_("Color temperature"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x003A, "ColorCompensationFilter", N_("Color Compensation Filter"),
+                N_("Color compensation filter"),
+                sony1MltCsA100Id, makerTags, signedShort, 1, printValue),
+        TagInfo(0x003B, "SonyImageSize", N_("Sony Image Size"),
+                N_("Sony Image Size"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyImageSizeA100)),
+        TagInfo(0x003C, "Quality", N_("Quality"),
+                N_("Quality"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyQualityCs),
+        TagInfo(0x003D, "InstantPlaybackTime", N_("Instant Playback Time"),
+                N_("Instant playback time"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x003E, "InstantPlaybackSetup", N_("Instant Playback Setup"),
+                N_("Instant playback setup"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyInstantPlaybackSetupA100)),
+        TagInfo(0x003F, "NoiseReduction", N_("Noise Reduction"),
+                N_("Noise reduction"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
+        TagInfo(0x0040, "EyeStartAF", N_("Eye Start AF"),
+                N_("Eye start AF"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolInverseValue),
+        TagInfo(0x0041, "RedEyeReduction", N_("Red Eye Reduction"),
+                N_("Red eye reduction"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
+        TagInfo(0x0042, "FlashDefault", N_("Flash Default"),
+                N_("Flash default"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFlashDefaultA100)),
+        TagInfo(0x0043, "AutoBracketOrder", N_("Auto Bracket Order"),
+                N_("Auto bracket order"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyAutoBracketOrderA100)),
+        TagInfo(0x0044, "FocusHoldButton", N_("Focus Hold Button"),
+                N_("Focus hold button"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFocusHoldButtonA100)),
+        TagInfo(0x0045, "AELButton", N_("AEL Button"),
+                N_("AEL button"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyAELButtonA100)),
+        TagInfo(0x0046, "ControlDialSet", N_("Control Dial Set"),
+                N_("Control dial set"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyControlDialSetA100)),
+        TagInfo(0x0047, "ExposureCompensationMode", N_("Exposure Compensation Mode"),
+                N_("Exposure compensation mode"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureCompensationModeA100)),
+        TagInfo(0x0048, "AFAssist", N_("AF Assist"),
+                N_("AF assist"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolInverseValue),
+        TagInfo(0x0049, "CardShutterLock", N_("Card Shutter Lock"),
+                N_("Card shutter lock"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolInverseValue),
+        TagInfo(0x004A, "LensShutterLock", N_("Lens Shutter Lock"),
+                N_("Lens shutter lock"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolInverseValue),
+        TagInfo(0x004B, "AFAreaIllumination", N_("AF Area Illumination"),
+                N_("AF area illumination"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyAFAreaIlluminationA100)),
+        TagInfo(0x004C, "MonitorDisplayOff", N_("Monitor Display Off"),
+                N_("Monitor display off"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyMonitorDisplayOffA100)),
+        TagInfo(0x004D, "RecordDisplay", N_("Record Display"),
+                N_("Record display"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyRecordDisplayA100)),
+        TagInfo(0x004E, "PlayDisplay", N_("Play Display"),
+                N_("Play display"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyPlayDisplayA100)),
+        TagInfo(0x0050, "ExposureIndicator", N_("Exposure Indicator"),
+                N_("Exposure indicator"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureIndicatorA100)),
+        TagInfo(0x0051, "AELExposureIndicator", N_("AEL Exposure Indicator"),
+                N_("AEL exposure indicator (also indicates exposure for next shot when bracketing)"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureIndicatorA100)),
+        TagInfo(0x0052, "ExposureBracketingIndicatorLast", N_("Exposure Bracketing Indicator Last"),
+                N_("Exposure bracketing indicator last (indicator for last shot when bracketing)"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureIndicatorA100)),
+        TagInfo(0x0053, "MeteringOffScaleIndicator", N_("Metering Off Scale Indicator"),
+                N_("Metering off scale indicator (two flashing triangles when under or over metering scale)"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyMeteringOffScaleIndicatorA100)),
+        TagInfo(0x0054, "FlashExposureIndicator", N_("Flash Exposure Indicator"),
+                N_("Flash exposure indicator"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureIndicatorA100)),
+        TagInfo(0x0055, "FlashExposureIndicatorNext", N_("Flash Exposure Indicator Next"),
+                N_("Flash exposure indicator next (indicator for next shot when bracketing)"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureIndicatorA100)),
+        TagInfo(0x0056, "FlashExposureIndicatorLast", N_("Flash Exposure Indicator Last"),
+                N_("Flash exposure indicator last (indicator for last shot when bracketing)"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureIndicatorA100)),
+        TagInfo(0x0057, "ImageStabilization", N_("Image Stabilization"),
+                N_("Image stabilization"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
+        TagInfo(0x0058, "FocusModeSwitch", N_("Focus Mode Switch"),
+                N_("Focus mode switch"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFocusModeSwitchA100)),
+        TagInfo(0x0059, "FlashType", N_("Flash Type"),
+                N_("Flash type"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFlashTypeA100)),
+        TagInfo(0x005A, "Rotation", N_("Rotation"),
+                N_("Rotation"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyRotation),
+        TagInfo(0x004B, "AELock", N_("AE Lock"),
+                N_("AE lock"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
+        TagInfo(0x005E, "ColorTemperature", N_("Color Temperature"),
+                N_("Color temperature"),
+                sony1MltCsA100Id, makerTags, unsignedLong, 1, printValue),
+        TagInfo(0x005F, "ColorCompensationFilter", N_("Color Compensation Filter"),
+                N_("Color compensation filter: negative is green, positive is magenta"),
+                sony1MltCsA100Id, makerTags, unsignedLong, 1, printValue),
+        TagInfo(0x0060, "BatteryLevel", N_("Battery Level"),
+                N_("Battery level"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyBatteryLevelA100)),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownSonyCsA100Tag)", "(UnknownSonyCsA100Tag)",
+                N_("Unknown Sony Camera Settings A100 tag"),
+                sony1MltCsA100Id, makerTags, unsignedShort, 1, printValue)
+    };
+
+    const TagInfo* MinoltaMakerNote::tagListCsA100()
+    {
+        return tagInfoCsA100_;
+    }
+
     // TODO : Add camera settings tags info "New2"...
 
-}                                       // namespace Exiv2
+    // -- Minolta and Sony MakerNote Common Values ---------------------------------------
+
+    //! Lookup table to translate Minolta/Sony Lens id values to readable labels
+    /* NOTE:
+       - duplicate tags value are:
+       0/25520, 4/25920, 13/25610, 19/25910, 22/26050/26070,
+       25500/25501/26130, 25540/25541/25850, 25580/25581, 2564025641,
+       25720/25721, 25790/25791, 25960/25961, 25980/25981, 26150/26151
+       - No need to i18n these string.
+    */
+    extern TagDetails const minoltaSonyLensID[] = {
+        { 0,     "Minolta AF 28-85mm F3.5-4.5 New" },
+        { 1,     "Minolta AF 80-200mm F2.8 HS-APO G" },
+        { 2,     "Minolta AF 28-70mm F2.8 G" },
+        { 3,     "Minolta AF 28-80mm F4-5.6" },
+        { 4,     "Minolta AF 85mm F1.4G" },
+        { 5,     "Minolta AF 35-70mm F3.5-4.5 [II]" },
+        { 6,     "Minolta AF 24-85mm F3.5-4.5 [New]" },
+        { 7,     "Minolta AF 100-300mm F4.5-5.6(D) APO [New] | "
+                 "Minolta AF 100-400mm F4.5-6.7(D) | "
+                 "Sigma AF 100-300mm F4 EX DG IF" },
+        { 8,     "Minolta AF 70-210mm F4.5-5.6 [II]" },
+        { 9,     "Minolta AF 50mm F3.5 Macro" },
+        { 10,    "Minolta AF 28-105mm F3.5-4.5 [New]" },
+        { 11,    "Minolta AF 300mm F4 HS-APO G" },
+        { 12,    "Minolta AF 100mm F2.8 Soft Focus" },
+        { 13,    "Minolta AF 75-300mm F4.5-5.6 (New or II)" },
+        { 14,    "Minolta AF 100-400mm F4.5-6.7 APO" },
+        { 15,    "Minolta AF 400mm F4.5 HS-APO G" },
+        { 16,    "Minolta AF 17-35mm F3.5 G" },
+        { 17,    "Minolta AF 20-35mm F3.5-4.5" },
+        { 18,    "Minolta AF 28-80mm F3.5-5.6 II" },
+        { 19,    "Minolta AF 35mm F1.4 G" },
+        { 20,    "Minolta/Sony 135mm F2.8 [T4.5] STF" },
+        { 22,    "Minolta AF 35-80mm F4-5.6 II" },
+        { 23,    "Minolta AF 200mm F4 Macro APO G" },
+        { 24,    "Minolta/Sony AF 24-105mm F3.5-4.5 (D) | "
+                 "Sigma 18-50mm F2.8 | "
+                 "Sigma 17-70mm F2.8-4.5 (D) | "
+                 "Sigma 20-40mm F2.8 EX DG Aspherical IF | "
+                 "Sigma 18-200mm F3.5-6.3 DC | "
+                 "Sigma 20-40mm F2.8 EX DG Aspherical IF | "
+                 "Sigma DC 18-125mm F4-5,6 D | "
+                 "Tamron SP AF 28-75mm F2.8 XR Di (IF) Macro" },
+        { 25,    "Minolta AF 100-300mm F4.5-5.6 APO (D) | "
+                 "Sigma 100-300mm F4 EX (APO (D) or D IF) | "
+                 "Sigma 70mm F2.8 EX DG Macro | "
+                 "Sigma 20mm F1.8 EX DG Aspherical RF | "
+                 "Sigma 30mm F1.4 DG EX" },
+        { 27,    "Minolta AF 85mm F1.4 G (D)" },
+        { 28,    "Minolta/Sony AF 100mm F2.8 Macro (D) | "
+                 "Tamron SP AF 90mm F2.8 Di Macro" },
+        { 29,    "Minolta/Sony AF 75-300mm F4.5-5.6 (D) " },
+        { 30,    "Minolta AF 28-80mm F3.5-5.6 (D) | "
+                 "Sigma AF 10-20mm F4-5.6 EX DC | "
+                 "Sigma AF 12-24mm F4.5-5.6 EX DG | "
+                 "Sigma 28-70mm EX DG F2.8 | "
+                 "Sigma 55-200mm F4-5.6 DC" },
+        { 31,    "Minolta AF 50mm F2.8 Macro(D) | "
+                 "Minolta AF 50mm F3.5 Macro" },
+        { 32,    "Minolta AF 100-400mm F4.5-6.7(D) | "
+                 "Minolta AF 300mm F2.8G APO(D) SSM" },
+        { 33,    "Minolta/Sony AF 70-200mm F2.8 G" },
+        { 35,    "Minolta AF 85mm F1.4 G (D) Limited" },
+        { 36,    "Minolta AF 28-100mm F3.5-5.6 (D)" },
+        { 38,    "Minolta AF 17-35mm F2.8-4 (D)" },
+        { 39,    "Minolta AF 28-75mm F2.8 (D)" },
+        { 40,    "Minolta/Sony AF DT 18-70mm F3.5-5.6 (D) | "
+                 "Sony AF DT 18-200mm F3.5-6.3" },
+        { 41,    "Minolta/Sony AF DT 11-18mm F4.5-5.6 (D) | "
+                 "Tamron SP AF 11-18mm F4.5-5.6 Di II LD Aspherical IF" },
+        { 42,    "Minolta/Sony AF DT 18-200mm F3.5-6.3 (D)" },
+        { 43,    "Sony 35mm F1.4 G (SAL-35F14G)" },
+        { 44,    "Sony 50mm F1.4 (SAL-50F14)" },
+        { 45,    "Carl Zeiss Planar T* 85mm F1.4 ZA" },
+        { 46,    "Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA" },
+        { 47,    "Carl Zeiss Sonnar T* 135mm F1.8 ZA" },
+        { 48,    "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL-2470Z)" },
+        { 49,    "Sony AF DT 55-200mm F4-5.6" },
+        { 50,    "Sony AF DT 18-250mm F3.5-6.3" },
+        { 51,    "Sony AF DT 16-105mm F3.5-5.6 | "
+                 "Sony AF DT 55-200mm F4-5.5" },
+        { 52,    "Sony 70-300mm F4.5-5.6 G SSM" },
+        { 53,    "Sony AF 70-400mm F4.5-5.6 G SSM (SAL-70400G)" },
+        { 54,    "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM (SAL-1635Z)" },
+        { 55,    "Sony DT 18-55mm F3.5-5.6 SAM (SAL-1855)" },
+        { 56,    "Sony AF DT 55-200mm F4-5.6 SAM" },
+        { 57,    "Sony AF DT 50mm F1.8 SAM" },
+        { 58,    "Sony AF DT 30mm F2.8 SAM Macro" },
+        { 128,   "Sigma 70-200mm F2.8 APO EX DG MACRO | "
+                 "Tamron 18-200mm F3.5-6.3 | "
+                 "Tamron 28-300mm F3.5-6.3 | "
+                 "Tamron 80-300mm F3.5-6.3 | "
+                 "Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] MACRO | "
+                 "Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF | "
+                 "Sigma AF 50-150mm F2.8 EX DC APO HSM II | "
+                 "Sigma 10-20mm F3.5 EX DC HSM | "
+                 "Sigma 70-200mm F2.8 II EX DG APO MACRO HSM" },
+        { 129,   "Tamron 200-400mm F5.6 LD | "
+                 "Tamron 70-300mm F4-5.6 LD" },
+        { 131,   "Tamron 20-40mm F2.7-3.5 SP Aspherical IF" },
+        { 135,   "Vivitar 28-210mm F3.5-5.6" },
+        { 136,   "Tokina EMZ M100 AF 100mm F3.5" },
+        { 137,   "Cosina 70-210mm F2.8-4 AF" },
+        { 138,   "Soligor 19-35mm F3.5-4.5" },
+        { 142,   "Voigtlander 70-300mm F4.5-5.6" },
+        { 146,   "Voigtlander Macro APO-Lanthar 125mm F2.5 SL" },
+        { 193,   "Minolta AF 1.4x APO II" },
+        { 255,   "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical | "
+                 "Tamron AF 18-250mm F3.5-6.3 XR Di II LD | "
+                 "Tamron AF 55-200mm F4-5.6 Di II | "
+                 "Tamron AF 70-300mm F4-5.6 Di LD MACRO 1:2 | "
+                 "Tamron SP AF 200-500mm F5.0-6.3 Di LD IF | "
+                 "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical IF | "
+                 "Tamron SP AF 70-200mm F2.8 Di LD IF Macro | "
+                 "Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical IF" },
+        { 25500, "Minolta AF 50mm F1.7" },
+        { 25501, "Minolta AF 50mm F1.7" },
+        { 25510, "Minolta AF 35-70mm F1.4" },
+        { 25511, "Minolta AF 35-70mm F4 | "
+                 "Sigma UC AF 28-70mm F3.5-4.5 | "
+                 "Sigma AF 28-70mm F2.8 | "
+                 "Sigma M-AF 70-200mm F2.8 EX Aspherical | "
+                 "Quantaray M-AF 35-80mm F4-5.6 " },
+        { 25520, "Minolta AF 28-85mm F3.5-4.5" },
+        { 25521, "Minolta AF 28-85mm F3.5-4.5 | "
+                 "Tokina 19-35mm F3.5-4.5 | "
+                 "Tokina 28-70mm F2.8 AT-X | "
+                 "Tokina 80-400mm F4.5-5.6 AT-X AF II 840 | "
+                 "Tokina AF PRO 28-80mm F2.8 AT-X 280 | "
+                 "Tokina AT-X PRO II AF 28-70mm F2.6-2.8 270 | "
+                 "Tamron AF 19-35mm F3.5-4.5 | "
+                 "Angenieux AF 28-70mm F2.6" },
+        { 25530, "Minolta AF 28-135mm F4-4.5" },
+        { 25531, "Minolta AF 28-135mm F4-4.5 | "
+                 "Sigma ZOOM-alpha 35-135mm F3.5-4.5 | "
+                 "Sigma 28-105mm F2.8-4 Aspherical" },
+        { 25540, "Minolta AF 35-105mm F3.5-4.5" },
+        { 25541, "Minolta AF 35-105mm F3.5-4.5" },
+        { 25550, "Minolta AF 70-210mm F4" },
+        { 25551, "Minolta AF 70-210mm F4 Macro | "
+                 "Sigma 70-210mm F4-5.6 APO | "
+                 "Sigma M-AF 70-200mm F2.8 EX APO | "
+                 "Sigma 75-200mm F2.8-3.5" },
+        { 25560, "Minolta AF 135mm F2.8" },
+        { 25561, "Minolta AF 135mm F2.8" },
+        { 25570, "Minolta AF 28mm F2.8" },
+        { 25571, "Minolta/Sony AF 28mm F2.8" },
+        { 25580, "Minolta AF 24-50mm F4" },
+        { 25581, "Minolta AF 24-50mm F4" },
+        { 25600, "Minolta AF 100-200mm F4.5" },
+        { 25601, "Minolta AF 100-200mm F4.5" },
+        { 25610, "Minolta AF 75-300mm F4.5-5.6" },
+        { 25611, "Minolta AF 75-300mm F4.5-5.6 | "
+                 "Sigma 70-300mm F4-5.6 DL Macro | "
+                 "Sigma 300mm F4 APO Macro | "
+                 "Sigma AF 500mm F4.5 APO | "
+                 "Sigma AF 170-500mm F5-6.3 APO Aspherical | "
+                 "Tokina AT-X AF 300mm F4 | "
+                 "Tokina AT-X AF 400mm F5.6 SD | "
+                 "Tokina AF 730 II 75-300mm F4.5-5.6" },
+        { 25620, "Minolta AF 50mm F1.4" },
+        { 25621, "Minolta AF 50mm F1.4 [New]" },
+        { 25630, "Minolta AF 300mm F2.8G APO" },
+        { 25631, "Minolta AF 300mm F2.8 APO | "
+                 "Sigma AF 50-500mm F4-6.3 EX DG APO | "
+                 "Sigma AF 170-500mm F5-6.3 APO Aspherical | "
+                 "Sigma AF 500mm F4.5 EX DG APO | "
+                 "Sigma 400mm F5.6 APO" },
+        { 25640, "Minolta AF 50mm F2.8 Macro" },
+        { 25641, "Minolta AF 50mm F2.8 Macro | "
+                 "Sigma 50mm F2.8 EX Macro" },
+        { 25650, "Minolta AF 600mm F4 APO" },
+        { 25651, "Minolta AF 600mm F4 APO" },
+        { 25660, "Minolta AF 24mm F2.8" },
+        { 25661, "Minolta AF 24mm F2.8 | "
+                 "Sigma 17-35mm F2.8-4.0 EX-D" },
+        { 25720, "Minolta AF 500mm F8 Reflex" },
+        { 25721, "Minolta/Sony AF 500mm F8 Reflex" },
+        { 25780, "Minolta/Sony AF 16mm F2.8 Fisheye" },
+        { 25781, "Minolta/Sony AF 16mm F2.8 Fisheye | "
+                 "Sigma 8mm F4 EX [DG] Fisheye | "
+                 "Sigma 14mm F3.5 | "
+                 "Sigma 15mm F2.8 Fisheye" },
+        { 25790, "Minolta AF 20mm F2.8" },
+        { 25791, "Minolta/Sony AF 20mm F2.8" },
+        { 25810, "Minolta AF 100mm F2.8 Macro" },
+        { 25811, "Minolta AF 100mm F2.8 Macro [New] | "
+                 "Sigma AF 90mm F2.8 Macro | "
+                 "Sigma AF 105mm F2.8 EX [DG] Macro | "
+                 "Sigma 180mm F5.6 Macro | "
+                 "Tamron 90mm F2.8 Macro" },
+        { 25850, "Minolta AF 35-105mm F3.5-4.5" },
+        { 25851, "Beroflex 35-135mm F3.5-4.5" },
+        { 25858, "Minolta AF 35-105mm F3.5-4.5 New | "
+                 "Tamron 24-135mm F3.5-5.6" },
+        { 25880, "Minolta AF 70-210mm F3.5-4.5" },
+        { 25881, "Minolta AF 70-210mm F3.5-4.5" },
+        { 25890, "Minolta AF 80-200mm F2.8 APO" },
+        { 25891, "Minolta AF 80-200mm F2.8 APO | "
+                 "Tokina 80-200mm F2.8" },
+        { 25910, "Minolta AF 35mm F1.4G" },
+        { 25911, "Minolta AF 35mm F1.4" },
+        { 25920, "Minolta AF 85mm F1.4G" },
+        { 25921, "Minolta AF 85mm F1.4G(D)" },
+        { 25930, "Minolta AF 200mm F2.8 APO" },
+        { 25931, "Minolta AF 200mm F2.8 G APO" },
+        { 25940, "Minolta AF 3X-1X F1.7-2.8 Macro" },
+        { 25941, "Minolta AF 3x-1x F1.7-2.8 Macro" },
+        { 25960, "Minolta AF 28mm F2" },
+        { 25961, "Minolta AF 28mm F2" },
+        { 25970, "Minolta AF 35mm F2" },
+        { 25971, "Minolta AF 35mm F2 [New]" },
+        { 25980, "Minolta AF 100mm F2" },
+        { 25981, "Minolta AF 100mm F2" },
+        { 26040, "Minolta AF 80-200mm F4.5-5.6" },
+        { 26041, "Minolta AF 80-200mm F4.5-5.6" },
+        { 26050, "Minolta AF 35-80mm F4-5.6" },
+        { 26051, "Minolta AF 35-80mm F4-5.6" },
+        { 26060, "Minolta AF 100-300mm F4.5-5.6" },
+        { 26061, "Minolta AF 100-300mm F4.5-5.6(D) | "
+                 "Sigma 105mm F2.8 Macro EX-DG" },
+        { 26070, "Minolta AF 35-80mm F4-5.6" },
+        { 26071, "Minolta AF 35-80mm F4-5.6" },
+        { 26080, "Minolta AF 300mm F2.8G APO High Speed" },
+        { 26081, "Minolta AF 300mm F2.8G" },
+        { 26090, "Minolta AF 600mm F4G APO High Speed" },
+        { 26091, "Minolta AF 600mm F4 HS-APO G" },
+        { 26120, "Minolta AF 200mm F2.8G APO High Speed" },
+        { 26121, "Minolta AF 200mm F2.8G(D)" },
+        { 26130, "Minolta AF 50mm F1.7" },
+        { 26131, "Minolta AF 50mm F1.7 New" },
+        { 26150, "Minolta AF 28-105mm F3.5-4.5 Xi" },
+        { 26151, "Minolta AF 28-105mm F3.5-4.5 xi" },
+        { 26160, "Minolta AF 35-200mm F4.5-5.6 Xi" },
+        { 26161, "Minolta AF 35-200mm F4.5-5.6 Xi" },
+        { 26180, "Minolta AF 28-80mm F4-5.6 Xi" },
+        { 26181, "Minolta AF 28-80mm F4-5.6 xi" },
+        { 26190, "Minolta AF 80-200mm F4.5-5.6 Xi" },
+        { 26191, "Minolta AF 80-200mm F4.5-5.6 Xi" },
+        { 26201, "Minolta AF 28-70mm F2.8 G" },
+        { 26210, "Minolta AF 100-300mm F4.5-5.6 Xi" },
+        { 26211, "Minolta AF 100-300mm F4.5-5.6 xi" },
+        { 26240, "Minolta AF 35-80mm F4-5.6 Power" },
+        { 26241, "Minolta AF 35-80mm F4-5.6 Power Zoom" },
+        { 26281, "Minolta AF 80-200mm F2.8 G" },
+        { 26291, "Minolta AF 85mm F1.4 New" },
+        { 26311, "Minolta/Sony AF 100-300mm F4.5-5.6 APO" },
+        { 26321, "Minolta AF 24-50mm F4 New" },
+        { 26381, "Minolta AF 50mm F2.8 Macro New" },
+        { 26391, "Minolta AF 100mm F2.8 Macro" },
+        { 26411, "Minolta/Sony AF 20mm F2.8 New" },
+        { 26421, "Minolta AF 24mm F2.8 New" },
+        { 26441, "Minolta AF 100-400mm F4.5-6.7 APO" },
+        { 26621, "Minolta AF 50mm F1.4 New" },
+        { 26671, "Minolta AF 35mm F2 New" },
+        { 26681, "Minolta AF 28mm F2 New" },
+        { 26721, "Minolta AF 24-105mm F3.5-4.5 (D)" },
+        { 45671, "Tokina 70-210mm F4-5.6" },
+        { 45741, "Minolta AF200mm F2.8G x2 | "
+                 "Tokina 300mm F2.8 x2 | "
+                 "Tokina RF 500mm F8.0 x2 | "
+                 "Tamron SP AF 90mm F2.5"},
+        { 45751, "1.4x Teleconverter " },
+        { 45851, "Tamron SP AF 300mm F2.8 LD IF" },
+        { 65535, "T-Mount | "
+                 "Arax MC 35mm F2.8 Tilt+Shift | "
+                 "Arax MC 80mm F2.8 Tilt+Shift | "
+                 "Zenitar MF 16mm F2.8 Fisheye M42 | "
+                 "Samyang 500mm Mirror F8.0 | "
+                 "Pentacon Auto 135mm F2.8 | "
+                 "Pentacon Auto 29mm F2.8 | "
+                 "Helios 44-2 58mm F2.0 | "
+                 "No Lens" }
+    };
+
+    std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyLensID)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Minolta A100 and all other Sony Alpha camera color mode values to readable labels
+    extern const TagDetails minoltaSonyColorMode[] = {
+        { 0,   N_("Standard")            },
+        { 1,   N_("Vivid Color")         },
+        { 2,   N_("Portrait")            },
+        { 3,   N_("Landscape")           },
+        { 4,   N_("Sunset")              },
+        { 5,   N_("Night View/Portrait") },
+        { 6,   N_("Black & White")       },
+        { 7,   N_("AdobeRGB")            },
+        { 12,  N_("Neutral")             },
+        { 100, N_("Neutral")             },
+        { 101, N_("Clear")               },
+        { 102, N_("Deep")                },
+        { 103, N_("Light")               },
+        { 104, N_("Night View")          },
+        { 105, N_("Autumn Leaves")       }
+    };
+
+    std::ostream& printMinoltaSonyColorMode(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyColorMode)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Minolta/Sony bool function values to readable labels
+    extern const TagDetails minoltaSonyBoolFunction[] = {
+        { 0, N_("Off") },
+        { 1, N_("On")  }
+    };
+
+    std::ostream& printMinoltaSonyBoolValue(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyBoolFunction)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Minolta/Sony bool inverse function values to readable labels
+    extern const TagDetails minoltaSonyBoolInverseFunction[] = {
+        { 0, N_("On")  },
+        { 1, N_("Off") }
+    };
+
+    std::ostream& printMinoltaSonyBoolInverseValue(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyBoolInverseFunction)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings focus mode values to readable labels
+    extern const TagDetails minoltaSonyAFAreaMode[] = {
+        { 0, N_("Wide")  },
+        { 1, N_("Local") },
+        { 2, N_("Spot")  }
+    };
+
+    std::ostream& printMinoltaSonyAFAreaMode(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyAFAreaMode)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings Local AF Area Point values to readable labels
+    extern const TagDetails minoltaSonyLocalAFAreaPoint[] = {
+        { 1,  N_("Center")       },
+        { 2,  N_("Top")          },
+        { 3,  N_("Top-Right")    },
+        { 4,  N_("Right")        },
+        { 5,  N_("Bottom-Right") },
+        { 6,  N_("Bottom")       },
+        { 7,  N_("Bottom-Left")  },
+        { 8,  N_("Left")         },
+        { 9,  N_("Top-Left")     },
+        { 10, N_("Far-Right")    },
+        { 11, N_("Far-Left")     }
+    };
+
+    std::ostream& printMinoltaSonyLocalAFAreaPoint(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyLocalAFAreaPoint)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings dynamic range optimizer mode values to readable labels
+    extern const TagDetails minoltaSonyDynamicRangeOptimizerMode[] = {
+        { 0,    N_("Off")            },
+        { 1,    N_("Standard")       },
+        { 2,    N_("Advanced Auto")  },
+        { 3,    N_("Advanced Level") },
+        { 4097, N_("Auto")           }
+    };
+
+    std::ostream& printMinoltaSonyDynamicRangeOptimizerMode(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyDynamicRangeOptimizerMode)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings priority setup shutter release values to readable labels
+    extern const TagDetails minoltaSonyPrioritySetupShutterRelease[] = {
+        { 0, N_("AF")      },
+        { 1, N_("Release") }
+    };
+
+    std::ostream& printMinoltaSonyPrioritySetupShutterRelease(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyPrioritySetupShutterRelease)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings quality values to readable labels
+    extern const TagDetails minoltaSonyQualityCs[] = {
+        { 0,   N_("RAW ")       },
+        { 2,   N_("CRAW ")      },
+        { 16,  N_("Extra Fine") },
+        { 32,  N_("Fine")       },
+        { 34,  N_("RAW+JPEG")   },
+        { 35,  N_("CRAW+JPEG")  },
+        { 48,  N_("Standard")   }
+    };
+
+    std::ostream& printMinoltaSonyQualityCs(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyQualityCs)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings rotation values to readable labels
+    extern const TagDetails minoltaSonyRotation[] = {
+        { 0, N_("Horizontal (normal)") },
+        { 1, N_("Rotate 90 CW")        },
+        { 2, N_("Rotate 270 CW")       }
+    };
+
+    std::ostream& printMinoltaSonyRotation(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyRotation)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Minolta/Sony scene mode values to readable labels
+    extern const TagDetails minoltaSonySceneMode[] = {
+        { 0,  N_("Standard")            },
+        { 1,  N_("Portrait")            },
+        { 2,  N_("Text")                },
+        { 3,  N_("Night Scene")         },
+        { 4,  N_("Sunset")              },
+        { 5,  N_("Sports")              },
+        { 6,  N_("Landscape")           },
+        { 7,  N_("Night Portrait")      },
+        { 8,  N_("Macro")               },
+        { 9,  N_("Super Macro")         },
+        { 16, N_("Auto")                },
+        { 17, N_("Night View/Portrait") }
+    };
+
+    std::ostream& printMinoltaSonySceneMode(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonySceneMode)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony/Minolta image quality values to readable labels
+    extern const TagDetails minoltaSonyImageQuality[] = {
+        { 0, N_("Raw")                   },
+        { 1, N_("Super Fine")            },
+        { 2, N_("Fine")                  },
+        { 3, N_("Standard")              },
+        { 4, N_("Economy")               },
+        { 5, N_("Extra Fine")            },
+        { 6, N_("Raw + JPEG")            },
+        { 7, N_("Compressed Raw")        },
+        { 8, N_("Compressed Raw + JPEG") }
+    };
+
+    std::ostream& printMinoltaSonyImageQuality(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyImageQuality)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony/Minolta teleconverter model values to readable labels
+    extern const TagDetails minoltaSonyTeleconverterModel[] = {
+        { 0x00, N_("None")                     },
+        { 0x48, N_("Minolta AF 2x APO (D)")    },
+        { 0x50, N_("Minolta AF 2x APO II")     },
+        { 0x88, N_("Minolta AF 1.4x APO (D)")  },
+        { 0x90, N_("Minolta AF 1.4x APO II")   }
+    };
+
+    std::ostream& printMinoltaSonyTeleconverterModel(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyTeleconverterModel)(os, value, metadata);
+    }
+
+    // ----------------------------------------------------------------------------------------------------
+
+    //! Lookup table to translate Sony/Minolta Std camera settings white balance values to readable labels
+    extern const TagDetails minoltaSonyWhiteBalanceStd[] = {
+        { 0x00,  N_("Auto")                           },
+        { 0x01,  N_("Color Temperature/Color Filter") },
+        { 0x10,  N_("Daylight")                       },
+        { 0x20,  N_("Cloudy")                         },
+        { 0x30,  N_("Shade")                          },
+        { 0x40,  N_("Tungsten")                       },
+        { 0x50,  N_("Flash")                          },
+        { 0x60,  N_("Fluorescent")                    },
+        { 0x70,  N_("Custom")                         }
+    };
+
+    std::ostream& printMinoltaSonyWhiteBalanceStd(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyWhiteBalanceStd)(os, value, metadata);
+    }
+
+    //! Lookup table to translate Sony/Minolta zone matching values to readable labels
+    extern const TagDetails minoltaSonyZoneMatching[] = {
+        { 0, N_("ISO Setting Used") },
+        { 1, N_("High Key") },
+        { 2, N_("Low Key")  }
+    };
+
+    std::ostream& printMinoltaSonyZoneMatching(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        return EXV_PRINT_TAG(minoltaSonyZoneMatching)(os, value, metadata);
+    }
+
+    std::ostream& printMinoltaSonyFlashExposureComp(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != signedRational) {
+            return os << "(" << value << ")";
+        }
+        return os << std::fixed << std::setprecision(2) << value.toFloat(0) << " EV";
+    }
+
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/minoltamn.hpp exiv2-0.21/src/minoltamn.hpp
--- exiv2-0.19/src/minoltamn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/minoltamn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    minoltamn.hpp
-  @brief   Minolta MakerNote implemented using the following references:<br>
-           <a href="http://www.dalibor.cz/minolta/makernote.htm">Minolta Makernote Format Specification</a> by Dalibor Jelinek,<br>
-           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Minolta.html">Minolta Makernote list</a> by Phil Harvey<br>
-           <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/minolta_mn.html">Minolta Makernote list from PHP JPEG Metadata Toolkit</a><br>
-           Email communication with <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a><br>
-           Some Minolta camera settings have been decoded by <a href="mailto:xraynaud@gmail.com">Xavier Raynaud</a> from digiKam project and added by Gilles Caulier.
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @author  Gilles Caulier (cgilles)
-           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
-  @date    06-May-06, gc: submitted
- */
-#ifndef MINOLTAMN_HPP_
-#define MINOLTAMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <iosfwd>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Minolta cameras
-    class EXIV2API MinoltaMakerNote {
-    public:
-        //! Return read-only list of built-in Minolta tags
-        static const TagInfo* tagList();
-        //! Return read-only list of built-in Minolta Standard Camera Settings tags
-        static const TagInfo* tagListCsStd();
-        //! Return read-only list of built-in Minolta 7D Camera Settings tags
-        static const TagInfo* tagListCs7D();
-        //! Return read-only list of built-in Minolta 5D Camera Settings tags
-        static const TagInfo* tagListCs5D();
-
-        //! @name Print functions for Minolta %MakerNote tags
-        //@{
-        //! Print Exposure Speed setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaExposureSpeedStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Exposure Time setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaExposureTimeStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print F Number setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaFNumberStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Exposure Compensation setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaExposureCompensationStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Focal Length setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaFocalLengthStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Minolta Date from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaDateStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Minolta Time from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaTimeStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Flash Exposure Compensation setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaFlashExposureCompStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print White Balance setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaWhiteBalanceStd(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Brightness setting from standard Minolta Camera Settings makernote
-        static std::ostream& printMinoltaBrightnessStd(std::ostream& os, const Value& value, const ExifData*);
-
-        //! Print Exposure Manual Bias setting from 5D Minolta Camera Settings makernote
-        static std::ostream& printMinoltaExposureManualBias5D(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Exposure Compensation setting from 5D Minolta Camera Settings makernote
-        static std::ostream& printMinoltaExposureCompensation5D(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-        static const TagInfo tagInfoCs5D_[];
-        static const TagInfo tagInfoCs7D_[];
-        static const TagInfo tagInfoCsStd_[];
-
-    }; // class MinoltaMakerNote
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef MINOLTAMN_HPP_
diff -Nru exiv2-0.19/src/minoltamn_int.hpp exiv2-0.21/src/minoltamn_int.hpp
--- exiv2-0.19/src/minoltamn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/minoltamn_int.hpp	2010-08-14 03:06:21.000000000 +0000
@@ -0,0 +1,159 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    minoltamn_int.hpp
+  @brief   Minolta MakerNote implemented using the following references:<br>
+           <a href="http://www.dalibor.cz/minolta/makernote.htm">Minolta Makernote Format Specification</a> by Dalibor Jelinek,<br>
+           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Minolta.html">Minolta Makernote list</a> by Phil Harvey<br>
+           <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/minolta_mn.html">Minolta Makernote list from PHP JPEG Metadata Toolkit</a><br>
+           Email communication with <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a><br>
+           Some Minolta camera settings have been decoded by <a href="mailto:xraynaud@gmail.com">Xavier Raynaud</a> from digiKam project and added by Gilles Caulier.
+  @version $Rev: 2315 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @author  Gilles Caulier (cgilles)
+           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  @date    06-May-06, gc: submitted
+ */
+#ifndef MINOLTAMN_INT_HPP_
+#define MINOLTAMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <iosfwd>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Minolta cameras
+    class MinoltaMakerNote {
+    public:
+        //! Return read-only list of built-in Minolta tags
+        static const TagInfo* tagList();
+        //! Return read-only list of built-in Minolta Standard Camera Settings tags
+        static const TagInfo* tagListCsStd();
+        //! Return read-only list of built-in Minolta 7D Camera Settings tags
+        static const TagInfo* tagListCs7D();
+        //! Return read-only list of built-in Minolta 5D Camera Settings tags
+        static const TagInfo* tagListCs5D();
+        //! Return read-only list of built-in Sony A100 Camera Settings tags
+        static const TagInfo* tagListCsA100();
+
+        //! @name Print functions for Minolta %MakerNote tags
+        //@{
+        //! Print Exposure Speed setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaExposureSpeedStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Exposure Time setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaExposureTimeStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print F Number setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaFNumberStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Exposure Compensation setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaExposureCompensationStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Focal Length setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaFocalLengthStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Minolta Date from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaDateStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Minolta Time from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaTimeStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Flash Exposure Compensation setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaFlashExposureCompStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print White Balance setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaWhiteBalanceStd(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Brightness setting from standard Minolta Camera Settings makernote
+        static std::ostream& printMinoltaBrightnessStd(std::ostream& os, const Value& value, const ExifData*);
+
+        //! Print Exposure Manual Bias setting from 5D Minolta Camera Settings makernote
+        static std::ostream& printMinoltaExposureManualBias5D(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Exposure Compensation setting from 5D Minolta Camera Settings makernote
+        static std::ostream& printMinoltaExposureCompensation5D(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+        static const TagInfo tagInfoCsA100_[];
+        static const TagInfo tagInfoCs5D_[];
+        static const TagInfo tagInfoCs7D_[];
+        static const TagInfo tagInfoCsStd_[];
+
+    }; // class MinoltaMakerNote
+
+    // -- Minolta and Sony MakerNote Common Values ---------------------------------------
+
+    //! Print Minolta/Sony Lens id values to readable labels.
+    std::ostream& printMinoltaSonyLensID(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony Color Mode values to readable labels.
+    std::ostream& printMinoltaSonyColorMode(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony bool function values to readable labels.
+    std::ostream& printMinoltaSonyBoolValue(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony bool inverse function values to readable labels.
+    std::ostream& printMinoltaSonyBoolInverseValue(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony AF Area Mode values to readable labels.
+    std::ostream& printMinoltaSonyAFAreaMode(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony Local AF Area Point values to readable labels.
+    std::ostream& printMinoltaSonyLocalAFAreaPoint(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony dynamic range optimizer mode values to readable labels.
+    std::ostream& printMinoltaSonyDynamicRangeOptimizerMode(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony priority setup shutter release values to readable labels.
+    std::ostream& printMinoltaSonyPrioritySetupShutterRelease(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony Quality values to readable labels.
+    std::ostream& printMinoltaSonyQualityCs(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony Rotation values to readable labels.
+    std::ostream& printMinoltaSonyRotation(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony Scene Mode values to readable labels.
+    std::ostream& printMinoltaSonySceneMode(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony Image Quality values to readable labels.
+    std::ostream& printMinoltaSonyImageQuality(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony Teleconverter Model values to readable labels.
+    std::ostream& printMinoltaSonyTeleconverterModel(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony White Balance Std values to readable labels.
+    std::ostream& printMinoltaSonyWhiteBalanceStd(std::ostream&, const Value&, const ExifData*);
+
+    //! Print Minolta/Sony ZoneMatching values to readable labels.
+    std::ostream& printMinoltaSonyZoneMatching(std::ostream&, const Value&, const ExifData*);
+
+    // TODO: Added shared methods here.
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef MINOLTAMN_INT_HPP_
diff -Nru exiv2-0.19/src/mn.hpp exiv2-0.21/src/mn.hpp
--- exiv2-0.19/src/mn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/mn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    mn.hpp
-  @brief   Include all makernote header files. Makes sure that the static
-           variable used to register makernotes is instantiated.
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @date    28-May-05, ahu: created
- */
-#ifndef MN_HPP_
-#define MN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "canonmn.hpp"
-#include "fujimn.hpp"
-#include "minoltamn.hpp"
-#include "nikonmn.hpp"
-#include "olympusmn.hpp"
-#include "panasonicmn.hpp"
-#include "pentaxmn.hpp"
-#include "sigmamn.hpp"
-#include "sonymn.hpp"
-
-#endif                                  // #ifndef MN_HPP_
diff -Nru exiv2-0.19/src/mrwimage.cpp exiv2-0.21/src/mrwimage.cpp
--- exiv2-0.19/src/mrwimage.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/mrwimage.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      mrwimage.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   13-May-06, ahu: created
   Credits:   See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: mrwimage.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: mrwimage.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
diff -Nru exiv2-0.19/src/mrwimage.hpp exiv2-0.21/src/mrwimage.hpp
--- exiv2-0.19/src/mrwimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/mrwimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   @file    mrwimage.hpp
   @brief   Minolta RAW image, implemented using the following references:
            <a href="http://www.dalibor.cz/minolta/raw_file_format.htm">Minolta Raw file format</a> by Dalibor Jelinek
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    13-May-06, ahu: created
diff -Nru exiv2-0.19/src/nikonmn.cpp exiv2-0.21/src/nikonmn.cpp
--- exiv2-0.19/src/nikonmn.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/nikonmn.cpp	2010-11-21 14:07:48.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * Lens database for the conversion of Nikon lens data to readable lens names
  * Copyright (C) 2005-2008 Robert Rottmerhusen <lens_id@rottmerhusen.com>
@@ -23,23 +23,24 @@
  */
 /*
   File:      nikonmn.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2376 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
-             Gilles Caulier (gc) <caulier.gilles@kdemail.net>
+             Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
+             Jens Mueller (jm) <tschensinger at web dot de>
   History:   17-May-04, ahu: created
              25-May-04, ahu: combined all Nikon formats in one component
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: nikonmn.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: nikonmn.cpp 2376 2010-11-21 14:07:48Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "nikonmn.hpp"
+#include "nikonmn_int.hpp"
 #include "value.hpp"
 #include "image.hpp"
-#include "tags.hpp"
+#include "tags_int.hpp"
 #include "error.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -54,6 +55,7 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     //! OffOn, multiple tags
     extern const TagDetails nikonOffOn[] = {
@@ -69,8 +71,18 @@
         {  5, N_("High")   }
     };
 
+    //! Off, Low, Normal, High, multiple tags
+    extern const TagDetails nikonActiveDLighning[] = {
+        {     0, N_("Off")        },
+        {     1, N_("Low")        },
+        {     3, N_("Normal")     },
+        {     5, N_("High")       },
+        {     7, N_("Extra High") },
+        { 65535, N_("Auto")       }
+    };
+
     //! Focus area for Nikon cameras.
-    extern const char *nikonFocusarea[] = {
+    extern const char * const nikonFocusarea[] = {
         N_("Single area"),
         N_("Dynamic area"),
         N_("Dynamic area, closest subject"),
@@ -83,7 +95,7 @@
     // module. Note that relative size and position will vary depending on if
     // "wide" or not
     //! Focus points for Nikon cameras, used for Nikon 1 and Nikon 3 makernotes.
-    extern const char *nikonFocuspoints[] = {
+    extern const char * const nikonFocuspoints[] = {
         N_("Center"),
         N_("Top"),
         N_("Bottom"),
@@ -200,57 +212,56 @@
     const TagInfo Nikon1MakerNote::tagInfo_[] = {
         TagInfo(0x0001, "Version", N_("Version"),
                 N_("Nikon Makernote version"),
-                nikon1IfdId, makerTags, undefined, printValue),
+                nikon1Id, makerTags, undefined, -1, printValue),
         TagInfo(0x0002, "ISOSpeed", N_("ISO Speed"),
                 N_("ISO speed setting"),
-                nikon1IfdId, makerTags, unsignedShort, print0x0002),
+                nikon1Id, makerTags, unsignedShort, -1, print0x0002),
         TagInfo(0x0003, "ColorMode", N_("Color Mode"),
                 N_("Color mode"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0004, "Quality", N_("Quality"),
                 N_("Image quality setting"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0005, "WhiteBalance", N_("White Balance"),
                 N_("White balance"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0006, "Sharpening", N_("Sharpening"),
                 N_("Image sharpening setting"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0007, "Focus", N_("Focus"),
                 N_("Focus mode"),
-                nikon1IfdId, makerTags, asciiString, print0x0007),
+                nikon1Id, makerTags, asciiString, -1, print0x0007),
         TagInfo(0x0008, "FlashSetting", N_("Flash Setting"),
                 N_("Flash setting"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x000a, "0x000a", "0x000a",
                 N_("Unknown"),
-                nikon1IfdId, makerTags, unsignedRational, printValue),
+                nikon1Id, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x000f, "ISOSelection", N_("ISO Selection"),
                 N_("ISO selection"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0010, "DataDump", N_("Data Dump"),
                 N_("Data dump"),
-                nikon1IfdId, makerTags, undefined, printValue),
+                nikon1Id, makerTags, undefined, -1, printValue),
         TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"),
                 N_("Image adjustment setting"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"),
                 N_("Auxiliary lens (adapter)"),
-                nikon1IfdId, makerTags, asciiString, printValue),
+                nikon1Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0085, "FocusDistance", N_("Focus Distance"),
                 N_("Manual focus distance"),
-                nikon1IfdId, makerTags, unsignedRational, print0x0085),
+                nikon1Id, makerTags, unsignedRational, -1, print0x0085),
         TagInfo(0x0086, "DigitalZoom", N_("Digital Zoom"),
                 N_("Digital zoom setting"),
-                nikon1IfdId, makerTags, unsignedRational, print0x0086),
+                nikon1Id, makerTags, unsignedRational, -1, print0x0086),
         TagInfo(0x0088, "AFFocusPos", N_("AF Focus Position"),
                 N_("AF focus position information"),
-                nikon1IfdId, makerTags, undefined, print0x0088),
-
+                nikon1Id, makerTags, undefined, -1, print0x0088),
         // End of list marker
         TagInfo(0xffff, "(UnknownNikon1MnTag)", "(UnknownNikon1MnTag)",
                 N_("Unknown Nikon1MakerNote tag"),
-                nikon1IfdId, makerTags, invalidTypeId, printValue)
+                nikon1Id, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* Nikon1MakerNote::tagList()
@@ -278,7 +289,8 @@
         std::string focus = value.toString();
         if      (focus == "AF-C  ") os << _("Continuous autofocus");
         else if (focus == "AF-S  ") os << _("Single autofocus");
-        else                        os << "(" << value << ")";
+        else if (focus == "AF-A  ") os << _("Automatic");
+        else                      os << "(" << value << ")";
         return os;
     }
 
@@ -443,41 +455,41 @@
     const TagInfo Nikon2MakerNote::tagInfo_[] = {
         TagInfo(0x0002, "0x0002", "0x0002",
                 N_("Unknown"),
-                nikon2IfdId, makerTags, asciiString, printValue),
+                nikon2Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0003, "Quality", N_("Quality"),
                 N_("Image quality setting"),
-                nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2Quality)),
+                nikon2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2Quality)),
         TagInfo(0x0004, "ColorMode", N_("Color Mode"),
                 N_("Color mode"),
-                nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2ColorMode)),
+                nikon2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2ColorMode)),
         TagInfo(0x0005, "ImageAdjustment", N_("Image Adjustment"),
                 N_("Image adjustment setting"),
-                nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2ImageAdjustment)),
+                nikon2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2ImageAdjustment)),
         TagInfo(0x0006, "ISOSpeed", N_("ISO Speed"),
                 N_("ISO speed setting"),
-                nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2IsoSpeed)),
+                nikon2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2IsoSpeed)),
         TagInfo(0x0007, "WhiteBalance", N_("White Balance"),
                 N_("White balance"),
-                nikon2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikon2WhiteBalance)),
+                nikon2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikon2WhiteBalance)),
         TagInfo(0x0008, "Focus", N_("Focus Mode"),
                 N_("Focus mode"),
-                nikon2IfdId, makerTags, unsignedRational, printValue),
+                nikon2Id, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x0009, "0x0009", "0x0009",
                 N_("Unknown"),
-                nikon2IfdId, makerTags, asciiString, printValue),
+                nikon2Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x000a, "DigitalZoom", N_("Digital Zoom"),
                 N_("Digital zoom setting"),
-                nikon2IfdId, makerTags, unsignedRational, print0x000a),
+                nikon2Id, makerTags, unsignedRational, -1, print0x000a),
         TagInfo(0x000b, "AuxiliaryLens", N_("Auxiliary Lens"),
                 N_("Auxiliary lens (adapter)"),
-                nikon2IfdId, makerTags, unsignedShort, printValue),
+                nikon2Id, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0f00, "0x0f00", "0x0f00",
                 N_("Unknown"),
-                nikon2IfdId, makerTags, unsignedLong, printValue),
+                nikon2Id, makerTags, unsignedLong, -1, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownNikon2MnTag)", "(UnknownNikon2MnTag)",
                 N_("Unknown Nikon2MakerNote tag"),
-                nikon2IfdId, makerTags, invalidTypeId, printValue)
+                nikon2Id, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* Nikon2MakerNote::tagList()
@@ -509,98 +521,99 @@
 
     // Nikon3 MakerNote Tag Info
     const TagInfo Nikon3MakerNote::tagInfo_[] = {
-        TagInfo(0x0001, "Version", N_("Version"), N_("Nikon Makernote version"), nikon3IfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0002, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), nikon3IfdId, makerTags, unsignedShort, print0x0002),
-        TagInfo(0x0003, "ColorMode", N_("Color Mode"), N_("Color mode"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0004, "Quality", N_("Quality"), N_("Image quality setting"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0005, "WhiteBalance", N_("White Balance"), N_("White balance"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0006, "Sharpening", N_("Sharpening"), N_("Image sharpening setting"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0007, "Focus", N_("Focus"), N_("Focus mode"), nikon3IfdId, makerTags, asciiString, print0x0007),
-        TagInfo(0x0008, "FlashSetting", N_("Flash Setting"), N_("Flash setting"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0009, "FlashDevice", N_("Flash Device"), N_("Flash device"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), nikon3IfdId, makerTags, unsignedRational, printValue),
-        TagInfo(0x000b, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance bias"), nikon3IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x000c, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), nikon3IfdId, makerTags, unsignedRational, printValue),
-        TagInfo(0x000d, "ProgramShift", N_("Program Shift"), N_("Program shift"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x000e, "ExposureDiff", N_("Exposure Difference"), N_("Exposure difference"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x000f, "ISOSelection", N_("ISO Selection"), N_("ISO selection"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0010, "DataDump", N_("Data Dump"), N_("Data dump"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0011, "Preview", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0012, "FlashComp", N_("Flash Comp"), N_("Flash compensation setting"), nikon3IfdId, makerTags, undefined, EXV_PRINT_TAG(nikonFlashComp)),
-        TagInfo(0x0013, "ISOSettings", N_("ISO Settings"), N_("ISO setting"), nikon3IfdId, makerTags, unsignedShort, print0x0002), // use 0x0002 print fct
-        TagInfo(0x0016, "ImageBoundary", N_("Image Boundary"), N_("Image boundary"), nikon3IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0017, "0x0017", "0x0017", N_("Unknown"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0018, "FlashBracketComp", N_("Flash Bracket Comp"), N_("Flash bracket compensation applied"), nikon3IfdId, makerTags, undefined, EXV_PRINT_TAG(nikonFlashComp)), // use 0x0012 print fct
-        TagInfo(0x0019, "ExposureBracketComp", N_("Exposure Bracket Comp"), N_("AE bracket compensation applied"), nikon3IfdId, makerTags, signedRational, printValue),
-        TagInfo(0x001a, "ImageProcessing", N_("Image Processing"), N_("Image processing"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x001b, "CropHiSpeed", N_("Crop High Speed"), N_("Crop high speed"), nikon3IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x001d, "SerialNumber", N_("Serial Number"), N_("Serial Number"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x001e, "ColorSpace", N_("Color Space"), N_("Color space"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonColorSpace)),
-        TagInfo(0x001f, "VRInfo", N_("VR Info"), N_("VR info"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0020, "ImageAuthentication", N_("Image Authentication"), N_("Image authentication"), nikon3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn)),
-        TagInfo(0x0022, "ActiveDLighting", N_("ActiveD-Lighting"), N_("ActiveD-lighting"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonOlnh)),
-        TagInfo(0x0023, "PictureControl", N_("Picture Control"), N_(" Picture control"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0024, "WorldTime", N_("World Time"), N_("World time"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0025, "ISOInfo", N_("ISO Info"), N_("ISO info"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x002a, "VignetteControl", N_("Vignette Control"), N_("Vignette control"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonOlnh)),
-        TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0081, "ToneComp", N_("Tone Compensation"), N_("Tone compensation"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0083, "LensType", N_("Lens Type"), N_("Lens type"), nikon3IfdId, makerTags, unsignedByte, print0x0083),
-        TagInfo(0x0084, "Lens", N_("Lens"), N_("Lens"), nikon3IfdId, makerTags, unsignedRational, print0x0084),
-        TagInfo(0x0085, "FocusDistance", N_("Focus Distance"), N_("Manual focus distance"), nikon3IfdId, makerTags, unsignedRational, print0x0085),
-        TagInfo(0x0086, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom setting"), nikon3IfdId, makerTags, unsignedRational, print0x0086),
-        TagInfo(0x0087, "FlashMode", N_("Flash Mode"), N_("Mode of flash used"), nikon3IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFlashMode)),
-        TagInfo(0x0088, "AFInfo", N_("AF Info"), N_("AF info"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0089, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), nikon3IfdId, makerTags, unsignedShort, print0x0089),
-        TagInfo(0x008a, "AutoBracketRelease", N_("Auto Bracket Release"), N_("Auto bracket release"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonAutoBracketRelease)),
-        TagInfo(0x008b, "LensFStops", N_("Lens FStops"), N_("Lens FStops"), nikon3IfdId, makerTags, undefined, print0x008b),
-        TagInfo(0x008c, "ContrastCurve", N_("Contrast Curve"), N_("Contrast curve"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x008d, "ColorHue", N_("Color Hue"), N_("Color hue"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x008f, "SceneMode", N_("Scene Mode"), N_("Scene mode"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0090, "LightSource", N_("Light Source"), N_("Light source"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0091, "ShotInfo", "Shot Info", N_("Shot info"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0092, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikon3IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0093, "NEFCompression", N_("NEF Compression"), N_("NEF compression"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonNefCompression)),
-        TagInfo(0x0094, "Saturation", N_("Saturation"), N_("Saturation"), nikon3IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0095, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0096, "LinearizationTable", N_("Linearization Table"), N_("Linearization table"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0097, "ColorBalance", N_("Color Balance"), N_("Color balance"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0098, "LensData", N_("Lens Data"), N_("Lens data settings"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0099, "RawImageCenter", N_("Raw Image Center"), N_("Raw image center"), nikon3IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x009a, "SensorPixelSize", N_("Sensor Pixel Size"), N_("Sensor pixel size"), nikon3IfdId, makerTags, unsignedRational, print0x009a),
-        TagInfo(0x009b, "0x009b", "0x009b", N_("Unknown"), nikon3IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x009c, "SceneAssist", N_("Scene Assist"), N_("Scene assist"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x009e, "RetouchHistory", N_("Retouch History"), N_("Retouch history"), nikon3IfdId, makerTags, unsignedShort, print0x009e),
-        TagInfo(0x009f, "0x009f", "0x009f", N_("Unknown"), nikon3IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x00a0, "SerialNO", N_("Serial NO"), N_("Camera serial number, usually starts with \"NO= \""), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x00a2, "ImageDataSize", N_("Image Data Size"), N_("Image data size"), nikon3IfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x00a3, "0x00a3", "0x00a3", N_("Unknown"), nikon3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(0x00a5, "ImageCount", N_("Image Count"), N_("Image count"), nikon3IfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x00a6, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikon3IfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x00a7, "ShutterCount", N_("Shutter Count"), N_("Number of shots taken by camera"), nikon3IfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x00a8, "FlashInfo", "Flash Info", N_("Flash info"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x00a9, "ImageOptimization", N_("Image Optimization"), N_("Image optimization"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x00aa, "Saturation", N_("Saturation"), N_("Saturation"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x00ab, "VariProgram", N_("Program Variation"), N_("Program variation"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x00ac, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x00ad, "AFResponse", N_("AF Response"), N_("AF response"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x00b0, "MultiExposure", "Multi Exposure", N_("Multi exposure"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x00b1, "HighISONoiseReduction", N_("High ISO Noise Reduction"), N_("High ISO Noise Reduction"), nikon3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonHighISONoiseReduction)),
-        TagInfo(0x00b3, "ToningEffect", "Toning Effect", N_("Toning effect"), nikon3IfdId, makerTags, asciiString, printValue),
-        TagInfo(0x00b7, "AFInfo2", "AF Info 2", N_("AF info 2"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x00b8, "FileInfo", "File Info", N_("File info"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), nikon3IfdId, makerTags, undefined, printValue),
+        TagInfo(0x0001, "Version", N_("Version"), N_("Nikon Makernote version"), nikon3Id, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0002, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), nikon3Id, makerTags, unsignedShort, -1, print0x0002),
+        TagInfo(0x0003, "ColorMode", N_("Color Mode"), N_("Color mode"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0004, "Quality", N_("Quality"), N_("Image quality setting"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0005, "WhiteBalance", N_("White Balance"), N_("White balance"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0006, "Sharpening", N_("Sharpening"), N_("Image sharpening setting"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0007, "Focus", N_("Focus"), N_("Focus mode"), nikon3Id, makerTags, asciiString, -1, print0x0007),
+        TagInfo(0x0008, "FlashSetting", N_("Flash Setting"), N_("Flash setting"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0009, "FlashDevice", N_("Flash Device"), N_("Flash device"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x000a, "0x000a", "0x000a", N_("Unknown"), nikon3Id, makerTags, unsignedRational, -1, printValue),
+        TagInfo(0x000b, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance bias"), nikon3Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x000c, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), nikon3Id, makerTags, unsignedRational, -1, printValue),
+        TagInfo(0x000d, "ProgramShift", N_("Program Shift"), N_("Program shift"), nikon3Id, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)),
+        TagInfo(0x000e, "ExposureDiff", N_("Exposure Difference"), N_("Exposure difference"), nikon3Id, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)),
+        TagInfo(0x000f, "ISOSelection", N_("ISO Selection"), N_("ISO selection"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0010, "DataDump", N_("Data Dump"), N_("Data dump"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0011, "Preview", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0012, "FlashComp", N_("Flash Comp"), N_("Flash compensation setting"), nikon3Id, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)),
+        TagInfo(0x0013, "ISOSettings", N_("ISO Settings"), N_("ISO setting"), nikon3Id, makerTags, unsignedShort, -1, print0x0002), // use 0x0002 print fct
+        TagInfo(0x0016, "ImageBoundary", N_("Image Boundary"), N_("Image boundary"), nikon3Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0017, "FlashExposureComp", "Flash Exposure Comp", N_("Flash exposure comp"), nikon3Id, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)),
+        TagInfo(0x0018, "FlashBracketComp", N_("Flash Bracket Comp"), N_("Flash bracket compensation applied"), nikon3Id, makerTags, undefined, -1, EXV_PRINT_TAG(nikonFlashComp)), // use 0x0012 print fct
+        TagInfo(0x0019, "ExposureBracketComp", N_("Exposure Bracket Comp"), N_("AE bracket compensation applied"), nikon3Id, makerTags, signedRational, -1, printValue),
+        TagInfo(0x001a, "ImageProcessing", N_("Image Processing"), N_("Image processing"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x001b, "CropHiSpeed", N_("Crop High Speed"), N_("Crop high speed"), nikon3Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x001c, "ExposureTuning", N_("Exposure Tuning"), N_("Exposure tuning"), nikon3Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x001d, "SerialNumber", N_("Serial Number"), N_("Serial Number"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x001e, "ColorSpace", N_("Color Space"), N_("Color space"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonColorSpace)),
+        TagInfo(0x001f, "VRInfo", N_("VR Info"), N_("VR info"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0020, "ImageAuthentication", N_("Image Authentication"), N_("Image authentication"), nikon3Id, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOffOn)),
+        TagInfo(0x0022, "ActiveDLighting", N_("ActiveD-Lighting"), N_("ActiveD-lighting"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonActiveDLighning)),
+        TagInfo(0x0023, "PictureControl", N_("Picture Control"), N_(" Picture control"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0024, "WorldTime", N_("World Time"), N_("World time"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0025, "ISOInfo", N_("ISO Info"), N_("ISO info"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x002a, "VignetteControl", N_("Vignette Control"), N_("Vignette control"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonOlnh)),
+        TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0081, "ToneComp", N_("Tone Compensation"), N_("Tone compensation"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0083, "LensType", N_("Lens Type"), N_("Lens type"), nikon3Id, makerTags, unsignedByte, -1, print0x0083),
+        TagInfo(0x0084, "Lens", N_("Lens"), N_("Lens"), nikon3Id, makerTags, unsignedRational, -1, print0x0084),
+        TagInfo(0x0085, "FocusDistance", N_("Focus Distance"), N_("Manual focus distance"), nikon3Id, makerTags, unsignedRational, -1, print0x0085),
+        TagInfo(0x0086, "DigitalZoom", N_("Digital Zoom"), N_("Digital zoom setting"), nikon3Id, makerTags, unsignedRational, -1, print0x0086),
+        TagInfo(0x0087, "FlashMode", N_("Flash Mode"), N_("Mode of flash used"), nikon3Id, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonFlashMode)),
+        TagInfo(0x0088, "AFInfo", N_("AF Info"), N_("AF info"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0089, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), nikon3Id, makerTags, unsignedShort, -1, print0x0089),
+        TagInfo(0x008a, "AutoBracketRelease", N_("Auto Bracket Release"), N_("Auto bracket release"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonAutoBracketRelease)),
+        TagInfo(0x008b, "LensFStops", N_("Lens FStops"), N_("Lens FStops"), nikon3Id, makerTags, undefined, -1, print0x008b),
+        TagInfo(0x008c, "ContrastCurve", N_("Contrast Curve"), N_("Contrast curve"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x008d, "ColorHue", N_("Color Hue"), N_("Color hue"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x008f, "SceneMode", N_("Scene Mode"), N_("Scene mode"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0090, "LightSource", N_("Light Source"), N_("Light source"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0091, "ShotInfo", "Shot Info", N_("Shot info"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0092, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikon3Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0093, "NEFCompression", N_("NEF Compression"), N_("NEF compression"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonNefCompression)),
+        TagInfo(0x0094, "Saturation", N_("Saturation"), N_("Saturation"), nikon3Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0095, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0096, "LinearizationTable", N_("Linearization Table"), N_("Linearization table"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0097, "ColorBalance", N_("Color Balance"), N_("Color balance"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0098, "LensData", N_("Lens Data"), N_("Lens data settings"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0099, "RawImageCenter", N_("Raw Image Center"), N_("Raw image center"), nikon3Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x009a, "SensorPixelSize", N_("Sensor Pixel Size"), N_("Sensor pixel size"), nikon3Id, makerTags, unsignedRational, -1, print0x009a),
+        TagInfo(0x009b, "0x009b", "0x009b", N_("Unknown"), nikon3Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x009c, "SceneAssist", N_("Scene Assist"), N_("Scene assist"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x009e, "RetouchHistory", N_("Retouch History"), N_("Retouch history"), nikon3Id, makerTags, unsignedShort, -1, print0x009e),
+        TagInfo(0x009f, "0x009f", "0x009f", N_("Unknown"), nikon3Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x00a0, "SerialNO", N_("Serial NO"), N_("Camera serial number, usually starts with \"NO= \""), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x00a2, "ImageDataSize", N_("Image Data Size"), N_("Image data size"), nikon3Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x00a3, "0x00a3", "0x00a3", N_("Unknown"), nikon3Id, makerTags, unsignedByte, -1, printValue),
+        TagInfo(0x00a5, "ImageCount", N_("Image Count"), N_("Image count"), nikon3Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x00a6, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikon3Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x00a7, "ShutterCount", N_("Shutter Count"), N_("Number of shots taken by camera"), nikon3Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x00a8, "FlashInfo", "Flash Info", N_("Flash info"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x00a9, "ImageOptimization", N_("Image Optimization"), N_("Image optimization"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x00aa, "Saturation", N_("Saturation"), N_("Saturation"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x00ab, "VariProgram", N_("Program Variation"), N_("Program variation"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x00ac, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x00ad, "AFResponse", N_("AF Response"), N_("AF response"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x00b0, "MultiExposure", "Multi Exposure", N_("Multi exposure"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x00b1, "HighISONoiseReduction", N_("High ISO Noise Reduction"), N_("High ISO Noise Reduction"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonHighISONoiseReduction)),
+        TagInfo(0x00b3, "ToningEffect", "Toning Effect", N_("Toning effect"), nikon3Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x00b7, "AFInfo2", "AF Info 2", N_("AF info 2"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x00b8, "FileInfo", "File Info", N_("File info"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), nikon3Id, makerTags, undefined, -1, printValue),
         // TODO: Add Capture Data decoding implementation.
-        TagInfo(0x0e01, "CaptureData", N_("Capture Data"), N_("Capture data"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0e09, "CaptureVersion", N_("Capture Version"), N_("Capture version"), nikon3IfdId, makerTags, asciiString, printValue),
+        TagInfo(0x0e01, "CaptureData", N_("Capture Data"), N_("Capture data"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0e09, "CaptureVersion", N_("Capture Version"), N_("Capture version"), nikon3Id, makerTags, asciiString, -1, printValue),
         // TODO: Add Capture Offsets decoding implementation.
-        TagInfo(0x0e0e, "CaptureOffsets", N_("Capture Offsets"), N_("Capture offsets"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0e10, "ScanIFD", "Scan IFD", N_("Scan IFD"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0e1d, "ICCProfile", "ICC Profile", N_("ICC profile"), nikon3IfdId, makerTags, undefined, printValue),
-        TagInfo(0x0e1e, "CaptureOutput", "Capture Output", N_("Capture output"), nikon3IfdId, makerTags, undefined, printValue),
+        TagInfo(0x0e0e, "CaptureOffsets", N_("Capture Offsets"), N_("Capture offsets"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0e10, "ScanIFD", "Scan IFD", N_("Scan IFD"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0e1d, "ICCProfile", "ICC Profile", N_("ICC profile"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0e1e, "CaptureOutput", "Capture Output", N_("Capture output"), nikon3Id, makerTags, undefined, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikon3MnTag)", "(UnknownNikon3MnTag)", N_("Unknown Nikon3MakerNote tag"), nikon3IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikon3MnTag)", "(UnknownNikon3MnTag)", N_("Unknown Nikon3MakerNote tag"), nikon3Id, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagList()
@@ -629,10 +642,10 @@
 
     // Nikon3 Vibration Reduction Tag Info
     const TagInfo Nikon3MakerNote::tagInfoVr_[] = {
-        TagInfo(0, "Version", N_("Version"), N_("Version"), nikonVrIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(4, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonVrIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOnOff)),
+        TagInfo(0, "Version", N_("Version"), N_("Version"), nikonVrId, makerTags, undefined, 4, printExifVersion),
+        TagInfo(4, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonVrId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonOnOff)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonVrTag)", "(UnknownNikonVrTag)", N_("Unknown Nikon Vibration Reduction Tag"), nikonVrIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonVrTag)", "(UnknownNikonVrTag)", N_("Unknown Nikon Vibration Reduction Tag"), nikonVrId, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListVr()
@@ -674,21 +687,21 @@
 
     // Nikon3 Picture Control Tag Info
     const TagInfo Nikon3MakerNote::tagInfoPc_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonPcIfdId, makerTags, undefined, printExifVersion),
-        TagInfo( 4, "Name", N_("Name"), N_("Name"), nikonPcIfdId, makerTags, asciiString, printValue),
-        TagInfo(24, "Base", N_("Base"), N_("Base"), nikonPcIfdId, makerTags, asciiString, printValue),
-        TagInfo(48, "Adjust", N_("Adjust"), N_("Adjust"), nikonPcIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonAdjust)),
-        TagInfo(49, "QuickAdjust", N_("Quick Adjust"), N_("Quick adjust"), nikonPcIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(50, "Sharpness", N_("Sharpness"), N_("Sharpness"), nikonPcIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(51, "Contrast", N_("Contrast"), N_("Contrast"), nikonPcIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(52, "Brightness", N_("Brightness"), N_("Brightness"), nikonPcIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(53, "Saturation", N_("Saturation"), N_("Saturation"), nikonPcIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(54, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikonPcIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(55, "FilterEffect", N_("Filter Effect"), N_("Filter effect"), nikonPcIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonFilterEffect)),
-        TagInfo(56, "ToningEffect", N_("Toning Effect"), N_("Toning effect"), nikonPcIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonToningEffect)),
-        TagInfo(57, "ToningSaturation", N_("Toning Saturation"), N_("Toning saturation"), nikonPcIfdId, makerTags, unsignedByte, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonPcId, makerTags, undefined, 4, printExifVersion),
+        TagInfo( 4, "Name", N_("Name"), N_("Name"), nikonPcId, makerTags, asciiString, 20, printValue),
+        TagInfo(24, "Base", N_("Base"), N_("Base"), nikonPcId, makerTags, asciiString, 20, printValue),
+        TagInfo(48, "Adjust", N_("Adjust"), N_("Adjust"), nikonPcId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonAdjust)),
+        TagInfo(49, "QuickAdjust", N_("Quick Adjust"), N_("Quick adjust"), nikonPcId, makerTags, unsignedByte, 1, printPictureControl),
+        TagInfo(50, "Sharpness", N_("Sharpness"), N_("Sharpness"), nikonPcId, makerTags, unsignedByte, 1, printPictureControl),
+        TagInfo(51, "Contrast", N_("Contrast"), N_("Contrast"), nikonPcId, makerTags, unsignedByte, 1, printPictureControl),
+        TagInfo(52, "Brightness", N_("Brightness"), N_("Brightness"), nikonPcId, makerTags, unsignedByte, 1, printPictureControl),
+        TagInfo(53, "Saturation", N_("Saturation"), N_("Saturation"), nikonPcId, makerTags, unsignedByte, 1, printPictureControl),
+        TagInfo(54, "HueAdjustment", N_("Hue Adjustment"), N_("Hue adjustment"), nikonPcId, makerTags, unsignedByte, 1, printPictureControl),
+        TagInfo(55, "FilterEffect", N_("Filter Effect"), N_("Filter effect"), nikonPcId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFilterEffect)),
+        TagInfo(56, "ToningEffect", N_("Toning Effect"), N_("Toning effect"), nikonPcId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonToningEffect)),
+        TagInfo(57, "ToningSaturation", N_("Toning Saturation"), N_("Toning saturation"), nikonPcId, makerTags, unsignedByte, 1, printPictureControl),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonPcTag)", "(UnknownNikonPcTag)", N_("Unknown Nikon Picture Control Tag"), nikonPcIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonPcTag)", "(UnknownNikonPcTag)", N_("Unknown Nikon Picture Control Tag"), nikonPcId, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListPc()
@@ -698,11 +711,11 @@
 
     // Nikon3 World Time Tag Info
     const TagInfo Nikon3MakerNote::tagInfoWt_[] = {
-        TagInfo(0, "Timezone", N_("Timezone"), N_("Timezone"), nikonWtIfdId, makerTags, signedShort, printValue),
-        TagInfo(2, "DaylightSavings", N_("Daylight Savings"), N_("Daylight savings"), nikonWtIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonYesNo)),
-        TagInfo(3, "DateDisplayFormat", N_("Date Display Format"), N_("Date display format"), nikonWtIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonDateDisplayFormat)),
+        TagInfo(0, "Timezone", N_("Timezone"), N_("Timezone"), nikonWtId, makerTags, signedShort, 1, printTimeZone),
+        TagInfo(2, "DaylightSavings", N_("Daylight Savings"), N_("Daylight savings"), nikonWtId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonYesNo)),
+        TagInfo(3, "DateDisplayFormat", N_("Date Display Format"), N_("Date display format"), nikonWtId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonDateDisplayFormat)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonWtTag)", "(UnknownNikonWtTag)", N_("Unknown Nikon World Time Tag"), nikonWtIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonWtTag)", "(UnknownNikonWtTag)", N_("Unknown Nikon World Time Tag"), nikonWtId, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListWt()
@@ -729,12 +742,12 @@
 
     // Nikon3 ISO Info Tag Info
     const TagInfo Nikon3MakerNote::tagInfoIi_[] = {
-        TagInfo( 0, "ISO", N_("ISO"), N_("ISO"), nikonIiIfdId, makerTags, unsignedByte, printIiIso),
-        TagInfo( 4, "ISOExpansion", N_("ISO Expansion"), N_("ISO expansion"), nikonIiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonIsoExpansion)),
-        TagInfo( 6, "ISO2", N_("ISO 2"), N_("ISO 2"), nikonIiIfdId, makerTags, unsignedByte, printIiIso),
-        TagInfo(10, "ISOExpansion2", N_("ISO Expansion 2"), N_("ISO expansion 2"), nikonIiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonIsoExpansion)),
+        TagInfo( 0, "ISO", N_("ISO"), N_("ISO"), nikonIiId, makerTags, unsignedByte, 1, printIiIso),
+        TagInfo( 4, "ISOExpansion", N_("ISO Expansion"), N_("ISO expansion"), nikonIiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(nikonIsoExpansion)),
+        TagInfo( 6, "ISO2", N_("ISO 2"), N_("ISO 2"), nikonIiId, makerTags, unsignedByte, 1, printIiIso),
+        TagInfo(10, "ISOExpansion2", N_("ISO Expansion 2"), N_("ISO expansion 2"), nikonIiId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(nikonIsoExpansion)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonIiTag)", "(UnknownNikonIiTag)", N_("Unknown Nikon Iso Info Tag"), nikonIiIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonIiTag)", "(UnknownNikonIiTag)", N_("Unknown Nikon Iso Info Tag"), nikonIiId, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListIi()
@@ -784,11 +797,11 @@
 
     // Nikon3 Auto Focus Tag Info
     const TagInfo Nikon3MakerNote::tagInfoAf_[] = {
-        TagInfo( 0, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), nikonAfIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonAfAreaMode)),
-        TagInfo( 1, "AFPoint", N_("AF Point"), N_("AF point"), nikonAfIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonAfPoint)),
-        TagInfo( 2, "AFPointsInFocus", N_("AF Points In Focus"), N_("AF points in focus"), nikonAfIfdId, makerTags, unsignedShort, printAfPointsInFocus),
+        TagInfo( 0, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), nikonAfId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonAfAreaMode)),
+        TagInfo( 1, "AFPoint", N_("AF Point"), N_("AF point"), nikonAfId, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonAfPoint)),
+        TagInfo( 2, "AFPointsInFocus", N_("AF Points In Focus"), N_("AF points in focus"), nikonAfId, makerTags, unsignedShort, 1, printAfPointsInFocus),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonAfTag)", "(UnknownNikonAfTag)", N_("Unknown Nikon Auto Focus Tag"), nikonAfIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonAfTag)", "(UnknownNikonAfTag)", N_("Unknown Nikon Auto Focus Tag"), nikonAfId, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListAf()
@@ -796,12 +809,239 @@
         return tagInfoAf_;
     }
 
+    //! PhaseDetectAF
+    extern const TagDetails nikonPhaseDetectAF[] = {
+        { 0, N_("Off")           },
+        { 1, N_("On (51-point)") },
+        { 2, N_("On (11-point)") }
+    };
+
+    // Nikon3 Auto Focus Tag Info
+    const TagInfo Nikon3MakerNote::tagInfoAf2_[] = {
+        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonAf2Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo(  4, "ContrastDetectAF", N_("Contrast Detect AF"), N_("Contrast detect AF"), nikonAf2Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonOffOn)),
+        TagInfo(  5, "AFAreaMode", N_("AF Area Mode"), N_("AF area mode"), nikonAf2Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo(  6, "PhaseDetectAF", N_("Phase Detect AF"), N_("Phase detect AF"), nikonAf2Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonPhaseDetectAF)),
+        TagInfo(  7, "PrimaryAFPoint", N_("Primary AF Point"), N_("Primary AF point"), nikonAf2Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo(  8, "AFPointsUsed", N_("AF Points Used"), N_("AF points used"), nikonAf2Id, makerTags, unsignedByte, 7, printValue),
+        TagInfo( 16, "AFImageWidth", N_("AF Image Width"), N_("AF image width"), nikonAf2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo( 18, "AFImageHeight", N_("AF Image Height"), N_("AF image height"), nikonAf2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo( 20, "AFAreaXPosition", N_("AF Area X Position"), N_("AF area x position"), nikonAf2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo( 22, "AFAreaYPosition", N_("AF Area Y Position"), N_("AF area y position"), nikonAf2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo( 24, "AFAreaWidth", N_("AF Area Width"), N_("AF area width"), nikonAf2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo( 26, "AFAreaHeight", N_("AF Area Height"), N_("AF area height"), nikonAf2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo( 28, "ContrastDetectAFInFocus", N_("Contrast Detect AF In Focus"), N_("Contrast detect AF in focus"), nikonAf2Id, makerTags, unsignedShort, 1, printValue),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownNikonAf2Tag)", "(UnknownNikonAf2Tag)", N_("Unknown Nikon Auto Focus 2 Tag"), nikonAf2Id, makerTags, unsignedByte, 1, printValue)
+    };
+
+    const TagInfo* Nikon3MakerNote::tagListAf2()
+    {
+        return tagInfoAf2_;
+    }
+
+    // Nikon3 File Info Tag Info
+    const TagInfo Nikon3MakerNote::tagInfoFi_[] = {
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonFiId, makerTags, undefined, 4, printExifVersion),
+        TagInfo( 6, "DirectoryNumber", N_("Directory Number"), N_("Directory number"), nikonFiId, makerTags, unsignedShort, 1, printValue),
+        TagInfo( 8, "FileNumber", N_("File Number"), N_("File number"), nikonFiId, makerTags, unsignedShort, 1, printValue),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownNikonFiTag)", "(UnknownNikonFiTag)", N_("Unknown Nikon File Info Tag"), nikonFiId, makerTags, unsignedByte, 1, printValue)
+    };
+
+    const TagInfo* Nikon3MakerNote::tagListFi()
+    {
+        return tagInfoFi_;
+    }
+
+    //! MultiExposureMode
+    extern const TagDetails nikonMultiExposureMode[] = {
+        { 0, N_("Off")               },
+        { 1, N_("Multiple Exposure") },
+        { 2, N_("Image Overlay")     }
+    };
+
+    // Nikon3 Multi Exposure Tag Info
+    const TagInfo Nikon3MakerNote::tagInfoMe_[] = {
+        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonMeId, makerTags, undefined, 4, printExifVersion),
+        TagInfo(  4, "MultiExposureMode", N_("Multi Exposure Mode"), N_("Multi exposure mode"), nikonMeId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(nikonMultiExposureMode)),
+        TagInfo(  8, "MultiExposureShots", N_("Multi Exposure Shots"), N_("Multi exposure shots"), nikonMeId, makerTags, unsignedLong, 1, printValue),
+        TagInfo( 12, "MultiExposureAutoGain", N_("Multi Exposure Auto Gain"), N_("Multi exposure auto gain"), nikonMeId, makerTags, unsignedLong, 1, EXV_PRINT_TAG(nikonOffOn)),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonMeId, makerTags, unsignedByte, 1, printValue)
+    };
+
+    const TagInfo* Nikon3MakerNote::tagListMe()
+    {
+        return tagInfoMe_;
+    }
+
+    //! FlashSource
+    extern const TagDetails nikonFlashSource[] = {
+        { 0, N_("None")     },
+        { 1, N_("External") },
+        { 2, N_("Internal") }
+    };
+
+    //! FlashFirmware
+    extern const TagDetails nikonFlashFirmware[] = {
+        { 0x0000, N_("n/a")                            },
+        { 0x0101, N_("1.01 (SB-800 or Metz 58 AF-1)")  },
+        { 0x0103, N_("1.03 (SB-800)")                  },
+        { 0x0201, N_("2.01 (SB-800)")                  },
+        { 0x0204, N_("2.04 (SB-600)")                  },
+        { 0x0205, N_("2.05 (SB-600)")                  },
+        { 0x0301, N_("3.01 (SU-800 Remote Commander)") },
+        { 0x0401, N_("4.01 (SB-400)")                  },
+        { 0x0402, N_("4.02 (SB-400)")                  },
+        { 0x0404, N_("4.04 (SB-400)")                  },
+        { 0x0501, N_("5.01 (SB-900)")                  },
+        { 0x0502, N_("5.02 (SB-900)")                  }
+    };
+
+    //! FlashGNDistance
+    extern const TagDetails nikonFlashGNDistance[] = {
+        {   0, N_("None")  },
+        {   1, N_("0.1 m") },
+        {   2, N_("0.2 m") },
+        {   3, N_("0.3 m") },
+        {   4, N_("0.4 m") },
+        {   5, N_("0.5 m") },
+        {   6, N_("0.6 m") },
+        {   7, N_("0.7 m") },
+        {   8, N_("0.8 m") },
+        {   9, N_("0.9 m") },
+        {  10, N_("1.0 m") },
+        {  11, N_("1.1 m") },
+        {  12, N_("1.3 m") },
+        {  13, N_("1.4 m") },
+        {  14, N_("1.6 m") },
+        {  15, N_("1.8 m") },
+        {  16, N_("2.0 m") },
+        {  17, N_("2.2 m") },
+        {  18, N_("2.5 m") },
+        {  19, N_("2.8 m") },
+        {  20, N_("3.2 m") },
+        {  21, N_("3.6 m") },
+        {  22, N_("4.0 m") },
+        {  23, N_("4.5 m") },
+        {  24, N_("5.0 m") },
+        {  25, N_("5.6 m") },
+        {  26, N_("6.3 m") },
+        {  27, N_("7.1 m") },
+        {  28, N_("8.0 m") },
+        {  29, N_("9.0 m") },
+        {  30, N_("10.0 m") },
+        {  31, N_("11.0 m") },
+        {  32, N_("13.0 m") },
+        {  33, N_("14.0 m") },
+        {  34, N_("16.0 m") },
+        {  35, N_("18.0 m") },
+        {  36, N_("20.0 m") },
+        { 255, N_("n/a") }
+    };
+
+    //! FlashControlMode
+    extern const TagDetails nikonFlashControlMode[] = {
+        { 0, N_("Off")                    },
+        { 1, N_("iTTL-BL")                },
+        { 2, N_("iTTL")                   },
+        { 3, N_("Auto Aperture")          },
+        { 4, N_("Automatic")              },
+        { 5, N_("GN (distance priority)") },
+        { 6, N_("Manual")                 },
+        { 7, N_("Repeating Flash")        },
+        { 7, N_("Repeating Flash")        }     // To silence compiler warning
+    };
+
+    //! ExternalFlashFlags
+    extern const TagDetails nikonExternalFlashFlags[] = {
+        { 0, N_("Fired")              },
+        { 2, N_("Bounce Flash")       },
+        { 4, N_("Wide Flash Adapter") }
+    };
+
+    //! FlashColorFilter
+    extern const TagDetails nikonFlashColorFilter[] = {
+        {  0, N_("None")   },
+        {  1, N_("FL-GL1") },
+        {  2, N_("FL-GL2") },
+        {  9, N_("TN-A1")  },
+        { 10, N_("TN-A2")  },
+        { 65, N_("Red")    },
+        { 66, N_("Blue")   },
+        { 67, N_("Yellow") },
+        { 68, N_("Amber")  }
+    };
+
+    // Nikon3 Flash Info 1 Tag Info
+    const TagInfo Nikon3MakerNote::tagInfoFl1_[] = {
+        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonFl1Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo(  4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl1Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashSource)),
+        TagInfo(  5, "0x0005", N_("0x0005"), N_("Unknown"), nikonFl1Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo(  6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl1Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(nikonFlashFirmware)),
+        TagInfo(  8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl1Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonExternalFlashFlags)),
+        TagInfo( 11, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl1Id, makerTags, unsignedByte, 1, printFlashFocalLength),
+        TagInfo( 12, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl1Id, makerTags, unsignedByte, 1, printRepeatingFlashRate),
+        TagInfo( 13, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl1Id, makerTags, unsignedByte, 1, printRepeatingFlashCount),
+        TagInfo( 14, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl1Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashGNDistance)),
+        TagInfo( 15, "FlashGroupAControlMode", N_("Flash Group A Control Mode"), N_("Flash group a control mode"), nikonFl1Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashControlMode)),
+        TagInfo( 16, "FlashGroupBControlMode", N_("Flash Group B Control Mode"), N_("Flash group b control mode"), nikonFl1Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashControlMode)),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl1Id, makerTags, unsignedByte, 1, printValue)
+    };
+
+    const TagInfo* Nikon3MakerNote::tagListFl1()
+    {
+        return tagInfoFl1_;
+    }
+
+    // Nikon3 Flash Info 2 Tag Info
+    const TagInfo Nikon3MakerNote::tagInfoFl2_[] = {
+        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonFl2Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo(  4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl2Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashSource)),
+        TagInfo(  5, "0x0005", N_("0x0005"), N_("Unknown"), nikonFl2Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo(  6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl2Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(nikonFlashFirmware)),
+        TagInfo(  8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl2Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonExternalFlashFlags)),
+        TagInfo( 12, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl2Id, makerTags, unsignedByte, 1, printFlashFocalLength),
+        TagInfo( 13, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl2Id, makerTags, unsignedByte, 1, printRepeatingFlashRate),
+        TagInfo( 14, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl2Id, makerTags, unsignedByte, 1, printRepeatingFlashCount),
+        TagInfo( 15, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl2Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashGNDistance)),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl2Id, makerTags, unsignedByte, 1, printValue)
+    };
+
+    const TagInfo* Nikon3MakerNote::tagListFl2()
+    {
+        return tagInfoFl2_;
+    }
+
+    // Nikon3 Flash Info 3 Tag Info
+    const TagInfo Nikon3MakerNote::tagInfoFl3_[] = {
+        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonFl3Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo(  4, "FlashSource", N_("Flash Source"), N_("Flash source"), nikonFl3Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashSource)),
+        TagInfo(  6, "ExternalFlashFirmware", N_("External Flash Firmware"), N_("External flash firmware"), nikonFl3Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(nikonFlashFirmware)),
+        TagInfo(  8, "ExternalFlashFlags", N_("External Flash Flags"), N_("External flash flags"), nikonFl3Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonExternalFlashFlags)),
+        TagInfo( 12, "FlashFocalLength", N_("Flash Focal Length"), N_("Flash focal length"), nikonFl3Id, makerTags, unsignedByte, 1, printFlashFocalLength),
+        TagInfo( 13, "RepeatingFlashRate", N_("Repeating Flash Rate"), N_("Repeating flash rate"), nikonFl3Id, makerTags, unsignedByte, 1, printRepeatingFlashRate),
+        TagInfo( 14, "RepeatingFlashCount", N_("Repeating Flash Count"), N_("Repeating flash count"), nikonFl3Id, makerTags, unsignedByte, 1, printRepeatingFlashCount),
+        TagInfo( 15, "FlashGNDistance", N_("Flash GN Distance"), N_("Flash GN distance"), nikonFl3Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashGNDistance)),
+        TagInfo( 16, "FlashColorFilter", N_("Flash Color Filter"), N_("Flash color filter"), nikonFl3Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonFlashColorFilter)),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownNikonMeTag)", "(UnknownNikonMeTag)", N_("Unknown Nikon Multi Exposure Tag"), nikonFl3Id, makerTags, unsignedByte, 1, printValue)
+    };
+
+    const TagInfo* Nikon3MakerNote::tagListFl3()
+    {
+        return tagInfoFl3_;
+    }
+
     // Nikon3 Shot Info D80 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoSi1_[] = {
-        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi1IfdId, makerTags, unsignedByte, printExifVersion),
-        TagInfo( 586, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi1IfdId, makerTags, unsignedLong, printValue),
+        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi1Id, makerTags, unsignedByte, 4, printExifVersion),
+        TagInfo( 586, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi1Id, makerTags, unsignedLong, 1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonSi1Tag)", "(UnknownNikonSi1Tag)", N_("Unknown Nikon Shot Info D80 Tag"), nikonSi1IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonSi1Tag)", "(UnknownNikonSi1Tag)", N_("Unknown Nikon Shot Info D80 Tag"), nikonSi1Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListSi1()
@@ -811,11 +1051,11 @@
 
     // Nikon3 Shot Info D40 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoSi2_[] = {
-        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi2IfdId, makerTags, unsignedByte, printExifVersion),
-        TagInfo( 582, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi2IfdId, makerTags, unsignedLong, printValue),
-        TagInfo( 738, "FlashLevel", N_("Flash Level"), N_("Flash level"), nikonSi2IfdId, makerTags, unsignedByte, printValue),
+        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi2Id, makerTags, unsignedByte, 4, printExifVersion),
+        TagInfo( 582, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi2Id, makerTags, unsignedLong, 1, printValue),
+        TagInfo( 738, "FlashLevel", N_("Flash Level"), N_("Flash level"), nikonSi2Id, makerTags, unsignedByte, 1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonSi2Tag)", "(UnknownNikonSi2Tag)", N_("Unknown Nikon Shot Info D40 Tag"), nikonSi2IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonSi2Tag)", "(UnknownNikonSi2Tag)", N_("Unknown Nikon Shot Info D40 Tag"), nikonSi2Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListSi2()
@@ -870,12 +1110,12 @@
 
     // Nikon3 Shot Info D300 (a) Tag Info
     const TagInfo Nikon3MakerNote::tagInfoSi3_[] = {
-        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi3IfdId, makerTags, unsignedByte, printExifVersion),
-        TagInfo( 604, "ISO", N_("ISO"), N_("ISO"), nikonSi3IfdId, makerTags, unsignedByte, printIiIso),
-        TagInfo( 633, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi3IfdId, makerTags, unsignedLong, printValue),
-        TagInfo( 721, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi3IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonAfFineTuneAdj1)),
+        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi3Id, makerTags, unsignedByte, 4, printExifVersion),
+        TagInfo( 604, "ISO", N_("ISO"), N_("ISO"), nikonSi3Id, makerTags, unsignedByte, 1, printIiIso),
+        TagInfo( 633, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi3Id, makerTags, unsignedLong, 1, printValue),
+        TagInfo( 721, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi3Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(nikonAfFineTuneAdj1)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonSi3Tag)", "(UnknownNikonSi3Tag)", N_("Unknown Nikon Shot Info D300 (a) Tag"), nikonSi3IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonSi3Tag)", "(UnknownNikonSi3Tag)", N_("Unknown Nikon Shot Info D300 (a) Tag"), nikonSi3Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListSi3()
@@ -930,12 +1170,12 @@
 
     // Nikon3 Shot Info D300 (b) Tag Info
     const TagInfo Nikon3MakerNote::tagInfoSi4_[] = {
-        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi4IfdId, makerTags, unsignedByte, printExifVersion),
-        TagInfo( 613, "ISO", N_("ISO"), N_("ISO"), nikonSi4IfdId, makerTags, unsignedByte, printIiIso),
-        TagInfo( 644, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi4IfdId, makerTags, unsignedLong, printValue),
-        TagInfo( 732, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi4IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(nikonAfFineTuneAdj2)),
+        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi4Id, makerTags, unsignedByte, 4, printExifVersion),
+        TagInfo( 613, "ISO", N_("ISO"), N_("ISO"), nikonSi4Id, makerTags, unsignedByte, 1, printIiIso),
+        TagInfo( 644, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi4Id, makerTags, unsignedLong, 1, printValue),
+        TagInfo( 732, "AFFineTuneAdj", N_("AF Fine Tune Adj"), N_("AF fine tune adj"), nikonSi4Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(nikonAfFineTuneAdj2)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonSi4Tag)", "(UnknownNikonSi4Tag)", N_("Unknown Nikon Shot Info D300 (b) Tag"), nikonSi4IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonSi4Tag)", "(UnknownNikonSi4Tag)", N_("Unknown Nikon Shot Info D300 (b) Tag"), nikonSi4Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListSi4()
@@ -960,17 +1200,17 @@
 
     // Nikon3 Shot Info Tag Info
     const TagInfo Nikon3MakerNote::tagInfoSi5_[] = {
-        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi5IfdId, makerTags, unsignedByte, printExifVersion),
-        TagInfo( 106, "ShutterCount1", N_("Shutter Count 1"), N_("Shutter count 1"), nikonSi5IfdId, makerTags, unsignedLong, printValue),
-        TagInfo( 110, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikonSi5IfdId, makerTags, unsignedLong, printValue),
-        TagInfo( 117, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonSi5IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn2)),
-        TagInfo( 130, "VibrationReduction1", N_(""), N_(""), nikonSi5IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn)),
-        TagInfo( 343, "ShutterCount2", N_("Shutter Count 2"), N_("Shutter count 2"), nikonSi5IfdId, makerTags, undefined, printValue),
-        TagInfo( 430, "VibrationReduction2", N_("Vibration Reduction 2"), N_("Vibration reduction 2"), nikonSi5IfdId, makerTags, unsignedByte, EXV_PRINT_TAG(nikonOffOn3)),
-        TagInfo( 598, "ISO", N_("ISO"), N_("ISO"), nikonSi5IfdId, makerTags, unsignedByte, printIiIso),
-        TagInfo( 630, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi5IfdId, makerTags, unsignedLong, printValue),
+        TagInfo(   0, "Version", N_("Version"), N_("Version"), nikonSi5Id, makerTags, unsignedByte, 4, printExifVersion),
+        TagInfo( 106, "ShutterCount1", N_("Shutter Count 1"), N_("Shutter count 1"), nikonSi5Id, makerTags, unsignedLong, 1, printValue),
+        TagInfo( 110, "DeletedImageCount", N_("Deleted Image Count"), N_("Deleted image count"), nikonSi5Id, makerTags, unsignedLong, 1, printValue),
+        TagInfo( 117, "VibrationReduction", N_("Vibration Reduction"), N_("Vibration reduction"), nikonSi5Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonOffOn2)),
+        TagInfo( 130, "VibrationReduction1", N_(""), N_(""), nikonSi5Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonOffOn)),
+        TagInfo( 343, "ShutterCount2", N_("Shutter Count 2"), N_("Shutter count 2"), nikonSi5Id, makerTags, undefined, 2, printValue),
+        TagInfo( 430, "VibrationReduction2", N_("Vibration Reduction 2"), N_("Vibration reduction 2"), nikonSi5Id, makerTags, unsignedByte, 1, EXV_PRINT_TAG(nikonOffOn3)),
+        TagInfo( 598, "ISO", N_("ISO"), N_("ISO"), nikonSi5Id, makerTags, unsignedByte, 1, printIiIso),
+        TagInfo( 630, "ShutterCount", N_("Shutter Count"), N_("Shutter count"), nikonSi5Id, makerTags, unsignedLong, 1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonSi5Tag)", "(UnknownNikonSi5Tag)", N_("Unknown Nikon Shot Info Tag"), nikonSi5IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonSi5Tag)", "(UnknownNikonSi5Tag)", N_("Unknown Nikon Shot Info Tag"), nikonSi5Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListSi5()
@@ -980,10 +1220,10 @@
 
     // Nikon3 Color Balance 1 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoCb1_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb1IfdId, makerTags, undefined, printExifVersion),
-        TagInfo(36, "WB_RBGGLevels", N_("WB RBGG Levels"), N_("WB RBGG levels"), nikonCb1IfdId, makerTags, unsignedShort, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb1Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo(36, "WB_RBGGLevels", N_("WB RBGG Levels"), N_("WB RBGG levels"), nikonCb1Id, makerTags, unsignedShort, 4, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonCb1Tag)", "(UnknownNikonCb1Tag)", N_("Unknown Nikon Color Balance 1 Tag"), nikonCb1IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonCb1Tag)", "(UnknownNikonCb1Tag)", N_("Unknown Nikon Color Balance 1 Tag"), nikonCb1Id, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListCb1()
@@ -993,10 +1233,10 @@
 
     // Nikon3 Color Balance 2 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoCb2_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2IfdId, makerTags, undefined, printExifVersion),
-        TagInfo( 5, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2IfdId, makerTags, unsignedShort, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo( 5, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2Id, makerTags, unsignedShort, 4, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonCb2Tag)", "(UnknownNikonCb2Tag)", N_("Unknown Nikon Color Balance 2 Tag"), nikonCb2IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonCb2Tag)", "(UnknownNikonCb2Tag)", N_("Unknown Nikon Color Balance 2 Tag"), nikonCb2Id, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListCb2()
@@ -1006,10 +1246,10 @@
 
     // Nikon3 Color Balance 2a Tag Info
     const TagInfo Nikon3MakerNote::tagInfoCb2a_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2aIfdId, makerTags, undefined, printExifVersion),
-        TagInfo( 9, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2aIfdId, makerTags, unsignedShort, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb2aId, makerTags, undefined, 4, printExifVersion),
+        TagInfo( 9, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2aId, makerTags, unsignedShort, 4, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonCb2aTag)", "(UnknownNikonCb2aTag)", N_("Unknown Nikon Color Balance 2a Tag"), nikonCb2aIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonCb2aTag)", "(UnknownNikonCb2aTag)", N_("Unknown Nikon Color Balance 2a Tag"), nikonCb2aId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListCb2a()
@@ -1019,10 +1259,10 @@
 
     // Nikon3 Color Balance 2b Tag Info
     const TagInfo Nikon3MakerNote::tagInfoCb2b_[] = {
-        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonCb2bIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(145, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2bIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonCb2bId, makerTags, undefined, 4, printExifVersion),
+        TagInfo(145, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"), nikonCb2bId, makerTags, unsignedShort, 4, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonCb2bTag)", "(UnknownNikonCb2bTag)", N_("Unknown Nikon Color Balance 2b Tag"), nikonCb2bIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonCb2bTag)", "(UnknownNikonCb2bTag)", N_("Unknown Nikon Color Balance 2b Tag"), nikonCb2bId, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListCb2b()
@@ -1032,10 +1272,10 @@
 
     // Nikon3 Color Balance 3 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoCb3_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb3IfdId, makerTags, undefined, printExifVersion),
-        TagInfo(10, "WB_RGBGLevels", N_("WB RGBG Levels"), N_("WB RGBG levels"), nikonCb3IfdId, makerTags, unsignedShort, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonCb3Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo(10, "WB_RGBGLevels", N_("WB RGBG Levels"), N_("WB RGBG levels"), nikonCb3Id, makerTags, unsignedShort, 4, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonCb3Tag)", "(UnknownNikonCb3Tag)", N_("Unknown Nikon Color Balance 3 Tag"), nikonCb3IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonCb3Tag)", "(UnknownNikonCb3Tag)", N_("Unknown Nikon Color Balance 3 Tag"), nikonCb3Id, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListCb3()
@@ -1045,10 +1285,10 @@
 
     // Nikon3 Color Balance 4 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoCb4_[] = {
-        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonCb4IfdId, makerTags, undefined, printExifVersion),
-        TagInfo(147, "WB_GRBGLevels", N_("WB GRBG Levels"), N_("WB GRBG levels"), nikonCb4IfdId, makerTags, unsignedShort, printValue),
+        TagInfo(  0, "Version", N_("Version"), N_("Version"), nikonCb4Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo(147, "WB_GRBGLevels", N_("WB GRBG Levels"), N_("WB GRBG levels"), nikonCb4Id, makerTags, unsignedShort, 4, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonCb4Tag)", "(UnknownNikonCb4Tag)", N_("Unknown Nikon Color Balance 4 Tag"), nikonCb4IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonCb4Tag)", "(UnknownNikonCb4Tag)", N_("Unknown Nikon Color Balance 4 Tag"), nikonCb4Id, makerTags, unsignedShort, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListCb4()
@@ -1058,16 +1298,16 @@
 
     // Nikon3 Lens Data 1 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoLd1_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd1IfdId, makerTags, undefined, printExifVersion),
-        TagInfo( 6, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd1IfdId, makerTags, unsignedByte, printLensId1),
-        TagInfo( 7, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
-        TagInfo( 8, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
-        TagInfo( 9, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(10, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(11, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(12, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd1IfdId, makerTags, unsignedByte, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd1Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo( 6, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd1Id, makerTags, unsignedByte, 1, printLensId1),
+        TagInfo( 7, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd1Id, makerTags, unsignedByte, 1, printFStops),
+        TagInfo( 8, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd1Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo( 9, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd1Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo(10, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd1Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo(11, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd1Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo(12, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd1Id, makerTags, unsignedByte, 1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonLd1Tag)", "(UnknownNikonLd1Tag)", N_("Unknown Nikon Lens Data 1 Tag"), nikonLd1IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonLd1Tag)", "(UnknownNikonLd1Tag)", N_("Unknown Nikon Lens Data 1 Tag"), nikonLd1Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListLd1()
@@ -1077,22 +1317,22 @@
 
     // Nikon3 Lens Data 2 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoLd2_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd2IfdId, makerTags, undefined, printExifVersion),
-        TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo( 9, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(10, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(11, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd2IfdId, makerTags, unsignedByte, printLensId2),
-        TagInfo(12, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(13, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(14, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(15, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(16, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(17, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(18, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd2IfdId, makerTags, unsignedByte, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd2Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd2Id, makerTags, unsignedByte, 1, printExitPupilPosition),
+        TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd2Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd2Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo( 9, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd2Id, makerTags, unsignedByte, 1, printFocusDistance),
+        TagInfo(10, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd2Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo(11, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd2Id, makerTags, unsignedByte, 1, printLensId2),
+        TagInfo(12, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd2Id, makerTags, unsignedByte, 1, printFStops),
+        TagInfo(13, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd2Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo(14, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd2Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo(15, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), nikonLd2Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo(16, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), nikonLd2Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo(17, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd2Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo(18, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd2Id, makerTags, unsignedByte, 1, printAperture),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonLd2Tag)", "(UnknownNikonLd2Tag)", N_("Unknown Nikon Lens Data 2 Tag"), nikonLd2IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonLd2Tag)", "(UnknownNikonLd2Tag)", N_("Unknown Nikon Lens Data 2 Tag"), nikonLd2Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListLd2()
@@ -1102,22 +1342,22 @@
 
     // Nikon3 Lens Data 3 Tag Info
     const TagInfo Nikon3MakerNote::tagInfoLd3_[] = {
-        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd3IfdId, makerTags, undefined, printExifVersion),
-        TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(10, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(11, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(12, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd3IfdId, makerTags, unsignedByte, printLensId3),
-        TagInfo(13, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(14, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(15, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(16, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(17, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal length"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(18, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
-        TagInfo(19, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd3IfdId, makerTags, unsignedByte, printValue),
+        TagInfo( 0, "Version", N_("Version"), N_("Version"), nikonLd3Id, makerTags, undefined, 4, printExifVersion),
+        TagInfo( 4, "ExitPupilPosition", N_("Exit Pupil Position"), N_("Exit pupil position"), nikonLd3Id, makerTags, unsignedByte, 1, printExitPupilPosition),
+        TagInfo( 5, "AFAperture", N_("AF Aperture"), N_("AF aperture"), nikonLd3Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo( 8, "FocusPosition", N_("Focus Position"), N_("Focus position"), nikonLd3Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo(10, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), nikonLd3Id, makerTags, unsignedByte, 1, printFocusDistance),
+        TagInfo(11, "FocalLength", N_("Focal Length"), N_("Focal length"), nikonLd3Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo(12, "LensIDNumber", N_("Lens ID Number"), N_("Lens ID number"), nikonLd3Id, makerTags, unsignedByte, 1, printLensId3),
+        TagInfo(13, "LensFStops", N_("Lens F-Stops"), N_("Lens F-stops"), nikonLd3Id, makerTags, unsignedByte, 1, printFStops),
+        TagInfo(14, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), nikonLd3Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo(15, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), nikonLd3Id, makerTags, unsignedByte, 1, printFocal),
+        TagInfo(16, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal length"), nikonLd3Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo(17, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal length"), nikonLd3Id, makerTags, unsignedByte, 1, printAperture),
+        TagInfo(18, "MCUVersion", N_("MCU Version"), N_("MCU version"), nikonLd3Id, makerTags, unsignedByte, 1, printValue),
+        TagInfo(19, "EffectiveMaxAperture", N_("Effective Max Aperture"), N_("Effective max aperture"), nikonLd3Id, makerTags, unsignedByte, 1, printAperture),
         // End of list marker
-        TagInfo(0xffff, "(UnknownNikonLd3Tag)", "(UnknownNikonLd3Tag)", N_("Unknown Nikon Lens Data 3 Tag"), nikonLd3IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownNikonLd3Tag)", "(UnknownNikonLd3Tag)", N_("Unknown Nikon Lens Data 3 Tag"), nikonLd3Id, makerTags, unsignedByte, 1, printValue)
     };
 
     const TagInfo* Nikon3MakerNote::tagListLd3()
@@ -1153,6 +1393,7 @@
         std::string focus = value.toString();
         if      (focus == "AF-C  ") os << _("Continuous autofocus");
         else if (focus == "AF-S  ") os << _("Single autofocus");
+        else if (focus == "AF-A  ") os << _("Automatic");
         else                      os << "(" << value << ")";
         return os;
     }
@@ -1436,526 +1677,592 @@
                                                const std::string& group)
     {
 #ifdef EXV_HAVE_LENSDATA
+// 8< - - - 8< do not remove this line >8 - - - >8
 //------------------------------------------------------------------------------
-// List of AF F-Mount lenses - Version 4.1.361.01                    2009-11-10
+#ifndef FMOUNTLH
+#define FMOUNTLH
 //------------------------------------------------------------------------------
-#define FMLVERSION "4.1.361.01"
-#define FMLDATE "2009-11-10"
+// List of AF F-Mount lenses - Version 4.3.410.01                    2010-09-15
+//------------------------------------------------------------------------------
+#define FMLVERSION "4.3.410.01"
+#define FMLDATE "2010-09-15"
 //------------------------------------------------------------------------------
 //
 //
-// created by Robert Rottmerhusen 2005 - 2009
+// Created by Robert Rottmerhusen 2005 - 2010
 // http://www.rottmerhusen.com (lens_id@rottmerhusen.com)
 //
-// for contributor info and more visit my online list:
+// For contributor info and more visit my online list:
 // http://www.rottmerhusen.com/objektives/lensid/thirdparty.html
 //
-// three misidentified lenses (ID like the a Nikkor):
-//    "Sigma" "105mm F2.8 EX DG Macro";
-//    "Tokina" "AT-X 235 AF PRO / AF 20-35mm f/2.8";
-//    "Tokina" "AT-X 124 AF PRO DX II / 12-24mm f/4";
 //
-// free use in non-commercial, GPL or open source software only!
-// please contact me for adding lenses or use in commercial software.
+// Seven misidentified lenses due to double LensIDs:
+// 
+// 2F 48 30 44 24 24 29 02.1: Nikon AF Zoom-Nikkor 20-35mm f/2.8D IF
+// 2F 48 30 44 24 24 29 02.2: Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)
+//
+// 32 54 6A 6A 24 24 35 02.1: Nikon AF Micro-Nikkor 105mm f/2.8D
+// 32 54 6A 6A 24 24 35 02.2: Sigma Macro 105mm F2.8 EX DG
+//
+// 7A 3C 1F 37 30 30 7E 06.1: Nikon AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED
+// 7A 3C 1F 37 30 30 7E 06.2: Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)
+//
+// 8B 40 2D 80 2C 3C FD 0E.1: Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED
+// 8B 40 2D 80 2C 3C FD 0E.2: Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II
+//
+// 32 53 64 64 24 24 35 02.1: Tamron SP AF 90mm F/2.8 Macro 1:1 (172E)
+// 32 53 64 64 24 24 35 02.2: Tamron SP AF 90mm F/2.8 Di Macro 1:1 (272E)
+//
+// 2F 40 30 44 2C 34 29 02.1: Tokina AF 235 II (AF 20-35mm f/3.5-4.5)
+// 2F 40 30 44 2C 34 29 02.2: Tokina AF 193 (AF 19-35mm f/3.5-4.5)
+//
+// 25 48 3C 5C 24 24 1B 02.1: Tokina AT-X 287 AF PRO SV (AF 28-70mm f/2.8)
+// 25 48 3C 5C 24 24 1B 02.2: Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)
+//
 //
 // product number/order code not complete
 //
-//"data from TAG 0x98" "ltyp" " "TC" "MID" "manuf" "PN" "lens name from manuf";
+// Free use in non-commercial, GPL or open source software only!
+// Please contact me for adding lenses or use in commercial software.
+//
+//"data from TAG 0x98" "ltyp" " "TC" "MID" "maker" "PN" "lens name from manuf";
 //
 //------------------------------------------------------------------------------
 // Nikkor lenses by their LensID
 //------------------------------------------------------------------------------
 //
-static const struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype, tcinfo, mid; const char *manuf, *lnumber, *lensname;}
+static const struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype, tcinfo, dblid, mid; const char *manuf, *lnumber, *lensname;}
 fmountlens[] = {
-{0x01,0x58,0x50,0x50,0x14,0x14,0x02,0x00,0x00,0x00, "Nikon", "JAA00901", "AF Nikkor 50mm f/1.8"},
-{0x02,0x42,0x44,0x5C,0x2A,0x34,0x02,0x00,0x00,0x00, "Nikon", "JAA72701", "AF Zoom-Nikkor 35-70mm f/3.3-4.5"},
-{0x02,0x42,0x44,0x5C,0x2A,0x34,0x08,0x00,0x00,0x00, "Nikon", "JAA72701", "AF Zoom-Nikkor 35-70mm f/3.3-4.5"},
-{0x03,0x48,0x5C,0x81,0x30,0x30,0x02,0x00,0x00,0x00, "Nikon", "JAA72801", "AF Zoom-Nikkor 70-210mm f/4"},
-{0x04,0x48,0x3C,0x3C,0x24,0x24,0x03,0x00,0x00,0x00, "Nikon", "JAA12001", "AF Nikkor 28mm f/2.8"},
-{0x05,0x54,0x50,0x50,0x0C,0x0C,0x04,0x00,0x00,0x00, "Nikon", "JAA01001", "AF Nikkor 50mm f/1.4"},
-{0x06,0x54,0x53,0x53,0x24,0x24,0x06,0x00,0x00,0x00, "Nikon", "JAA62101", "AF Micro-Nikkor 55mm f/2.8"},
-{0x07,0x40,0x3C,0x62,0x2C,0x34,0x03,0x00,0x00,0x00, "Nikon", "JAA72901", "AF Zoom-Nikkor 28-85mm f/3.5-4.5"},
-{0x08,0x40,0x44,0x6A,0x2C,0x34,0x04,0x00,0x00,0x00, "Nikon", "JAA73001", "AF Zoom-Nikkor 35-105mm f/3.5-4.5"},
-{0x09,0x48,0x37,0x37,0x24,0x24,0x04,0x00,0x00,0x00, "Nikon", "JAA12101", "AF Nikkor 24mm f/2.8"},
-{0x0A,0x48,0x8E,0x8E,0x24,0x24,0x03,0x00,0x00,0x00, "Nikon", "JAA322AB", "AF Nikkor 300mm f/2.8 IF-ED"},
-{0x0B,0x48,0x7C,0x7C,0x24,0x24,0x05,0x00,0x00,0x00, "Nikon", "JAA32101", "AF Nikkor 180mm f/2.8 IF-ED"},
+{0x01,0x58,0x50,0x50,0x14,0x14,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA00901", "AF Nikkor 50mm f/1.8"},
+{0x02,0x42,0x44,0x5C,0x2A,0x34,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA72701", "AF Zoom-Nikkor 35-70mm f/3.3-4.5"},
+{0x02,0x42,0x44,0x5C,0x2A,0x34,0x08,0x00,0x00,0x00,0x00, "Nikon", "JAA72701", "AF Zoom-Nikkor 35-70mm f/3.3-4.5"},
+{0x03,0x48,0x5C,0x81,0x30,0x30,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA72801", "AF Zoom-Nikkor 70-210mm f/4"},
+{0x04,0x48,0x3C,0x3C,0x24,0x24,0x03,0x00,0x00,0x00,0x00, "Nikon", "JAA12001", "AF Nikkor 28mm f/2.8"},
+{0x05,0x54,0x50,0x50,0x0C,0x0C,0x04,0x00,0x00,0x00,0x00, "Nikon", "JAA01001", "AF Nikkor 50mm f/1.4"},
+{0x06,0x54,0x53,0x53,0x24,0x24,0x06,0x00,0x40,0x00,0x00, "Nikon", "JAA62101", "AF Micro-Nikkor 55mm f/2.8"},
+{0x07,0x40,0x3C,0x62,0x2C,0x34,0x03,0x00,0x00,0x00,0x00, "Nikon", "JAA72901", "AF Zoom-Nikkor 28-85mm f/3.5-4.5"},
+{0x08,0x40,0x44,0x6A,0x2C,0x34,0x04,0x00,0x00,0x00,0x00, "Nikon", "JAA73001", "AF Zoom-Nikkor 35-105mm f/3.5-4.5"},
+{0x09,0x48,0x37,0x37,0x24,0x24,0x04,0x00,0x00,0x00,0x00, "Nikon", "JAA12101", "AF Nikkor 24mm f/2.8"},
+{0x0A,0x48,0x8E,0x8E,0x24,0x24,0x03,0x00,0x00,0x00,0x00, "Nikon", "JAA322AA", "AF Nikkor 300mm f/2.8 IF-ED"},
+{0x0A,0x48,0x8E,0x8E,0x24,0x24,0x05,0x00,0x00,0x00,0x00, "Nikon", "JAA322AB", "AF Nikkor 300mm f/2.8 IF-ED N"},
+{0x0B,0x48,0x7C,0x7C,0x24,0x24,0x05,0x00,0x00,0x00,0x00, "Nikon", "JAA32101", "AF Nikkor 180mm f/2.8 IF-ED"},
 //0C
-{0x0D,0x40,0x44,0x72,0x2C,0x34,0x07,0x00,0x00,0x00, "Nikon", "JAA73101", "AF Zoom-Nikkor 35-135mm f/3.5-4.5"},
-{0x0E,0x48,0x5C,0x81,0x30,0x30,0x05,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 70-210mm f/4"},
-{0x0F,0x58,0x50,0x50,0x14,0x14,0x05,0x00,0x00,0x00, "Nikon", "JAA009AD", "AF Nikkor 50mm f/1.8 N"},
-{0x10,0x48,0x8E,0x8E,0x30,0x30,0x08,0x00,0x00,0x00, "Nikon", "JAA32301", "AF Nikkor 300mm f/4 IF-ED"},
-{0x11,0x48,0x44,0x5C,0x24,0x24,0x08,0x00,0x00,0x00, "Nikon", "JAA73301", "AF Zoom-Nikkor 35-70mm f/2.8"},
-{0x12,0x48,0x5C,0x81,0x30,0x3C,0x09,0x00,0x00,0x00, "Nikon", "JAA73201", "AF Nikkor 70-210mm f/4-5.6"},
-{0x13,0x42,0x37,0x50,0x2A,0x34,0x0B,0x00,0x00,0x00, "Nikon", "JAA73401", "AF Zoom-Nikkor 24-50mm f/3.3-4.5"},
-{0x14,0x48,0x60,0x80,0x24,0x24,0x0B,0x00,0x00,0x00, "Nikon", "JAA73501", "AF Zoom-Nikkor 80-200mm f/2.8 ED"},
-{0x15,0x4C,0x62,0x62,0x14,0x14,0x0C,0x00,0x00,0x00, "Nikon", "JAA32401", "AF Nikkor 85mm f/1.8"},
+{0x0D,0x40,0x44,0x72,0x2C,0x34,0x07,0x00,0x00,0x00,0x00, "Nikon", "JAA73101", "AF Zoom-Nikkor 35-135mm f/3.5-4.5"},
+{0x0E,0x48,0x5C,0x81,0x30,0x30,0x05,0x00,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 70-210mm f/4"},
+{0x0F,0x58,0x50,0x50,0x14,0x14,0x05,0x00,0x00,0x00,0x00, "Nikon", "JAA009AD", "AF Nikkor 50mm f/1.8 N"},
+{0x10,0x48,0x8E,0x8E,0x30,0x30,0x08,0x00,0x00,0x00,0x00, "Nikon", "JAA32301", "AF Nikkor 300mm f/4 IF-ED"},
+{0x11,0x48,0x44,0x5C,0x24,0x24,0x08,0x00,0x00,0x00,0x00, "Nikon", "JAA73301", "AF Zoom-Nikkor 35-70mm f/2.8"},
+{0x12,0x48,0x5C,0x81,0x30,0x3C,0x09,0x00,0x00,0x00,0x00, "Nikon", "JAA73201", "AF Nikkor 70-210mm f/4-5.6"},
+{0x13,0x42,0x37,0x50,0x2A,0x34,0x0B,0x00,0x00,0x00,0x00, "Nikon", "JAA73401", "AF Zoom-Nikkor 24-50mm f/3.3-4.5"},
+{0x14,0x48,0x60,0x80,0x24,0x24,0x0B,0x00,0x00,0x00,0x00, "Nikon", "JAA73501", "AF Zoom-Nikkor 80-200mm f/2.8 ED"},
+{0x15,0x4C,0x62,0x62,0x14,0x14,0x0C,0x00,0x00,0x00,0x00, "Nikon", "JAA32401", "AF Nikkor 85mm f/1.8"},
 //16
-{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x0F,0x00,0x00,0x00, "Nikon", "JAA518AA", "Nikkor 500mm f/4 P ED IF"},
-{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x11,0x00,0x00,0x00, "Nikon", "JAA518AA", "Nikkor 500mm f/4 P ED IF"},
-{0x18,0x40,0x44,0x72,0x2C,0x34,0x0E,0x00,0x00,0x00, "Nikon", "JAA736AA", "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N"},
+{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x0F,0x00,0x00,0x00,0x00, "Nikon", "JAA518AA", "Nikkor 500mm f/4 P ED IF"},
+{0x17,0x3C,0xA0,0xA0,0x30,0x30,0x11,0x00,0x00,0x00,0x00, "Nikon", "JAA518AA", "Nikkor 500mm f/4 P ED IF"},
+{0x18,0x40,0x44,0x72,0x2C,0x34,0x0E,0x00,0x00,0x00,0x00, "Nikon", "JAA736AA", "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N"},
 //19
-{0x1A,0x54,0x44,0x44,0x18,0x18,0x11,0x00,0x00,0x00, "Nikon", "JAA12201", "AF Nikkor 35mm f/2"},
-{0x1B,0x44,0x5E,0x8E,0x34,0x3C,0x10,0x00,0x00,0x00, "Nikon", "JAA738AA", "AF Zoom-Nikkor 75-300mm f/4.5-5.6"},
-{0x1C,0x48,0x30,0x30,0x24,0x24,0x12,0x00,0x00,0x00, "Nikon", "JAA12301", "AF Nikkor 20mm f/2.8"},
-{0x1D,0x42,0x44,0x5C,0x2A,0x34,0x12,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-70mm f/3.3-4.5 N"},
-{0x1E,0x54,0x56,0x56,0x24,0x24,0x13,0x00,0x00,0x00, "Nikon", "JAA62201", "AF Micro-Nikkor 60mm f/2.8"},
-{0x1F,0x54,0x6A,0x6A,0x24,0x24,0x14,0x00,0x00,0x00, "Nikon", "JAA62301", "AF Micro-Nikkor 105mm f/2.8"},
-{0x20,0x48,0x60,0x80,0x24,0x24,0x15,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 80-200mm f/2.8 ED"},
-{0x21,0x40,0x3C,0x5C,0x2C,0x34,0x16,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 28-70mm f/3.5-4.5"},
-{0x22,0x48,0x72,0x72,0x18,0x18,0x16,0x00,0x00,0x00, "Nikon", "JAA32501", "AF DC-Nikkor 135mm f/2"},
-{0x23,0x30,0xBE,0xCA,0x3C,0x48,0x17,0x00,0x00,0x00, "Nikon", "", "Zoom-Nikkor 1200-1700mm f/5.6-8 P ED IF"},
+{0x1A,0x54,0x44,0x44,0x18,0x18,0x11,0x00,0x00,0x00,0x00, "Nikon", "JAA12201", "AF Nikkor 35mm f/2"},
+{0x1B,0x44,0x5E,0x8E,0x34,0x3C,0x10,0x00,0x00,0x00,0x00, "Nikon", "JAA738AA", "AF Zoom-Nikkor 75-300mm f/4.5-5.6"},
+{0x1C,0x48,0x30,0x30,0x24,0x24,0x12,0x00,0x00,0x00,0x00, "Nikon", "JAA12301", "AF Nikkor 20mm f/2.8"},
+{0x1D,0x42,0x44,0x5C,0x2A,0x34,0x12,0x00,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-70mm f/3.3-4.5 N"},
+{0x1E,0x54,0x56,0x56,0x24,0x24,0x13,0x00,0x40,0x00,0x00, "Nikon", "JAA62201", "AF Micro-Nikkor 60mm f/2.8"},
+{0x1F,0x54,0x6A,0x6A,0x24,0x24,0x14,0x00,0x40,0x00,0x00, "Nikon", "JAA62301", "AF Micro-Nikkor 105mm f/2.8"},
+{0x20,0x48,0x60,0x80,0x24,0x24,0x15,0x00,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 80-200mm f/2.8 ED"},
+{0x21,0x40,0x3C,0x5C,0x2C,0x34,0x16,0x00,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 28-70mm f/3.5-4.5"},
+{0x22,0x48,0x72,0x72,0x18,0x18,0x16,0x00,0x00,0x00,0x00, "Nikon", "JAA32501", "AF DC-Nikkor 135mm f/2"},
+{0x23,0x30,0xBE,0xCA,0x3C,0x48,0x17,0x00,0x00,0x00,0x00, "Nikon", "", "Zoom-Nikkor 1200-1700mm f/5.6-8 P ED IF"},
 // - D - lenses from here
-{0x24,0x48,0x60,0x80,0x24,0x24,0x1A,0x02,0x00,0x00, "Nikon", "JAA742DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
-{0x25,0x48,0x44,0x5c,0x24,0x24,0x1B,0x02,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D"},
-{0x25,0x48,0x44,0x5c,0x24,0x24,0x52,0x02,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D"},
-//26
-{0x27,0x48,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x08,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED"},
-{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x28,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-14E"},
-{0x27,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x28,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-17E"},
-{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x28,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-20E"},
-{0x28,0x3C,0xA6,0xA6,0x30,0x30,0x1D,0x02,0x08,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED"},
-{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-14E"},
-{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-17E"},
-{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-20E"},
+{0x24,0x48,0x60,0x80,0x24,0x24,0x1A,0x02,0x00,0x00,0x00, "Nikon", "JAA742DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+{0x25,0x48,0x44,0x5c,0x24,0x24,0x1B,0x02,0x00,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D"},
+{0x25,0x48,0x44,0x5c,0x24,0x24,0x52,0x02,0x00,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D"},
+{0x26,0x40,0x3C,0x5C,0x2C,0x34,0x1C,0x02,0x00,0x00,0x00, "Nikon", "JAA744DA", "AF Zoom-Nikkor 28-70mm f/3.5-4.5D"},
+// ^- not yet verified
+{0x27,0x48,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x07,0x00,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED"},
+{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-14E"},
+{0x27,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-17E"},
+{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-20E"},
+{0x28,0x3C,0xA6,0xA6,0x30,0x30,0x1D,0x02,0x07,0x00,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED"},
+{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-14E"},
+{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-17E"},
+{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-20E"},
 //29
-{0x2A,0x54,0x3C,0x3C,0x0C,0x0C,0x26,0x02,0x00,0x00, "Nikon", "JAA124DA", "AF Nikkor 28mm f/1.4D"},
-{0x2B,0x3C,0x44,0x60,0x30,0x3C,0x1F,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
-{0x2C,0x48,0x6A,0x6A,0x18,0x18,0x27,0x02,0x00,0x00, "Nikon", "JAA327DA", "AF DC-Nikkor 105mm f/2D"},
-{0x2D,0x48,0x80,0x80,0x30,0x30,0x21,0x02,0x00,0x00, "Nikon", "JAA624DA", "AF Micro-Nikkor 200mm f/4D IF-ED"},
-{0x2E,0x48,0x5C,0x82,0x30,0x3C,0x28,0x02,0x00,0x00, "Nikon", "JAA747DA", "AF Nikkor 70-210mm f/4-5.6D"},
-{0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x00, "Nikon", "JAA746DA", "AF Zoom-Nikkor 20-35mm f/2.8D IF"},
-{0x30,0x48,0x98,0x98,0x24,0x24,0x24,0x02,0x08,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED"},
-{0x30,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x28,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E"},
-{0x30,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x28,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-17E"},
-{0x30,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x28,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E"},
-{0x31,0x54,0x56,0x56,0x24,0x24,0x25,0x02,0x00,0x00, "Nikon", "JAA625DA", "AF Micro-Nikkor 60mm f/2.8D"},
-{0x32,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x00,0x00, "Nikon", "JAA627DA", "AF Micro-Nikkor 105mm f/2.8D"},
-{0x33,0x48,0x2D,0x2D,0x24,0x24,0x31,0x02,0x00,0x00, "Nikon", "JAA126DA", "AF Nikkor 18mm f/2.8D"},
-{0x34,0x48,0x29,0x29,0x24,0x24,0x32,0x02,0x00,0x00, "Nikon", "JAA626DA", "AF Fisheye Nikkor 16mm f/2.8D"},
-{0x35,0x3C,0xA0,0xA0,0x30,0x30,0x33,0x02,0x08,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED"},
-{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-14E"},
-{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-17E"},
-{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-20E"},
-{0x36,0x48,0x37,0x37,0x24,0x24,0x34,0x02,0x00,0x00, "Nikon", "JAA125DA", "AF Nikkor 24mm f/2.8D"},
-{0x37,0x48,0x30,0x30,0x24,0x24,0x36,0x02,0x00,0x00, "Nikon", "JAA127DA", "AF Nikkor 20mm f/2.8D"},
-{0x38,0x4C,0x62,0x62,0x14,0x14,0x37,0x02,0x00,0x00, "Nikon", "JAA328DA", "AF Nikkor 85mm f/1.8D"},
+{0x2A,0x54,0x3C,0x3C,0x0C,0x0C,0x26,0x02,0x00,0x00,0x00, "Nikon", "JAA124DA", "AF Nikkor 28mm f/1.4D"},
+{0x2B,0x3C,0x44,0x60,0x30,0x3C,0x1F,0x02,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
+{0x2C,0x48,0x6A,0x6A,0x18,0x18,0x27,0x02,0x00,0x00,0x00, "Nikon", "JAA327DA", "AF DC-Nikkor 105mm f/2D"},
+{0x2D,0x48,0x80,0x80,0x30,0x30,0x21,0x02,0x40,0x00,0x00, "Nikon", "JAA624DA", "AF Micro-Nikkor 200mm f/4D IF-ED"},
+{0x2E,0x48,0x5C,0x82,0x30,0x3C,0x22,0x02,0x00,0x00,0x00, "Nikon", "JAA747DA", "AF Nikkor 70-210mm f/4-5.6D"},
+{0x2E,0x48,0x5C,0x82,0x30,0x3C,0x28,0x02,0x00,0x00,0x00, "Nikon", "JAA747DA", "AF Nikkor 70-210mm f/4-5.6D"},
+{0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x01,0x00, "Nikon", "JAA746DA", "AF Zoom-Nikkor 20-35mm f/2.8D IF"},
+{0x30,0x48,0x98,0x98,0x24,0x24,0x24,0x02,0x07,0x00,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED"},
+{0x30,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E"},
+{0x30,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-17E"},
+{0x30,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E"},
+{0x31,0x54,0x56,0x56,0x24,0x24,0x25,0x02,0x40,0x00,0x00, "Nikon", "JAA625DA", "AF Micro-Nikkor 60mm f/2.8D"},
+{0x32,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x40,0x01,0x00, "Nikon", "JAA627DA", "AF Micro-Nikkor 105mm f/2.8D"},
+{0x33,0x48,0x2D,0x2D,0x24,0x24,0x31,0x02,0x00,0x00,0x00, "Nikon", "JAA126DA", "AF Nikkor 18mm f/2.8D"},
+{0x34,0x48,0x29,0x29,0x24,0x24,0x32,0x02,0x00,0x00,0x00, "Nikon", "JAA626DA", "AF Fisheye Nikkor 16mm f/2.8D"},
+{0x35,0x3C,0xA0,0xA0,0x30,0x30,0x33,0x02,0x07,0x00,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED"},
+{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-14E"},
+{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-17E"},
+{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-20E"},
+{0x36,0x48,0x37,0x37,0x24,0x24,0x34,0x02,0x00,0x00,0x00, "Nikon", "JAA125DA", "AF Nikkor 24mm f/2.8D"},
+{0x37,0x48,0x30,0x30,0x24,0x24,0x36,0x02,0x00,0x00,0x00, "Nikon", "JAA127DA", "AF Nikkor 20mm f/2.8D"},
+{0x38,0x4C,0x62,0x62,0x14,0x14,0x37,0x02,0x00,0x00,0x00, "Nikon", "JAA328DA", "AF Nikkor 85mm f/1.8D"},
 //39                38
-{0x3A,0x40,0x3C,0x5C,0x2C,0x34,0x39,0x02,0x00,0x00, "Nikon", "JAA744DA", "AF Zoom-Nikkor 28-70mm f/3.5-4.5D"},
-{0x3B,0x48,0x44,0x5C,0x24,0x24,0x3A,0x02,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D N"},
-{0x3C,0x48,0x60,0x80,0x24,0x24,0x3B,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
-{0x3D,0x3C,0x44,0x60,0x30,0x3C,0x3E,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
-{0x3E,0x48,0x3C,0x3C,0x24,0x24,0x3D,0x02,0x00,0x00, "Nikon", "JAA128DA", "AF Nikkor 28mm f/2.8D"},
-{0x3F,0x40,0x44,0x6A,0x2C,0x34,0x45,0x02,0x00,0x00, "Nikon", "JAA748DA", "AF Zoom-Nikkor 35-105mm f/3.5-4.5D"},
+{0x3A,0x40,0x3C,0x5C,0x2C,0x34,0x39,0x02,0x00,0x00,0x00, "Nikon", "JAA744DA", "AF Zoom-Nikkor 28-70mm f/3.5-4.5D"},
+{0x3B,0x48,0x44,0x5C,0x24,0x24,0x3A,0x02,0x00,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D N"},
+{0x3C,0x48,0x60,0x80,0x24,0x24,0x3B,0x02,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+{0x3D,0x3C,0x44,0x60,0x30,0x3C,0x3E,0x02,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-80mm f/4-5.6D"},
+{0x3E,0x48,0x3C,0x3C,0x24,0x24,0x3D,0x02,0x00,0x00,0x00, "Nikon", "JAA128DA", "AF Nikkor 28mm f/2.8D"},
+{0x3F,0x40,0x44,0x6A,0x2C,0x34,0x45,0x02,0x00,0x00,0x00, "Nikon", "JAA748DA", "AF Zoom-Nikkor 35-105mm f/3.5-4.5D"},
 //40
-{0x41,0x48,0x7c,0x7c,0x24,0x24,0x43,0x02,0x00,0x00, "Nikon", "JAA330DA", "AF Nikkor 180mm f/2.8D IF-ED"},
-{0x42,0x54,0x44,0x44,0x18,0x18,0x44,0x02,0x00,0x00, "Nikon", "JAA129DA", "AF Nikkor 35mm f/2D"},
-{0x43,0x54,0x50,0x50,0x0C,0x0C,0x46,0x02,0x00,0x00, "Nikon", "JAA011DB", "AF Nikkor 50mm f/1.4D"},
-{0x44,0x44,0x60,0x80,0x34,0x3C,0x47,0x02,0x00,0x00, "Nikon", "JAA753DB", "AF Zoom-Nikkor 80-200mm f/4.5-5.6D"},
-{0x45,0x40,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x00, "Nikon", "JAA752DA", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"},
-{0x46,0x3C,0x44,0x60,0x30,0x3C,0x49,0x02,0x00,0x00, "Nikon", "JAA754DA", "AF Zoom-Nikkor 35-80mm f/4-5.6D N"},
-{0x47,0x42,0x37,0x50,0x2A,0x34,0x4A,0x02,0x00,0x00, "Nikon", "JAA756DA", "AF Zoom-Nikkor 24-50mm f/3.3-4.5D"},
-{0x48,0x48,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x08,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED"},
-{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x28,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-14E"},
-{0x48,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x28,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-17E"},
-{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x28,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-20E"},
-{0x49,0x3C,0xA6,0xA6,0x30,0x30,0x4C,0x02,0x08,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED"},
-{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-14E"},
-{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-17E"},
-{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-20E"},
-{0x4A,0x54,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00, "Nikon", "JAA332DA", "AF Nikkor 85mm f/1.4D IF"},
-{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0x4E,0x02,0x08,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED"},
-{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-14E"},
-{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-17E"},
-{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-20E"},
-{0x4C,0x40,0x37,0x6E,0x2C,0x3C,0x4F,0x02,0x00,0x00, "Nikon", "JAA757DA", "AF Zoom-Nikkor 24-120mm f/3.5-5.6D IF"},
-{0x4D,0x40,0x3C,0x80,0x2C,0x3C,0x62,0x02,0x00,0x00, "Nikon", "JAA758DA", "AF Zoom-Nikkor 28-200mm f/3.5-5.6D IF"},
-{0x4E,0x48,0x72,0x72,0x18,0x18,0x51,0x02,0x00,0x00, "Nikon", "JAA329DA", "AF DC-Nikkor 135mm f/2D"},
-{0x4F,0x40,0x37,0x5C,0x2C,0x3C,0x53,0x06,0x00,0x00, "Nikon", "JBA701AA", "IX-Nikkor 24-70mm f/3.5-5.6"},
-{0x50,0x48,0x56,0x7C,0x30,0x3C,0x54,0x06,0x00,0x00, "Nikon", "JBA702AA", "IX-Nikkor 60-180mm f/4-5.6"},
-//                                             "JBA703AC" "IX-Nikkor 20-60 mm f/3.5-5.6";
+{0x41,0x48,0x7c,0x7c,0x24,0x24,0x43,0x02,0x00,0x00,0x00, "Nikon", "JAA330DA", "AF Nikkor 180mm f/2.8D IF-ED"},
+{0x42,0x54,0x44,0x44,0x18,0x18,0x44,0x02,0x00,0x00,0x00, "Nikon", "JAA129DA", "AF Nikkor 35mm f/2D"},
+{0x43,0x54,0x50,0x50,0x0C,0x0C,0x46,0x02,0x00,0x00,0x00, "Nikon", "JAA011DB", "AF Nikkor 50mm f/1.4D"},
+{0x44,0x44,0x60,0x80,0x34,0x3C,0x47,0x02,0x00,0x00,0x00, "Nikon", "JAA753DB", "AF Zoom-Nikkor 80-200mm f/4.5-5.6D"},
+{0x45,0x40,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x00,0x00, "Nikon", "JAA752DA", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"},
+{0x46,0x3C,0x44,0x60,0x30,0x3C,0x49,0x02,0x00,0x00,0x00, "Nikon", "JAA754DA", "AF Zoom-Nikkor 35-80mm f/4-5.6D N"},
+{0x47,0x42,0x37,0x50,0x2A,0x34,0x4A,0x02,0x00,0x00,0x00, "Nikon", "JAA756DA", "AF Zoom-Nikkor 24-50mm f/3.3-4.5D"},
+{0x48,0x48,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x07,0x00,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED"},
+{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-14E"},
+{0x48,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-17E"},
+{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-20E"},
+{0x49,0x3C,0xA6,0xA6,0x30,0x30,0x4C,0x02,0x07,0x00,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED"},
+{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-14E"},
+{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-17E"},
+{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-20E"},
+{0x4A,0x54,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Nikon", "JAA332DA", "AF Nikkor 85mm f/1.4D IF"},
+{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0x4E,0x02,0x07,0x00,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED"},
+{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-14E"},
+{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-17E"},
+{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-20E"},
+{0x4C,0x40,0x37,0x6E,0x2C,0x3C,0x4F,0x02,0x00,0x00,0x00, "Nikon", "JAA757DA", "AF Zoom-Nikkor 24-120mm f/3.5-5.6D IF"},
+{0x4D,0x40,0x3C,0x80,0x2C,0x3C,0x62,0x02,0x00,0x00,0x00, "Nikon", "JAA758DA", "AF Zoom-Nikkor 28-200mm f/3.5-5.6D IF"},
+{0x4E,0x48,0x72,0x72,0x18,0x18,0x51,0x02,0x00,0x00,0x00, "Nikon", "JAA329DA", "AF DC-Nikkor 135mm f/2D"},
+{0x4F,0x40,0x37,0x5C,0x2C,0x3C,0x53,0x06,0x00,0x00,0x00, "Nikon", "JBA701AA", "IX-Nikkor 24-70mm f/3.5-5.6"},
+{0x50,0x48,0x56,0x7C,0x30,0x3C,0x54,0x06,0x00,0x00,0x00, "Nikon", "JBA702AA", "IX-Nikkor 60-180mm f/4-5.6"},
+//                                                  "JBA703AC" "IX-Nikkor 20-60 mm f/3.5-5.6";
 //51
 //52
-{0x53,0x48,0x60,0x80,0x24,0x24,0x57,0x02,0x00,0x00, "Nikon", "JAA762DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
-{0x53,0x48,0x60,0x80,0x24,0x24,0x60,0x02,0x00,0x00, "Nikon", "JAA762DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
-{0x54,0x44,0x5C,0x7C,0x34,0x3C,0x58,0x02,0x00,0x00, "Nikon", "JAA763DA", "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"},
+{0x53,0x48,0x60,0x80,0x24,0x24,0x57,0x02,0x00,0x00,0x00, "Nikon", "JAA762DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+{0x53,0x48,0x60,0x80,0x24,0x24,0x60,0x02,0x00,0x00,0x00, "Nikon", "JAA762DA", "AF Zoom-Nikkor 80-200mm f/2.8D ED"},
+{0x54,0x44,0x5C,0x7C,0x34,0x3C,0x58,0x02,0x00,0x00,0x00, "Nikon", "JAA763DA", "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED"},
 //55
-{0x56,0x48,0x5C,0x8E,0x30,0x3C,0x5A,0x02,0x00,0x00, "Nikon", "JAA764DA", "AF Zoom-Nikkor 70-300mm f/4-5.6D ED"},
+{0x56,0x48,0x5C,0x8E,0x30,0x3C,0x5A,0x02,0x00,0x00,0x00, "Nikon", "JAA764DA", "AF Zoom-Nikkor 70-300mm f/4-5.6D ED"},
 //57
 //58
-{0x59,0x48,0x98,0x98,0x24,0x24,0x5D,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED"},
-{0x59,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E"},
-{0x59,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E"},
-{0x59,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-20E"},
-{0x5A,0x3C,0x3E,0x56,0x30,0x3C,0x5E,0x06,0x00,0x00, "Nikon", "JBA704AA", "IX-Nikkor 30-60mm f/4-5.6"},
-{0x5B,0x44,0x56,0x7C,0x34,0x3C,0x5F,0x06,0x00,0x00, "Nikon", "JBA705AA", "IX-Nikkor 60-180mm f/4.5-5.6"},
-//                                             "JBA706AC" "IX-Nikkor 20-60 mm f/3.5-5.6N";
+{0x59,0x48,0x98,0x98,0x24,0x24,0x5D,0x02,0x07,0x00,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED"},
+{0x59,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x0F,0x00,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E"},
+{0x59,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x0F,0x00,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E"},
+{0x59,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x0F,0x00,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-20E"},
+{0x5A,0x3C,0x3E,0x56,0x30,0x3C,0x5E,0x06,0x00,0x00,0x00, "Nikon", "JBA704AA", "IX-Nikkor 30-60mm f/4-5.6"},
+{0x5B,0x44,0x56,0x7C,0x34,0x3C,0x5F,0x06,0x00,0x00,0x00, "Nikon", "JBA705AA", "IX-Nikkor 60-180mm f/4.5-5.6"},
+//                                                  "JBA706AC" "IX-Nikkor 20-60 mm f/3.5-5.6N";
 //5C
-{0x5D,0x48,0x3C,0x5C,0x24,0x24,0x63,0x02,0x05,0x00, "Nikon", "JAA767DA", "AF-S Zoom-Nikkor 28-70mm f/2.8D IF-ED"},
-{0x5E,0x48,0x60,0x80,0x24,0x24,0x64,0x02,0x05,0x00, "Nikon", "JAA765DA", "AF-S Zoom-Nikkor 80-200mm f/2.8D IF-ED"},
-{0x5F,0x40,0x3C,0x6A,0x2C,0x34,0x65,0x02,0x00,0x00, "Nikon", "JAA766DA", "AF Zoom-Nikkor 28-105mm f/3.5-4.5D IF"},
-{0x60,0x40,0x3C,0x60,0x2C,0x3C,0x66,0x02,0x00,0x00, "Nikon", "JAA769DA", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"},
-{0x61,0x44,0x5E,0x86,0x34,0x3C,0x67,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 75-240mm f/4.5-5.6D"},
+{0x5D,0x48,0x3C,0x5C,0x24,0x24,0x63,0x02,0x01,0x00,0x00, "Nikon", "JAA767DA", "AF-S Zoom-Nikkor 28-70mm f/2.8D IF-ED"},
+{0x5E,0x48,0x60,0x80,0x24,0x24,0x64,0x02,0x03,0x00,0x00, "Nikon", "JAA765DA", "AF-S Zoom-Nikkor 80-200mm f/2.8D IF-ED"},
+{0x5F,0x40,0x3C,0x6A,0x2C,0x34,0x65,0x02,0x00,0x00,0x00, "Nikon", "JAA766DA", "AF Zoom-Nikkor 28-105mm f/3.5-4.5D IF"},
+{0x60,0x40,0x3C,0x60,0x2C,0x3C,0x66,0x02,0x00,0x00,0x00, "Nikon", "JAA769DA", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"},
+{0x61,0x44,0x5E,0x86,0x34,0x3C,0x67,0x02,0x00,0x00,0x00, "Nikon", "JAA768DA", "AF Zoom-Nikkor 75-240mm f/4.5-5.6D"},
 //62                69
-{0x63,0x48,0x2B,0x44,0x24,0x24,0x68,0x02,0x05,0x00, "Nikon", "JAA770DA", "AF-S Nikkor 17-35mm f/2.8D IF-ED"},
-{0x64,0x00,0x62,0x62,0x24,0x24,0x6A,0x02,0x00,0x00, "Nikon", "JAA628DA", "PC Micro-Nikkor 85mm f/2.8D"},
-{0x65,0x44,0x60,0x98,0x34,0x3C,0x6B,0x0A,0x00,0x00, "Nikon", "JAA771DA", "AF VR Zoom-Nikkor 80-400mm f/4.5-5.6D ED"},
-{0x66,0x40,0x2D,0x44,0x2C,0x34,0x6C,0x02,0x00,0x00, "Nikon", "JAA772DA", "AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED"},
-{0x67,0x48,0x37,0x62,0x24,0x30,0x6D,0x02,0x00,0x00, "Nikon", "JAA774DA", "AF Zoom-Nikkor 24-85mm f/2.8-4D IF"},
-{0x68,0x42,0x3C,0x60,0x2A,0x3C,0x6E,0x06,0x00,0x00, "Nikon", "JAA777DA", "AF Zoom-Nikkor 28-80mm f/3.3-5.6G"},
-{0x69,0x48,0x5C,0x8E,0x30,0x3C,0x6F,0x06,0x00,0x00, "Nikon", "JAA776DA", "AF Zoom-Nikkor 70-300mm f/4-5.6G"},
-{0x6A,0x48,0x8E,0x8E,0x30,0x30,0x70,0x02,0x00,0x00, "Nikon", "JAA334DA", "AF-S Nikkor 300mm f/4D IF-ED"},
-{0x6B,0x48,0x24,0x24,0x24,0x24,0x71,0x02,0x00,0x00, "Nikon", "JAA130DA", "AF Nikkor ED 14mm f/2.8D"},
+{0x63,0x48,0x2B,0x44,0x24,0x24,0x68,0x02,0x01,0x00,0x00, "Nikon", "JAA770DA", "AF-S Nikkor 17-35mm f/2.8D IF-ED"},
+{0x64,0x00,0x62,0x62,0x24,0x24,0x6A,0x02,0x40,0x00,0x00, "Nikon", "JAA628DA", "PC Micro-Nikkor 85mm f/2.8D"},
+{0x65,0x44,0x60,0x98,0x34,0x3C,0x6B,0x0A,0x00,0x00,0x00, "Nikon", "JAA771DA", "AF VR Zoom-Nikkor 80-400mm f/4.5-5.6D ED"},
+{0x66,0x40,0x2D,0x44,0x2C,0x34,0x6C,0x02,0x00,0x00,0x00, "Nikon", "JAA772DA", "AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED"},
+{0x67,0x48,0x37,0x62,0x24,0x30,0x6D,0x02,0x00,0x00,0x00, "Nikon", "JAA774DA", "AF Zoom-Nikkor 24-85mm f/2.8-4D IF"},
+{0x68,0x42,0x3C,0x60,0x2A,0x3C,0x6E,0x06,0x00,0x00,0x00, "Nikon", "JAA777DA", "AF Zoom-Nikkor 28-80mm f/3.3-5.6G"},
+{0x69,0x48,0x5C,0x8E,0x30,0x3C,0x6F,0x06,0x00,0x00,0x00, "Nikon", "JAA776DA", "AF Zoom-Nikkor 70-300mm f/4-5.6G"},
+{0x6A,0x48,0x8E,0x8E,0x30,0x30,0x70,0x02,0x03,0x00,0x00, "Nikon", "JAA334DA", "AF-S Nikkor 300mm f/4D IF-ED"},
+{0x6B,0x48,0x24,0x24,0x24,0x24,0x71,0x02,0x00,0x00,0x00, "Nikon", "JAA130DA", "AF Nikkor ED 14mm f/2.8D"},
 //6C                72
-{0x6D,0x48,0x8E,0x8E,0x24,0x24,0x73,0x02,0x04,0x00, "Nikon", "JAA335DA", "AF-S Nikkor 300mm f/2.8D IF-ED II"},
-{0x6E,0x48,0x98,0x98,0x24,0x24,0x74,0x02,0x04,0x00, "Nikon", "JAA525DA", "AF-S Nikkor 400mm f/2.8D IF-ED II"},
-{0x6F,0x3C,0xA0,0xA0,0x30,0x30,0x75,0x02,0x04,0x00, "Nikon", "JAA526DA", "AF-S Nikkor 500mm f/4D IF-ED II"},
-{0x70,0x3C,0xA6,0xA6,0x30,0x30,0x76,0x02,0x04,0x00, "Nikon", "JAA527DA", "AF-S Nikkor 600mm f/4D IF-ED II"},
+{0x6D,0x48,0x8E,0x8E,0x24,0x24,0x73,0x02,0x03,0x00,0x00, "Nikon", "JAA335DA", "AF-S Nikkor 300mm f/2.8D IF-ED II"},
+{0x6E,0x48,0x98,0x98,0x24,0x24,0x74,0x02,0x03,0x00,0x00, "Nikon", "JAA525DA", "AF-S Nikkor 400mm f/2.8D IF-ED II"},
+{0x6F,0x3C,0xA0,0xA0,0x30,0x30,0x75,0x02,0x03,0x00,0x00, "Nikon", "JAA526DA", "AF-S Nikkor 500mm f/4D IF-ED II"},
+{0x70,0x3C,0xA6,0xA6,0x30,0x30,0x76,0x02,0x03,0x00,0x00, "Nikon", "JAA527DA", "AF-S Nikkor 600mm f/4D IF-ED II"},
 //71
-{0x72,0x48,0x4C,0x4C,0x24,0x24,0x77,0x00,0x00,0x00, "Nikon", "JAA012AA", "Nikkor 45mm f/2.8 P"},
+{0x72,0x48,0x4C,0x4C,0x24,0x24,0x77,0x00,0x00,0x00,0x00, "Nikon", "JAA012AA", "Nikkor 45mm f/2.8 P"},
 //73
-{0x74,0x40,0x37,0x62,0x2C,0x34,0x78,0x06,0x05,0x00, "Nikon", "JAA780DA", "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
-{0x75,0x40,0x3C,0x68,0x2C,0x3C,0x79,0x06,0x00,0x00, "Nikon", "JAA778DA", "AF Zoom-Nikkor 28-100mm f/3.5-5.6G"},
-{0x76,0x58,0x50,0x50,0x14,0x14,0x7A,0x02,0x00,0x00, "Nikon", "JAA013DA", "AF Nikkor 50mm f/1.8D"},
-{0x77,0x48,0x5C,0x80,0x24,0x24,0x7B,0x0E,0x04,0x00, "Nikon", "JAA781DA", "AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED"},
-{0x78,0x40,0x37,0x6E,0x2C,0x3C,0x7C,0x0E,0x05,0x00, "Nikon", "JAA782DA", "AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED"},
-{0x79,0x40,0x3C,0x80,0x2C,0x3C,0x7F,0x06,0x00,0x00, "Nikon", "JAA783DA", "AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED"},
-{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x05,0x00, "Nikon", "JAA784DA", "AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED"},
-{0x7B,0x48,0x80,0x98,0x30,0x30,0x80,0x0E,0x04,0x00, "Nikon", "JAA787DA", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED"},
+{0x74,0x40,0x37,0x62,0x2C,0x34,0x78,0x06,0x01,0x00,0x00, "Nikon", "JAA780DA", "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
+{0x75,0x40,0x3C,0x68,0x2C,0x3C,0x79,0x06,0x00,0x00,0x00, "Nikon", "JAA778DA", "AF Zoom-Nikkor 28-100mm f/3.5-5.6G"},
+{0x76,0x58,0x50,0x50,0x14,0x14,0x7A,0x02,0x00,0x00,0x00, "Nikon", "JAA013DA", "AF Nikkor 50mm f/1.8D"},
+{0x77,0x48,0x5C,0x80,0x24,0x24,0x7B,0x0E,0x03,0x00,0x00, "Nikon", "JAA781DA", "AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED"},
+{0x78,0x40,0x37,0x6E,0x2C,0x3C,0x7C,0x0E,0x01,0x00,0x00, "Nikon", "JAA782DA", "AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED"},
+{0x79,0x40,0x3C,0x80,0x2C,0x3C,0x7F,0x06,0x00,0x00,0x00, "Nikon", "JAA783DA", "AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED"},
+{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x01,0x00, "Nikon", "JAA784DA", "AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED"},
+{0x7B,0x48,0x80,0x98,0x30,0x30,0x80,0x0E,0x03,0x00,0x00, "Nikon", "JAA787DA", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED"},
 //7C                81
-{0x7D,0x48,0x2B,0x53,0x24,0x24,0x82,0x06,0x01,0x00, "Nikon", "JAA788DA", "AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED"},
+{0x7D,0x48,0x2B,0x53,0x24,0x24,0x82,0x06,0x01,0x00,0x00, "Nikon", "JAA788DA", "AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED"},
 //7E                83
-{0x7F,0x40,0x2D,0x5C,0x2C,0x34,0x84,0x06,0x01,0x00, "Nikon", "JAA790DA", "AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED"},
-{0x80,0x48,0x1A,0x1A,0x24,0x24,0x85,0x06,0x00,0x00, "Nikon", "JAA629DA", "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"},
-{0x81,0x54,0x80,0x80,0x18,0x18,0x86,0x0E,0x03,0x00, "Nikon", "JAA336DA", "AF-S VR Nikkor 200mm f/2G IF-ED"},
-{0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E,0x03,0x00, "Nikon", "JAA337DA", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
-//83
-//84
-//85
+{0x7F,0x40,0x2D,0x5C,0x2C,0x34,0x84,0x06,0x11,0x00,0x00, "Nikon", "JAA790DA", "AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED"},
+{0x80,0x48,0x1A,0x1A,0x24,0x24,0x85,0x06,0x00,0x00,0x00, "Nikon", "JAA629DA", "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"},
+{0x81,0x54,0x80,0x80,0x18,0x18,0x86,0x0E,0x03,0x00,0x00, "Nikon", "JAA336DA", "AF-S VR Nikkor 200mm f/2G IF-ED"},
+{0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E,0x13,0x00,0x00, "Nikon", "JAA337DA", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
+{0x83,0x00,0xB0,0xB0,0x5A,0x5A,0x88,0x04,0x00,0x00,0x00, "Nikon", "", "FSA-L2, EDG 65, 800mm F13 G"},
+//84                
+//85                 
 //86
 //87
-//88
-{0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x00,0x00, "Nikon", "JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
-{0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x03,0x00, "Nikon", "JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
-{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x00,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
-{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x00,0x00, "Nikon", "JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED (II)"},
-{0x8C,0x40,0x2D,0x53,0x2C,0x3C,0x8E,0x06,0x00,0x00, "Nikon", "JAA792DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"},
-{0x8D,0x44,0x5C,0x8E,0x34,0x3C,0x8F,0x0E,0x00,0x00, "Nikon", "JAA795DA", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"},
+//88                
+{0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x01,0x00,0x00, "Nikon", "JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
+{0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x53,0x00,0x00, "Nikon", "JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
+{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x01,0x00,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
+{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x01,0x01,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"},
+{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x01,0x02,0x00, "Nikon", "JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II"},
+{0x8C,0x40,0x2D,0x53,0x2C,0x3C,0x8E,0x06,0x01,0x00,0x00, "Nikon", "JAA792DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"},
+{0x8D,0x44,0x5C,0x8E,0x34,0x3C,0x8F,0x0E,0x31,0x00,0x00, "Nikon", "JAA795DA", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"},
 //8E                90
-{0x8F,0x40,0x2D,0x72,0x2C,0x3C,0x91,0x06,0x00,0x00, "Nikon", "JAA796DA", "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED"},
-{0x90,0x3B,0x53,0x80,0x30,0x3C,0x92,0x0E,0x00,0x00, "Nikon", "JAA798DA", "AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED"},
+{0x8F,0x40,0x2D,0x72,0x2C,0x3C,0x91,0x06,0x01,0x00,0x00, "Nikon", "JAA796DA", "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED"},
+{0x90,0x3B,0x53,0x80,0x30,0x3C,0x92,0x0E,0x01,0x00,0x00, "Nikon", "JAA798DA", "AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED"},
 //91                93
-{0x92,0x48,0x24,0x37,0x24,0x24,0x94,0x06,0x01,0x00, "Nikon", "JAA801DA", "AF-S Zoom-Nikkor 14-24mm f/2.8G ED"},
-{0x93,0x48,0x37,0x5C,0x24,0x24,0x95,0x06,0x01,0x00, "Nikon", "JAA802DA", "AF-S Zoom-Nikkor 24-70mm f/2.8G ED"},
-{0x94,0x40,0x2D,0x53,0x2C,0x3C,0x96,0x06,0x00,0x00, "Nikon", "JAA797DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II"},
-{0x95,0x4C,0x37,0x37,0x2C,0x2C,0x97,0x02,0x00,0x00, "Nikon", "JAA631DA", "PC-E Nikkor 24mm f/3.5D ED"},
-{0x95,0x00,0x37,0x37,0x2C,0x2C,0x97,0x06,0x00,0x00, "Nikon", "JAA631DA", "PC-E Nikkor 24mm f/3.5D ED"},
-{0x96,0x48,0x98,0x98,0x24,0x24,0x98,0x0E,0x02,0x00, "Nikon", "JAA528DA", "AF-S VR Nikkor 400mm f/2.8G ED"},
-{0x97,0x3C,0xA0,0xA0,0x30,0x30,0x99,0x0E,0x02,0x00, "Nikon", "JAA529DA", "AF-S VR Nikkor 500mm f/4G ED"},
-{0x98,0x3C,0xA6,0xA6,0x30,0x30,0x9A,0x0E,0x02,0x00, "Nikon", "JAA530DA", "AF-S VR Nikkor 600mm f/4G ED"},
-{0x99,0x40,0x29,0x62,0x2C,0x3C,0x9B,0x0E,0x00,0x00, "Nikon", "JAA800DA", "AF-S DX VR Zoom-Nikkor 16-85mm f/3.5-5.6G ED"},
-{0x9A,0x40,0x2D,0x53,0x2C,0x3C,0x9C,0x0E,0x00,0x00, "Nikon", "JAA803DA", "AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G"},
-{0x9B,0x54,0x4C,0x4C,0x24,0x24,0x9D,0x02,0x00,0x00, "Nikon", "JAA633DA", "PC-E Micro Nikkor 45mm f/2.8D ED"},
-{0x9B,0x00,0x4C,0x4C,0x24,0x24,0x9D,0x06,0x00,0x00, "Nikon", "JAA633DA", "PC-E Micro Nikkor 45mm f/2.8D ED"},
-{0x9C,0x54,0x56,0x56,0x24,0x24,0x9E,0x06,0x00,0x00, "Nikon", "JAA632DA", "AF-S Micro Nikkor 60mm f/2.8G ED"},
-{0x9D,0x54,0x62,0x62,0x24,0x24,0x9F,0x02,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"},
-{0x9D,0x00,0x62,0x62,0x24,0x24,0x9F,0x06,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"},
-{0x9E,0x40,0x2D,0x6A,0x2C,0x3C,0xA0,0x0E,0x00,0x00, "Nikon", "JAA805DA", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
-{0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06,0x00,0x00, "Nikon", "JAA132DA", "AF-S DX Nikkor 35mm f/1.8G"},
-{0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"},
-{0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
-{0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"},
-//
-//
-{0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
-{0x01,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x20,0x00, "Nikon", "JAA908DA", "TC-14E"},
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x20,0x00, "Nikon", "JAA909DA", "TC-20E"},
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x20,0x00, "Nikon", "JAA910DA", "TC-14E II"},
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x20,0x00, "Nikon", "JAA911DA", "TC-20E II"},
-{0x00,0x00,0x00,0x00,0x00,0x00,0xE1,0x12,0x20,0x00, "Nikon", "JAA912DA", "TC-17E II"},
+{0x92,0x48,0x24,0x37,0x24,0x24,0x94,0x06,0x01,0x00,0x00, "Nikon", "JAA801DA", "AF-S Zoom-Nikkor 14-24mm f/2.8G ED"},
+{0x93,0x48,0x37,0x5C,0x24,0x24,0x95,0x06,0x01,0x00,0x00, "Nikon", "JAA802DA", "AF-S Zoom-Nikkor 24-70mm f/2.8G ED"},
+{0x94,0x40,0x2D,0x53,0x2C,0x3C,0x96,0x06,0x01,0x00,0x00, "Nikon", "JAA797DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II"},
+{0x95,0x4C,0x37,0x37,0x2C,0x2C,0x97,0x02,0x00,0x00,0x00, "Nikon", "JAA631DA", "PC-E Nikkor 24mm f/3.5D ED"},
+{0x95,0x00,0x37,0x37,0x2C,0x2C,0x97,0x06,0x00,0x00,0x00, "Nikon", "JAA631DA", "PC-E Nikkor 24mm f/3.5D ED"},
+{0x96,0x48,0x98,0x98,0x24,0x24,0x98,0x0E,0x13,0x00,0x00, "Nikon", "JAA528DA", "AF-S VR Nikkor 400mm f/2.8G ED"},
+{0x97,0x3C,0xA0,0xA0,0x30,0x30,0x99,0x0E,0x13,0x00,0x00, "Nikon", "JAA529DA", "AF-S VR Nikkor 500mm f/4G ED"},
+{0x98,0x3C,0xA6,0xA6,0x30,0x30,0x9A,0x0E,0x13,0x00,0x00, "Nikon", "JAA530DA", "AF-S VR Nikkor 600mm f/4G ED"},
+{0x99,0x40,0x29,0x62,0x2C,0x3C,0x9B,0x0E,0x01,0x00,0x00, "Nikon", "JAA800DA", "AF-S DX VR Zoom-Nikkor 16-85mm f/3.5-5.6G ED"},
+{0x9A,0x40,0x2D,0x53,0x2C,0x3C,0x9C,0x0E,0x01,0x00,0x00, "Nikon", "JAA803DA", "AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G"},
+{0x9B,0x54,0x4C,0x4C,0x24,0x24,0x9D,0x02,0x00,0x00,0x00, "Nikon", "JAA633DA", "PC-E Micro Nikkor 45mm f/2.8D ED"},
+{0x9B,0x00,0x4C,0x4C,0x24,0x24,0x9D,0x06,0x00,0x00,0x00, "Nikon", "JAA633DA", "PC-E Micro Nikkor 45mm f/2.8D ED"},
+{0x9C,0x54,0x56,0x56,0x24,0x24,0x9E,0x06,0x41,0x00,0x00, "Nikon", "JAA632DA", "AF-S Micro Nikkor 60mm f/2.8G ED"},
+{0x9D,0x54,0x62,0x62,0x24,0x24,0x9F,0x02,0x40,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"},
+{0x9D,0x00,0x62,0x62,0x24,0x24,0x9F,0x06,0x40,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"},
+{0x9E,0x40,0x2D,0x6A,0x2C,0x3C,0xA0,0x0E,0x01,0x00,0x00, "Nikon", "JAA805DA", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
+{0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06,0x01,0x00,0x00, "Nikon", "JAA132DA", "AF-S DX Nikkor 35mm f/1.8G"},
+{0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x01,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"},
+{0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x01,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
+{0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x13,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"},
+{0xA3,0x3C,0x29,0x44,0x30,0x30,0xA5,0x0E,0x01,0x00,0x00, "Nikon", "JAA806DA", "AF-S Nikkor 16-35mm f/4G ED VR"},
+{0xA4,0x54,0x37,0x37,0x0C,0x0C,0xA6,0x06,0x01,0x00,0x00, "Nikon", "JAA131DA", "AF-S Nikkor 24mm f/1.4G ED"},
+{0xA5,0x40,0x3C,0x8E,0x2C,0x3C,0xA7,0x0E,0x01,0x00,0x00, "Nikon", "JAA808DA", "AF-S Nikkor 28-300mm f/3.5-5.6G ED VR"},
+{0xA6,0x48,0x8E,0x8E,0x24,0x24,0xA8,0x0E,0x13,0x00,0x00, "Nikon", "JAA339DA", "AF-S VR Nikkor 300mm f/2.8G IF-ED II"},
+{0xA7,0x4B,0x62,0x62,0x2C,0x2C,0xA9,0x0E,0x41,0x00,0x00, "Nikon", "JAA637DA", "AF-S DX Micro Nikkor 85mm f/3.5G ED VR"},
+//A8                AA
+{0xA9,0x54,0x80,0x80,0x18,0x18,0xAB,0x0E,0x13,0x00,0x00, "Nikon", "JAA340DA", "AF-S Nikkor 200mm f/2G ED VR II"},
+{0xAA,0x3C,0x37,0x6E,0x30,0x30,0xAC,0x0E,0x01,0x00,0x00, "Nikon", "JAA811DA", "AF-S Nikkor 24-120mm f/4G ED VR"},
+//AB                AD
+{0xAC,0x38,0x53,0x8E,0x34,0x3C,0xAE,0x0E,0x01,0x00,0x00, "Nikon", "JAA814DA", "AF-S DX VR Nikkor 55-300mm 4.5-5.6G ED"},
+//AD                AF
+{0xAE,0x54,0x62,0x62,0x0C,0x0C,0xB0,0x06,0x01,0x00,0x00, "Nikon", "JAA338DA", "AF-S Nikkor 85mm f/1.4G"},
+{0xAF,0x54,0x44,0x44,0x0C,0x0C,0xB1,0x06,0x01,0x00,0x00, "Nikon", "JAA134DA", "AF-S Nikkor 35mm f/1.4G"},
+//
+{0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
+{0x01,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
 //
 //------------------------------------------------------------------------------
 // Sigma lenses by focal length, first fixed then zoom lenses
 //------------------------------------------------------------------------------
 //
-{0xFE,0x47,0x00,0x00,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "486556", "4.5mm F2.8 EX DC HSM Circular Fisheye"},
-{0x26,0x48,0x11,0x11,0x30,0x30,0x1C,0x02,0x00,0x05, "Sigma", "483", "8mm F4 EX Circular Fisheye"},
-{0x79,0x40,0x11,0x11,0x2C,0x2C,0x1C,0x06,0x00,0x05, "Sigma", "485597", "8mm F3.5 EX Circular Fisheye"},
-{0xDC,0x48,0x19,0x19,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "477554", "10mm F2.8 EX DC HSM Fisheye"},
-{0x02,0x3F,0x24,0x24,0x2C,0x2C,0x02,0x00,0x00,0x05, "Sigma", "468", "14mm F3.5"},
-{0x48,0x48,0x24,0x24,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "", "14mm F2.8 EX Aspherical HSM"},
-{0x26,0x48,0x27,0x27,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "476441", "15mm F2.8 EX Diagonal Fisheye"},
-//                                     "Sigma" "410"    "18mm F3.5";
-{0x26,0x58,0x31,0x31,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "411442", "20mm F1.8 EX DG Aspherical RF"},
-{0x26,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"},
-{0xE1,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"},
-{0x02,0x46,0x37,0x37,0x25,0x25,0x02,0x00,0x00,0x05, "Sigma", "438", "24mm F2.8 Super Wide II Macro"},
-{0x26,0x58,0x3C,0x3C,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "440442", "28mm F1.8 EX DG Aspherical Macro"},
-{0x48,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
-{0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
-{0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x05, "Sigma", "310554", "50mm F1.4 EX DG HSM"},
-{0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x05, "Sigma", "346447", "Macro 50mm F2.8 EX DG"},
-{0x79,0x48,0x5C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x05, "Sigma", "270599", "Macro 70mm F2.8 EX DG"},
-{0x02,0x48,0x65,0x65,0x24,0x24,0x02,0x00,0x00,0x05, "Sigma", "", "90mm F2.8 Macro"},
-{0x32,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x00,0x05, "Sigma", "256", "Macro 105mm F2.8 EX DG"},
-{0xE5,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x00,0x05, "Sigma", "257446", "Macro 105mm F2.8 EX DG"},
-{0x48,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x04,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"},
-{0xF5,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x04,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"},
-{0x48,0x4C,0x7C,0x7C,0x2C,0x2C,0x4B,0x02,0x00,0x05, "Sigma", "", "180mm F3.5 EX DG Macro"},
-{0x48,0x4C,0x7D,0x7D,0x2C,0x2C,0x4B,0x02,0x00,0x05, "Sigma", "105556", "APO Macro 180mm F3.5 EX DG HSM"},
-{0x48,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 300mm F2.8 EX DG HSM"},
-{0xFB,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "195557", "APO 300mm F2.8 EX DG HSM"},
-{0x26,0x48,0x8E,0x8E,0x30,0x30,0x1C,0x02,0x00,0x05, "Sigma", "", "APO Tele Macro 300mm F4"},
-{0x02,0x2F,0x98,0x98,0x3D,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "400mm F5.6 APO"},
-{0x02,0x37,0xA0,0xA0,0x34,0x34,0x02,0x00,0x00,0x05, "Sigma", "", "APO 500mm F4.5"},
-{0x48,0x44,0xA0,0xA0,0x34,0x34,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 500mm F4.5 EX HSM"},
-//                                     "Sigma" ""       "500mm F7.2 APO";
-//                                     "Sigma" ""       "800mm F5.6 APO";
-{0x48,0x3C,0xB0,0xB0,0x3C,0x3C,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 800mm F5.6 EX HSM"},
-//                                     "Sigma" "152550" "APO 800mm F5.6 EX DG HSM";
-//
-{0xA1,0x41,0x19,0x31,0x2C,0x2C,0x4B,0x06,0x00,0x05, "Sigma", "", "10-20mm F3.5 EX DC HSM"},
-{0x48,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"},
-{0xF9,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"},
-{0x48,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"},
-{0xF0,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"},
-{0x26,0x40,0x27,0x3F,0x2C,0x34,0x1C,0x02,0x00,0x05, "Sigma", "", "15-30mm F3.5-4.5 EX DG Aspherical DF"},
-{0x48,0x48,0x2B,0x44,0x24,0x30,0x4B,0x06,0x00,0x05, "Sigma", "", "17-35mm F2.8-4 EX DG  Aspherical HSM"},
-{0x26,0x54,0x2B,0x44,0x24,0x30,0x1C,0x02,0x00,0x05, "Sigma", "", "17-35mm F2.8-4 EX Aspherical"},
-{0x7A,0x47,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
-{0x7A,0x48,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
-{0x7F,0x48,0x2B,0x5C,0x24,0x34,0x1C,0x06,0x00,0x05, "Sigma", "", "17-70mm F2.8-4.5 DC Macro Asp. IF"},
-{0x26,0x40,0x2D,0x44,0x2B,0x34,0x1C,0x02,0x00,0x05, "Sigma", "", "18-35 F3.5-4.5 Aspherical"},
-{0x26,0x48,0x2D,0x50,0x24,0x24,0x1C,0x06,0x00,0x05, "Sigma", "", "18-50mm F2.8 EX DC"},
-{0x7F,0x48,0x2D,0x50,0x24,0x24,0x1C,0x06,0x00,0x05, "Sigma", "", "18-50mm F2.8 EX DC Macro"},
-{0x7A,0x48,0x2D,0x50,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "582593", "18-50mm F2.8 EX DC Macro"},
-{0x26,0x40,0x2D,0x50,0x2C,0x3C,0x1C,0x06,0x00,0x05, "Sigma", "", "18-50mm F3.5-5.6 DC"},
-{0x7A,0x40,0x2D,0x50,0x2C,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "551551", "18-50mm F3.5-5.6 DC HSM"},
-{0x26,0x40,0x2D,0x70,0x2B,0x3C,0x1C,0x06,0x00,0x05, "Sigma", "", "18-125mm F3.5-5.6 DC"},
-{0xCD,0x3D,0x2D,0x70,0x2E,0x3C,0x4B,0x0E,0x00,0x05, "Sigma", "853556", "18-125mm F3.8-5.6 DC OS HSM"},
-{0x26,0x40,0x2D,0x80,0x2C,0x40,0x1C,0x06,0x00,0x05, "Sigma", "777555", "18-200mm F3.5-6.3 DC"},
-{0xED,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x00,0x05, "Sigma", "888558", "18-200mm F3.5-6.3 DC OS HSM"},
-{0xA5,0x40,0x2D,0x88,0x2C,0x40,0x4B,0x0E,0x00,0x05, "Sigma", "", "18-250mm F3.5-6.3 DC OS HSM"},
-{0x26,0x48,0x31,0x49,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "", "20-40mm F2.8"},
-{0x26,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"},
-{0xB6,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"},
-{0xA6,0x48,0x37,0x5C,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "", "24-70mm F2.8 IF EX DG HSM"},
-{0x26,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "", "24-70mm F2.8 EX DG Macro"},
-{0x67,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
-{0xE9,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
-{0x26,0x40,0x37,0x5C,0x2C,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "24-70mm F3.5-5.6 Aspherical HF"},
-{0x26,0x54,0x37,0x73,0x24,0x34,0x1C,0x02,0x00,0x05, "Sigma", "", "24-135mm F2.8-4.5"},
-{0x02,0x46,0x3C,0x5C,0x25,0x25,0x02,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8"},
-{0x26,0x54,0x3C,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "", "28-70mm F2.8 EX"},
-{0x26,0x48,0x3C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x05, "Sigma", "549442", "28-70mm F2.8 EX DG"},
-{0x26,0x48,0x3C,0x5C,0x24,0x30,0x1C,0x02,0x00,0x05, "Sigma", "634445", "28-70mm F2.8-4 DG"},
-{0x02,0x3F,0x3C,0x5C,0x2D,0x35,0x02,0x00,0x00,0x05, "Sigma", "", "28-70mm F3.5-4.5 UC"},
-{0x26,0x40,0x3C,0x60,0x2C,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "28-80mm F3.5-5.6 Mini Zoom Macro II Aspherical"},
-{0x26,0x40,0x3C,0x65,0x2C,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "28-90mm F3.5-5.6 Macro"},
-{0x26,0x48,0x3C,0x6A,0x24,0x30,0x1C,0x02,0x00,0x05, "Sigma", "", "28-105mm F2.8-4 Aspherical"},
-{0x26,0x3E,0x3C,0x6A,0x2E,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "28-105mm F3.8-5.6 UC-III Aspherical IF"},
-{0x26,0x40,0x3C,0x80,0x2C,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "28-200mm F3.5-5.6 Compact Aspherical Hyperzoom Macro"},
-{0x26,0x40,0x3C,0x80,0x2B,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "28-200mm F3.5-5.6 Compact Aspherical Hyperzoom Macro"},
-{0x26,0x3D,0x3C,0x80,0x2F,0x3D,0x1C,0x02,0x00,0x05, "Sigma", "", "28-300mm F3.8-5.6 Aspherical"},
-{0x26,0x41,0x3C,0x8E,0x2C,0x40,0x1C,0x02,0x00,0x05, "Sigma", "795443", "28-300mm F3.5-6.3 DG Macro"},
-{0x26,0x40,0x3C,0x8E,0x2C,0x40,0x1C,0x02,0x00,0x05, "Sigma", "", "28-300mm F3.5-6.3 Macro"},
-{0x02,0x3B,0x44,0x61,0x30,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "35-80mm F4-5.6"},
-{0x02,0x40,0x44,0x73,0x2B,0x36,0x02,0x00,0x00,0x05, "Sigma", "", "35-135mm F3.5-4.5 a"},
-{0x7A,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "", "50-150mm F2.8 EX APO DC HSM"},
-{0xFD,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "691554", "50-150mm F2.8 EX APO DC HSM II"},
-{0x48,0x3C,0x50,0xA0,0x30,0x40,0x4B,0x02,0x04,0x05, "Sigma", "736552", "APO 50-500mm F4-6.3 EX HSM"},
-{0x26,0x3C,0x54,0x80,0x30,0x3C,0x1C,0x06,0x00,0x05, "Sigma", "", "55-200mm F4-5.6 DC"},
-{0x7A,0x3B,0x53,0x80,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "", "55-200mm F4-5.6 DC HSM"},
-{0x48,0x54,0x5C,0x80,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "", "70-200mm F2.8 EX APO IF HSM"},
-{0x7A,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "", "70-200mm F2.8 EX APO DG Macro HSM II"},
-{0xEE,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "579555", "70-200mm F2.8 EX APO DG Macro HSM II"},
-{0x02,0x46,0x5C,0x82,0x25,0x25,0x02,0x00,0x00,0x05, "Sigma", "", "70-210mm F2.8 APO"},
-{0x26,0x3C,0x5C,0x82,0x30,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "70-210mm F4-5.6 UC-II"},
-{0x26,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 DG Macro"},
-{0x56,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 APO Macro Super II"},
-{0xE0,0x3C,0x5C,0x8E,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 APO DG Macro HSM"},
-{0x02,0x37,0x5E,0x8E,0x35,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "75-300mm F4.5-5.6 APO"},
-{0x02,0x3A,0x5E,0x8E,0x32,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "75-300mm F4.0-5.6"},
-{0x77,0x44,0x61,0x98,0x34,0x3C,0x7B,0x0E,0x04,0x05, "Sigma", "", "80-400mm f4.5-5.6 EX OS"},
-{0x48,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02,0x04,0x05, "Sigma", "", "APO 100-300mm F4 EX IF HSM"},
-{0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02,0x04,0x05, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"},
-{0x7A,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x04,0x05, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"},
-{0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E,0x00,0x05, "Sigma", "", "APO 120-400mm F4.5-5.6 DG OS HSM"},
-{0x26,0x44,0x73,0x98,0x34,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "135-400mm F4.5-5.6 APO Aspherical"},
-{0xCE,0x34,0x76,0xA0,0x38,0x40,0x4B,0x0E,0x00,0x05, "Sigma", "", "APO 150-500mm F5-6.3 DG OS HSM"},
-{0x26,0x40,0x7B,0xA0,0x34,0x40,0x1C,0x02,0x00,0x05, "Sigma", "", "APO 170-500mm F5-6.3 Aspherical RF"},
-{0x48,0x3C,0x8E,0xB0,0x3C,0x3C,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 300-800 F5.6 EX DG HSM"},
-//
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x10,0x05, "Sigma", "", "APO Tele Converter 1.4x EX DG"},
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x10,0x05, "Sigma", "", "APO Tele Converter 2x EX DG"},
+{0xFE,0x47,0x00,0x00,0x24,0x24,0x4B,0x06,0x01,0x00,0x05, "Sigma", "486556", "4.5mm F2.8 EX DC HSM Circular Fisheye"},
+{0x26,0x48,0x11,0x11,0x30,0x30,0x1C,0x02,0x00,0x00,0x05, "Sigma", "483", "8mm F4 EX Circular Fisheye"},
+{0x79,0x40,0x11,0x11,0x2C,0x2C,0x1C,0x06,0x00,0x00,0x05, "Sigma", "485597", "8mm F3.5 EX Circular Fisheye"},
+{0xDC,0x48,0x19,0x19,0x24,0x24,0x4B,0x06,0x01,0x00,0x05, "Sigma", "477554", "10mm F2.8 EX DC HSM Fisheye"},
+{0x02,0x3F,0x24,0x24,0x2C,0x2C,0x02,0x00,0x00,0x00,0x05, "Sigma", "468", "14mm F3.5"},
+{0x48,0x48,0x24,0x24,0x24,0x24,0x4B,0x02,0x01,0x00,0x05, "Sigma", "", "14mm F2.8 EX Aspherical HSM"},
+{0x26,0x48,0x27,0x27,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "476441", "15mm F2.8 EX Diagonal Fisheye"},
+//M                                         "Sigma" "410"    "18mm F3.5";
+{0x26,0x58,0x31,0x31,0x14,0x14,0x1C,0x02,0x00,0x00,0x05, "Sigma", "411442", "20mm F1.8 EX DG Aspherical RF"},
+{0x26,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x00,0x05, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"},
+{0xE1,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x00,0x05, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"},
+{0x02,0x46,0x37,0x37,0x25,0x25,0x02,0x00,0x00,0x00,0x05, "Sigma", "438", "24mm F2.8 Super Wide II Macro"},
+{0x26,0x58,0x3C,0x3C,0x14,0x14,0x1C,0x02,0x00,0x00,0x05, "Sigma", "440442", "28mm F1.8 EX DG Aspherical Macro"},
+{0x48,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
+{0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
+{0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "310554", "50mm F1.4 EX DG HSM"},
+{0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x05, "Sigma", "346447", "Macro 50mm F2.8 EX DG"},
+{0x79,0x48,0x5C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "270599", "Macro 70mm F2.8 EX DG"},
+{0x02,0x48,0x65,0x65,0x24,0x24,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "Macro 90mm F2.8"},
+{0x32,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x00,0x02,0x05, "Sigma", "256", "Macro 105mm F2.8 EX DG"},
+{0xE5,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x40,0x00,0x05, "Sigma", "257446", "Macro 105mm F2.8 EX DG"},
+{0x48,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x43,0x00,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"},
+{0xF5,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x43,0x00,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"},
+{0x48,0x4C,0x7C,0x7C,0x2C,0x2C,0x4B,0x02,0x43,0x00,0x05, "Sigma", "", "APO Macro 180mm F3.5 EX DG HSM"},
+{0x48,0x4C,0x7D,0x7D,0x2C,0x2C,0x4B,0x02,0x43,0x00,0x05, "Sigma", "105556", "APO Macro 180mm F3.5 EX DG HSM"},
+//M                                         "Sigma" ""       "APO 300mm F2.8";
+{0x48,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x05, "Sigma", "", "APO 300mm F2.8 EX DG HSM"},
+{0xFB,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x13,0x00,0x05, "Sigma", "195557", "APO 300mm F2.8 EX DG HSM"},
+{0x26,0x48,0x8E,0x8E,0x30,0x30,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "APO Tele Macro 300mm F4"},
+{0x02,0x2F,0x98,0x98,0x3D,0x3D,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "APO 400mm F5.6"},
+{0x26,0x3C,0x98,0x98,0x3C,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "APO Tele Macro 400mm F5.6"},
+{0x02,0x37,0xA0,0xA0,0x34,0x34,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "APO 500mm F4.5"},
+{0x48,0x44,0xA0,0xA0,0x34,0x34,0x4B,0x02,0x03,0x00,0x05, "Sigma", "", "APO 500mm F4.5 EX HSM"},
+{0xF1,0x44,0xA0,0xA0,0x34,0x34,0x4B,0x02,0x03,0x00,0x05, "Sigma", "184551", "APO 500mm F4.5 EX DG HSM"},
+{0x02,0x34,0xA0,0xA0,0x44,0x44,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "APO 500mm F7.2"},
+{0x02,0x3C,0xB0,0xB0,0x3C,0x3C,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "APO 800mm F5.6"},
+{0x48,0x3C,0xB0,0xB0,0x3C,0x3C,0x4B,0x02,0x03,0x00,0x05, "Sigma", "", "APO 800mm F5.6 EX HSM"},
+//M                                         "Sigma" "152550" "APO 800mm F5.6 EX DG HSM";
+//M2    B8 B8 49 49 02" "00" "00" "00" "05" "Sigma" ""       "APO 1000mm F8.0";
+//
+{0xA1,0x41,0x19,0x31,0x2C,0x2C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "", "10-20mm F3.5 EX DC HSM"},
+{0x48,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"},
+{0xF9,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"},
+{0x48,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06,0x00,0x00,0x05, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"},
+{0xF0,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06,0x00,0x00,0x05, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"},
+{0x26,0x40,0x27,0x3F,0x2C,0x34,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "15-30mm F3.5-4.5 EX DG Aspherical DF"},
+{0x48,0x48,0x2B,0x44,0x24,0x30,0x4B,0x06,0x00,0x00,0x05, "Sigma", "", "17-35mm F2.8-4 EX DG  Aspherical HSM"},
+{0x26,0x54,0x2B,0x44,0x24,0x30,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "17-35mm F2.8-4 EX Aspherical"},
+{0x7A,0x47,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
+{0x7A,0x48,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
+{0x7F,0x48,0x2B,0x5C,0x24,0x34,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "17-70mm F2.8-4.5 DC Macro Asp. IF"},
+{0x26,0x40,0x2D,0x44,0x2B,0x34,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "18-35 F3.5-4.5 Aspherical"},
+{0x26,0x48,0x2D,0x50,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "18-50mm F2.8 EX DC"},
+{0x7F,0x48,0x2D,0x50,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "18-50mm F2.8 EX DC Macro"},
+{0x7A,0x48,0x2D,0x50,0x24,0x24,0x4B,0x06,0x01,0x00,0x05, "Sigma", "582593", "18-50mm F2.8 EX DC Macro"},
+{0xF6,0x48,0x2D,0x50,0x24,0x24,0x4B,0x06,0x01,0x00,0x05, "Sigma", "582593", "18-50mm F2.8 EX DC Macro"},
+{0xA4,0x47,0x2D,0x50,0x24,0x34,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "", "18-50mm F2.8-4.5 DC OS HSM"},
+{0x26,0x40,0x2D,0x50,0x2C,0x3C,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "18-50mm F3.5-5.6 DC"},
+{0x7A,0x40,0x2D,0x50,0x2C,0x3C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "551551", "18-50mm F3.5-5.6 DC HSM"},
+{0x26,0x40,0x2D,0x70,0x2B,0x3C,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "18-125mm F3.5-5.6 DC"},
+{0xCD,0x3D,0x2D,0x70,0x2E,0x3C,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "853556", "18-125mm F3.8-5.6 DC OS HSM"},
+{0x26,0x40,0x2D,0x80,0x2C,0x40,0x1C,0x06,0x00,0x00,0x05, "Sigma", "777555", "18-200mm F3.5-6.3 DC"},
+{0x7A,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "888558", "18-200mm F3.5-6.3 DC OS HSM"},
+{0xED,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "888558", "18-200mm F3.5-6.3 DC OS HSM"},
+{0xA5,0x40,0x2D,0x88,0x2C,0x40,0x4B,0x0E,0x01,0x00,0x05, "Sigma", "", "18-250mm F3.5-6.3 DC OS HSM"},
+{0x26,0x48,0x31,0x49,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "20-40mm F2.8"},
+{0x26,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"},
+{0xB6,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"},
+{0xA6,0x48,0x37,0x5C,0x24,0x24,0x4B,0x06,0x01,0x00,0x05, "Sigma", "571559", "24-70mm F2.8 IF EX DG HSM"},
+{0x26,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "24-70mm F2.8 EX DG Macro"},
+{0x67,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
+{0xE9,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
+{0x26,0x40,0x37,0x5C,0x2C,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "24-70mm F3.5-5.6 Aspherical HF"},
+{0x26,0x54,0x37,0x73,0x24,0x34,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "24-135mm F2.8-4.5"},
+{0x02,0x46,0x3C,0x5C,0x25,0x25,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8"},
+{0x26,0x54,0x3C,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8 EX"},
+{0x26,0x48,0x3C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "549442", "28-70mm F2.8 EX DG"},
+{0x26,0x48,0x3C,0x5C,0x24,0x30,0x1C,0x02,0x00,0x00,0x05, "Sigma", "634445", "28-70mm F2.8-4 DG"},
+{0x02,0x3F,0x3C,0x5C,0x2D,0x35,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "28-70mm F3.5-4.5 UC"},
+{0x26,0x40,0x3C,0x60,0x2C,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-80mm F3.5-5.6 Mini Zoom Macro II Aspherical"},
+{0x26,0x40,0x3C,0x65,0x2C,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-90mm F3.5-5.6 Macro"},
+{0x26,0x48,0x3C,0x6A,0x24,0x30,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-105mm F2.8-4 Aspherical"},
+{0x26,0x3E,0x3C,0x6A,0x2E,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-105mm F3.8-5.6 UC-III Aspherical IF"},
+{0x26,0x40,0x3C,0x80,0x2C,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-200mm F3.5-5.6 Compact Aspherical Hyperzoom Macro"},
+{0x26,0x40,0x3C,0x80,0x2B,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-200mm F3.5-5.6 Compact Aspherical Hyperzoom Macro"},
+{0x26,0x3D,0x3C,0x80,0x2F,0x3D,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-300mm F3.8-5.6 Aspherical"},
+{0x26,0x41,0x3C,0x8E,0x2C,0x40,0x1C,0x02,0x00,0x00,0x05, "Sigma", "795443", "28-300mm F3.5-6.3 DG Macro"},
+{0x26,0x40,0x3C,0x8E,0x2C,0x40,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-300mm F3.5-6.3 Macro"},
+{0x02,0x3B,0x44,0x61,0x30,0x3D,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "35-80mm F4-5.6"},
+{0x02,0x40,0x44,0x73,0x2B,0x36,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "35-135mm F3.5-4.5 a"},
+{0x7A,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x03,0x00,0x05, "Sigma", "", "50-150mm F2.8 EX APO DC HSM"},
+{0xFD,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x03,0x00,0x05, "Sigma", "691554", "50-150mm F2.8 EX APO DC HSM II"},
+{0x48,0x3C,0x50,0xA0,0x30,0x40,0x4B,0x02,0x03,0x00,0x05, "Sigma", "736552", "APO 50-500mm F4-6.3 EX HSM"},
+{0x9F,0x37,0x50,0xA0,0x34,0x40,0x4B,0x0E,0x03,0x00,0x05, "Sigma", "", "50-500mm F4.5-6.3 APO DG OS HSM"},
+//M                                         "Sigma" "686550" "50-200mm F4-5.6 DC OS HSM";
+{0x26,0x3C,0x54,0x80,0x30,0x3C,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "55-200mm F4-5.6 DC"},
+{0x7A,0x3B,0x53,0x80,0x30,0x3C,0x4B,0x06,0x01,0x00,0x05, "Sigma", "", "55-200mm F4-5.6 DC HSM"},
+{0x48,0x54,0x5C,0x80,0x24,0x24,0x4B,0x02,0x00,0x00,0x05, "Sigma", "", "70-200mm F2.8 EX APO IF HSM"},
+{0x7A,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x03,0x00,0x05, "Sigma", "", "70-200mm F2.8 EX APO DG Macro HSM II"},
+{0xEE,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x03,0x00,0x05, "Sigma", "579555", "70-200mm F2.8 EX APO DG Macro HSM II"},
+{0x02,0x46,0x5C,0x82,0x25,0x25,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "70-210mm F2.8 APO"},
+{0x26,0x3C,0x5C,0x82,0x30,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "70-210mm F4-5.6 UC-II"},
+{0x26,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 DG Macro"},
+{0x56,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 APO Macro Super II"},
+{0xE0,0x3C,0x5C,0x8E,0x30,0x3C,0x4B,0x06,0x00,0x00,0x05, "Sigma", "508555", "APO 70-300mm F4-5.6 DG Macro"},
+{0xA3,0x3C,0x5C,0x8E,0x30,0x3C,0x4B,0x0E,0x00,0x00,0x05, "Sigma", "572556", "70-300mm F4-5.6 DG OS"},
+{0x02,0x37,0x5E,0x8E,0x35,0x3D,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "75-300mm F4.5-5.6 APO"},
+{0x02,0x3A,0x5E,0x8E,0x32,0x3D,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "75-300mm F4.0-5.6"},
+{0x77,0x44,0x61,0x98,0x34,0x3C,0x7B,0x0E,0x03,0x00,0x05, "Sigma", "", "80-400mm f4.5-5.6 EX OS"},
+{0x48,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02,0x03,0x00,0x05, "Sigma", "134556", "APO 100-300mm F4 EX IF HSM"},
+{0xF3,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02,0x13,0x00,0x05, "Sigma", "134556", "APO 100-300mm F4 EX IF HSM"},
+{0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x05, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"},
+{0x7A,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x05, "Sigma", "135553", "APO 120-300mm F2.8 EX DG HSM"},
+{0xFA,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x05, "Sigma", "135553", "APO 120-300mm F2.8 EX DG HSM"},
+{0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E,0x03,0x00,0x05, "Sigma", "728557", "APO 120-400mm F4.5-5.6 DG OS HSM"},
+{0x26,0x44,0x73,0x98,0x34,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "135-400mm F4.5-5.6 APO Aspherical"},
+{0xCE,0x34,0x76,0xA0,0x38,0x40,0x4B,0x0E,0x03,0x00,0x05, "Sigma", "737559", "APO 150-500mm F5-6.3 DG OS HSM"},
+{0x26,0x40,0x7B,0xA0,0x34,0x40,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "APO 170-500mm F5-6.3 Aspherical RF"},
+{0xA7,0x49,0x80,0xA0,0x24,0x24,0x4B,0x06,0x03,0x00,0x05, "Sigma", "", "APO 200-500mm F2.8 EX DG"},
+{0x48,0x3C,0x8E,0xB0,0x3C,0x3C,0x4B,0x02,0x03,0x00,0x05, "Sigma", "595555", "APO 300-800mm F5.6 EX DG HSM"},
 //
 //------------------------------------------------------------------------------
 // Tamron lenses by focal length, first fixed then zoom lenses
 //------------------------------------------------------------------------------
 //
-//                                     "Tamron" "69E"    "SP AF 14mm F/2.8 Aspherical (IF)"
-{0xF4,0x54,0x56,0x56,0x18,0x18,0x84,0x06,0x00,0x02, "Tamron", "G005", "SP AF 60mm F/2 Di II LD (IF) Macro 1:1"},
-{0x1E,0x5D,0x64,0x64,0x20,0x20,0x13,0x00,0x00,0x02, "Tamron", "52E", "SP AF 90mm F/2.5"},
-//                                     "Tamron" "152E"   "SP AF 90mm F/2.5";
-//                                     "Tamron" "72E"    "SP AF 90mm F/2.8 Macro 1:1";
-{0x32,0x53,0x64,0x64,0x24,0x24,0x35,0x02,0x00,0x02, "Tamron", "272E", "SP AF 90mm F/2.8 Di Macro 1:1"},
-{0xF8,0x55,0x64,0x64,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"},
-{0x00,0x4C,0x7C,0x7C,0x2C,0x2C,0x00,0x02,0x00,0x02, "Tamron", "B01", "SP AF 180mm F/3.5 Di Model"},
-//                                     "Tamron" "60E"    "SP AF 300mm F/2.8 LD-IF";
-//                                     "Tamron" "360E"   "SP AF 300mm F/2.8 LD-IF";
-//
-{0xF6,0x3F,0x18,0x37,0x2C,0x34,0x84,0x06,0x00,0x02, "Tamron", "B001", "SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical (IF)"},
-{0x00,0x36,0x1C,0x2D,0x34,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A13", "SP AF 11-18mm F/4.5-5.6 Di II LD Aspherical (IF)"},
-{0x07,0x46,0x2B,0x44,0x24,0x30,0x03,0x02,0x00,0x02, "Tamron", "A05", "SP AF 17-35mm F/2.8-4 Di LD Aspherical (IF)"},
-{0x00,0x53,0x2B,0x50,0x24,0x24,0x00,0x06,0x00,0x02, "Tamron", "A16", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical (IF)"},
-{0x00,0x54,0x2B,0x50,0x24,0x24,0x00,0x06,0x00,0x02, "Tamron", "A16NII", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical (IF)"},
-{0xF3,0x54,0x2B,0x50,0x24,0x24,0x84,0x0E,0x00,0x02, "Tamron", "B005", "SP AF 17-50mm F/2.8 XR Di II VC LD Aspherical (IF)"},
-{0x00,0x3F,0x2D,0x80,0x2B,0x40,0x00,0x06,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF)"},
-{0x00,0x3F,0x2D,0x80,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
-{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A14NII", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
-{0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06,0x00,0x02, "Tamron", "A18", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"},
-{0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A18NII", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro "},
-{0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "B003", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro"},
-{0x07,0x40,0x2F,0x44,0x2C,0x34,0x03,0x02,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"},
-{0x07,0x40,0x30,0x45,0x2D,0x35,0x03,0x02,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"},
-{0x00,0x49,0x30,0x48,0x22,0x2B,0x00,0x02,0x00,0x02, "Tamron", "166D", "SP AF 20-40mm F/2.7-3.5"},
-{0x0E,0x4A,0x31,0x48,0x23,0x2D,0x0E,0x02,0x00,0x02, "Tamron", "166D", "SP AF 20-40mm F/2.7-3.5"},
-//                                     "Tamron" "266D"   "SP AF 20-40mm F/2.7-3.5 Aspherical-IF";
-//                                     "Tamron" "73D"    "AF 24-70mm F/3.3-5.6 Aspherical";
-{0x45,0x41,0x37,0x72,0x2C,0x3C,0x48,0x02,0x00,0x02, "Tamron", "190D", "SP AF 24-135mm F/3.5-5.6 AD Aspherical (IF) Macro"},
-//                                     "Tamron" "159D"   "AF 28-70mm F/3.5-4.5";
-//                                     "Tamron" "259D"   "AF 28-70mm F/3.5-4.5";
-{0x33,0x54,0x3C,0x5E,0x24,0x24,0x62,0x02,0x00,0x02, "Tamron", "A09", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
-{0xFA,0x54,0x3C,0x5E,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
-{0x10,0x3D,0x3C,0x60,0x2C,0x3C,0xD2,0x02,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"},
-{0x45,0x3D,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"},
-{0x00,0x48,0x3C,0x6A,0x24,0x24,0x00,0x02,0x00,0x02, "Tamron", "176D", "SP AF 28-105mm F/2.8 LD Aspherical IF"},
-//                                     "Tamron" "276D"   "SP AF 28-105mm F/2.8 LD Aspherical IF";
-//                                     "Tamron" "179D"   "AF 28-105mm F4.0-5.6 IF";
-//                                     "Tamron" "285D"   "AF 28-300mm F/3.8-6.3 LD Aspherical IF Silver";
-//                                     "Tamron" "271D"   "AF 28-200mm F/3.8-5.6 LD Aspherical IF Super Silver";
-//                                     "Tamron" "471D"   "AF 28-200mm F/3.8-5.6 Aspherical IF Super2 Silver";
-{0x0B,0x3E,0x3D,0x7F,0x2F,0x3D,0x0E,0x00,0x00,0x02, "Tamron", "71D", "AF 28-200mm F/3.8-5.6"},
-{0x0B,0x3E,0x3D,0x7F,0x2F,0x3D,0x0E,0x02,0x00,0x02, "Tamron", "171D", "AF 28-200mm F/3.8-5.6D"},
-{0x12,0x3D,0x3C,0x80,0x2E,0x3C,0xDF,0x02,0x00,0x02, "Tamron", "271D", "AF 28-200mm F/3.8-5.6 AF Aspherical LD (IF)"},
-{0x4D,0x41,0x3C,0x8E,0x2B,0x40,0x62,0x02,0x00,0x02, "Tamron", "A061", "AF 28-300mm F/3.5-6.3 XR Di LD Aspherical (IF)"},
-{0x4D,0x41,0x3C,0x8E,0x2C,0x40,0x62,0x02,0x00,0x02, "Tamron", "185D", "AF 28-300mm F/3.5-6.3 XR LD Aspherical (IF)"},
-{0xF9,0x40,0x3C,0x8E,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "A20", "AF 28-300mm F/3.5-6.3 XR Di VC LD Aspherical (IF) Macro"},
-//                                     "Tamron" "63D"    "AF 35-90mm F/4-5.6";
-//                                     "Tamron" "65D"    "SP AF 35-105mm F/2.8 Aspherical";
-//                                     "Tamron" ""       "AF 35-135mm F/3.5-4.5";
-{0x00,0x47,0x53,0x80,0x30,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A15", "AF 55-200mm F/4-5.6 Di II LD"},
-{0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
-//                                     "Tamron" "67D"    "SP AF 70-210mm f/2.8 LD";
-//                                     "Tamron" ""       "AF 70-210mm F/3.5-4.5";
-//                                     "Tamron" "158D"   "AF 70-210mm F/4-5.6";
-//                                     "Tamron" "258D"   "AF 70-210mm F/4-5.6";
-//                                     "Tamron" "67D"    "SP AF 70-210mm F/2.8 LD";
-//                                     "Tamron" "172D"   "AF 70-300mm F/4-5.6";
-//                                     "Tamron" "472D"   "AF 70-300mm F/4-5.6 LD";
-{0x69,0x48,0x5C,0x8E,0x30,0x3C,0x6F,0x02,0x00,0x02, "Tamron", "772D", "AF 70-300mm F/4-5.6 LD Macro 1:2"},
-{0x00,0x48,0x5C,0x8E,0x30,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A17", "AF 70-300mm F/4-5.6 Di LD Macro 1:2"},
-//                                     "Tamron" "872D"   "AF 75-300mm F/4-5.6 LD";
-//                                     "Tamron" "278D"   "AF 80-210mm F/4.5-5.6";
-//                                     "Tamron" "62D"    "AF 90-300mm F/4.5-5.6";
-//                                     "Tamron" "186D"   "AF 100-300mm F/5-6.3";
-{0x20,0x3C,0x80,0x98,0x3D,0x3D,0x1E,0x02,0x00,0x02, "Tamron", "75D", "AF 200-400mm F/5.6 LD IF"},
-{0x00,0x3E,0x80,0xA0,0x38,0x3F,0x00,0x02,0x00,0x02, "Tamron", "A08", "SP AF 200-500mm F/5-6.3 Di LD (IF)"},
-{0x00,0x3F,0x80,0xA0,0x38,0x3F,0x00,0x02,0x00,0x02, "Tamron", "A08", "SP AF 200-500mm F/5-6.3 Di"},
+{0x00,0x47,0x25,0x25,0x24,0x24,0x00,0x02,0x00,0x00,0x02, "Tamron", "69E", "SP AF 14mm F/2.8 Aspherical (IF)"},
+{0xF4,0x54,0x56,0x56,0x18,0x18,0x84,0x06,0x01,0x00,0x02, "Tamron", "G005", "SP AF 60mm F/2 Di II LD (IF) Macro 1:1"},
+{0x1E,0x5D,0x64,0x64,0x20,0x20,0x13,0x00,0x40,0x00,0x02, "Tamron", "52E", "SP AF 90mm F/2.5"},
+{0x20,0x5A,0x64,0x64,0x20,0x20,0x14,0x00,0x40,0x00,0x02, "Tamron", "152E", "SP AF 90mm F/2.5 Macro"},
+{0x22,0x53,0x64,0x64,0x24,0x24,0xE0,0x02,0x40,0x00,0x02, "Tamron", "72E", "SP AF 90mm F/2.8 Macro 1:1"},
+{0x32,0x53,0x64,0x64,0x24,0x24,0x35,0x02,0x40,0x01,0x02, "Tamron", "172E", "SP AF 90mm F/2.8 Macro 1:1"},
+{0x32,0x53,0x64,0x64,0x24,0x24,0x35,0x02,0x40,0x02,0x02, "Tamron", "272E", "SP AF 90mm F/2.8 Di Macro 1:1"},
+{0xF8,0x55,0x64,0x64,0x24,0x24,0x84,0x06,0x41,0x00,0x02, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"},
+{0xF8,0x54,0x64,0x64,0x24,0x24,0xDF,0x06,0x41,0x00,0x02, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"},
+{0x00,0x4C,0x7C,0x7C,0x2C,0x2C,0x00,0x02,0x00,0x00,0x02, "Tamron", "B01", "SP AF 180mm F/3.5 Di Model"},
+{0x21,0x56,0x8E,0x8E,0x24,0x24,0x14,0x00,0x00,0x00,0x02, "Tamron", "60E", "SP AF 300mm F/2.8 LD-IF"},
+{0x27,0x54,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x00,0x00,0x02, "Tamron", "360E", "SP AF 300mm F/2.8 LD-IF"},
+//
+{0xF6,0x3F,0x18,0x37,0x2C,0x34,0x84,0x06,0x01,0x00,0x02, "Tamron", "B001", "SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical (IF)"},
+{0x00,0x36,0x1C,0x2D,0x34,0x3C,0x00,0x06,0x00,0x00,0x02, "Tamron", "A13", "SP AF 11-18mm F/4.5-5.6 Di II LD Aspherical (IF)"},
+{0x07,0x46,0x2B,0x44,0x24,0x30,0x03,0x02,0x00,0x00,0x02, "Tamron", "A05", "SP AF 17-35mm F/2.8-4 Di LD Aspherical (IF)"},
+{0x00,0x53,0x2B,0x50,0x24,0x24,0x00,0x06,0x00,0x00,0x02, "Tamron", "A16", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical (IF)"},
+{0x00,0x54,0x2B,0x50,0x24,0x24,0x00,0x06,0x01,0x00,0x02, "Tamron", "A16NII", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical (IF)"},
+{0xF3,0x54,0x2B,0x50,0x24,0x24,0x84,0x0E,0x01,0x00,0x02, "Tamron", "B005", "SP AF 17-50mm F/2.8 XR Di II VC LD Aspherical (IF)"},
+{0x00,0x3F,0x2D,0x80,0x2B,0x40,0x00,0x06,0x00,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF)"},
+{0x00,0x3F,0x2D,0x80,0x2C,0x40,0x00,0x06,0x00,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
+{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06,0x01,0x00,0x02, "Tamron", "A14NII", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"},
+{0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06,0x00,0x00,0x02, "Tamron", "A18", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"},
+{0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06,0x01,0x00,0x02, "Tamron", "A18NII", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro "},
+{0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E,0x01,0x00,0x02, "Tamron", "B003", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro"},
+{0x07,0x40,0x2F,0x44,0x2C,0x34,0x03,0x02,0x00,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"},
+{0x07,0x40,0x30,0x45,0x2D,0x35,0x03,0x02,0x00,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"},
+{0x00,0x49,0x30,0x48,0x22,0x2B,0x00,0x02,0x00,0x00,0x02, "Tamron", "166D", "SP AF 20-40mm F/2.7-3.5"},
+{0x0E,0x4A,0x31,0x48,0x23,0x2D,0x0E,0x02,0x00,0x00,0x02, "Tamron", "166D", "SP AF 20-40mm F/2.7-3.5"},
+//M                                         "Tamron" "266D"   "SP AF 20-40mm F/2.7-3.5 Aspherical-IF";
+//M                                         "Tamron" "73D"    "AF 24-70mm F/3.3-5.6 Aspherical";
+{0x45,0x41,0x37,0x72,0x2C,0x3C,0x48,0x02,0x00,0x00,0x02, "Tamron", "190D", "SP AF 24-135mm F/3.5-5.6 AD Aspherical (IF) Macro"},
+//M                                         "Tamron" "159D"   "AF 28-70mm F/3.5-4.5";
+//M                                         "Tamron" "259D"   "AF 28-70mm F/3.5-4.5";
+{0x33,0x54,0x3C,0x5E,0x24,0x24,0x62,0x02,0x00,0x00,0x02, "Tamron", "A09", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
+{0xFA,0x54,0x3C,0x5E,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"},
+{0x10,0x3D,0x3C,0x60,0x2C,0x3C,0xD2,0x02,0x00,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"},
+{0x45,0x3D,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"},
+{0x00,0x48,0x3C,0x6A,0x24,0x24,0x00,0x02,0x00,0x00,0x02, "Tamron", "176D", "SP AF 28-105mm F/2.8 LD Aspherical IF"},
+//M                                         "Tamron" "276D"   "SP AF 28-105mm F/2.8 LD Aspherical IF";
+//M                                         "Tamron" "179D"   "AF 28-105mm F4.0-5.6 IF";
+//M                                         "Tamron" "471D"   "AF 28-200mm F/3.8-5.6 Aspherical IF Super2 Silver";
+{0x0B,0x3E,0x3D,0x7F,0x2F,0x3D,0x0E,0x00,0x00,0x00,0x02, "Tamron", "71D", "AF 28-200mm F/3.8-5.6"},
+{0x0B,0x3E,0x3D,0x7F,0x2F,0x3D,0x0E,0x02,0x00,0x00,0x02, "Tamron", "171D", "AF 28-200mm F/3.8-5.6D"},
+{0x12,0x3D,0x3C,0x80,0x2E,0x3C,0xDF,0x02,0x00,0x00,0x02, "Tamron", "271D", "AF 28-200mm F/3.8-5.6 LD Aspherical (IF)"},
+{0x4D,0x41,0x3C,0x8E,0x2B,0x40,0x62,0x02,0x00,0x00,0x02, "Tamron", "A061", "AF 28-300mm F/3.5-6.3 XR Di LD Aspherical (IF)"},
+{0x4D,0x41,0x3C,0x8E,0x2C,0x40,0x62,0x02,0x00,0x00,0x02, "Tamron", "185D", "AF 28-300mm F/3.5-6.3 XR LD Aspherical (IF)"},
+//M                                         "Tamron" "285D"   "AF 28-300mm F/3.8-6.3 LD Aspherical IF Silver";
+{0xF9,0x40,0x3C,0x8E,0x2C,0x40,0x40,0x0E,0x01,0x00,0x02, "Tamron", "A20", "AF 28-300mm F/3.5-6.3 XR Di VC LD Aspherical (IF) Macro"},
+//M                                         "Tamron" "63D"    "AF 35-90mm F/4-5.6";
+//M                                         "Tamron" "65D"    "SP AF 35-105mm F/2.8 Aspherical";
+//M                                         "Tamron" ""       "AF 35-135mm F/3.5-4.5";
+{0x00,0x47,0x53,0x80,0x30,0x3C,0x00,0x06,0x00,0x00,0x02, "Tamron", "A15", "AF 55-200mm F/4-5.6 Di II LD"},
+{0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
+{0xFE,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
+//M                                         "Tamron" "67D"    "SP AF 70-210mm f/2.8 LD";
+//M                                         "Tamron" ""       "AF 70-210mm F/3.5-4.5";
+//M                                         "Tamron" "158D"   "AF 70-210mm F/4-5.6";
+//M                                         "Tamron" "258D"   "AF 70-210mm F/4-5.6";
+//M                                         "Tamron" "172D"   "AF 70-300mm F/4-5.6";
+//M                                         "Tamron" "472D"   "AF 70-300mm F/4-5.6 LD";
+{0x69,0x48,0x5C,0x8E,0x30,0x3C,0x6F,0x02,0x00,0x00,0x02, "Tamron", "772D", "AF 70-300mm F/4-5.6 LD Macro 1:2"},
+{0x69,0x47,0x5C,0x8E,0x30,0x3C,0x00,0x02,0x00,0x00,0x02, "Tamron", "A17N", "AF 70-300mm F/4-5.6 Di LD Macro 1:2"},
+{0x00,0x48,0x5C,0x8E,0x30,0x3C,0x00,0x06,0x01,0x00,0x02, "Tamron", "A17NII", "AF 70-300mm F/4-5.6 Di LD Macro 1:2"},
+{0xF1,0x47,0x5C,0x8E,0x30,0x3C,0xDF,0x0E,0x00,0x00,0x02, "Tamron", "A005", "SP 70-300mm F4-5.6 Di VC USD"},
+//M                                         "Tamron" "872D"   "AF 75-300mm F/4-5.6 LD";
+//M                                         "Tamron" "278D"   "AF 80-210mm F/4.5-5.6";
+//M                                         "Tamron" "62D"    "AF 90-300mm F/4.5-5.6";
+//M                                         "Tamron" "186D"   "AF 100-300mm F/5-6.3";
+{0x20,0x3C,0x80,0x98,0x3D,0x3D,0x1E,0x02,0x00,0x00,0x02, "Tamron", "75D", "AF 200-400mm F/5.6 LD IF"},
+{0x00,0x3E,0x80,0xA0,0x38,0x3F,0x00,0x02,0x00,0x00,0x02, "Tamron", "A08", "SP AF 200-500mm F/5-6.3 Di LD (IF)"},
+{0x00,0x3F,0x80,0xA0,0x38,0x3F,0x00,0x02,0x00,0x00,0x02, "Tamron", "A08", "SP AF 200-500mm F/5-6.3 Di"},
 //
 //------------------------------------------------------------------------------
 // Tokina Lenses by focal length, first fixed then zoom lenses
 //------------------------------------------------------------------------------
 //
-{0x00,0x40,0x2B,0x2B,0x2C,0x2C,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 17 AF PRO (AF 17mm f/3.5)"},
-{0x00,0x47,0x44,0x44,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "T303503", "AT-X M35 PRO DX (AF 35mm f/2.8 Macro)"},
-{0x00,0x54,0x68,0x68,0x24,0x24,0x00,0x02,0x00,0x03, "Tokina", "T310003N", "AT-X M100 PRO D (AF 100mm f/2.8 Macro)"},
-//                                     "Tokina" ""          "AT-X 304 AF (AF 300mm f/4.0)";
-{0x00,0x54,0x8E,0x8E,0x24,0x24,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 300 AF PRO (AF 300mm f/2.8)"},
-//                                     "Tokina" ""          "AT-X 400 AF SD (AF 400mm f/5.6)";
-//
-{0x00,0x40,0x18,0x2B,0x2C,0x34,0x00,0x06,0x00,0x03, "Tokina", "T4101703", "AT-X 107 DX Fisheye (AF 10-17mm f/3.5-4.5)"},
-{0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "T4111603", "AT-X 116 PRO DX (AF 11-16mm f/2.8)"},
-{0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x03, "Tokina", "T4122403", "AT-X 124 AF PRO DX (AF 12-24mm f/4)"},
-{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x00,0x03, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"},
-{0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 165 PRO DX (AF 16-50mm f/2.8)"},
-{0x00,0x40,0x2A,0x72,0x2C,0x3C,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)"},
-//                                     "Tokina" ""          "AF 193 (AF 19-35mm f/3.5-4.5)";
-{0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x03, "Tokina", "", "AT-X 235 AF PRO (AF 20-35mm f/2.8)"},
-//                                     "Tokina" ""          "AF 235 (AF 20-35mm f/3.5-4.5)";
-{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x03, "Tokina", "", "AF 235 II (AF 20-35mm f/3.5-4.5)"},
-//                                     "Tokina" ""          "AT-X 240 AF (AF 24-40mm f/2.8)";
-//                                     "Tokina" ""          "AT-X 242 AF (AF 24-200mm f/3.5-4.5)";
-{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x03, "Tokina", "", "AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)"},
-//25 48 3C 5C 24 24 1B" "02" "00" "03" "Tokina" ""          "AT-X 287 AF PRO SV (AF 28-70mm f/2.8)";
-{0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00,0x00,0x03, "Tokina", "", "AT-X 287 AF (AF 28-70mm f/2.8)"},
-{0x07,0x47,0x3C,0x5C,0x25,0x35,0x03,0x00,0x00,0x03, "Tokina", "", "AF 287 SD (AF 28-70mm f/2.8-4.5)"},
-//                                     "Tokina" ""          "AF 270 II (AF 28-70mm f/3.5-4.5)";
-{0x00,0x48,0x3C,0x60,0x24,0x24,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 280 AF PRO (AF 28-80mm f/2.8)"},
-//                                     "Tokina" ""          "AF 280 II EMZ (AF 28-80mm f/3.5-5.6)";
-//                                     "Tokina" ""          "AF 205 (AF 28-105mm f/3.5-4.5);
-//                                     "Tokina" ""          "AF 282 EMZ II (AF 28-210mm f/4.2-6.5)";
-//                                     "Tokina" ""          "AF 370 II (AF 35-70mm f/3.5-4.6)";
-//                                     "Tokina" ""          "AF 353 (AF 35-300mm f/4.5-6.7);
-{0x00,0x48,0x50,0x72,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 535 PRO DX (AF 50-135mm f/2.8)"},
-//                                     "Tokina" ""          "AF 210 II SD (AF 70-210mm f/4.0-5.6)";
-//                                     "Tokina" ""          "AF-730 II (AF 75-300mm f/4.5-5.6)";
-//                                     "Tokina" ""          "AT-X 828 AF (AF 80-200mm f/2.8)";
-{0x14,0x54,0x60,0x80,0x24,0x24,0x0B,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF PRO (AF 80-200mm f/2.8)"},
-//                                     "Tokina" ""          "AT-X 840 AF (AF 80-400mm f/4.5-5.6)";
-{0x24,0x44,0x60,0x98,0x34,0x3C,0x1A,0x02,0x00,0x03, "Tokina", "", "AT-X 840 AF-II (AF 80-400mm f/4.5-5.6)"},
-{0x00,0x44,0x60,0x98,0x34,0x3C,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 840 AF D (AF 80-400mm f/4.5-5.6)"},
-{0x14,0x48,0x68,0x8E,0x30,0x30,0x0B,0x00,0x00,0x03, "Tokina", "", "AT-X 340 AF (AF 100-300mm f/4)"},
-//                                     "Tokina" ""          "AT-X 340 AF-II (AF 100-300mm f/4)";
-//                                     "Tokina" ""          "AF 130 EMZ II (AF 100-300mm f/5.6-6.7)";
-//                                     "Tokina" ""          "AF 140 EMZ (AF 100-400mm f/4.5-6.3)";
+{0x00,0x40,0x2B,0x2B,0x2C,0x2C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 17 AF PRO (AF 17mm f/3.5)"},
+{0x00,0x47,0x44,0x44,0x24,0x24,0x00,0x06,0x40,0x00,0x03, "Tokina", "T303503", "AT-X M35 PRO DX (AF 35mm f/2.8 Macro)"},
+{0x00,0x54,0x68,0x68,0x24,0x24,0x00,0x02,0x40,0x00,0x03, "Tokina", "T310003N", "AT-X M100 PRO D (AF 100mm f/2.8 Macro)"},
+{0x27,0x48,0x8E,0x8E,0x30,0x30,0x1D,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 304 AF (AF 300mm f/4.0)"},
+{0x00,0x54,0x8E,0x8E,0x24,0x24,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 300 AF PRO (AF 300mm f/2.8)"},
+{0x12,0x3B,0x98,0x98,0x3D,0x3D,0x09,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 400 AF SD (AF 400mm f/5.6)"},
+//
+{0x00,0x40,0x18,0x2B,0x2C,0x34,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4101703", "AT-X 107 DX Fisheye (AF 10-17mm f/3.5-4.5)"},
+{0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4111603", "AT-X 116 PRO DX (AF 11-16mm f/2.8)"},
+{0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x00,0x03, "Tokina", "T4122403", "AT-X 124 AF PRO DX (AF 12-24mm f/4)"},
+{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x02,0x03, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"},
+{0x00,0x48,0x29,0x3C,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 16-28 AF PRO FX (AF 16-28mm f/2.8)"},
+{0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 165 PRO DX (AF 16-50mm f/2.8)"},
+{0x00,0x40,0x2A,0x72,0x2C,0x3C,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)"},
+{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x02,0x03, "Tokina", "", "AF 193 (AF 19-35mm f/3.5-4.5)"},
+{0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x02,0x03, "Tokina", "", "AT-X 235 AF PRO (AF 20-35mm f/2.8)"},
+//M                                         "Tokina" ""          "AF 235 (AF 20-35mm f/3.5-4.5)"
+{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x01,0x03, "Tokina", "", "AF 235 II (AF 20-35mm f/3.5-4.5)"},
+//M                                         "Tokina" ""          "AT-X 240 AF (AF 24-40mm f/2.8)"
+{0x00,0x40,0x37,0x80,0x2C,0x3C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 242 AF (AF 24-200mm f/3.5-5.6)"},
+{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x02,0x03, "Tokina", "", "AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)"},
+{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x01,0x03, "Tokina", "", "AT-X 287 AF PRO SV (AF 28-70mm f/2.8)"},
+{0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 287 AF (AF 28-70mm f/2.8)"},
+{0x07,0x47,0x3C,0x5C,0x25,0x35,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AF 287 SD (AF 28-70mm f/2.8-4.5)"},
+{0x07,0x40,0x3C,0x5C,0x2C,0x35,0x03,0x00,0x00,0x00,0x03, "Tokina", "", "AF 270 II (AF 28-70mm f/3.5-4.5)"},
+{0x00,0x48,0x3C,0x60,0x24,0x24,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 280 AF PRO (AF 28-80mm f/2.8)"},
+//M                                         "Tokina" ""          "AF 280 II EMZ (AF 28-80mm f/3.5-5.6)"
+//M                                         "Tokina" ""          "AF 205 (AF 28-105mm f/3.5-4.5)"
+//M                                         "Tokina" ""          "AF 282 (AF 28-200mm 3.5-5.6)"
+//M                                         "Tokina" ""          "AF 282 EMZ II (AF 28-210mm f/4.2-6.5)"
+//M                                         "Tokina" ""          "AF 370 (AF 35-70mm f/3.5-4.6)"
+//M                                         "Tokina" ""          "AF 370 II (AF 35-70mm f/3.5-4.6)"
+{0x25,0x44,0x44,0x8E,0x34,0x42,0x1B,0x02,0x00,0x00,0x03, "Tokina", "", "AF 353 (AF 35-300mm f/4.5-6.7)"},
+{0x00,0x48,0x50,0x72,0x24,0x24,0x00,0x06,0x00,0x00,0x03, "Tokina", "", "AT-X 535 PRO DX (AF 50-135mm f/2.8)"},
+//M                                         "Tokina" ""          "AF 745 (AF 70-210mm f/4.5)"
+//M                                         "Tokina" ""          "AF 210 (AF 70-210mm f/4.0-5.6)"
+//M                                         "Tokina" ""          "AF 210 II SD (AF 70-210mm f/4.0-5.6)"
+{0x12,0x44,0x5E,0x8E,0x34,0x3C,0x09,0x00,0x00,0x00,0x03, "Tokina", "", "AF 730 (AF 75-300mm F4.5-5.6)"},
+//M                                         "Tokina" ""          "AF 730 II (AF 75-300mm f/4.5-5.6)"
+{0x14,0x54,0x60,0x80,0x24,0x24,0x0B,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF (AF 80-200mm f/2.8)"},
+{0x24,0x54,0x60,0x80,0x24,0x24,0x1A,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF PRO (AF 80-200mm f/2.8)"},
+//M                                         "Tokina" ""          "AT-X 840 AF (AF 80-400mm f/4.5-5.6)"
+{0x24,0x44,0x60,0x98,0x34,0x3C,0x1A,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 840 AF-II (AF 80-400mm f/4.5-5.6)"},
+{0x00,0x44,0x60,0x98,0x34,0x3C,0x00,0x02,0x00,0x00,0x03, "Tokina", "", "AT-X 840 D (AF 80-400mm f/4.5-5.6)"},
+{0x14,0x48,0x68,0x8E,0x30,0x30,0x0B,0x00,0x00,0x00,0x03, "Tokina", "", "AT-X 340 AF (AF 100-300mm f/4)"},
+//M                                         "Tokina" ""          "AT-X 340 AF-II (AF 100-300mm f/4)"
+//M                                         "Tokina" ""          "AF 130 EMZ II (AF 100-300mm f/5.6-6.7)"
+//M                                         "Tokina" ""          "AF 140 EMZ (AF 100-400mm f/4.5-6.3)"
 //
 //------------------------------------------------------------------------------
 // Lenses from various other brands
 //------------------------------------------------------------------------------
 //
-{0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00,0x00,0x04, "Cosina", "", "AF 100mm F3.5 Macro"},
-{0x07,0x36,0x3D,0x5F,0x2C,0x3C,0x03,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-80mm F3.5-5.6 MC Macro"},
-{0x07,0x46,0x3D,0x6A,0x25,0x2F,0x03,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-105mm F2.8-3.8 MC"},
-//                                     "Cosina" "" "AF Zoom 28-210mm F3.5-5.6";
-//                                     "Cosina" "" "AF Zoom 28-210mm F4.2-6.5 Aspherical IF";
-//                                     "Cosina" "" "AF Zoom 28-300mm F4.0-6.3";
-//                                     "Cosina" "" "AF Zoom 70-210mm F2.8-4.0";
-{0x12,0x36,0x5C,0x81,0x35,0x3D,0x09,0x00,0x00,0x04, "Cosina", "", "AF Zoom 70-210mm F4.5-5.6 MC Macro"},
-{0x12,0x39,0x5C,0x8E,0x34,0x3D,0x08,0x02,0x00,0x04, "Cosina", "", "AF Zoom 70-300mm F4.5-5.6 MC Macro"},
-{0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02,0x00,0x04, "Cosina", "", "AF Zoom 100-300mm F5.6-6.7 MC Macro"},
-//                                     "Cosina" "" "AF Zoom 100-400mm F5.6-6.7 MC";
-//
-{0x00,0x40,0x31,0x31,0x2C,0x2C,0x00,0x00,0x00,0x04, "Voigtlander", "BA295AN", "Color Skopar 20mm F3.5 SLII Aspherical"},
-{0x00,0x54,0x48,0x48,0x18,0x18,0x00,0x00,0x00,0x04, "Voigtlander", "BA229DN", "Ultron 40mm F2 SLII Aspherical"},
-{0x00,0x54,0x55,0x55,0x0C,0x0C,0x00,0x00,0x00,0x04, "Voigtlander", "BA239BN", "Nokton 58mm F1.4 SLII"},
-//
-{0x00,0x54,0x56,0x56,0x30,0x30,0x00,0x00,0x00,0x0C, "Coastal Optical Systems", "", "60mm 1:4 UV-VIS-IR Macro Apo"},
-//
-{0x02,0x40,0x44,0x5C,0x2C,0x34,0x02,0x00,0x00,0x15, "Exakta", "", "AF 35-70mm 1:3.5-4.5 MC"},
-{0x07,0x3E,0x30,0x43,0x2D,0x35,0x03,0x00,0x00,0x14, "Soligor", "", "AF Zoom 19-35mm 1:3.5-4.5 MC"},
-{0x03,0x43,0x5C,0x81,0x35,0x35,0x02,0x00,0x00,0x13, "Soligor", "", "AF C/D Zoom UMCS 70-210mm 1:4.5"},
-{0x12,0x4A,0x5C,0x81,0x31,0x3D,0x09,0x00,0x00,0x13, "Soligor", "", "AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS"},
-//
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x10,0x08, "Kenko", "KE-MCP1DGN", "Teleplus PRO 300 DG 1.4x"},
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x10,0x08, "Kenko", "KE-MCP2DGN", "Teleplus PRO 300 DG 2.0x"},
+{0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00,0x00,0x00,0x04, "Cosina", "", "AF 100mm F3.5 Macro"},
+{0x07,0x36,0x3D,0x5F,0x2C,0x3C,0x03,0x00,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-80mm F3.5-5.6 MC Macro"},
+{0x07,0x46,0x3D,0x6A,0x25,0x2F,0x03,0x00,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-105mm F2.8-3.8 MC"},
+//M                                         "Cosina" "" "AF Zoom 28-210mm F3.5-5.6"; 
+//M                                         "Cosina" "" "AF Zoom 28-210mm F4.2-6.5 Aspherical IF";
+//M                                         "Cosina" "" "AF Zoom 28-300mm F4.0-6.3"; 
+//M                                         "Cosina" "" "AF Zoom 70-210mm F2.8-4.0"; 
+{0x12,0x36,0x5C,0x81,0x35,0x3D,0x09,0x00,0x00,0x00,0x04, "Cosina", "", "AF Zoom 70-210mm F4.5-5.6 MC Macro"},
+{0x12,0x39,0x5C,0x8E,0x34,0x3D,0x08,0x02,0x00,0x00,0x04, "Cosina", "", "AF Zoom 70-300mm F4.5-5.6 MC Macro"},
+{0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02,0x00,0x00,0x04, "Cosina", "", "AF Zoom 100-300mm F5.6-6.7 MC Macro"},
+//M                                         "Cosina" "" "AF Zoom 100-400mm F5.6-6.7 MC";
+//
+{0x00,0x40,0x31,0x31,0x2C,0x2C,0x00,0x00,0x00,0x00,0x34, "Voigtlander", "BA295AN", "Color Skopar 20mm F3.5 SLII Aspherical"},
+{0x00,0x54,0x48,0x48,0x18,0x18,0x00,0x00,0x00,0x00,0x34, "Voigtlander", "BA229DN", "Ultron 40mm F2 SLII Aspherical"},
+{0x00,0x54,0x55,0x55,0x0C,0x0C,0x00,0x00,0x00,0x00,0x34, "Voigtlander", "BA239BN", "Nokton 58mm F1.4 SLII"},
+{0x00,0x40,0x64,0x64,0x2C,0x2C,0x00,0x00,0x00,0x00,0x34, "Voigtlander", "", "APO-Lanthar 90mm F3.5 SLII Close Focus"},
+//
+{0x00,0x40,0x2D,0x2D,0x2C,0x2C,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Distagon T* 3,5/18 ZF.2"},
+{0x00,0x48,0x32,0x32,0x24,0x24,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Distagon T* 2,8/21 ZF.2"},
+{0x00,0x54,0x3C,0x3C,0x18,0x18,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Distagon T* 2/28 ZF.2"},
+{0x00,0x54,0x44,0x44,0x18,0x18,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Distagon T* 2/35 ZF.2"},
+{0x00,0x54,0x50,0x50,0x0C,0x0C,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Planar T* 1,4/50 ZF.2"},
+{0x00,0x54,0x50,0x50,0x18,0x18,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Makro-Planar T* 2/50 ZF.2"},
+{0x00,0x54,0x62,0x62,0x0C,0x0C,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Planar T* 1,4/85 ZF.2"},
+{0x00,0x54,0x68,0x68,0x18,0x18,0x00,0x00,0x00,0x00,0x44, "Carl Zeiss", "", "Makro-Planar T* 2/100 ZF.2"},
+//
+{0x00,0x54,0x56,0x56,0x30,0x30,0x00,0x00,0x00,0x00,0x0C, "Coastal Optical Systems", "", "60mm 1:4 UV-VIS-IR Macro Apo"},
+//
+{0x02,0x40,0x44,0x5C,0x2C,0x34,0x02,0x00,0x00,0x00,0x15, "Exakta", "", "AF 35-70mm 1:3.5-4.5 MC"},
+{0x07,0x3E,0x30,0x43,0x2D,0x35,0x03,0x00,0x00,0x00,0x14, "Soligor", "", "AF Zoom 19-35mm 1:3.5-4.5 MC"},
+{0x03,0x43,0x5C,0x81,0x35,0x35,0x02,0x00,0x00,0x00,0x13, "Soligor", "", "AF C/D Zoom UMCS 70-210mm 1:4.5"},
+{0x12,0x4A,0x5C,0x81,0x31,0x3D,0x09,0x00,0x00,0x00,0x13, "Soligor", "", "AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS"},
 //
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, "Manual Lens", "", "No CPU"},
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, "Manual Lens", "", "No CPU"},
 //
 //------------------------------------------------------------------------------
 //
 // Lenses, that were upgraded with custom CPU
 //
-{0x00,0x47,0x10,0x10,0x24,0x24,0x00,0x00,0x00,0x00, "Nikon", "JAA604AC", "Fisheye Nikkor 8mm f/2.8 AiS"},
-{0x00,0x54,0x44,0x44,0x0C,0x0C,0x00,0x00,0x00,0x00, "Nikon", "JAA115AD", "Nikkor 35mm f/1.4 AiS"},
-{0x00,0x48,0x50,0x50,0x18,0x18,0x00,0x00,0x00,0x00, "Nikon", "", "Nikkor H 50mm f/2"},
-{0x00,0x48,0x68,0x68,0x24,0x24,0x00,0x00,0x00,0x00, "Nikon", "JAA304AA", "Series E 100mm f/2.8"},
-{0x00,0x4C,0x6A,0x6A,0x20,0x20,0x00,0x00,0x00,0x00, "Nikon", "JAA305AA", "Nikkor 105mm f/2.5 AiS"},
-{0x00,0x48,0x80,0x80,0x30,0x30,0x00,0x00,0x00,0x00, "Nikon", "JAA313AA", "Nikkor 200mm f/4 AiS"},
+{0x00,0x47,0x10,0x10,0x24,0x24,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA604AC", "Fisheye Nikkor 8mm f/2.8 AiS"},
+{0x00,0x54,0x44,0x44,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA115AD", "Nikkor 35mm f/1.4 AiS"},
+{0x00,0x48,0x50,0x50,0x18,0x18,0x00,0x00,0x00,0x00,0x00, "Nikon", "", "Nikkor H 50mm f/2"},
+{0x00,0x48,0x68,0x68,0x24,0x24,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA304AA", "Series E 100mm f/2.8"},
+{0x00,0x4C,0x6A,0x6A,0x20,0x20,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA305AA", "Nikkor 105mm f/2.5 AiS"},
+{0x00,0x48,0x80,0x80,0x30,0x30,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA313AA", "Nikkor 200mm f/4 AiS"},
+{0x00,0x40,0x11,0x11,0x2C,0x2C,0x00,0x00,0x00,0x00,0x1D, "Samyang", "", "8mm f/3.5 Fish-Eye"},
+{0x00,0x58,0x64,0x64,0x20,0x20,0x00,0x00,0x00,0x00,0x17, "Soligor", "", "C/D Macro MC 90mm f/2.5"},
 //
-{0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL}
+{0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL}
 };
+//------------------------------------------------------------------------------
+#endif
+// 8< - - - 8< do not remove this line >8 - - - >8
 
         if (metadata == 0) return os << value;
 
@@ -2007,6 +2314,173 @@
 #endif // EXV_HAVE_LENSDATA
     }
 
+    std::ostream& Nikon3MakerNote::printFocusDistance(std::ostream& os,
+                                                      const Value& value,
+                                                      const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte) {
+            return os << "(" << value << ")";
+        }
+        double dist = 0.01 * pow(10.0, value.toLong()/40.0);
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(2) << dist << " m";
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printAperture(std::ostream& os, 
+                                                 const Value& value, 
+                                                 const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte) {
+            return os << "(" << value << ")";
+        }
+        double aperture = pow(2.0, value.toLong()/24.0);
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(1) << "F" << aperture;
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printFocal(std::ostream& os, 
+                                              const Value& value, 
+                                              const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte) {
+            return os << "(" << value << ")";
+        }
+        double focal = 5.0 * pow(2.0, value.toLong()/24.0);
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(1) << focal << " mm";
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printFStops(std::ostream& os, 
+                                               const Value& value, 
+                                               const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte) {
+            return os << "(" << value << ")";
+        }
+        double fstops = value.toLong()/12.0;
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(1) << "F" << fstops;
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printExitPupilPosition(std::ostream& os, 
+                                                          const Value& value, 
+                                                          const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte || value.toLong() == 0) {
+            return os << "(" << value << ")";
+        }
+        double epp = 2048.0/value.toLong();
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(1) << epp << " mm";
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printFlashFocalLength(std::ostream& os, 
+                                                         const Value& value, 
+                                                         const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte || value.toLong() == 0 || value.toLong() == 255) {
+            return os << "(" << value << ")";
+        }
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(1) << value.toLong() << " mm";
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printRepeatingFlashRate(std::ostream& os, 
+                                                           const Value& value, 
+                                                           const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte || value.toLong() == 0 || value.toLong() == 255) {
+            return os << "(" << value << ")";
+        }
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(2) << value.toLong() << " Hz";
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printRepeatingFlashCount(std::ostream& os, 
+                                                            const Value& value, 
+                                                            const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte || value.toLong() == 0 || value.toLong() == 255) {
+            return os << "(" << value << ")";
+        }
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << std::fixed << std::setprecision(2) << value.toLong();
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printTimeZone(std::ostream& os, 
+                                                 const Value& value, 
+                                                 const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != signedShort) {
+            return os << "(" << value << ")";
+        }
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        char sign = value.toLong() < 0 ? '-' : '+';
+        long h = long(abs(value.toLong())/60.0);
+        long min = abs(value.toLong()) - h*60;
+        os << std::fixed << "UTC " << sign << std::setw(2) << std::setfill('0') << h << ":" 
+           << std::setw(2) << std::setfill('0') << min;
+        os.copyfmt(oss);
+        return os;
+    }
+
+    std::ostream& Nikon3MakerNote::printPictureControl(std::ostream& os, 
+                                                       const Value& value, 
+                                                       const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedByte) {
+            return os << "(" << value << ")";
+        }
+        long pcval = value.toLong() - 0x80;
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        switch(pcval)
+        {
+        case 0:
+            os << "Normal";
+            break;
+        case 127:
+            os << "n/a";
+            break;
+        case -127:
+            os << "User";
+            break;
+        case -128:
+            os << "Auto";
+            break;
+        default:
+            os << pcval;
+            break;
+        }
+        os.copyfmt(oss);
+        return os;
+    }
+
     std::ostream& Nikon3MakerNote::print0x009a(std::ostream& os,
                                                const Value& value,
                                                const ExifData*)
@@ -2043,4 +2517,5 @@
         }
         return os << s;
     }
-}                                       // namespace Exiv2
+
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/nikonmn.hpp exiv2-0.21/src/nikonmn.hpp
--- exiv2-0.19/src/nikonmn.hpp	2009-12-04 17:40:42.000000000 +0000
+++ exiv2-0.21/src/nikonmn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,235 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    nikonmn.hpp
-  @brief   Nikon makernote tags.<BR>References:<BR>
-  [1] <a href="http://www.tawbaware.com/990exif.htm">MakerNote EXIF Tag of the Nikon 990</a> by Max Lyons<BR>
-  [2] <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">Exif file format</a> by TsuruZoh Tachibanaya<BR>
-  [3] "EXIFutils Field Reference Guide"<BR>
-  [3] <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/nikon_mn.html#Nikon_Type_3_Tags">Nikon Type 3 Makernote Tags Definition</a> of the PHP JPEG Metadata Toolkit by Evan Hunter<BR>
-  [4] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey<BR>
-  [5] Email communication with <a href="http://www.rottmerhusen.com">Robert Rottmerhusen</a><BR>
-  [6] Email communication with Roger Larsson<BR>
-  [7] <a href="http://www.cybercom.net/~dcoffin/dcraw/">Decoding raw digital photos in Linux</a> by Dave Coffin<br>
-
-  @version $Rev: 1953 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @author  Gilles Caulier (gc)
-           <a href="mailto:caulier dot gilles at kdemail dot net">caulier dot gilles at kdemail dot net</a>
-  @date    17-May-04, ahu: created<BR>
-           25-May-04, ahu: combined all Nikon formats in one component
- */
-#ifndef NIKONMN_HPP_
-#define NIKONMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <iosfwd>
-#include <memory>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! A MakerNote format used by Nikon cameras, such as the E990 and D1.
-    class EXIV2API Nikon1MakerNote {
-    public:
-        //! Return read-only list of built-in Nikon1 tags
-        static const TagInfo* tagList();
-
-        //! @name Print functions for Nikon1 %MakerNote tags
-        //@{
-        //! Print ISO setting
-        static std::ostream& print0x0002(std::ostream& os, const Value& value, const ExifData*);
-        //! Print autofocus mode
-        static std::ostream& print0x0007(std::ostream& os, const Value& value, const ExifData*);
-        //! Print manual focus distance
-        static std::ostream& print0x0085(std::ostream& os, const Value& value, const ExifData*);
-        //! Print digital zoom setting
-        static std::ostream& print0x0086(std::ostream& os, const Value& value, const ExifData*);
-        //! Print AF focus position
-        static std::ostream& print0x0088(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-
-    }; // class Nikon1MakerNote
-
-    /*!
-      @brief A second MakerNote format used by Nikon cameras, including the
-             E700, E800, E900, E900S, E910, E950
-     */
-    class EXIV2API Nikon2MakerNote {
-    public:
-        //! Return read-only list of built-in Nikon2 tags
-        static const TagInfo* tagList();
-
-        //! @name Print functions for Nikon2 %MakerNote tags
-        //@{
-        //! Print digital zoom setting
-        static std::ostream& print0x000a(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-
-    }; // class Nikon2MakerNote
-
-    //! A third MakerNote format used by Nikon cameras, e.g., E5400, SQ, D2H, D70
-    class EXIV2API Nikon3MakerNote {
-    public:
-        //! Return read-only list of built-in Nikon3 tags
-        static const TagInfo* tagList();
-        //! Return read-only list of built-in Vibration Reduction tags
-        static const TagInfo* tagListVr();
-        //! Return read-only list of built-in Picture Control tags
-        static const TagInfo* tagListPc();
-        //! Return read-only list of built-in World time tags
-        static const TagInfo* tagListWt();
-        //! Return read-only list of built-in ISO info tags
-        static const TagInfo* tagListIi();
-        //! Return read-only list of built-in Auto Focus tags
-        static const TagInfo* tagListAf();
-        //! Return read-only list of built-in Shot Info D80 tags
-        static const TagInfo* tagListSi1();
-        //! Return read-only list of built-in Shot Info D40 tags
-        static const TagInfo* tagListSi2();
-        //! Return read-only list of built-in Shot Info D300 (a) tags
-        static const TagInfo* tagListSi3();
-        //! Return read-only list of built-in Shot Info D300 (b) tags
-        static const TagInfo* tagListSi4();
-        //! Return read-only list of built-in Shot Info tags
-        static const TagInfo* tagListSi5();
-        //! Return read-only list of built-in Color Balance 1 tags
-        static const TagInfo* tagListCb1();
-        //! Return read-only list of built-in Color Balance 2 tags
-        static const TagInfo* tagListCb2();
-        //! Return read-only list of built-in Color Balance 2a tags
-        static const TagInfo* tagListCb2a();
-        //! Return read-only list of built-in Color Balance 2b tags
-        static const TagInfo* tagListCb2b();
-        //! Return read-only list of built-in Color Balance 3 tags
-        static const TagInfo* tagListCb3();
-        //! Return read-only list of built-in Color Balance 4 tags
-        static const TagInfo* tagListCb4();
-        //! Return read-only list of built-in Lens Data 1 tags
-        static const TagInfo* tagListLd1();
-        //! Return read-only list of built-in Lens Data 2 tags
-        static const TagInfo* tagListLd2();
-        //! Return read-only list of built-in Lens Data 3 tags
-        static const TagInfo* tagListLd3();
-
-        //! @name Print functions for Nikon3 %MakerNote tags
-        //@{
-        //! Print ISO setting
-        static std::ostream& print0x0002(std::ostream& os, const Value& value, const ExifData*);
-        //! Print autofocus mode
-        static std::ostream& print0x0007(std::ostream& os, const Value& value, const ExifData*);
-        //! Print lens type
-        static std::ostream& print0x0083(std::ostream& os, const Value& value, const ExifData*);
-        //! Print lens information
-        static std::ostream& print0x0084(std::ostream& os, const Value& value, const ExifData*);
-        //! Print manual focus distance
-        static std::ostream& print0x0085(std::ostream& os, const Value& value, const ExifData*);
-        //! Print digital zoom setting
-        static std::ostream& print0x0086(std::ostream& os, const Value& value, const ExifData*);
-        //! Print AF point
-        static std::ostream& print0x0088(std::ostream& os, const Value& value, const ExifData*);
-        //! Print shooting mode
-        static std::ostream& print0x0089(std::ostream& os, const Value& value, const ExifData* metadata);
-        //! Print number of lens stops
-        static std::ostream& print0x008b(std::ostream& os, const Value& value, const ExifData*);
-        //! Print AF Points In Focus
-        static std::ostream& printAfPointsInFocus(std::ostream& os, const Value& value, const ExifData* metadata);
-
-        //! Print lens name
-        static std::ostream& printLensId(std::ostream& os, const Value& value, const ExifData* metadata, const std::string& group);
-        static std::ostream& printLensId1(std::ostream& os, const Value& value, const ExifData* metadata);
-        static std::ostream& printLensId2(std::ostream& os, const Value& value, const ExifData* metadata);
-        static std::ostream& printLensId3(std::ostream& os, const Value& value, const ExifData* metadata);
-
-        //! Print sensor pixel size
-        static std::ostream& print0x009a(std::ostream& os, const Value& value, const ExifData*);
-        //! Print retouch history
-        static std::ostream& print0x009e(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Exif.NikonIi.ISO(2)
-        static std::ostream& printIiIso(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-        //! Vibration Reduction tag information
-        static const TagInfo tagInfoVr_[];
-        //! Picture Control tag information
-        static const TagInfo tagInfoPc_[];
-        //! World Time tag information
-        static const TagInfo tagInfoWt_[];
-        //! ISO info tag information
-        static const TagInfo tagInfoIi_[];
-        //! Auto Focus tag information
-        static const TagInfo tagInfoAf_[];
-        //! Shot Info D80 tag information
-        static const TagInfo tagInfoSi1_[];
-        //! Shot Info D40 tag information
-        static const TagInfo tagInfoSi2_[];
-        //! Shot Info D300 (a) tag information
-        static const TagInfo tagInfoSi3_[];
-        //! Shot Info D300 (b) tag information
-        static const TagInfo tagInfoSi4_[];
-        //! Shot Info tag information
-        static const TagInfo tagInfoSi5_[];
-        //! Color Balance 1 tag information
-        static const TagInfo tagInfoCb1_[];
-        //! Color Balance 2 tag information
-        static const TagInfo tagInfoCb2_[];
-        //! Color Balance 2a tag information
-        static const TagInfo tagInfoCb2a_[];
-        //! Color Balance 2b tag information
-        static const TagInfo tagInfoCb2b_[];
-        //! Color Balance 3 tag information
-        static const TagInfo tagInfoCb3_[];
-        //! Color Balance 4 tag information
-        static const TagInfo tagInfoCb4_[];
-        //! Lens Data 1 tag information
-        static const TagInfo tagInfoLd1_[];
-        //! Lens Data 2 tag information
-        static const TagInfo tagInfoLd2_[];
-        //! Lens Data 3 tag information
-        static const TagInfo tagInfoLd3_[];
-
-    }; // class Nikon3MakerNote
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef NIKONMN_HPP_
diff -Nru exiv2-0.19/src/nikonmn_int.hpp exiv2-0.21/src/nikonmn_int.hpp
--- exiv2-0.19/src/nikonmn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/nikonmn_int.hpp	2010-08-08 15:11:33.000000000 +0000
@@ -0,0 +1,280 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    nikonmn_int.hpp
+  @brief   Nikon makernote tags.<BR>References:<BR>
+  [1] <a href="http://www.tawbaware.com/990exif.htm">MakerNote EXIF Tag of the Nikon 990</a> by Max Lyons<BR>
+  [2] <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">Exif file format</a> by TsuruZoh Tachibanaya<BR>
+  [3] "EXIFutils Field Reference Guide"<BR>
+  [3] <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/nikon_mn.html#Nikon_Type_3_Tags">Nikon Type 3 Makernote Tags Definition</a> of the PHP JPEG Metadata Toolkit by Evan Hunter<BR>
+  [4] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey<BR>
+  [5] Email communication with <a href="http://www.rottmerhusen.com">Robert Rottmerhusen</a><BR>
+  [6] Email communication with Roger Larsson<BR>
+  [7] <a href="http://www.cybercom.net/~dcoffin/dcraw/">Decoding raw digital photos in Linux</a> by Dave Coffin<br>
+
+  @version $Rev: 2308 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @author  Gilles Caulier (gc)
+           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  @author  Jens Mueller (jm)
+           <a href="mailto:tschensinger at web dot de">tschensinger at web dot de</a>
+  @date    17-May-04, ahu: created<BR>
+           25-May-04, ahu: combined all Nikon formats in one component
+ */
+#ifndef NIKONMN_INT_HPP_
+#define NIKONMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+#include <memory>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! A MakerNote format used by Nikon cameras, such as the E990 and D1.
+    class Nikon1MakerNote {
+    public:
+        //! Return read-only list of built-in Nikon1 tags
+        static const TagInfo* tagList();
+
+        //! @name Print functions for Nikon1 %MakerNote tags
+        //@{
+        //! Print ISO setting
+        static std::ostream& print0x0002(std::ostream& os, const Value& value, const ExifData*);
+        //! Print autofocus mode
+        static std::ostream& print0x0007(std::ostream& os, const Value& value, const ExifData*);
+        //! Print manual focus distance
+        static std::ostream& print0x0085(std::ostream& os, const Value& value, const ExifData*);
+        //! Print digital zoom setting
+        static std::ostream& print0x0086(std::ostream& os, const Value& value, const ExifData*);
+        //! Print AF focus position
+        static std::ostream& print0x0088(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+
+    }; // class Nikon1MakerNote
+
+    /*!
+      @brief A second MakerNote format used by Nikon cameras, including the
+             E700, E800, E900, E900S, E910, E950
+     */
+    class Nikon2MakerNote {
+    public:
+        //! Return read-only list of built-in Nikon2 tags
+        static const TagInfo* tagList();
+
+        //! @name Print functions for Nikon2 %MakerNote tags
+        //@{
+        //! Print digital zoom setting
+        static std::ostream& print0x000a(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+
+    }; // class Nikon2MakerNote
+
+    //! A third MakerNote format used by Nikon cameras, e.g., E5400, SQ, D2H, D70
+    class Nikon3MakerNote {
+    public:
+        //! Return read-only list of built-in Nikon3 tags
+        static const TagInfo* tagList();
+        //! Return read-only list of built-in Vibration Reduction tags
+        static const TagInfo* tagListVr();
+        //! Return read-only list of built-in Picture Control tags
+        static const TagInfo* tagListPc();
+        //! Return read-only list of built-in World time tags
+        static const TagInfo* tagListWt();
+        //! Return read-only list of built-in ISO info tags
+        static const TagInfo* tagListIi();
+        //! Return read-only list of built-in Auto Focus tags
+        static const TagInfo* tagListAf();
+        //! Return read-only list of built-in Auto Focus 2 tags
+        static const TagInfo* tagListAf2();
+        //! Return read-only list of built-in File Info tags
+        static const TagInfo* tagListFi();
+        //! Return read-only list of built-in Multi Exposure tags
+        static const TagInfo* tagListMe();
+        //! Return read-only list of built-in Flash Info 1 tags
+        static const TagInfo* tagListFl1();
+        //! Return read-only list of built-in Flash Info 2 tags
+        static const TagInfo* tagListFl2();
+        //! Return read-only list of built-in Flash Info 3 tags
+        static const TagInfo* tagListFl3();
+        //! Return read-only list of built-in Shot Info D80 tags
+        static const TagInfo* tagListSi1();
+        //! Return read-only list of built-in Shot Info D40 tags
+        static const TagInfo* tagListSi2();
+        //! Return read-only list of built-in Shot Info D300 (a) tags
+        static const TagInfo* tagListSi3();
+        //! Return read-only list of built-in Shot Info D300 (b) tags
+        static const TagInfo* tagListSi4();
+        //! Return read-only list of built-in Shot Info tags
+        static const TagInfo* tagListSi5();
+        //! Return read-only list of built-in Color Balance 1 tags
+        static const TagInfo* tagListCb1();
+        //! Return read-only list of built-in Color Balance 2 tags
+        static const TagInfo* tagListCb2();
+        //! Return read-only list of built-in Color Balance 2a tags
+        static const TagInfo* tagListCb2a();
+        //! Return read-only list of built-in Color Balance 2b tags
+        static const TagInfo* tagListCb2b();
+        //! Return read-only list of built-in Color Balance 3 tags
+        static const TagInfo* tagListCb3();
+        //! Return read-only list of built-in Color Balance 4 tags
+        static const TagInfo* tagListCb4();
+        //! Return read-only list of built-in Lens Data 1 tags
+        static const TagInfo* tagListLd1();
+        //! Return read-only list of built-in Lens Data 2 tags
+        static const TagInfo* tagListLd2();
+        //! Return read-only list of built-in Lens Data 3 tags
+        static const TagInfo* tagListLd3();
+
+        //! @name Print functions for Nikon3 %MakerNote tags
+        //@{
+        //! Print ISO setting
+        static std::ostream& print0x0002(std::ostream& os, const Value& value, const ExifData*);
+        //! Print autofocus mode
+        static std::ostream& print0x0007(std::ostream& os, const Value& value, const ExifData*);
+        //! Print lens type
+        static std::ostream& print0x0083(std::ostream& os, const Value& value, const ExifData*);
+        //! Print lens information
+        static std::ostream& print0x0084(std::ostream& os, const Value& value, const ExifData*);
+        //! Print manual focus distance
+        static std::ostream& print0x0085(std::ostream& os, const Value& value, const ExifData*);
+        //! Print digital zoom setting
+        static std::ostream& print0x0086(std::ostream& os, const Value& value, const ExifData*);
+        //! Print AF point
+        static std::ostream& print0x0088(std::ostream& os, const Value& value, const ExifData*);
+        //! Print shooting mode
+        static std::ostream& print0x0089(std::ostream& os, const Value& value, const ExifData* metadata);
+        //! Print number of lens stops
+        static std::ostream& print0x008b(std::ostream& os, const Value& value, const ExifData*);
+        //! Print AF Points In Focus
+        static std::ostream& printAfPointsInFocus(std::ostream& os, const Value& value, const ExifData* metadata);
+        //! Print lens name
+        static std::ostream& printLensId(std::ostream& os, const Value& value, const ExifData* metadata, const std::string& group);
+        static std::ostream& printLensId1(std::ostream& os, const Value& value, const ExifData* metadata);
+        static std::ostream& printLensId2(std::ostream& os, const Value& value, const ExifData* metadata);
+        static std::ostream& printLensId3(std::ostream& os, const Value& value, const ExifData* metadata);
+        //! Print focus distance
+        static std::ostream& printFocusDistance(std::ostream& os, const Value& value, const ExifData*);
+        //! Print lens aperture value
+        static std::ostream& printAperture(std::ostream& os, const Value& value, const ExifData*);
+        //! Print lens focal length
+        static std::ostream& printFocal(std::ostream& os, const Value& value, const ExifData*);
+        //! Print lens f-stops
+        static std::ostream& printFStops(std::ostream& os, const Value& value, const ExifData*);
+        //! Print exit pupil position
+        static std::ostream& printExitPupilPosition(std::ostream& os, const Value& value, const ExifData*);
+        //! Print sensor pixel size
+        static std::ostream& print0x009a(std::ostream& os, const Value& value, const ExifData*);
+        //! Print retouch history
+        static std::ostream& print0x009e(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Exif.NikonIi.ISO(2)
+        static std::ostream& printIiIso(std::ostream& os, const Value& value, const ExifData*);
+        //! Print flash focal length
+        static std::ostream& printFlashFocalLength(std::ostream& os, const Value& value, const ExifData*);
+        //! Print repeating flash rate
+        static std::ostream& printRepeatingFlashRate(std::ostream& os, const Value& value, const ExifData*);
+        //! Print repeating flash count
+        static std::ostream& printRepeatingFlashCount(std::ostream& os, const Value& value, const ExifData*);
+        //! Print time zone
+        static std::ostream& printTimeZone(std::ostream& os, const Value& value, const ExifData*);
+        //! Print picture control value
+        static std::ostream& printPictureControl(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+        //! Vibration Reduction tag information
+        static const TagInfo tagInfoVr_[];
+        //! Picture Control tag information
+        static const TagInfo tagInfoPc_[];
+        //! World Time tag information
+        static const TagInfo tagInfoWt_[];
+        //! ISO info tag information
+        static const TagInfo tagInfoIi_[];
+        //! Auto Focus tag information
+        static const TagInfo tagInfoAf_[];
+        //! Auto Focus tag 2 information
+        static const TagInfo tagInfoAf2_[];
+        //! File Info tag information
+        static const TagInfo tagInfoFi_[];
+        //! Multi Exposure tag information
+        static const TagInfo tagInfoMe_[];
+        //! Flash Info 1 tag information
+        static const TagInfo tagInfoFl1_[];
+        //! Flash Info 2 tag information
+        static const TagInfo tagInfoFl2_[];
+        //! Flash Info 3 tag information
+        static const TagInfo tagInfoFl3_[];
+        //! Shot Info D80 tag information
+        static const TagInfo tagInfoSi1_[];
+        //! Shot Info D40 tag information
+        static const TagInfo tagInfoSi2_[];
+        //! Shot Info D300 (a) tag information
+        static const TagInfo tagInfoSi3_[];
+        //! Shot Info D300 (b) tag information
+        static const TagInfo tagInfoSi4_[];
+        //! Shot Info tag information
+        static const TagInfo tagInfoSi5_[];
+        //! Color Balance 1 tag information
+        static const TagInfo tagInfoCb1_[];
+        //! Color Balance 2 tag information
+        static const TagInfo tagInfoCb2_[];
+        //! Color Balance 2a tag information
+        static const TagInfo tagInfoCb2a_[];
+        //! Color Balance 2b tag information
+        static const TagInfo tagInfoCb2b_[];
+        //! Color Balance 3 tag information
+        static const TagInfo tagInfoCb3_[];
+        //! Color Balance 4 tag information
+        static const TagInfo tagInfoCb4_[];
+        //! Lens Data 1 tag information
+        static const TagInfo tagInfoLd1_[];
+        //! Lens Data 2 tag information
+        static const TagInfo tagInfoLd2_[];
+        //! Lens Data 3 tag information
+        static const TagInfo tagInfoLd3_[];
+
+    }; // class Nikon3MakerNote
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef NIKONMN_INT_HPP_
diff -Nru exiv2-0.19/src/olympusmn.cpp exiv2-0.21/src/olympusmn.cpp
--- exiv2-0.19/src/olympusmn.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/olympusmn.cpp	2010-09-10 16:36:33.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,23 +20,26 @@
  */
 /*
   File:      olympusmn.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2346 $
   Author(s): Will Stokes (wuz) <wstokes@gmail.com>
              Andreas Huggel (ahu) <ahuggel@gmx.net>
-             Gilles Caulier (gc) <caulier.gilles@kdemail.net>
+             Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
+             Greg Mansfield <G.Mansfield at computer dot org>
   History:   10-Mar-05, wuz: created
   Credits:   See header file.
  */
 
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: olympusmn.cpp 1750 2009-02-16 14:30:51Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: olympusmn.cpp 2346 2010-09-10 16:36:33Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "olympusmn.hpp"
+#include "olympusmn_int.hpp"
 #include "value.hpp"
+#include "image.hpp"
+#include "tags_int.hpp"
 #include "i18n.h"                // NLS support.
 
 // + standard includes
@@ -49,7 +52,7 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
-
+    namespace Internal {
 
     //! OffOn, multiple tags
     extern const TagDetails olympusOffOn[] = {
@@ -85,6 +88,55 @@
         {  2, N_("On (preset)") }
     };
 
+    //! SceneMode, tag 0x403 and CameraSettings tag 0x509
+    extern const TagDetails olympusSceneMode[] = {
+        {  0, N_("Standard")                    },
+        {  6, N_("Auto")                        },
+        {  7, N_("Sport")                       },
+        {  8, N_("Portrait")                    },
+        {  9, N_("Landscape+Portrait")          },
+        { 10, N_("Landscape")                   },
+        { 11, N_("Night Scene")                 },
+        { 12, N_("Self Portrait")               },
+        { 13, N_("Panorama")                    },
+        { 14, N_("2 in 1")                      },
+        { 15, N_("Movie")                       },
+        { 16, N_("Landscape+Portrait")          },
+        { 17, N_("Night+Portrait")              },
+        { 18, N_("Indoor")                      },
+        { 19, N_("Fireworks")                   },
+        { 20, N_("Sunset")                      },
+        { 22, N_("Macro")                       },
+        { 23, N_("Super Macro")                 },
+        { 24, N_("Food")                        },
+        { 25, N_("Documents")                   },
+        { 26, N_("Museum")                      },
+        { 27, N_("Shoot & Select")              },
+        { 28, N_("Beach & Snow")                },
+        { 29, N_("Self Portrait+Timer")         },
+        { 30, N_("Candle")                      },
+        { 31, N_("Available Light")             },
+        { 32, N_("Behind Glass")                },
+        { 33, N_("My Mode")                     },
+        { 34, N_("Pet")                         },
+        { 35, N_("Underwater Wide1")            },
+        { 36, N_("Underwater Macro")            },
+        { 37, N_("Shoot & Select1")             },
+        { 38, N_("Shoot & Select2")             },
+        { 39, N_("High Key")                    },
+        { 40, N_("Digital Image Stabilization") },
+        { 41, N_("Auction")                     },
+        { 42, N_("Beach")                       },
+        { 43, N_("Snow")                        },
+        { 44, N_("Underwater Wide2")            },
+        { 45, N_("Low Key")                     },
+        { 46, N_("Children")                    },
+        { 47, N_("Vivid")                       },
+        { 48, N_("Nature Macro")                },
+        { 49, N_("Underwater Snapshot")         },
+        { 50, N_("Shooting Guide")              }
+    };
+
     //! FlashDevice, tag 0x1005
     extern const TagDetails olympusFlashDevice[] = {
         {  0, N_("None")                },
@@ -93,6 +145,12 @@
         {  5, N_("Internal + External") }
     };
 
+    //! FocusRange, tag 0x100a
+    extern const TagDetails olympusFocusRange[] = {
+        {  0, N_("Normal")   },
+        {  1, N_("Macro") }
+    };
+
     //! FocusMode, tag 0x100b
     extern const TagDetails olympusFocusMode[] = {
         {  0, N_("Auto")   },
@@ -124,290 +182,293 @@
 
         /* TODO:
            add Minolta makenotes tags here (0x0000-0x0103). See Exiftool database.*/
+        TagInfo(0x0000, "0x0000", "0x0000",
+                N_("Unknown"),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0100, "ThumbnailImage", N_("Thumbnail Image"),
                 N_("Thumbnail image"),
-                olympusIfdId, makerTags, undefined, printValue),
+                olympusId, makerTags, undefined, -1, printValue),
 
+        TagInfo(0x0104, "BodyFirmwareVersion", N_("Body Firmware Version"),
+                N_("Body firmware version"),
+                olympusId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0200, "SpecialMode", N_("Special Mode"),
                 N_("Picture taking mode"),
-                olympusIfdId, makerTags, unsignedLong, print0x0200),
+                olympusId, makerTags, unsignedLong, -1, print0x0200),
         TagInfo(0x0201, "Quality", N_("Quality"),
                 N_("Image quality setting"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusQuality)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusQuality)),
         TagInfo(0x0202, "Macro", N_("Macro"),
                 N_("Macro mode"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusMacro)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusMacro)),
         TagInfo(0x0203, "BWMode", N_("Black & White Mode"),
                 N_("Black and white mode"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
         TagInfo(0x0204, "DigitalZoom", N_("Digital Zoom"),
                 N_("Digital zoom ratio"),
-                olympusIfdId, makerTags, unsignedRational, print0x0204),
+                olympusId, makerTags, unsignedRational, -1, print0x0204),
         TagInfo(0x0205, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"),
                 N_("Focal plane diagonal"),
-                olympusIfdId, makerTags, unsignedRational, printValue),
+                olympusId, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x0206, "LensDistortionParams", N_("Lens Distortion Parameters"),
                 N_("Lens distortion parameters"),
-                olympusIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0207, "FirmwareVersion", N_("Firmware Version"),
-                N_("Software firmware version"),
-                olympusIfdId, makerTags, asciiString, printValue),
+                olympusId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0207, "CameraType", N_("Camera Type"),
+                N_("Camera type"),
+                olympusId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0208, "PictureInfo", N_("Picture Info"),
                 N_("ASCII format data such as [PictureInfo]"),
-                olympusIfdId, makerTags, asciiString, printValue),
+                olympusId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0209, "CameraID", N_("Camera ID"),
                 N_("Camera ID data"),
-                olympusIfdId, makerTags, undefined, printValue),
-
-        /* TODO: Epson Camera tags. See ExifTool database.
-
+                olympusId, makerTags, asciiString, -1, print0x0209),
         TagInfo(0x020b, "ImageWidth", N_("Image Width"),
                 N_("Image width"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x020c, "ImageHeight", N_("Image Height"),
                 N_("Image height"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x020d, "Software", N_("Software"),
                 N_("Software"),
-                olympusIfdId, makerTags, asciiString, printValue),
+                olympusId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0280, "PreviewImage", N_("Preview Image"),
                 N_("Preview image"),
-                olympusIfdId, makerTags, unsignedByte, printValue),
-        */
-
+                olympusId, makerTags, unsignedByte, -1, printValue),
         TagInfo(0x0300, "PreCaptureFrames", N_("Pre Capture Frames"),
                 N_("Pre-capture frames"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0301, "0x0301", "0x0301",
-                N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0301, "WhiteBoard", N_("White Board"),
+                N_("White board"),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x0302, "OneTouchWB", N_("One Touch WB"),
                 N_("One touch white balance"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOneTouchWb)),
-        TagInfo(0x0303, "0x0303", "0x0303",
-                N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0304, "0x0304", "0x0304",
-                N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0404, "SerialNumber", N_("Serial Number"),
-                N_("Serial number"),
-                olympusIfdId, makerTags, asciiString, printValue),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOneTouchWb)),
+        TagInfo(0x0303, "WhiteBalanceBracket", N_("White Balance Bracket"),
+                N_("White balance bracket"),
+                olympusId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0304, "WhiteBalanceBias", N_("White Balance Bias"),
+                N_("White balance bias"),
+                olympusId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0403, "SceneMode", N_("Scene Mode"),
+                N_("Scene mode"),
+                olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusSceneMode)),
+        TagInfo(0x0404, "Firmware", N_("Firmware"),
+                N_("Firmwarer"),
+                olympusId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0e00, "PrintIM", N_("Print IM"),
                 N_("PrintIM information"),
-                olympusIfdId, makerTags, undefined, printValue),
+                olympusId, makerTags, undefined, -1, printValue),
         TagInfo(0x0f00, "DataDump1", N_("Data Dump 1"),
                 N_("Various camera settings 1"),
-                olympusIfdId, makerTags, undefined, printValue),
+                olympusId, makerTags, undefined, -1, printValue),
         TagInfo(0x0f01, "DataDump2", N_("Data Dump 2"),
                 N_("Various camera settings 2"),
-                olympusIfdId, makerTags, undefined, printValue),
+                olympusId, makerTags, undefined, -1, printValue),
         TagInfo(0x1000, "ShutterSpeed", N_("Shutter Speed"),
                 N_("Shutter speed value"),
-                olympusIfdId, makerTags, signedRational, printValue),
+                olympusId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1001, "ISOSpeed", N_("ISO Speed"),
                 N_("ISO speed value"),
-                olympusIfdId, makerTags, signedRational, printValue),
+                olympusId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1002, "ApertureValue", N_("Aperture Value"),
                 N_("Aperture value"),
-                olympusIfdId, makerTags, signedRational, printValue),
+                olympusId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1003, "Brightness", N_("Brightness"),
                 N_("Brightness value"),
-                olympusIfdId, makerTags, signedRational, printValue),
+                olympusId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1004, "FlashMode", N_("Flash Mode"),
                 N_("Flash mode"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
         TagInfo(0x1005, "FlashDevice", N_("Flash Device"),
                 N_("Flash device"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFlashDevice)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFlashDevice)),
         TagInfo(0x1006, "Bracket", N_("Bracket"),
                 N_("Exposure compensation value"),
-                olympusIfdId, makerTags, signedRational, printValue),
+                olympusId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1007, "SensorTemperature", N_("Sensor Temperature"),
                 N_("Sensor temperature"),
-                olympusIfdId, makerTags, signedShort, printValue),
+                olympusId, makerTags, signedShort, -1, printValue),
         TagInfo(0x1008, "LensTemperature", N_("Lens Temperature"),
                 N_("Lens temperature"),
-                olympusIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x1009, "0x1009", "0x1009",
-                N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x100a, "0x100a", "0x100a",
-                N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x1009, "LightCondition", N_("Light Condition"),
+                N_("Light condition"),
+                olympusId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x100a, "FocusRange", N_("Focus Range"),
+                N_("Focus range"),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFocusRange)),
         TagInfo(0x100b, "FocusMode", N_("Focus Mode"),
                 N_("Focus mode"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFocusMode)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFocusMode)),
         TagInfo(0x100c, "FocusDistance", N_("Focus Distance"),
                 N_("Manual focus distance"),
-                olympusIfdId, makerTags, unsignedRational, printValue),
+                olympusId, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x100d, "Zoom", N_("Zoom"),
                 N_("Zoom step count"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x100e, "MacroFocus", N_("Macro Focus"),
                 N_("Macro focus step count"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x100f, "SharpnessFactor", N_("Sharpness Factor"),
                 N_("Sharpness factor"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusSharpness)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusSharpness)),
         TagInfo(0x1010, "FlashChargeLevel", N_("Flash Charge Level"),
                 N_("Flash charge level"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1011, "ColorMatrix", N_("Color Matrix"),
                 N_("Color matrix"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1012, "BlackLevel", N_("BlackLevel"),
                 N_("Black level"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1013, "0x1013", "0x1013",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1014, "0x1014", "0x1014",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1015, "WhiteBalance", N_("White Balance"),
                 N_("White balance mode"),
-                olympusIfdId, makerTags, unsignedShort, print0x1015),
+                olympusId, makerTags, unsignedShort, -1, print0x1015),
         TagInfo(0x1016, "0x1016", "0x1016",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1017, "RedBalance", N_("Red Balance"),
                 N_("Red balance"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1018, "BlueBalance", N_("Blue Balance"),
                 N_("Blue balance"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x1019, "0x1019", "0x1019",
-                N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x1019, "ColorMatrixNumber", N_("Color Matrix Number"),
+                N_("Color matrix mumber"),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x101a, "SerialNumber2", N_("Serial Number 2"),
                 N_("Serial number 2"),
-                olympusIfdId, makerTags, asciiString, printValue),
+                olympusId, makerTags, asciiString, -1, printValue),
         TagInfo(0x101b, "0x101b", "0x101b",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x101c, "0x101c", "0x101c",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x101d, "0x101d", "0x101d",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x101e, "0x101e", "0x101e",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x101f, "0x101f", "0x101f",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1020, "0x1020", "0x1020",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1021, "0x1021", "0x1021",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1022, "0x1022", "0x1022",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1023, "FlashBias", N_("Flash Bias"),
                 N_("Flash exposure compensation"),
-                olympusIfdId, makerTags, signedRational, printValue),
+                olympusId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1024, "0x1024", "0x1024",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1025, "0x1025", "0x1025",
                 N_("Unknown"),
-                olympusIfdId, makerTags, signedRational, printValue),
+                olympusId, makerTags, signedRational, -1, printValue),
         TagInfo(0x1026, "ExternalFlashBounce", N_("External Flash Bounce"),
                 N_("External flash bounce"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
         TagInfo(0x1027, "ExternalFlashZoom", N_("External Flash Zoom"),
                 N_("External flash zoom"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1028, "ExternalFlashMode", N_("External Flash Mode"),
                 N_("External flash mode"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1029, "Contrast", N_("Contrast"),
                 N_("Contrast setting"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusContrast)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusContrast)),
         TagInfo(0x102a, "SharpnessFactor", N_("Sharpness Factor"),
                 N_("Sharpness factor"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x102b, "ColorControl", N_("Color Control"),
                 N_("Color control"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x102c, "ValidBits", N_("ValidBits"),
                 N_("Valid bits"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x102d, "CoringFilter", N_("CoringFilter"),
                 N_("Coring filter"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x102e, "ImageWidth", N_("Image Width"),
                 N_("Image width"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x102f, "ImageHeight", N_("Image Height"),
                 N_("Image height"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1030, "0x1030", "0x1030",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1031, "0x1031", "0x1031",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1032, "0x1032", "0x1032",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x1033, "0x1033", "0x1033",
                 N_("Unknown"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1034, "CompressionRatio", N_("Compression Ratio"),
                 N_("Compression ratio"),
-                olympusIfdId, makerTags, unsignedRational, printValue),
+                olympusId, makerTags, unsignedRational, -1, printValue),
         TagInfo(0x1035, "Thumbnail", N_("Thumbnail"),
                 N_("Preview image embedded"),
-                olympusIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(olympusOffOn)),
+                olympusId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(olympusOffOn)),
         TagInfo(0x1036, "ThumbnailOffset", N_("Thumbnail Offset"),
                 N_("Offset of the preview image"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1037, "ThumbnailLength", N_("Thumbnail Length"),
                 N_("Size of the preview image"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x1039, "CCDScanMode", N_("CCD Scan Mode"),
                 N_("CCD scan mode"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusCCDScanMode)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusCCDScanMode)),
         TagInfo(0x103a, "NoiseReduction", N_("Noise Reduction"),
                 N_("Noise reduction"),
-                olympusIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
+                olympusId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
         TagInfo(0x103b, "InfinityLensStep", N_("Infinity Lens Step"),
                 N_("Infinity lens step"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x103c, "NearLensStep", N_("Near Lens Step"),
                 N_("Near lens step"),
-                olympusIfdId, makerTags, unsignedShort, printValue),
+                olympusId, makerTags, unsignedShort, -1, printValue),
         TagInfo(0x2010, "Equipment", N_("Equipment Info"),
                 N_("Camera equipment sub-IFD"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x2020, "CameraSettings", N_("Camera Settings"),
                 N_("Camera Settings sub-IFD"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x2030, "RawDevelopment", N_("Raw Development"),
                 N_("Raw development sub-IFD"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x2031, "RawDevelopment2", N_("Raw Development 2"),
                 N_("Raw development 2 sub-IFD"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x2040, "ImageProcessing", N_("Image Processing"),
                 N_("Image processing sub-IFD"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x2050, "FocusInfo", N_("Focus Info"),
                 N_("Focus sub-IFD"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
+                olympusId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x3000, "RawInfo", N_("Raw Info"),
                 N_("Raw sub-IFD"),
-                olympusIfdId, makerTags, unsignedLong, printValue),
-
+                olympusId, makerTags, unsignedLong, -1, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownOlympusMakerNoteTag)", "(UnknownOlympusMakerNoteTag)",
                 N_("Unknown OlympusMakerNote tag"),
-                olympusIfdId, makerTags, invalidTypeId, printValue)
+                olympusId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagList()
@@ -415,6 +476,7 @@
         return tagInfo_;
     }
 
+// Olympus CameraSettings Tags
     //! ExposureMode, tag 0x0200
     extern const TagDetails olympusExposureMode[] = {
         { 1, N_("Manual")                    },
@@ -424,7 +486,7 @@
         { 5, N_("Program-shift")             }
     };
 
-    //! MeteringMode
+    //! MeteringMode, tag 0x0202
     extern const TagDetails olympusMeteringMode[] = {
         {    2, N_("Center-weighted average") },
         {    3, N_("Spot")                    },
@@ -434,14 +496,14 @@
         { 1027, N_("Spot+Shadow control")     }
     };
 
-    //! MacroMode
+    //! MacroMode, tag 0x0300
     extern const TagDetails olympusMacroMode[] = {
         { 0, N_("Off")         },
         { 1, N_("On")          },
         { 2, N_("Super Macro") }
     };
 
-    //! FocusMode
+    //! FocusMode, tag 0x0301
     extern const TagDetails olympusCsFocusMode[] = {
         { 0, N_("Single AF")              },
         { 1, N_("Sequential shooting AF") },
@@ -450,19 +512,19 @@
         { 10, N_("MF")                    }
     };
 
-    //! FocusProcess
+    //! FocusProcess, tag 0x0302
     extern const TagDetails olympusFocusProcess[] = {
         { 0, N_("AF Not Used") },
         { 1, N_("AF Used")     }
     };
 
-    //! AFSearch
+    //! AFSearch, tag 0x0303
     extern const TagDetails olympusAFSearch[] = {
         { 0, N_("Not Ready") },
         { 1, N_("Ready")     }
     };
 
-    //! FlashMode
+    //! FlashMode, tag 0x0400
     extern const TagDetailsBitmask olympusFlashMode[] = {
         { 0x0000, N_("Off")         },
         { 0x0001, N_("On")          },
@@ -473,7 +535,32 @@
         { 0x0020, N_("2nd Curtain") }
     };
 
-    //! OlympusCs WhiteBalance
+    //! FlashRemoteControl, tag 0x0403
+    extern const TagDetails olympusFlashRemoteControl[] = {
+        {  0x0, N_("Off")              },
+        {  0x1, N_("Channel 1, Low")   },
+        {  0x2, N_("Channel 2, Low")   },
+        {  0x3, N_("Channel 3, Low")   },
+        {  0x4, N_("Channel 4, Low")   },
+        {  0x9, N_("Channel 1, Mid")   },
+        {  0xa, N_("Channel 2, Mid")   },
+        {  0xb, N_("Channel 3, Mid")   },
+        {  0xc, N_("Channel 4, Mid")   },
+        { 0x11, N_("Channel 1, High")  },
+        { 0x12, N_("Channel 2, High")  },
+        { 0x13, N_("Channel 3, High")  },
+        { 0x14, N_("Channel 4, High")  }
+    };
+
+    //! FlashControlMode, tag 0x0404
+    extern const TagDetails olympusFlashControlMode[] = {
+        { 0, N_("Off")     },
+        { 3, N_("TTL")     },
+        { 4, N_("Auto")    },
+        { 5, N_("Manual")  }
+    };
+
+    //! WhiteBalance, tag 0x0500
     extern const TagDetails olympusWhiteBalance[] = {
         {   0, N_("Auto")                              },
         {  16, N_("7500K (Fine Weather with Shade)")   },
@@ -494,7 +581,7 @@
         { 514, N_("Custom WB 8000K")                   }
     };
 
-    //! ModifiedSaturation
+    //! ModifiedSaturation, tag 0x0504
     extern const TagDetails olympusModifiedSaturation[] = {
         { 0, N_("Off")                 },
         { 1, N_("CM1 (Red Enhance)")   },
@@ -503,70 +590,22 @@
         { 4, N_("CM4 (Skin Tones)")    }
     };
 
-    //! ColorSpace
+    //! ColorSpace, tag 0x0507
     extern const TagDetails olympusColorSpace[] = {
         { 0, N_("sRGB")          },
         { 1, N_("Adobe RGB")     },
         { 2, N_("Pro Photo RGB") }
     };
 
-    //! SceneMode
-    extern const TagDetails olympusSceneMode[] = {
-        {  0, N_("Standard")                    },
-        {  6, N_("Auto")                        },
-        {  7, N_("Sport")                       },
-        {  8, N_("Portrait")                    },
-        {  9, N_("Landscape+Portrait")          },
-        { 10, N_("Landscape")                   },
-        { 11, N_("Night Scene")                 },
-        { 12, N_("Self Portrait")               },
-        { 13, N_("Panorama")                    },
-        { 14, N_("2 in 1")                      },
-        { 15, N_("Movie")                       },
-        { 16, N_("Landscape+Portrait")          },
-        { 17, N_("Night+Portrait")              },
-        { 18, N_("Indoor")                      },
-        { 19, N_("Fireworks")                   },
-        { 20, N_("Sunset")                      },
-        { 22, N_("Macro")                       },
-        { 23, N_("Super Macro")                 },
-        { 24, N_("Food")                        },
-        { 25, N_("Documents")                   },
-        { 26, N_("Museum")                      },
-        { 27, N_("Shoot & Select")              },
-        { 28, N_("Beach & Snow")                },
-        { 29, N_("Self Portrait+Timer")         },
-        { 30, N_("Candle")                      },
-        { 31, N_("Available Light")             },
-        { 32, N_("Behind Glass")                },
-        { 33, N_("My Mode")                     },
-        { 34, N_("Pet")                         },
-        { 35, N_("Underwater Wide1")            },
-        { 36, N_("Underwater Macro")            },
-        { 37, N_("Shoot & Select1")             },
-        { 38, N_("Shoot & Select2")             },
-        { 39, N_("High Key")                    },
-        { 40, N_("Digital Image Stabilization") },
-        { 41, N_("Auction")                     },
-        { 42, N_("Beach")                       },
-        { 43, N_("Snow")                        },
-        { 44, N_("Underwater Wide2")            },
-        { 45, N_("Low Key")                     },
-        { 46, N_("Children")                    },
-        { 47, N_("Vivid")                       },
-        { 48, N_("Nature Macro")                },
-        { 49, N_("Underwater Snapshot")         },
-        { 50, N_("Shooting Guide")              }
-    };
-
-    //! NoiseReduction
+    //! NoiseReduction, tag 0x050a
     extern const TagDetailsBitmask olympusNoiseReduction[] = {
         { 0x0001, N_("Noise Reduction")          },
         { 0x0002, N_("Noise Filter")             },
-        { 0x0004, N_("Noise Filter (ISO Boost)") }
+        { 0x0004, N_("Noise Filter (ISO Boost)") },
+        { 0x0008, N_("Auto")                     }
     };
 
-    //! PictureMode
+    //! PictureMode, tag 0x0520
     extern const TagDetails olympusPictureMode[] = {
         {   1, N_("Vivid")    },
         {   2, N_("Natural")  },
@@ -576,7 +615,7 @@
         { 512, N_("Sepia")    }
     };
 
-    //! PictureModeBWFilter
+    //! PictureModeBWFilter, tag 0x0525
     extern const TagDetails olympusPictureModeBWFilter[] = {
         { 0, N_("n/a")     },
         { 1, N_("Neutral") },
@@ -586,7 +625,7 @@
         { 5, N_("Green")   }
     };
 
-    //! PictureModeTone
+    //! PictureModeTone, tag 0x0526
     extern const TagDetails olympusPictureModeTone[] = {
         { 0, N_("n/a")     },
         { 1, N_("Neutral") },
@@ -596,7 +635,7 @@
         { 5, N_("Green")   }
     };
 
-    //! OlympusCs Quality
+    //! OlympusCs Quality, tag 0x0603
     extern const TagDetails olympusCsQuality[] = {
         { 1, N_("SQ")  },
         { 2, N_("HQ")  },
@@ -604,51 +643,71 @@
         { 4, N_("RAW") }
     };
 
+    //! Olympus ImageStabilization, tag 0x0604
+    extern const TagDetails olympusImageStabilization[] = {
+        { 0, N_("Off")        },
+        { 1, N_("On, Mode 1") },
+        { 2, N_("On, Mode 2") },
+        { 3, N_("On, Mode 3") }
+    };
+
     const TagInfo OlympusMakerNote::tagInfoCs_[] = {
-        TagInfo(0x0000, "CameraSettingsVersion", N_("Camera Settings Version"), N_("Camera settings version"), olympusCsIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0100, "PreviewImageValid", N_("PreviewImage Valid"), N_("Preview image valid"), olympusCsIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(olympusNoYes)),
-        TagInfo(0x0101, "PreviewImageStart", N_("PreviewImage Start"), N_("Preview image start"), olympusCsIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0102, "PreviewImageLength", N_("PreviewImage Length"), N_("Preview image length"), olympusCsIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0200, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusExposureMode)),
-        TagInfo(0x0201, "AELock", N_("AE Lock"), N_("Auto exposure lock"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x0202, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusMeteringMode)),
-        TagInfo(0x0300, "MacroMode", N_("Macro Mode"), N_("Macro mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusMacroMode)),
-        TagInfo(0x0301, "FocusMode", N_("Focus Mode"), N_("Focus mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusCsFocusMode)),
-        TagInfo(0x0302, "FocusProcess", N_("Focus Process"), N_("Focus process"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFocusProcess)),
-        TagInfo(0x0303, "AFSearch", N_("AF Search"), N_("AF search"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusAFSearch)),
-        TagInfo(0x0304, "AFAreas", N_("AF Areas"), N_("AF areas"), olympusCsIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0400, "FlashMode", N_("Flash Mode"), N_("Flash mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusFlashMode)),
-        TagInfo(0x0401, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation"), olympusCsIfdId, makerTags, signedRational, printValue),
-        TagInfo(0x0500, "WhiteBalance", N_("White Balance 2"), N_("White balance 2"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusWhiteBalance)),
-        TagInfo(0x0501, "WhiteBalanceTemperature", N_("White Balance Temperature"), N_("White balance temperature"), olympusCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0502, "WhiteBalanceBracket", N_("White Balance Bracket"), N_("White balance bracket"), olympusCsIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0503, "CustomSaturation", N_("Custom Saturation"), N_("Custom saturation"), olympusCsIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0504, "ModifiedSaturation", N_("Modified Saturation"), N_("Modified saturation"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusModifiedSaturation)),
-        TagInfo(0x0505, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusCsIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0506, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusCsIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0507, "ColorSpace", N_("Color Space"), N_("Color space"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusColorSpace)),
-        TagInfo(0x0509, "SceneMode", N_("Scene Mode"), N_("Scene mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusSceneMode)),
-        TagInfo(0x050a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
-        TagInfo(0x050b, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x050c, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x050d, "CompressionFactor", N_("Compression Factor"), N_("Compression factor"), olympusCsIfdId, makerTags, unsignedRational, printValue),
-        TagInfo(0x050f, "Gradation", N_("Gradation"), N_("Gradation"), olympusCsIfdId, makerTags, signedShort, print0x050f),
-        TagInfo(0x0520, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusPictureMode)),
-        TagInfo(0x0521, "PictureModeSaturation", N_("Picture Mode Saturation"), N_("Picture mode saturation"), olympusCsIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0522, "PictureModeHue", N_("Picture Mode Hue"), N_("Picture mode hue"), olympusCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0523, "PictureModeContrast", N_("Picture Mode Contrast"), N_("Picture mode contrast"), olympusCsIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0524, "PictureModeSharpness", N_("Picture Mode Sharpness"), N_("Picture mode sharpness"), olympusCsIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0525, "PictureModeBWFilter", N_("Picture Mode BW Filter"), N_("Picture mode BW filter"), olympusCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(olympusPictureModeBWFilter)),
-        TagInfo(0x0526, "PictureModeTone", N_("Picture Mode Tone"), N_("Picture mode tone"), olympusCsIfdId, makerTags, signedShort, EXV_PRINT_TAG(olympusPictureModeTone)),
-        TagInfo(0x0527, "NoiseFilter", N_("Noise Filter"), N_("Noise filter"), olympusCsIfdId, makerTags, signedShort, print0x0527),
-        TagInfo(0x0600, "DriveMode", N_("Drive Mode"), N_("Drive mode"), olympusCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0601, "PanoramaMode", N_("Panorama Mode"), N_("Panorama mode"), olympusCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0603, "Quality", N_("Image Quality 2"), N_("Image quality 2"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusCsQuality)),
-        TagInfo(0x0900, "ManometerPressure", N_("Manometer Pressure"), N_("Manometer pressure"), olympusCsIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0901, "ManometerReading", N_("Manometer Reading"), N_("Manometer reading"), olympusCsIfdId, makerTags, signedLong, printValue),
-        TagInfo(0x0902, "ExtendedWBDetect", N_("Extended WB Detect"), N_("Extended WB detect"), olympusCsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x0000, "CameraSettingsVersion", N_("Camera Settings Version"), N_("Camera settings version"), olympusCsId, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0100, "PreviewImageValid", N_("PreviewImage Valid"), N_("Preview image valid"), olympusCsId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(olympusNoYes)),
+        TagInfo(0x0101, "PreviewImageStart", N_("PreviewImage Start"), N_("Preview image start"), olympusCsId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0102, "PreviewImageLength", N_("PreviewImage Length"), N_("Preview image length"), olympusCsId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0200, "ExposureMode", N_("Exposure Mode"), N_("Exposure mode"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusExposureMode)),
+        TagInfo(0x0201, "AELock", N_("AE Lock"), N_("Auto exposure lock"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x0202, "MeteringMode", N_("Metering Mode"), N_("Metering mode"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusMeteringMode)),
+        TagInfo(0x0203, "ExposureShift", N_("Exposure Shift"), N_("Exposure shift"), olympusCsId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x0300, "MacroMode", N_("Macro Mode"), N_("Macro mode"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusMacroMode)),
+        TagInfo(0x0301, "FocusMode", N_("Focus Mode"), N_("Focus mode"), olympusCsId, makerTags, unsignedShort, -1, printCs0x0301),
+        TagInfo(0x0302, "FocusProcess", N_("Focus Process"), N_("Focus process"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFocusProcess)),
+        TagInfo(0x0303, "AFSearch", N_("AF Search"), N_("AF search"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusAFSearch)),
+        TagInfo(0x0304, "AFAreas", N_("AF Areas"), N_("AF areas"), olympusCsId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0305, "AFPointSelected", N_("AFPointSelected"), N_("AFPointSelected"), olympusCsId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x0307, "AFFineTuneAdj", N_("AF Fine Tune Adjust"), N_("AF fine tune adjust"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0400, "FlashMode", N_("Flash Mode"), N_("Flash mode"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusFlashMode)),
+        TagInfo(0x0401, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation"), olympusCsId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x0403, "FlashRemoteControl", N_("Flash Remote Control"), N_("Flash remote control"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFlashRemoteControl)),
+        TagInfo(0x0404, "FlashControlMode", N_("Flash Control Mode"), N_("Flash control mode"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFlashControlMode)),
+        TagInfo(0x0405, "FlashIntensity", N_("Flash Intensity"), N_("Flash intensity"), olympusCsId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x0406, "ManualFlashStrength", N_("Manual Flash Strength"), N_("Manual flash strength"), olympusCsId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x0500, "WhiteBalance", N_("White Balance 2"), N_("White balance 2"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusWhiteBalance)),
+        TagInfo(0x0501, "WhiteBalanceTemperature", N_("White Balance Temperature"), N_("White balance temperature"), olympusCsId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0502, "WhiteBalanceBracket", N_("White Balance Bracket"), N_("White balance bracket"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0503, "CustomSaturation", N_("Custom Saturation"), N_("Custom saturation"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0504, "ModifiedSaturation", N_("Modified Saturation"), N_("Modified saturation"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusModifiedSaturation)),
+        TagInfo(0x0505, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0506, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0507, "ColorSpace", N_("Color Space"), N_("Color space"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusColorSpace)),
+        TagInfo(0x0509, "SceneMode", N_("Scene Mode"), N_("Scene mode"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusSceneMode)),
+        TagInfo(0x050a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
+        TagInfo(0x050b, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x050c, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x050d, "CompressionFactor", N_("Compression Factor"), N_("Compression factor"), olympusCsId, makerTags, unsignedRational, -1, printValue),
+        TagInfo(0x050f, "Gradation", N_("Gradation"), N_("Gradation"), olympusCsId, makerTags, signedShort, -1, print0x050f),
+        TagInfo(0x0520, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusPictureMode)),
+        TagInfo(0x0521, "PictureModeSaturation", N_("Picture Mode Saturation"), N_("Picture mode saturation"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0522, "PictureModeHue", N_("Picture Mode Hue"), N_("Picture mode hue"), olympusCsId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0523, "PictureModeContrast", N_("Picture Mode Contrast"), N_("Picture mode contrast"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0524, "PictureModeSharpness", N_("Picture Mode Sharpness"), N_("Picture mode sharpness"), olympusCsId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0525, "PictureModeBWFilter", N_("Picture Mode BW Filter"), N_("Picture mode BW filter"), olympusCsId, makerTags, signedShort, -1, EXV_PRINT_TAG(olympusPictureModeBWFilter)),
+        TagInfo(0x0526, "PictureModeTone", N_("Picture Mode Tone"), N_("Picture mode tone"), olympusCsId, makerTags, signedShort, -1, EXV_PRINT_TAG(olympusPictureModeTone)),
+        TagInfo(0x0527, "NoiseFilter", N_("Noise Filter"), N_("Noise filter"), olympusCsId, makerTags, signedShort, -1, print0x0527),
+        TagInfo(0x0529, "ArtFilter", N_("Art Filter"), N_("Art filter"), olympusCsId, makerTags, unsignedShort, -1, print0x0529),
+        TagInfo(0x052c, "MagicFilter", N_("Magic Filter"), N_("Magic filter"), olympusCsId, makerTags, unsignedShort, -1, print0x0529),
+        TagInfo(0x0600, "DriveMode", N_("Drive Mode"), N_("Drive mode"), olympusCsId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0601, "PanoramaMode", N_("Panorama Mode"), N_("Panorama mode"), olympusCsId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0603, "Quality", N_("Image Quality 2"), N_("Image quality 2"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusCsQuality)),
+        TagInfo(0x0604, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusImageStabilization)),
+        TagInfo(0x0900, "ManometerPressure", N_("Manometer Pressure"), N_("Manometer pressure"), olympusCsId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0901, "ManometerReading", N_("Manometer Reading"), N_("Manometer reading"), olympusCsId, makerTags, signedLong, -1, printValue),
+        TagInfo(0x0902, "ExtendedWBDetect", N_("Extended WB Detect"), N_("Extended WB detect"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x0903, "LevelGaugeRoll", N_("Level Gauge Roll"), N_("Level gauge roll"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x0904, "LevelGaugePitch", N_("Level Gauge Pitch"), N_("Level gauge pitch"), olympusCsId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusCsTag)", "(UnknownOlympusCsTag)", N_("Unknown OlympusCs tag"), olympusCsIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusCsTag)", "(UnknownOlympusCsTag)", N_("Unknown OlympusCs tag"), olympusCsId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListCs()
@@ -672,35 +731,37 @@
         { 4, "TF-22"    },
         { 5, "FL-36"    },
         { 6, "FL-50R"   },
-        { 7, "FL-36R"   }
+        { 7, "FL-36R"   },
+        { 7, "FL-36R"   }                       // To silence compiler warning
     };
 
     const TagInfo OlympusMakerNote::tagInfoEq_[] = {
-        TagInfo(0x0000, "EquipmentVersion", N_("Equipment Version"), N_("Equipment version"), olympusEqIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0100, "CameraType", N_("Camera Type"), N_("Camera type"), olympusEqIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0101, "SerialNumber", N_("Serial Number"), N_("Serial number"), olympusEqIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0102, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), olympusEqIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0103, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), N_("Focal plane diagonal"), olympusEqIfdId, makerTags, unsignedRational, printValue),
-        TagInfo(0x0104, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusEqIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0201, "LensType", N_("Lens Type"), N_("Lens type"), olympusEqIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(0x0202, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), olympusEqIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0204, "LensFirmwareVersion", N_("Lens Firmware Version"), N_("Lens firmware version"), olympusEqIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0205, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0206, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0207, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0208, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x020a, "MaxApertureAtCurrentFocal", N_("Max Aperture At Current Focal"), N_("Max aperture at current focal"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x020b, "LensProperties", N_("Lens Properties"), N_("Lens properties"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0301, "Extender", N_("Extender"), N_("Extender"), olympusEqIfdId, makerTags, unsignedByte, printValue),
-        TagInfo(0x0302, "ExtenderSerialNumber", N_("Extender Serial Number"), N_("Extender serial number"), olympusEqIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0303, "ExtenderModel", N_("Extender Model"), N_("Extender model"), olympusEqIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0304, "ExtenderFirmwareVersion", N_("Extender Firmware Version"), N_("Extender firmwareversion"), olympusEqIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x1000, "FlashType", N_("Flash Type"), N_("Flash type"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusEqFlashType)),
-        TagInfo(0x1001, "FlashModel", N_("Flash Model"), N_("Flash model"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusEqFlashModel)),
-        TagInfo(0x1002, "FlashFirmwareVersion", N_("Flash Firmware Version"), N_("Flash firmware version"), olympusEqIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x1003, "FlashSerialNumber", N_("FlashSerialNumber"), N_("FlashSerialNumber"), olympusEqIfdId, makerTags, asciiString, printValue),
+        TagInfo(0x0000, "EquipmentVersion", N_("Equipment Version"), N_("Equipment version"), olympusEqId, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0100, "CameraType", N_("Camera Type"), N_("Camera type"), olympusEqId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0101, "SerialNumber", N_("Serial Number"), N_("Serial number"), olympusEqId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0102, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), olympusEqId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0103, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), N_("Focal plane diagonal"), olympusEqId, makerTags, unsignedRational, -1, printValue),
+        TagInfo(0x0104, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusEqId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0201, "LensType", N_("Lens Type"), N_("Lens type"), olympusEqId, makerTags, unsignedByte, -1, print0x0201),
+        TagInfo(0x0202, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), olympusEqId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0203, "LensModel", N_("Lens Model"), N_("Lens model"), olympusEqId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0204, "LensFirmwareVersion", N_("Lens Firmware Version"), N_("Lens firmware version"), olympusEqId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0205, "MaxApertureAtMinFocal", N_("Max Aperture At Min Focal"), N_("Max aperture at min focal"), olympusEqId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0206, "MaxApertureAtMaxFocal", N_("Max Aperture At Max Focal"), N_("Max aperture at max focal"), olympusEqId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0207, "MinFocalLength", N_("Min Focal Length"), N_("Min focal length"), olympusEqId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0208, "MaxFocalLength", N_("Max Focal Length"), N_("Max focal length"), olympusEqId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x020a, "MaxApertureAtCurrentFocal", N_("Max Aperture At Current Focal"), N_("Max aperture at current focal"), olympusEqId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x020b, "LensProperties", N_("Lens Properties"), N_("Lens properties"), olympusEqId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0301, "Extender", N_("Extender"), N_("Extender"), olympusEqId, makerTags, unsignedByte, -1, printEq0x0301),
+        TagInfo(0x0302, "ExtenderSerialNumber", N_("Extender Serial Number"), N_("Extender serial number"), olympusEqId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0303, "ExtenderModel", N_("Extender Model"), N_("Extender model"), olympusEqId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0304, "ExtenderFirmwareVersion", N_("Extender Firmware Version"), N_("Extender firmwareversion"), olympusEqId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x1000, "FlashType", N_("Flash Type"), N_("Flash type"), olympusEqId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusEqFlashType)),
+        TagInfo(0x1001, "FlashModel", N_("Flash Model"), N_("Flash model"), olympusEqId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusEqFlashModel)),
+        TagInfo(0x1002, "FlashFirmwareVersion", N_("Flash Firmware Version"), N_("Flash firmware version"), olympusEqId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x1003, "FlashSerialNumber", N_("FlashSerialNumber"), N_("FlashSerialNumber"), olympusEqId, makerTags, asciiString, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusEqTag)", "(UnknownOlympusEqTag)", N_("Unknown OlympusEq tag"), olympusEqIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusEqTag)", "(UnknownOlympusEqTag)", N_("Unknown OlympusEq tag"), olympusEqId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListEq()
@@ -744,22 +805,22 @@
     };
 
     const TagInfo OlympusMakerNote::tagInfoRd_[] = {
-        TagInfo(0x0000, "RawDevVersion", N_("Raw Development Version"), N_("Raw development version"), olympusRdIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRdIfdId, makerTags, signedRational, printValue),
-        TagInfo(0x0101, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRdIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0102, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("WB fine adjustment"), olympusRdIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0103, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRdIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0104, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRdIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0105, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRdIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0106, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRdIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0107, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRdIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0108, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdColorSpace)),
-        TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEngine)),
-        TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
-        TagInfo(0x010b, "EditStatus", N_("Edit Status"), N_("Edit status"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEditStatus)),
-        TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdSettings)),
+        TagInfo(0x0000, "RawDevVersion", N_("Raw Development Version"), N_("Raw development version"), olympusRdId, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRdId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x0101, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRdId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0102, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("WB fine adjustment"), olympusRdId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0103, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRdId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0104, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRdId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0105, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRdId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0106, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRdId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0107, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRdId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0108, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRdColorSpace)),
+        TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusRdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRdEngine)),
+        TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
+        TagInfo(0x010b, "EditStatus", N_("Edit Status"), N_("Edit status"), olympusRdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRdEditStatus)),
+        TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusRdId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusRdSettings)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusRdTag)", "(UnknownOlympusRdTag)", N_("Unknown OlympusRd tag"), olympusRdIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusRdTag)", "(UnknownOlympusRdTag)", N_("Unknown OlympusRd tag"), olympusRdId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListRd()
@@ -814,31 +875,31 @@
     };
 
     const TagInfo OlympusMakerNote::tagInfoRd2_[] = {
-        TagInfo(0x0000, "RawDev2Version", N_("Raw Development 2 Version"), N_("Raw development 2 version"), olympusRd2IfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRd2IfdId, makerTags, signedRational, printValue),
-        TagInfo(0x0101, "WhiteBalance", N_("White Balance"), N_("White balance"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2WhiteBalance)),
-        TagInfo(0x0102, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRd2IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0103, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("White balance fine adjustment"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0104, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRd2IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0105, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0106, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0107, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0108, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRd2IfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0109, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2ColorSpace)),
-        TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
-        TagInfo(0x010b, "Engine", N_("Engine"), N_("Engine"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2Engine)),
-        TagInfo(0x010c, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2PictureMode)),
-        TagInfo(0x010d, "PMSaturation", N_("PM Saturation"), N_("Picture mode saturation"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x010e, "PMContrast", N_("PM Contrast"), N_("Picture mode contrast"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x010f, "PMSharpness", N_("PM Sharpness"), N_("Picture mode sharpness"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0110, "PM_BWFilter", N_("PM BW Filter"), N_("PM BW filter"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2PM_BWFilter)),
-        TagInfo(0x0111, "PMPictureTone", N_("PM Picture Tone"), N_("PM picture tone"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRd2PMPictureTone)),
-        TagInfo(0x0112, "Gradation", N_("Gradation"), N_("Gradation"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0113, "Saturation", N_("Saturation"), N_("Saturation"), olympusRd2IfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0119, "AutoGradation", N_("Auto Gradation"), N_("Auto gradation"), olympusRd2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x0120, "PMNoiseFilter", N_("PM Noise Filter"), N_("Picture mode noise filter"), olympusRd2IfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0000, "RawDev2Version", N_("Raw Development 2 Version"), N_("Raw development 2 version"), olympusRd2Id, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRd2Id, makerTags, signedRational, -1, printValue),
+        TagInfo(0x0101, "WhiteBalance", N_("White Balance"), N_("White balance"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2WhiteBalance)),
+        TagInfo(0x0102, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRd2Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0103, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("White balance fine adjustment"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0104, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRd2Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0105, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0106, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0107, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0108, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRd2Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0109, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2ColorSpace)),
+        TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
+        TagInfo(0x010b, "Engine", N_("Engine"), N_("Engine"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2Engine)),
+        TagInfo(0x010c, "PictureMode", N_("Picture Mode"), N_("Picture mode"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2PictureMode)),
+        TagInfo(0x010d, "PMSaturation", N_("PM Saturation"), N_("Picture mode saturation"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x010e, "PMContrast", N_("PM Contrast"), N_("Picture mode contrast"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x010f, "PMSharpness", N_("PM Sharpness"), N_("Picture mode sharpness"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0110, "PM_BWFilter", N_("PM BW Filter"), N_("PM BW filter"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2PM_BWFilter)),
+        TagInfo(0x0111, "PMPictureTone", N_("PM Picture Tone"), N_("PM picture tone"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRd2PMPictureTone)),
+        TagInfo(0x0112, "Gradation", N_("Gradation"), N_("Gradation"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0113, "Saturation", N_("Saturation"), N_("Saturation"), olympusRd2Id, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0119, "AutoGradation", N_("Auto Gradation"), N_("Auto gradation"), olympusRd2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x0120, "PMNoiseFilter", N_("PM Noise Filter"), N_("Picture mode noise filter"), olympusRd2Id, makerTags, unsignedShort, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusRd2Tag)", "(UnknownOlympusRd2Tag)", N_("Unknown OlympusRd2 tag"), olympusRd2IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusRd2Tag)", "(UnknownOlympusRd2Tag)", N_("Unknown OlympusRd2 tag"), olympusRd2Id, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListRd2()
@@ -846,57 +907,80 @@
         return tagInfoRd2_;
     }
 
+    //! OlympusIp MultipleExposureMode, tag 0x101c
+    extern const TagDetails olympusIpMultipleExposureMode[] = {
+        { 0, N_("Off")             },
+        { 2, N_("On (2 frames)")   },
+        { 3, N_("On (3 frames)")   }
+    };
+
+    //! OlympusIp olympusIpAspectRatio, tag 0x101c
+    extern const TagDetails olympusIpAspectRatio[] = {
+        { 1, N_("4:3")  },
+        { 2, N_("3:2")  },
+        { 3, N_("16:9") },
+        { 4, N_("6:6")  },
+        { 5, N_("5:4")  },
+        { 6, N_("7:6")  },
+        { 7, N_("6:5")  },
+        { 8, N_("7:5")  },
+        { 9, N_("3:4")  }
+    };
+
     const TagInfo OlympusMakerNote::tagInfoIp_[] = {
-        TagInfo(0x0000, "ImageProcessingVersion", N_("Image Processing Version"), N_("Image processing version"), olympusIpIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0100, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0102, "WB_RBLevels3000K", N_("WB RB Levels 3000K"), N_("WB RB levels 3000K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0103, "WB_RBLevels3300K", N_("WB RB Levels 3300K"), N_("WB RB levels 3300K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0104, "WB_RBLevels3600K", N_("WB RB Levels 3600K"), N_("WB RB levels 3600K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0105, "WB_RBLevels3900K", N_("WB RB Levels 3900K"), N_("WB RB levels 3900K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0106, "WB_RBLevels4000K", N_("WB RB Levels 4000K"), N_("WB RB levels 4000K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0107, "WB_RBLevels4300K", N_("WB RB Levels 4300K"), N_("WB RB levels 4300K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0108, "WB_RBLevels4500K", N_("WB RB Levels 4500K"), N_("WB RB levels 4500K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0109, "WB_RBLevels4800K", N_("WB RB Levels 4800K"), N_("WB RB levels 4800K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x010a, "WB_RBLevels5300K", N_("WB RB Levels 5300K"), N_("WB RB levels 5300K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x010b, "WB_RBLevels6000K", N_("WB RB Levels 6000K"), N_("WB RB levels 6000K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x010c, "WB_RBLevels6600K", N_("WB RB Levels 6600K"), N_("WB RB levels 6600K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x010d, "WB_RBLevels7500K", N_("WB RB Levels 7500K"), N_("WB RB levels 7500K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x010e, "WB_RBLevelsCWB1", N_("WB RB Levels CWB1"), N_("WB RB levels CWB1"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x010f, "WB_RBLevelsCWB2", N_("WB RB Levels CWB2"), N_("WB RB levels CWB2"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0110, "WB_RBLevelsCWB3", N_("WB RB Levels CWB3"), N_("WB RB levels CWB3"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0111, "WB_RBLevelsCWB4", N_("WB RB Levels CWB4"), N_("WB RB levels CWB4"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0113, "WB_GLevel3000K", N_("WB G Level 3000K"), N_("WB G level 3000K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0114, "WB_GLevel3300K", N_("WB G Level 3300K"), N_("WB G level 3300K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0115, "WB_GLevel3600K", N_("WB G Level 3600K"), N_("WB G level 3600K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0116, "WB_GLevel3900K", N_("WB G Level 3900K"), N_("WB G level 3900K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0117, "WB_GLevel4000K", N_("WB G Level 4000K"), N_("WB G level 4000K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0118, "WB_GLevel4300K", N_("WB G Level 4300K"), N_("WB G level 4300K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0119, "WB_GLevel4500K", N_("WB G Level 4500K"), N_("WB G level 4500K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x011a, "WB_GLevel4800K", N_("WB G Level 4800K"), N_("WB G level 4800K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x011b, "WB_GLevel5300K", N_("WB G Level 5300K"), N_("WB G level 5300K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x011c, "WB_GLevel6000K", N_("WB G Level 6000K"), N_("WB G level 6000K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x011d, "WB_GLevel6600K", N_("WB G Level 6600K"), N_("WB G level 6600K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x011e, "WB_GLevel7500K", N_("WB G Level 7500K"), N_("WB G level 7500K"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x011f, "WB_GLevel", N_("WB G Level"), N_("WB G level"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0200, "ColorMatrix", N_("Color Matrix"), N_("Color matrix"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0300, "Enhancer", N_("Enhancer"), N_("Enhancer"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0301, "EnhancerValues", N_("Enhancer Values"), N_("Enhancer values"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0600, "BlackLevel", N_("Black Level"), N_("Black level"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0610, "GainBase", N_("Gain Base"), N_("Gain base"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0611, "ValidBits", N_("Valid Bits"), N_("Valid bits"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusIpIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusIpIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusIpIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x1010, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusIpIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
-        TagInfo(0x1011, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusIpIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x1012, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusIpIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x1200, "FaceDetect", N_("Face Detect"), N_("Face detect"), olympusIpIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x1201, "FaceDetectArea", N_("Face Detect Area"), N_("Face detect area"), olympusIpIfdId, makerTags, signedShort, printValue),
+        TagInfo(0x0000, "ImageProcessingVersion", N_("Image Processing Version"), N_("Image processing version"), olympusIpId, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0100, "WB_RBLevels", N_("WB RB Levels"), N_("WB RB levels"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0102, "WB_RBLevels3000K", N_("WB RB Levels 3000K"), N_("WB RB levels 3000K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0103, "WB_RBLevels3300K", N_("WB RB Levels 3300K"), N_("WB RB levels 3300K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0104, "WB_RBLevels3600K", N_("WB RB Levels 3600K"), N_("WB RB levels 3600K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0105, "WB_RBLevels3900K", N_("WB RB Levels 3900K"), N_("WB RB levels 3900K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0106, "WB_RBLevels4000K", N_("WB RB Levels 4000K"), N_("WB RB levels 4000K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0107, "WB_RBLevels4300K", N_("WB RB Levels 4300K"), N_("WB RB levels 4300K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0108, "WB_RBLevels4500K", N_("WB RB Levels 4500K"), N_("WB RB levels 4500K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0109, "WB_RBLevels4800K", N_("WB RB Levels 4800K"), N_("WB RB levels 4800K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x010a, "WB_RBLevels5300K", N_("WB RB Levels 5300K"), N_("WB RB levels 5300K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x010b, "WB_RBLevels6000K", N_("WB RB Levels 6000K"), N_("WB RB levels 6000K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x010c, "WB_RBLevels6600K", N_("WB RB Levels 6600K"), N_("WB RB levels 6600K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x010d, "WB_RBLevels7500K", N_("WB RB Levels 7500K"), N_("WB RB levels 7500K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x010e, "WB_RBLevelsCWB1", N_("WB RB Levels CWB1"), N_("WB RB levels CWB1"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x010f, "WB_RBLevelsCWB2", N_("WB RB Levels CWB2"), N_("WB RB levels CWB2"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0110, "WB_RBLevelsCWB3", N_("WB RB Levels CWB3"), N_("WB RB levels CWB3"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0111, "WB_RBLevelsCWB4", N_("WB RB Levels CWB4"), N_("WB RB levels CWB4"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0113, "WB_GLevel3000K", N_("WB G Level 3000K"), N_("WB G level 3000K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0114, "WB_GLevel3300K", N_("WB G Level 3300K"), N_("WB G level 3300K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0115, "WB_GLevel3600K", N_("WB G Level 3600K"), N_("WB G level 3600K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0116, "WB_GLevel3900K", N_("WB G Level 3900K"), N_("WB G level 3900K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0117, "WB_GLevel4000K", N_("WB G Level 4000K"), N_("WB G level 4000K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0118, "WB_GLevel4300K", N_("WB G Level 4300K"), N_("WB G level 4300K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0119, "WB_GLevel4500K", N_("WB G Level 4500K"), N_("WB G level 4500K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x011a, "WB_GLevel4800K", N_("WB G Level 4800K"), N_("WB G level 4800K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x011b, "WB_GLevel5300K", N_("WB G Level 5300K"), N_("WB G level 5300K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x011c, "WB_GLevel6000K", N_("WB G Level 6000K"), N_("WB G level 6000K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x011d, "WB_GLevel6600K", N_("WB G Level 6600K"), N_("WB G level 6600K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x011e, "WB_GLevel7500K", N_("WB G Level 7500K"), N_("WB G level 7500K"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x011f, "WB_GLevel", N_("WB G Level"), N_("WB G level"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0200, "ColorMatrix", N_("Color Matrix"), N_("Color matrix"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0300, "Enhancer", N_("Enhancer"), N_("Enhancer"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0301, "EnhancerValues", N_("Enhancer Values"), N_("Enhancer values"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0600, "BlackLevel", N_("Black Level"), N_("Black level"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0610, "GainBase", N_("Gain Base"), N_("Gain base"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0611, "ValidBits", N_("Valid Bits"), N_("Valid bits"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusIpId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusIpId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x1010, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusIpId, makerTags, unsignedShort, -1, EXV_PRINT_TAG_BITMASK(olympusNoiseReduction)),
+        TagInfo(0x1011, "DistortionCorrection", N_("Distortion Correction"), N_("Distortion correction"), olympusIpId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x1012, "ShadingCompensation", N_("Shading Compensation"), N_("Shading compensation"), olympusIpId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x101c, "MultipleExposureMode", N_("Multiple Exposure Mode"), N_("Multiple exposure mode"), olympusIpId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusIpMultipleExposureMode)),
+        TagInfo(0x1112, "AspectRatio", N_("Aspect Ratio"), N_("Aspect ratio"), olympusIpId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(olympusIpAspectRatio)),
+        TagInfo(0x1113, "AspectFrame", N_("Aspect Frame"), N_("Aspect frame"), olympusIpId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x1200, "FaceDetect", N_("Face Detect"), N_("Face detect"), olympusIpId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x1201, "FaceDetectArea", N_("Face Detect Area"), N_("Face detect area"), olympusIpId, makerTags, signedShort, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusIpTag)", "(UnknownOlympusIpTag)", N_("Unknown OlympusIp tag"), olympusIpIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusIpTag)", "(UnknownOlympusIpTag)", N_("Unknown OlympusIp tag"), olympusIpId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListIp()
@@ -911,27 +995,27 @@
     };
 
     const TagInfo OlympusMakerNote::tagInfoFi_[] = {
-        TagInfo(0x0000, "FocusInfoVersion", N_("Focus Info Version"), N_("Focus info version"), olympusFiIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0209, "AutoFocus", N_("Auto Focus"), N_("Auto focus"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x0210, "SceneDetect", N_("Scene Detect"), N_("Scene detect"), olympusFiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0211, "SceneArea", N_("Scene Area"), N_("Scene area"), olympusFiIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0212, "SceneDetectData", N_("Scene Detect Data"), N_("Scene detect data"), olympusFiIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0300, "ZoomStepCount", N_("Zoom Step Count"), N_("Zoom step count"), olympusFiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0301, "FocusStepCount", N_("Focus Step Count"), N_("Focus step count"), olympusFiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0303, "FocusStepInfinity", N_("Focus Step Infinity"), N_("Focus step infinity"), olympusFiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0304, "FocusStepNear", N_("Focus Step Near"), N_("Focus step near"), olympusFiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0305, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), olympusFiIfdId, makerTags, unsignedRational, printValue),
-        TagInfo(0x0308, "AFPoint", N_("AF Point"), N_("AF point"), olympusFiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x1201, "ExternalFlash", N_("External Flash"), N_("External flash"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x1203, "ExternalFlashGuideNumber", N_("External Flash Guide Number"), N_("External flash guide number"), olympusFiIfdId, makerTags, signedRational, printValue),
-        TagInfo(0x1204, "ExternalFlashBounce", N_("External Flash Bounce"), N_("External flash bounce"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusFiExternalFlashBounce)),
-        TagInfo(0x1205, "ExternalFlashZoom", N_("External Flash Zoom"), N_("External flash zoom"), olympusFiIfdId, makerTags, unsignedRational, printValue),
-        TagInfo(0x1208, "InternalFlash", N_("Internal Flash"), N_("Internal flash"), olympusFiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusOffOn)),
-        TagInfo(0x1209, "ManualFlash", N_("Manual Flash"), N_("Manual flash"), olympusFiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x1500, "SensorTemperature", N_("Sensor Temperature"), N_("Sensor temperature"), olympusFiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x1600, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), olympusFiIfdId, makerTags, undefined, printValue),
+        TagInfo(0x0000, "FocusInfoVersion", N_("Focus Info Version"), N_("Focus info version"), olympusFiId, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0209, "AutoFocus", N_("Auto Focus"), N_("Auto focus"), olympusFiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x0210, "SceneDetect", N_("Scene Detect"), N_("Scene detect"), olympusFiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0211, "SceneArea", N_("Scene Area"), N_("Scene area"), olympusFiId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0212, "SceneDetectData", N_("Scene Detect Data"), N_("Scene detect data"), olympusFiId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0300, "ZoomStepCount", N_("Zoom Step Count"), N_("Zoom step count"), olympusFiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0301, "FocusStepCount", N_("Focus Step Count"), N_("Focus step count"), olympusFiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0303, "FocusStepInfinity", N_("Focus Step Infinity"), N_("Focus step infinity"), olympusFiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0304, "FocusStepNear", N_("Focus Step Near"), N_("Focus step near"), olympusFiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0305, "FocusDistance", N_("Focus Distance"), N_("Focus distance"), olympusFiId, makerTags, unsignedRational, -1, printValue),
+        TagInfo(0x0308, "AFPoint", N_("AF Point"), N_("AF point"), olympusFiId, makerTags, unsignedShort, -1, print0x0308),
+        TagInfo(0x1201, "ExternalFlash", N_("External Flash"), N_("External flash"), olympusFiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x1203, "ExternalFlashGuideNumber", N_("External Flash Guide Number"), N_("External flash guide number"), olympusFiId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x1204, "ExternalFlashBounce", N_("External Flash Bounce"), N_("External flash bounce"), olympusFiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusFiExternalFlashBounce)),
+        TagInfo(0x1205, "ExternalFlashZoom", N_("External Flash Zoom"), N_("External flash zoom"), olympusFiId, makerTags, unsignedRational, -1, printValue),
+        TagInfo(0x1208, "InternalFlash", N_("Internal Flash"), N_("Internal flash"), olympusFiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusOffOn)),
+        TagInfo(0x1209, "ManualFlash", N_("Manual Flash"), N_("Manual flash"), olympusFiId, makerTags, unsignedShort, -1, print0x1209),
+        TagInfo(0x1500, "SensorTemperature", N_("Sensor Temperature"), N_("Sensor temperature"), olympusFiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x1600, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), olympusFiId, makerTags, unsignedLong, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusFiTag)", "(UnknownOlympusFiTag)", N_("Unknown OlympusFi tag"), olympusFiIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusFiTag)", "(UnknownOlympusFiTag)", N_("Unknown OlympusFi tag"), olympusFiId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListFi()
@@ -940,9 +1024,9 @@
     }
 
     const TagInfo OlympusMakerNote::tagInfoFe_[] = {
-        TagInfo(0x0100, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusFe1IfdId, makerTags, asciiString, printValue),
+        TagInfo(0x0100, "BodyFirmwareVersion", N_("Body Firmware Version"), N_("Body firmware version"), olympusFe1Id, makerTags, asciiString, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusFeTag)", "(UnknownOlympusFeTag)", N_("Unknown OlympusFe tag"), olympusFe1IfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusFeTag)", "(UnknownOlympusFeTag)", N_("Unknown OlympusFe tag"), olympusFe1Id, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListFe()
@@ -967,44 +1051,44 @@
     };
 
     const TagInfo OlympusMakerNote::tagInfoRi_[] = {
-        TagInfo(0x0000, "RawInfoVersion", N_("Raw Info Version"), N_("Raw info version"), olympusRiIfdId, makerTags, undefined, printValue),
-        TagInfo(0x0100, "WB_RBLevelsUsed", N_("WB_RB Levels Used"), N_("WB_RB levels used"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0110, "WB_RBLevelsAuto", N_("WB_RB Levels Auto"), N_("WB_RB levels auto"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0120, "WB_RBLevelsShade", N_("WB_RB Levels Shade"), N_("WB_RB levels shade"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0121, "WB_RBLevelsCloudy", N_("WB_RB Levels Cloudy"), N_("WB_RB levels cloudy"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0122, "WB_RBLevelsFineWeather", N_("WB_RB Levels Fine Weather"), N_("WB_RB levels fine weather"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0123, "WB_RBLevelsTungsten", N_("WB_RB Levels Tungsten"), N_("WB_RB levels tungsten"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0124, "WB_RBLevelsEveningSunlight", N_("WB_RB Levels Evening Sunlight"), N_("WB_RB levels evening sunlight"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0130, "WB_RBLevelsDaylightFluor", N_("WB_RB Levels Daylight Fluor"), N_("WB_RB levels daylight fluor"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0131, "WB_RBLevelsDayWhiteFluor", N_("WB_RB Levels Day White Fluor"), N_("WB_RB levels day white fluor"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0132, "WB_RBLevelsCoolWhiteFluor", N_("WB_RB Levels Cool White Fluor"), N_("WB_RB levels cool white fluor"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0133, "WB_RBLevelsWhiteFluorescent", N_("WB_RB Levels White Fluorescent"), N_("WB_RB levels white fluorescent"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0200, "ColorMatrix2", N_("Color Matrix2"), N_("Color matrix 2"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0600, "BlackLevel2", N_("Black Level 2"), N_("Black level 2"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0601, "YCbCrCoefficients", N_("YCbCr Coefficients"), N_("YCbCr coefficients"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0611, "ValidPixelDepth", N_("Valid Pixel Depth"), N_("Valid pixel depth"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusRiIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusRiIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x1000, "LightSource", N_("Light Source"), N_("Light source"), olympusRiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRiLightSource)),
-        TagInfo(0x1001, "WhiteBalanceComp", N_("White Balance Comp"), N_("White balance comp"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x1010, "SaturationSetting", N_("Saturation Setting"), N_("Saturation setting"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x1011, "HueSetting", N_("Hue Setting"), N_("Hue setting"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x1012, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x1013, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x2000, "CMExposureCompensation", N_("CM Exposure Compensation"), N_("CM exposure compensation"), olympusRiIfdId, makerTags, signedRational, printValue),
-        TagInfo(0x2001, "CMWhiteBalance", N_("CM White Balance"), N_("CM white balance"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x2002, "CMWhiteBalanceComp", N_("CM White Balance Comp"), N_("CM white balance comp"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x2010, "CMWhiteBalanceGrayPoint", N_("CM White Balance Gray Point"), N_("CM white balance gray point"), olympusRiIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x2020, "CMSaturation", N_("CM Saturation"), N_("CM saturation"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x2021, "CMHue", N_("CM Hue"), N_("CM hue"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x2022, "CMContrast", N_("CM Contrast"), N_("CM contrast"), olympusRiIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x2023, "CMSharpness", N_("CM Sharpness"), N_("CM sharpness"), olympusRiIfdId, makerTags, signedShort, printValue),
+        TagInfo(0x0000, "RawInfoVersion", N_("Raw Info Version"), N_("Raw info version"), olympusRiId, makerTags, undefined, -1, printValue),
+        TagInfo(0x0100, "WB_RBLevelsUsed", N_("WB_RB Levels Used"), N_("WB_RB levels used"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0110, "WB_RBLevelsAuto", N_("WB_RB Levels Auto"), N_("WB_RB levels auto"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0120, "WB_RBLevelsShade", N_("WB_RB Levels Shade"), N_("WB_RB levels shade"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0121, "WB_RBLevelsCloudy", N_("WB_RB Levels Cloudy"), N_("WB_RB levels cloudy"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0122, "WB_RBLevelsFineWeather", N_("WB_RB Levels Fine Weather"), N_("WB_RB levels fine weather"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0123, "WB_RBLevelsTungsten", N_("WB_RB Levels Tungsten"), N_("WB_RB levels tungsten"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0124, "WB_RBLevelsEveningSunlight", N_("WB_RB Levels Evening Sunlight"), N_("WB_RB levels evening sunlight"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0130, "WB_RBLevelsDaylightFluor", N_("WB_RB Levels Daylight Fluor"), N_("WB_RB levels daylight fluor"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0131, "WB_RBLevelsDayWhiteFluor", N_("WB_RB Levels Day White Fluor"), N_("WB_RB levels day white fluor"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0132, "WB_RBLevelsCoolWhiteFluor", N_("WB_RB Levels Cool White Fluor"), N_("WB_RB levels cool white fluor"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0133, "WB_RBLevelsWhiteFluorescent", N_("WB_RB Levels White Fluorescent"), N_("WB_RB levels white fluorescent"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0200, "ColorMatrix2", N_("Color Matrix2"), N_("Color matrix 2"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0310, "CoringFilter", N_("Coring Filter"), N_("Coring filter"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0311, "CoringValues", N_("Coring Values"), N_("Coring values"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0600, "BlackLevel2", N_("Black Level 2"), N_("Black level 2"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0601, "YCbCrCoefficients", N_("YCbCr Coefficients"), N_("YCbCr coefficients"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0611, "ValidPixelDepth", N_("Valid Pixel Depth"), N_("Valid pixel depth"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0612, "CropLeft", N_("Crop Left"), N_("Crop left"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0613, "CropTop", N_("Crop Top"), N_("Crop top"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0614, "CropWidth", N_("Crop Width"), N_("Crop width"), olympusRiId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0615, "CropHeight", N_("Crop Height"), N_("Crop height"), olympusRiId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x1000, "LightSource", N_("Light Source"), N_("Light source"), olympusRiId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(olympusRiLightSource)),
+        TagInfo(0x1001, "WhiteBalanceComp", N_("White Balance Comp"), N_("White balance comp"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x1010, "SaturationSetting", N_("Saturation Setting"), N_("Saturation setting"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x1011, "HueSetting", N_("Hue Setting"), N_("Hue setting"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x1012, "ContrastSetting", N_("Contrast Setting"), N_("Contrast setting"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x1013, "SharpnessSetting", N_("Sharpness Setting"), N_("Sharpness setting"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x2000, "CMExposureCompensation", N_("CM Exposure Compensation"), N_("CM exposure compensation"), olympusRiId, makerTags, signedRational, -1, printValue),
+        TagInfo(0x2001, "CMWhiteBalance", N_("CM White Balance"), N_("CM white balance"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x2002, "CMWhiteBalanceComp", N_("CM White Balance Comp"), N_("CM white balance comp"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x2010, "CMWhiteBalanceGrayPoint", N_("CM White Balance Gray Point"), N_("CM white balance gray point"), olympusRiId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x2020, "CMSaturation", N_("CM Saturation"), N_("CM saturation"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x2021, "CMHue", N_("CM Hue"), N_("CM hue"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x2022, "CMContrast", N_("CM Contrast"), N_("CM contrast"), olympusRiId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x2023, "CMSharpness", N_("CM Sharpness"), N_("CM sharpness"), olympusRiId, makerTags, signedShort, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownOlympusRiTag)", "(UnknownOlympusRiTag)", N_("Unknown OlympusRi tag"), olympusRiIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownOlympusRiTag)", "(UnknownOlympusRiTag)", N_("Unknown OlympusRi tag"), olympusRiId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* OlympusMakerNote::tagListRi()
@@ -1035,7 +1119,7 @@
         return os;
     }
 
-    // NoiseFilter
+    // Olympus CameraSettings tag 0x0527 NoiseFilter
     std::ostream& OlympusMakerNote::print0x0527(std::ostream& os, const Value& value, const ExifData*)
     {
         if (   value.count() != 3
@@ -1144,4 +1228,343 @@
         return os;
     } // OlympusMakerNote::print0x1015
 
-}                                       // namespace Exiv2
+    //! OlympusEq LensType, tag 0x201
+    std::ostream& OlympusMakerNote::print0x0201(std::ostream& os, const Value& value, const ExifData*)
+    {
+        // 6 numbers: 0. Make, 1. Unknown, 2. Model, 3. Sub-model, 4-5. Unknown.
+        // Only the Make, Model and Sub-model are used to determine the lens model
+        static struct {
+            byte val[3];
+            const char *label;
+        } lensTypes[] = {
+            { { 0,  0,  0 }, N_("None")                                            },
+            { { 0,  1,  0 }, N_("Olympus Zuiko Digital ED 50mm F2.0 Macro")        },
+            { { 0,  1,  1 }, N_("Olympus Zuiko Digital 40-150mm F3.5-4.5")         },
+            { { 0,  1, 16 }, N_("Olympus Zuiko Digital ED 14-42mm F3.5-5.6")       },
+            { { 0,  2,  0 }, N_("Olympus Zuiko Digital ED 150mm F2.0")             },
+            { { 0,  2, 16 }, N_("Olympus Zuiko Digital 17mm F2.8 Pancake")         },
+            { { 0,  3,  0 }, N_("Olympus Zuiko Digital ED 300mm F2.8")             },
+            { { 0,  5,  0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5")          },
+            { { 0,  5,  1 }, N_("Olympus Zuiko Digital Pro ED 90-250mm F2.8")      },
+            { { 0,  6,  0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5")      },
+            { { 0,  6,  1 }, N_("Olympus Zuiko Digital ED 8mm F3.5 Fisheye")       },
+            { { 0,  7,  0 }, N_("Olympus Zuiko Digital 11-22mm F2.8-3.5")          },
+            { { 0,  7,  1 }, N_("Olympus Zuiko Digital 18-180mm F3.5-6.3")         },
+            { { 0,  8,  1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6")         },
+            { { 0, 21,  0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0")            },
+            { { 0, 23,  0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm F2.0")      },
+            { { 0, 24,  0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6")          },
+            { { 0, 32,  0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro")           },
+            { { 0, 34,  0 }, N_("Olympus Zuiko Digital 17.5-45mm F3.5-5.6")        },
+            { { 0, 35,  0 }, N_("Olympus Zuiko Digital ED 14-42mm F3.5-5.6")       },
+            { { 0, 36,  0 }, N_("Olympus Zuiko Digital ED 40-150mm F4.0-5.6")      },
+            { { 0, 48,  0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD")  },
+            { { 0, 49,  0 }, N_("Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD")   },
+            { { 0, 50,  0 }, N_("Olympus Zuiko Digital ED 14-35mm F2.0 SWD")       },
+            { { 0, 51,  0 }, N_("Olympus Zuiko Digital 25mm F2.8")                 },
+            { { 0, 52,  0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6")        },
+            { { 0, 53,  0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5 II")       },
+            { { 1,  1,  0 }, N_("Sigma 18-50mm F3.5-5.6")                          },
+            { { 1,  2,  0 }, N_("Sigma 55-200mm F4.0-5.6 DC")                      },
+            { { 1,  3,  0 }, N_("Sigma 18-125mm F3.5-5.6 DC")                      },
+            { { 1,  4,  0 }, N_("Sigma 18-125mm F3.5-5.6")                         },
+            { { 1,  5,  0 }, N_("Sigma 30mm F1.4")                                 },
+            { { 1,  6,  0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")        },
+            { { 1,  7,  0 }, N_("Sigma 105mm F2.8 DG")                             },
+            { { 1,  8,  0 }, N_("Sigma 150mm F2.8 DG HSM")                         },
+            { { 1, 16,  0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro")          },
+            { { 1, 17,  0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF")          },
+            { { 1, 18,  0 }, N_("Sigma 300-800mm F5.6 EX DG APO")                  },
+            { { 1, 20,  0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")        },
+            { { 1, 21,  0 }, N_("Sigma 10-20mm F4.0-5.6 EX DC HSM")                },
+            { { 2,  1,  0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.")    },
+            { { 2,  1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS")   },
+            { { 2,  2,  0 }, N_("Leica D Summilux 25mm F1.4 Asph.")                },
+            { { 2,  2, 16 }, N_("Lumix G Vario 45-200mm F4-5.6 Mega OIS")          },
+            { { 2,  3,  1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.")      },
+            { { 2,  3, 16 }, N_("Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS") },
+            { { 2,  4,  0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6")           },
+            { { 2,  4, 16 }, N_("Lumix G Vario 7-14mm F4 Asph.")                   },
+            { { 2,  5, 16 }, N_("Lumix G 20mm F1.7 Asph.")                         },
+            { { 3,  1,  0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.")    },
+            { { 3,  2,  0 }, N_("Leica D Summilux 25mm F1.4 Asph.")                },
+            // End of list marker
+            { { 0xff,  0,  0 }, "" }
+        };
+
+        if (value.count() != 6 || value.typeId() != unsignedByte) {
+            return os << value;
+        }
+
+        byte v0 = (byte)value.toLong(0);
+        byte v2 = (byte)value.toLong(2);
+        byte v3 = (byte)value.toLong(3);
+
+        for (int i = 0; lensTypes[i].val[0] != 0xff; i++) {
+            if (lensTypes[i].val[0] == v0 &&
+                lensTypes[i].val[1] == v2 &&
+                lensTypes[i].val[2] == v3) {
+                    return os << lensTypes[i].label;
+            }
+        }
+        return os << value;
+    } // OlympusMakerNote::print0x0201
+
+    // Olympus tag 0x0209 CameraID
+    std::ostream& OlympusMakerNote::print0x0209(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.typeId() != asciiString && value.typeId() != undefined) {
+            return os << value;
+        }
+
+        char ch;
+        int size = value.size();
+        for (int i = 0; i < size && ((ch = (char)value.toLong(i)) != '\0'); i++) {
+            os << ch;
+        }
+        return os;
+    } // OlympusMakerNote::print0x0209
+
+    //! OlympusEq Extender, tag 0x0301
+    std::ostream& OlympusMakerNote::printEq0x0301(std::ostream& os, const Value& value, const ExifData*)
+    {
+        // 6 numbers: 0. Make, 1. Unknown, 2. Model, 3. Sub-model, 4-5. Unknown.
+        // Only the Make and Model are used to determine the extender model
+        static struct {
+            byte val[2];
+            const char *label;
+        } extenderModels[] = {
+            { { 0, 0 }, N_("None")                                           },
+            { { 0, 4 }, N_("Olympus Zuiko Digital EC-14 1.4x Teleconverter") },
+            { { 0, 8 }, N_("Olympus EX-25 Extension Tube")                   },
+            { { 0, 16 },N_("Olympus Zuiko Digital EC-20 2.0x Teleconverter") },
+            // End of list marker
+            { { 0xff,  0 }, "" }
+        };
+
+        if (value.count() != 6 || value.typeId() != unsignedByte) {
+            return os << value;
+        }
+
+        byte v0 = (byte)value.toLong(0);
+        byte v2 = (byte)value.toLong(2);
+
+        for (int i = 0; extenderModels[i].val[0] != 0xff; i++) {
+            if (extenderModels[i].val[0] == v0 &&
+                extenderModels[i].val[1] == v2) {
+                    return os << extenderModels[i].label;
+            }
+        }
+        return os << value;
+    } // OlympusMakerNote::printEq0x0301
+
+    //! OlympusCs FocusMode, tag 0x0301
+    // (1 or 2 values)
+    std::ostream& OlympusMakerNote::printCs0x0301(std::ostream& os, const Value& value, const ExifData*)
+    {
+        static struct {
+            uint16_t val;
+            const char *label;
+        } focusModes0[] = {
+            { 0, N_("Single AF")              },
+            { 1, N_("Sequential shooting AF") },
+            { 2, N_("Continuous AF")          },
+            { 3, N_("Multi AF")               },
+            { 5, N_("Face detect")            },
+            { 10, N_("MF")                    },
+            // End of list marker
+            { 0xff, "" }
+        };
+        static struct {
+            uint16_t val;
+            const char *label;
+        } focusModes1[] = {
+            { 0x0001, N_("S-AF")        },
+            { 0x0004, N_("C-AF")        },
+            { 0x0010, N_("MF")          },
+            { 0x0020, N_("Face detect") },
+            { 0x0040, N_("Imager AF")   },
+            { 0x0100, N_("AF sensor")   },
+            // End of list marker
+            { 0, "" }
+        };
+
+        if (value.count() < 1 || value.typeId() != unsignedShort) {
+            return os << "(" << value << ")";
+        }
+
+        uint16_t v = (uint16_t)value.toLong(0);
+
+        // If value 2 is present, it is used instead of value 1.
+        if (value.count() < 2) {
+            std::string p = "";    // Used to enable ',' separation
+
+            v = (uint16_t)value.toLong(1);
+            for (int i = 0; focusModes1[i].val != 0; i++) {
+                if ((v & focusModes1[i].val) != 0) {
+                    if (p.size() > 0) {
+                        os << ", ";
+                    }
+                    p = focusModes1[i].label;
+                    os << p;
+                }
+            }
+        } else {
+            v = (uint16_t)value.toLong(0);
+            for (int i = 0; focusModes0[i].val != 0xff; i++) {
+               if (focusModes0[i].val == v) {
+                   os << focusModes0[i].label;
+                   break;
+               }
+            }
+        }
+        return os << v;
+    } // OlympusMakerNote::printCs0x0301
+
+    //! OlympusCs ArtFilter, tag 0x0529, OlympusCs MagicFilter, tag 0x052c
+    std::ostream& OlympusMakerNote::print0x0529(std::ostream& os, const Value& value, const ExifData*)
+    {
+        static struct {
+            uint16_t val[2];
+            const char *label;
+        } artFilters[] = {
+            { {  0,    0}, N_("Off")                },
+            { {  0, 1280}, N_("Off")                },
+            { {  1, 1280}, N_("Soft Focus")         },
+            { {  2, 1280}, N_("Pop Art")            },
+            { {  3, 1280}, N_("Pale & Light Color") },
+            { {  4, 1280}, N_("Light Tone")         },
+            { {  5, 1280}, N_("Pin Hole")           },
+            { {  6, 1280}, N_("Grainy Film")        },
+            { {  9, 1280}, N_("Diorama")            },
+            { { 10, 1280}, N_("Cross Process")      },
+            { { 12, 1280}, N_("Fish Eye")           },
+            { { 13, 1280}, N_("Drawing")            },
+            // End of list marker
+            { { 0xffff,  0 }, "" }
+        };
+
+        if (value.count() != 4 || value.typeId() != unsignedShort) {
+            return os << value;
+        }
+
+        uint16_t v0 = (uint16_t)value.toLong(0);
+        uint16_t v1 = (uint16_t)value.toLong(1);
+
+        for (int i = 0; artFilters[i].val[0] != 0xffff; i++) {
+            if (artFilters[i].val[0] == v0 &&
+                artFilters[i].val[1] == v1) {
+                    return os << artFilters[i].label;
+            }
+        }
+        return os << "";
+    } // OlympusMakerNote::print0x0529
+
+    // Olympus FocusInfo tag 0x1209 ManualFlash
+    std::ostream& OlympusMakerNote::print0x1209(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() != 2 || value.typeId() != unsignedShort) {
+            return os << value;
+        }
+
+        switch (value.toLong(0)) {
+            case 0: os << _("Off"); break;
+            case 1: os << _("On"); break;
+            default: os << value.toLong(0); break;
+        }
+        os << " ";
+        os << value.toLong(1);
+
+        return os;
+    } // OlympusMakerNote::print0x1209
+
+    // Olympus FocusInfo tag 0x0308 AFPoint
+    std::ostream& OlympusMakerNote::print0x0308(std::ostream& os, const Value&
+value, const ExifData* metadata)
+    {
+        static struct {
+            uint16_t val;
+            const char *label;
+        } afPoints[] = {
+            {   0, N_("Left (or n/a)") },
+            {   1, N_("Center (horizontal)") },
+            {   2, N_("Right") },
+            {   3, N_("Center (vertical)") },
+            { 255, N_("None") },
+            // End of list marker
+            { 0xffff, "" }
+        };
+
+        static struct {
+            byte val;
+            const char *label;
+        } afPointsE3[] = {
+            { 0x00, N_("None")                       },
+            { 0x01, N_("Top-left (horizontal)")      },
+            { 0x02, N_("Top-center (horizontal)")    },
+            { 0x03, N_("Top-right (horizontal)")     },
+            { 0x04, N_("Left (horizontal)")          },
+            { 0x05, N_("Mid-left (horizontal)")      },
+            { 0x06, N_("Center (horizontal)")        },
+            { 0x07, N_("Mid-right (horizontal)")     },
+            { 0x08, N_("Right (horizontal)")         },
+            { 0x09, N_("Bottom-left (horizontal)")   },
+            { 0x0a, N_("Bottom-center (horizontal)") },
+            { 0x0b, N_("Bottom-right (horizontal)")  },
+            { 0x0c, N_("Top-left (vertical)")        },
+            { 0x0d, N_("Top-center (vertical)")      },
+            { 0x0e, N_("Top-right (vertical)")       },
+            { 0x0f, N_("Left (vertical)")            },
+            { 0x10, N_("Mid-left (vertical)")        },
+            { 0x11, N_("Center (vertical)")          },
+            { 0x12, N_("Mid-right (vertical)")       },
+            { 0x13, N_("Right (vertical)")           },
+            { 0x14, N_("Bottom-left (vertical)")     },
+            { 0x15, N_("Bottom-center (vertical)")   },
+            { 0x16, N_("Bottom-right (vertical)")    },
+            // End of list marker
+            { 0xff, "" }
+        };
+
+        if (value.count() != 1 || value.typeId() != unsignedShort) {
+            return os << value;
+        }
+
+        bool E3_E30model = false;
+
+        if (metadata != NULL) {
+            ExifData::const_iterator pos = metadata->findKey(ExifKey("Exif.Image.Model"));
+            if (pos != metadata->end() && pos->count() != 0) {
+                std::string model = pos->toString();
+                if (model.find("E-3 ") != std::string::npos ||
+                    model.find("E-30 ") != std::string::npos) {
+                      E3_E30model = true;
+                }
+            }
+        }
+
+        uint16_t v = (uint16_t) value.toLong(0);
+
+        if (!E3_E30model) {
+            for (int i = 0; afPoints[i].val != 0xffff; i++) {
+                if (afPoints[i].val == v) {
+                    return os << afPoints[i].label;
+                }
+            }
+        } else {
+
+            // E-3 and E-30
+            for (int i = 0; afPointsE3[i].val != 0xff; i++) {
+                if (afPointsE3[i].val == (v & 0x1f)) {
+                    os << afPointsE3[i].label;
+                    os << ", ";
+                    if ((v & 0xe0) == 0)  return os << N_("Single Target");
+                    if (v & 0x40)  return os << N_("All Target");
+                    if (v & 0x80)  return os << N_("Dynamic Single Target");
+                }
+            }
+        }
+        return os << v;
+    } // OlympusMakerNote::print0x0308
+
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/olympusmn.hpp exiv2-0.21/src/olympusmn.hpp
--- exiv2-0.19/src/olympusmn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/olympusmn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    olympusmn.hpp
-  @brief   Olympus makernote tags.<br>References:<br>
-           [1] <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html#APP1">Exif file format, Appendix 1: MakerNote of Olympus Digicams</a> by TsuruZoh Tachibanaya<br>
-           [2] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey<br>
-           [3] <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/olympus_mn.html">Olympus Makernote Format Specification</a> by Evan Hunter<br>
-           [4] email communication with <a href="mailto:wstokes@gmail.com">Will Stokes</a>
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @author  Will Stokes (wuz)
-           <a href="mailto:wstokes@gmail.com">wstokes@gmail.com</a>
-  @author  Gilles Caulier (gc)
-           <a href="mailto:caulier dot gilles at kdemail dot net">caulier dot gilles at kdemail dot net</a>
-  @date    10-Mar-05, wuz: created
- */
-#ifndef OLYMPUSMN_HPP_
-#define OLYMPUSMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <iosfwd>
-#include <memory>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Olympus cameras
-    class EXIV2API OlympusMakerNote {
-    public:
-        //! Return read-only list of built-in Olympus tags
-        static const TagInfo* tagList();
-        //! Return read-only list of built-in Olympus Camera Settings tags
-        static const TagInfo* tagListCs();
-        //! Return read-only list of built-in Olympus Equipment tags
-        static const TagInfo* tagListEq();
-        //! Return read-only list of built-in Olympus Raw Development tags
-        static const TagInfo* tagListRd();
-        //! Return read-only list of built-in Olympus Raw Development 2 tags
-        static const TagInfo* tagListRd2();
-        //! Return read-only list of built-in Olympus Image Processing tags
-        static const TagInfo* tagListIp();
-        //! Return read-only list of built-in Olympus Focus Info tags
-        static const TagInfo* tagListFi();
-        //! Return read-only list of built-in Olympus FE tags
-        static const TagInfo* tagListFe();
-        //! Return read-only list of built-in Olympus Raw Info tags
-        static const TagInfo* tagListRi();
-
-        //! @name Print functions for Olympus %MakerNote tags
-        //@{
-        //! Print 'Special Mode'
-        static std::ostream& print0x0200(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Digital Zoom Factor
-        static std::ostream& print0x0204(std::ostream& os, const Value& value, const ExifData*);
-        //! Print White Balance Mode
-        static std::ostream& print0x1015(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Olympus camera settings Gradation
-        static std::ostream& print0x050f(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Olympus camera settings Noise Filter
-        static std::ostream& print0x0527(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-        static const TagInfo tagInfoCs_[];
-        static const TagInfo tagInfoEq_[];
-        static const TagInfo tagInfoRd_[];
-        static const TagInfo tagInfoRd2_[];
-        static const TagInfo tagInfoIp_[];
-        static const TagInfo tagInfoFi_[];
-        static const TagInfo tagInfoFe_[];
-        static const TagInfo tagInfoRi_[];
-
-    }; // class OlympusMakerNote
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef OLYMPUSMN_HPP_
diff -Nru exiv2-0.19/src/olympusmn_int.hpp exiv2-0.21/src/olympusmn_int.hpp
--- exiv2-0.19/src/olympusmn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/olympusmn_int.hpp	2010-08-14 08:52:46.000000000 +0000
@@ -0,0 +1,128 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    olympusmn_int.hpp
+  @brief   Olympus makernote tags.<br>References:<br>
+           [1] <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html#APP1">Exif file format, Appendix 1: MakerNote of Olympus Digicams</a> by TsuruZoh Tachibanaya<br>
+           [2] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey<br>
+           [3] <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/olympus_mn.html">Olympus Makernote Format Specification</a> by Evan Hunter<br>
+           [4] email communication with <a href="mailto:wstokes@gmail.com">Will Stokes</a>
+  @version $Rev: 2317 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @author  Will Stokes (wuz)
+           <a href="mailto:wstokes@gmail.com">wstokes@gmail.com</a>
+  @author  Gilles Caulier (gc)
+           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  @author  Greg Mansfield
+           <a href="mailto:G.Mansfield at computer dot org">G.Mansfield at computer dot org</a>
+  @date    10-Mar-05, wuz: created
+ */
+#ifndef OLYMPUSMN_INT_HPP_
+#define OLYMPUSMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+#include <memory>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Olympus cameras
+    class OlympusMakerNote {
+    public:
+        //! Return read-only list of built-in Olympus tags
+        static const TagInfo* tagList();
+        //! Return read-only list of built-in Olympus Camera Settings tags
+        static const TagInfo* tagListCs();
+        //! Return read-only list of built-in Olympus Equipment tags
+        static const TagInfo* tagListEq();
+        //! Return read-only list of built-in Olympus Raw Development tags
+        static const TagInfo* tagListRd();
+        //! Return read-only list of built-in Olympus Raw Development 2 tags
+        static const TagInfo* tagListRd2();
+        //! Return read-only list of built-in Olympus Image Processing tags
+        static const TagInfo* tagListIp();
+        //! Return read-only list of built-in Olympus Focus Info tags
+        static const TagInfo* tagListFi();
+        //! Return read-only list of built-in Olympus FE tags
+        static const TagInfo* tagListFe();
+        //! Return read-only list of built-in Olympus Raw Info tags
+        static const TagInfo* tagListRi();
+
+        //! @name Print functions for Olympus %MakerNote tags
+        //@{
+        //! Print 'Special Mode'
+        static std::ostream& print0x0200(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Digital Zoom Factor
+        static std::ostream& print0x0204(std::ostream& os, const Value& value, const ExifData*);
+        //! Print White Balance Mode
+        static std::ostream& print0x1015(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus equipment Lens type
+        static std::ostream& print0x0201(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus CamerID
+        static std::ostream& print0x0209(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus equipment Extender
+        static std::ostream& printEq0x0301(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus camera settings Focus Mode
+        static std::ostream& printCs0x0301(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus camera settings Gradation
+        static std::ostream& print0x050f(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus camera settings Noise Filter
+        static std::ostream& print0x0527(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus ArtFilter
+        static  std::ostream& print0x0529(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus focus info ManualFlash
+        static std::ostream& print0x1209(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus focus info AF Point
+        static std::ostream& print0x0308(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Olympus generic
+        static std::ostream& printGeneric(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+        static const TagInfo tagInfoCs_[];
+        static const TagInfo tagInfoEq_[];
+        static const TagInfo tagInfoRd_[];
+        static const TagInfo tagInfoRd2_[];
+        static const TagInfo tagInfoIp_[];
+        static const TagInfo tagInfoFi_[];
+        static const TagInfo tagInfoFe_[];
+        static const TagInfo tagInfoRi_[];
+
+    }; // class OlympusMakerNote
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef OLYMPUSMN_INT_HPP_
diff -Nru exiv2-0.19/src/orfimage.cpp exiv2-0.21/src/orfimage.cpp
--- exiv2-0.19/src/orfimage.cpp	2009-12-07 16:01:14.000000000 +0000
+++ exiv2-0.21/src/orfimage.cpp	2010-08-30 19:33:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      orfimage.cpp
-  Version:   $Rev: 1954 $
+  Version:   $Rev: 2336 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   13-May-06, ahu: created
   Credits:   See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: orfimage.cpp 1954 2009-12-07 16:01:14Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: orfimage.cpp 2336 2010-08-30 19:33:07Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -86,18 +86,6 @@
         return 0;
     }
 
-    void OrfImage::setExifData(const ExifData& /*exifData*/)
-    {
-        // Todo: implement me!
-        throw(Error(32, "Exif metadata", "ORF"));
-    }
-
-    void OrfImage::setIptcData(const IptcData& /*iptcData*/)
-    {
-        // Todo: implement me!
-        throw(Error(32, "IPTC metadata", "ORF"));
-    }
-
     void OrfImage::setComment(const std::string& /*comment*/)
     {
         // not supported
@@ -129,8 +117,29 @@
 
     void OrfImage::writeMetadata()
     {
-        // Todo: implement me!
-        throw(Error(31, "ORF"));
+#ifdef DEBUG
+        std::cerr << "Writing ORF file " << io_->path() << "\n";
+#endif
+        ByteOrder bo = byteOrder();
+        byte* pData = 0;
+        long size = 0;
+        IoCloser closer(*io_);
+        if (io_->open() == 0) {
+            // Ensure that this is the correct image type
+            if (isOrfType(*io_, false)) {
+                pData = io_->mmap(true);
+                size = io_->size();
+                OrfHeader orfHeader;
+                if (0 == orfHeader.read(pData, 8)) {
+                    bo = orfHeader.byteOrder();
+                }
+            }
+        }
+        if (bo == invalidByteOrder) {
+            bo = littleEndian;
+        }
+        setByteOrder(bo);
+        OrfParser::encode(*io_, pData, size, bo, exifData_, iptcData_, xmpData_); // may throw
     } // OrfImage::writeMetadata
 
     ByteOrder OrfParser::decode(
@@ -153,27 +162,42 @@
     }
 
     WriteMethod OrfParser::encode(
-              Blob&     blob,
+              BasicIo&  io,
         const byte*     pData,
               uint32_t  size,
+              ByteOrder byteOrder,
         const ExifData& exifData,
         const IptcData& iptcData,
         const XmpData&  xmpData
     )
     {
-        /* Todo: Implement me!
+        // Copy to be able to modify the Exif data
+        ExifData ed = exifData;
+
+        // Delete IFDs which do not occur in TIFF images
+        static const IfdId filteredIfds[] = {
+            panaRawId
+        };
+        for (unsigned int i = 0; i < EXV_COUNTOF(filteredIfds); ++i) {
+#ifdef DEBUG
+            std::cerr << "Warning: Exif IFD " << filteredIfds[i] << " not encoded\n";
+#endif
+            ed.erase(std::remove_if(ed.begin(),
+                                    ed.end(),
+                                    FindExifdatum(filteredIfds[i])),
+                     ed.end());
+        }
 
-        return TiffParserWorker::encode(blob,
-                                 pData,
-                                 size,
-                                 exifData,
-                                 iptcData,
-                                 xmpData,
-                                 TiffCreator::create,
-                                 TiffMapping::findEncoder);
-        */
-        blob.clear();
-        return wmIntrusive;
+        std::auto_ptr<TiffHeaderBase> header(new OrfHeader(byteOrder));
+        return TiffParserWorker::encode(io,
+                                        pData,
+                                        size,
+                                        ed,
+                                        iptcData,
+                                        xmpData,
+                                        Tag::root,
+                                        TiffMapping::findEncoder,
+                                        header.get());
     }
 
     // *************************************************************************
@@ -208,8 +232,9 @@
 namespace Exiv2 {
     namespace Internal {
 
-    OrfHeader::OrfHeader()
-        : TiffHeaderBase(0x4f52, 8, littleEndian, 0x00000008)
+    OrfHeader::OrfHeader(ByteOrder byteOrder)
+        : TiffHeaderBase(0x4f52, 8, byteOrder, 0x00000008),
+          sig_(0x4f52)
     {
     }
 
@@ -232,6 +257,7 @@
         }
         uint16_t sig = getUShort(pData + 2, byteOrder());
         if (tag() != sig && 0x5352 != sig) return false; // #658: Added 0x5352 for SP-560UZ
+        sig_ = sig;
         setOffset(getULong(pData + 4, byteOrder()));
         if (offset() != 0x00000008) return false;
 
@@ -240,8 +266,23 @@
 
     DataBuf OrfHeader::write() const
     {
-        // Todo: Implement me!
-        return DataBuf();
+        DataBuf buf(8);
+        switch (byteOrder()) {
+        case littleEndian:
+            buf.pData_[0] = 0x49;
+            buf.pData_[1] = 0x49;
+            break;
+        case bigEndian:
+            buf.pData_[0] = 0x4d;
+            buf.pData_[1] = 0x4d;
+            break;
+        case invalidByteOrder:
+            assert(false);
+            break;
+        }
+        us2Data(buf.pData_ + 2, sig_, byteOrder());
+        ul2Data(buf.pData_ + 4, 0x00000008, byteOrder());
+        return buf;
     }
 
 }}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/orfimage.hpp exiv2-0.21/src/orfimage.hpp
--- exiv2-0.19/src/orfimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/orfimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    orfimage.hpp
   @brief   Olympus RAW image
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Jeff Costlow
            <a href="mailto:costlow@gmail.com">costlow@gmail.com</a>
   @date    31-Jul-07, costlow: created
@@ -79,22 +79,8 @@
         //! @name Manipulators
         //@{
         void readMetadata();
-        /*!
-          @brief Todo: Write metadata back to the image. This method is not
-              yet implemented. Calling it will throw an Error(31).
-         */
         void writeMetadata();
         /*!
-          @brief Todo: Not supported yet, requires writeMetadata(). Calling
-              this function will throw an Error(32).
-         */
-        void setExifData(const ExifData& exifData);
-        /*!
-          @brief Todo: Not supported yet, requires writeMetadata(). Calling
-              this function will throw an Error(32).
-         */
-        void setIptcData(const IptcData& iptcData);
-        /*!
           @brief Not supported. ORF format does not contain a comment.
               Calling this function will throw an Error(32).
          */
@@ -143,14 +129,14 @@
                  See TiffParser::encode().
         */
         static WriteMethod encode(
-                  Blob&     blob,
+                  BasicIo&  io,
             const byte*     pData,
                   uint32_t  size,
+                  ByteOrder byteOrder,
             const ExifData& exifData,
             const IptcData& iptcData,
             const XmpData&  xmpData
         );
-
     }; // class OrfParser
 
 // *****************************************************************************
diff -Nru exiv2-0.19/src/orfimage_int.hpp exiv2-0.21/src/orfimage_int.hpp
--- exiv2-0.19/src/orfimage_int.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/orfimage_int.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    orfimage_int.hpp
   @brief   Internal classes to support Olympus RAW image format
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Jeff Costlow
            <a href="mailto:costlow@gmail.com">costlow@gmail.com</a>
   @date    31-Jul-07, costlow: created
@@ -51,7 +51,7 @@
         //! @name Creators
         //@{
         //! Default constructor
-        OrfHeader();
+        OrfHeader(ByteOrder byteOrder =littleEndian);
         //! Destructor.
         ~OrfHeader();
         //@}
@@ -65,6 +65,9 @@
         //@{
         DataBuf write() const;
         //@}
+    private:
+        // DATA
+        uint16_t sig_;       //<! The actual magic number
     }; // class OrfHeader
 
 }}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/panasonicmn.cpp exiv2-0.21/src/panasonicmn.cpp
--- exiv2-0.19/src/panasonicmn.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/panasonicmn.cpp	2010-09-10 16:36:33.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,20 +20,21 @@
  */
 /*
   File:      panasonicmn.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2346 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
-             Gilles Caulier (gc) <caulier.gilles@kdemail.net>
+             Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
   History:   11-Jun-04, ahu: created
   Credits:   See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: panasonicmn.cpp 1750 2009-02-16 14:30:51Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: panasonicmn.cpp 2346 2010-09-10 16:36:33Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "panasonicmn.hpp"
+#include "panasonicmn_int.hpp"
+#include "tags_int.hpp"
 #include "value.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -47,6 +48,7 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     //! Quality, tag 0x0001
     extern const TagDetails panasonicQuality[] = {
@@ -66,7 +68,8 @@
         {  5, N_("Manual")          },
         {  8, N_("Flash")           },
         { 10, N_("Black and white") },
-        { 11, N_("Manual")          }
+        { 11, N_("Manual")          },
+        { 11, N_("Manual")          }           // To silence compiler warning
     };
 
     //! FocusMode, tag 0x0007
@@ -74,7 +77,8 @@
         {  1, N_("Auto")               },
         {  2, N_("Manual")             },
         {  4, N_("Auto, focus button") },
-        {  5, N_("Auto, continuous")   }
+        {  5, N_("Auto, continuous")   },
+        {  5, N_("Auto, continuous")   }        // To silence compiler warning
     };
 
     //! ImageStabilizer, tag 0x001a
@@ -161,7 +165,8 @@
         {   7, N_("Medium high") },
         { 256, N_("Low")         },
         { 272, N_("Standard")    },
-        { 288, N_("High")        }
+        { 288, N_("High")        },
+        { 288, N_("High")        }              // To silence compiler warning
     };
 
     //! NoiseReduction, tag 0x002d
@@ -205,7 +210,8 @@
         { 1, N_("Off")       },
         { 2, N_("Wide")      },
         { 3, N_("Telephoto") },
-        { 4, N_("Macro")     }
+        { 4, N_("Macro")     },
+        { 4, N_("Macro")     }                  // To silence compiler warning
     };
 
     //! WorldTimeLocation, tag 0x003a
@@ -227,59 +233,59 @@
 
     // Panasonic MakerNote Tag Info
     const TagInfo PanasonicMakerNote::tagInfo_[] = {
-        TagInfo(0x0001, "Quality", N_("Quality"), N_("Image Quality"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicQuality)),
-        TagInfo(0x0002, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), panasonicIfdId, makerTags, undefined, printValue),
-        TagInfo(0x0003, "WhiteBalance", N_("White Balance"), N_("White balance setting"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicWhiteBalance)),
-        TagInfo(0x0004, "0x0004", "0x0004", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicFocusMode)),
-        TagInfo(0x000f, "AFMode", N_("AF Mode"), N_("AF mode"), panasonicIfdId, makerTags, unsignedByte, print0x000f),
-        TagInfo(0x001a, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicImageStabilizer)),
-        TagInfo(0x001c, "Macro", N_("Macro"), N_("Macro mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicMacro)),
-        TagInfo(0x001f, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicShootingMode)),
-        TagInfo(0x0020, "Audio", N_("Audio"), N_("Audio"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicAudio)),
-        TagInfo(0x0021, "DataDump", N_("Data Dump"), N_("Data dump"), panasonicIfdId, makerTags, undefined, printValue),
-        TagInfo(0x0022, "0x0022", "0x0022", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0023, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance adjustment"), panasonicIfdId, makerTags, signedShort, print0x0023),
-        TagInfo(0x0024, "FlashBias", N_("FlashBias"), N_("Flash bias"), panasonicIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0025, "InternalSerialNumber", N_("Internal Serial Number"), N_("This number is unique, and contains the date of manufacture, but is not the same as the number printed on the camera body."), panasonicIfdId, makerTags, undefined, printValue),
-        TagInfo(0x0026, "ExifVersion", "Exif Version", N_("Exif version"), panasonicIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0027, "0x0027", "0x0027", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0028, "ColorEffect", N_("Color Effect"), N_("Color effect"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicColorEffect)),
-        TagInfo(0x0029, "TimeSincePowerOn", "Time since Power On", N_("Time in 1/100 s from when the camera was powered on to when the image is written to memory card"), panasonicIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x002a, "BurstMode", N_("Burst Mode"), N_("Burst mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicBurstMode)),
-        TagInfo(0x002b, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), panasonicIfdId, makerTags, unsignedLong, printValue),
-        TagInfo(0x002c, "Contrast", N_("Contrast"), N_("Contrast setting"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicContrast)),
-        TagInfo(0x002d, "NoiseReduction", N_("NoiseReduction"), N_("Noise reduction"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicNoiseReduction)),
-        TagInfo(0x002e, "SelfTimer", N_("Self Timer"), N_("Self timer"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicSelfTimer)),
-        TagInfo(0x002f, "0x002f", "0x002f", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0030, "Rotation", N_("Rotation"), N_("Rotation"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicRotation)),
-        TagInfo(0x0031, "0x0031", "0x0031", N_("Unknown"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0032, "ColorMode", N_("Color Mode"), N_("Color mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicColorMode)),
-        TagInfo(0x0033, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0034, "OpticalZoomMode", N_("Optical Zoom Mode"), N_("Optical zoom mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicOpticalZoomMode)),
-        TagInfo(0x0035, "ConversionLens", N_("Conversion Lens"), N_("Conversion lens"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicConversionLens)),
-        TagInfo(0x0036, "TravelDay", N_("Travel Day"), N_("Travel day"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0039, "Contrast", N_("Contrast"), N_("Contrast"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x003a, "WorldTimeLocation", N_("World Time Location"), N_("World time location"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicWorldTimeLocation)),
-        TagInfo(0x003c, "ProgramISO", N_("Program ISO"), N_("Program ISO"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0040, "Saturation", N_("Saturation"), N_("Saturation"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0041, "Sharpness", N_("Sharpness"), N_("Sharpness"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0042, "FilmMode", N_("Film Mode"), N_("Film mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicFilmMode)),
-        TagInfo(0x0046, "WBAdjustAB", N_("WB Adjust AB"), N_("WB adjust AB. Positive is a shift toward blue."), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0047, "WBAdjustGM", N_("WB Adjust GM"), N_("WBAdjustGM. Positive is a shift toward green."), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0051, "LensType", N_("Lens Type"), N_("Lens type"), panasonicIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0052, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), panasonicIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0053, "AccessoryType", N_("Accessory Type"), N_("Accessory type"), panasonicIfdId, makerTags, asciiString, printValue),
-        TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), minoltaIfdId, makerTags, undefined, printValue),
-        TagInfo(0x4449, "0x4449", "0x4449", N_("Unknown"), panasonicIfdId, makerTags, undefined, printValue),
-        TagInfo(0x8000, "MakerNoteVersion", N_("MakerNote Version"), N_("MakerNote version"), panasonicIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x8001, "SceneMode", N_("Scene Mode"), N_("Scene mode"), panasonicIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(panasonicShootingMode)),
-        TagInfo(0x8004, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x8005, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x8006, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panasonicIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x8010, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicIfdId, makerTags, asciiString, printValue),
+        TagInfo(0x0001, "Quality", N_("Quality"), N_("Image Quality"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicQuality)),
+        TagInfo(0x0002, "FirmwareVersion", N_("Firmware Version"), N_("Firmware version"), panasonicId, makerTags, undefined, -1, printValue),
+        TagInfo(0x0003, "WhiteBalance", N_("White Balance"), N_("White balance setting"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicWhiteBalance)),
+        TagInfo(0x0004, "0x0004", "0x0004", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFocusMode)),
+        TagInfo(0x000f, "AFMode", N_("AF Mode"), N_("AF mode"), panasonicId, makerTags, unsignedByte, -1, print0x000f),
+        TagInfo(0x001a, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicImageStabilizer)),
+        TagInfo(0x001c, "Macro", N_("Macro"), N_("Macro mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicMacro)),
+        TagInfo(0x001f, "ShootingMode", N_("Shooting Mode"), N_("Shooting mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicShootingMode)),
+        TagInfo(0x0020, "Audio", N_("Audio"), N_("Audio"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicAudio)),
+        TagInfo(0x0021, "DataDump", N_("Data Dump"), N_("Data dump"), panasonicId, makerTags, undefined, -1, printValue),
+        TagInfo(0x0022, "0x0022", "0x0022", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0023, "WhiteBalanceBias", N_("White Balance Bias"), N_("White balance adjustment"), panasonicId, makerTags, signedShort, -1, print0x0023),
+        TagInfo(0x0024, "FlashBias", N_("FlashBias"), N_("Flash bias"), panasonicId, makerTags, signedShort, -1, printValue),
+        TagInfo(0x0025, "InternalSerialNumber", N_("Internal Serial Number"), N_("This number is unique, and contains the date of manufacture, but is not the same as the number printed on the camera body."), panasonicId, makerTags, undefined, -1, printValue),
+        TagInfo(0x0026, "ExifVersion", "Exif Version", N_("Exif version"), panasonicId, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0027, "0x0027", "0x0027", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0028, "ColorEffect", N_("Color Effect"), N_("Color effect"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicColorEffect)),
+        TagInfo(0x0029, "TimeSincePowerOn", "Time since Power On", N_("Time in 1/100 s from when the camera was powered on to when the image is written to memory card"), panasonicId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x002a, "BurstMode", N_("Burst Mode"), N_("Burst mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicBurstMode)),
+        TagInfo(0x002b, "SequenceNumber", N_("Sequence Number"), N_("Sequence number"), panasonicId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x002c, "Contrast", N_("Contrast"), N_("Contrast setting"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicContrast)),
+        TagInfo(0x002d, "NoiseReduction", N_("NoiseReduction"), N_("Noise reduction"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicNoiseReduction)),
+        TagInfo(0x002e, "SelfTimer", N_("Self Timer"), N_("Self timer"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicSelfTimer)),
+        TagInfo(0x002f, "0x002f", "0x002f", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0030, "Rotation", N_("Rotation"), N_("Rotation"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicRotation)),
+        TagInfo(0x0031, "0x0031", "0x0031", N_("Unknown"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0032, "ColorMode", N_("Color Mode"), N_("Color mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicColorMode)),
+        TagInfo(0x0033, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0034, "OpticalZoomMode", N_("Optical Zoom Mode"), N_("Optical zoom mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicOpticalZoomMode)),
+        TagInfo(0x0035, "ConversionLens", N_("Conversion Lens"), N_("Conversion lens"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicConversionLens)),
+        TagInfo(0x0036, "TravelDay", N_("Travel Day"), N_("Travel day"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0039, "Contrast", N_("Contrast"), N_("Contrast"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x003a, "WorldTimeLocation", N_("World Time Location"), N_("World time location"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicWorldTimeLocation)),
+        TagInfo(0x003c, "ProgramISO", N_("Program ISO"), N_("Program ISO"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0040, "Saturation", N_("Saturation"), N_("Saturation"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0041, "Sharpness", N_("Sharpness"), N_("Sharpness"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0042, "FilmMode", N_("Film Mode"), N_("Film mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFilmMode)),
+        TagInfo(0x0046, "WBAdjustAB", N_("WB Adjust AB"), N_("WB adjust AB. Positive is a shift toward blue."), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0047, "WBAdjustGM", N_("WB Adjust GM"), N_("WBAdjustGM. Positive is a shift toward green."), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x0051, "LensType", N_("Lens Type"), N_("Lens type"), panasonicId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0052, "LensSerialNumber", N_("Lens Serial Number"), N_("Lens serial number"), panasonicId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0053, "AccessoryType", N_("Accessory Type"), N_("Accessory type"), panasonicId, makerTags, asciiString, -1, printValue),
+        TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), panasonicId, makerTags, undefined, -1, printValue),
+        TagInfo(0x4449, "0x4449", "0x4449", N_("Unknown"), panasonicId, makerTags, undefined, -1, printValue),
+        TagInfo(0x8000, "MakerNoteVersion", N_("MakerNote Version"), N_("MakerNote version"), panasonicId, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x8001, "SceneMode", N_("Scene Mode"), N_("Scene mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicShootingMode)),
+        TagInfo(0x8004, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x8005, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x8006, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panasonicId, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x8010, "BabyAge", N_("Baby Age"), N_("Baby (or pet) age"), panasonicId, makerTags, asciiString, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownPanasonicMakerNoteTag)", "(UnknownPanasonicMakerNoteTag)", N_("Unknown PanasonicMakerNote tag"), panasonicIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownPanasonicMakerNoteTag)", "(UnknownPanasonicMakerNoteTag)", N_("Unknown PanasonicMakerNote tag"), panasonicId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* PanasonicMakerNote::tagList()
@@ -326,31 +332,31 @@
 
     // Panasonic MakerNote Tag Info
     const TagInfo PanasonicMakerNote::tagInfoRaw_[] = {
-        TagInfo(0x0001, "Version", N_("Version"), N_("Panasonic raw version"), panaRawIfdId, panaRaw, undefined, printExifVersion),
-        TagInfo(0x0002, "SensorWidth", N_("Sensor Width"), N_("Sensor width"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0003, "SensorHeight", N_("Sensor Height"), N_("Sensor height"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0004, "SensorTopBorder", N_("Sensor Top Border"), N_("Sensor top border"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0005, "SensorLeftBorder", N_("Sensor Left Border"), N_("Sensor left border"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0006, "ImageHeight", N_("Image Height"), N_("Image height"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0007, "ImageWidth", N_("Image Width"), N_("Image width"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0011, "RedBalance", N_("Red Balance"), N_("Red balance (found in Digilux 2 RAW images)"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0012, "BlueBalance", N_("Blue Balance"), N_("Blue balance"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0017, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0024, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0025, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0026, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x002e, "PreviewImage", N_("Preview Image"), N_("Preview image"), panaRawIfdId, panaRaw, undefined, printValue),
-        TagInfo(0x010f, "Make", N_("Manufacturer"), N_("The manufacturer of the recording equipment"), panaRawIfdId, panaRaw, asciiString, printValue),
-        TagInfo(0x0110, "Model", N_("Model"), N_("The model name or model number of the equipment"), panaRawIfdId, panaRaw, asciiString, printValue),
-        TagInfo(0x0111, "StripOffsets", N_("Strip Offsets"), N_("Strip offsets"), panaRawIfdId, panaRaw, unsignedLong, printValue),
-        TagInfo(0x0112, "Orientation", N_("Orientation"), N_("Orientation"), panaRawIfdId, panaRaw, unsignedShort, print0x0112),
-        TagInfo(0x0116, "RowsPerStrip", N_("Rows Per Strip"), N_("The number of rows per strip"), panaRawIfdId, panaRaw, unsignedShort, printValue),
-        TagInfo(0x0117, "StripByteCounts", N_("Strip Byte Counts"), N_("Strip byte counts"), panaRawIfdId, panaRaw, unsignedLong, printValue),
-        TagInfo(0x0118, "RawDataOffset", N_("Raw Data Offset"), N_("Raw data offset"), panaRawIfdId, panaRaw, unsignedLong, printValue),
-        TagInfo(0x8769, "ExifTag", N_("Exif IFD Pointer"), N_("A pointer to the Exif IFD"), panaRawIfdId, panaRaw, unsignedLong, printValue),
-        TagInfo(0x8825, "GPSTag", N_("GPS Info IFD Pointer"), N_("A pointer to the GPS Info IFD"), panaRawIfdId, panaRaw, unsignedLong, printValue),
+        TagInfo(0x0001, "Version", N_("Version"), N_("Panasonic raw version"), panaRawId, panaRaw, undefined, -1, printExifVersion),
+        TagInfo(0x0002, "SensorWidth", N_("Sensor Width"), N_("Sensor width"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0003, "SensorHeight", N_("Sensor Height"), N_("Sensor height"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0004, "SensorTopBorder", N_("Sensor Top Border"), N_("Sensor top border"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0005, "SensorLeftBorder", N_("Sensor Left Border"), N_("Sensor left border"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0006, "ImageHeight", N_("Image Height"), N_("Image height"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0007, "ImageWidth", N_("Image Width"), N_("Image width"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0011, "RedBalance", N_("Red Balance"), N_("Red balance (found in Digilux 2 RAW images)"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0012, "BlueBalance", N_("Blue Balance"), N_("Blue balance"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0017, "ISOSpeed", N_("ISO Speed"), N_("ISO speed setting"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0024, "WBRedLevel", N_("WB Red Level"), N_("WB red level"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0025, "WBGreenLevel", N_("WB Green Level"), N_("WB green level"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0026, "WBBlueLevel", N_("WB Blue Level"), N_("WB blue level"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x002e, "PreviewImage", N_("Preview Image"), N_("Preview image"), panaRawId, panaRaw, undefined, -1, printValue),
+        TagInfo(0x010f, "Make", N_("Manufacturer"), N_("The manufacturer of the recording equipment"), panaRawId, panaRaw, asciiString, -1, printValue),
+        TagInfo(0x0110, "Model", N_("Model"), N_("The model name or model number of the equipment"), panaRawId, panaRaw, asciiString, -1, printValue),
+        TagInfo(0x0111, "StripOffsets", N_("Strip Offsets"), N_("Strip offsets"), panaRawId, panaRaw, unsignedLong, -1, printValue),
+        TagInfo(0x0112, "Orientation", N_("Orientation"), N_("Orientation"), panaRawId, panaRaw, unsignedShort, -1, print0x0112),
+        TagInfo(0x0116, "RowsPerStrip", N_("Rows Per Strip"), N_("The number of rows per strip"), panaRawId, panaRaw, unsignedShort, -1, printValue),
+        TagInfo(0x0117, "StripByteCounts", N_("Strip Byte Counts"), N_("Strip byte counts"), panaRawId, panaRaw, unsignedLong, -1, printValue),
+        TagInfo(0x0118, "RawDataOffset", N_("Raw Data Offset"), N_("Raw data offset"), panaRawId, panaRaw, unsignedLong, -1, printValue),
+        TagInfo(0x8769, "ExifTag", N_("Exif IFD Pointer"), N_("A pointer to the Exif IFD"), panaRawId, panaRaw, unsignedLong, -1, printValue),
+        TagInfo(0x8825, "GPSTag", N_("GPS Info IFD Pointer"), N_("A pointer to the GPS Info IFD"), panaRawId, panaRaw, unsignedLong, -1, printValue),
         // End of list marker
-        TagInfo(0xffff, "(UnknownPanasonicRawTag)", "(UnknownPanasonicRawTag)", N_("Unknown PanasonicRaw tag"), panaRawIfdId, panaRaw, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownPanasonicRawTag)", "(UnknownPanasonicRawTag)", N_("Unknown PanasonicRaw tag"), panaRawId, panaRaw, asciiString, -1, printValue)
     };
 
     const TagInfo* PanasonicMakerNote::tagListRaw()
@@ -358,4 +364,4 @@
         return tagInfoRaw_;
     }
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/panasonicmn.hpp exiv2-0.21/src/panasonicmn.hpp
--- exiv2-0.19/src/panasonicmn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/panasonicmn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    panasonicmn.hpp
-  @brief   Panasonic MakerNote implemented using the following references:
-           <a href="http://www.compton.nu/panasonic.html">Panasonic MakerNote Information</a> by Tom Hughes,
-           Panasonic.pm of <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey,
-           <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/panasonic_mn.html">Panasonic Makernote Format Specification</a> by Evan Hunter.
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @author  Gilles Caulier (gc)
-           <a href="mailto:caulier dot gilles at kdemail dot net">caulier dot gilles at kdemail dot net</a>
-  @date    11-Jun-05, ahu: created
- */
-#ifndef PANASONICMN_HPP_
-#define PANASONICMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <iosfwd>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Panasonic cameras
-    class EXIV2API PanasonicMakerNote {
-    public:
-        //! Return read-only list of built-in Panasonic tags
-        static const TagInfo* tagList();
-        //! Return read-only list of built-in Panasonic RAW image tags (IFD0)
-        static const TagInfo* tagListRaw();
-
-        //! @name Print functions for Panasonic %MakerNote tags
-        //@{
-        //! Print SpotMode
-        static std::ostream& print0x000f(std::ostream& os, const Value& value, const ExifData*);
-        //! Print WhiteBalanceBias
-        static std::ostream& print0x0023(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        //! Makernote tag list
-        static const TagInfo tagInfo_[];
-        //! Taglist for IFD0 of Panasonic RAW images
-        static const TagInfo tagInfoRaw_[];
-
-    }; // class PanasonicMakerNote
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef PANASONICMN_HPP_
diff -Nru exiv2-0.19/src/panasonicmn_int.hpp exiv2-0.21/src/panasonicmn_int.hpp
--- exiv2-0.19/src/panasonicmn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/panasonicmn_int.hpp	2010-08-14 02:36:34.000000000 +0000
@@ -0,0 +1,80 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    panasonicmn_int.hpp
+  @brief   Panasonic MakerNote implemented using the following references:
+           <a href="http://www.compton.nu/panasonic.html">Panasonic MakerNote Information</a> by Tom Hughes,
+           Panasonic.pm of <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey,
+           <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/panasonic_mn.html">Panasonic Makernote Format Specification</a> by Evan Hunter.
+  @version $Rev: 2311 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @author  Gilles Caulier (gc)
+           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  @date    11-Jun-05, ahu: created
+ */
+#ifndef PANASONICMN_INT_HPP_
+#define PANASONICMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Panasonic cameras
+    class PanasonicMakerNote {
+    public:
+        //! Return read-only list of built-in Panasonic tags
+        static const TagInfo* tagList();
+        //! Return read-only list of built-in Panasonic RAW image tags (IFD0)
+        static const TagInfo* tagListRaw();
+
+        //! @name Print functions for Panasonic %MakerNote tags
+        //@{
+        //! Print SpotMode
+        static std::ostream& print0x000f(std::ostream& os, const Value& value, const ExifData*);
+        //! Print WhiteBalanceBias
+        static std::ostream& print0x0023(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        //! Makernote tag list
+        static const TagInfo tagInfo_[];
+        //! Taglist for IFD0 of Panasonic RAW images
+        static const TagInfo tagInfoRaw_[];
+
+    }; // class PanasonicMakerNote
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef PANASONICMN_INT_HPP_
diff -Nru exiv2-0.19/src/pentaxmn.cpp exiv2-0.21/src/pentaxmn.cpp
--- exiv2-0.19/src/pentaxmn.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/pentaxmn.cpp	2010-09-10 16:36:33.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,22 +20,22 @@
  */
 /*
   File:      pentaxmn.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2346 $
   Author(s): Michal Cihar <michal@cihar.com>
   Based on fujimn.cpp by:
              Andreas Huggel (ahu) <ahuggel@gmx.net>
-             Gilles Caulier (gc) <caulier.gilles@kdemail.net>
+             Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
   History:   27-Sep-07 created
   Credits:   See header file.
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: pentaxmn.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: pentaxmn.cpp 2346 2010-09-10 16:36:33Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "pentaxmn.hpp"
+#include "pentaxmn_int.hpp"
 #include "value.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -49,6 +49,7 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     //! ShootingMode, tag 0x0001
     extern const TagDetails pentaxShootingMode[] = {
@@ -100,33 +101,50 @@
         {    0x12b9c, N_("K100D") },
         {    0x12b9d, N_("K110D") },
         {    0x12ba2, N_("K100D Super") },
-        {    0x12bb0, N_("Optio T10") },
+        {    0x12bb0, N_("Optio T10/T20") },
         {    0x12be2, N_("Optio W10") },
         {    0x12bf6, N_("Optio M10") },
         {    0x12c1e, N_("K10D") },
         {    0x12c20, N_("Samsung GX10") },
         {    0x12c28, N_("Optio S7") },
+        {    0x12c2d, N_("Optio L20") },
         {    0x12c32, N_("Optio M20") },
         {    0x12c3c, N_("Optio W20") },
         {    0x12c46, N_("Optio A20") },
         {    0x12c8c, N_("Optio M30") },
         {    0x12c78, N_("Optio E30") },
+        {    0x12c7d, N_("Optio E35") },
         {    0x12c82, N_("Optio T30") },
         {    0x12c96, N_("Optio W30") },
         {    0x12ca0, N_("Optio A30") },
         {    0x12cb4, N_("Optio E40") },
         {    0x12cbe, N_("Optio M40") },
         {    0x12cc8, N_("Optio Z10") },
-        {    0x12cdc, N_("Optio S10") },
-        {    0x12ce6, N_("Optio A40") },
-        {    0x12cf0, N_("Optio V10") },
         {    0x12cd2, N_("K20D") },
+        {    0x12cd4, N_("Samsung GX20") },
         {    0x12cdc, N_("Optio S10") },
         {    0x12ce6, N_("Optio A40") },
         {    0x12cf0, N_("Optio V10") },
         {    0x12cfa, N_("K200D") },
+        {    0x12d04, N_("Optio S12") },
         {    0x12d0e, N_("Optio E50") },
         {    0x12d18, N_("Optio M50") },
+        {    0x12d2c, N_("Optio V20") },
+        {    0x12d40, N_("Optio W60") },
+        {    0x12d4a, N_("Optio M60") },
+        {    0x12d68, N_("Optio E60") },
+        {    0x12d72, N_("K2000") },
+        {    0x12d73, N_("K-m") },
+        {    0x12d86, N_("Optio P70") },
+        {    0x12d9a, N_("Optio E70") },
+        {    0x12dae, N_("X70") },
+        {    0x12db8, N_("K-7") },
+        {    0x12dcc, N_("Optio W80") },
+        {    0x12dea, N_("Optio P80") },
+        {    0x12df4, N_("Optio WS80") },
+        {    0x12dfe, N_("K-x") },
+        {    0x12e08, N_("645D") },
+        {    0x12e3a, N_("Optio I-10") },
     };
 
     //! Quality, tag 0x0008
@@ -181,15 +199,19 @@
         {    1, N_("Macro") },
         {    2, N_("Infinity") },
         {    3, N_("Manual") },
+        {    4, N_("Super Macro") },
         {    5, N_("Pan Focus") },
         {    16, N_("AF-S") },
         {    17, N_("AF-C") },
+        {    18, N_("AF-A") },
     };
 
     //! AFPoint, tag 0x000e
     extern const TagDetails pentaxAFPoint[] = {
         {    0xffff, N_("Auto") },
         {    0xfffe, N_("Fixed Center") },
+        {    0xfffd, N_("Automatic Tracking AF") },
+        {    0xfffc, N_("Face Recognition AF") },
         {    1, N_("Upper-left") },
         {    2, N_("Top") },
         {    3, N_("Upper-right") },
@@ -203,6 +225,21 @@
         {    11, N_("Lower-right") },
     };
 
+    //! AFPointInFocus, tag 0x000f
+    extern const TagDetails pentaxAFPointFocus[] = {
+        {    0xffff, N_("None") },
+        {    0, N_("Fixed Center or multiple") },
+        {    1, N_("Top-left") },
+        {    2, N_("Top-center") },
+        {    3, N_("Top-right") },
+        {    4, N_("Left") },
+        {    5, N_("Center") },
+        {    6, N_("Right") },
+        {    7, N_("Bottom-left") },
+        {    8, N_("Bottom-center") },
+        {    9, N_("Bottom-right") },
+    };
+
     //! ISO, tag 0x0014
     extern const TagDetails pentaxISO[] = {
         {    3, N_("50") },
@@ -221,7 +258,12 @@
         {    16, N_("1000") },
         {    17, N_("1250") },
         {    18, N_("1600") },
+        {    19, N_("2000") },
+        {    20, N_("2500") },
         {    21, N_("3200") },
+        {    22, N_("4000") },
+        {    23, N_("5000") },
+        {    24, N_("6400") },
         {    50, N_("50") },
         {    100, N_("100") },
         {    200, N_("200") },
@@ -230,6 +272,19 @@
         {    800, N_("800") },
         {    1600, N_("1600") },
         {    3200, N_("3200") },
+        {    258, N_("50") },
+        {    259, N_("70") },
+        {    260, N_("100") },
+        {    261, N_("140") },
+        {    262, N_("200") },
+        {    263, N_("280") },
+        {    264, N_("400") },
+        {    265, N_("560") },
+        {    266, N_("800") },
+        {    267, N_("1100") },
+        {    268, N_("1600") },
+        {    269, N_("2200") },
+        {    270, N_("3200") },
     };
 
     //! Generic for Off/On switches
@@ -264,6 +319,7 @@
         {    8, N_("WhiteFluorescent") },
         {    9, N_("Flash") },
         {    10, N_("Cloudy") },
+        {    17, N_("Kelvin") },
         {    65534, N_("Unknown") },
         {    65535, N_("User Selected") },
     };
@@ -283,13 +339,15 @@
 
     //! Saturation, tag 0x001f
     extern const TagDetails pentaxSaturation[] = {
-        {    0, N_("Low") },
-        {    1, N_("Normal") },
-        {    2, N_("High") },
-        {    3, N_("Med Low") },
-        {    4, N_("Med High") },
-        {    5, N_("Very Low") },
-        {    6, N_("Very High") },
+        {     0, N_("Low")       },
+        {     1, N_("Normal")    },
+        {     2, N_("High")      },
+        {     3, N_("Med Low")   },
+        {     4, N_("Med High")  },
+        {     5, N_("Very Low")  },
+        {     6, N_("Very High") },
+        { 65535, N_("None")      },
+        { 65535, N_("None")      }              // To silence compiler warning
     };
 
     //! Contrast, tag 0x0020
@@ -393,6 +451,7 @@
         {    68, N_("Amsterdam") },
         {    69, N_("Stockholm") },
         {    70, N_("Lisbon") },
+        {    71, N_("Copenhagen") },
     };
 
     //! ImageProcessing, combi-tag 0x0032 (4 bytes)
@@ -424,6 +483,9 @@
         { 0x001000, N_("Pet") },
         { 0x001100, N_("Candlelight") },
         { 0x001200, N_("Museum") },
+        { 0x001300, N_("Food") },
+        { 0x001400, N_("Stage Lighting") },
+        { 0x001500, N_("Night Snap") },
         /* AUTO PICT modes (auto-selected) */
         { 0x010400, N_("Auto PICT (Standard)") },
         { 0x010500, N_("Auto PICT (Portrait)") },
@@ -461,7 +523,9 @@
         { 0x100000, N_("Flash X-Sync Speed AE") },
         { 0x100001, N_("Flash X-Sync Speed AE (1)") },
         /* other modes */
-        { 0x000001, N_("Program") }
+        { 0x000001, N_("Program") },
+        { 0xfe0000, N_("Video (30 fps)") },
+        { 0xff0004, N_("Video (24 fps)") },
     };
 
     //! DriveMode, combi-tag 0x0034 (4 bytes)
@@ -470,11 +534,13 @@
         { 0x01000000, N_("Continuous") },
         { 0x02000000, N_("Continuous (Hi)") },
         { 0x03000000, N_("Burst") },
+        { 0x00100000, N_("Single-frame") }, /* on 645D */
         { 0x00010000, N_("Self-timer (12 sec)") },
         { 0x00020000, N_("Self-timer (2 sec)") },
         { 0x00000100, N_("Remote Control (3 sec)") },
         { 0x00000200, N_("Remote Control") },
         { 0x00000001, N_("Multiple Exposure") },
+        { 0x000000ff, N_("Video") },
     };
 
     //! ColorSpace, tag 0x0037
@@ -599,12 +665,21 @@
         { 0x060d, "smc PENTAX-FA* 400mm F5.6 ED[IF]" },
         { 0x060e, "smc PENTAX-FA* MACRO 200mm F4 ED[IF]" },
         { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
+        { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
+        { 0x07d9, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" },
+        { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" },
+        { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]" },
+        { 0x07de, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
+        { 0x07df, "Samsung D-XENON 18-55mm F3.5-5.6 II" },
+        { 0x07e0, "smc PENTAX-DA 15mm F4 ED AL Limited" },
+        { 0x07e1, "Samsung D-XENON 18-250mm F3.5-6.3" },
         { 0x07e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
         { 0x07e6, "Tamron AF 17-50mm F2.8 XR Di-II LD (Model A16)" },
         { 0x07e7, "smc PENTAX-DA 18-250mm F3.5-6.3ED AL [IF]" },
         { 0x07e9, "smc PENTAX-DA 35mm F2.8 Macro Limited" },
         { 0x07ea, "smc PENTAX-DA* 300 mm F4ED [IF] SDM (SDM not used)" },
         { 0x07eb, "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM (SDM not used)" },
+        { 0x07ec, "smc PENTAX-DA 55-300mm F4-5.8 ED" },
         { 0x07ee, "TAMRON AF 18-250mm F3.5-6.3 Di II LD Aspherical [IF] MACRO" },
         { 0x07f1, "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM (SDM not used)" },
         { 0x07f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not used)" },
@@ -617,6 +692,9 @@
         { 0x08eb, "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM" },
         { 0x08f1, "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM" },
         { 0x08f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM" },
+        { 0x0b04, "smc PENTAX-FA645 Zoom 45mm-85mm F4.5" },
+        { 0x0b07, "smc PENTAX-FA645 Macro 120mm F4" },
+        { 0x0b11, "smc PENTAX-FA645 Zoom 150mm-300mm F5.6 ED [IF]" },
     };
 
     //! ImageTone, tag 0x004f
@@ -627,6 +705,7 @@
         {    3, N_("Landscape") },
         {    4, N_("Vibrant") },
         {    5, N_("Monochrome") },
+        {    7, N_("Reversal film") },
     };
 
     //! DynamicRangeExpansion, tag 0x0069
@@ -641,6 +720,7 @@
         {   1, N_("Weakest") },
         {   2, N_("Weak") },
         {   3, N_("Strong") },
+        {   4, N_("Custom") },
     };
 
     std::ostream& PentaxMakerNote::printPentaxVersion(std::ostream& os, const Value& value, const ExifData*)
@@ -784,244 +864,266 @@
     const TagInfo PentaxMakerNote::tagInfo_[] = {
         TagInfo(0x0000, "Version", N_("Version"),
                 N_("Pentax Makernote version"),
-                pentaxIfdId, makerTags, undefined, printPentaxVersion),
+                pentaxId, makerTags, undefined, -1, printPentaxVersion),
         TagInfo(0x0001, "Mode", N_("Shooting mode"),
                 N_("Camera shooting mode"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxShootingMode)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxShootingMode)),
         TagInfo(0x0002, "PreviewResolution", N_("Resolution of a preview image"),
                 N_("Resolution of a preview image"),
-                pentaxIfdId, makerTags, undefined, printPentaxResolution),
+                pentaxId, makerTags, undefined, -1, printPentaxResolution),
         TagInfo(0x0003, "PreviewLength", N_("Length of a preview image"),
                 N_("Size of an IFD containing a preview image"),
-                pentaxIfdId, makerTags, undefined, printValue),
+                pentaxId, makerTags, undefined, -1, printValue),
         TagInfo(0x0004, "PreviewOffset", N_("Pointer to a preview image"),
                 N_("Offset to an IFD containing a preview image"),
-                pentaxIfdId, makerTags, undefined, printValue),
+                pentaxId, makerTags, undefined, -1, printValue),
         TagInfo(0x0005, "ModelID", N_("Model identification"),
                 N_("Pentax model idenfication"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxModel)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxModel)),
         TagInfo(0x0006, "Date", N_("Date"),
                 N_("Date"),
-                pentaxIfdId, makerTags, undefined, printPentaxDate),
+                pentaxId, makerTags, undefined, -1, printPentaxDate),
         TagInfo(0x0007, "Time", N_("Time"),
                 N_("Time"),
-                pentaxIfdId, makerTags, undefined, printPentaxTime),
+                pentaxId, makerTags, undefined, -1, printPentaxTime),
         TagInfo(0x0008, "Quality", N_("Image quality"),
                 N_("Image quality settings"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxQuality)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxQuality)),
         TagInfo(0x0009, "Size", N_("Image size"),
                 N_("Image size settings"),
-                pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxSize)),
+                pentaxId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxSize)),
         /* Some missing ! */
         TagInfo(0x000c, "Flash", N_("Flash mode"),
                 N_("Flash mode settings"),
-                pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxFlash)),
+                pentaxId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxFlash)),
         TagInfo(0x000d, "Focus", N_("Focus mode"),
                 N_("Focus mode settings"),
-                pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxFocus)),
+                pentaxId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxFocus)),
         TagInfo(0x000e, "AFPoint", N_("AF point"),
                 N_("Selected AF point"),
-                pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxAFPoint)),
+                pentaxId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxAFPoint)),
+        TagInfo(0x000F, "AFPointInFocus", N_("AF point in focus"),
+                N_("AF point in focus"),
+                pentaxId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxAFPointFocus)),
         /* Some missing ! */
         TagInfo(0x0012, "ExposureTime", N_("Exposure time"),
                 N_("Exposure time"),
-                pentaxIfdId, makerTags, unsignedLong, printPentaxExposure),
+                pentaxId, makerTags, unsignedLong, -1, printPentaxExposure),
         TagInfo(0x0013, "FNumber", N_("F-Number"),
                 N_("F-Number"),
-                pentaxIfdId, makerTags, unsignedLong, printPentaxFValue),
+                pentaxId, makerTags, unsignedLong, -1, printPentaxFValue),
         TagInfo(0x0014, "ISO", N_("ISO sensitivity"),
                 N_("ISO sensitivity settings"),
-                pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(pentaxISO)),
+                pentaxId, makerTags, unsignedLong, -1, EXV_PRINT_TAG(pentaxISO)),
         /* Some missing ! */
         TagInfo(0x0016, "ExposureCompensation", N_("Exposure compensation"),
                 N_("Exposure compensation"),
-                pentaxIfdId, makerTags, unsignedLong, printPentaxCompensation),
+                pentaxId, makerTags, unsignedLong, -1, printPentaxCompensation),
         /* Some missing ! */
         TagInfo(0x0017, "MeteringMode", N_("MeteringMode"),
                 N_("MeteringMode"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxMeteringMode)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxMeteringMode)),
         TagInfo(0x0018, "AutoBracketing", N_("AutoBracketing"),
                 N_("AutoBracketing"),
-                pentaxIfdId, makerTags, undefined, printPentaxBracketing),
+                pentaxId, makerTags, undefined, -1, printPentaxBracketing),
         TagInfo(0x0019, "WhiteBallance", N_("White ballance"),
                 N_("White ballance"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxWhiteBallance)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBallance)),
         TagInfo(0x001a, "WhiteBallanceMode", N_("White ballance mode"),
                 N_("White ballance mode"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxWhiteBallanceMode)),
-        /* Some missing ! */
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxWhiteBallanceMode)),
+        TagInfo(0x001b, "BlueBalance", N_("Blue balance"),
+                N_("Blue color balance"),
+                pentaxId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x001c, "RedBalance", N_("Red balance"),
+                N_("Red color balance"),
+                pentaxId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x001d, "FocalLength", N_("FocalLength"),
                 N_("FocalLength"),
-                pentaxIfdId, makerTags, undefined, printPentaxFocalLength),
-        /* Some missing ! */
+                pentaxId, makerTags, undefined, -1, printPentaxFocalLength),
+        TagInfo(0x001e, "DigitalZoom", N_("Digital zoom"),
+                N_("Digital zoom"),
+                pentaxId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x001f, "Saturation", N_("Saturation"),
                 N_("Saturation"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxSaturation)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxSaturation)),
         TagInfo(0x0020, "Contrast", N_("Contrast"),
                 N_("Contrast"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxContrast)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxContrast)),
         TagInfo(0x0021, "Sharpness", N_("Sharpness"),
                 N_("Sharpness"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxSharpness)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxSharpness)),
         TagInfo(0x0022, "Location", N_("Location"),
                 N_("Location"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxLocation)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxLocation)),
         TagInfo(0x0023, "Hometown", N_("Hometown"),
                 N_("Home town"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxCities)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxCities)),
         TagInfo(0x0024, "Destination", N_("Destination"),
                 N_("Destination"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxCities)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxCities)),
         TagInfo(0x0025, "HometownDST", N_("Hometown DST"),
                 N_("Whether day saving time is active in home town"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxYesNo)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxYesNo)),
         TagInfo(0x0026, "DestinationDST", N_("Destination DST"),
                 N_("Whether day saving time is active in destination"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_TAG(pentaxYesNo)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_TAG(pentaxYesNo)),
         TagInfo(0x0027, "DSPFirmwareVersion", N_("DSPFirmwareVersion"),
                 N_("DSPFirmwareVersion"),
-                pentaxIfdId, makerTags, unsignedByte, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, unsignedByte, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0028, "CPUFirmwareVersion", N_("CPUFirmwareVersion"),
                 N_("CPUFirmwareVersion"),
-                pentaxIfdId, makerTags, unsignedByte, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, unsignedByte, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0029, "FrameNumber", N_("Frame number"),
                 N_("Frame number"),
-                pentaxIfdId, makerTags, undefined, printValue),
+                pentaxId, makerTags, undefined, -1, printValue),
         /* Some missing ! */
         TagInfo(0x002d, "EffectiveLV", N_("Light value"),
                 N_("Camera calculated light value, includes exposure compensation"),
-                pentaxIfdId, makerTags, unsignedShort, printValue),
+                pentaxId, makerTags, unsignedShort, -1, printValue),
         /* Some missing ! */
         TagInfo(0x0032, "ImageProcessing", N_("Image processing"),
                 N_("Image processing"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxImageProcessing, 4, 0)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxImageProcessing, 4, 0)),
         TagInfo(0x0033, "PictureMode", N_("Picture mode"),
                 N_("Picture mode"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxPictureMode, 3, 0)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxPictureMode, 3, 0)),
         TagInfo(0x0034, "DriveMode", N_("Drive mode"),
                 N_("Drive mode"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxDriveMode, 4, 0)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxDriveMode, 4, 0)),
         /* Some missing ! */
         TagInfo(0x0037, "ColorSpace", N_("Color space"),
                 N_("Color space"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxColorSpace)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxColorSpace)),
+        TagInfo(0x0038, "ImageAreaOffset", N_("Image area offset"),
+                N_("Image area offset"),
+                pentaxId, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0039, "RawImageSize", N_("Raw image size"),
+                N_("Raw image size"),
+                pentaxId, makerTags, unsignedLong, -1, printValue),
         /* Some missing ! */
         TagInfo(0x003e, "PreviewImageBorders", N_("Preview image borders"),
                 N_("Preview image borders"),
-                pentaxIfdId, makerTags, unsignedByte, printValue),
+                pentaxId, makerTags, unsignedByte, -1, printValue),
         TagInfo(0x003f, "LensType", N_("Lens type"),
                 N_("Lens type"),
-                pentaxIfdId, makerTags, unsignedByte, EXV_PRINT_COMBITAG(pentaxLensType, 2, 1)),
+                pentaxId, makerTags, unsignedByte, -1, EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)),
         TagInfo(0x0040, "SensitivityAdjust", N_("Sensitivity adjust"),
                 N_("Sensitivity adjust"),
-                pentaxIfdId, makerTags, unsignedLong, printValue),
+                pentaxId, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x0041, "DigitalFilter", N_("Digital filter"),
                 N_("Digital filter"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxOffOn)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxOffOn)),
         /* Some missing ! */
         TagInfo(0x0047, "Temperature", N_("Temperature"),
                 N_("Camera temperature"),
-                pentaxIfdId, makerTags, signedByte, printPentaxTemperature),
+                pentaxId, makerTags, signedByte, -1, printPentaxTemperature),
         TagInfo(0x0048, "AELock", N_("AE lock"),
                 N_("AE lock"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxOffOn)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxOffOn)),
         TagInfo(0x0049, "NoiseReduction", N_("Noise reduction"),
                 N_("Noise reduction"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxOffOn)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxOffOn)),
         /* Some missing ! */
         TagInfo(0x004d, "FlashExposureCompensation", N_("Flash exposure compensation"),
                 N_("Flash exposure compensation"),
-                pentaxIfdId, makerTags, signedLong, printPentaxFlashCompensation),
+                pentaxId, makerTags, signedLong, -1, printPentaxFlashCompensation),
         /* Some missing ! */
         TagInfo(0x004f, "ImageTone", N_("Image tone"),
                 N_("Image tone"),
-                pentaxIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(pentaxImageTone)),
+                pentaxId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(pentaxImageTone)),
         TagInfo(0x0050, "ColorTemperature", N_("Colort temperature"),
                 N_("Colort temperature"),
-                pentaxIfdId, makerTags, unsignedShort, printValue),
+                pentaxId, makerTags, unsignedShort, -1, printValue),
         /* Some missing ! */
         TagInfo(0x005c, "ShakeReduction", N_("Shake reduction"),
                 N_("Shake reduction information"),
-                pentaxIfdId, makerTags, undefined, printValue),
+                pentaxId, makerTags, undefined, -1, printValue),
         TagInfo(0x005d, "ShutterCount", N_("Shutter count"),
                 N_("Shutter count"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: This has some encryption by date (see exiftool) */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: This has some encryption by date (see exiftool) */
         TagInfo(0x0069, "DynamicRangeExpansion", N_("Dynamic range expansion"),
                 N_("Dynamic range expansion"),
-                pentaxIfdId, makerTags, undefined, EXV_PRINT_COMBITAG(pentaxDynamicRangeExpansion, 4, 0)),
+                pentaxId, makerTags, undefined, -1, EXV_PRINT_COMBITAG(pentaxDynamicRangeExpansion, 4, 0)),
         TagInfo(0x0071, "HighISONoiseReduction", N_("High ISO noise reduction"),
                 N_("High ISO noise reduction"),
-                pentaxIfdId, makerTags, unsignedByte, EXV_PRINT_TAG(pentaxHighISONoiseReduction)),
+                pentaxId, makerTags, unsignedByte, -1, EXV_PRINT_TAG(pentaxHighISONoiseReduction)),
+        TagInfo(0x0072, "AFAdjustment", N_("AF Adjustment"),
+                N_("AF Adjustment"),
+                pentaxId, makerTags, undefined, -1, printValue),
         /* Many missing ! */
         TagInfo(0x0200, "BlackPoint", N_("Black point"),
                 N_("Black point"),
-                pentaxIfdId, makerTags, undefined, printValue),
+                pentaxId, makerTags, undefined, -1, printValue),
         TagInfo(0x0201, "WhitePoint", N_("White point"),
                 N_("White point"),
-                pentaxIfdId, makerTags, undefined, printValue),
+                pentaxId, makerTags, undefined, -1, printValue),
         /* Some missing ! */
         TagInfo(0x0205, "ShotInfo", N_("ShotInfo"),
                 N_("ShotInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0206, "AEInfo", N_("AEInfo"),
                 N_("AEInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0207, "LensInfo", N_("LensInfo"),
                 N_("LensInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0208, "FlashInfo", N_("FlashInfo"),
                 N_("FlashInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0209, "AEMeteringSegments", N_("AEMeteringSegments"),
                 N_("AEMeteringSegments"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x020a, "FlashADump", N_("FlashADump"),
                 N_("FlashADump"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x020b, "FlashBDump", N_("FlashBDump"),
                 N_("FlashBDump"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         /* Some missing ! */
         TagInfo(0x020d, "WB_RGGBLevelsDaylight", N_("WB_RGGBLevelsDaylight"),
                 N_("WB_RGGBLevelsDaylight"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x020e, "WB_RGGBLevelsShade", N_("WB_RGGBLevelsShade"),
                 N_("WB_RGGBLevelsShade"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x020f, "WB_RGGBLevelsCloudy", N_("WB_RGGBLevelsCloudy"),
                 N_("WB_RGGBLevelsCloudy"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0210, "WB_RGGBLevelsTungsten", N_("WB_RGGBLevelsTungsten"),
                 N_("WB_RGGBLevelsTungsten"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0211, "WB_RGGBLevelsFluorescentD", N_("WB_RGGBLevelsFluorescentD"),
                 N_("WB_RGGBLevelsFluorescentD"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0212, "WB_RGGBLevelsFluorescentN", N_("WB_RGGBLevelsFluorescentN"),
                 N_("WB_RGGBLevelsFluorescentN"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0213, "WB_RGGBLevelsFluorescentW", N_("WB_RGGBLevelsFluorescentW"),
                 N_("WB_RGGBLevelsFluorescentW"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0214, "WB_RGGBLevelsFlash", N_("WB_RGGBLevelsFlash"),
                 N_("WB_RGGBLevelsFlash"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0215, "CameraInfo", N_("CameraInfo"),
                 N_("CameraInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0216, "BatteryInfo", N_("BatteryInfo"),
                 N_("BatteryInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x021f, "AFInfo", N_("AFInfo"),
                 N_("AFInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
         TagInfo(0x0222, "ColorInfo", N_("ColorInfo"),
                 N_("ColorInfo"),
-                pentaxIfdId, makerTags, undefined, printValue), /* TODO: Decoding missing */
+                pentaxId, makerTags, undefined, -1, printValue), /* TODO: Decoding missing */
+        TagInfo(0x0229, "SerialNumber", N_("Serial Number"),
+                N_("Serial Number"),
+                pentaxId, makerTags, asciiString, -1, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownPentaxMakerNoteTag)", "(UnknownPentaxMakerNoteTag)",
                 N_("Unknown PentaxMakerNote tag"),
-                pentaxIfdId, makerTags, invalidTypeId, printValue)
+                pentaxId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* PentaxMakerNote::tagList()
@@ -1029,4 +1131,4 @@
         return tagInfo_;
     }
 
-}                                       // namespace Exiv2
+}}                                       // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/pentaxmn.hpp exiv2-0.21/src/pentaxmn.hpp
--- exiv2-0.19/src/pentaxmn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/pentaxmn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    pentaxmn.hpp
-  @brief   Pentax MakerNote implemented according to the specification
-           http://www.gvsoft.homedns.org/exif/makernote-pentax-type3.html and
-           based on ExifTool implementation and
-           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Pentax.html">Pentax Makernote list</a> by Phil Harvey<br>
-  @version $Rev: 1750 $
-  @author  Michal Cihar
-           <a href="mailto:michal@cihar.com">michal@cihar.com</a>
-  @date    27-Sep-07
- */
-#ifndef PENTAXMN_HPP_
-#define PENTAXMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <iostream>
-#include <iomanip>
-#include <memory>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Pentaxfilm cameras
-    class EXIV2API PentaxMakerNote {
-    public:
-        //! Return read-only list of built-in Pentaxfilm tags
-        static const TagInfo* tagList();
-
-        //! Print Pentax version
-        static std::ostream& printPentaxVersion(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax resolution
-        static std::ostream& printPentaxResolution(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax date
-        static std::ostream& printPentaxDate(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax time
-        static std::ostream& printPentaxTime(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax exposure
-        static std::ostream& printPentaxExposure(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax F value
-        static std::ostream& printPentaxFValue(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax focal length
-        static std::ostream& printPentaxFocalLength(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax compensation
-        static std::ostream& printPentaxCompensation(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax temperature
-        static std::ostream& printPentaxTemperature(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax flash compensation
-        static std::ostream& printPentaxFlashCompensation(std::ostream& os, const Value& value, const ExifData*);
-        //! Print Pentax bracketing
-        static std::ostream& printPentaxBracketing(std::ostream& os, const Value& value, const ExifData*);
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-    }; // class PentaxMakerNote
-
-    /*!
-      @brief Print function to translate Pentax "combi-values" to a description
-             by looking up a reference table.
-     */
-    template <int N, const TagDetails (&array)[N], int count, int ignoredcount>
-    std::ostream& printCombiTag(std::ostream& os, const Value& value, const ExifData* metadata)
-    {
-        if ((value.count() != count && value.count() != (count + ignoredcount)) || count > 4) {
-            return printValue(os, value, metadata);
-        }
-        unsigned long l = 0;
-        for (int c = 0; c < count; ++c) {
-            if (value.toLong(c) < 0 || value.toLong(c) > 255) {
-                return printValue(os, value, metadata);
-            }
-            l += (value.toLong(c) << ((count - c - 1) * 8));
-        }
-        const TagDetails* td = find(array, l);
-        if (td) {
-            os << exvGettext(td->label_);
-        }
-        else {
-            os << exvGettext("Unknown") << " (0x"
-               << std::setw(2 * count) << std::setfill('0')
-               << std::hex << l << std::dec << ")";
-        }
-
-        return os;
-    }
-
-//! Shortcut for the printCombiTag template which requires typing the array name only once.
-#define EXV_PRINT_COMBITAG(array, count, ignoredcount) printCombiTag<EXV_COUNTOF(array), array, count, ignoredcount>
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef PENTAXMN_HPP_
diff -Nru exiv2-0.19/src/pentaxmn_int.hpp exiv2-0.21/src/pentaxmn_int.hpp
--- exiv2-0.19/src/pentaxmn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/pentaxmn_int.hpp	2010-08-16 13:38:06.000000000 +0000
@@ -0,0 +1,126 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    pentaxmn_int.hpp
+  @brief   Pentax MakerNote implemented according to the specification
+           http://www.gvsoft.homedns.org/exif/makernote-pentax-type3.html and
+           based on ExifTool implementation and
+           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Pentax.html">Pentax Makernote list</a> by Phil Harvey<br>
+  @version $Rev: 2322 $
+  @author  Michal Cihar
+           <a href="mailto:michal@cihar.com">michal@cihar.com</a>
+  @date    27-Sep-07
+ */
+#ifndef PENTAXMN_INT_HPP_
+#define PENTAXMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "tags_int.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iostream>
+#include <iomanip>
+#include <memory>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Pentaxfilm cameras
+    class PentaxMakerNote {
+    public:
+        //! Return read-only list of built-in Pentaxfilm tags
+        static const TagInfo* tagList();
+
+        //! Print Pentax version
+        static std::ostream& printPentaxVersion(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax resolution
+        static std::ostream& printPentaxResolution(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax date
+        static std::ostream& printPentaxDate(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax time
+        static std::ostream& printPentaxTime(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax exposure
+        static std::ostream& printPentaxExposure(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax F value
+        static std::ostream& printPentaxFValue(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax focal length
+        static std::ostream& printPentaxFocalLength(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax compensation
+        static std::ostream& printPentaxCompensation(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax temperature
+        static std::ostream& printPentaxTemperature(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax flash compensation
+        static std::ostream& printPentaxFlashCompensation(std::ostream& os, const Value& value, const ExifData*);
+        //! Print Pentax bracketing
+        static std::ostream& printPentaxBracketing(std::ostream& os, const Value& value, const ExifData*);
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+    }; // class PentaxMakerNote
+
+    /*!
+      @brief Print function to translate Pentax "combi-values" to a description
+             by looking up a reference table.
+     */
+    template <int N, const TagDetails (&array)[N], int count, int ignoredcount, int ignoredcountmax>
+    std::ostream& printCombiTag(std::ostream& os, const Value& value, const ExifData* metadata)
+    {
+        if ((value.count() != count && (value.count() < (count + ignoredcount) || value.count() > (count + ignoredcountmax))) || count > 4) {
+            return printValue(os, value, metadata);
+        }
+        unsigned long l = 0;
+        for (int c = 0; c < count; ++c) {
+            if (value.toLong(c) < 0 || value.toLong(c) > 255) {
+                return printValue(os, value, metadata);
+            }
+            l += (value.toLong(c) << ((count - c - 1) * 8));
+        }
+        const TagDetails* td = find(array, l);
+        if (td) {
+            os << exvGettext(td->label_);
+        }
+        else {
+            os << exvGettext("Unknown") << " (0x"
+               << std::setw(2 * count) << std::setfill('0')
+               << std::hex << l << std::dec << ")";
+        }
+
+        return os;
+    }
+
+//! Shortcut for the printCombiTag template which requires typing the array name only once.
+#define EXV_PRINT_COMBITAG(array, count, ignoredcount) printCombiTag<EXV_COUNTOF(array), array, count, ignoredcount, ignoredcount>
+//! Shortcut for the printCombiTag template which requires typing the array name only once.
+#define EXV_PRINT_COMBITAG_MULTI(array, count, ignoredcount, ignoredcountmax) printCombiTag<EXV_COUNTOF(array), array, count, ignoredcount, ignoredcountmax>
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef PENTAXMN_INT_HPP_
diff -Nru exiv2-0.19/src/pgfimage.cpp exiv2-0.21/src/pgfimage.cpp
--- exiv2-0.19/src/pgfimage.cpp	2009-12-28 14:11:23.000000000 +0000
+++ exiv2-0.21/src/pgfimage.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:    pgfimage.cpp
-  Version: $Rev: 1976 $
+  Version: $Rev: 2286 $
   Author(s): Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
   History: 16-Jun-09, gc: submitted
   Credits: See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: pgfimage.cpp 1976 2009-12-28 14:11:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: pgfimage.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 
diff -Nru exiv2-0.19/src/pgfimage.hpp exiv2-0.21/src/pgfimage.hpp
--- exiv2-0.19/src/pgfimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/pgfimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   @file    pgfimage.hpp
   @brief   PGF image, implemented using the following references:
            <a href="http://www.libpgf.org/uploads/media/PGF_stamm_wscg02.pdf">PGF specification</a> from libpgf web site<br>
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @author  Gilles Caulier (cgilles)
diff -Nru exiv2-0.19/src/pngchunk.cpp exiv2-0.21/src/pngchunk.cpp
--- exiv2-0.19/src/pngchunk.cpp	2009-12-29 10:45:39.000000000 +0000
+++ exiv2-0.21/src/pngchunk.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:    pngchunk.cpp
-  Version: $Rev: 1978 $
+  Version: $Rev: 2344 $
   Author(s): Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
   History: 12-Jun-06, gc: submitted
   Credits: See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: pngchunk.cpp 1978 2009-12-29 10:45:39Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: pngchunk.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -276,7 +276,7 @@
                 else
                 {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Exiv2::PngChunk::parseChunkContent: Failed to decode Exif metadata.\n";
+                    EXV_WARNING << "Failed to decode Exif metadata.\n";
 #endif
                     pImage->exifData().clear();
                 }
@@ -317,7 +317,7 @@
                                           &iptcBlob[0],
                                           static_cast<uint32_t>(iptcBlob.size()))) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode IPTC metadata.\n";
+                    EXV_WARNING << "Failed to decode IPTC metadata.\n";
 #endif
                     pImage->clearIptcData();
                 }
@@ -327,7 +327,7 @@
                                           psData.pData_,
                                           psData.size_)) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode IPTC metadata.\n";
+                    EXV_WARNING << "Failed to decode IPTC metadata.\n";
 #endif
                     pImage->clearIptcData();
                 }
@@ -351,15 +351,15 @@
                 if (idx != std::string::npos && idx > 0)
                 {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Exiv2::PngChunk::parseChunkContent: Removing " << idx
-                              << " characters from the beginning of the XMP packet\n";
+                    EXV_WARNING << "Removing " << idx
+                                << " characters from the beginning of the XMP packet\n";
 #endif
                     xmpPacket = xmpPacket.substr(idx);
                 }
                 if (XmpParser::decode(pImage->xmpData(), xmpPacket))
                 {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Exiv2::PngChunk::parseChunkContent: Failed to decode XMP metadata.\n";
+                    EXV_WARNING << "Failed to decode XMP metadata.\n";
 #endif
                 }
             }
@@ -379,15 +379,15 @@
                 if (idx != std::string::npos && idx > 0)
                 {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Removing " << idx << " characters "
-                              << "from the beginning of the XMP packet\n";
+                    EXV_WARNING << "Removing " << idx << " characters "
+                                << "from the beginning of the XMP packet\n";
 #endif
                     xmpPacket = xmpPacket.substr(idx);
                 }
                 if (XmpParser::decode(pImage->xmpData(), xmpPacket))
                 {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode XMP metadata.\n";
+                    EXV_WARNING << "Failed to decode XMP metadata.\n";
 #endif
                 }
             }
@@ -440,41 +440,36 @@
     {
         uLongf uncompressedLen = compressedTextSize * 2; // just a starting point
         int zlibResult;
+        int dos = 0;
 
-        do
-        {
+        do {
             arr.alloc(uncompressedLen);
-            zlibResult = uncompress((Bytef*)arr.pData_, &uncompressedLen,
-                                    compressedText, compressedTextSize);
-
-            if (zlibResult == Z_OK)
-            {
-                // then it is all OK
+            zlibResult = uncompress((Bytef*)arr.pData_,
+                                    &uncompressedLen,
+                                    compressedText,
+                                    compressedTextSize);
+            if (zlibResult == Z_OK) {
                 arr.alloc(uncompressedLen);
             }
-            else if (zlibResult == Z_BUF_ERROR)
-            {
+            else if (zlibResult == Z_BUF_ERROR) {
                 // the uncompressedArray needs to be larger
-#ifdef DEBUG
-                std::cout << "Exiv2::PngChunk::parsePngChunk: doubling size for decompression.\n";
-#endif
                 uncompressedLen *= 2;
-
                 // DoS protection. can't be bigger than 64k
-                if ( uncompressedLen > 131072 )
-                    break;
+                if (uncompressedLen > 131072) {
+                    if (++dos > 1) break;
+                    uncompressedLen = 131072;
+                }
             }
-            else
-            {
+            else {
                 // something bad happened
                 throw Error(14);
             }
         }
         while (zlibResult == Z_BUF_ERROR);
 
-        if (zlibResult != Z_OK)
+        if (zlibResult != Z_OK) {
             throw Error(14);
-
+        }
     } // PngChunk::zlibUncompress
 
     std::string PngChunk::zlibCompress(const std::string& text)
diff -Nru exiv2-0.19/src/pngchunk_int.hpp exiv2-0.21/src/pngchunk_int.hpp
--- exiv2-0.19/src/pngchunk_int.hpp	2009-12-29 10:45:39.000000000 +0000
+++ exiv2-0.21/src/pngchunk_int.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -25,7 +25,7 @@
            <a href="http://www.vias.org/pngguide/chapter11_04.html">PNG tTXt and zTXt chunks structures</a> from PNG definitive guide,<br>
            <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PNG.html">PNG tags list</a> by Phil Harvey<br>
            Email communication with <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a><br>
-  @version $Rev: 1978 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @author  Gilles Caulier (cgilles)
diff -Nru exiv2-0.19/src/pngimage.cpp exiv2-0.21/src/pngimage.cpp
--- exiv2-0.19/src/pngimage.cpp	2009-12-29 10:45:39.000000000 +0000
+++ exiv2-0.21/src/pngimage.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:    pngimage.cpp
-  Version: $Rev: 1978 $
+  Version: $Rev: 2344 $
   Author(s): Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
   History: 12-Jun-06, gc: submitted
   Credits: See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: pngimage.cpp 1978 2009-12-29 10:45:39Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: pngimage.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 
@@ -325,7 +325,7 @@
                 if (writeXmpFromPacket() == false) {
                     if (XmpParser::encode(xmpPacket_, xmpData_) > 1) {
 #ifndef SUPPRESS_WARNINGS
-                        std::cerr << "Error: Failed to encode XMP metadata.\n";
+                        EXV_ERROR << "Failed to encode XMP metadata.\n";
 #endif
                     }
                 }
diff -Nru exiv2-0.19/src/pngimage.hpp exiv2-0.21/src/pngimage.hpp
--- exiv2-0.19/src/pngimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/pngimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -23,7 +23,7 @@
   @brief   PNG image, implemented using the following references:
            <a href="http://www.w3.org/TR/PNG/">PNG specification</a> by W3C<br>
            <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PNG.html">PNG tags list</a> by Phil Harvey<br>
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @author  Gilles Caulier (cgilles)
diff -Nru exiv2-0.19/src/preview.cpp exiv2-0.21/src/preview.cpp
--- exiv2-0.19/src/preview.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/preview.cpp	2010-11-06 14:57:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      preview.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2375 $
   Author(s): Vladimir Nadvornik (vn) <nadvornik@suse.cz>
   History:   18-Sep-08, vn: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: preview.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: preview.cpp 2375 2010-11-06 14:57:15Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -218,7 +218,7 @@
         //! Tag that contains image data. Possible values are "StripOffsets" or "TileOffsets"
         std::string offsetTag_;
 
-        //! Tag that contains data sizes. Possible values are "StripByteCountss" or "TileByteCounts"
+        //! Tag that contains data sizes. Possible values are "StripByteCounts" or "TileByteCounts"
         std::string sizeTag_;
 
         //! Structure that lists preview groups
@@ -247,21 +247,25 @@
         { 0,                   createLoaderExifDataJpeg, 4 },
         { 0,                   createLoaderExifDataJpeg, 5 },
         { 0,                   createLoaderExifDataJpeg, 6 },
-        { "image/x-raw",       createLoaderExifDataJpeg, 7 },
+        { 0,                   createLoaderExifDataJpeg, 7 },
+        { "image/x-raw",       createLoaderExifDataJpeg, 8 },
+        { 0,                   createLoaderExifDataJpeg, 9 },
         { 0,                   createLoaderTiff,         0 },
         { 0,                   createLoaderTiff,         1 },
         { 0,                   createLoaderTiff,         2 },
         { 0,                   createLoaderTiff,         3 },
         { 0,                   createLoaderTiff,         4 },
         { 0,                   createLoaderTiff,         5 },
+        { 0,                   createLoaderTiff,         6 },
         { 0,                   createLoaderExifJpeg,     0 },
         { 0,                   createLoaderExifJpeg,     1 },
         { 0,                   createLoaderExifJpeg,     2 },
         { 0,                   createLoaderExifJpeg,     3 },
         { 0,                   createLoaderExifJpeg,     4 },
         { 0,                   createLoaderExifJpeg,     5 },
-        { "image/x-canon-cr2", createLoaderExifJpeg,     6 },
-        { 0,                   createLoaderExifJpeg,     7 }
+        { 0,                   createLoaderExifJpeg,     6 },
+        { "image/x-canon-cr2", createLoaderExifJpeg,     7 },
+        { 0,                   createLoaderExifJpeg,     8 }
     };
 
     const LoaderExifJpeg::Param LoaderExifJpeg::param_[] = {
@@ -270,9 +274,10 @@
         { "Exif.SubImage2.JPEGInterchangeFormat", "Exif.SubImage2.JPEGInterchangeFormatLength", 0 }, // 2
         { "Exif.SubImage3.JPEGInterchangeFormat", "Exif.SubImage3.JPEGInterchangeFormatLength", 0 }, // 3
         { "Exif.SubImage4.JPEGInterchangeFormat", "Exif.SubImage4.JPEGInterchangeFormatLength", 0 }, // 4
-        { "Exif.Image2.JPEGInterchangeFormat",    "Exif.Image2.JPEGInterchangeFormatLength",    0 }, // 5
-        { "Exif.Image.StripOffsets",              "Exif.Image.StripByteCounts",                 0 }, // 6
-        { "Exif.OlympusCs.PreviewImageStart",     "Exif.OlympusCs.PreviewImageLength",            "Exif.MakerNote.Offset"}  // 7
+        { "Exif.SubThumb1.JPEGInterchangeFormat", "Exif.SubThumb1.JPEGInterchangeFormatLength", 0 }, // 5
+        { "Exif.Image2.JPEGInterchangeFormat",    "Exif.Image2.JPEGInterchangeFormatLength",    0 }, // 6
+        { "Exif.Image.StripOffsets",              "Exif.Image.StripByteCounts",                 0 }, // 7
+        { "Exif.OlympusCs.PreviewImageStart",     "Exif.OlympusCs.PreviewImageLength",          "Exif.MakerNote.Offset"}  // 8
     };
 
     const LoaderExifDataJpeg::Param LoaderExifDataJpeg::param_[] = {
@@ -280,10 +285,12 @@
         { "Exif.NikonPreview.JPEGInterchangeFormat", "Exif.NikonPreview.JPEGInterchangeFormatLength" }, // 1
         { "Exif.Pentax.PreviewOffset",               "Exif.Pentax.PreviewLength"                     }, // 2
         { "Exif.Minolta.ThumbnailOffset",            "Exif.Minolta.ThumbnailLength"                  }, // 3
-        { "Exif.Olympus.ThumbnailImage",             0                                               }, // 4
-        { "Exif.Olympus2.ThumbnailImage",            0                                               }, // 5
-        { "Exif.Minolta.Thumbnail",                  0                                               }, // 6
-        { "Exif.PanasonicRaw.PreviewImage",          0                                               }  // 7
+        { "Exif.SonyMinolta.ThumbnailOffset",        "Exif.SonyMinolta.ThumbnailLength"              }, // 4
+        { "Exif.Olympus.ThumbnailImage",             0                                               }, // 5
+        { "Exif.Olympus2.ThumbnailImage",            0                                               }, // 6
+        { "Exif.Minolta.Thumbnail",                  0                                               }, // 7
+        { "Exif.PanasonicRaw.PreviewImage",          0                                               }, // 8
+        { "Exif.SamsungPreview.JPEGInterchangeFormat", "Exif.SamsungPreview.JPEGInterchangeFormatLength" } // 9
     };
 
     const LoaderTiff::Param LoaderTiff::param_[] = {
@@ -292,7 +299,8 @@
         { "SubImage2", "Exif.SubImage2.NewSubfileType", "1" },  // 2
         { "SubImage3", "Exif.SubImage3.NewSubfileType", "1" },  // 3
         { "SubImage4", "Exif.SubImage4.NewSubfileType", "1" },  // 4
-        { "Thumbnail", 0,                               0   }   // 5
+        { "SubThumb1", "Exif.SubThumb1.NewSubfileType", "1" },  // 5
+        { "Thumbnail", 0,                               0   }   // 6
     };
 
     Loader::AutoPtr Loader::create(PreviewId id, const Image &image)
@@ -338,13 +346,13 @@
     {
         offset_ = 0;
         ExifData::const_iterator pos = image_.exifData().findKey(ExifKey(param_[parIdx].offsetKey_));
-        if (pos != image_.exifData().end()) {
+        if (pos != image_.exifData().end() && pos->count() > 0) {
             offset_ = pos->toLong();
         }
 
         size_ = 0;
         pos = image_.exifData().findKey(ExifKey(param_[parIdx].sizeKey_));
-        if (pos != image_.exifData().end()) {
+        if (pos != image_.exifData().end() && pos->count() > 0) {
             size_ = pos->toLong();
         }
 
@@ -352,7 +360,7 @@
 
         if (param_[parIdx].baseOffsetKey_) {
             pos = image_.exifData().findKey(ExifKey(param_[parIdx].baseOffsetKey_));
-            if (pos != image_.exifData().end()) {
+            if (pos != image_.exifData().end() && pos->count() > 0) {
                 offset_ += pos->toLong();
             }
         }
@@ -416,7 +424,7 @@
         }
         catch (const AnyError& /* error */ ) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Invalid JPEG preview image.\n";
+            EXV_WARNING << "Invalid JPEG preview image.\n";
 #endif
             return false;
         }
@@ -532,19 +540,19 @@
         if (pos == exifData.end()) return;
         if (offsetCount != pos->value().count()) return;
         for (int i = 0; i < offsetCount; i++) {
-            size_ += pos->value().toLong(i);
+            size_ += pos->toLong(i);
         }
 
         if (size_ == 0) return;
 
         pos = exifData.findKey(ExifKey(std::string("Exif.") + group_ + ".ImageWidth"));
-        if (pos != exifData.end()) {
-            width_ = pos->value().toLong();
+        if (pos != exifData.end() && pos->count() > 0) {
+            width_ = pos->toLong();
         }
 
         pos = exifData.findKey(ExifKey(std::string("Exif.") + group_ + ".ImageLength"));
-        if (pos != exifData.end()) {
-            height_ = pos->value().toLong();
+        if (pos != exifData.end() && pos->count() > 0) {
+            height_ = pos->toLong();
         }
 
         if (width_ == 0 || height_ == 0) return;
@@ -623,32 +631,34 @@
 
             const Value &sizes = preview["Exif.Image." + sizeTag_].value();
 
-            if (sizes.count() == 1) {
-                // this saves one copying of the buffer
-                uint32_t offset = dataValue.toLong(0);
-                uint32_t size = sizes.toLong(0);
-                if (offset + size <= static_cast<uint32_t>(io.size()))
-                    dataValue.setDataArea(base + offset, size);
-            }
-            else {
-                // FIXME: the buffer is probably copied twice, it should be optimized
-                DataBuf buf(size_);
-                Exiv2::byte* pos = buf.pData_;
-                for (int i = 0; i < sizes.count(); i++) {
-                    uint32_t offset = dataValue.toLong(i);
-                    uint32_t size = sizes.toLong(i);
+            if (sizes.count() == dataValue.count()) {
+                if (sizes.count() == 1) {
+                    // this saves one copying of the buffer
+                    uint32_t offset = dataValue.toLong(0);
+                    uint32_t size = sizes.toLong(0);
                     if (offset + size <= static_cast<uint32_t>(io.size()))
-                        memcpy(pos, base + offset, size);
-                    pos += size;
+                        dataValue.setDataArea(base + offset, size);
+                }
+                else {
+                    // FIXME: the buffer is probably copied twice, it should be optimized
+                    DataBuf buf(size_);
+                    Exiv2::byte* pos = buf.pData_;
+                    for (int i = 0; i < sizes.count(); i++) {
+                        uint32_t offset = dataValue.toLong(i);
+                        uint32_t size = sizes.toLong(i);
+                        if (offset + size <= static_cast<uint32_t>(io.size()))
+                            memcpy(pos, base + offset, size);
+                        pos += size;
+                    }
+                    dataValue.setDataArea(buf.pData_, buf.size_);
                 }
-                dataValue.setDataArea(buf.pData_, buf.size_);
             }
         }
 
         // write new image
         MemIo mio;
-        const IptcData emptyIptc;
-        const XmpData  emptyXmp;
+        IptcData emptyIptc;
+        XmpData  emptyXmp;
         TiffParser::encode(mio, 0, 0, Exiv2::littleEndian, preview, emptyIptc, emptyXmp);
         return DataBuf(mio.mmap(), mio.size());
     }
@@ -766,8 +776,8 @@
     PreviewPropertiesList PreviewManager::getPreviewProperties() const
     {
         PreviewPropertiesList list;
-        // go through the loader table and store all successfuly created loaders in the list
-        for (PreviewId id = 0; id < Loader::getNumLoaders(); id++) {
+        // go through the loader table and store all successfully created loaders in the list
+        for (PreviewId id = 0; id < Loader::getNumLoaders(); ++id) {
             Loader::AutoPtr loader = Loader::create(id, image_);
             if (loader.get() && loader->readDimensions()) {
                 list.push_back(loader->getProperties());
diff -Nru exiv2-0.19/src/preview.hpp exiv2-0.21/src/preview.hpp
--- exiv2-0.19/src/preview.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/preview.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    preview.hpp
   @brief   Classes to access all preview images embedded in an image.
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Vladimir Nadvornik (vn)
            <a href="mailto:nadvornik@suse.cz">nadvornik@suse.cz</a>
   @date    18-Sep-08, vn: created
diff -Nru exiv2-0.19/src/properties.cpp exiv2-0.21/src/properties.cpp
--- exiv2-0.19/src/properties.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/properties.cpp	2010-11-06 13:53:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,19 +20,19 @@
  */
 /*
   File:      properties.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2374 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
              Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
   History:   13-July-07, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: properties.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: properties.cpp 2374 2010-11-06 13:53:15Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "properties.hpp"
-#include "tags.hpp"
+#include "tags_int.hpp"
 #include "error.hpp"
 #include "types.hpp"
 #include "value.hpp"
@@ -57,7 +57,7 @@
             return 0 == strcmp(key_, key.c_str());
         }
 
-        const char* key_;               //!< XMP key
+        const char* key_;                      //!< XMP key
         Exiv2::PrintFct printFct_;             //!< Print function
     };
 
@@ -67,9 +67,12 @@
 // class member definitions
 namespace Exiv2 {
 
+    using namespace Internal;
+
     //! @cond IGNORE
     extern const XmpPropertyInfo xmpDcInfo[];
     extern const XmpPropertyInfo xmpDigikamInfo[];
+    extern const XmpPropertyInfo xmpKipiInfo[];
     extern const XmpPropertyInfo xmpXmpInfo[];
     extern const XmpPropertyInfo xmpXmpRightsInfo[];
     extern const XmpPropertyInfo xmpXmpMMInfo[];
@@ -86,11 +89,14 @@
     extern const XmpPropertyInfo xmpIptcInfo[];
     extern const XmpPropertyInfo xmpIptcExtInfo[];
     extern const XmpPropertyInfo xmpPlusInfo[];
+    extern const XmpPropertyInfo xmpMediaProInfo[];
+    extern const XmpPropertyInfo xmpExpressionMediaInfo[];
 
     extern const XmpNsInfo xmpNsInfo[] = {
         // Schemas   -   NOTE: Schemas which the XMP-SDK doesn't know must be registered in XmpParser::initialize - Todo: Automate this
         { "http://purl.org/dc/elements/1.1/",             "dc",             xmpDcInfo,        N_("Dublin Core schema")                        },
         { "http://www.digikam.org/ns/1.0/",               "digiKam",        xmpDigikamInfo,   N_("digiKam Photo Management schema")           },
+        { "http://www.digikam.org/ns/kipi/1.0/",          "kipi",           xmpKipiInfo,      N_("KDE Image Program Interface schema")        },
         { "http://ns.adobe.com/xap/1.0/",                 "xmp",            xmpXmpInfo,       N_("XMP Basic schema")                          },
         { "http://ns.adobe.com/xap/1.0/rights/",          "xmpRights",      xmpXmpRightsInfo, N_("XMP Rights Management schema")              },
         { "http://ns.adobe.com/xap/1.0/mm/",              "xmpMM",          xmpXmpMMInfo,     N_("XMP Media Management schema")               },
@@ -109,6 +115,8 @@
         { "http://iptc.org/std/Iptc4xmpExt/2008-02-29/",  "iptcExt",        xmpIptcExtInfo,   N_("IPTC Extension schema")                     },
                                                                                              // NOTE: It really should be 'Iptc4xmpExt' but following example above
         { "http://ns.useplus.org/ldf/xmp/1.0/",           "plus",           xmpPlusInfo,      N_("PLUS License Data Format schema")           },
+        { "http://ns.iview-multimedia.com/mediapro/1.0/", "mediapro",       xmpMediaProInfo,  N_("iView Media Pro schema")                    },
+        { "http://ns.microsoft.com/expressionmedia/1.0/", "expressionmedia",xmpExpressionMediaInfo, N_("Expression Media schema")             },
 
         // Structures
         { "http://ns.adobe.com/xap/1.0/g/",                   "xapG",    0, N_("Colorant structure")           },
@@ -127,7 +135,7 @@
     extern const XmpPropertyInfo xmpDcInfo[] = {
         { "contributor",      N_("Contributor"),      "bag ProperName",  xmpBag,       xmpExternal, N_("Contributors to the resource (other than the authors).")                               },
         { "coverage",         N_("Coverage"),         "Text",            xmpText,      xmpExternal, N_("The spatial or temporal topic of the resource, the spatial applicability of the "
-                                                                                                   "resource, or the jurisdiction under which the resource is relevant.")                      },
+                                                                                                       "resource, or the jurisdiction under which the resource is relevant.")                      },
         { "creator",          N_("Creator"),          "seq ProperName",  xmpSeq,       xmpExternal, N_("The authors of the resource (listed in order of precedence, if significant).")         },
         { "date",             N_("Date"),             "seq Date",        xmpSeq,       xmpExternal, N_("Date(s) that something interesting happened to the resource.")                         },
         { "description",      N_("Description"),      "Lang Alt",        langAlt,      xmpExternal, N_("A textual description of the content of the resource. Multiple values may be "
@@ -135,16 +143,16 @@
         { "format",           N_("Format"),           "MIMEType",        xmpText,      xmpInternal, N_("The file format used when saving the resource. Tools and applications should set "
                                                                                                        "this property to the save format of the data. It may include appropriate qualifiers.") },
         { "identifier",       N_("Identifier"),       "Text",            xmpText,      xmpExternal, N_("Unique identifier of the resource. Recommended best practice is to identify the "
-                                                                                                   "resource by means of a string conforming to a formal identification system.")              },
+                                                                                                       "resource by means of a string conforming to a formal identification system.")              },
         { "language",         N_("Language"),         "bag Locale",      xmpBag,       xmpInternal, N_("An unordered array specifying the languages used in the resource.")                    },
         { "publisher",        N_("Publisher"),        "bag ProperName",  xmpBag,       xmpExternal, N_("An entity responsible for making the resource available. Examples of a Publisher "
-                                                                                                   "include a person, an organization, or a service. Typically, the name of a Publisher "
-                                                       "should be used to indicate the entity.")                                               },
+                                                                                                       "include a person, an organization, or a service. Typically, the name of a Publisher "
+                                                                                                       "should be used to indicate the entity.")                                               },
         { "relation",         N_("Relation"),         "bag Text",        xmpBag,       xmpInternal, N_("Relationships to other documents. Recommended best practice is to identify the "
-                                                                                                   "related resource by means of a string conforming to a formal identification system.")      },
+                                                                                                       "related resource by means of a string conforming to a formal identification system.")      },
         { "rights",           N_("Rights"),           "Lang Alt",        langAlt,      xmpExternal, N_("Informal rights statement, selected by language. Typically, rights information "
-                                                                                                   "includes a statement about various property rights associated with the resource, "
-                                                       "including intellectual property rights.")                                              },
+                                                                                                       "includes a statement about various property rights associated with the resource, "
+                                                                                                       "including intellectual property rights.")                                              },
         { "source",           N_("Source"),           "Text",            xmpText,      xmpExternal, N_("Unique identifier of the work from which this resource was derived.")                  },
         { "subject",          N_("Subject"),          "bag Text",        xmpBag,       xmpExternal, N_("An unordered array of descriptive phrases or keywords that specify the topic of the "
                                                                                                        "content of the resource.")                                                             },
@@ -159,7 +167,15 @@
         { "TagsList",               N_("Tags List"),                 "seq Text", xmpSeq,  xmpExternal, N_("The list of complete tags path as string. The path hierarchy is separated by '/' character (ex.: \"City/Paris/Monument/Eiffel Tower\".") },
         { "CaptionsAuthorNames",    N_("Captions Author Names"),     "Lang Alt", langAlt, xmpExternal, N_("The list of all captions author names for each language alternative captions set in standard XMP tags.") },
         { "CaptionsDateTimeStamps", N_("Captions Date Time Stamps"), "Lang Alt", langAlt, xmpExternal, N_("The list of all captions date time stamps for each language alternative captions set in standard XMP tags.") },
+        { "ImageHistory",           N_("Image History"),             "Text",     xmpText, xmpExternal, N_("An XML based content to list all action processed on this image with image editor (as crop, rotate, color corrections, adjustements, etc.).") },
+        { "LensCorrectionSettings", N_("Lens Correction Settings"),  "Text",     xmpText, xmpExternal, N_("The list of Lens Correction tools settings used to fix lens distorsion. This include Batch Queue Manager and Image editor tools based on LensFun library.") },
+        // End of list marker
+        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
+    };
 
+    extern const XmpPropertyInfo xmpKipiInfo[] = {
+        { "EnfuseInputFiles",       N_("Enfuse Input Files"),        "Text",     xmpText, xmpExternal, N_("The list of files processed with Enfuse program through ExpoBlending tool.") },
+        { "EnfuseSettings",         N_("Enfuse Settings"),           "Text",     xmpText, xmpExternal, N_("The list of Enfuse settings used to blend image stack with ExpoBlending tool.") },
         // End of list marker
         { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
     };
@@ -901,6 +917,24 @@
         { "RE-REU", N_("Repeat Use")     }
     };
 
+    extern const XmpPropertyInfo xmpMediaProInfo[] = {
+        { "Event",       N_("Event"),       "Text",     xmpText, xmpExternal, N_("Fixture Identification")                          },
+        { "Status",      N_("Status"),      "Text",     xmpText, xmpExternal, N_("A notation making the image unique")              },
+        { "People",      N_("People"),      "bag Text", xmpBag,  xmpExternal, N_("Contact")                                         },
+        { "CatalogSets", N_("CatalogSets"), "bag Text", xmpBag,  xmpExternal, N_("Descriptive markers of catalog items by content") },
+        // End of list marker
+        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
+    };
+
+    extern const XmpPropertyInfo xmpExpressionMediaInfo[] = {
+        { "Event",       N_("Event"),       "Text",     xmpText, xmpExternal, N_("Fixture Identification")                          },
+        { "Status",      N_("Status"),      "Text",     xmpText, xmpExternal, N_("A notation making the image unique")              },
+        { "People",      N_("People"),      "bag Text", xmpBag,  xmpExternal, N_("Contact")                                         },
+        { "CatalogSets", N_("CatalogSets"), "bag Text", xmpBag,  xmpExternal, N_("Descriptive markers of catalog items by content") },
+        // End of list marker
+        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
+    };
+
     extern const XmpPrintInfo xmpPrintInfo[] = {
         {"Xmp.crs.CropUnits",                 EXV_PRINT_TAG(crsCropUnits)   },
         {"Xmp.exif.ApertureValue",            print0x9202                   },
@@ -1012,6 +1046,17 @@
         std::string ns2 = ns;
         if (   ns2.substr(ns2.size() - 1, 1) != "/"
             && ns2.substr(ns2.size() - 1, 1) != "#") ns2 += "/";
+        // Check if there is already a registered namespace with this prefix
+        const XmpNsInfo* xnp = lookupNsRegistry(XmpNsInfo::Prefix(prefix));
+        if (xnp) {
+#ifndef SUPPRESS_WARNINGS
+            if (strcmp(xnp->ns_, ns2.c_str()) != 0) {
+                EXV_WARNING << "Updating namespace URI for " << prefix << " from "
+                            << xnp->ns_ << " to " << ns2 << "\n";
+            }
+#endif
+            unregisterNs(xnp->ns_);
+        }
         // Allocated memory is freed when the namespace is unregistered.
         // Using malloc/free for better system compatibility in case
         // users don't unregister their namespaces explicitely.
@@ -1025,14 +1070,12 @@
         xn.xmpPropertyInfo_ = 0;
         xn.desc_ = "";
         nsRegistry_[ns2] = xn;
-        XmpParser::registerNs(ns2, prefix);
     }
 
     void XmpProperties::unregisterNs(const std::string& ns)
     {
         NsRegistry::iterator i = nsRegistry_.find(ns);
         if (i != nsRegistry_.end()) {
-            XmpParser::unregisterNs(ns);
             std::free(const_cast<char*>(i->second.prefix_));
             std::free(const_cast<char*>(i->second.ns_));
             nsRegistry_.erase(i);
@@ -1205,6 +1248,7 @@
     XmpKey& XmpKey::operator=(const XmpKey& rhs)
     {
         if (this == &rhs) return *this;
+        Key::operator=(rhs);
         *p_ = *rhs.p_;
         return *this;
     }
diff -Nru exiv2-0.19/src/properties.hpp exiv2-0.21/src/properties.hpp
--- exiv2-0.19/src/properties.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/properties.hpp	2010-11-06 13:53:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -23,7 +23,7 @@
   @brief   XMP property and type information.<BR>References:<BR>
   <a href="http://www.adobe.com/devnet/xmp/pdfs/xmp_specification.pdf">XMP Specification</a> from Adobe
   <I>(Property descriptions copied from the XMP specification with the permission of Adobe)</I>
-  @version $Rev: 1937 $
+  @version $Rev: 2374 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @author  Gilles Caulier (cgilles)
@@ -185,8 +185,8 @@
         /*!
           @brief Register namespace \em ns with preferred prefix \em prefix.
 
-          If the namespace is a known or previously registered namespace, the
-          prefix is overwritten.
+          If the prefix is a known or previously registered prefix, the
+          corresponding namespace URI is overwritten.
 
           @note This invalidates XMP keys generated with the previous prefix.
          */
@@ -209,11 +209,15 @@
           @note This invalidates XMP keys generated in any custom namespace.
          */
         static void unregisterNs();
-
-    private:
+        //! Type for the namespace registry
         typedef std::map<std::string, XmpNsInfo> NsRegistry;
+        /*!
+          @brief Get the registered namespace for a specific \em prefix from the registry.
+         */
         static const XmpNsInfo* lookupNsRegistry(const XmpNsInfo::Prefix& prefix);
-        static NsRegistry nsRegistry_;
+
+        // DATA
+        static NsRegistry nsRegistry_;          //! Namespace registry
 
     }; // class XmpProperties
 
diff -Nru exiv2-0.19/src/psdimage.cpp exiv2-0.21/src/psdimage.cpp
--- exiv2-0.19/src/psdimage.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/psdimage.cpp	2010-10-25 13:24:51.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      psdimage.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2370 $
   Author(s): Marco Piovanelli, Ovolab (marco)
              Michael Ulbrich (mul)
   History:   05-Mar-2007, marco: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: psdimage.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: psdimage.cpp 2370 2010-10-25 13:24:51Z ahuggel $")
 
 //#define DEBUG 1
 
@@ -259,7 +259,7 @@
                 if (io_->error() || io_->eof()) throw Error(14);
                 if (IptcParser::decode(iptcData_, rawIPTC.pData_, rawIPTC.size_)) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode IPTC metadata.\n";
+                    EXV_WARNING << "Failed to decode IPTC metadata.\n";
 #endif
                     iptcData_.clear();
                 }
@@ -275,7 +275,7 @@
                 setByteOrder(bo);
                 if (rawExif.size_ > 0 && byteOrder() == invalidByteOrder) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode Exif metadata.\n";
+                    EXV_WARNING << "Failed to decode Exif metadata.\n";
 #endif
                     exifData_.clear();
                 }
@@ -290,7 +290,7 @@
                 xmpPacket_.assign(reinterpret_cast<char *>(xmpPacket.pData_), xmpPacket.size_);
                 if (xmpPacket_.size() > 0 && XmpParser::decode(xmpData_, xmpPacket_)) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Warning: Failed to decode XMP metadata.\n";
+                    EXV_WARNING << "Failed to decode XMP metadata.\n";
 #endif
                 }
                 break;
@@ -363,7 +363,7 @@
         long toRead = 0;
         while (readTotal < colorDataLength) {
             toRead =   static_cast<long>(colorDataLength - readTotal) < lbuf.size_
-                     ? colorDataLength - readTotal : lbuf.size_;
+                     ? static_cast<long>(colorDataLength - readTotal) : lbuf.size_;
             if (io_->read(lbuf.pData_, toRead) != toRead) throw Error(3, "Photoshop");
             readTotal += toRead;
             if (outIo.write(lbuf.pData_, toRead) != toRead) throw Error(21);
@@ -419,24 +419,24 @@
             uint32_t curOffset = io_->tell();
 
             // Write IPTC_NAA resource block
-            if (   resourceId == kPhotoshopResourceID_IPTC_NAA
-                || (resourceId > kPhotoshopResourceID_IPTC_NAA && iptcDone == false)) {
+            if ((resourceId == kPhotoshopResourceID_IPTC_NAA  ||
+                 resourceId >  kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) {
                 newResLength += writeIptcData(iptcData_, outIo);
                 resourceSize = (resourceSize + 1) & ~1;    // adjust for padding
                 iptcDone = true;
             }
 
             // Write ExifInfo resource block
-            else if (   resourceId == kPhotoshopResourceID_ExifInfo
-                     || (resourceId > kPhotoshopResourceID_ExifInfo && exifDone == false)) {
+            else if ((resourceId == kPhotoshopResourceID_ExifInfo  ||
+                      resourceId >  kPhotoshopResourceID_ExifInfo) && exifDone == false) {
                 newResLength += writeExifData(exifData_, outIo);
                 resourceSize = (resourceSize + 1) & ~1;    // adjust for padding
                 exifDone = true;
             }
 
             // Write XMPpacket resource block
-            else if (   resourceId == kPhotoshopResourceID_XMPPacket
-                     || (resourceId > kPhotoshopResourceID_XMPPacket && xmpDone == false)) {
+            else if ((resourceId == kPhotoshopResourceID_XMPPacket  ||
+                      resourceId >  kPhotoshopResourceID_XMPPacket) && xmpDone == false) {
                 newResLength += writeXmpData(xmpData_, outIo);
                 resourceSize = (resourceSize + 1) & ~1;    // adjust for padding
                 xmpDone = true;
@@ -456,7 +456,7 @@
                 us2Data(buf, resourceId, bigEndian);
                 if (outIo.write(buf, 2) != 2) throw Error(21);
                 // Write resource name as Pascal string
-                buf[0] = resourceNameLength & 0x000f;
+                buf[0] = resourceNameLength & 0x00ff;
                 if (outIo.write(buf, 1) != 1) throw Error(21);
                 buf[0] = resourceNameFirstChar;
                 if (outIo.write(buf, 1) != 1) throw Error(21);
@@ -470,7 +470,7 @@
                 resourceSize = (resourceSize + 1) & ~1;        // pad to even
                 while (readTotal < resourceSize) {
                     toRead =   static_cast<long>(resourceSize - readTotal) < lbuf.size_
-                             ? resourceSize - readTotal : lbuf.size_;
+                             ? static_cast<long>(resourceSize - readTotal) : lbuf.size_;
                     if (io_->read(lbuf.pData_, toRead) != toRead) {
                         throw Error(3, "Photoshop");
                     }
@@ -608,7 +608,7 @@
         if (writeXmpFromPacket() == false) {
             if (XmpParser::encode(xmpPacket, xmpData) > 1) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Error: Failed to encode XMP metadata.\n";
+                EXV_ERROR << "Failed to encode XMP metadata.\n";
 #endif
             }
         }
diff -Nru exiv2-0.19/src/psdimage.hpp exiv2-0.21/src/psdimage.hpp
--- exiv2-0.19/src/psdimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/psdimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   @file    psdimage.hpp
   @brief   Photoshop image, implemented using the following references:
            <a href="http://www.fine-view.com/jp/lab/doc/ps6ffspecsv2.pdf">Adobe Photoshop 6.0 File Format Specification</a> by Adobe<br>
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Marco Piovanelli, Ovolab (marco)
            <a href="mailto:marco.piovanelli@pobox.com">marco.piovanelli@pobox.com</a>
   @author  Michael Ulbrich
diff -Nru exiv2-0.19/src/rafimage.cpp exiv2-0.21/src/rafimage.cpp
--- exiv2-0.19/src/rafimage.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/rafimage.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      rafimage.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   05-Feb-07, ahu: created
   Credits:   See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: rafimage.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: rafimage.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
diff -Nru exiv2-0.19/src/rafimage.hpp exiv2-0.21/src/rafimage.hpp
--- exiv2-0.19/src/rafimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/rafimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    rafimage.hpp
   @brief   Fujifilm RAW image
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    05-Feb-07, ahu: created
diff -Nru exiv2-0.19/src/rcsid.hpp exiv2-0.21/src/rcsid.hpp
--- exiv2-0.19/src/rcsid.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/rcsid.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    rcsid.hpp
-  @brief   Define an RCS id string in every object file compiled from a source
-           file that includes rcsid.hpp.
-
-  This is a simplified version of the ACE_RCSID macro that is used in the
-  <a href="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE(TM)</a> distribution.
-
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @date    02-Feb-04, ahu: created
- */
-#ifndef RCSID_HPP_
-#define RCSID_HPP_
-
-#if !defined (EXIV2_RCSID)
-/*!
-  @brief Macro to store version information in each object file.
-
-         Use this macro by including the following two lines at the beginning of
-         each *.cpp file.  See the ident(1) manual pages for more information.
-
-         @code
-         #include "rcsid.hpp"
-         EXIV2_RCSID("@(#) $Id$");
-         @endcode
-
-         The macro hack itself has the following purposes:
-         -# To define the RCS id string variable in the local namespace, so
-            that there won't be any duplicate extern symbols at link time.
-         -# To avoid warnings of the type "variable declared and never used".
-
- */
-#define EXIV2_RCSID(id) \
-    namespace { \
-        inline const char* getRcsId(const char*) { return id ; } \
-        const char* rcsId = getRcsId(rcsId); \
-    }
-
-#endif // #if !defined (EXIV2_RCSID)
-#endif // #ifndef RCSID_HPP_
diff -Nru exiv2-0.19/src/rcsid_int.hpp exiv2-0.21/src/rcsid_int.hpp
--- exiv2-0.19/src/rcsid_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/rcsid_int.hpp	2010-06-27 10:04:39.000000000 +0000
@@ -0,0 +1,62 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    rcsid_int.hpp
+  @brief   Define an RCS id string in every object file compiled from a source
+           file that includes rcsid_int.hpp.
+
+  This is a simplified version of the ACE_RCSID macro that is used in the
+  <a href="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE(TM)</a> distribution.
+
+  @version $Rev: 2286 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @date    02-Feb-04, ahu: created
+ */
+#ifndef RCSID_INT_HPP_
+#define RCSID_INT_HPP_
+
+#if !defined (EXIV2_RCSID)
+/*!
+  @brief Macro to store version information in each object file.
+
+         Use this macro by including the following two lines at the beginning of
+         each *.cpp file.  See the ident(1) manual pages for more information.
+
+         @code
+         #include "rcsid_int.hpp"
+         EXIV2_RCSID("@(#) $Id$");
+         @endcode
+
+         The macro hack itself has the following purposes:
+         -# To define the RCS id string variable in the local namespace, so
+            that there won't be any duplicate extern symbols at link time.
+         -# To avoid warnings of the type "variable declared and never used".
+
+ */
+#define EXIV2_RCSID(id) \
+    namespace { \
+        inline const char* getRcsId(const char*) { return id ; } \
+        const char* rcsId = getRcsId(rcsId); \
+    }
+
+#endif // #if !defined (EXIV2_RCSID)
+#endif // #ifndef RCSID_INT_HPP_
diff -Nru exiv2-0.19/src/rw2image.cpp exiv2-0.21/src/rw2image.cpp
--- exiv2-0.19/src/rw2image.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/rw2image.cpp	2010-10-01 14:09:47.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      rw2image.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2360 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   06-Jan-09, ahu: created
 
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: rw2image.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: rw2image.cpp 2360 2010-10-01 14:09:47Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -64,7 +64,7 @@
 
     std::string Rw2Image::mimeType() const
     {
-        return "image/x-raw";
+        return "image/x-panasonic-rw2";
     }
 
     int Rw2Image::pixelWidth() const
@@ -134,7 +134,7 @@
         // Todo: What if there are more preview images?
         if (list.size() > 1) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: RW2 image contains more than one preview. None used.\n";
+            EXV_WARNING << "RW2 image contains more than one preview. None used.\n";
 #endif
         }
         if (list.size() != 1) return;
@@ -143,7 +143,7 @@
         Image::AutoPtr image = ImageFactory::open(preview.pData(), preview.size());
         if (image.get() == 0) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to open RW2 preview image.\n";
+            EXV_WARNING << "Failed to open RW2 preview image.\n";
 #endif
             return;
         }
@@ -152,7 +152,7 @@
         if (!prevData.empty()) {
             // Filter duplicate tags
             for (ExifData::const_iterator pos = exifData_.begin(); pos != exifData_.end(); ++pos) {
-                if (pos->ifdId() == panaRawIfdId) continue;
+                if (pos->ifdId() == panaRawId) continue;
                 ExifData::iterator dup = prevData.findKey(ExifKey(pos->key()));
                 if (dup != prevData.end()) {
 #ifdef DEBUG
diff -Nru exiv2-0.19/src/rw2image.hpp exiv2-0.21/src/rw2image.hpp
--- exiv2-0.19/src/rw2image.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/rw2image.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    rw2image.hpp
   @brief   Class Rw2Image
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    06-Jan-09, ahu: created
diff -Nru exiv2-0.19/src/rw2image_int.hpp exiv2-0.21/src/rw2image_int.hpp
--- exiv2-0.19/src/rw2image_int.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/rw2image_int.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    rw2image_int.hpp
   @brief   Internal classes to support RW2 image format
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    06-Jan-09, ahu: created
diff -Nru exiv2-0.19/src/samsungmn.cpp exiv2-0.21/src/samsungmn.cpp
--- exiv2-0.19/src/samsungmn.cpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/samsungmn.cpp	2010-09-29 16:33:50.000000000 +0000
@@ -0,0 +1,135 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+  File:      samsungmn.cpp
+  Version:   $Rev: 2358 $
+  Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
+  History:   27-Sep-10, ahu: created
+ */
+// *****************************************************************************
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: samsungmn.cpp 2358 2010-09-29 16:33:50Z ahuggel $")
+
+// *****************************************************************************
+// included header files
+#include "types.hpp"
+#include "samsungmn_int.hpp"
+#include "tags_int.hpp"
+#include "value.hpp"
+#include "i18n.h"                // NLS support.
+
+// + standard includes
+#include <string>
+#include <sstream>
+#include <iomanip>
+#include <cassert>
+#include <cstring>
+
+// *****************************************************************************
+// class member definitions
+namespace Exiv2 {
+    namespace Internal {
+
+    //! LensType, tag 0xa003
+    extern const TagDetails samsung2LensType[] = {
+        { 1, N_("Samsung 30mm F2")                     },
+        { 2, N_("Samsung Zoom 18-55mm F3.5-5.6 OIS")   },
+        { 3, N_("Samsung Zoom 50-200mm F4-5.6 ED OIS") }
+    };
+
+    std::ostream& printPictureWizard(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() != 5 || value.typeId() != unsignedShort) {
+            return os << value;
+        }
+        return os <<  "Mode: " << value.toLong(0)
+                  << ", Col: " << value.toLong(1)
+                  << ", Sat: " << value.toLong(2) - 4
+                  << ", Sha: " << value.toLong(3) - 4
+                  << ", Con: " << value.toLong(4) - 4;
+    }
+
+    std::ostream& printCameraTemperature(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != signedRational) {
+            return os << value;
+        }
+        return os << value.toFloat() << " C";
+    }
+
+    std::ostream& printFocalLength35(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() != 1 || value.typeId() != unsignedLong) {
+            return os << value;
+        }
+        long length = value.toLong();
+        if (length == 0) {
+            os << _("Unknown");
+        }
+        else {
+            std::ostringstream oss;
+            oss.copyfmt(os);
+            os << std::fixed << std::setprecision(1) << length / 10.0 << " mm";
+            os.copyfmt(oss);
+        }
+        return os;
+    }
+
+    // Samsung MakerNote Tag Info
+    const TagInfo Samsung2MakerNote::tagInfo_[] = {
+        TagInfo(0x0001, "Version", N_("Version"), N_("Makernote version"),
+                samsung2Id, makerTags, undefined, -1, printExifVersion),
+        TagInfo(0x0021, "PictureWizard", N_("PictureWizard"), N_("Picture wizard"),
+                samsung2Id, makerTags, unsignedShort, -1, printPictureWizard),
+        TagInfo(0x0035, "Preview", N_("Pointer to a preview image"), N_("Offset to an IFD containing a preview image"),
+                samsung2Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0043, "CameraTemperature", N_("Camera Temperature"), N_("Camera temperature"),
+                samsung2Id, makerTags, signedRational, -1, printCameraTemperature),
+        TagInfo(0xa001, "FirmwareName", N_("Firmware Name"), N_("Firmware name"),
+                samsung2Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0xa003, "LensType", N_("Lens Type"), N_("Lens type"),
+                samsung2Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(samsung2LensType)),
+        TagInfo(0xa010, "SensorAreas", N_("Sensor Areas"), N_("Sensor areas"),
+                samsung2Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0xa013, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"),
+                samsung2Id, makerTags, signedRational, -1, print0x9204),
+        TagInfo(0xa014, "ISO", N_("ISO"), N_("ISO"),
+                samsung2Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0xa018, "ExposureTime", N_("Exposure Time"), N_("Exposure time"),
+                samsung2Id, makerTags, unsignedRational, -1, print0x829a),
+        TagInfo(0xa019, "FNumber", N_("FNumber"), N_("The F number."),
+                samsung2Id, makerTags, unsignedRational, -1, print0x829d),
+        TagInfo(0xa01a, "FocalLengthIn35mmFormat", N_("Focal Length In 35mm Format"), N_("Focal length in 35mm format"),
+                samsung2Id, makerTags, unsignedLong, -1, printFocalLength35),
+        TagInfo(0xa021, "WB_RGGBLevels", N_("WB RGGB Levels"), N_("WB RGGB levels"),
+                samsung2Id, makerTags, unsignedLong, -1, printValue),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownSamsung2MakerNoteTag)", "(UnknownSamsung2MakerNoteTag)",
+                N_("Unknown Samsung2MakerNote tag"),
+                samsung2Id, makerTags, undefined, -1, printValue)
+    };
+
+    const TagInfo* Samsung2MakerNote::tagList()
+    {
+        return tagInfo_;
+    }
+
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/samsungmn_int.hpp exiv2-0.21/src/samsungmn_int.hpp
--- exiv2-0.19/src/samsungmn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/samsungmn_int.hpp	2010-09-28 17:05:23.000000000 +0000
@@ -0,0 +1,65 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    samsungmn_int.hpp
+  @brief   Samsung makernote tags.<BR>References:<BR>
+  [1] <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a> by Phil Harvey
+  @version $Rev: 2357 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @date    27-Sep-10, ahu: created
+ */
+#ifndef SAMSUNGMN_INT_HPP_
+#define SAMSUNGMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+#include <memory>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Samsung cameras
+    class Samsung2MakerNote {
+    public:
+        //! Return read-only list of built-in Samsung tags
+        static const TagInfo* tagList();
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+
+    }; // class Samsung2MakerNote
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef SAMSUNGMN_INT_HPP_
diff -Nru exiv2-0.19/src/sigmamn.cpp exiv2-0.21/src/sigmamn.cpp
--- exiv2-0.19/src/sigmamn.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/sigmamn.cpp	2010-08-30 19:33:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,7 +20,7 @@
  */
 /*
   File:      sigmamn.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2336 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   02-Apr-04, ahu: created
   Credits:   Sigma and Foveon MakerNote implemented according to the specification
@@ -28,13 +28,14 @@
              <http://www.x3f.info/technotes/FileDocs/MakerNoteDoc.html>
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: sigmamn.cpp 1750 2009-02-16 14:30:51Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: sigmamn.cpp 2336 2010-08-30 19:33:07Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "sigmamn.hpp"
+#include "sigmamn_int.hpp"
+#include "tags_int.hpp"
 #include "value.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -48,81 +49,83 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
 
     // Sigma (Foveon) MakerNote Tag Info
     const TagInfo SigmaMakerNote::tagInfo_[] = {
         TagInfo(0x0002, "SerialNumber", N_("Serial Number"),
                 N_("Camera serial number"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0003, "DriveMode", N_("Drive Mode"),
                 N_("Drive mode"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0004, "ResolutionMode", N_("Resolution Mode"),
-                N_("Resolution mode"), sigmaIfdId, makerTags, asciiString, printValue),
+                N_("Resolution mode"),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0005, "AutofocusMode", N_("Autofocus Mode"),
                 N_("Autofocus mode"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0006, "FocusSetting", N_("Focus Setting"),
                 N_("Focus setting"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0007, "WhiteBalance", N_("White Balance"),
                 N_("White balance"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0008, "ExposureMode", N_("Exposure Mode"),
                 N_("Exposure mode"),
-                sigmaIfdId, makerTags, asciiString, print0x0008),
+                sigmaId, makerTags, asciiString, -1, print0x0008),
         TagInfo(0x0009, "MeteringMode", N_("Metering Mode"),
                 N_("Metering mode"),
-                sigmaIfdId, makerTags, asciiString, print0x0009),
+                sigmaId, makerTags, asciiString, -1, print0x0009),
         TagInfo(0x000a, "LensRange", N_("Lens Range"),
                 N_("Lens focal length range"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x000b, "ColorSpace", N_("Color Space"),
                 N_("Color space"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x000c, "Exposure", N_("Exposure"),
                 N_("Exposure"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x000d, "Contrast", N_("Contrast"),
                 N_("Contrast"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x000e, "Shadow", N_("Shadow"),
                 N_("Shadow"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x000f, "Highlight", N_("Highlight"),
                 N_("Highlight"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x0010, "Saturation", N_("Saturation"),
                 N_("Saturation"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x0011, "Sharpness", N_("Sharpness"),
                 N_("Sharpness"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x0012, "FillLight", N_("Fill Light"),
                 N_("X3 Fill light"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x0014, "ColorAdjustment", N_("Color Adjustment"),
                 N_("Color adjustment"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x0015, "AdjustmentMode", N_("Adjustment Mode"),
                 N_("Adjustment mode"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0016, "Quality", N_("Quality"),
                 N_("Quality"),
-                sigmaIfdId, makerTags, asciiString, printStripLabel),
+                sigmaId, makerTags, asciiString, -1, printStripLabel),
         TagInfo(0x0017, "Firmware", N_("Firmware"),
                 N_("Firmware"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0018, "Software", N_("Software"),
                 N_("Software"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         TagInfo(0x0019, "AutoBracket", N_("Auto Bracket"),
                 N_("Auto bracket"),
-                sigmaIfdId, makerTags, asciiString, printValue),
+                sigmaId, makerTags, asciiString, -1, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownSigmaMakerNoteTag)", "(UnknownSigmaMakerNoteTag)",
                 N_("Unknown SigmaMakerNote tag"),
-                sigmaIfdId, makerTags, invalidTypeId, printValue)
+                sigmaId, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* SigmaMakerNote::tagList()
@@ -170,4 +173,4 @@
         return os;
     }
 
-}                                       // namespace Exiv2
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/sigmamn.hpp exiv2-0.21/src/sigmamn.hpp
--- exiv2-0.19/src/sigmamn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/sigmamn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    sigmamn.hpp
-  @brief   Sigma and Foveon MakerNote implemented according to the specification
-           <a href="http://www.x3f.info/technotes/FileDocs/MakerNoteDoc.html">
-           SIGMA and FOVEON EXIF MakerNote Documentation</a> by Foveon.
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @date    02-Apr-04, ahu: created
- */
-#ifndef SIGMAMN_HPP_
-#define SIGMAMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <iosfwd>
-#include <memory>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Sigma (Foveon) cameras
-    class EXIV2API SigmaMakerNote {
-    public:
-        //! Return read-only list of built-in Sigma tags
-        static const TagInfo* tagList();
-
-        //! @name Print functions for Sigma (Foveon) %MakerNote tags
-        //@{
-        //! Strip the label from the value and print the remainder
-        static std::ostream& printStripLabel(std::ostream& os, const Value& value, const ExifData*);
-        //! Print exposure mode
-        static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
-        //! Print metering mode
-        static std::ostream& print0x0009(std::ostream& os, const Value& value, const ExifData*);
-        //@}
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-
-    }; // class SigmaMakerNote
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef SIGMAMN_HPP_
diff -Nru exiv2-0.19/src/sigmamn_int.hpp exiv2-0.21/src/sigmamn_int.hpp
--- exiv2-0.19/src/sigmamn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/sigmamn_int.hpp	2010-08-14 02:50:44.000000000 +0000
@@ -0,0 +1,76 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    sigmamn_int.hpp
+  @brief   Sigma and Foveon MakerNote implemented according to the specification
+           <a href="http://www.x3f.info/technotes/FileDocs/MakerNoteDoc.html">
+           SIGMA and FOVEON EXIF MakerNote Documentation</a> by Foveon.
+  @version $Rev: 2313 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @date    02-Apr-04, ahu: created
+ */
+#ifndef SIGMAMN_INT_HPP_
+#define SIGMAMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+#include <memory>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Sigma (Foveon) cameras
+    class SigmaMakerNote {
+    public:
+        //! Return read-only list of built-in Sigma tags
+        static const TagInfo* tagList();
+
+        //! @name Print functions for Sigma (Foveon) %MakerNote tags
+        //@{
+        //! Strip the label from the value and print the remainder
+        static std::ostream& printStripLabel(std::ostream& os, const Value& value, const ExifData*);
+        //! Print exposure mode
+        static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
+        //! Print metering mode
+        static std::ostream& print0x0009(std::ostream& os, const Value& value, const ExifData*);
+        //@}
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+
+    }; // class SigmaMakerNote
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef SIGMAMN_INT_HPP_
diff -Nru exiv2-0.19/src/sonymn.cpp exiv2-0.21/src/sonymn.cpp
--- exiv2-0.19/src/sonymn.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/sonymn.cpp	2010-09-10 16:36:33.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,18 +20,20 @@
  */
 /*
   File:      sonymn.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2346 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   18-Apr-05, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: sonymn.cpp 1750 2009-02-16 14:30:51Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: sonymn.cpp 2346 2010-09-10 16:36:33Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
-#include "sonymn.hpp"
+#include "minoltamn_int.hpp"
+#include "sonymn_int.hpp"
+#include "tags_int.hpp"
 #include "value.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -45,40 +47,392 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
+    namespace Internal {
+
+    // -- Standard Sony Makernotes tags ---------------------------------------------------------------
+
+    //! Lookup table to translate Sony Auto HDR values to readable labels
+    extern const TagDetails sonyHDRMode[] = {
+        { 0x00000, N_("Off")   },
+        { 0x10001, N_("Auto")  },
+        { 0x10010, "1"         },
+        { 0x10012, "2"         },
+        { 0x10014, "3"         },
+        { 0x10016, "4"         },
+        { 0x10018, "5"         }
+    };
+
+    //! Lookup table to translate Sony model ID values to readable labels
+    extern const TagDetails sonyModelId[] = {
+        { 2,   "DSC-R1"    },
+        { 256, "DSLR-A100" },
+        { 257, "DSLR-A900" },
+        { 258, "DSLR-A700" },
+        { 259, "DSLR-A200" },
+        { 260, "DSLR-A350" },
+        { 261, "DSLR-A300" },
+        { 263, "DSLR-A380" },
+        { 264, "DSLR-A330" },
+        { 265, "DSLR-A230" },
+        { 269, "DSLR-A850" },
+        { 273, "DSLR-A550" },
+        { 274, "DSLR-A500" },
+        { 275, "DSLR-A450" },
+        { 278, "NEX-5"     },
+        { 279, "NEX-3"     }
+    };
+
+    //! Lookup table to translate Sony dynamic range optimizer values to readable labels
+    extern const TagDetails print0xb025[] = {
+        { 0,  N_("Off")           },
+        { 1,  N_("Standard ")     },
+        { 2,  N_("Advanced Auto") },
+        { 3,  N_("Auto")          },
+        { 8,  N_("Advanced Lv1")  },
+        { 9,  N_("Advanced Lv2")  },
+        { 10, N_("Advanced Lv3")  },
+        { 11, N_("Advanced Lv4")  },
+        { 12, N_("Advanced Lv5")  },
+        { 16, "1"                 },
+        { 17, "2"                 },
+        { 18, "3"                 },
+        { 19, "4"                 },
+        { 20, "5"                 }
+    };
+
+    //! Lookup table to translate Sony exposure mode values to readable labels
+    extern const TagDetails sonyExposureMode[] = {
+        { 0,     N_("Auto")                     },
+        { 1,     N_("Portrait")                 },
+        { 2,     N_("Beach")                    },
+        { 4,     N_("Snow")                     },
+        { 5,     N_("Landscape ")               },
+        { 6,     N_("Program")                  },
+        { 7,     N_("Aperture priority")        },
+        { 8,     N_("Shutter priority")         },
+        { 9,     N_("Night Scene / Twilight")   },
+        { 10,    N_("Hi-Speed Shutter")         },
+        { 11,    N_("Twilight Portrait")        },
+        { 12,    N_("Soft Snap")                },
+        { 13,    N_("Fireworks")                },
+        { 14,    N_("Smile Shutter")            },
+        { 15,    N_("Manual")                   },
+        { 18,    N_("High Sensitivity")         },
+        { 20,    N_("Advanced Sports Shooting") },
+        { 29,    N_("Underwater")               },
+        { 33,    N_("Gourmet")                  },
+        { 34,    N_("Panorama")                 },
+        { 35,    N_("Handheld Twilight")        },
+        { 36,    N_("Anti Motion Blur")         },
+        { 37,    N_("Pet")                      },
+        { 38,    N_("Backlight Correction HDR") },
+        { 65535, N_("n/a")                      }
+    };
+
+    //! Lookup table to translate Sony JPEG Quality values to readable labels
+    extern const TagDetails sonyJPEGQuality[] = {
+        { 0,     N_("Normal") },
+        { 1,     N_("Fine")   },
+        { 65535, N_("n/a")    }
+    };
+
+    //! Lookup table to translate Sony anti-blur values to readable labels
+    extern const TagDetails sonyAntiBlur[] = {
+        { 0,     N_("Off")             },
+        { 1,     N_("On (Continuous)") },
+        { 2,     N_("On (Shooting)")   },
+        { 65535, N_("n/a")             }
+    };
+
+    //! Lookup table to translate Sony dynamic range optimizer values to readable labels
+    extern const TagDetails print0xb04f[] = {
+        { 0, N_("Off")      },
+        { 1, N_("Standard") },
+        { 2, N_("Plus")     }
+    };
+
+    //! Lookup table to translate Sony Intelligent Auto values to readable labels
+    extern const TagDetails sonyIntelligentAuto[] = {
+        { 0, N_("Off")      },
+        { 1, N_("On")       },
+        { 2, N_("Advanced") }
+    };
+
+    //! Lookup table to translate Sony WB values to readable labels
+    extern const TagDetails sonyWhiteBalance[] = {
+        { 0,  N_("Auto")                       },
+        { 4,  N_("Manual")                     },
+        { 5,  N_("Daylight")                   },
+        { 6,  N_("Cloudy")                     },
+        { 7,  N_("White Flourescent")          },
+        { 8,  N_("Cool White Flourescent")     },
+        { 9,  N_("Day White Flourescent")      },
+        { 14, N_("Incandescent")               },
+        { 15, N_("Flash")                      },
+        { 17, N_("Underwater 1 (Blue Water)")  },
+        { 18, N_("Underwater 2 (Green Water)") }
+    };
+
+    //! Lookup table to translate Sony AF mode values to readable labels
+    extern const TagDetails sonyFocusMode[] = {
+        { 1,     "AF-S"             },
+        { 2,     "AF-C"             },
+        { 4,     N_("Permanent-AF") },
+        { 65535, N_("n/a")          }
+    };
+
+    //! Lookup table to translate Sony AF mode values to readable labels
+    extern const TagDetails sonyAFMode[] = {
+        { 0,     N_("Default")          },
+        { 1,     N_("Multi AF")         },
+        { 2,     N_("Center AF")        },
+        { 3,     N_("Spot AF")          },
+        { 4,     N_("Flexible Spot AF") },
+        { 6,     N_("Touch AF")         },
+        { 14,    N_("Manual Focus")     },
+        { 15,    N_("Face Detected")    },
+        { 65535, N_("n/a")              }
+    };
+
+    //! Lookup table to translate Sony AF illuminator values to readable labels
+    extern const TagDetails sonyAFIlluminator[] = {
+        { 0,     N_("Off") },
+        { 1,     N_("Auto")  },
+        { 65535, N_("n/a") }
+    };
+
+    //! Lookup table to translate Sony macro mode values to readable labels
+    extern const TagDetails sonyMacroMode[] = {
+        { 0,     N_("Off")         },
+        { 1,     N_("On")          },
+        { 2,     N_("Close Focus") },
+        { 65535, N_("n/a")         }
+    };
+
+    //! Lookup table to translate Sony flash level values to readable labels
+    extern const TagDetails sonyFlashLevel[] = {
+        { -32768, N_("Low")    },
+        { -1,     N_("n/a")    },
+        { 0,      N_("Normal") },
+        { 32767,  N_("High")   }
+    };
+
+    //! Lookup table to translate Sony release mode values to readable labels
+    extern const TagDetails sonyReleaseMode[] = {
+        { 0,     N_("Normal")                   },
+        { 2,     N_("Burst")                    },
+        { 5,     N_("Exposure Bracketing")      },
+        { 6,     N_("White Balance Bracketing") },
+        { 65535, N_("n/a")                      }
+    };
+
+    //! Lookup table to translate Sony sequence number values to readable labels
+    extern const TagDetails sonySequenceNumber[] = {
+        { 0,     N_("Single")                    },
+        { 65535, N_("n/a")                       }
+    };
+
+    //! Lookup table to translate Sony long exposure noise reduction values to readable labels
+    extern const TagDetails sonyLongExposureNoiseReduction[] = {
+        { 0,     N_("Off") },
+        { 1,     N_("On")  },
+        { 65535, N_("n/a") }
+    };
+
+    std::ostream& SonyMakerNote::print0xb000(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() != 4)
+        {
+            os << "(" << value << ")";
+        }
+        else
+        {
+            std::string val = value.toString(0) + value.toString(1) + value.toString(2) + value.toString(3);
+            if      (val == "0002") os << "JPEG";
+            else if (val == "1000") os << "SR2";
+            else if (val == "2000") os << "ARW 1.0";
+            else if (val == "3000") os << "ARW 2.0";
+            else if (val == "3100") os << "ARW 2.1";
+            else if (val == "3200") os << "ARW 2.2";
+            else                    os << "(" << value << ")";
+        }
+        return os;
+    }
+
+    std::ostream& SonyMakerNote::printImageSize(std::ostream& os, const Value& value, const ExifData*)
+    {
+        if (value.count() == 2)
+            os << value.toString(0) << " x " << value.toString(1);
+        else
+            os << "(" << value << ")";
+
+        return os;
+    }
 
     // Sony MakerNote Tag Info
     const TagInfo SonyMakerNote::tagInfo_[] = {
-        TagInfo(0x2000, "0x2000", "0x2000",
+        TagInfo(0x0102, "Quality", N_("Image Quality"),
+                N_("Image quality"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonyImageQuality),
+        TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"),
+                N_("Flash exposure compensation in EV"),
+                sony1Id, makerTags, signedRational, -1, print0x9204),
+        TagInfo(0x0105, "Teleconverter", N_("Teleconverter Model"),
+                N_("Teleconverter Model"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonyTeleconverterModel),
+        TagInfo(0x0112, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
+                N_("White Balance Fine Tune Value"),
+                sony1Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x0114, "CameraSettings", N_("Camera Settings"),
+                N_("Camera Settings"),
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0115, "WhiteBalance", N_("White Balance"),
+                N_("White balance"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonyWhiteBalanceStd),
+        TagInfo(0x0116, "0x0116", "0x0116",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9001, "0x9001", "0x9001",
-                N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9002, "0x9002", "0x9002",
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x0E00, "PrintIM", N_("Print IM"),
+                N_("PrintIM information"),
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x1000, "MultiBurstMode", N_("Multi Burst Mode"),
+                N_("Multi Burst Mode"),
+                sony1Id, makerTags, undefined, -1, printMinoltaSonyBoolValue),
+        TagInfo(0x1001, "MultiBurstImageWidth", N_("Multi Burst Image Width"),
+                N_("Multi Burst Image Width"),
+                sony1Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x1002, "MultiBurstImageHeight", N_("Multi Burst Image Height"),
+                N_("Multi Burst Image Height"),
+                sony1Id, makerTags, unsignedShort, -1, printValue),
+        // TODO : Implement Panorama tags decoding.
+        TagInfo(0x1003, "Panorama", N_("Panorama"),
+                N_("Panorama"),
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x2000, "0x2000", "0x2000",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9003, "0x9003", "0x9003",
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x2001, "PreviewImage", N_("Preview Image"),
+                N_("JPEG preview image"),
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x2002, "0x2002", "0x2002",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9004, "0x9004", "0x9004",
+                sony1Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0x2003, "0x2003", "0x2003",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9005, "0x9005", "0x9005",
+                sony1Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0x2004, "Contrast", "Contrast",
+                N_("Contrast"),
+                sony1Id, makerTags, signedLong, -1, printValue),
+        TagInfo(0x2005, "Saturation", "Saturation",
+                N_("Saturation"),
+                sony1Id, makerTags, signedLong, -1, printValue),
+        TagInfo(0x2006, "0x2006", "0x2006",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9006, "0x9006", "0x9006",
+                sony1Id, makerTags, signedLong, -1, printValue),
+        TagInfo(0x2007, "0x2007", "0x2007",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9007, "0x9007", "0x9007",
+                sony1Id, makerTags, signedLong, -1, printValue),
+        TagInfo(0x2008, "0x2008", "0x2008",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
-        TagInfo(0x9008, "0x9008", "0x9008",
+                sony1Id, makerTags, signedLong, -1, printValue),
+        TagInfo(0x2009, "0x2009", "0x2009",
                 N_("Unknown"),
-                sonyIfdId, makerTags, undefined, printValue),
+                sony1Id, makerTags, unsignedShort, -1, printValue),
+        TagInfo(0x200A, "AutoHDR", N_("Auto HDR"),
+                N_("High Definition Range Mode"),
+                sony1Id, makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyHDRMode)),
+        // TODO : Implement Shot Info tags decoding.
+        TagInfo(0x3000, "ShotInfo", N_("Shot Info"),
+                N_("Shot Information"),
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0xB000, "FileFormat", N_("File Format"),
+                N_("File Format"),
+                sony1Id, makerTags, unsignedByte, -1, print0xb000),
+        TagInfo(0xB001, "SonyModelID", N_("Sony Model ID"),
+                N_("Sony Model ID"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyModelId)),
+        TagInfo(0xB020, "ColorReproduction", N_("Color Reproduction"),
+                N_("Color Reproduction"),
+                sony1Id, makerTags, asciiString, -1, printValue),
+        TagInfo(0xb021, "ColorTemperature", N_("Color Temperature"),
+                N_("Color Temperature"),
+                sony1Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0xB022, "ColorCompensationFilter", N_("Color Compensation Filter"),
+                N_("Color Compensation Filter: negative is green, positive is magenta"),
+                sony1Id, makerTags, unsignedLong, -1, printValue),
+        TagInfo(0xB023, "SceneMode", N_("Scene Mode"),
+                N_("Scene Mode"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonySceneMode),
+        TagInfo(0xB024, "ZoneMatching", N_("Zone Matching"),
+                N_("Zone Matching"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonyZoneMatching),
+        TagInfo(0xB025, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
+                N_("Dynamic Range Optimizer"),
+                sony1Id, makerTags, unsignedLong, -1, EXV_PRINT_TAG(print0xb025)),
+        TagInfo(0xB026, "ImageStabilization", N_("Image Stabilization"),
+                N_("Image stabilization"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonyBoolValue),
+        TagInfo(0xB027, "LensID", N_("Lens ID"),
+                N_("Lens identifier"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonyLensID),
+        TagInfo(0xB028, "MinoltaMakerNote", N_("Minolta MakerNote"),
+                N_("Minolta MakerNote"),
+                sony1Id, makerTags, undefined, -1, printValue),
+        TagInfo(0xB029, "ColorMode", N_("Color Mode"),
+                N_("Color Mode"),
+                sony1Id, makerTags, unsignedLong, -1, printMinoltaSonyColorMode),
+        TagInfo(0xB02B, "FullImageSize", N_("Full Image Size"),
+                N_("Full Image Size"),
+                sony1Id, makerTags, unsignedLong, -1, printImageSize),
+        TagInfo(0xB02C, "PreviewImageSize", N_("Preview Image Size"),
+                N_("Preview image size"),
+                sony1Id, makerTags, unsignedLong, -1, printImageSize),
+        TagInfo(0xB040, "Macro", N_("Macro"),
+                N_("Macro"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyMacroMode)),
+        TagInfo(0xB041, "ExposureMode", N_("Exposure Mode"),
+                N_("Exposure Mode"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyExposureMode)),
+        TagInfo(0xB042, "FocusMode", N_("Focus Mode"),
+                N_("Focus Mode"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyFocusMode)),
+        TagInfo(0xB043, "AFMode", N_("AF Mode"),
+                N_("AF Mode"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAFMode)),
+        TagInfo(0xB044, "AFIlluminator", N_("AF Illuminator"),
+                N_("AF Illuminator"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAFIlluminator)),
+        TagInfo(0xB047, "JPEGQuality", N_("JPEG Quality"),
+                N_("JPEG Quality"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyJPEGQuality)),
+        TagInfo(0xB048, "FlashLevel", N_("Flash Level"),
+                N_("Flash Level"),
+                sony1Id, makerTags, signedShort, -1, EXV_PRINT_TAG(sonyFlashLevel)),
+        TagInfo(0xB049, "ReleaseMode", N_("Release Mode"),
+                N_("Release Mode"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyReleaseMode)),
+        TagInfo(0xB04A, "SequenceNumber", N_("Sequence Number"),
+                N_("Shot number in continous burst mode"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonySequenceNumber)),
+        TagInfo(0xB04B, "AntiBlur", N_("Anti-Blur"),
+                N_("Anti-Blur"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAntiBlur)),
+        TagInfo(0xB04E, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"),
+                N_("Long Exposure Noise Reduction"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyLongExposureNoiseReduction)),
+        TagInfo(0xB04F, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"),
+                N_("Dynamic Range Optimizer"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(print0xb04f)),
+        TagInfo(0xB052, "IntelligentAuto", N_("Intelligent Auto"),
+                N_("Intelligent Auto"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyIntelligentAuto)),
+        TagInfo(0xB054, "WhiteBalance2", N_("White Balance 2"),
+                N_("White balance 2"),
+                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyWhiteBalance)),
         // End of list marker
-        TagInfo(0xffff, "(UnknownSonyMakerNoteTag)", "(UnknownSonyMakerNoteTag)",
-                N_("Unknown SonyMakerNote tag"),
-                sonyIfdId, makerTags, invalidTypeId, printValue)
+        TagInfo(0xffff, "(UnknownSony1MakerNoteTag)", "(UnknownSony1MakerNoteTag)",
+                N_("Unknown Sony1MakerNote tag"),
+                sony1Id, makerTags, asciiString, -1, printValue)
     };
 
     const TagInfo* SonyMakerNote::tagList()
@@ -86,4 +440,289 @@
         return tagInfo_;
     }
 
-}                                       // namespace Exiv2
+    // -- Sony camera settings ---------------------------------------------------------------
+
+    //! Lookup table to translate Sony camera settings drive mode values to readable labels
+    extern const TagDetails sonyDriveModeStd[] = {
+        { 1,  N_("Single Frame")                     },
+        { 2,  N_("Continuous High")                  },
+        { 4,  N_("Self-timer 10 sec")                },
+        { 5,  N_("Self-timer 2 sec")                 },
+        { 7,  N_("Continuous Bracketing")            },
+        { 12, N_("Continuous Low")                   },
+        { 18, N_("White Balance Bracketing Low")     },
+        { 19, N_("D-Range Optimizer Bracketing Low") },
+        { 19, N_("D-Range Optimizer Bracketing Low") } // To silence compiler warning
+    };
+
+    //! Lookup table to translate Sony camera settings focus mode values to readable labels
+    extern const TagDetails sonyCSFocusMode[] = {
+        { 0, N_("Manual") },
+        { 1, "AF-S"       },
+        { 2, "AF-C"       },
+        { 3, "AF-A"       }
+    };
+
+    //! Lookup table to translate Sony camera settings metering mode values to readable labels
+    extern const TagDetails sonyMeteringMode[] = {
+        { 1, N_("Multi-segment")           },
+        { 2, N_("Center weighted average") },
+        { 4, N_("Spot")                    }
+    };
+
+    //! Lookup table to translate Sony camera settings creative style values to readable labels
+    extern const TagDetails sonyCreativeStyle[] = {
+        { 1,    N_("Standard")            },
+        { 2,    N_("Vivid")               },
+        { 3,    N_("Portrait")            },
+        { 4,    N_("Landscape")           },
+        { 5,    N_("Sunset")              },
+        { 6,    N_("Night View/Portrait") },
+        { 8,    N_("Black & White")       },
+        { 9,    N_("Adobe RGB")           },
+        { 11,   N_("Neutral")             },
+        { 12,   N_("Clear")               },
+        { 13,   N_("Deep")                },
+        { 14,   N_("Light")               },
+        { 15,   N_("Autumn")              },
+        { 16,   N_("Sepia")               }
+    };
+
+    //! Lookup table to translate Sony camera settings flash mode values to readable labels
+    extern const TagDetails sonyFlashMode[] = {
+        { 0, N_("ADI") },
+        { 1, N_("TTL") },
+    };
+
+    //! Lookup table to translate Sony AF illuminator values to readable labels
+    extern const TagDetails sonyAFIlluminatorCS[] = {
+        { 0, N_("Auto") },
+        { 1, N_("Off")  }
+    };
+
+    //! Lookup table to translate Sony camera settings image style values to readable labels
+    extern const TagDetails sonyImageStyle[] = {
+        { 1,    N_("Standard")      },
+        { 2,    N_("Vivid")         },
+        { 9,    N_("Adobe RGB")     },
+        { 11,   N_("Neutral")       },
+        { 129,  N_("StyleBox1")     },
+        { 130,  N_("StyleBox1")     },
+        { 131,  N_("StyleBox1")     }
+    };
+
+    //! Lookup table to translate Sony camera settings exposure program values to readable labels
+    extern const TagDetails sonyExposureProgram[] = {
+        { 0,    N_("Auto")                      },
+        { 1,    N_("Manual")                    },
+        { 2,    N_("Program AE")                },
+        { 3,    N_("Aperture-priority AE")      },
+        { 4,    N_("Shutter speed priority AE") },
+        { 8,    N_("Program Shift A")           },
+        { 9,    N_("Program Shift S")           },
+        { 16,   N_("Portrait")                  },
+        { 17,   N_("Sports")                    },
+        { 18,   N_("Sunset")                    },
+        { 19,   N_("Night Portrait")            },
+        { 20,   N_("Landscape")                 },
+        { 21,   N_("Macro")                     },
+        { 35,   N_("Auto No Flash")             }
+    };
+
+    //! Lookup table to translate Sony camera settings image size values to readable labels
+    extern const TagDetails sonyImageSize[] = {
+        { 1, N_("Large")  },
+        { 2, N_("Medium") },
+        { 3, N_("Small")  }
+    };
+
+    //! Lookup table to translate Sony aspect ratio values to readable labels
+    extern const TagDetails sonyAspectRatio[] = {
+        { 1, "3:2"   },
+        { 2, "16:9"  }
+    };
+
+    //! Lookup table to translate Sony exposure level increments values to readable labels
+    extern const TagDetails sonyExposureLevelIncrements[] = {
+        { 33, "1/3 EV" },
+        { 50, "1/2 EV" }
+    };
+
+    // Sony Camera Settings Tag Info
+    // NOTE: all are for A200, A230, A300, A350, A700, A850 and A900 Sony model excepted
+    // some entries which are only relevant with A700.
+
+    // Warnings: Exiftool database give a list of tags shorted in decimal mode, not hexadecimal.
+
+    const TagInfo SonyMakerNote::tagInfoCs_[] = {
+        // NOTE: A700 only
+        TagInfo(0x0004, "DriveMode", N_("Drive Mode"),
+                N_("Drive Mode"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyDriveModeStd)),
+        // NOTE: A700 only
+        TagInfo(0x0006, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
+                N_("White Balance Fine Tune"),
+                sony1CsId, makerTags, signedShort, 1, printValue),
+        TagInfo(0x0010, "FocusMode", N_("Focus Mode"),
+                N_("Focus Mode"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyCSFocusMode)),
+        TagInfo(0x0011, "AFAreaMode", N_("AF Area Mode"),
+                N_("AF Area Mode"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyAFAreaMode),
+        TagInfo(0x0012, "LocalAFAreaPoint", N_("Local AF Area Point"),
+                N_("Local AF Area Point"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyLocalAFAreaPoint),
+        TagInfo(0x0015, "MeteringMode", N_("Metering Mode"),
+                N_("Metering Mode"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyMeteringMode)),
+        TagInfo(0x0016, "ISOSetting", N_("ISO Setting"),
+                N_("ISO Setting"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0018, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"),
+                N_("Dynamic Range Optimizer Mode"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyDynamicRangeOptimizerMode),
+        TagInfo(0x0019, "DynamicRangeOptimizerLevel", N_("Dynamic Range Optimizer Level"),
+                N_("Dynamic Range Optimizer Level"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001A, "CreativeStyle", N_("Creative Style"),
+                N_("Creative Style"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyCreativeStyle)),
+        TagInfo(0x001C, "Sharpness", N_("Sharpness"),
+                N_("Sharpness"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001D, "Contrast", N_("Contrast"),
+                N_("Contrast"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001E, "Saturation", N_("Saturation"),
+                N_("Saturation"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001F, "ZoneMatchingValue", N_("Zone Matching Value"),
+                N_("Zone Matching Value"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0022, "Brightness", N_("Brightness"),
+                N_("Brightness"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0023, "FlashMode", N_("FlashMode"),
+                N_("FlashMode"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFlashMode)),
+        // NOTE: A700 only
+        TagInfo(0x0028, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"),
+                N_("Priority Setup Shutter Release"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyPrioritySetupShutterRelease),
+        // NOTE: A700 only
+        TagInfo(0x0029, "AFIlluminator", N_("AF Illuminator"),
+                N_("AF Illuminator"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyAFIlluminatorCS)),
+        // NOTE: A700 only
+        TagInfo(0x002A, "AFWithShutter", N_("AF With Shutter"),
+                N_("AF With Shutter"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyBoolInverseValue),
+        // NOTE: A700 only
+        TagInfo(0x002B, "LongExposureNoiseReduction", N_("Long Exposure Noise Reduction"),
+                N_("Long Exposure Noise Reduction"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
+        // NOTE: A700 only
+        TagInfo(0x002C, "HighISONoiseReduction", N_("High ISO NoiseReduction"),
+                N_("High ISO NoiseReduction"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue),
+        // NOTE: A700 only
+        TagInfo(0x002D, "ImageStyle", N_("Image Style"),
+                N_("Image Style"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyImageStyle)),
+        TagInfo(0x003C, "ExposureProgram", N_("Exposure Program"),
+                N_("Exposure Program"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureProgram)),
+        TagInfo(0x003D, "ImageStabilization", N_("Image Stabilization"),
+                N_("Image Stabilization"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue),
+        TagInfo(0x003F, "Rotation", N_("Rotation"),
+                N_("Rotation"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyRotation),
+        TagInfo(0x0054, "SonyImageSize", N_("Sony Image Size"),
+                N_("Sony Image Size"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyImageSize)),
+        TagInfo(0x0055, "AspectRatio", N_("Aspect Ratio"),
+                N_("Aspect Ratio"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyAspectRatio)),
+        TagInfo(0x0056, "Quality", N_("Quality"),
+                N_("Quality"),
+                sony1CsId, makerTags, unsignedShort, 1, printMinoltaSonyQualityCs),
+        TagInfo(0x0058, "ExposureLevelIncrements", N_("Exposure Level Increments"),
+                N_("Exposure Level Increments"),
+                sony1CsId, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureLevelIncrements)),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownSony1CsTag)", "(UnknownSony1CsTag)",
+                N_("Unknown Sony1 Camera Settings tag"),
+                sony1CsId, makerTags, unsignedShort, 1, printValue)
+    };
+
+    const TagInfo* SonyMakerNote::tagListCs()
+    {
+        return tagInfoCs_;
+    }
+
+    // -- Sony camera settings 2 ---------------------------------------------------------------
+
+    // Sony Camera Settings Tag Version 2 Info
+    // NOTE: for A330, A380, A450, A500, A550 Sony model
+
+    // Warnings: Exiftool database give a list of tags shorted in decimal mode, not hexadecimal.
+
+    const TagInfo SonyMakerNote::tagInfoCs2_[] = {
+        TagInfo(0x0010, "FocusMode", N_("Focus Mode"),
+                N_("Focus Mode"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyCSFocusMode)),
+        TagInfo(0x0011, "AFAreaMode", N_("AF Area Mode"),
+                N_("AF Area Mode"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printMinoltaSonyAFAreaMode),
+        TagInfo(0x0012, "LocalAFAreaPoint", N_("Local AF Area Point"),
+                N_("Local AF Area Point"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printMinoltaSonyLocalAFAreaPoint),
+        TagInfo(0x0013, "MeteringMode", N_("Metering Mode"),
+                N_("Metering Mode"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyMeteringMode)),
+        TagInfo(0x0014, "ISOSetting", N_("ISO Setting"),
+                N_("ISO Setting"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0016, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"),
+                N_("Dynamic Range Optimizer Mode"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printMinoltaSonyDynamicRangeOptimizerMode),
+        TagInfo(0x0017, "DynamicRangeOptimizerLevel", N_("Dynamic Range Optimizer Level"),
+                N_("Dynamic Range Optimizer Level"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0018, "CreativeStyle", N_("Creative Style"),
+                N_("Creative Style"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyCreativeStyle)),
+        TagInfo(0x0019, "Sharpness", N_("Sharpness"),
+                N_("Sharpness"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001A, "Contrast", N_("Contrast"),
+                N_("Contrast"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x001B, "Saturation", N_("Saturation"),
+                N_("Saturation"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printValue),
+        TagInfo(0x0023, "FlashMode", N_("FlashMode"),
+                N_("FlashMode"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyFlashMode)),
+        TagInfo(0x003C, "ExposureProgram", N_("Exposure Program"),
+                N_("Exposure Program"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyExposureProgram)),
+        TagInfo(0x003F, "Rotation", N_("Rotation"),
+                N_("Rotation"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printMinoltaSonyRotation),
+        TagInfo(0x0054, "SonyImageSize", N_("Sony Image Size"),
+                N_("Sony Image Size"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, EXV_PRINT_TAG(sonyImageSize)),
+        // End of list marker
+        TagInfo(0xffff, "(UnknownSony1Cs2Tag)", "(UnknownSony1Cs2Tag)",
+                N_("Unknown Sony1 Camera Settings 2 tag"),
+                sony1Cs2Id, makerTags, unsignedShort, 1, printValue)
+    };
+
+    const TagInfo* SonyMakerNote::tagListCs2()
+    {
+        return tagInfoCs2_;
+    }
+
+}}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/sonymn.hpp exiv2-0.21/src/sonymn.hpp
--- exiv2-0.19/src/sonymn.hpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/sonymn.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
- *
- * This program is part of the Exiv2 distribution.
- *
- * 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, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*!
-  @file    sonymn.hpp
-  @brief   Basic Sony MakerNote implementation
-  @version $Rev: 1750 $
-  @author  Andreas Huggel (ahu)
-           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
-  @date    18-Apr-05, ahu: created
- */
-#ifndef SONYMN_HPP_
-#define SONYMN_HPP_
-
-// *****************************************************************************
-// included header files
-#include "tags.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
-#include <iosfwd>
-
-// *****************************************************************************
-// namespace extensions
-namespace Exiv2 {
-
-// *****************************************************************************
-// class definitions
-
-    //! MakerNote for Sony cameras
-    class EXIV2API SonyMakerNote {
-    public:
-        //! Return read-only list of built-in Sony tags
-        static const TagInfo* tagList();
-
-    private:
-        //! Tag information
-        static const TagInfo tagInfo_[];
-
-    }; // class SonyMakerNote
-
-}                                       // namespace Exiv2
-
-#endif                                  // #ifndef SONYMN_HPP_
diff -Nru exiv2-0.19/src/sonymn_int.hpp exiv2-0.21/src/sonymn_int.hpp
--- exiv2-0.19/src/sonymn_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/sonymn_int.hpp	2010-08-14 02:59:06.000000000 +0000
@@ -0,0 +1,81 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    sonymn_int.hpp
+  @brief   Sony MakerNote implemented using the following references:<br>
+           <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Sony.html">Sony Makernote list</a> by Phil Harvey<br>
+Email communication with <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a><br>
+
+  @version $Rev: 2314 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+             @author  Gilles Caulier (cgilles)
+           <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  @date    18-Apr-05, ahu: created
+ */
+#ifndef SONYMN_INT_HPP_
+#define SONYMN_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "tags.hpp"
+#include "types.hpp"
+
+// + standard includes
+#include <string>
+#include <iosfwd>
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! MakerNote for Sony cameras
+    class SonyMakerNote {
+    public:
+        //! Return read-only list of built-in Sony tags
+        static const TagInfo* tagList();
+        //! Return read-only list of built-in Sony Standard Camera Settings tags
+        static const TagInfo* tagListCs();
+        //! Return read-only list of built-in Sony Standard Camera Settings version 2 tags
+        static const TagInfo* tagListCs2();
+
+        //! @name Print functions for Sony %MakerNote tags
+        //@{
+        //! Print Sony Camera Model
+        static std::ostream& print0xb000(std::ostream&, const Value&, const ExifData*);
+        //! Print Full and Preview Image size
+        static std::ostream& printImageSize(std::ostream&, const Value&, const ExifData*);
+
+    private:
+        //! Tag information
+        static const TagInfo tagInfo_[];
+        static const TagInfo tagInfoCs_[];
+        static const TagInfo tagInfoCs2_[];
+
+    }; // class SonyMakerNote
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef SONYMN_INT_HPP_
diff -Nru exiv2-0.19/src/taglist.cpp exiv2-0.21/src/taglist.cpp
--- exiv2-0.19/src/taglist.cpp	2009-02-02 16:19:57.000000000 +0000
+++ exiv2-0.21/src/taglist.cpp	2010-08-28 17:47:45.000000000 +0000
@@ -3,7 +3,7 @@
   Abstract:  Print a simple comma separated list of tags defined in Exiv2
 
   File:      taglist.cpp
-  Version:   $Rev: 1740 $
+  Version:   $Rev: 2331 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   07-Jan-04, ahu: created
  */
@@ -37,9 +37,8 @@
             break;
         }
 
-        IfdId ifdId = ExifTags::ifdIdByIfdItem(item);
-        if (ExifTags::isExifIfd(ifdId) || ExifTags::isMakerIfd(ifdId)) {
-            ExifTags::taglist(std::cout, ifdId);
+        if (ExifTags::isExifGroup(item) || ExifTags::isMakerGroup(item)) {
+            ExifTags::taglist(std::cout, item);
             break;
         }
 
diff -Nru exiv2-0.19/src/tags.cpp exiv2-0.21/src/tags.cpp
--- exiv2-0.19/src/tags.cpp	2009-12-25 16:15:09.000000000 +0000
+++ exiv2-0.21/src/tags.cpp	2010-09-29 16:33:50.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,26 +20,37 @@
  */
 /*
   File:      tags.cpp
-  Version:   $Rev: 1965 $
+  Version:   $Rev: 2358 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
-             Gilles Caulier (gc) <caulier.gilles@kdemail.net>
+             Gilles Caulier (gc) <caulier dot gilles at gmail dot com>
   History:   15-Jan-04, ahu: created
              21-Jan-05, ahu: added MakerNote TagInfo registry and related code
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: tags.cpp 1965 2009-12-25 16:15:09Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: tags.cpp 2358 2010-09-29 16:33:50Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "types.hpp"
 #include "tags.hpp"
+#include "tags_int.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "value.hpp"
-#include "mn.hpp"                // To ensure that all makernotes are registered
 #include "i18n.h"                // NLS support.
 
+#include "canonmn_int.hpp"
+#include "fujimn_int.hpp"
+#include "minoltamn_int.hpp"
+#include "nikonmn_int.hpp"
+#include "olympusmn_int.hpp"
+#include "panasonicmn_int.hpp"
+#include "pentaxmn_int.hpp"
+#include "samsungmn_int.hpp"
+#include "sigmamn_int.hpp"
+#include "sonymn_int.hpp"
+
 #include <iostream>
 #include <iomanip>
 #include <sstream>
@@ -68,110 +79,113 @@
 // class member definitions
 namespace Exiv2 {
 
-    bool TagVocabulary::operator==(const std::string& key) const
-    {
-        if (strlen(voc_) > key.size()) return false;
-        return 0 == strcmp(voc_, key.c_str() + key.size() - strlen(voc_));
-    }
-
-    //! @cond IGNORE
-    IfdInfo::Item::Item(const std::string& item)
-    {
-        i_ = item;
-    }
-    //! @endcond
-
-    bool IfdInfo::operator==(IfdId ifdId) const
-    {
-        return ifdId_ == ifdId;
-    }
+    using namespace Internal;
 
-    bool IfdInfo::operator==(const Item& item) const
-    {
-        const char* i = item.i_.c_str();
-        if (i == 0) return false;
-        return 0 == strcmp(i, item_);
-    }
-
-    // Important: IFD item must be unique!
-    const IfdInfo ExifTags::ifdInfo_[] = {
-        { ifdIdNotSet,       "(Unknown IFD)", "(Unknown item)", 0 },
-        { ifd0Id,            "IFD0",      "Image",        ExifTags::ifdTagList           },
-        { exifIfdId,         "Exif",      "Photo",        ExifTags::exifTagList          }, // just to avoid 'Exif.Exif.*' keys
-        { gpsIfdId,          "GPSInfo",   "GPSInfo",      ExifTags::gpsTagList           },
-        { iopIfdId,          "Iop",       "Iop",          ExifTags::iopTagList           },
-        { ifd1Id,            "IFD1",      "Thumbnail",    ExifTags::ifdTagList           },
-        { ifd2Id,            "IFD2",      "Image2",       ExifTags::ifdTagList           },
-        { ifd3Id,            "IFD3",      "Image3",       ExifTags::ifdTagList           },
-        { subImage1Id,       "SubImage1", "SubImage1",    ExifTags::ifdTagList           },
-        { subImage2Id,       "SubImage2", "SubImage2",    ExifTags::ifdTagList           },
-        { subImage3Id,       "SubImage3", "SubImage3",    ExifTags::ifdTagList           },
-        { subImage4Id,       "SubImage4", "SubImage4",    ExifTags::ifdTagList           },
-        { mnIfdId,           "Makernote", "MakerNote",    ExifTags::mnTagList            },
-        { canonIfdId,        "Makernote", "Canon",        CanonMakerNote::tagList        },
-        { canonCsIfdId,      "Makernote", "CanonCs",      CanonMakerNote::tagListCs      },
-        { canonSiIfdId,      "Makernote", "CanonSi",      CanonMakerNote::tagListSi      },
-        { canonCfIfdId,      "Makernote", "CanonCf",      CanonMakerNote::tagListCf      },
-        { canonPiIfdId,      "Makernote", "CanonPi",      CanonMakerNote::tagListPi      },
-        { canonFiIfdId,      "Makernote", "CanonFi",      CanonMakerNote::tagListFi      },
-        { canonPaIfdId,      "Makernote", "CanonPa",      CanonMakerNote::tagListPa      },
-        { fujiIfdId,         "Makernote", "Fujifilm",     FujiMakerNote::tagList         },
-        { minoltaIfdId,      "Makernote", "Minolta",      MinoltaMakerNote::tagList      },
-        { minoltaCs5DIfdId,  "Makernote", "MinoltaCs5D",  MinoltaMakerNote::tagListCs5D  },
-        { minoltaCs7DIfdId,  "Makernote", "MinoltaCs7D",  MinoltaMakerNote::tagListCs7D  },
-        { minoltaCsOldIfdId, "Makernote", "MinoltaCsOld", MinoltaMakerNote::tagListCsStd },
-        { minoltaCsNewIfdId, "Makernote", "MinoltaCsNew", MinoltaMakerNote::tagListCsStd },
-        { nikon1IfdId,       "Makernote", "Nikon1",       Nikon1MakerNote::tagList       },
-        { nikon2IfdId,       "Makernote", "Nikon2",       Nikon2MakerNote::tagList       },
-        { nikon3IfdId,       "Makernote", "Nikon3",       Nikon3MakerNote::tagList       },
-        { nikonPvIfdId,      "Makernote", "NikonPreview", ExifTags::ifdTagList           },
-        { nikonVrIfdId,      "Makernote", "NikonVr",      Nikon3MakerNote::tagListVr     },
-        { nikonPcIfdId,      "Makernote", "NikonPc",      Nikon3MakerNote::tagListPc     },
-        { nikonWtIfdId,      "Makernote", "NikonWt",      Nikon3MakerNote::tagListWt     },
-        { nikonIiIfdId,      "Makernote", "NikonIi",      Nikon3MakerNote::tagListIi     },
-        { nikonAfIfdId,      "Makernote", "NikonAf",      Nikon3MakerNote::tagListAf     },
-        { nikonSi1IfdId,     "Makernote", "NikonSiD80",   Nikon3MakerNote::tagListSi1    },
-        { nikonSi2IfdId,     "Makernote", "NikonSiD40",   Nikon3MakerNote::tagListSi2    },
-        { nikonSi3IfdId,     "Makernote", "NikonSiD300a", Nikon3MakerNote::tagListSi3    },
-        { nikonSi4IfdId,     "Makernote", "NikonSiD300b", Nikon3MakerNote::tagListSi4    },
-        { nikonSi5IfdId,     "Makernote", "NikonSi02xx",  Nikon3MakerNote::tagListSi5    },
-        { nikonSi6IfdId,     "Makernote", "NikonSi01xx",  Nikon3MakerNote::tagListSi5    },
-        { nikonCb1IfdId,     "Makernote", "NikonCb1",     Nikon3MakerNote::tagListCb1    },
-        { nikonCb2IfdId,     "Makernote", "NikonCb2",     Nikon3MakerNote::tagListCb2    },
-        { nikonCb2aIfdId,    "Makernote", "NikonCb2a",    Nikon3MakerNote::tagListCb2a   },
-        { nikonCb2bIfdId,    "Makernote", "NikonCb2b",    Nikon3MakerNote::tagListCb2b   },
-        { nikonCb3IfdId,     "Makernote", "NikonCb3",     Nikon3MakerNote::tagListCb3    },
-        { nikonCb4IfdId,     "Makernote", "NikonCb4",     Nikon3MakerNote::tagListCb4    },
-        { nikonLd1IfdId,     "Makernote", "NikonLd1",     Nikon3MakerNote::tagListLd1    },
-        { nikonLd2IfdId,     "Makernote", "NikonLd2",     Nikon3MakerNote::tagListLd2    },
-        { nikonLd3IfdId,     "Makernote", "NikonLd3",     Nikon3MakerNote::tagListLd3    },
-        { olympusIfdId,      "Makernote", "Olympus",      OlympusMakerNote::tagList      },
-        { olympus2IfdId,     "Makernote", "Olympus2",     OlympusMakerNote::tagList      },
-        { olympusCsIfdId,    "Makernote", "OlympusCs",    OlympusMakerNote::tagListCs    },
-        { olympusEqIfdId,    "Makernote", "OlympusEq",    OlympusMakerNote::tagListEq    },
-        { olympusRdIfdId,    "Makernote", "OlympusRd",    OlympusMakerNote::tagListRd    },
-        { olympusRd2IfdId,   "Makernote", "OlympusRd2",   OlympusMakerNote::tagListRd2   },
-        { olympusIpIfdId,    "Makernote", "OlympusIp",    OlympusMakerNote::tagListIp    },
-        { olympusFiIfdId,    "Makernote", "OlympusFi",    OlympusMakerNote::tagListFi    },
-        { olympusFe1IfdId,   "Makernote", "OlympusFe1",   OlympusMakerNote::tagListFe    },
-        { olympusFe2IfdId,   "Makernote", "OlympusFe2",   OlympusMakerNote::tagListFe    },
-        { olympusFe3IfdId,   "Makernote", "OlympusFe3",   OlympusMakerNote::tagListFe    },
-        { olympusFe4IfdId,   "Makernote", "OlympusFe4",   OlympusMakerNote::tagListFe    },
-        { olympusFe5IfdId,   "Makernote", "OlympusFe5",   OlympusMakerNote::tagListFe    },
-        { olympusFe6IfdId,   "Makernote", "OlympusFe6",   OlympusMakerNote::tagListFe    },
-        { olympusFe7IfdId,   "Makernote", "OlympusFe7",   OlympusMakerNote::tagListFe    },
-        { olympusFe8IfdId,   "Makernote", "OlympusFe8",   OlympusMakerNote::tagListFe    },
-        { olympusFe9IfdId,   "Makernote", "OlympusFe9",   OlympusMakerNote::tagListFe    },
-        { olympusRiIfdId,    "Makernote", "OlympusRi",    OlympusMakerNote::tagListRi    },
-        { panasonicIfdId,    "Makernote", "Panasonic",    PanasonicMakerNote::tagList    },
-        { panaRawIfdId,      "PanaRaw",   "PanasonicRaw", PanasonicMakerNote::tagListRaw },
-        { pentaxIfdId,       "Makernote", "Pentax",       PentaxMakerNote::tagList       },
-        { sigmaIfdId,        "Makernote", "Sigma",        SigmaMakerNote::tagList        },
-        { sonyIfdId,         "Makernote", "Sony",         SonyMakerNote::tagList         },
-        { lastIfdId,         "(Last IFD info)", "(Last IFD item)", 0 }
+    //! List of all known Exif groups. Important: Group name (3rd column) must be unique!
+    extern const GroupInfo groupInfo[] = {
+        { ifdIdNotSet,     "Unknown IFD", "Unknown", 0 },
+        { ifd0Id,          "IFD0",      "Image",        ifdTagList                     },
+        { ifd1Id,          "IFD1",      "Thumbnail",    ifdTagList                     },
+        { ifd2Id,          "IFD2",      "Image2",       ifdTagList                     },
+        { ifd3Id,          "IFD3",      "Image3",       ifdTagList                     },
+        { exifId,          "Exif",      "Photo",        exifTagList                    },
+        { gpsId,           "GPSInfo",   "GPSInfo",      gpsTagList                     },
+        { iopId,           "Iop",       "Iop",          iopTagList                     },
+        { subImage1Id,     "SubImage1", "SubImage1",    ifdTagList                     },
+        { subImage2Id,     "SubImage2", "SubImage2",    ifdTagList                     },
+        { subImage3Id,     "SubImage3", "SubImage3",    ifdTagList                     },
+        { subImage4Id,     "SubImage4", "SubImage4",    ifdTagList                     },
+        { subImage5Id,     "SubImage5", "SubImage5",    ifdTagList                     },
+        { subImage6Id,     "SubImage6", "SubImage6",    ifdTagList                     },
+        { subImage7Id,     "SubImage7", "SubImage7",    ifdTagList                     },
+        { subImage8Id,     "SubImage8", "SubImage8",    ifdTagList                     },
+        { subImage9Id,     "SubImage9", "SubImage9",    ifdTagList                     },
+        { subThumb1Id,     "SubThumb1", "SubThumb1",    ifdTagList                     },
+        { panaRawId,       "PanaRaw",   "PanasonicRaw", PanasonicMakerNote::tagListRaw },
+        { mnId,            "Makernote", "MakerNote",    mnTagList                      },
+        { canonId,         "Makernote", "Canon",        CanonMakerNote::tagList        },
+        { canonCsId,       "Makernote", "CanonCs",      CanonMakerNote::tagListCs      },
+        { canonSiId,       "Makernote", "CanonSi",      CanonMakerNote::tagListSi      },
+        { canonCfId,       "Makernote", "CanonCf",      CanonMakerNote::tagListCf      },
+        { canonPiId,       "Makernote", "CanonPi",      CanonMakerNote::tagListPi      },
+        { canonFiId,       "Makernote", "CanonFi",      CanonMakerNote::tagListFi      },
+        { canonPaId,       "Makernote", "CanonPa",      CanonMakerNote::tagListPa      },
+        { canonPrId,       "Makernote", "CanonPr",      CanonMakerNote::tagListPr      },
+        { fujiId,          "Makernote", "Fujifilm",     FujiMakerNote::tagList         },
+        { minoltaId,       "Makernote", "Minolta",      MinoltaMakerNote::tagList      },
+        { minoltaCs5DId,   "Makernote", "MinoltaCs5D",  MinoltaMakerNote::tagListCs5D  },
+        { minoltaCs7DId,   "Makernote", "MinoltaCs7D",  MinoltaMakerNote::tagListCs7D  },
+        { minoltaCsOldId,  "Makernote", "MinoltaCsOld", MinoltaMakerNote::tagListCsStd },
+        { minoltaCsNewId,  "Makernote", "MinoltaCsNew", MinoltaMakerNote::tagListCsStd },
+        { nikon1Id,        "Makernote", "Nikon1",       Nikon1MakerNote::tagList       },
+        { nikon2Id,        "Makernote", "Nikon2",       Nikon2MakerNote::tagList       },
+        { nikon3Id,        "Makernote", "Nikon3",       Nikon3MakerNote::tagList       },
+        { nikonPvId,       "Makernote", "NikonPreview", ifdTagList                     },
+        { nikonVrId,       "Makernote", "NikonVr",      Nikon3MakerNote::tagListVr     },
+        { nikonPcId,       "Makernote", "NikonPc",      Nikon3MakerNote::tagListPc     },
+        { nikonWtId,       "Makernote", "NikonWt",      Nikon3MakerNote::tagListWt     },
+        { nikonIiId,       "Makernote", "NikonIi",      Nikon3MakerNote::tagListIi     },
+        { nikonAfId,       "Makernote", "NikonAf",      Nikon3MakerNote::tagListAf     },
+        { nikonAf2Id,      "Makernote", "NikonAf2",     Nikon3MakerNote::tagListAf2    },
+        { nikonFiId,       "Makernote", "NikonFi",      Nikon3MakerNote::tagListFi     },
+        { nikonMeId,       "Makernote", "NikonMe",      Nikon3MakerNote::tagListMe     },
+        { nikonFl1Id,      "Makernote", "NikonFl1",     Nikon3MakerNote::tagListFl1    },
+        { nikonFl2Id,      "Makernote", "NikonFl2",     Nikon3MakerNote::tagListFl2    },
+        { nikonFl3Id,      "Makernote", "NikonFl3",     Nikon3MakerNote::tagListFl3    },
+        { nikonSi1Id,      "Makernote", "NikonSiD80",   Nikon3MakerNote::tagListSi1    },
+        { nikonSi2Id,      "Makernote", "NikonSiD40",   Nikon3MakerNote::tagListSi2    },
+        { nikonSi3Id,      "Makernote", "NikonSiD300a", Nikon3MakerNote::tagListSi3    },
+        { nikonSi4Id,      "Makernote", "NikonSiD300b", Nikon3MakerNote::tagListSi4    },
+        { nikonSi5Id,      "Makernote", "NikonSi02xx",  Nikon3MakerNote::tagListSi5    },
+        { nikonSi6Id,      "Makernote", "NikonSi01xx",  Nikon3MakerNote::tagListSi5    },
+        { nikonCb1Id,      "Makernote", "NikonCb1",     Nikon3MakerNote::tagListCb1    },
+        { nikonCb2Id,      "Makernote", "NikonCb2",     Nikon3MakerNote::tagListCb2    },
+        { nikonCb2aId,     "Makernote", "NikonCb2a",    Nikon3MakerNote::tagListCb2a   },
+        { nikonCb2bId,     "Makernote", "NikonCb2b",    Nikon3MakerNote::tagListCb2b   },
+        { nikonCb3Id,      "Makernote", "NikonCb3",     Nikon3MakerNote::tagListCb3    },
+        { nikonCb4Id,      "Makernote", "NikonCb4",     Nikon3MakerNote::tagListCb4    },
+        { nikonLd1Id,      "Makernote", "NikonLd1",     Nikon3MakerNote::tagListLd1    },
+        { nikonLd2Id,      "Makernote", "NikonLd2",     Nikon3MakerNote::tagListLd2    },
+        { nikonLd3Id,      "Makernote", "NikonLd3",     Nikon3MakerNote::tagListLd3    },
+        { olympusId,       "Makernote", "Olympus",      OlympusMakerNote::tagList      },
+        { olympus2Id,      "Makernote", "Olympus2",     OlympusMakerNote::tagList      },
+        { olympusCsId,     "Makernote", "OlympusCs",    OlympusMakerNote::tagListCs    },
+        { olympusEqId,     "Makernote", "OlympusEq",    OlympusMakerNote::tagListEq    },
+        { olympusRdId,     "Makernote", "OlympusRd",    OlympusMakerNote::tagListRd    },
+        { olympusRd2Id,    "Makernote", "OlympusRd2",   OlympusMakerNote::tagListRd2   },
+        { olympusIpId,     "Makernote", "OlympusIp",    OlympusMakerNote::tagListIp    },
+        { olympusFiId,     "Makernote", "OlympusFi",    OlympusMakerNote::tagListFi    },
+        { olympusFe1Id,    "Makernote", "OlympusFe1",   OlympusMakerNote::tagListFe    },
+        { olympusFe2Id,    "Makernote", "OlympusFe2",   OlympusMakerNote::tagListFe    },
+        { olympusFe3Id,    "Makernote", "OlympusFe3",   OlympusMakerNote::tagListFe    },
+        { olympusFe4Id,    "Makernote", "OlympusFe4",   OlympusMakerNote::tagListFe    },
+        { olympusFe5Id,    "Makernote", "OlympusFe5",   OlympusMakerNote::tagListFe    },
+        { olympusFe6Id,    "Makernote", "OlympusFe6",   OlympusMakerNote::tagListFe    },
+        { olympusFe7Id,    "Makernote", "OlympusFe7",   OlympusMakerNote::tagListFe    },
+        { olympusFe8Id,    "Makernote", "OlympusFe8",   OlympusMakerNote::tagListFe    },
+        { olympusFe9Id,    "Makernote", "OlympusFe9",   OlympusMakerNote::tagListFe    },
+        { olympusRiId,     "Makernote", "OlympusRi",    OlympusMakerNote::tagListRi    },
+        { panasonicId,     "Makernote", "Panasonic",    PanasonicMakerNote::tagList    },
+        { pentaxId,        "Makernote", "Pentax",       PentaxMakerNote::tagList       },
+        { samsung2Id,      "Makernote", "Samsung2",     Samsung2MakerNote::tagList     },
+        { samsungPvId,     "Makernote", "SamsungPreview", ifdTagList                   },
+        { sigmaId,         "Makernote", "Sigma",        SigmaMakerNote::tagList        },
+        { sony1Id,         "Makernote", "Sony1",        SonyMakerNote::tagList         },
+        { sony2Id,         "Makernote", "Sony2",        SonyMakerNote::tagList         },
+        { sonyMltId,       "Makernote", "SonyMinolta",  MinoltaMakerNote::tagList      },
+        { sony1CsId,       "Makernote", "Sony1Cs",      SonyMakerNote::tagListCs       },
+        { sony1Cs2Id,      "Makernote", "Sony1Cs2",     SonyMakerNote::tagListCs2      },
+        { sony1MltCs7DId,  "Makernote", "Sony1MltCs7D", MinoltaMakerNote::tagListCs7D  },
+        { sony1MltCsOldId, "Makernote", "Sony1MltCsOld",MinoltaMakerNote::tagListCsStd },
+        { sony1MltCsNewId, "Makernote", "Sony1MltCsNew",MinoltaMakerNote::tagListCsStd },
+        { sony1MltCsA100Id,"Makernote","Sony1MltCsA100",MinoltaMakerNote::tagListCsA100},
+        { sony2CsId,       "Makernote", "Sony2Cs",      SonyMakerNote::tagListCs       },
+        { sony2Cs2Id,      "Makernote", "Sony2Cs2",     SonyMakerNote::tagListCs2      },
+        { lastId,          "(Last IFD info)", "(Last IFD item)", 0 }
     };
 
-    const SectionInfo ExifTags::sectionInfo_[] = {
+    //! List of all defined Exif sections.
+    extern const SectionInfo sectionInfo[] = {
         { sectionIdNotSet, "(UnknownSection)",     N_("Unknown section")              },
         { imgStruct,       "ImageStructure",       N_("Image data structure")         },
         { recOffset,       "RecordingOffset",      N_("Recording offset")             },
@@ -190,22 +204,20 @@
         { dngTags,         "DngTags",              N_("Adobe DNG tags")               },
         { panaRaw,         "PanasonicRaw",         N_("Panasonic RAW tags")           },
         { tiffEp,          "TIFF/EP",              N_("TIFF/EP tags")                 },
+        { tiffPm6,         "TIFF&PM6",             N_("TIFF PageMaker 6.0 tags")      },
+        { adobeOpi,        "AdobeOPI",             N_("Adobe OPI tags")               },
         { lastSectionId,   "(LastSection)",        N_("Last section")                 }
     };
 
-    TagInfo::TagInfo(
-        uint16_t tag,
-        const char* name,
-        const char* title,
-        const char* desc,
-        IfdId ifdId,
-        SectionId sectionId,
-        TypeId typeId,
-        PrintFct printFct
-    )
-        : tag_(tag), name_(name), title_(title), desc_(desc), ifdId_(ifdId),
-          sectionId_(sectionId), typeId_(typeId), printFct_(printFct)
+} // namespace Exiv2
+
+namespace Exiv2 {
+    namespace Internal {
+
+    bool TagVocabulary::operator==(const std::string& key) const
     {
+        if (strlen(voc_) > key.size()) return false;
+        return 0 == strcmp(voc_, key.c_str() + key.size() - strlen(voc_));
     }
 
     //! NewSubfileType, TIFF tag 0x00fe - this is actually a bitmask
@@ -217,7 +229,15 @@
         {  4, N_("Primary image, Transparency mask")                            },
         {  5, N_("Thumbnail/Preview image, Transparency mask")                  },
         {  6, N_("Primary image, Multi page file, Transparency mask")           },
-        {  7, N_("Thumbnail/Preview image, Multi page file, Transparency mask") }
+        {  7, N_("Thumbnail/Preview image, Multi page file, Transparency mask") },
+        {  7, N_("Thumbnail/Preview image, Multi page file, Transparency mask") }  // To silence compiler warning
+    };
+
+    //! SubfileType, TIFF tag 0x00ff
+    extern const TagDetails exifSubfileType[] = {
+        {  1, N_("Full-resolution image data")                                  },
+        {  2, N_("Reduced-resolution image data")                               },
+        {  3, N_("A single page of a multi-page image")                         }
     };
 
     //! Units for measuring X and Y resolution, tags 0x0128, 0xa210
@@ -241,6 +261,7 @@
         {    10, N_("JBIG Color")               },
         { 32766, N_("Next 2-bits RLE")          },
         { 32769, N_("Epson ERF Compressed")     },
+        { 32770, N_("Samsung SRW Compressed")   },
         { 32771, N_("CCITT RLE 1-word")         },
         { 32773, N_("PackBits (Macintosh RLE)") },
         { 32809, N_("Thunderscan RLE")          },
@@ -279,6 +300,13 @@
         { 34892, N_("Linear Raw")         }
     };
 
+    //! Threshholding, tag 0x0107
+    extern const TagDetails exifThreshholding[] = {
+        { 1, N_("No dithering or halftoning")           },
+        { 2, N_("Ordered dither or halftone technique") },
+        { 3, N_("Randomized process")                   }
+    };
+
     //! Orientation, tag 0x0112
     extern const TagDetails exifOrientation[] = {
         { 1, N_("top, left")     },
@@ -288,7 +316,46 @@
         { 5, N_("left, top")     },
         { 6, N_("right, top")    },
         { 7, N_("right, bottom") },
-        { 8, N_("left, bottom")  }
+        { 8, N_("left, bottom")  },
+        { 8, N_("left, bottom")  }              // To silence compiler warning
+    };
+
+    //! Predictor, tag 0x013d
+    extern const TagDetails exifPredictor[] = {
+        { 1, N_("No prediction scheme used") },
+        { 2, N_("Horizontal differencing")   }
+    };
+
+    //! InkSet, tag 0x014c
+    extern const TagDetails exifInkSet[] = {
+        { 1, N_("CMYK")     },
+        { 2, N_("not CMYK") }
+    };
+
+    //! SampleFormat, tag 0x0153
+    extern const TagDetails exifSampleFormat[] = {
+        { 1, N_("Unsigned integer data")                },
+        { 2, N_("Two's complement signed integer data") },
+        { 3, N_("IEEE floating point data")             },
+        { 4, N_("Undefined data format")                },
+        { 4, N_("Undefined data format")                } // To silence compiler warning
+    };
+
+    //! Indexed, tag 0x015a
+    extern const TagDetails exifIndexed[] = {
+        { 0, N_("Not indexed") },
+        { 1, N_("Indexed")     }
+    };
+
+    //! exifJpegLosslessPredictor, tag 0x0205
+    extern const TagDetails exifJpegLosslessPredictor[] = {
+        { 1, N_("A")           },
+        { 2, N_("B")           },
+        { 3, N_("C")           },
+        { 4, N_("A+B-C")       },
+        { 5, N_("A+((B-C)/2)") },
+        { 6, N_("B+((A-C)/2)") },
+        { 7, N_("(A+B)/2")     }
     };
 
     //! YCbCrPositioning, tag 0x0213
@@ -342,120 +409,148 @@
         TagInfo(0x000b, "ProcessingSoftware", N_("Processing Software"),
                 N_("The name and version of the software used to post-process "
                    "the picture."), // ACD Systems Digital Imaging tag
-                ifd0Id, otherTags, asciiString, printValue),
+                ifd0Id, otherTags, asciiString, 0, printValue),
         TagInfo(0x00fe, "NewSubfileType", N_("New Subfile Type"),
                 N_("A general indication of the kind of data contained in this subfile."),
-                ifd0Id, imgStruct, unsignedLong, EXV_PRINT_TAG(exifNewSubfileType)), // TIFF tag
+                ifd0Id, imgStruct, unsignedLong, 1, EXV_PRINT_TAG(exifNewSubfileType)), // TIFF tag
+        TagInfo(0x00ff, "SubfileType", N_("Subfile Type"),
+                N_("A general indication of the kind of data contained in this subfile. "
+                   "This field is deprecated. The NewSubfileType field should be used instead."),
+                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifSubfileType)), // TIFF tag
         TagInfo(0x0100, "ImageWidth", N_("Image Width"),
                 N_("The number of columns of image data, equal to the number of "
                 "pixels per row. In JPEG compressed data a JPEG marker is "
                 "used instead of this tag."),
-                ifd0Id, imgStruct, unsignedLong, printValue),
+                ifd0Id, imgStruct, unsignedLong, 1, printValue),
         TagInfo(0x0101, "ImageLength", N_("Image Length"),
                 N_("The number of rows of image data. In JPEG compressed data a "
                 "JPEG marker is used instead of this tag."),
-                ifd0Id, imgStruct, unsignedLong, printValue),
+                ifd0Id, imgStruct, unsignedLong, 1, printValue),
         TagInfo(0x0102, "BitsPerSample", N_("Bits per Sample"),
                 N_("The number of bits per image component. In this standard each "
                 "component of the image is 8 bits, so the value for this "
                 "tag is 8. See also <SamplesPerPixel>. In JPEG compressed data "
                 "a JPEG marker is used instead of this tag."),
-                ifd0Id, imgStruct, unsignedShort, printValue),
+                ifd0Id, imgStruct, unsignedShort, 3, printValue),
         TagInfo(0x0103, "Compression", N_("Compression"),
                 N_("The compression scheme used for the image data. When a "
                 "primary image is JPEG compressed, this designation is "
                 "not necessary and is omitted. When thumbnails use JPEG "
                 "compression, this tag value is set to 6."),
-                ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifCompression)),
+                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifCompression)),
         TagInfo(0x0106, "PhotometricInterpretation", N_("Photometric Interpretation"),
                 N_("The pixel composition. In JPEG compressed data a JPEG "
                 "marker is used instead of this tag."),
-                ifd0Id, imgStruct, unsignedShort, EXV_PRINT_TAG(exifPhotometricInterpretation)),
+                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPhotometricInterpretation)),
+        TagInfo(0x0107, "Threshholding", N_("Threshholding"),
+                N_("For black and white TIFF files that represent shades of gray, "
+                   "the technique used to convert from gray to black and white pixels."),
+                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifThreshholding)), // TIFF tag
+        TagInfo(0x0108, "CellWidth", N_("Cell Width"),
+                N_("The width of the dithering or halftoning matrix used to create a "
+                   "dithered or halftoned bilevel file."),
+                ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
+        TagInfo(0x0109, "CellLength", N_("Cell Length"),
+                N_("The length of the dithering or halftoning matrix used to create a "
+                   "dithered or halftoned bilevel file."),
+                ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
         TagInfo(0x010a, "FillOrder", N_("Fill Order"),
                 N_("The logical order of bits within a byte"),
-                ifd0Id, imgStruct, unsignedShort, printValue), // TIFF tag
+                ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
         TagInfo(0x010d, "DocumentName", N_("Document Name"),
                 N_("The name of the document from which this image was scanned"),
-                ifd0Id, imgStruct, asciiString, printValue), // TIFF tag
+                ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag
         TagInfo(0x010e, "ImageDescription", N_("Image Description"),
                 N_("A character string giving the title of the image. It may be "
                 "a comment such as \"1988 company picnic\" or "
                 "the like. Two-bytes character codes cannot be used. "
                 "When a 2-bytes code is necessary, the Exif Private tag "
                 "<UserComment> is to be used."),
-                ifd0Id, otherTags, asciiString, printValue),
+                ifd0Id, otherTags, asciiString, 0, printValue),
         TagInfo(0x010f, "Make", N_("Manufacturer"),
                 N_("The manufacturer of the recording "
                 "equipment. This is the manufacturer of the DSC, scanner, "
                 "video digitizer or other equipment that generated the "
                 "image. When the field is left blank, it is treated as unknown."),
-                ifd0Id, otherTags, asciiString, printValue),
+                ifd0Id, otherTags, asciiString, 0, printValue),
         TagInfo(0x0110, "Model", N_("Model"),
                 N_("The model name or model number of the equipment. This is the "
                 "model name or number of the DSC, scanner, video digitizer "
                 "or other equipment that generated the image. When the field "
                 "is left blank, it is treated as unknown."),
-                ifd0Id, otherTags, asciiString, printValue),
+                ifd0Id, otherTags, asciiString, 0, printValue),
         TagInfo(0x0111, "StripOffsets", N_("Strip Offsets"),
                 N_("For each strip, the byte offset of that strip. It is "
                 "recommended that this be selected so the number of strip "
                 "bytes does not exceed 64 Kbytes. With JPEG compressed "
                 "data this designation is not needed and is omitted. See also "
                 "<RowsPerStrip> and <StripByteCounts>."),
-                ifd0Id, recOffset, unsignedLong, printValue),
+                ifd0Id, recOffset, unsignedLong, -1, printValue),
         TagInfo(0x0112, "Orientation", N_("Orientation"),
                 N_("The image orientation viewed in terms of rows and columns."),
-                ifd0Id, imgStruct, unsignedShort, print0x0112),
+                ifd0Id, imgStruct, unsignedShort, 1, print0x0112),
         TagInfo(0x0115, "SamplesPerPixel", N_("Samples per Pixel"),
                 N_("The number of components per pixel. Since this standard applies "
                 "to RGB and YCbCr images, the value set for this tag is 3. "
                 "In JPEG compressed data a JPEG marker is used instead of this tag."),
-                ifd0Id, imgStruct, unsignedShort, printValue),
+                ifd0Id, imgStruct, unsignedShort, 1, printValue),
         TagInfo(0x0116, "RowsPerStrip", N_("Rows per Strip"),
                 N_("The number of rows per strip. This is the number of rows "
                 "in the image of one strip when an image is divided into "
                 "strips. With JPEG compressed data this designation is not "
                 "needed and is omitted. See also <StripOffsets> and <StripByteCounts>."),
-                ifd0Id, recOffset, unsignedLong, printValue),
+                ifd0Id, recOffset, unsignedLong, 1, printValue),
         TagInfo(0x0117, "StripByteCounts", N_("Strip Byte Count"),
                 N_("The total number of bytes in each strip. With JPEG compressed "
                 "data this designation is not needed and is omitted."),
-                ifd0Id, recOffset, unsignedLong, printValue),
+                ifd0Id, recOffset, unsignedLong, -1, printValue),
         TagInfo(0x011a, "XResolution", N_("X-Resolution"),
                 N_("The number of pixels per <ResolutionUnit> in the <ImageWidth> "
                 "direction. When the image resolution is unknown, 72 [dpi] is designated."),
-                ifd0Id, imgStruct, unsignedRational, printLong),
+                ifd0Id, imgStruct, unsignedRational, 1, printLong),
         TagInfo(0x011b, "YResolution", N_("Y-Resolution"),
                 N_("The number of pixels per <ResolutionUnit> in the <ImageLength> "
                 "direction. The same value as <XResolution> is designated."),
-                ifd0Id, imgStruct, unsignedRational, printLong),
+                ifd0Id, imgStruct, unsignedRational, 1, printLong),
         TagInfo(0x011c, "PlanarConfiguration", N_("Planar Configuration"),
                 N_("Indicates whether pixel components are recorded in a chunky "
                 "or planar format. In JPEG compressed files a JPEG marker "
                 "is used instead of this tag. If this field does not exist, "
                 "the TIFF default of 1 (chunky) is assumed."),
-                ifd0Id, imgStruct, unsignedShort, printValue),
+                ifd0Id, imgStruct, unsignedShort, 1, printValue),
+        TagInfo(0x0122, "GrayResponseUnit", N_("Gray Response Unit"),
+                N_("The precision of the information contained in the GrayResponseCurve."),
+                ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
+        TagInfo(0x0123, "GrayResponseCurve", N_("Gray Response Curve"),
+                N_("For grayscale data, the optical density of each possible pixel value."),
+                ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag
+        TagInfo(0x0124, "T4Options", N_("T4 Options"),
+                N_("T.4-encoding options."),
+                ifd0Id, imgStruct, unsignedLong, 1, printValue), // TIFF tag
+        TagInfo(0x0125, "T6Options", N_("T6 Options"),
+                N_("T.6-encoding options."),
+                ifd0Id, imgStruct, unsignedLong, 1, printValue), // TIFF tag
         TagInfo(0x0128, "ResolutionUnit", N_("Resolution Unit"),
                 N_("The unit for measuring <XResolution> and <YResolution>. The same "
                 "unit is used for both <XResolution> and <YResolution>. If "
                 "the image resolution is unknown, 2 (inches) is designated."),
-                ifd0Id, imgStruct, unsignedShort, printExifUnit),
+                ifd0Id, imgStruct, unsignedShort, 1, printExifUnit),
         TagInfo(0x012d, "TransferFunction", N_("Transfer Function"),
                 N_("A transfer function for the image, described in tabular style. "
                 "Normally this tag is not necessary, since color space is "
                 "specified in the color space information tag (<ColorSpace>)."),
-                ifd0Id, imgCharacter, unsignedShort, printValue),
+                ifd0Id, imgCharacter, unsignedShort, 3*256, printValue),
         TagInfo(0x0131, "Software", N_("Software"),
                 N_("This tag records the name and version of the software or "
                 "firmware of the camera or image input device used to "
                 "generate the image. The detailed format is not specified, but "
                 "it is recommended that the example shown below be "
                 "followed. When the field is left blank, it is treated as unknown."),
-                ifd0Id, otherTags, asciiString, printValue),
+                ifd0Id, otherTags, asciiString, 0, printValue),
         TagInfo(0x0132, "DateTime", N_("Date and Time"),
                 N_("The date and time of image creation. In Exif standard, "
                 "it is the date and time the file was changed."),
-                ifd0Id, otherTags, asciiString, printValue),
+                ifd0Id, otherTags, asciiString, 20, printValue),
         TagInfo(0x013b, "Artist", N_("Artist"),
                 N_("This tag records the name of the camera owner, photographer or "
                 "image creator. The detailed format is not specified, but it is "
@@ -463,54 +558,118 @@
                 "below for ease of Interoperability. When the field is "
                 "left blank, it is treated as unknown. Ex.) \"Camera owner, John "
                 "Smith; Photographer, Michael Brown; Image creator, Ken James\""),
-                ifd0Id, otherTags, asciiString, printValue),
-        TagInfo(0x013c, "HostComputer", N_("Host computer"),
+                ifd0Id, otherTags, asciiString, 0, printValue),
+        TagInfo(0x013c, "HostComputer", N_("Host Computer"),
                 N_("This tag records information about the host computer used "
                 "to generate the image."),
-                ifd0Id, otherTags, asciiString, printValue),
+                ifd0Id, otherTags, asciiString, 0, printValue),
+        TagInfo(0x013d, "Predictor", N_("Predictor"),
+                N_("A predictor is a mathematical operator that is applied to "
+                   "the image data before an encoding scheme is applied."),
+                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPredictor)), // TIFF tag
         TagInfo(0x013e, "WhitePoint", N_("White Point"),
                 N_("The chromaticity of the white point of the image. Normally "
                 "this tag is not necessary, since color space is specified "
                 "in the colorspace information tag (<ColorSpace>)."),
-                ifd0Id, imgCharacter, unsignedRational, printValue),
+                ifd0Id, imgCharacter, unsignedRational, 2, printValue),
         TagInfo(0x013f, "PrimaryChromaticities", N_("Primary Chromaticities"),
                 N_("The chromaticity of the three primary colors of the image. "
                 "Normally this tag is not necessary, since colorspace is "
                 "specified in the colorspace information tag (<ColorSpace>)."),
-                ifd0Id, imgCharacter, unsignedRational, printValue),
+                ifd0Id, imgCharacter, unsignedRational, 6, printValue),
+        TagInfo(0x0140, "ColorMap", N_("Color Map"),
+                N_("A color map for palette color images. This field defines "
+                   "a Red-Green-Blue color map (often called a lookup table) "
+                   "for palette-color images. In a palette-color image, a "
+                   "pixel value is used to index into an RGB lookup table."),
+                ifd0Id, imgCharacter, unsignedShort, -1, printValue),
+        TagInfo(0x0141, "HalftoneHints", N_("Halftone Hints"),
+                N_("The purpose of the HalftoneHints field is to convey to the "
+                   "halftone function the range of gray levels within a "
+                   "colorimetrically-specified image that should retain tonal detail."),
+                ifd0Id, imgStruct, unsignedShort, 2, printValue), // TIFF tag
         TagInfo(0x0142, "TileWidth", N_("Tile Width"),
                 N_("The tile width in pixels. This is the number of columns in each tile."),
-                ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag
+                ifd0Id, recOffset, unsignedShort, 1, printValue), // TIFF tag
         TagInfo(0x0143, "TileLength", N_("Tile Length"),
                 N_("The tile length (height) in pixels. This is the number of rows in each tile."),
-                ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag
+                ifd0Id, recOffset, unsignedShort, 1, printValue), // TIFF tag
         TagInfo(0x0144, "TileOffsets", N_("Tile Offsets"),
                 N_("For each tile, the byte offset of that tile, as compressed and "
                    "stored on disk. The offset is specified with respect to the "
                    "beginning of the TIFF file. Note that this implies that each "
                    "tile has a location independent of the locations of other tiles."),
-                ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag
+                ifd0Id, recOffset, unsignedShort, -1, printValue), // TIFF tag
         TagInfo(0x0145, "TileByteCounts", N_("Tile Byte Counts"),
                 N_("For each tile, the number of (compressed) bytes in that tile. See "
                    "TileOffsets for a description of how the byte counts are ordered."),
-                ifd0Id, recOffset, unsignedShort, printValue), // TIFF tag
+                ifd0Id, recOffset, unsignedShort, -1, printValue), // TIFF tag
         TagInfo(0x014a, "SubIFDs", N_("SubIFD Offsets"),
                 N_("Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."),
-                ifd0Id, tiffEp, unsignedLong, printValue),
+                ifd0Id, tiffEp, unsignedLong, -1, printValue),
+        TagInfo(0x014c, "InkSet", N_("Ink Set"),
+                N_("The set of inks used in a separated (PhotometricInterpretation=5) image."),
+                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifInkSet)), // TIFF tag
+        TagInfo(0x014d, "InkNames", N_("Ink Names"),
+                N_("The name of each ink used in a separated (PhotometricInterpretation=5) image."),
+                ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag
+        TagInfo(0x014e, "NumberOfInks", N_("Number Of Inks"),
+                N_("The number of inks. Usually equal to SamplesPerPixel, unless there are extra samples."),
+                ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
+        TagInfo(0x0150, "DotRange", N_("Dot Range"),
+                N_("The component values that correspond to a 0% dot and 100% dot."),
+                ifd0Id, imgStruct, unsignedByte, -1, printValue), // TIFF tag
+        TagInfo(0x0151, "TargetPrinter", N_("Target Printer"),
+                N_("A description of the printing environment for which this separation is intended."),
+                ifd0Id, imgStruct, asciiString, 0, printValue), // TIFF tag
+        TagInfo(0x0152, "ExtraSamples", N_("Extra Samples"),
+                N_("Specifies that each pixel has m extra components whose interpretation "
+                   "is defined by one of the values listed below."),
+                ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag
+        TagInfo(0x0153, "SampleFormat", N_("Sample Format"),
+                N_("This field specifies how to interpret each data sample in a pixel."),
+                ifd0Id, imgStruct, unsignedShort, -1, EXV_PRINT_TAG(exifSampleFormat)), // TIFF tag
+        TagInfo(0x0154, "SMinSampleValue", N_("SMin Sample Value"),
+                N_("This field specifies the minimum sample value."),
+                ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag
+        TagInfo(0x0155, "SMaxSampleValue", N_("SMax Sample Value"),
+                N_("This field specifies the maximum sample value."),
+                ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag
         TagInfo(0x0156, "TransferRange", N_("Transfer Range"),
                 N_("Expands the range of the TransferFunction"),
-                ifd0Id, imgCharacter, unsignedShort, printValue), // TIFF tag
+                ifd0Id, imgCharacter, unsignedShort, 6, printValue), // TIFF tag
+        TagInfo(0x0157, "ClipPath", N_("Clip Path"),
+                N_("A TIFF ClipPath is intended to mirror the essentials of PostScript's "
+                   "path creation functionality."),
+                ifd0Id, tiffPm6, unsignedByte, -1, printValue), // TIFF&PM6 tag
+        TagInfo(0x0158, "XClipPathUnits", N_("X Clip Path Units"),
+                N_("The number of units that span the width of the image, in terms of "
+                   "integer ClipPath coordinates."),
+                ifd0Id, tiffPm6, signedShort, 1, printValue), // TIFF&PM6 tag
+        TagInfo(0x0159, "YClipPathUnits", N_("Y Clip Path Units"),
+                N_("The number of units that span the height of the image, in terms of "
+                   "integer ClipPath coordinates."),
+                ifd0Id, tiffPm6, signedShort, 1, printValue), // TIFF&PM6 tag
+        TagInfo(0x015a, "Indexed", N_("Indexed"),
+                N_("Indexed images are images where the 'pixels' do not represent color "
+                   "values, but rather an index (usually 8-bit) into a separate color "
+                   "table, the ColorMap."),
+                ifd0Id, tiffPm6, unsignedShort, 1, EXV_PRINT_TAG(exifIndexed)), // TIFF&PM6 tag
         TagInfo(0x015b, "JPEGTables", N_("JPEG tables"),
                 N_("This optional tag may be used to encode the JPEG quantization and"
                    "Huffman tables for subsequent use by the JPEG decompression process."),
-                ifd0Id, imgStruct, undefined, printValue), // TIFF/EP tag
+                ifd0Id, imgStruct, undefined, 0, printValue), // TIFF/EP tag
+        TagInfo(0x015F, "OPIProxy", N_("OPI Proxy"),
+                N_("OPIProxy gives information concerning whether this image is a "
+                   "low-resolution proxy of a high-resolution image (Adobe OPI)."),
+                ifd0Id, adobeOpi, unsignedShort, 1, printValue), // Adobe OPI tag
         TagInfo(0x0200, "JPEGProc", N_("JPEG Process"),
                 N_("This field indicates the process used to produce the compressed data"),
-                ifd0Id, recOffset, unsignedLong, printValue), // TIFF tag
+                ifd0Id, recOffset, unsignedLong, 1, printValue), // TIFF tag
         TagInfo(0x0201, "JPEGInterchangeFormat", N_("JPEG Interchange Format"),
                 N_("The offset to the start byte (SOI) of JPEG compressed "
                 "thumbnail data. This is not used for primary image JPEG data."),
-                ifd0Id, recOffset, unsignedLong, printValue),
+                ifd0Id, recOffset, unsignedLong, 1, printValue),
         TagInfo(0x0202, "JPEGInterchangeFormatLength", N_("JPEG Interchange Format Length"),
                 N_("The number of bytes of JPEG compressed thumbnail data. This "
                 "is not used for primary image JPEG data. JPEG thumbnails "
@@ -518,7 +677,30 @@
                 "bitstream from SOI to EOI. Appn and COM markers should "
                 "not be recorded. Compressed thumbnails must be recorded in no "
                 "more than 64 Kbytes, including all other data to be recorded in APP1."),
-                ifd0Id, recOffset, unsignedLong, printValue),
+                ifd0Id, recOffset, unsignedLong, 1, printValue),
+        TagInfo(0x0203, "JPEGRestartInterval", N_("JPEG Restart Interval"),
+                N_("This Field indicates the length of the restart interval used "
+                   "in the compressed image data."),
+                ifd0Id, imgStruct, unsignedShort, 1, printValue), // TIFF tag
+        TagInfo(0x0205, "JPEGLosslessPredictors", N_("JPEG Lossless Predictors"),
+                N_("This Field points to a list of lossless predictor-selection "
+                   "values, one per component."),
+                ifd0Id, imgStruct, unsignedShort, -1, EXV_PRINT_TAG(exifJpegLosslessPredictor)), // TIFF tag
+        TagInfo(0x0206, "JPEGPointTransforms", N_("JPEG Point Transforms"),
+                N_("This Field points to a list of point transform values, one per component."),
+                ifd0Id, imgStruct, unsignedShort, -1, printValue), // TIFF tag
+        TagInfo(0x0207, "JPEGQTables", N_("JPEG Q-Tables"),
+                N_("This Field points to a list of offsets to the quantization tables, "
+                   "one per component."),
+                ifd0Id, imgStruct, unsignedLong, -1, printValue), // TIFF tag
+        TagInfo(0x0208, "JPEGDCTables", N_("JPEG DC-Tables"),
+                N_("This Field points to a list of offsets to the DC Huffman tables or "
+                   "the lossless Huffman tables, one per component."),
+                ifd0Id, imgStruct, unsignedLong, -1, printValue), // TIFF tag
+        TagInfo(0x0209, "JPEGACTables", N_("JPEG AC-Tables"),
+                N_("This Field points to a list of offsets to the Huffman AC tables, "
+                   "one per component."),
+                ifd0Id, imgStruct, unsignedLong, -1, printValue), // TIFF tag
         TagInfo(0x0211, "YCbCrCoefficients", N_("YCbCr Coefficients"),
                 N_("The matrix coefficients for transformation from RGB to YCbCr "
                 "image data. No default is given in TIFF; but here the "
@@ -527,12 +709,12 @@
                 "color space information tag, with the default being the value "
                 "that gives the optimal image characteristics "
                 "Interoperability this condition."),
-                ifd0Id, imgCharacter, unsignedRational, printValue),
+                ifd0Id, imgCharacter, unsignedRational, 3, printValue),
         TagInfo(0x0212, "YCbCrSubSampling", N_("YCbCr Sub-Sampling"),
                 N_("The sampling ratio of chrominance components in relation to the "
                 "luminance component. In JPEG compressed data a JPEG marker "
                 "is used instead of this tag."),
-                ifd0Id, imgStruct, unsignedShort, printValue),
+                ifd0Id, imgStruct, unsignedShort, 2, printValue),
         TagInfo(0x0213, "YCbCrPositioning", N_("YCbCr Positioning"),
                 N_("The position of chrominance components in relation to the "
                 "luminance component. This field is designated only for "
@@ -547,7 +729,7 @@
                 "<YCbCrPositioning>, it shall follow the TIFF default regardless "
                 "of the value in this field. It is preferable that readers "
                 "be able to support both centered and co-sited positioning."),
-                ifd0Id, imgStruct, unsignedShort, print0x0213),
+                ifd0Id, imgStruct, unsignedShort, 1, print0x0213),
         TagInfo(0x0214, "ReferenceBlackWhite", N_("Reference Black/White"),
                 N_("The reference black point value and reference white point "
                 "value. No defaults are given in TIFF, but the values "
@@ -555,28 +737,33 @@
                 "in a color space information tag, with the default "
                 "being the value that gives the optimal image characteristics "
                 "Interoperability these conditions."),
-                ifd0Id, imgCharacter, unsignedRational, printValue),
+                ifd0Id, imgCharacter, unsignedRational, 6, printValue),
         TagInfo(0x02bc, "XMLPacket", N_("XML Packet"),
                 N_("XMP Metadata (Adobe technote 9-14-02)"),
-                ifd0Id, otherTags, unsignedByte, printValue),
+                ifd0Id, otherTags, unsignedByte, -1, printValue),
         TagInfo(0x4746, "Rating", N_("Windows Rating"),
                 N_("Rating tag used by Windows"),
-                ifd0Id, otherTags, unsignedShort, printValue), // Windows Tag
+                ifd0Id, otherTags, unsignedShort, -1, printValue), // Windows Tag
         TagInfo(0x4749, "RatingPercent", N_("Windows Rating Percent"),
                 N_("Rating tag used by Windows, value in percent"),
-                ifd0Id, otherTags, unsignedShort, printValue), // Windows Tag
+                ifd0Id, otherTags, unsignedShort, -1, printValue), // Windows Tag
+        TagInfo(0x800d, "ImageID", N_("Image ID"),
+                N_("ImageID is the full pathname of the original, high-resolution image, "
+                   "or any other identifying string that uniquely identifies the original "
+                   "image (Adobe OPI)."),
+                ifd0Id, adobeOpi, asciiString, 0, printValue), // Adobe OPI tag
         TagInfo(0x828d, "CFARepeatPatternDim", N_("CFA Repeat Pattern Dimension"),
                 N_("Contains two values representing the minimum rows and columns "
                 "to define the repeating patterns of the color filter array"),
-                ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP Tag
+                ifd0Id, tiffEp, unsignedShort, 2, printValue), // TIFF/EP Tag
         TagInfo(0x828e, "CFAPattern", N_("CFA Pattern"),
                 N_("Indicates the color filter array (CFA) geometric pattern of the image "
                 "sensor when a one-chip color area sensor is used. It does not apply to "
                 "all sensing methods"),
-                ifd0Id, tiffEp, unsignedByte, printValue), // TIFF/EP Tag
+                ifd0Id, tiffEp, unsignedByte, -1, printValue), // TIFF/EP Tag
         TagInfo(0x828f, "BatteryLevel", N_("Battery Level"),
                 "Contains a value of the battery level as a fraction or string",
-                ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP Tag
+                ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP Tag
         TagInfo(0x8298, "Copyright", N_("Copyright"),
                 N_("Copyright information. In this standard the tag is used to "
                 "indicate both the photographer and editor copyrights. It is "
@@ -596,93 +783,93 @@
                 "consists of one space followed by a terminating NULL code, then "
                 "the editor copyright is given. When the field is left blank, it is "
                 "treated as unknown."),
-                ifd0Id, otherTags, asciiString, print0x8298),
-        TagInfo(0x829a, "ExposureTime", N_("Exposure Time"), N_("Exposure time, given in seconds."), ifd0Id, tiffEp, unsignedRational, print0x829a), // TIFF/EP tag
-        TagInfo(0x829d, "FNumber", N_("FNumber"), N_("The F number."), ifd0Id, tiffEp, unsignedRational, print0x829d), // TIFF/EP tag
+                ifd0Id, otherTags, asciiString, 0, print0x8298),
+        TagInfo(0x829a, "ExposureTime", N_("Exposure Time"), N_("Exposure time, given in seconds."), ifd0Id, tiffEp, unsignedRational, 1, print0x829a), // TIFF/EP tag
+        TagInfo(0x829d, "FNumber", N_("FNumber"), N_("The F number."), ifd0Id, tiffEp, unsignedRational, 1, print0x829d), // TIFF/EP tag
         TagInfo(0x83bb, "IPTCNAA", N_("IPTC/NAA"),
                 N_("Contains an IPTC/NAA record"),
-                ifd0Id, tiffEp, unsignedLong, printValue), // TIFF/EP Tag
+                ifd0Id, tiffEp, unsignedLong, 0, printValue), // TIFF/EP Tag
         TagInfo(0x8649, "ImageResources", N_("Image Resources Block"),
                 N_("Contains information embedded by the Adobe Photoshop application"),
-                ifd0Id, otherTags, unsignedByte, printValue),
+                ifd0Id, otherTags, unsignedByte, -1, printValue),
         TagInfo(0x8769, "ExifTag", N_("Exif IFD Pointer"),
                 N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the "
                 "same structure as that of the IFD specified in TIFF. "
                 "ordinarily, however, it does not contain image data as in "
                 "the case of TIFF."),
-                ifd0Id, exifFormat, unsignedLong, printValue),
+                ifd0Id, exifFormat, unsignedLong, 1, printValue),
         TagInfo(0x8773, "InterColorProfile", N_("Inter Color Profile"),
                 N_("Contains an InterColor Consortium (ICC) format color space characterization/profile"),
-                ifd0Id, tiffEp, undefined, printValue),
-        TagInfo(0x8822, "ExposureProgram", N_("Exposure Program"), N_("The class of the program used by the camera to set exposure when the picture is taken."), ifd0Id, tiffEp, unsignedShort, print0x8822), // TIFF/EP tag
-        TagInfo(0x8824, "SpectralSensitivity", N_("Spectral Sensitivity"), N_("Indicates the spectral sensitivity of each channel of the camera used."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag
+                ifd0Id, tiffEp, undefined, -1, printValue),
+        TagInfo(0x8822, "ExposureProgram", N_("Exposure Program"), N_("The class of the program used by the camera to set exposure when the picture is taken."), ifd0Id, tiffEp, unsignedShort, 1, print0x8822), // TIFF/EP tag
+        TagInfo(0x8824, "SpectralSensitivity", N_("Spectral Sensitivity"), N_("Indicates the spectral sensitivity of each channel of the camera used."), ifd0Id, tiffEp, asciiString, 0, printValue), // TIFF/EP tag
         TagInfo(0x8825, "GPSTag", N_("GPS Info IFD Pointer"),
                 N_("A pointer to the GPS Info IFD. The "
                 "Interoperability structure of the GPS Info IFD, like that of "
                 "Exif IFD, has no image data."),
-                ifd0Id, exifFormat, unsignedLong, printValue),
-        TagInfo(0x8827, "ISOSpeedRatings", N_("ISO Speed Ratings"), N_("Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."), ifd0Id, tiffEp, unsignedShort, print0x8827), // TIFF/EP tag
-        TagInfo(0x8828, "OECF", N_("OECF"), N_("Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524."), ifd0Id, tiffEp, undefined, printValue), // TIFF/EP tag
-        TagInfo(0x8829, "Interlace", N_("Interlace"), N_("Indicates the field number of multifield images."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag
+                ifd0Id, exifFormat, unsignedLong, 1, printValue),
+        TagInfo(0x8827, "ISOSpeedRatings", N_("ISO Speed Ratings"), N_("Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."), ifd0Id, tiffEp, unsignedShort, 0, print0x8827), // TIFF/EP tag
+        TagInfo(0x8828, "OECF", N_("OECF"), N_("Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524."), ifd0Id, tiffEp, undefined, 0, printValue), // TIFF/EP tag
+        TagInfo(0x8829, "Interlace", N_("Interlace"), N_("Indicates the field number of multifield images."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag
         TagInfo(0x882a, "TimeZoneOffset", N_("Time Zone Offset"),
                 N_("This optional tag encodes the time zone of the camera clock (relative"
                    "to Greenwich Mean Time) used to create the DataTimeOriginal tag-value"
                    "when the picture was taken. It may also contain the time zone offset"
                    "of the clock used to create the DateTime tag-value when the image was"
                    "modified."),
-                ifd0Id, tiffEp, signedShort, printValue),
-        TagInfo(0x882b, "SelfTimerMode", N_("Self Timer Mode"), N_("Number of seconds image capture was delayed from button press."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag
-        TagInfo(0x9003, "DateTimeOriginal", N_("Date Time Original"), N_("The date and time when the original image data was generated."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag
-        TagInfo(0x9102, "CompressedBitsPerPixel", N_("Compressed Bits Per Pixel"), N_("Specific to compressed data; states the compressed bits per pixel."), ifd0Id, tiffEp, unsignedRational, printFloat), // TIFF/EP tag
-        TagInfo(0x9201, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed."), ifd0Id, tiffEp, unsignedRational, print0x9201), // TIFF/EP tag
-        TagInfo(0x9202, "ApertureValue", N_("Aperture Value"), N_("The lens aperture."), ifd0Id, tiffEp, unsignedRational, print0x9202), // TIFF/EP tag
-        TagInfo(0x9203, "BrightnessValue", N_("Brightness Value"), N_("The value of brightness."), ifd0Id, tiffEp, signedRational, printFloat), // TIFF/EP tag
-        TagInfo(0x9204, "ExposureBiasValue", N_("Exposure Bias Value"), N_("The exposure bias."), ifd0Id, tiffEp, signedRational, print0x9204), // TIFF/EP tag
-        TagInfo(0x9205, "MaxApertureValue", N_("Max Aperture Value"), N_("The smallest F number of the lens."), ifd0Id, tiffEp, unsignedRational, print0x9202), // TIFF/EP tag
-        TagInfo(0x9206, "SubjectDistance", N_("Subject Distance"), N_("The distance to the subject, given in meters."), ifd0Id, tiffEp, signedRational, print0x9206), // TIFF/EP tag
-        TagInfo(0x9207, "MeteringMode", N_("Metering Mode"), N_("The metering mode."), ifd0Id, tiffEp, unsignedShort, print0x9207), // TIFF/EP tag
-        TagInfo(0x9208, "LightSource", N_("Light Source"), N_("The kind of light source."), ifd0Id, tiffEp, unsignedShort, print0x9208), // TIFF/EP tag
-        TagInfo(0x9209, "Flash", N_("Flash"), N_("Indicates the status of flash when the image was shot."), ifd0Id, tiffEp, unsignedShort, EXV_PRINT_TAG(exifFlash)), // TIFF/EP tag
-        TagInfo(0x920a, "FocalLength", N_("Focal Length"), N_("The actual focal length of the lens, in mm."), ifd0Id, tiffEp, unsignedRational, print0x920a), // TIFF/EP tag
-        TagInfo(0x920b, "FlashEnergy", N_("Flash Energy"), N_("Amount of flash energy (BCPS)."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag
-        TagInfo(0x920c, "SpatialFrequencyResponse", N_("Spatial Frequency Response"), N_("SFR of the camera."), ifd0Id, tiffEp, undefined, printValue), // TIFF/EP tag
-        TagInfo(0x920d, "Noise", N_("Noise"), N_("Noise measurement values."), ifd0Id, tiffEp, undefined, printValue), // TIFF/EP tag
-        TagInfo(0x920e, "FocalPlaneXResolution", N_("Focal Plane X Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag
-        TagInfo(0x920f, "FocalPlaneYResolution", N_("Focal Plane Y Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag
-        TagInfo(0x9210, "FocalPlaneResolutionUnit", N_("Focal Plane Resolution Unit"), N_("Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391)."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag
-        TagInfo(0x9211, "ImageNumber", N_("Image Number"), N_("Number assigned to an image, e.g., in a chained image burst."), ifd0Id, tiffEp, unsignedLong, printValue), // TIFF/EP tag
-        TagInfo(0x9212, "SecurityClassification", N_("Security Classification"), N_("Security classification assigned to the image."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag
-        TagInfo(0x9213, "ImageHistory", N_("Image History"), N_("Record of what has been done to the image."), ifd0Id, tiffEp, asciiString, printValue), // TIFF/EP tag
-        TagInfo(0x9214, "SubjectLocation", N_("Subject Location"), N_("Indicates the location and area of the main subject in the overall scene."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag
-        TagInfo(0x9215, "ExposureIndex", N_("Exposure Index"), N_("Encodes the camera exposure index setting when image was captured."), ifd0Id, tiffEp, unsignedRational, printValue), // TIFF/EP tag
+                ifd0Id, tiffEp, signedShort, -1, printValue),
+        TagInfo(0x882b, "SelfTimerMode", N_("Self Timer Mode"), N_("Number of seconds image capture was delayed from button press."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag
+        TagInfo(0x9003, "DateTimeOriginal", N_("Date Time Original"), N_("The date and time when the original image data was generated."), ifd0Id, tiffEp, asciiString, 20, printValue), // TIFF/EP tag
+        TagInfo(0x9102, "CompressedBitsPerPixel", N_("Compressed Bits Per Pixel"), N_("Specific to compressed data; states the compressed bits per pixel."), ifd0Id, tiffEp, unsignedRational, 1, printFloat), // TIFF/EP tag
+        TagInfo(0x9201, "ShutterSpeedValue", N_("Shutter Speed Value"), N_("Shutter speed."), ifd0Id, tiffEp, signedRational, 1, print0x9201), // TIFF/EP tag
+        TagInfo(0x9202, "ApertureValue", N_("Aperture Value"), N_("The lens aperture."), ifd0Id, tiffEp, unsignedRational, 1, print0x9202), // TIFF/EP tag
+        TagInfo(0x9203, "BrightnessValue", N_("Brightness Value"), N_("The value of brightness."), ifd0Id, tiffEp, signedRational, 1, printFloat), // TIFF/EP tag
+        TagInfo(0x9204, "ExposureBiasValue", N_("Exposure Bias Value"), N_("The exposure bias."), ifd0Id, tiffEp, signedRational, 1, print0x9204), // TIFF/EP tag
+        TagInfo(0x9205, "MaxApertureValue", N_("Max Aperture Value"), N_("The smallest F number of the lens."), ifd0Id, tiffEp, unsignedRational, 1, print0x9202), // TIFF/EP tag
+        TagInfo(0x9206, "SubjectDistance", N_("Subject Distance"), N_("The distance to the subject, given in meters."), ifd0Id, tiffEp, signedRational, 1, print0x9206), // TIFF/EP tag
+        TagInfo(0x9207, "MeteringMode", N_("Metering Mode"), N_("The metering mode."), ifd0Id, tiffEp, unsignedShort, 1, print0x9207), // TIFF/EP tag
+        TagInfo(0x9208, "LightSource", N_("Light Source"), N_("The kind of light source."), ifd0Id, tiffEp, unsignedShort, 1, print0x9208), // TIFF/EP tag
+        TagInfo(0x9209, "Flash", N_("Flash"), N_("Indicates the status of flash when the image was shot."), ifd0Id, tiffEp, unsignedShort, 1, EXV_PRINT_TAG(exifFlash)), // TIFF/EP tag
+        TagInfo(0x920a, "FocalLength", N_("Focal Length"), N_("The actual focal length of the lens, in mm."), ifd0Id, tiffEp, unsignedRational, 1, print0x920a), // TIFF/EP tag
+        TagInfo(0x920b, "FlashEnergy", N_("Flash Energy"), N_("Amount of flash energy (BCPS)."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag
+        TagInfo(0x920c, "SpatialFrequencyResponse", N_("Spatial Frequency Response"), N_("SFR of the camera."), ifd0Id, tiffEp, undefined, 0, printValue), // TIFF/EP tag
+        TagInfo(0x920d, "Noise", N_("Noise"), N_("Noise measurement values."), ifd0Id, tiffEp, undefined, 0, printValue), // TIFF/EP tag
+        TagInfo(0x920e, "FocalPlaneXResolution", N_("Focal Plane X Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageWidth direction for main image."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag
+        TagInfo(0x920f, "FocalPlaneYResolution", N_("Focal Plane Y Resolution"), N_("Number of pixels per FocalPlaneResolutionUnit (37392) in ImageLength direction for main image."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag
+        TagInfo(0x9210, "FocalPlaneResolutionUnit", N_("Focal Plane Resolution Unit"), N_("Unit of measurement for FocalPlaneXResolution(37390) and FocalPlaneYResolution(37391)."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag
+        TagInfo(0x9211, "ImageNumber", N_("Image Number"), N_("Number assigned to an image, e.g., in a chained image burst."), ifd0Id, tiffEp, unsignedLong, 1, printValue), // TIFF/EP tag
+        TagInfo(0x9212, "SecurityClassification", N_("Security Classification"), N_("Security classification assigned to the image."), ifd0Id, tiffEp, asciiString, 0, printValue), // TIFF/EP tag
+        TagInfo(0x9213, "ImageHistory", N_("Image History"), N_("Record of what has been done to the image."), ifd0Id, tiffEp, asciiString, 0, printValue), // TIFF/EP tag
+        TagInfo(0x9214, "SubjectLocation", N_("Subject Location"), N_("Indicates the location and area of the main subject in the overall scene."), ifd0Id, tiffEp, unsignedShort, 2, printValue), // TIFF/EP tag
+        TagInfo(0x9215, "ExposureIndex", N_("Exposure Index"), N_("Encodes the camera exposure index setting when image was captured."), ifd0Id, tiffEp, unsignedRational, 1, printValue), // TIFF/EP tag
         TagInfo(0x9216, "TIFFEPStandardID", N_("TIFF/EP Standard ID"),
                 N_("Contains four ASCII characters representing the TIFF/EP standard "
                 "version of a TIFF/EP file, eg '1', '0', '0', '0'"),
-                ifd0Id, tiffEp, unsignedByte, printValue), // TIFF/EP Tag
-        TagInfo(0x9217, "SensingMethod", N_("Sensing Method"), N_("Type of image sensor."), ifd0Id, tiffEp, unsignedShort, printValue), // TIFF/EP tag
+                ifd0Id, tiffEp, unsignedByte, 4, printValue), // TIFF/EP Tag
+        TagInfo(0x9217, "SensingMethod", N_("Sensing Method"), N_("Type of image sensor."), ifd0Id, tiffEp, unsignedShort, 1, printValue), // TIFF/EP tag
         TagInfo(0x9c9b, "XPTitle", N_("Windows Title"),
                 N_("Title tag used by Windows, encoded in UCS2"),
-                ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag
+                ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag
         TagInfo(0x9c9c, "XPComment", N_("Windows Comment"),
                 N_("Comment tag used by Windows, encoded in UCS2"),
-                ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag
+                ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag
         TagInfo(0x9c9d, "XPAuthor", N_("Windows Author"),
                 N_("Author tag used by Windows, encoded in UCS2"),
-                ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag
+                ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag
         TagInfo(0x9c9e, "XPKeywords", N_("Windows Keywords"),
                 N_("Keywords tag used by Windows, encoded in UCS2"),
-                ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag
+                ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag
         TagInfo(0x9c9f, "XPSubject", N_("Windows Subject"),
                 N_("Subject tag used by Windows, encoded in UCS2"),
-                ifd0Id, otherTags, unsignedByte, printUcs2), // Windows Tag
+                ifd0Id, otherTags, unsignedByte, -1, printUcs2), // Windows Tag
         TagInfo(0xc4a5, "PrintImageMatching", N_("Print Image Matching"),
-                N_("Print Image Matching, descriptiont needed."),
-                ifd0Id, otherTags, undefined, printValue),
+                N_("Print Image Matching, description needed."),
+                ifd0Id, otherTags, undefined, -1, printValue),
         TagInfo(0xc612, "DNGVersion", N_("DNG version"),
                 N_("This tag encodes the DNG four-tier version number. For files "
                    "compliant with version 1.1.0.0 of the DNG specification, this "
                    "tag should contain the bytes: 1, 1, 0, 0."),
-                ifd0Id, dngTags, unsignedByte, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedByte, 4, printValue), // DNG tag
         TagInfo(0xc613, "DNGBackwardVersion", N_("DNG backward version"),
                 N_("This tag specifies the oldest version of the Digital Negative "
                    "specification for which a file is compatible. Readers should"
@@ -691,7 +878,7 @@
                    "the reader was based on.  In addition to checking the version tags, "
                    "readers should, for all tags, check the types, counts, and values, "
                    "to verify it is able to correctly read the file."),
-                ifd0Id, dngTags, unsignedByte, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedByte, 4, printValue), // DNG tag
         TagInfo(0xc614, "UniqueCameraModel", N_("Unique Camera Model"),
                 N_("Defines a unique, non-localized name for the camera model that "
                    "created the image in the raw file. This name should include the "
@@ -699,56 +886,56 @@
                    "even if the camera name itself is localized for different markets "
                    "(see LocalizedCameraModel). This string may be used by reader "
                    "software to index into per-model preferences and replacement profiles."),
-                ifd0Id, dngTags, asciiString, printValue), // DNG tag
+                ifd0Id, dngTags, asciiString, 0, printValue), // DNG tag
         TagInfo(0xc615, "LocalizedCameraModel", N_("Localized Camera Model"),
                 N_("Similar to the UniqueCameraModel field, except the name can be "
                    "localized for different markets to match the localization of the "
                    "camera name."),
-                ifd0Id, dngTags, unsignedByte, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedByte, 0, printValue), // DNG tag
         TagInfo(0xc616, "CFAPlaneColor", N_("CFA Plane Color"),
                 N_("Provides a mapping between the values in the CFAPattern tag and the "
                    "plane numbers in LinearRaw space. This is a required tag for non-RGB "
                    "CFA images."),
-                ifd0Id, dngTags, unsignedByte, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedByte, -1, printValue), // DNG tag
         TagInfo(0xc617, "CFALayout", N_("CFA Layout"),
                 N_("Describes the spatial layout of the CFA."),
-                ifd0Id, dngTags, unsignedShort, EXV_PRINT_TAG(exifCfaLayout)), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 1, EXV_PRINT_TAG(exifCfaLayout)), // DNG tag
         TagInfo(0xc618, "LinearizationTable", N_("Linearization Table"),
                 N_("Describes a lookup table that maps stored values into linear values. "
                    "This tag is typically used to increase compression ratios by storing "
                    "the raw data in a non-linear, more visually uniform space with fewer "
                    "total encoding levels. If SamplesPerPixel is not equal to one, this "
                    "single table applies to all the samples for each pixel."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag
         TagInfo(0xc619, "BlackLevelRepeatDim", N_("Black Level Repeat Dim"),
                 N_("Specifies repeat pattern size for the BlackLevel tag."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag
         TagInfo(0xc61a, "BlackLevel", N_("Black Level"),
                 N_("Specifies the zero light (a.k.a. thermal black or black current) "
                    "encoding level, as a repeating pattern. The origin of this pattern "
                    "is the top-left corner of the ActiveArea rectangle. The values are "
                    "stored in row-column-sample scan order."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, -1, printValue), // DNG tag
         TagInfo(0xc61b, "BlackLevelDeltaH", N_("Black Level Delta H"),
                 N_("If the zero light encoding level is a function of the image column, "
                    "BlackLevelDeltaH specifies the difference between the zero light "
                    "encoding level for each column and the baseline zero light encoding "
                    "level. If SamplesPerPixel is not equal to one, this single table "
                    "applies to all the samples for each pixel."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc61c, "BlackLevelDeltaV", N_("Black Level Delta V"),
                 N_("If the zero light encoding level is a function of the image row, "
                    "this tag specifies the difference between the zero light encoding "
                    "level for each row and the baseline zero light encoding level. If "
                    "SamplesPerPixel is not equal to one, this single table applies to "
                    "all the samples for each pixel."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc61d, "WhiteLevel", N_("White Level"),
                 N_("This tag specifies the fully saturated encoding level for the raw "
                    "sample values. Saturation is caused either by the sensor itself "
                    "becoming highly non-linear in response, or by the camera's analog "
                    "to digital converter clipping."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag
         TagInfo(0xc61e, "DefaultScale", N_("Default Scale"),
                 N_("DefaultScale is required for cameras with non-square pixels. It "
                    "specifies the default scale factors for each direction to convert "
@@ -756,7 +943,7 @@
                    "to approximately preserve total pixel count. For CFA images that "
                    "use CFALayout equal to 2, 3, 4, or 5, such as the Fujifilm SuperCCD, "
                    "these two values should usually differ by a factor of 2.0."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 2, printValue), // DNG tag
         TagInfo(0xc61f, "DefaultCropOrigin", N_("Default Crop Origin"),
                 N_("Raw images often store extra pixels around the edges of the final "
                    "image. These extra pixels help prevent interpolation artifacts near "
@@ -764,27 +951,27 @@
                    "of the final image area, in raw image coordinates (i.e., before the "
                    "DefaultScale has been applied), relative to the top-left corner of "
                    "the ActiveArea rectangle."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag
         TagInfo(0xc620, "DefaultCropSize", N_("Default Crop Size"),
                 N_("Raw images often store extra pixels around the edges of the final "
                    "image. These extra pixels help prevent interpolation artifacts near "
                    "the edges of the final image. DefaultCropSize specifies the size of "
                    "the final image area, in raw image coordinates (i.e., before the "
                    "DefaultScale has been applied)."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 2, printValue), // DNG tag
         TagInfo(0xc621, "ColorMatrix1", N_("Color Matrix 1"),
                 N_("ColorMatrix1 defines a transformation matrix that converts XYZ "
                    "values to reference camera native color space values, under the "
                    "first calibration illuminant. The matrix values are stored in row "
                    "scan order. The ColorMatrix1 tag is required for all non-monochrome "
                    "DNG files."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc622, "ColorMatrix2", N_("Color Matrix 2"),
                 N_("ColorMatrix2 defines a transformation matrix that converts XYZ "
                    "values to reference camera native color space values, under the "
                    "second calibration illuminant. The matrix values are stored in row "
                    "scan order."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc623, "CameraCalibration1", N_("Camera Calibration 1"),
                 N_("CameraClalibration1 defines a calibration matrix that transforms "
                    "reference camera native space values to individual camera native "
@@ -794,7 +981,7 @@
                    "swap in replacement color matrices based on UniqueCameraModel tag, "
                    "while still taking advantage of any per-individual camera calibration "
                    "performed by the camera manufacturer."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc624, "CameraCalibration2", N_("Camera Calibration 2"),
                 N_("CameraCalibration2 defines a calibration matrix that transforms "
                    "reference camera native space values to individual camera native "
@@ -804,21 +991,21 @@
                    "swap in replacement color matrices based on UniqueCameraModel tag, "
                    "while still taking advantage of any per-individual camera calibration "
                    "performed by the camera manufacturer."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc625, "ReductionMatrix1", N_("Reduction Matrix 1"),
                 N_("ReductionMatrix1 defines a dimensionality reduction matrix for use as "
                    "the first stage in converting color camera native space values to XYZ "
                    "values, under the first calibration illuminant. This tag may only be "
                    "used if ColorPlanes is greater than 3. The matrix is stored in row "
                    "scan order."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc626, "ReductionMatrix2", N_("Reduction Matrix 2"),
                 N_("ReductionMatrix2 defines a dimensionality reduction matrix for use as "
                    "the first stage in converting color camera native space values to XYZ "
                    "values, under the second calibration illuminant. This tag may only be "
                    "used if ColorPlanes is greater than 3. The matrix is stored in row "
                    "scan order."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc627, "AnalogBalance", N_("Analog Balance"),
                 N_("Normally the stored raw values are not white balanced, since any "
                    "digital white balancing will reduce the dynamic range of the final "
@@ -828,18 +1015,18 @@
                    "range of the final image. AnalogBalance defines the gain, either "
                    "analog (recommended) or digital (not recommended) that has been "
                    "applied the stored raw values."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, -1, printValue), // DNG tag
         TagInfo(0xc628, "AsShotNeutral", N_("As Shot Neutral"),
                 N_("Specifies the selected white balance at time of capture, encoded as "
                    "the coordinates of a perfectly neutral color in linear reference "
                    "space values. The inclusion of this tag precludes the inclusion of "
                    "the AsShotWhiteXY tag."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag
         TagInfo(0xc629, "AsShotWhiteXY", N_("As Shot White XY"),
                 N_("Specifies the selected white balance at time of capture, encoded as "
                    "x-y chromaticity coordinates. The inclusion of this tag precludes "
                    "the inclusion of the AsShotNeutral tag."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 2, printValue), // DNG tag
         TagInfo(0xc62a, "BaselineExposure", N_("Baseline Exposure"),
                 N_("Camera models vary in the trade-off they make between highlight "
                    "headroom and shadow noise. Some leave a significant amount of "
@@ -854,21 +1041,21 @@
                    "(in EV units) to move the zero point. Positive values result in "
                    "brighter default results, while negative values result in darker "
                    "default results."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, 1, printValue), // DNG tag
         TagInfo(0xc62b, "BaselineNoise", N_("Baseline Noise"),
                 N_("Specifies the relative noise level of the camera model at a baseline "
                    "ISO value of 100, compared to a reference camera model. Since noise "
                    "levels tend to vary approximately with the square root of the ISO "
                    "value, a raw converter can use this value, combined with the current "
                    "ISO, to estimate the relative noise level of the current image."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag
         TagInfo(0xc62c, "BaselineSharpness", N_("Baseline Sharpness"),
                 N_("Specifies the relative amount of sharpening required for this camera "
                    "model, compared to a reference camera model. Camera models vary in "
                    "the strengths of their anti-aliasing filters. Cameras with weak or "
                    "no filters require less sharpening than cameras with strong "
                    "anti-aliasing filters."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag
         TagInfo(0xc62d, "BayerGreenSplit", N_("Bayer Green Split"),
                 N_("Only applies to CFA images using a Bayer pattern filter array. This "
                    "tag specifies, in arbitrary units, how closely the values of the "
@@ -877,7 +1064,7 @@
                    "of green pixels track closely, while a non-zero value means they "
                    "sometimes diverge. The useful range for this tag is from 0 (no "
                    "divergence) to about 5000 (quite large divergence)."),
-                ifd0Id, dngTags, unsignedLong, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedLong, 1, printValue), // DNG tag
         TagInfo(0xc62e, "LinearResponseLimit", N_("Linear Response Limit"),
                 N_("Some sensors have an unpredictable non-linearity in their response "
                    "as they near the upper limit of their encoding range. This "
@@ -885,15 +1072,15 @@
                    "resulting image unless the raw converter compensates for this effect. "
                    "LinearResponseLimit specifies the fraction of the encoding range "
                    "above which the response may become significantly non-linear."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag
         TagInfo(0xc62f, "CameraSerialNumber", N_("Camera Serial Number"),
                 N_("CameraSerialNumber contains the serial number of the camera or camera "
                    "body that captured the image."),
-                ifd0Id, dngTags, asciiString, printValue), // DNG tag
+                ifd0Id, dngTags, asciiString, 0, printValue), // DNG tag
         TagInfo(0xc630, "LensInfo", N_("Lens Info"),
                 N_("Contains information about the lens that captured the image. If the "
                    "minimum f-stops are unknown, they should be encoded as 0/0."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 4, printValue), // DNG tag
         TagInfo(0xc631, "ChromaBlurRadius", N_("Chroma Blur Radius"),
                 N_("ChromaBlurRadius provides a hint to the DNG reader about how much "
                    "chroma blur should be applied to the image. If this tag is omitted, "
@@ -902,23 +1089,23 @@
                    "amount of chroma blur required for mosaic images is highly dependent "
                    "on the de-mosaic algorithm, in which case the DNG reader's default "
                    "value is likely optimized for its particular de-mosaic algorithm."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag
         TagInfo(0xc632, "AntiAliasStrength", N_("Anti Alias Strength"),
                 N_("Provides a hint to the DNG reader about how strong the camera's "
                    "anti-alias filter is. A value of 0.0 means no anti-alias filter "
                    "(i.e., the camera is prone to aliasing artifacts with some subjects), "
                    "while a value of 1.0 means a strong anti-alias filter (i.e., the "
                    "camera almost never has aliasing artifacts)."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag
         TagInfo(0xc633, "ShadowScale", N_("Shadow Scale"),
                 N_("This tag is used by Adobe Camera Raw to control the sensitivity of "
                    "its 'Shadows' slider."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, 1, printValue), // DNG tag
         TagInfo(0xc634, "DNGPrivateData", N_("DNG Private Data"),
                 N_("Provides a way for camera manufacturers to store private data in the "
                    "DNG file for use by their own raw converters, and to have that data "
                    "preserved by programs that edit DNG files."),
-                ifd0Id, dngTags, unsignedByte, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedByte, -1, printValue), // DNG tag
         TagInfo(0xc635, "MakerNoteSafety", N_("MakerNote Safety"),
                 N_("MakerNoteSafety lets the DNG reader know whether the EXIF MakerNote "
                    "tag is safe to preserve along with the rest of the EXIF data. File "
@@ -926,20 +1113,20 @@
                    "with a preserved MakerNote should be aware that any thumbnail "
                    "image embedded in the MakerNote may be stale, and may not reflect "
                    "the current state of the full size image."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 1, printValue), // DNG tag
         TagInfo(0xc65a, "CalibrationIlluminant1", N_("Calibration Illuminant 1"),
                 N_("The illuminant used for the first set of color calibration tags "
                    "(ColorMatrix1, CameraCalibration1, ReductionMatrix1). The legal "
                    "values for this tag are the same as the legal values for the "
                    "LightSource EXIF tag."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 1, printValue), // DNG tag
         TagInfo(0xc65b, "CalibrationIlluminant2", N_("Calibration Illuminant 2"),
                 N_("The illuminant used for an optional second set of color calibration "
                    "tags (ColorMatrix2, CameraCalibration2, ReductionMatrix2). The legal "
                    "values for this tag are the same as the legal values for the "
                    "CalibrationIlluminant1 tag; however, if both are included, neither "
                    "is allowed to have a value of 0 (unknown)."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 1, printValue), // DNG tag
         TagInfo(0xc65c, "BestQualityScale", N_("Best Quality Scale"),
                 N_("For some cameras, the best possible image quality is not achieved "
                    "by preserving the total pixel count during conversion. For example, "
@@ -947,7 +1134,7 @@
                    "count is doubled. This tag specifies the amount by which the values "
                    "of the DefaultScale tag need to be multiplied to achieve the best "
                    "quality image size."),
-                ifd0Id, dngTags, unsignedRational, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedRational, 1, printValue), // DNG tag
         TagInfo(0xc65d, "RawDataUniqueID", N_("Raw Data Unique ID"),
                 N_("This tag contains a 16-byte unique identifier for the raw image data "
                    "in the DNG file. DNG readers can use this tag to recognize a "
@@ -956,11 +1143,11 @@
                    "an identifier, it should do so using an algorithm that will ensure "
                    "that it is very unlikely two different images will end up having the "
                    "same identifier."),
-                ifd0Id, dngTags, unsignedByte, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedByte, 16, printValue), // DNG tag
         TagInfo(0xc68b, "OriginalRawFileName", N_("Original Raw File Name"),
                 N_("If the DNG file was converted from a non-DNG raw file, then this tag "
                    "contains the file name of that original raw file."),
-                ifd0Id, dngTags, unsignedByte, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedByte, 0, printValue), // DNG tag
         TagInfo(0xc68c, "OriginalRawFileData", N_("Original Raw File Data"),
                 N_("If the DNG file was converted from a non-DNG raw file, then this tag "
                    "contains the compressed contents of that original raw file. The "
@@ -971,11 +1158,11 @@
                    "also detect the case where data blocks are missing from the end of "
                    "the sequence, and should assume a default value for all the missing "
                    "blocks. There are no padding or alignment bytes between data blocks."),
-                ifd0Id, dngTags, undefined, printValue), // DNG tag
+                ifd0Id, dngTags, undefined, -1, printValue), // DNG tag
         TagInfo(0xc68d, "ActiveArea", N_("Active Area"),
                 N_("This rectangle defines the active (non-masked) pixels of the sensor. "
                    "The order of the rectangle coordinates is: top, left, bottom, right."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, 4, printValue), // DNG tag
         TagInfo(0xc68e, "MaskedAreas", N_("Masked Areas"),
                 N_("This tag contains a list of non-overlapping rectangle coordinates of "
                    "fully masked pixels, which can be optionally used by DNG readers "
@@ -983,7 +1170,7 @@
                    "coordinates is: top, left, bottom, right. If the raw image data has "
                    "already had its black encoding level subtracted, then this tag should "
                    "not be used, since the masked pixels are no longer useful."),
-                ifd0Id, dngTags, unsignedShort, printValue), // DNG tag
+                ifd0Id, dngTags, unsignedShort, -1, printValue), // DNG tag
         TagInfo(0xc68f, "AsShotICCProfile", N_("As-Shot ICC Profile"),
                 N_("This tag contains an ICC profile that, in conjunction with the "
                    "AsShotPreProfileMatrix tag, provides the camera manufacturer with a "
@@ -995,7 +1182,7 @@
                    "means that the rendering in this profile should include any desired "
                    "tone and gamut mapping needed to convert between scene referred "
                    "values and output referred values."),
-                ifd0Id, dngTags, undefined, printValue), // DNG tag
+                ifd0Id, dngTags, undefined, -1, printValue), // DNG tag
         TagInfo(0xc690, "AsShotPreProfileMatrix", N_("As-Shot Pre-Profile Matrix"),
                 N_("This tag is used in conjunction with the AsShotICCProfile tag. It "
                    "specifies a matrix that should be applied to the camera color space "
@@ -1005,28 +1192,28 @@
                    "matrix can (but is not required to) reduce the dimensionality of the "
                    "color data down to three components, in which case the AsShotICCProfile "
                    "should have three rather than ColorPlanes input components."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         TagInfo(0xc691, "CurrentICCProfile", N_("Current ICC Profile"),
                 N_("This tag is used in conjunction with the CurrentPreProfileMatrix tag. "
                    "The CurrentICCProfile and CurrentPreProfileMatrix tags have the same "
                    "purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix "
                    "tag pair, except they are for use by raw file editors rather than "
                    "camera manufacturers."),
-                ifd0Id, dngTags, undefined, printValue), // DNG tag
+                ifd0Id, dngTags, undefined, -1, printValue), // DNG tag
         TagInfo(0xc692, "CurrentPreProfileMatrix", N_("Current Pre-Profile Matrix"),
                 N_("This tag is used in conjunction with the CurrentICCProfile tag. "
                    "The CurrentICCProfile and CurrentPreProfileMatrix tags have the same "
                    "purpose and usage as the AsShotICCProfile and AsShotPreProfileMatrix "
                    "tag pair, except they are for use by raw file editors rather than "
                    "camera manufacturers."),
-                ifd0Id, dngTags, signedRational, printValue), // DNG tag
+                ifd0Id, dngTags, signedRational, -1, printValue), // DNG tag
         // End of list marker
         TagInfo(0xffff, "(UnknownIfdTag)", N_("Unknown IFD tag"),
                 N_("Unknown IFD tag"),
-                ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue)
+                ifd0Id, sectionIdNotSet, asciiString, -1, printValue)
     };
 
-    const TagInfo* ExifTags::ifdTagList()
+    const TagInfo* ifdTagList()
     {
         return ifdTagInfo;
     }
@@ -1053,7 +1240,8 @@
         { 4,   N_("Multi-spot")              },
         { 5,   N_("Multi-segment")           },
         { 6,   N_("Partial")                 },
-        { 255, N_("Other")                   }
+        { 255, N_("Other")                   },
+        { 255, N_("Other")                   }  // To silence compiler warning
     };
 
     //! LightSource, tag 0x9208
@@ -1135,7 +1323,8 @@
         { 0, N_("Standard")    },
         { 1, N_("Landscape")   },
         { 2, N_("Portrait")    },
-        { 3, N_("Night scene") }
+        { 3, N_("Night scene") },
+        { 3, N_("Night scene") }                // To silence compiler warning
     };
 
     //! GainControl, tag 0xa407
@@ -1166,46 +1355,47 @@
         { 0, N_("Unknown")      },
         { 1, N_("Macro")        },
         { 2, N_("Close view")   },
-        { 3, N_("Distant view") }
+        { 3, N_("Distant view") },
+        { 3, N_("Distant view") }               // To silence compiler warning
     };
 
     // Exif IFD Tags
     static const TagInfo exifTagInfo[] = {
         TagInfo(0x829a, "ExposureTime", N_("Exposure Time"),
                 N_("Exposure time, given in seconds (sec)."),
-                exifIfdId, captureCond, unsignedRational, print0x829a),
+                exifId, captureCond, unsignedRational, 1, print0x829a),
         TagInfo(0x829d, "FNumber", N_("FNumber"),
                 N_("The F number."),
-                exifIfdId, captureCond, unsignedRational, print0x829d),
+                exifId, captureCond, unsignedRational, 1, print0x829d),
         TagInfo(0x8822, "ExposureProgram", N_("Exposure Program"),
                 N_("The class of the program used by the camera to set exposure "
                 "when the picture is taken."),
-                exifIfdId, captureCond, unsignedShort, print0x8822),
+                exifId, captureCond, unsignedShort, 1, print0x8822),
         TagInfo(0x8824, "SpectralSensitivity", N_("Spectral Sensitivity"),
                 N_("Indicates the spectral sensitivity of each channel of the "
                 "camera used. The tag value is an ASCII string compatible "
                 "with the standard developed by the ASTM Technical Committee."),
-                exifIfdId, captureCond, asciiString, printValue),
+                exifId, captureCond, asciiString, 0, printValue),
         TagInfo(0x8827, "ISOSpeedRatings", N_("ISO Speed Ratings"),
                 N_("Indicates the ISO Speed and ISO Latitude of the camera or "
                 "input device as specified in ISO 12232."),
-                exifIfdId, captureCond, unsignedShort, print0x8827),
+                exifId, captureCond, unsignedShort, 0, print0x8827),
         TagInfo(0x8828, "OECF", N_("Opto-Electoric Conversion Function"),
                 N_("Indicates the Opto-Electoric Conversion Function (OECF) "
                 "specified in ISO 14524. <OECF> is the relationship between "
                 "the camera optical input and the image values."),
-                exifIfdId, captureCond, undefined, printValue),
+                exifId, captureCond, undefined, 0, printValue),
         TagInfo(0x9000, "ExifVersion", N_("Exif Version"),
                 N_("The version of this standard supported. Nonexistence of this "
                 "field is taken to mean nonconformance to the standard."),
-                exifIfdId, exifVersion, undefined, printExifVersion),
+                exifId, exifVersion, undefined, 4, printExifVersion),
         TagInfo(0x9003, "DateTimeOriginal", N_("Date and Time (original)"),
                 N_("The date and time when the original image data was generated. "
                 "For a digital still camera the date and time the picture was taken are recorded."),
-                exifIfdId, dateTime, asciiString, printValue),
+                exifId, dateTime, asciiString, 20, printValue),
         TagInfo(0x9004, "DateTimeDigitized", N_("Date and Time (digitized)"),
                 N_("The date and time when the image was stored as digital data."),
-                exifIfdId, dateTime, asciiString, printValue),
+                exifId, dateTime, asciiString, 20, printValue),
         TagInfo(0x9101, "ComponentsConfiguration", N_("Components Configuration"),
                 N_("Information specific to compressed data. The channels of "
                 "each component are arranged in order from the 1st "
@@ -1215,72 +1405,72 @@
                 "express the order of Y, Cb and Cr, this tag is provided "
                 "for cases when compressed data uses components other than "
                 "Y, Cb, and Cr and to enable support of other sequences."),
-                exifIfdId, imgConfig, undefined, print0x9101),
+                exifId, imgConfig, undefined, 4, print0x9101),
         TagInfo(0x9102, "CompressedBitsPerPixel", N_("Compressed Bits per Pixel"),
                 N_("Information specific to compressed data. The compression mode "
                 "used for a compressed image is indicated in unit bits per pixel."),
-                exifIfdId, imgConfig, unsignedRational, printFloat),
+                exifId, imgConfig, unsignedRational, 1, printFloat),
         TagInfo(0x9201, "ShutterSpeedValue", N_("Shutter speed"),
                 N_("Shutter speed. The unit is the APEX (Additive System of "
                 "Photographic Exposure) setting."),
-                exifIfdId, captureCond, signedRational, print0x9201),
+                exifId, captureCond, signedRational, 1, print0x9201),
         TagInfo(0x9202, "ApertureValue", N_("Aperture"),
                 N_("The lens aperture. The unit is the APEX value."),
-                exifIfdId, captureCond, unsignedRational, print0x9202),
+                exifId, captureCond, unsignedRational, 1, print0x9202),
         TagInfo(0x9203, "BrightnessValue", N_("Brightness"),
                 N_("The value of brightness. The unit is the APEX value. "
                 "Ordinarily it is given in the range of -99.99 to 99.99."),
-                exifIfdId, captureCond, signedRational, printFloat),
+                exifId, captureCond, signedRational, 1, printFloat),
         TagInfo(0x9204, "ExposureBiasValue", N_("Exposure Bias"),
                 N_("The exposure bias. The units is the APEX value. Ordinarily "
                 "it is given in the range of -99.99 to 99.99."),
-                exifIfdId, captureCond, signedRational, print0x9204),
+                exifId, captureCond, signedRational, 1, print0x9204),
         TagInfo(0x9205, "MaxApertureValue", N_("Max Aperture Value"),
                 N_("The smallest F number of the lens. The unit is the APEX value. "
                 "Ordinarily it is given in the range of 00.00 to 99.99, "
                 "but it is not limited to this range."),
-                exifIfdId, captureCond, unsignedRational, print0x9202),
+                exifId, captureCond, unsignedRational, 1, print0x9202),
         TagInfo(0x9206, "SubjectDistance", N_("Subject Distance"),
                 N_("The distance to the subject, given in meters."),
-                exifIfdId, captureCond, unsignedRational, print0x9206),
+                exifId, captureCond, unsignedRational, 1, print0x9206),
         TagInfo(0x9207, "MeteringMode", N_("Metering Mode"),
                 N_("The metering mode."),
-                exifIfdId, captureCond, unsignedShort, print0x9207),
+                exifId, captureCond, unsignedShort, 1, print0x9207),
         TagInfo(0x9208, "LightSource", N_("Light Source"),
                 N_("The kind of light source."),
-                exifIfdId, captureCond, unsignedShort, print0x9208),
+                exifId, captureCond, unsignedShort, 1, print0x9208),
         TagInfo(0x9209, "Flash", N_("Flash"),
                 N_("This tag is recorded when an image is taken using a strobe light (flash)."),
-                exifIfdId, captureCond, unsignedShort, EXV_PRINT_TAG(exifFlash)),
+                exifId, captureCond, unsignedShort, 1, EXV_PRINT_TAG(exifFlash)),
         TagInfo(0x920a, "FocalLength", N_("Focal Length"),
                 N_("The actual focal length of the lens, in mm. Conversion is not "
                 "made to the focal length of a 35 mm film camera."),
-                exifIfdId, captureCond, unsignedRational, print0x920a),
+                exifId, captureCond, unsignedRational, 1, print0x920a),
         TagInfo(0x9214, "SubjectArea", N_("Subject Area"),
                 N_("This tag indicates the location and area of the main subject "
                 "in the overall scene."),
-                exifIfdId, captureCond, unsignedShort, printValue),
+                exifId, captureCond, unsignedShort, -1, printValue),
         TagInfo(0x927c, "MakerNote", N_("Maker Note"),
                 N_("A tag for manufacturers of Exif writers to record any desired "
                 "information. The contents are up to the manufacturer."),
-                exifIfdId, userInfo, undefined, printValue),
+                exifId, userInfo, undefined, 0, printValue),
         TagInfo(0x9286, "UserComment", N_("User Comment"),
                 N_("A tag for Exif users to write keywords or comments on the image "
                 "besides those in <ImageDescription>, and without the "
                 "character code limitations of the <ImageDescription> tag."),
-                exifIfdId, userInfo, comment, print0x9286),
+                exifId, userInfo, comment, 0, print0x9286),
         TagInfo(0x9290, "SubSecTime", N_("Sub-seconds Time"),
                 N_("A tag used to record fractions of seconds for the <DateTime> tag."),
-                exifIfdId, dateTime, asciiString, printValue),
+                exifId, dateTime, asciiString, 0, printValue),
         TagInfo(0x9291, "SubSecTimeOriginal", N_("Sub-seconds Time Original"),
                 N_("A tag used to record fractions of seconds for the <DateTimeOriginal> tag."),
-                exifIfdId, dateTime, asciiString, printValue),
+                exifId, dateTime, asciiString, 0, printValue),
         TagInfo(0x9292, "SubSecTimeDigitized", N_("Sub-seconds Time Digitized"),
                 N_("A tag used to record fractions of seconds for the <DateTimeDigitized> tag."),
-                exifIfdId, dateTime, asciiString, printValue),
+                exifId, dateTime, asciiString, 0, printValue),
         TagInfo(0xa000, "FlashpixVersion", N_("FlashPix Version"),
                 N_("The FlashPix format version supported by a FPXR file."),
-                exifIfdId, exifVersion, undefined, printExifVersion),
+                exifId, exifVersion, undefined, 4, printExifVersion),
         TagInfo(0xa001, "ColorSpace", N_("Color Space"),
                 N_("The color space information tag is always "
                 "recorded as the color space specifier. Normally sRGB "
@@ -1289,14 +1479,14 @@
                 "sRGB is used, Uncalibrated is set. Image data "
                 "recorded as Uncalibrated can be treated as sRGB when it is "
                 "converted to FlashPix."),
-                exifIfdId, imgCharacter, unsignedShort, print0xa001),
+                exifId, imgCharacter, unsignedShort, 1, print0xa001),
         TagInfo(0xa002, "PixelXDimension", N_("Pixel X Dimension"),
                 N_("Information specific to compressed data. When a "
                 "compressed file is recorded, the valid width of the "
                 "meaningful image must be recorded in this tag, whether or "
                 "not there is padding data or a restart marker. This tag "
                 "should not exist in an uncompressed file."),
-                exifIfdId, imgConfig, unsignedLong, printValue),
+                exifId, imgConfig, unsignedLong, 1, printValue),
         TagInfo(0xa003, "PixelYDimension", N_("Pixel Y Dimension"),
                 N_("Information specific to compressed data. When a compressed "
                 "file is recorded, the valid height of the meaningful image "
@@ -1305,14 +1495,14 @@
                 "uncompressed file. Since data padding is unnecessary in the vertical "
                 "direction, the number of lines recorded in this valid image height tag "
                 "will in fact be the same as that recorded in the SOF."),
-                exifIfdId, imgConfig, unsignedLong, printValue),
+                exifId, imgConfig, unsignedLong, 1, printValue),
         TagInfo(0xa004, "RelatedSoundFile", N_("Related Sound File"),
                 N_("This tag is used to record the name of an audio file related "
                 "to the image data. The only relational information "
                 "recorded here is the Exif audio file name and extension (an "
                 "ASCII string consisting of 8 characters + '.' + 3 "
                 "characters). The path is not recorded."),
-                exifIfdId, relatedFile, asciiString, printValue),
+                exifId, relatedFile, asciiString, 13, printValue),
         TagInfo(0xa005, "InteroperabilityTag", N_("Interoperability IFD Pointer"),
                 N_("Interoperability IFD is composed of tags which stores the "
                 "information to ensure the Interoperability and pointed "
@@ -1320,122 +1510,122 @@
                 "The Interoperability structure of Interoperability IFD is "
                 "the same as TIFF defined IFD structure but does not contain the "
                 "image data characteristically compared with normal TIFF IFD."),
-                exifIfdId, exifFormat, unsignedLong, printValue),
+                exifId, exifFormat, unsignedLong, 1, printValue),
         TagInfo(0xa20b, "FlashEnergy", N_("Flash Energy"),
                 N_("Indicates the strobe energy at the time the image is "
                 "captured, as measured in Beam Candle Power Seconds (BCPS)."),
-                exifIfdId, captureCond, unsignedRational, printValue),
+                exifId, captureCond, unsignedRational, 1, printValue),
         TagInfo(0xa20c, "SpatialFrequencyResponse", N_("Spatial Frequency Response"),
                 N_("This tag records the camera or input device spatial frequency "
                 "table and SFR values in the direction of image width, "
                 "image height, and diagonal direction, as specified in ISO 12233."),
-                exifIfdId, captureCond, undefined, printValue),
+                exifId, captureCond, undefined, 0, printValue),
         TagInfo(0xa20e, "FocalPlaneXResolution", N_("Focal Plane X-Resolution"),
                 N_("Indicates the number of pixels in the image width (X) direction "
                 "per <FocalPlaneResolutionUnit> on the camera focal plane."),
-                exifIfdId, captureCond, unsignedRational, printFloat),
+                exifId, captureCond, unsignedRational, 1, printFloat),
         TagInfo(0xa20f, "FocalPlaneYResolution", N_("Focal Plane Y-Resolution"),
                 N_("Indicates the number of pixels in the image height (V) direction "
                 "per <FocalPlaneResolutionUnit> on the camera focal plane."),
-                exifIfdId, captureCond, unsignedRational, printFloat),
+                exifId, captureCond, unsignedRational, 1, printFloat),
         TagInfo(0xa210, "FocalPlaneResolutionUnit", N_("Focal Plane Resolution Unit"),
                 N_("Indicates the unit for measuring <FocalPlaneXResolution> and "
                 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."),
-                exifIfdId, captureCond, unsignedShort, printExifUnit),
+                exifId, captureCond, unsignedShort, 1, printExifUnit),
         TagInfo(0xa214, "SubjectLocation", N_("Subject Location"),
                 N_("Indicates the location of the main subject in the scene. The "
                 "value of this tag represents the pixel at the center of the "
                 "main subject relative to the left edge, prior to rotation "
                 "processing as per the <Rotation> tag. The first value "
                 "indicates the X column number and second indicates the Y row number."),
-                exifIfdId, captureCond, unsignedShort, printValue),
+                exifId, captureCond, unsignedShort, 2, printValue),
         TagInfo(0xa215, "ExposureIndex", N_("Exposure index"),
                 N_("Indicates the exposure index selected on the camera or "
                 "input device at the time the image is captured."),
-                exifIfdId, captureCond, unsignedRational, printValue),
+                exifId, captureCond, unsignedRational, 1, printValue),
         TagInfo(0xa217, "SensingMethod", N_("Sensing Method"),
                 N_("Indicates the image sensor type on the camera or input device."),
-                exifIfdId, captureCond, unsignedShort, print0xa217),
+                exifId, captureCond, unsignedShort, 1, print0xa217),
         TagInfo(0xa300, "FileSource", N_("File Source"),
                 N_("Indicates the image source. If a DSC recorded the image, "
                 "this tag value of this tag always be set to 3, indicating "
                 "that the image was recorded on a DSC."),
-                exifIfdId, captureCond, undefined, print0xa300),
+                exifId, captureCond, undefined, 1, print0xa300),
         TagInfo(0xa301, "SceneType", N_("Scene Type"),
                 N_("Indicates the type of scene. If a DSC recorded the image, "
                 "this tag value must always be set to 1, indicating that the "
                 "image was directly photographed."),
-                exifIfdId, captureCond, undefined, print0xa301),
+                exifId, captureCond, undefined, 1, print0xa301),
         TagInfo(0xa302, "CFAPattern", N_("Color Filter Array Pattern"),
                 N_("Indicates the color filter array (CFA) geometric pattern of the "
                 "image sensor when a one-chip color area sensor is used. "
                 "It does not apply to all sensing methods."),
-                exifIfdId, captureCond, undefined, printValue),
+                exifId, captureCond, undefined, 0, printValue),
         TagInfo(0xa401, "CustomRendered", N_("Custom Rendered"),
                 N_("This tag indicates the use of special processing on image "
                 "data, such as rendering geared to output. When special "
                 "processing is performed, the reader is expected to disable "
                 "or minimize any further processing."),
-                exifIfdId, captureCond, unsignedShort, print0xa401),
+                exifId, captureCond, unsignedShort, 1, print0xa401),
         TagInfo(0xa402, "ExposureMode", N_("Exposure Mode"),
                 N_("This tag indicates the exposure mode set when the image was "
                 "shot. In auto-bracketing mode, the camera shoots a series of "
                 "frames of the same scene at different exposure settings."),
-                exifIfdId, captureCond, unsignedShort, print0xa402),
+                exifId, captureCond, unsignedShort, 1, print0xa402),
         TagInfo(0xa403, "WhiteBalance", N_("White Balance"),
                 N_("This tag indicates the white balance mode set when the image was shot."),
-                exifIfdId, captureCond, unsignedShort, print0xa403),
+                exifId, captureCond, unsignedShort, 1, print0xa403),
         TagInfo(0xa404, "DigitalZoomRatio", N_("Digital Zoom Ratio"),
                 N_("This tag indicates the digital zoom ratio when the image was "
                 "shot. If the numerator of the recorded value is 0, this "
                 "indicates that digital zoom was not used."),
-                exifIfdId, captureCond, unsignedRational, print0xa404),
+                exifId, captureCond, unsignedRational, 1, print0xa404),
         TagInfo(0xa405, "FocalLengthIn35mmFilm", N_("Focal Length In 35mm Film"),
                 N_("This tag indicates the equivalent focal length assuming a "
                 "35mm film camera, in mm. A value of 0 means the focal "
                 "length is unknown. Note that this tag differs from the "
                 "<FocalLength> tag."),
-                exifIfdId, captureCond, unsignedShort, print0xa405),
+                exifId, captureCond, unsignedShort, 1, print0xa405),
         TagInfo(0xa406, "SceneCaptureType", N_("Scene Capture Type"),
                 N_("This tag indicates the type of scene that was shot. It can "
                 "also be used to record the mode in which the image was "
                 "shot. Note that this differs from the <SceneType> tag."),
-                exifIfdId, captureCond, unsignedShort, print0xa406),
+                exifId, captureCond, unsignedShort, 1, print0xa406),
         TagInfo(0xa407, "GainControl", N_("Gain Control"),
                 N_("This tag indicates the degree of overall image gain adjustment."),
-                exifIfdId, captureCond, unsignedShort, print0xa407),
+                exifId, captureCond, unsignedShort, 1, print0xa407),
         TagInfo(0xa408, "Contrast", N_("Contrast"),
                 N_("This tag indicates the direction of contrast processing "
                 "applied by the camera when the image was shot."),
-                exifIfdId, captureCond, unsignedShort, printNormalSoftHard),
+                exifId, captureCond, unsignedShort, 1, printNormalSoftHard),
         TagInfo(0xa409, "Saturation", N_("Saturation"),
                 N_("This tag indicates the direction of saturation processing "
                 "applied by the camera when the image was shot."),
-                exifIfdId, captureCond, unsignedShort, print0xa409),
+                exifId, captureCond, unsignedShort, 1, print0xa409),
         TagInfo(0xa40a, "Sharpness", N_("Sharpness"),
                 N_("This tag indicates the direction of sharpness processing "
                 "applied by the camera when the image was shot."),
-                exifIfdId, captureCond, unsignedShort, printNormalSoftHard),
+                exifId, captureCond, unsignedShort, 1, printNormalSoftHard),
         TagInfo(0xa40b, "DeviceSettingDescription", N_("Device Setting Description"),
                 N_("This tag indicates information on the picture-taking "
                 "conditions of a particular camera model. The tag is used "
                 "only to indicate the picture-taking conditions in the reader."),
-                exifIfdId, captureCond, undefined, printValue),
+                exifId, captureCond, undefined, 0, printValue),
         TagInfo(0xa40c, "SubjectDistanceRange", N_("Subject Distance Range"),
                 N_("This tag indicates the distance to the subject."),
-                exifIfdId, captureCond, unsignedShort, print0xa40c),
+                exifId, captureCond, unsignedShort, 1, print0xa40c),
         TagInfo(0xa420, "ImageUniqueID", N_("Image Unique ID"),
                 N_("This tag indicates an identifier assigned uniquely to "
                 "each image. It is recorded as an ASCII string equivalent "
                 "to hexadecimal notation and 128-bit fixed length."),
-                exifIfdId, otherTags, asciiString, printValue),
+                exifId, otherTags, asciiString, 33, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownExifTag)", N_("Unknown Exif tag"),
                 N_("Unknown Exif tag"),
-                ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue)
+                exifId, sectionIdNotSet, asciiString, -1, printValue)
     };
 
-    const TagInfo* ExifTags::exifTagList()
+    const TagInfo* exifTagList()
     {
         return exifTagInfo;
     }
@@ -1504,11 +1694,11 @@
                 "present. (Note: The <GPSVersionID> tag is given in bytes, "
                 "unlike the <ExifVersion> tag. When the version is "
                 "2.0.0.0, the tag value is 02000000.H)."),
-                gpsIfdId, gpsTags, unsignedByte, print0x0000),
+                gpsId, gpsTags, unsignedByte, 4, print0x0000),
         TagInfo(0x0001, "GPSLatitudeRef", N_("GPS Latitude Reference"),
                 N_("Indicates whether the latitude is north or south latitude. The "
                 "ASCII value 'N' indicates north latitude, and 'S' is south latitude."),
-                gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLatitudeRef)),
+                gpsId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLatitudeRef)),
         TagInfo(0x0002, "GPSLatitude", N_("GPS Latitude"),
                 N_("Indicates the latitude. The latitude is expressed as three "
                 "RATIONAL values giving the degrees, minutes, and seconds, "
@@ -1516,11 +1706,11 @@
                 "the format is dd/1,mm/1,ss/1. When degrees and minutes are used "
                 "and, for example, fractions of minutes are given up to two "
                 "decimal places, the format is dd/1,mmmm/100,0/1."),
-                gpsIfdId, gpsTags, unsignedRational, printDegrees),
+                gpsId, gpsTags, unsignedRational, 3, printDegrees),
         TagInfo(0x0003, "GPSLongitudeRef", N_("GPS Longitude Reference"),
                 N_("Indicates whether the longitude is east or west longitude. "
                 "ASCII 'E' indicates east longitude, and 'W' is west longitude."),
-                gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLongitudeRef)),
+                gpsId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLongitudeRef)),
         TagInfo(0x0004, "GPSLongitude", N_("GPS Longitude"),
                 N_("Indicates the longitude. The longitude is expressed as three "
                 "RATIONAL values giving the degrees, minutes, and seconds, "
@@ -1528,7 +1718,7 @@
                 "the format is ddd/1,mm/1,ss/1. When degrees and minutes are "
                 "used and, for example, fractions of minutes are given up to "
                 "two decimal places, the format is ddd/1,mmmm/100,0/1."),
-                gpsIfdId, gpsTags, unsignedRational, printDegrees),
+                gpsId, gpsTags, unsignedRational, 3, printDegrees),
         TagInfo(0x0005, "GPSAltitudeRef", N_("GPS Altitude Reference"),
                 N_("Indicates the altitude used as the reference altitude. If the "
                 "reference is sea level and the altitude is above sea level, 0 "
@@ -1536,67 +1726,67 @@
                 "and the altitude is indicated as an absolute value in the "
                 "GSPAltitude tag. The reference unit is meters. Note that this tag "
                 "is BYTE type, unlike other reference tags."),
-                gpsIfdId, gpsTags, unsignedByte, print0x0005),
+                gpsId, gpsTags, unsignedByte, 1, print0x0005),
         TagInfo(0x0006, "GPSAltitude", N_("GPS Altitude"),
                 N_("Indicates the altitude based on the reference in GPSAltitudeRef. "
                 "Altitude is expressed as one RATIONAL value. The reference unit is meters."),
-                gpsIfdId, gpsTags, unsignedRational, print0x0006),
+                gpsId, gpsTags, unsignedRational, 1, print0x0006),
         TagInfo(0x0007, "GPSTimeStamp", N_("GPS Time Stamp"),
                 N_("Indicates the time as UTC (Coordinated Universal Time). "
                 "<TimeStamp> is expressed as three RATIONAL values "
                 "giving the hour, minute, and second (atomic clock)."),
-                gpsIfdId, gpsTags, unsignedRational, print0x0007),
+                gpsId, gpsTags, unsignedRational, 3, print0x0007),
         TagInfo(0x0008, "GPSSatellites", N_("GPS Satellites"),
                 N_("Indicates the GPS satellites used for measurements. This tag can be used "
                 "to describe the number of satellites, their ID number, angle of elevation, "
                 "azimuth, SNR and other information in ASCII notation. The format is not "
                 "specified. If the GPS receiver is incapable of taking measurements, value "
                 "of the tag is set to NULL."),
-                gpsIfdId, gpsTags, asciiString, printValue),
+                gpsId, gpsTags, asciiString, 0, printValue),
         TagInfo(0x0009, "GPSStatus", N_("GPS Status"),
                 N_("Indicates the status of the GPS receiver when the image is recorded. "
                 "\"A\" means measurement is in progress, and \"V\" means the measurement "
                 "is Interoperability."),
-                gpsIfdId, gpsTags, asciiString, print0x0009),
+                gpsId, gpsTags, asciiString, 2, print0x0009),
         TagInfo(0x000a, "GPSMeasureMode", N_("GPS Measure Mode"),
                 N_("Indicates the GPS measurement mode. \"2\" means two-dimensional measurement and \"3\" "
                 "means three-dimensional measurement is in progress."),
-                gpsIfdId, gpsTags, asciiString, print0x000a),
+                gpsId, gpsTags, asciiString, 2, print0x000a),
         TagInfo(0x000b, "GPSDOP", N_("GPS Data Degree of Precision"),
                 N_("Indicates the GPS DOP (data degree of precision). An HDOP value is written "
                 "during two-dimensional measurement, and PDOP during three-dimensional measurement."),
-                gpsIfdId, gpsTags, unsignedRational, printValue),
+                gpsId, gpsTags, unsignedRational, 1, printValue),
         TagInfo(0x000c, "GPSSpeedRef", N_("GPS Speed Reference"),
                 N_("Indicates the unit used to express the GPS receiver speed of movement. "
                 "\"K\" \"M\" and \"N\" represents kilometers per hour, miles per hour, and knots."),
-                gpsIfdId, gpsTags, asciiString, print0x000c),
+                gpsId, gpsTags, asciiString, 2, print0x000c),
         TagInfo(0x000d, "GPSSpeed", N_("GPS Speed"),
                 N_("Indicates the speed of GPS receiver movement."),
-                gpsIfdId, gpsTags, unsignedRational, printValue),
+                gpsId, gpsTags, unsignedRational, 1, printValue),
         TagInfo(0x000e, "GPSTrackRef", N_("GPS Track Ref"),
                 N_("Indicates the reference for giving the direction of GPS receiver movement. "
                 "\"T\" denotes true direction and \"M\" is magnetic direction."),
-                gpsIfdId, gpsTags, asciiString, printGPSDirRef),
+                gpsId, gpsTags, asciiString, 2, printGPSDirRef),
         TagInfo(0x000f, "GPSTrack", N_("GPS Track"),
                 N_("Indicates the direction of GPS receiver movement. The range of values is "
                 "from 0.00 to 359.99."),
-                gpsIfdId, gpsTags, unsignedRational, printValue),
+                gpsId, gpsTags, unsignedRational, 1, printValue),
         TagInfo(0x0010, "GPSImgDirectionRef", N_("GPS Image Direction Reference"),
                 N_("Indicates the reference for giving the direction of the image when it is captured. "
                 "\"T\" denotes true direction and \"M\" is magnetic direction."),
-                gpsIfdId, gpsTags, asciiString, printGPSDirRef),
+                gpsId, gpsTags, asciiString, 2, printGPSDirRef),
         TagInfo(0x0011, "GPSImgDirection", N_("GPS Image Direction"),
                 N_("Indicates the direction of the image when it was captured. The range of values "
                 "is from 0.00 to 359.99."),
-                gpsIfdId, gpsTags, unsignedRational, printValue),
+                gpsId, gpsTags, unsignedRational, 1, printValue),
         TagInfo(0x0012, "GPSMapDatum", N_("GPS Map Datum"),
                 N_("Indicates the geodetic survey data used by the GPS receiver. If the survey data "
                 "is restricted to Japan, the value of this tag is \"TOKYO\" or \"WGS-84\"."),
-                gpsIfdId, gpsTags, asciiString, printValue),
+                gpsId, gpsTags, asciiString, 0, printValue),
         TagInfo(0x0013, "GPSDestLatitudeRef", N_("GPS Destination Latitude Refeference"),
                 N_("Indicates whether the latitude of the destination point is north or south latitude. "
                 "The ASCII value \"N\" indicates north latitude, and \"S\" is south latitude."),
-                gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLatitudeRef)),
+                gpsId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLatitudeRef)),
         TagInfo(0x0014, "GPSDestLatitude", N_("GPS Destination Latitude"),
                 N_("Indicates the latitude of the destination point. The latitude is expressed as "
                 "three RATIONAL values giving the degrees, minutes, and seconds, respectively. "
@@ -1604,56 +1794,56 @@
                 "be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, "
                 "fractions of minutes are given up to two decimal places, the format would be "
                 "dd/1,mmmm/100,0/1."),
-                gpsIfdId, gpsTags, unsignedRational, printDegrees),
+                gpsId, gpsTags, unsignedRational, 3, printDegrees),
         TagInfo(0x0015, "GPSDestLongitudeRef", N_("GPS Destination Longitude Reference"),
                 N_("Indicates whether the longitude of the destination point is east or west longitude. "
                 "ASCII \"E\" indicates east longitude, and \"W\" is west longitude."),
-                gpsIfdId, gpsTags, asciiString, EXV_PRINT_TAG(exifGPSLongitudeRef)),
+                gpsId, gpsTags, asciiString, 2, EXV_PRINT_TAG(exifGPSLongitudeRef)),
         TagInfo(0x0016, "GPSDestLongitude", N_("GPS Destination Longitude"),
                 N_("Indicates the longitude of the destination point. The longitude is expressed "
                 "as three RATIONAL values giving the degrees, minutes, and seconds, respectively. "
                 "If longitude is expressed as degrees, minutes and seconds, a typical format would be "
                 "ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of "
                 "minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1."),
-                gpsIfdId, gpsTags, unsignedRational, printDegrees),
+                gpsId, gpsTags, unsignedRational, 3, printDegrees),
         TagInfo(0x0017, "GPSDestBearingRef", N_("GPS Destination Bearing Reference"),
                 N_("Indicates the reference used for giving the bearing to the destination point. "
                 "\"T\" denotes true direction and \"M\" is magnetic direction."),
-                gpsIfdId, gpsTags, asciiString, printGPSDirRef),
+                gpsId, gpsTags, asciiString, 2, printGPSDirRef),
         TagInfo(0x0018, "GPSDestBearing", N_("GPS Destination Bearing"),
                 N_("Indicates the bearing to the destination point. The range of values is from "
                 "0.00 to 359.99."),
-                gpsIfdId, gpsTags, unsignedRational, printValue),
+                gpsId, gpsTags, unsignedRational, 1, printValue),
         TagInfo(0x0019, "GPSDestDistanceRef", N_("GPS Destination Distance Reference"),
                 N_("Indicates the unit used to express the distance to the destination point. "
                 "\"K\", \"M\" and \"N\" represent kilometers, miles and knots."),
-                gpsIfdId, gpsTags, asciiString, print0x0019),
+                gpsId, gpsTags, asciiString, 2, print0x0019),
         TagInfo(0x001a, "GPSDestDistance", N_("GPS Destination Distance"),
                 N_("Indicates the distance to the destination point."),
-                gpsIfdId, gpsTags, unsignedRational, printValue),
+                gpsId, gpsTags, unsignedRational, 1, printValue),
         TagInfo(0x001b, "GPSProcessingMethod", N_("GPS Processing Method"),
                 N_("A character string recording the name of the method used for location finding. "
                 "The first byte indicates the character code used, and this is followed by the name "
                 "of the method."),
-                gpsIfdId, gpsTags, undefined, printValue),
+                gpsId, gpsTags, undefined, 0, printValue),
         TagInfo(0x001c, "GPSAreaInformation", N_("GPS Area Information"),
                 N_("A character string recording the name of the GPS area. The first byte indicates "
                 "the character code used, and this is followed by the name of the GPS area."),
-                gpsIfdId, gpsTags, undefined, printValue),
+                gpsId, gpsTags, undefined, 0, printValue),
         TagInfo(0x001d, "GPSDateStamp", N_("GPS Date Stamp"),
                 N_("A character string recording date and time information relative to UTC "
                 "(Coordinated Universal Time). The format is \"YYYY:MM:DD.\"."),
-                gpsIfdId, gpsTags, asciiString, printValue),
+                gpsId, gpsTags, asciiString, 11, printValue),
         TagInfo(0x001e, "GPSDifferential", N_("GPS Differential"),
                 N_("Indicates whether differential correction is applied to the GPS receiver."),
-                gpsIfdId, gpsTags, unsignedShort, print0x001e),
+                gpsId, gpsTags, unsignedShort, 1, print0x001e),
         // End of list marker
         TagInfo(0xffff, "(UnknownGpsTag)", N_("Unknown GPSInfo tag"),
                 N_("Unknown GPSInfo tag"),
-                ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue)
+                gpsId, gpsTags, asciiString, -1, printValue)
     };
 
-    const TagInfo* ExifTags::gpsTagList()
+    const TagInfo* gpsTagList()
     {
         return gpsTagInfo;
     }
@@ -1666,26 +1856,26 @@
                 "including the termination code (NULL). see the separate "
                 "volume of Recommended Exif Interoperability Rules (ExifR98) "
                 "for other tags used for ExifR98."),
-                iopIfdId, iopTags, asciiString, printValue),
+                iopId, iopTags, asciiString, 0, printValue),
         TagInfo(0x0002, "InteroperabilityVersion", N_("Interoperability Version"),
                 N_("Interoperability version"),
-                iopIfdId, iopTags, undefined, printExifVersion),
+                iopId, iopTags, undefined, -1, printExifVersion),
         TagInfo(0x1000, "RelatedImageFileFormat", N_("Related Image File Format"),
                 N_("File format of image file"),
-                iopIfdId, iopTags, asciiString, printValue),
+                iopId, iopTags, asciiString, 0, printValue),
         TagInfo(0x1001, "RelatedImageWidth", N_("Related Image Width"),
                 N_("Image width"),
-                iopIfdId, iopTags, unsignedLong, printValue),
+                iopId, iopTags, unsignedLong, 1, printValue),
         TagInfo(0x1002, "RelatedImageLength", N_("Related Image Length"),
                 N_("Image height"),
-                iopIfdId, iopTags, unsignedLong, printValue),
+                iopId, iopTags, unsignedLong, 1, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownIopTag)", N_("Unknown Exif Interoperability tag"),
                 N_("Unknown Exif Interoperability tag"),
-                ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue)
+                iopId, iopTags, asciiString, -1, printValue)
     };
 
-    const TagInfo* ExifTags::iopTagList()
+    const TagInfo* iopTagList()
     {
         return iopTagInfo;
     }
@@ -1694,17 +1884,17 @@
     static const TagInfo mnTagInfo[] = {
         TagInfo(0x0001, "Offset", N_("Offset"),
                 N_("Offset of the makernote from the start of the TIFF header."),
-                mnIfdId, makerTags, unsignedLong, printValue),
+                mnId, makerTags, unsignedLong, 1, printValue),
         TagInfo(0x0002, "ByteOrder", N_("Byte Order"),
                 N_("Byte order used to encode MakerNote tags, 'MM' (big-endian) or 'II' (little-endian)."),
-                mnIfdId, makerTags, asciiString, printValue),
+                mnId, makerTags, asciiString, 0, printValue),
         // End of list marker
         TagInfo(0xffff, "(UnknownMnTag)", N_("Unknown Exiv2 Makernote info tag"),
                 N_("Unknown Exiv2 Makernote info tag"),
-                ifdIdNotSet, sectionIdNotSet, invalidTypeId, printValue)
+                mnId, makerTags, asciiString, -1, printValue)
     };
 
-    const TagInfo* ExifTags::mnTagList()
+    const TagInfo* mnTagList()
     {
         return mnTagInfo;
     }
@@ -1712,57 +1902,53 @@
     // Unknown Tag
     static const TagInfo unknownTag(0xffff, "Unknown tag", N_("Unknown tag"),
                                     N_("Unknown tag"),
-                                    ifdIdNotSet, sectionIdNotSet, asciiString, printValue);
+                                    ifdIdNotSet, sectionIdNotSet, asciiString, -1, printValue);
 
-    const TagInfo* ExifTags::tagList(IfdId ifdId)
+    std::ostream& printValue(std::ostream& os, const Value& value, const ExifData*)
     {
-        const IfdInfo* ii = find(ifdInfo_, ifdId);
-        if (ii == 0 || ii->tagList_ == 0) return 0;
-        return ii->tagList_();
-    } // ExifTags::tagList
+        return os << value;
+    }
 
-    const TagInfo* ExifTags::tagInfo(uint16_t tag, IfdId ifdId)
+    IfdId groupId(const std::string& groupName)
     {
-        const TagInfo* ti = tagList(ifdId);
-        if (ti == 0) return 0;
-        for (int idx = 0; ti[idx].tag_ != 0xffff; ++idx) {
-            if (ti[idx].tag_ == tag) return &ti[idx];
-        }
-        return 0;
-    } // ExifTags::tagInfo
+        IfdId ifdId = ifdIdNotSet;
+        const GroupInfo* ii = find(groupInfo, GroupInfo::GroupName(groupName));
+        if (ii != 0) ifdId = static_cast<IfdId>(ii->ifdId_);
+        return ifdId;
+    }
 
-    const TagInfo* ExifTags::tagInfo(const std::string& tagName, IfdId ifdId)
+    const char* ifdName(IfdId ifdId)
     {
-        const TagInfo* ti = tagList(ifdId);
-        if (ti == 0) return 0;
-        const char* tn = tagName.c_str();
-        if (tn == 0) return 0;
-        for (int idx = 0; ti[idx].tag_ != 0xffff; ++idx) {
-            if (0 == strcmp(ti[idx].name_, tn)) {
-                return &ti[idx];
-            }
-        }
-        return 0;
-    } // ExifTags::tagInfo
+        const GroupInfo* ii = find(groupInfo, ifdId);
+        if (ii == 0) return groupInfo[0].ifdName_;
+        return ii->ifdName_;
+    } // ifdName
 
-    bool ExifTags::isMakerIfd(IfdId ifdId)
+    const char* groupName(IfdId ifdId)
+    {
+        const GroupInfo* ii = find(groupInfo, ifdId);
+        if (ii == 0) return groupInfo[0].groupName_;
+        return ii->groupName_;
+    } // groupName
+
+    bool isMakerIfd(IfdId ifdId)
     {
         bool rc = false;
-        const IfdInfo* ii = find(ifdInfo_, ifdId);
-        if (ii != 0 && 0 == strcmp(ii->name_, "Makernote")) {
+        const GroupInfo* ii = find(groupInfo, ifdId);
+        if (ii != 0 && 0 == strcmp(ii->ifdName_, "Makernote")) {
             rc = true;
         }
         return rc;
-    } // ExifTags::isMakerIfd
+    } // isMakerIfd
 
-    bool ExifTags::isExifIfd(IfdId ifdId)
+    bool isExifIfd(IfdId ifdId)
     {
         bool rc;
         switch (ifdId) {
         case ifd0Id:
-        case exifIfdId:
-        case gpsIfdId:
-        case iopIfdId:
+        case exifId:
+        case gpsId:
+        case iopId:
         case ifd1Id:
         case ifd2Id:
         case ifd3Id:
@@ -1770,338 +1956,70 @@
         case subImage2Id:
         case subImage3Id:
         case subImage4Id:
-        case panaRawIfdId: rc = true; break;
+        case subImage5Id:
+        case subImage6Id:
+        case subImage7Id:
+        case subImage8Id:
+        case subImage9Id:
+        case subThumb1Id:
+        case panaRawId: rc = true; break;
         default:           rc = false; break;
         }
         return rc;
-    } // ExifTags::isExifIfd
-
-    std::string ExifTags::tagName(uint16_t tag, IfdId ifdId)
-    {
-        const TagInfo* ti = tagInfo(tag, ifdId);
-        if (ti != 0) return ti->name_;
-        std::ostringstream os;
-        os << "0x" << std::setw(4) << std::setfill('0') << std::right
-           << std::hex << tag;
-        return os.str();
-    } // ExifTags::tagName
-
-    const char* ExifTags::tagTitle(uint16_t tag, IfdId ifdId)
-    {
-        return tagLabel(tag, ifdId);
-    } // ExifTags::tagTitle
-
-    const char* ExifTags::tagLabel(uint16_t tag, IfdId ifdId)
-    {
-        const TagInfo* ti = tagInfo(tag, ifdId);
-        if (ti == 0) return "";
-        return _(ti->title_);
-    } // ExifTags::tagLabel
-
-    const char* ExifTags::tagDesc(uint16_t tag, IfdId ifdId)
-    {
-        const TagInfo* ti = tagInfo(tag, ifdId);
-        if (ti == 0) return "";
-        return _(ti->desc_);
-    } // ExifTags::tagDesc
-
-    TypeId ExifTags::tagType(uint16_t tag, IfdId ifdId)
-    {
-        const TagInfo* ti = tagInfo(tag, ifdId);
-        if (ti == 0) return unknownTag.typeId_;
-        return ti->typeId_;
-    } // ExifTags::tagType
-
-    uint16_t ExifTags::tag(const std::string& tagName, IfdId ifdId)
-    {
-        const TagInfo* ti = tagInfo(tagName, ifdId);
-        if (ti != 0) return ti->tag_;
-        if (!isHex(tagName, 4, "0x")) throw Error(7, tagName, ifdId);
-        std::istringstream is(tagName);
-        uint16_t tag;
-        is >> std::hex >> tag;
-        return tag;
-    } // ExifTags::tag
-
-    IfdId ExifTags::ifdIdByIfdItem(const std::string& ifdItem)
-    {
-        IfdId ifdId = ifdIdNotSet;
-        const IfdInfo* ii = find(ifdInfo_, IfdInfo::Item(ifdItem));
-        if (ii != 0) ifdId = ii->ifdId_;
-        return ifdId;
-    }
-
-    const char* ExifTags::sectionName(uint16_t tag, IfdId ifdId)
-    {
-        const TagInfo* ti = tagInfo(tag, ifdId);
-        if (ti == 0) return sectionInfo_[unknownTag.sectionId_].name_;
-        return sectionInfo_[ti->sectionId_].name_;
-    } // ExifTags::sectionName
-
-    const char* ExifTags::sectionDesc(uint16_t tag, IfdId ifdId)
-    {
-        const TagInfo* ti = tagInfo(tag, ifdId);
-        if (ti == 0) return _(sectionInfo_[unknownTag.sectionId_].desc_);
-        return _(sectionInfo_[ti->sectionId_].desc_);
-    } // ExifTags::sectionDesc
+    } // isExifIfd
 
-    const char* ExifTags::ifdName(IfdId ifdId)
+    void taglist(std::ostream& os, IfdId ifdId)
     {
-        const IfdInfo* ii = find(ifdInfo_, ifdId);
-        if (ii == 0) return ifdInfo_[0].name_;
-        return ii->name_;
-    } // ExifTags::ifdName
-
-    const char* ExifTags::ifdItem(IfdId ifdId)
-    {
-        const IfdInfo* ii = find(ifdInfo_, ifdId);
-        if (ii == 0) return ifdInfo_[0].item_;
-        return ii->item_;
-    } // ExifTags::ifdItem
-
-    const char* ExifTags::sectionName(SectionId sectionId)
-    {
-        return sectionInfo_[sectionId].name_;
-    } // ExifTags::sectionName
-
-    SectionId ExifTags::sectionId(const std::string& sectionName)
-    {
-        int i;
-        for (i = int(lastSectionId) - 1; i > 0; --i) {
-            if (sectionInfo_[i].name_ == sectionName) break;
-        }
-        return SectionId(i);
-    } // ExifTags::sectionId
-
-    std::ostream& ExifTags::printTag(std::ostream& os,
-                                     uint16_t tag,
-                                     IfdId ifdId,
-                                     const Value& value,
-                                     const ExifData* pExifData)
-    {
-        if (value.count() == 0) return os;
-        PrintFct fct = printValue;
-        const TagInfo* ti = tagInfo(tag, ifdId);
-        if (ti != 0) fct = ti->printFct_;
-        return fct(os, value, pExifData);
-    } // ExifTags::printTag
-
-    void ExifTags::taglist(std::ostream& os)
-    {
-        for (int i=0; ifdTagInfo[i].tag_ != 0xffff; ++i) {
-            os << ifdTagInfo[i] << "\n";
-        }
-        for (int i=0; exifTagInfo[i].tag_ != 0xffff; ++i) {
-            os << exifTagInfo[i] << "\n";
-        }
-        for (int i=0; iopTagInfo[i].tag_ != 0xffff; ++i) {
-            os << iopTagInfo[i] << "\n";
-        }
-        for (int i=0; gpsTagInfo[i].tag_ != 0xffff; ++i) {
-            os << gpsTagInfo[i] << "\n";
-        }
-    } // ExifTags::taglist
-
-    void ExifTags::taglist(std::ostream& os, IfdId ifdId)
-    {
-        const TagInfo* ti = tagList(ifdId);
+        const TagInfo* ti = Internal::tagList(ifdId);
         if (ti != 0) {
             for (int k = 0; ti[k].tag_ != 0xffff; ++k) {
                 os << ti[k] << "\n";
             }
         }
-    } // ExifTags::taglist
+    } // taglist
 
-    const char* ExifKey::familyName_ = "Exif";
-
-    ExifKey::ExifKey(const std::string& key)
-        : tag_(0), ifdId_(ifdIdNotSet), ifdItem_(""),
-          idx_(0), key_(key)
+    const TagInfo* tagList(IfdId ifdId)
     {
-        decomposeKey();
-    }
+        const GroupInfo* ii = find(groupInfo, ifdId);
+        if (ii == 0 || ii->tagList_ == 0) return 0;
+        return ii->tagList_();
+    } // tagList
 
-    ExifKey::ExifKey(uint16_t tag, const std::string& ifdItem)
-        : tag_(0), ifdId_(ifdIdNotSet), ifdItem_(""),
-          idx_(0), key_("")
+    const TagInfo* tagInfo(uint16_t tag, IfdId ifdId)
     {
-        IfdId ifdId = ExifTags::ifdIdByIfdItem(ifdItem);
-        if (!ExifTags::isExifIfd(ifdId) && !ExifTags::isMakerIfd(ifdId)) {
-            throw Error(23, ifdId);
+        const TagInfo* ti = tagList(ifdId);
+        if (ti == 0) return 0;
+        int idx = 0;
+        for (idx = 0; ti[idx].tag_ != 0xffff; ++idx) {
+            if (ti[idx].tag_ == tag) break;
         }
-        tag_ = tag;
-        ifdId_ = ifdId;
-        ifdItem_ = ifdItem;
-        makeKey();
-    }
-
-    ExifKey::ExifKey(const ExifKey& rhs)
-        : Key(rhs), tag_(rhs.tag_), ifdId_(rhs.ifdId_), ifdItem_(rhs.ifdItem_),
-          idx_(rhs.idx_), key_(rhs.key_)
-    {
-    }
-
-    ExifKey::~ExifKey()
-    {
-    }
-
-    ExifKey& ExifKey::operator=(const ExifKey& rhs)
-    {
-        if (this == &rhs) return *this;
-        Key::operator=(rhs);
-        tag_ = rhs.tag_;
-        ifdId_ = rhs.ifdId_;
-        ifdItem_ = rhs.ifdItem_;
-        idx_ = rhs.idx_;
-        key_ = rhs.key_;
-        return *this;
-    }
-
-    void ExifKey::setIdx(int idx)
-    {
-        idx_ = idx;
-    }
-
-    std::string ExifKey::key() const
-    {
-        return key_;
-    }
-
-    const char* ExifKey::familyName() const
-    {
-        return familyName_;
-    }
-
-    std::string ExifKey::groupName() const
-    {
-        return ifdItem();
-    }
-
-    std::string ExifKey::tagName() const
-    {
-        return ExifTags::tagName(tag_, ifdId_);
-    }
-
-    std::string ExifKey::tagLabel() const
-            {
-        return ExifTags::tagLabel(tag_, ifdId_);
-    }
-
-    uint16_t ExifKey::tag() const
-    {
-        return tag_;
-    }
-
-    ExifKey::AutoPtr ExifKey::clone() const
-    {
-        return AutoPtr(clone_());
-    }
-
-    ExifKey* ExifKey::clone_() const
-    {
-        return new ExifKey(*this);
-    }
+        return &ti[idx];
+    } // tagInfo
 
-    std::string ExifKey::sectionName() const
+    const TagInfo* tagInfo(const std::string& tagName, IfdId ifdId)
     {
-        return ExifTags::sectionName(tag(), ifdId());
-    }
-
-    void ExifKey::decomposeKey()
-    {
-        // Get the family name, IFD name and tag name parts of the key
-        std::string::size_type pos1 = key_.find('.');
-        if (pos1 == std::string::npos) throw Error(6, key_);
-        std::string familyName = key_.substr(0, pos1);
-        if (0 != strcmp(familyName.c_str(), familyName_)) {
-            throw Error(6, key_);
-        }
-        std::string::size_type pos0 = pos1 + 1;
-        pos1 = key_.find('.', pos0);
-        if (pos1 == std::string::npos) throw Error(6, key_);
-        std::string ifdItem = key_.substr(pos0, pos1 - pos0);
-        if (ifdItem == "") throw Error(6, key_);
-        std::string tagName = key_.substr(pos1 + 1);
-        if (tagName == "") throw Error(6, key_);
-
-        // Find IfdId
-        IfdId ifdId = ExifTags::ifdIdByIfdItem(ifdItem);
-        if (ifdId == ifdIdNotSet) throw Error(6, key_);
-        if (!ExifTags::isExifIfd(ifdId) && !ExifTags::isMakerIfd(ifdId)) {
-            throw Error(6, key_);
+        const TagInfo* ti = tagList(ifdId);
+        if (ti == 0) return 0;
+        const char* tn = tagName.c_str();
+        if (tn == 0) return 0;
+        for (int idx = 0; ti[idx].tag_ != 0xffff; ++idx) {
+            if (0 == strcmp(ti[idx].name_, tn)) {
+                return &ti[idx];
+            }
         }
-        // Convert tag
-        uint16_t tag = ExifTags::tag(tagName, ifdId);
-
-        // Translate hex tag name (0xabcd) to a real tag name if there is one
-        tagName = ExifTags::tagName(tag, ifdId);
-
-        tag_ = tag;
-        ifdId_ = ifdId;
-        ifdItem_ = ifdItem;
-        key_ = familyName + "." + ifdItem + "." + tagName;
-    }
-
-    void ExifKey::makeKey()
-    {
-        key_ =   std::string(familyName_)
-               + "." + ifdItem_
-               + "." + ExifTags::tagName(tag_, ifdId_);
-    }
-
-    // *************************************************************************
-    // free functions
-
-    std::ostream& operator<<(std::ostream& os, const TagInfo& ti)
-    {
-        ExifKey exifKey(ti.tag_, ExifTags::ifdItem(ti.ifdId_));
-        return os << ExifTags::tagName(ti.tag_, ti.ifdId_) << ",\t"
-                  << std::dec << ti.tag_ << ",\t"
-                  << "0x" << std::setw(4) << std::setfill('0')
-                  << std::right << std::hex << ti.tag_ << ",\t"
-                  << ExifTags::ifdName(ti.ifdId_) << ",\t"
-                  << exifKey.key() << ",\t"
-                  << TypeInfo::typeName(
-                      ExifTags::tagType(ti.tag_, ti.ifdId_)) << ",\t"
-                  << ExifTags::tagDesc(ti.tag_, ti.ifdId_);
-    }
-
-    std::ostream& operator<<(std::ostream& os, const Rational& r)
-    {
-        return os << r.first << "/" << r.second;
-    }
-
-    std::istream& operator>>(std::istream& is, Rational& r)
-    {
-        int32_t nominator;
-        int32_t denominator;
-        char c('\0');
-        is >> nominator >> c >> denominator;
-        if (c != '/') is.setstate(std::ios::failbit);
-        if (is) r = std::make_pair(nominator, denominator);
-        return is;
-    }
-
-    std::ostream& operator<<(std::ostream& os, const URational& r)
-    {
-        return os << r.first << "/" << r.second;
-    }
+        return 0;
+    } // tagInfo
 
-    std::istream& operator>>(std::istream& is, URational& r)
+    uint16_t tagNumber(const std::string& tagName, IfdId ifdId)
     {
-        uint32_t nominator;
-        uint32_t denominator;
-        char c('\0');
-        is >> nominator >> c >> denominator;
-        if (c != '/') is.setstate(std::ios::failbit);
-        if (is) r = std::make_pair(nominator, denominator);
-        return is;
-    }
-
-    std::ostream& printValue(std::ostream& os, const Value& value, const ExifData*)
-    {
-        return os << value;
-    }
+        const TagInfo* ti = tagInfo(tagName, ifdId);
+        if (ti != 0 && ti->tag_ != 0xffff) return ti->tag_;
+        if (!isHex(tagName, 4, "0x")) throw Error(7, tagName, ifdId);
+        std::istringstream is(tagName);
+        uint16_t tag;
+        is >> std::hex >> tag;
+        return tag;
+    } // tagNumber
 
     std::ostream& printLong(std::ostream& os, const Value& value, const ExifData*)
     {
@@ -2178,7 +2096,7 @@
             cd = iconv_open("UTF-8", "UCS-2LE");
             if (cd == (iconv_t)(-1)) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: iconv_open: " << strError() << "\n";
+                EXV_WARNING << "iconv_open: " << strError() << "\n";
 #endif
                 go = false;
             }
@@ -2200,9 +2118,8 @@
                               &outbytesleft);
             if (rc == size_t(-1)) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: iconv: "
-                          << strError()
-                          << " inbytesleft = " << inbytesleft << "\n";
+                EXV_WARNING << "iconv: " << strError()
+                            << " inbytesleft = " << inbytesleft << "\n";
 #endif
                 go = false;
             }
@@ -2515,17 +2432,14 @@
         return os;
     }
 
-    // Todo: Implement this properly
     std::ostream& print0x9286(std::ostream& os, const Value& value, const ExifData*)
     {
-        if (value.size() > 8) {
-            DataBuf buf(value.size());
-            value.copy(buf.pData_, bigEndian);
-            // Hack: Skip the leading 8-Byte character code, truncate
-            // trailing '\0's and let the stream take care of the remainder
-            std::string userComment(reinterpret_cast<char*>(buf.pData_) + 8, buf.size_ - 8);
-            std::string::size_type pos = userComment.find_last_not_of('\0');
-            os << userComment.substr(0, pos + 1);
+        const CommentValue* pcv = dynamic_cast<const CommentValue*>(&value);
+        if (pcv) {
+            os << pcv->comment();
+        }
+        else {
+            os << value;
         }
         return os;
     }
@@ -2683,6 +2597,349 @@
         return ur;
     }
 
+}}                                      // namespace Internal, Exiv2
+
+namespace Exiv2 {
+
+    //! @cond IGNORE
+    GroupInfo::GroupName::GroupName(const std::string& groupName)
+    {
+        g_ = groupName;
+    }
+    //! @endcond
+
+    bool GroupInfo::operator==(int ifdId) const
+    {
+        return ifdId_ == ifdId;
+    }
+
+    bool GroupInfo::operator==(const GroupName& groupName) const
+    {
+        return 0 == strcmp(groupName.g_.c_str(), groupName_);
+    }
+
+    TagInfo::TagInfo(
+        uint16_t tag,
+        const char* name,
+        const char* title,
+        const char* desc,
+        int ifdId,
+        int sectionId,
+        TypeId typeId,
+        int16_t count,
+        PrintFct printFct
+    )
+        : tag_(tag), name_(name), title_(title), desc_(desc), ifdId_(ifdId),
+          sectionId_(sectionId), typeId_(typeId), count_(count), printFct_(printFct)
+    {
+    }
+
+    const GroupInfo* ExifTags::groupList()
+    {
+        return groupInfo + 1; // +1 to skip the first (ifdIdNotSet) entry
+    }
+
+    const TagInfo* ExifTags::tagList(const std::string& groupName)
+    {
+        const GroupInfo* ii = find(groupInfo, GroupInfo::GroupName(groupName));
+        if (ii == 0 || ii->tagList_ == 0) return 0;
+        return ii->tagList_();
+    } // ExifTags::tagList
+
+    const char* ExifTags::sectionName(const ExifKey& key)
+    {
+        const TagInfo* ti = tagInfo(key.tag(), static_cast<Internal::IfdId>(key.ifdId()));
+        if (ti == 0) return sectionInfo[unknownTag.sectionId_].name_;
+        return sectionInfo[ti->sectionId_].name_;
+    }
+
+    uint16_t ExifTags::defaultCount(const ExifKey& key)
+    {
+        const TagInfo* ti = tagInfo(key.tag(), static_cast<Internal::IfdId>(key.ifdId()));
+        if (ti == 0) return unknownTag.count_;
+        return ti->count_;
+    }
+
+    const char* ExifTags::ifdName(const std::string& groupName)
+    {
+        IfdId ifdId = Internal::groupId(groupName);        
+        return Internal::ifdName(ifdId);
+    }
+
+    bool ExifTags::isMakerGroup(const std::string& groupName)
+    {
+        IfdId ifdId = Internal::groupId(groupName);
+        return Internal::isMakerIfd(ifdId);
+    }
+
+    bool ExifTags::isExifGroup(const std::string& groupName)
+    {
+        IfdId ifdId = Internal::groupId(groupName);
+        return Internal::isExifIfd(ifdId);
+    }
+
+    void ExifTags::taglist(std::ostream& os)
+    {
+        for (int i=0; ifdTagInfo[i].tag_ != 0xffff; ++i) {
+            os << ifdTagInfo[i] << "\n";
+        }
+        for (int i=0; exifTagInfo[i].tag_ != 0xffff; ++i) {
+            os << exifTagInfo[i] << "\n";
+        }
+        for (int i=0; iopTagInfo[i].tag_ != 0xffff; ++i) {
+            os << iopTagInfo[i] << "\n";
+        }
+        for (int i=0; gpsTagInfo[i].tag_ != 0xffff; ++i) {
+            os << gpsTagInfo[i] << "\n";
+        }
+    } // ExifTags::taglist
+
+    void ExifTags::taglist(std::ostream& os, const std::string& groupName)
+    {
+        IfdId ifdId = Internal::groupId(groupName);
+        Internal::taglist(os, ifdId);
+    }
+
+    //! %Internal Pimpl structure with private members and data of class ExifKey.
+    struct ExifKey::Impl {
+        //! @name Creators
+        //@{
+        Impl();                         //!< Default constructor
+        //@}
+
+        //! @name Manipulators
+        //@{
+        /*!
+          @brief Set the key corresponding to the \em tag, \em ifdId and \em tagInfo.
+                 The key is of the form '<b>Exif</b>.groupName.tagName'.
+         */
+        void makeKey(uint16_t tag, IfdId ifdId, const TagInfo* tagInfo);
+        /*!
+          @brief Parse and convert the key string into tag and IFD Id.
+                 Updates data members if the string can be decomposed,
+                 or throws \em Error .
+
+          @throw Error if the key cannot be decomposed.
+         */
+        void decomposeKey(const std::string& key);
+        //@}
+
+        //! @name Accessors
+        //@{
+        //! Return the name of the tag
+        std::string tagName() const;
+        //@}
+
+        // DATA
+        static const char* familyName_; //!< "Exif"
+
+        const TagInfo* tagInfo_;        //!< Tag info
+        uint16_t tag_;                  //!< Tag value
+        IfdId ifdId_;                   //!< The IFD associated with this tag
+        int idx_;                       //!< Unique id of the Exif key in the image
+        std::string groupName_;         //!< The group name
+        std::string key_;               //!< %Key
+    };
+
+    const char* ExifKey::Impl::familyName_ = "Exif";
+
+    ExifKey::Impl::Impl()
+        : tagInfo_(0), tag_(0), ifdId_(ifdIdNotSet), idx_(0)
+    {
+    }
+
+    std::string ExifKey::Impl::tagName() const
+    {
+        if (tagInfo_ != 0 && tagInfo_->tag_ != 0xffff) {
+            return tagInfo_->name_;
+        }
+        std::ostringstream os;
+        os << "0x" << std::setw(4) << std::setfill('0') << std::right
+           << std::hex << tag_;
+        return os.str();
+    }
+
+    void ExifKey::Impl::decomposeKey(const std::string& key)
+    {
+        // Get the family name, IFD name and tag name parts of the key
+        std::string::size_type pos1 = key.find('.');
+        if (pos1 == std::string::npos) throw Error(6, key);
+        std::string familyName = key.substr(0, pos1);
+        if (0 != strcmp(familyName.c_str(), familyName_)) {
+            throw Error(6, key);
+        }
+        std::string::size_type pos0 = pos1 + 1;
+        pos1 = key.find('.', pos0);
+        if (pos1 == std::string::npos) throw Error(6, key);
+        std::string groupName = key.substr(pos0, pos1 - pos0);
+        if (groupName.empty()) throw Error(6, key);
+        std::string tn = key.substr(pos1 + 1);
+        if (tn.empty()) throw Error(6, key);
+
+        // Find IfdId
+        IfdId ifdId = groupId(groupName);
+        if (ifdId == ifdIdNotSet) throw Error(6, key);
+        if (!Internal::isExifIfd(ifdId) && !Internal::isMakerIfd(ifdId)) {
+            throw Error(6, key);
+        }
+        // Convert tag
+        uint16_t tag = tagNumber(tn, ifdId);
+        // Get tag info
+        tagInfo_ = tagInfo(tag, ifdId);
+        if (tagInfo_ == 0) throw Error(6, key);
+
+        tag_ = tag;
+        ifdId_ = ifdId;
+        groupName_ = groupName;
+        // tagName() translates hex tag name (0xabcd) to a real tag name if there is one
+        key_ = familyName + "." + groupName + "." + tagName();
+    }
+
+    void ExifKey::Impl::makeKey(uint16_t tag, IfdId ifdId, const TagInfo* tagInfo)
+    {
+        assert(tagInfo != 0);
+
+        tagInfo_ = tagInfo;
+        tag_ = tag;
+        ifdId_ = ifdId;
+        key_ = std::string(familyName_) + "." + groupName_ + "." + tagName();
+    }
+
+    ExifKey::ExifKey(uint16_t tag, const std::string& groupName)
+        : p_(new Impl)
+    {
+        IfdId ifdId = groupId(groupName);
+        // Todo: Test if this condition can be removed
+        if (!Internal::isExifIfd(ifdId) && !Internal::isMakerIfd(ifdId)) {
+            throw Error(23, ifdId);
+        }
+        const TagInfo* ti = tagInfo(tag, ifdId);
+        if (ti == 0) {
+            throw Error(23, ifdId);
+        }
+        p_->groupName_ = groupName;
+        p_->makeKey(tag, ifdId, ti);
+    }
+
+    ExifKey::ExifKey(const TagInfo& ti)
+        : p_(new Impl)
+    {
+        IfdId ifdId = static_cast<IfdId>(ti.ifdId_);
+        if (!Internal::isExifIfd(ifdId) && !Internal::isMakerIfd(ifdId)) {
+            throw Error(23, ifdId);
+        }
+        p_->groupName_ = Exiv2::groupName(ifdId);
+        p_->makeKey(ti.tag_, ifdId, &ti);
+    }
+
+    ExifKey::ExifKey(const std::string& key)
+        : p_(new Impl)
+    {
+        p_->decomposeKey(key);
+    }
+
+    ExifKey::ExifKey(const ExifKey& rhs)
+        : Key(rhs), p_(new Impl(*rhs.p_))
+    {
+    }
+
+    ExifKey::~ExifKey()
+    {
+        delete p_;
+    }
+
+    ExifKey& ExifKey::operator=(const ExifKey& rhs)
+    {
+        if (this == &rhs) return *this;
+        Key::operator=(rhs);
+        *p_ = *rhs.p_;
+        return *this;
+    }
+
+    void ExifKey::setIdx(int idx)
+    {
+        p_->idx_ = idx;
+    }
+
+    std::string ExifKey::key() const
+    {
+        return p_->key_;
+    }
+
+    const char* ExifKey::familyName() const
+    {
+        return p_->familyName_;
+    }
+
+    std::string ExifKey::groupName() const
+    {
+        return p_->groupName_;
+    }
+
+    std::string ExifKey::tagName() const
+    {
+        return p_->tagName();
+    }
+
+    std::string ExifKey::tagLabel() const
+    {
+        if (p_->tagInfo_ == 0 || p_->tagInfo_->tag_ == 0xffff) return "";
+        return _(p_->tagInfo_->title_);
+    }
+
+    std::string ExifKey::tagDesc() const
+    {
+        if (p_->tagInfo_ == 0 || p_->tagInfo_->tag_ == 0xffff) return "";
+        return _(p_->tagInfo_->desc_);
+    }
+
+    TypeId ExifKey::defaultTypeId() const
+    {
+        if (p_->tagInfo_ == 0) return unknownTag.typeId_;
+        return p_->tagInfo_->typeId_;
+    }
+
+    uint16_t ExifKey::tag() const
+    {
+        return p_->tag_;
+    }
+
+    ExifKey::AutoPtr ExifKey::clone() const
+    {
+        return AutoPtr(clone_());
+    }
+
+    ExifKey* ExifKey::clone_() const
+    {
+        return new ExifKey(*this);
+    }
+
+    int ExifKey::ifdId() const
+    {
+        return p_->ifdId_;
+    }
+
+    int ExifKey::idx() const
+    {
+        return p_->idx_;
+    }
+
+    // *************************************************************************
+    // free functions
+
+    std::ostream& operator<<(std::ostream& os, const TagInfo& ti)
+    {
+        ExifKey exifKey(ti);
+        return os << exifKey.tagName() << ",\t"
+                  << std::dec << exifKey.tag() << ",\t"
+                  << "0x" << std::setw(4) << std::setfill('0')
+                  << std::right << std::hex << exifKey.tag() << ",\t"
+                  << exifKey.groupName() << ",\t"
+                  << exifKey.key() << ",\t"
+                  << TypeInfo::typeName(exifKey.defaultTypeId()) << ",\t"
+                  << exifKey.tagDesc();
+    }
+
 }                                       // namespace Exiv2
 
 namespace {
diff -Nru exiv2-0.19/src/tags.hpp exiv2-0.21/src/tags.hpp
--- exiv2-0.19/src/tags.hpp	2009-12-20 23:54:11.000000000 +0000
+++ exiv2-0.21/src/tags.hpp	2010-11-30 17:01:21.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    tags.hpp
   @brief   Exif tag and type information
-  @version $Rev: 1960 $
+  @version $Rev: 2387 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    15-Jan-04, ahu: created<BR>
@@ -34,12 +34,10 @@
 // included header files
 #include "metadatum.hpp"
 #include "types.hpp"
-#include "value.hpp"
 
 // + standard includes
 #include <string>
-#include <utility>                              // for std::pair
-#include <iostream>
+#include <iosfwd>
 #include <memory>
 
 // *****************************************************************************
@@ -49,6 +47,7 @@
 // *****************************************************************************
 // class declarations
     class ExifData;
+    class ExifKey;
     class Value;
     struct TagInfo;
 
@@ -59,42 +58,25 @@
     typedef std::ostream& (*PrintFct)(std::ostream&, const Value&, const ExifData* pExifData);
     //! A function returning a tag list.
     typedef const TagInfo* (*TagListFct)();
-    /*!
-      @brief Section identifiers to logically group tags. A section consists
-             of nothing more than a name, based on the Exif standard.
-     */
-    enum SectionId { sectionIdNotSet,
-                     imgStruct, recOffset, imgCharacter, otherTags, exifFormat,
-                     exifVersion, imgConfig, userInfo, relatedFile, dateTime,
-                     captureCond, gpsTags, iopTags, makerTags, dngTags, panaRaw,
-                     tiffEp,
-                     lastSectionId };
 
 // *****************************************************************************
 // class definitions
 
-    //! The details of an IFD.
-    struct EXIV2API IfdInfo {
-        struct Item;
-        bool operator==(IfdId ifdId) const;     //!< Comparison operator for IFD id
-        bool operator==(const Item& item) const;       //!< Comparison operator for IFD item
-        IfdId ifdId_;                           //!< IFD id
-        const char* name_;                      //!< IFD name
-        const char* item_; //!< Related IFD item. This is also an IFD name, unique for each IFD.
-        TagListFct tagList_;                    //!< Tag list
+    //! The details of an Exif group. Groups include IFDs and binary arrays.
+    struct EXIV2API GroupInfo {
+        struct GroupName;
+        bool operator==(int ifdId) const;        //!< Comparison operator for IFD id
+        bool operator==(const GroupName& groupName) const; //!< Comparison operator for group name
+        int ifdId_;                              //!< IFD id
+        const char* ifdName_;                    //!< IFD name
+        const char* groupName_;                  //!< Group name, unique for each group.
+        TagListFct tagList_;                     //!< Tag list
     };
 
-    //! Search key to find an IfdInfo by its IFD item.
-    struct EXIV2API IfdInfo::Item {
-        Item(const std::string& item);          //!< Constructor
-        std::string i_;                         //!< IFD item
-    };
-
-    //! The details of a section.
-    struct EXIV2API SectionInfo {
-        SectionId sectionId_;                   //!< Section id
-        const char* name_;                      //!< Section name (one word)
-        const char* desc_;                      //!< Section description
+    //! Search key to find a GroupInfo by its group name.
+    struct EXIV2API GroupInfo::GroupName {
+        GroupName(const std::string& groupName); //!< Constructor
+        std::string g_;                          //!< Group name
     };
 
     //! Tag information
@@ -105,134 +87,24 @@
             const char* name,
             const char* title,
             const char* desc,
-            IfdId ifdId,
-            SectionId sectionId,
+            int ifdId,
+            int sectionId,
             TypeId typeId,
+            int16_t count,
             PrintFct printFct
         );
         uint16_t tag_;                          //!< Tag
         const char* name_;                      //!< One word tag label
         const char* title_;                     //!< Tag title
         const char* desc_;                      //!< Short tag description
-        IfdId ifdId_;                           //!< Link to the (prefered) IFD
-        SectionId sectionId_;                   //!< Section id
+        int ifdId_;                             //!< Link to the (preferred) IFD
+        int sectionId_;                         //!< Section id
         TypeId typeId_;                         //!< Type id
+        int16_t count_;                         //!< The number of values (not bytes!), 0=any, -1=count not known.
         PrintFct printFct_;                     //!< Pointer to tag print function
     }; // struct TagInfo
 
-    /*!
-      @brief Helper structure for lookup tables for translations of numeric
-             tag values to human readable labels.
-     */
-    struct EXIV2API TagDetails {
-        long val_;                              //!< Tag value
-        const char* label_;                     //!< Translation of the tag value
-
-        //! Comparison operator for use with the find template
-        bool operator==(long key) const { return val_ == key; }
-    }; // struct TagDetails
-
-    /*!
-      @brief Helper structure for lookup tables for translations of bitmask
-             values to human readable labels.
-     */
-    struct EXIV2API TagDetailsBitmask {
-        uint32_t mask_;                         //!< Bitmask value
-        const char* label_;                     //!< Description of the tag value
-    }; // struct TagDetailsBitmask
-
-    /*!
-      @brief Helper structure for lookup tables for translations of controlled
-             vocabulary strings to their descriptions.
-     */
-    struct EXIV2API TagVocabulary {
-        const char* voc_;                       //!< Vocabulary string
-        const char* label_;                     //!< Description of the vocabulary string
-
-        /*!
-          @brief Comparison operator for use with the find template
-
-          Compare vocabulary strings like "PR-NON" with keys like
-          "http://ns.useplus.org/ldf/vocab/PR-NON" and return true if the vocabulary
-          string matches the end of the key.
-         */
-        bool operator==(const std::string& key) const;
-    }; // struct TagDetails
-
-    /*!
-      @brief Generic pretty-print function to translate a long value to a description
-             by looking up a reference table.
-     */
-    template <int N, const TagDetails (&array)[N]>
-    std::ostream& printTag(std::ostream& os, const Value& value, const ExifData*)
-    {
-        const TagDetails* td = find(array, value.toLong());
-        if (td) {
-            os << exvGettext(td->label_);
-        }
-        else {
-            os << "(" << value << ")";
-        }
-        return os;
-    }
-
-//! Shortcut for the printTag template which requires typing the array name only once.
-#define EXV_PRINT_TAG(array) printTag<EXV_COUNTOF(array), array>
-
-    /*!
-      @brief Generic print function to translate a long value to a description
-             by looking up bitmasks in a reference table.
-     */
-    template <int N, const TagDetailsBitmask (&array)[N]>
-    std::ostream& printTagBitmask(std::ostream& os, const Value& value, const ExifData*)
-    {
-        const uint32_t val = static_cast<uint32_t>(value.toLong());
-        if (val == 0 && N > 0) {
-            const TagDetailsBitmask* td = *(&array);
-            if (td->mask_ == 0) return os << exvGettext(td->label_);
-        }
-        bool sep = false;
-        for (int i = 0; i < N; ++i) {
-            // *& acrobatics is a workaround for a MSVC 7.1 bug
-            const TagDetailsBitmask* td = *(&array) + i;
-
-            if (val & td->mask_) {
-                if (sep) {
-                    os << ", " << exvGettext(td->label_);
-                }
-                else {
-                    os << exvGettext(td->label_);
-                    sep = true;
-                }
-            }
-        }
-        return os;
-    }
-
-//! Shortcut for the printTagBitmask template which requires typing the array name only once.
-#define EXV_PRINT_TAG_BITMASK(array) printTagBitmask<EXV_COUNTOF(array), array>
-
-    /*!
-      @brief Generic pretty-print function to translate a controlled vocabulary value (string)
-             to a description by looking up a reference table.
-     */
-    template <int N, const TagVocabulary (&array)[N]>
-    std::ostream& printTagVocabulary(std::ostream& os, const Value& value, const ExifData*)
-    {
-        const TagVocabulary* td = find(array, value.toString());
-        if (td) {
-            os << exvGettext(td->label_);
-        }
-        else {
-            os << "(" << value << ")";
-        }
-        return os;
-    }
-
-//! Shortcut for the printTagVocabulary template which requires typing the array name only once.
-#define EXV_PRINT_VOCABULARY(array) printTagVocabulary<EXV_COUNTOF(array), array>
-
-    //! Exif tag reference, implemented as a static class.
+    //! Access to Exif group and tag lists and misc. tag reference methods, implemented as a static class.
     class EXIV2API ExifTags {
         //! Prevent construction: not implemented.
         ExifTags();
@@ -242,127 +114,38 @@
         ExifTags& operator=(const ExifTags& rhs);
 
     public:
-        /*!
-          @brief Return the name of the tag or a string with the hexadecimal
-                 value of the tag in the form "0x01ff", if the tag is not
-                 a known Exif tag.
-
-          @param tag The tag
-          @param ifdId IFD id
-          @return The name of the tag or a string containing the hexadecimal
-                  value of the tag in the form "0x01ff", if this is an unknown
-                  tag.
-         */
-        static std::string tagName(uint16_t tag, IfdId ifdId);
-        /*!
-          @brief Return the title (label) of the tag.
-                 (Deprecated, use tagLabel() instead.)
+        //! Return read-only list of built-in groups
+        static const GroupInfo* groupList();
+        //! Return read-only list of built-in \em groupName tags.
+        static const TagInfo* tagList(const std::string& groupName);
 
-          @param tag The tag
-          @param ifdId IFD id
-          @return The title (label) of the tag.
-         */
-        static const char* tagTitle(uint16_t tag, IfdId ifdId);
-        /*!
-          @brief Return the title (label) of the tag.
-
-          @param tag The tag
-          @param ifdId IFD id
-          @return The title (label) of the tag.
-         */
-        static const char* tagLabel(uint16_t tag, IfdId ifdId);
-        /*!
-          @brief Return the description of the tag.
-          @param tag The tag
-          @param ifdId IFD id
-          @return The description of the tag or a string indicating that
-                 the tag is unknown.
-         */
-        static const char* tagDesc(uint16_t tag, IfdId ifdId);
-        /*!
-          @brief Return the tag for one combination of IFD id and tagName.
-                 If the tagName is not known, it expects tag names in the
-                 form "0x01ff" and converts them to unsigned integer.
-
-          @throw Error if the tagname or ifdId is invalid
-         */
-        static uint16_t tag(const std::string& tagName, IfdId ifdId);
-        //! Return the IFD id for an IFD item
-        static IfdId ifdIdByIfdItem(const std::string& ifdItem);
-        //! Return the name of the IFD
-        static const char* ifdName(IfdId ifdId);
-        //! Return the related image item (image or thumbnail)
-        static const char* ifdItem(IfdId ifdId);
-        //! Return the name of the section
-        static const char* sectionName(SectionId sectionId);
-        /*!
-          @brief Return the name of the section for a combination of
-                 tag and IFD id.
-          @param tag The tag
-          @param ifdId IFD id
-          @return The name of the section or a string indicating that the
-                  section or the tag is unknown.
-         */
-        static const char* sectionName(uint16_t tag, IfdId ifdId);
-        /*!
-          @brief Return the description of the section for a combination of
-                 tag and IFD id.
-          @param tag The tag
-          @param ifdId IFD id
-          @return The description of the section or a string indicating that
-                 the section or the tag is unknown.
-         */
-        static const char* sectionDesc(uint16_t tag, IfdId ifdId);
-        //! Return the section id for a section name
-        static SectionId sectionId(const std::string& sectionName);
-        //! Return the type for tag and IFD id
-        static TypeId tagType(uint16_t tag, IfdId ifdId);
-        //! Interpret and print the value of an Exif tag
-        static std::ostream& printTag(std::ostream& os,
-                                      uint16_t tag,
-                                      IfdId ifdId,
-                                      const Value& value,
-                                      const ExifData* pExifData =0);
-        //! Return read-only list of built-in IFD0/1 tags
-        static const TagInfo* ifdTagList();
-        //! Return read-only list of built-in Exif IFD tags
-        static const TagInfo* exifTagList();
-        //! Return read-only list of built-in IOP tags
-        static const TagInfo* iopTagList();
-        //! Return read-only list of built-in GPS tags
-        static const TagInfo* gpsTagList();
-        //! Return read-only list of built-in Exiv2 Makernote info tags
-        static const TagInfo* mnTagList();
         //! Print a list of all standard Exif tags to output stream
         static void taglist(std::ostream& os);
-        //! Print the list of tags for \em %IfdId
-        static void taglist(std::ostream& os, IfdId ifdId);
+        //! Print the list of tags for \em groupName
+        static void taglist(std::ostream& os, const std::string& groupName);
+
+        //! Return the name of the section for an Exif \em key.
+        static const char* sectionName(const ExifKey& key);
+        //! Return the default number of components (not bytes!) \em key has. (0=any, -1=count not known)
+        static uint16_t defaultCount(const ExifKey& key);
+        //! Return the name of the IFD for the group.
+        static const char* ifdName(const std::string& groupName);
+
         /*!
-          @brief Return true if \em ifdId is an %Ifd id which is
-                 a makernote %Ifd id. Note: Calling this function with
-                 makerIfd returns false.
+          @brief Return true if \em groupName is a makernote group.
         */
-        static bool isMakerIfd(IfdId ifdId);
+        static bool isMakerGroup(const std::string& groupName);
         /*!
-          @brief Return true if \em ifdId is an Exif %Ifd Id, i.e., one of
-                 ifd0Id, exifIfdId, gpsIfdId, iopIfdId or ifd1Id, else false.
-                 This is used to differentiate between standard Exif %Ifds
-                 and %Ifds associated with the makernote.
+          @brief Return true if \em groupName is a TIFF or Exif IFD, else false.
+                 This is used to differentiate between standard Exif IFDs
+                 and IFDs associated with the makernote.
         */
-        static bool isExifIfd(IfdId ifdId);
-
-    private:
-        static const TagInfo* tagList(IfdId ifdId);
-        static const TagInfo* tagInfo(uint16_t tag, IfdId ifdId);
-        static const TagInfo* tagInfo(const std::string& tagName, IfdId ifdId);
-
-        static const IfdInfo     ifdInfo_[];     //!< All Exif and Makernote tag lists
-        static const SectionInfo sectionInfo_[]; //!< Exif (and one common Makernote) sections
+        static bool isExifGroup(const std::string& groupName);
 
     }; // class ExifTags
 
     /*!
-      @brief Concrete keys for Exif metadata.
+      @brief Concrete keys for Exif metadata and access to Exif tag reference data.
      */
     class EXIV2API ExifKey : public Key {
     public:
@@ -377,21 +160,29 @@
           @param key The key string.
           @throw Error if the first part of the key is not '<b>Exif</b>' or
                  the remainin parts of the key cannot be parsed and
-                 converted to an ifd-item and tag name.
+                 converted to a group name and tag name.
         */
         explicit ExifKey(const std::string& key);
         /*!
-          @brief Constructor to create an Exif key from a tag and IFD item
-                 string.
+          @brief Constructor to create an Exif key from the tag number and
+                 group name.
           @param tag The tag value
-          @param ifdItem The IFD string. For MakerNote tags, this must be the
-                 IFD item of the specific MakerNote. "MakerNote" is not allowed.
-          @throw Error if the key cannot be constructed from the tag and IFD
-                 item parameters.
+          @param groupName The name of the group, i.e., the second part of
+                 the Exif key.
+          @throw Error if the key cannot be constructed from the tag number
+                 and group name.
+         */
+        ExifKey(uint16_t tag, const std::string& groupName);
+        /*!
+          @brief Constructor to create an Exif key from a TagInfo instance.
+          @param ti The TagInfo instance
+          @throw Error if the key cannot be constructed from the tag number
+                 and group name.
          */
-        ExifKey(uint16_t tag, const std::string& ifdItem);
+        ExifKey(const TagInfo& ti);
         //! Copy constructor
         ExifKey(const ExifKey& rhs);
+        //! Destructor
         virtual ~ExifKey();
         //@}
 
@@ -409,58 +200,31 @@
         //@{
         virtual std::string key() const;
         virtual const char* familyName() const;
-        /*!
-          @brief Return the name of the group (the second part of the key).
-                 For Exif keys, the group name is the IFD item.
-        */
         virtual std::string groupName() const;
+        //! Return the IFD id as an integer. (Do not use, this is meant for library internal use.)
+        int ifdId() const;
         virtual std::string tagName() const;
-        virtual std::string tagLabel() const;
         virtual uint16_t tag() const;
+        virtual std::string tagLabel() const;
+        //! Return the tag description.
+        std::string tagDesc() const;        // Todo: should be in the base class
+        //! Return the default type id for this tag.
+        TypeId defaultTypeId() const;       // Todo: should be in the base class
 
         AutoPtr clone() const;
-        //! Return the IFD id
-        IfdId ifdId() const { return ifdId_; }
-        //! Return the name of the IFD
-        const char* ifdName() const { return ExifTags::ifdName(ifdId()); }
-        //! Return the related image item
-        std::string ifdItem() const { return ifdItem_; }
-        //! Return the name of the Exif section (deprecated)
-        std::string sectionName() const;
         //! Return the index (unique id of this key within the original Exif data, 0 if not set)
-        int idx() const { return idx_; }
-        //@}
-
-    protected:
-        //! @name Manipulators
-        //@{
-        /*!
-          @brief Set the key corresponding to the tag and IFD id.
-                 The key is of the form '<b>Exif</b>.ifdItem.tagName'.
-         */
-        void makeKey();
-        /*!
-          @brief Parse and convert the key string into tag and IFD Id.
-                 Updates data members if the string can be decomposed,
-                 or throws \em Error .
-
-          @throw Error if the key cannot be decomposed.
-         */
-        void decomposeKey();
+        int idx() const;
         //@}
 
     private:
         //! Internal virtual copy constructor.
         EXV_DLLLOCAL virtual ExifKey* clone_() const;
 
-        // DATA
-        static const char* familyName_;
+    private:
+        // Pimpl idiom
+        struct Impl;
+        Impl* p_;
 
-        uint16_t tag_;                  //!< Tag value
-        IfdId ifdId_;                   //!< The IFD associated with this tag
-        std::string ifdItem_;           //!< The IFD item
-        int idx_;                       //!< Unique id of the Exif key in the image
-        std::string key_;               //!< Key
     }; // class ExifKey
 
 // *****************************************************************************
@@ -469,114 +233,6 @@
     //! Output operator for TagInfo
     EXIV2API std::ostream& operator<<(std::ostream& os, const TagInfo& ti);
 
-    //! @name Functions printing interpreted tag values
-    //@{
-    //! Default print function, using the Value output operator
-    EXIV2API std::ostream& printValue(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the value converted to a long
-    EXIV2API std::ostream& printLong(std::ostream& os, const Value& value, const ExifData*);
-    //! Print a Rational or URational value in floating point format
-    EXIV2API std::ostream& printFloat(std::ostream& os, const Value& value, const ExifData*);
-    //! Print a longitude or latitude value
-    EXIV2API std::ostream& printDegrees(std::ostream& os, const Value& value, const ExifData*);
-    //! Print function converting from UCS-2LE to UTF-8
-    EXIV2API std::ostream& printUcs2(std::ostream& os, const Value& value, const ExifData*);
-    //! Print function for Exif units
-    EXIV2API std::ostream& printExifUnit(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS version
-    EXIV2API std::ostream& print0x0000(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS altitude ref
-    EXIV2API std::ostream& print0x0005(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS altitude
-    EXIV2API std::ostream& print0x0006(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS timestamp
-    EXIV2API std::ostream& print0x0007(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS status
-    EXIV2API std::ostream& print0x0009(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS measurement mode
-    EXIV2API std::ostream& print0x000a(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS speed ref
-    EXIV2API std::ostream& print0x000c(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS destination distance ref
-    EXIV2API std::ostream& print0x0019(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS differential correction
-    EXIV2API std::ostream& print0x001e(std::ostream& os, const Value& value, const ExifData*);
-    //! Print orientation
-    EXIV2API std::ostream& print0x0112(std::ostream& os, const Value& value, const ExifData*);
-    //! Print YCbCrPositioning
-    EXIV2API std::ostream& print0x0213(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the copyright
-    EXIV2API std::ostream& print0x8298(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the exposure time
-    EXIV2API std::ostream& print0x829a(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the f-number
-    EXIV2API std::ostream& print0x829d(std::ostream& os, const Value& value, const ExifData*);
-    //! Print exposure program
-    EXIV2API std::ostream& print0x8822(std::ostream& os, const Value& value, const ExifData*);
-    //! Print ISO speed ratings
-    EXIV2API std::ostream& print0x8827(std::ostream& os, const Value& value, const ExifData*);
-    //! Print components configuration specific to compressed data
-    EXIV2API std::ostream& print0x9101(std::ostream& os, const Value& value, const ExifData*);
-    //! Print exposure time converted from APEX shutter speed value
-    EXIV2API std::ostream& print0x9201(std::ostream& os, const Value& value, const ExifData*);
-    //! Print f-number converted from APEX aperture value
-    EXIV2API std::ostream& print0x9202(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the exposure bias value
-    EXIV2API std::ostream& print0x9204(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the subject distance
-    EXIV2API std::ostream& print0x9206(std::ostream& os, const Value& value, const ExifData*);
-    //! Print metering mode
-    EXIV2API std::ostream& print0x9207(std::ostream& os, const Value& value, const ExifData*);
-    //! Print light source
-    EXIV2API std::ostream& print0x9208(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the actual focal length of the lens
-    EXIV2API std::ostream& print0x920a(std::ostream& os, const Value& value, const ExifData*);
-    //! Print the user comment
-    EXIV2API std::ostream& print0x9286(std::ostream& os, const Value& value, const ExifData*);
-    //! Print color space
-    EXIV2API std::ostream& print0xa001(std::ostream& os, const Value& value, const ExifData*);
-    //! Print sensing method
-    EXIV2API std::ostream& print0xa217(std::ostream& os, const Value& value, const ExifData*);
-    //! Print file source
-    EXIV2API std::ostream& print0xa300(std::ostream& os, const Value& value, const ExifData*);
-    //! Print scene type
-    EXIV2API std::ostream& print0xa301(std::ostream& os, const Value& value, const ExifData*);
-    //! Print custom rendered
-    EXIV2API std::ostream& print0xa401(std::ostream& os, const Value& value, const ExifData*);
-    //! Print exposure mode
-    EXIV2API std::ostream& print0xa402(std::ostream& os, const Value& value, const ExifData*);
-    //! Print white balance
-    EXIV2API std::ostream& print0xa403(std::ostream& os, const Value& value, const ExifData*);
-    //! Print digital zoom ratio
-    EXIV2API std::ostream& print0xa404(std::ostream& os, const Value& value, const ExifData*);
-    //! Print 35mm equivalent focal length
-    EXIV2API std::ostream& print0xa405(std::ostream& os, const Value& value, const ExifData*);
-    //! Print scene capture type
-    EXIV2API std::ostream& print0xa406(std::ostream& os, const Value& value, const ExifData*);
-    //! Print gain control
-    EXIV2API std::ostream& print0xa407(std::ostream& os, const Value& value, const ExifData*);
-    //! Print saturation
-    EXIV2API std::ostream& print0xa409(std::ostream& os, const Value& value, const ExifData*);
-    //! Print subject distance range
-    EXIV2API std::ostream& print0xa40c(std::ostream& os, const Value& value, const ExifData*);
-    //! Print GPS direction ref
-    EXIV2API std::ostream& printGPSDirRef(std::ostream& os, const Value& value, const ExifData*);
-    //! Print contrast, sharpness (normal, soft, hard)
-    EXIV2API std::ostream& printNormalSoftHard(std::ostream& os, const Value& value, const ExifData*);
-    //! Print any version packed in 4 Bytes format : major major minor minor
-    EXIV2API std::ostream& printExifVersion(std::ostream& os, const Value& value, const ExifData*);
-    //! Print any version encoded in the ASCII string majormajorminorminor
-    EXIV2API std::ostream& printXmpVersion(std::ostream& os, const Value& value, const ExifData*);
-    //! Print a date following the format YYYY-MM-DDTHH:MM:SSZ
-    EXIV2API std::ostream& printXmpDate(std::ostream& os, const Value& value, const ExifData*);
-    //@}
-
-    //! Calculate F number from an APEX aperture value
-    EXIV2API float fnumber(float apertureValue);
-
-    //! Calculate the exposure time from an APEX shutter speed value
-    EXIV2API URational exposureTime(float shutterSpeedValue);
-
 }                                       // namespace Exiv2
 
 #endif                                  // #ifndef TAGS_HPP_
diff -Nru exiv2-0.19/src/tags_int.hpp exiv2-0.21/src/tags_int.hpp
--- exiv2-0.19/src/tags_int.hpp	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/tags_int.hpp	2010-09-28 17:05:23.000000000 +0000
@@ -0,0 +1,442 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    tags_int.hpp
+  @brief   Internal Exif tag and type information
+  @version $Rev: 2357 $
+  @author  Andreas Huggel (ahu)
+           <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
+  @date    15-Jan-04, ahu: created<BR>
+           11-Feb-04, ahu: isolated as a component
+ */
+#ifndef TAGS_INT_HPP_
+#define TAGS_INT_HPP_
+
+// *****************************************************************************
+// included header files
+#include "types.hpp"
+#include "tags.hpp"
+#include "value.hpp"
+
+// + standard includes
+#include <string>
+#include <iostream>
+#include <memory>
+
+// *****************************************************************************
+// namespace extensions
+
+namespace Exiv2 {
+    class ExifData;
+
+    namespace Internal {
+
+// *****************************************************************************
+// class definitions
+
+    //! Type to specify the IFD to which a metadata belongs
+    enum IfdId {
+        ifdIdNotSet,
+        ifd0Id,
+        ifd1Id,
+        ifd2Id,
+        ifd3Id,
+        exifId,
+        gpsId,
+        iopId,
+        subImage1Id,
+        subImage2Id,
+        subImage3Id,
+        subImage4Id,
+        subImage5Id,
+        subImage6Id,
+        subImage7Id,
+        subImage8Id,
+        subImage9Id,
+        subThumb1Id,
+        panaRawId,
+        mnId,
+        canonId,
+        canonCsId,
+        canonSiId,
+        canonCfId,
+        canonPiId,
+        canonPaId,
+        canonFiId,
+        canonPrId,
+        fujiId,
+        minoltaId,
+        minoltaCs5DId,
+        minoltaCs7DId,
+        minoltaCsOldId,
+        minoltaCsNewId,
+        nikon1Id,
+        nikon2Id,
+        nikon3Id,
+        nikonPvId,
+        nikonVrId,
+        nikonPcId,
+        nikonWtId,
+        nikonIiId,
+        nikonAfId,
+        nikonAf2Id,
+        nikonFiId,
+        nikonMeId,
+        nikonFl1Id,
+        nikonFl2Id,
+        nikonFl3Id,
+        nikonSi1Id,
+        nikonSi2Id,
+        nikonSi3Id,
+        nikonSi4Id,
+        nikonSi5Id,
+        nikonSi6Id,
+        nikonLd1Id,
+        nikonLd2Id,
+        nikonLd3Id,
+        nikonCb1Id,
+        nikonCb2Id,
+        nikonCb2aId,
+        nikonCb2bId,
+        nikonCb3Id,
+        nikonCb4Id,
+        olympusId,
+        olympus2Id,
+        olympusCsId,
+        olympusEqId,
+        olympusRdId,
+        olympusRd2Id,
+        olympusIpId,
+        olympusFiId,
+        olympusFe1Id,
+        olympusFe2Id,
+        olympusFe3Id,
+        olympusFe4Id,
+        olympusFe5Id,
+        olympusFe6Id,
+        olympusFe7Id,
+        olympusFe8Id,
+        olympusFe9Id,
+        olympusRiId,
+        panasonicId,
+        pentaxId,
+        samsung2Id,
+        samsungPvId,
+        sigmaId,
+        sony1Id,
+        sony2Id,
+        sonyMltId,
+        sony1CsId,
+        sony1Cs2Id,
+        sony2CsId,
+        sony2Cs2Id,
+        sony1MltCs7DId,
+        sony1MltCsOldId,
+        sony1MltCsNewId,
+        sony1MltCsA100Id,
+        lastId,
+        ignoreId = lastId
+    };
+
+    /*!
+      @brief Section identifiers to logically group tags. A section consists
+             of nothing more than a name, based on the Exif standard.
+     */
+    enum SectionId { sectionIdNotSet,
+                     imgStruct, recOffset, imgCharacter, otherTags, exifFormat,
+                     exifVersion, imgConfig, userInfo, relatedFile, dateTime,
+                     captureCond, gpsTags, iopTags, makerTags, dngTags, panaRaw,
+                     tiffEp, tiffPm6, adobeOpi,
+                     lastSectionId };
+
+    //! The details of a section.
+    struct SectionInfo {
+        SectionId sectionId_;                   //!< Section id
+        const char* name_;                      //!< Section name (one word)
+        const char* desc_;                      //!< Section description
+    };
+
+    /*!
+      @brief Helper structure for lookup tables for translations of numeric
+             tag values to human readable labels.
+     */
+    struct TagDetails {
+        long val_;                              //!< Tag value
+        const char* label_;                     //!< Translation of the tag value
+
+        //! Comparison operator for use with the find template
+        bool operator==(long key) const { return val_ == key; }
+    }; // struct TagDetails
+
+    /*!
+      @brief Helper structure for lookup tables for translations of bitmask
+             values to human readable labels.
+     */
+    struct TagDetailsBitmask {
+        uint32_t mask_;                         //!< Bitmask value
+        const char* label_;                     //!< Description of the tag value
+    }; // struct TagDetailsBitmask
+
+    /*!
+      @brief Helper structure for lookup tables for translations of controlled
+             vocabulary strings to their descriptions.
+     */
+    struct TagVocabulary {
+        const char* voc_;                       //!< Vocabulary string
+        const char* label_;                     //!< Description of the vocabulary string
+
+        /*!
+          @brief Comparison operator for use with the find template
+
+          Compare vocabulary strings like "PR-NON" with keys like
+          "http://ns.useplus.org/ldf/vocab/PR-NON" and return true if the vocabulary
+          string matches the end of the key.
+         */
+        bool operator==(const std::string& key) const;
+    }; // struct TagDetails
+
+    /*!
+      @brief Generic pretty-print function to translate a long value to a description
+             by looking up a reference table.
+     */
+    template <int N, const TagDetails (&array)[N]>
+    std::ostream& printTag(std::ostream& os, const Value& value, const ExifData*)
+    {
+        const TagDetails* td = find(array, value.toLong());
+        if (td) {
+            os << exvGettext(td->label_);
+        }
+        else {
+            os << "(" << value << ")";
+        }
+        return os;
+    }
+
+//! Shortcut for the printTag template which requires typing the array name only once.
+#define EXV_PRINT_TAG(array) printTag<EXV_COUNTOF(array), array>
+
+    /*!
+      @brief Generic print function to translate a long value to a description
+             by looking up bitmasks in a reference table.
+     */
+    template <int N, const TagDetailsBitmask (&array)[N]>
+    std::ostream& printTagBitmask(std::ostream& os, const Value& value, const ExifData*)
+    {
+        const uint32_t val = static_cast<uint32_t>(value.toLong());
+        if (val == 0 && N > 0) {
+            const TagDetailsBitmask* td = *(&array);
+            if (td->mask_ == 0) return os << exvGettext(td->label_);
+        }
+        bool sep = false;
+        for (int i = 0; i < N; ++i) {
+            // *& acrobatics is a workaround for a MSVC 7.1 bug
+            const TagDetailsBitmask* td = *(&array) + i;
+
+            if (val & td->mask_) {
+                if (sep) {
+                    os << ", " << exvGettext(td->label_);
+                }
+                else {
+                    os << exvGettext(td->label_);
+                    sep = true;
+                }
+            }
+        }
+        return os;
+    }
+
+//! Shortcut for the printTagBitmask template which requires typing the array name only once.
+#define EXV_PRINT_TAG_BITMASK(array) printTagBitmask<EXV_COUNTOF(array), array>
+
+    /*!
+      @brief Generic pretty-print function to translate a controlled vocabulary value (string)
+             to a description by looking up a reference table.
+     */
+    template <int N, const TagVocabulary (&array)[N]>
+    std::ostream& printTagVocabulary(std::ostream& os, const Value& value, const ExifData*)
+    {
+        const TagVocabulary* td = find(array, value.toString());
+        if (td) {
+            os << exvGettext(td->label_);
+        }
+        else {
+            os << "(" << value << ")";
+        }
+        return os;
+    }
+
+//! Shortcut for the printTagVocabulary template which requires typing the array name only once.
+#define EXV_PRINT_VOCABULARY(array) printTagVocabulary<EXV_COUNTOF(array), array>
+
+// *****************************************************************************
+// free functions
+
+    //! Return read-only list of built-in IFD0/1 tags
+    const TagInfo* ifdTagList();
+    //! Return read-only list of built-in Exif IFD tags
+    const TagInfo* exifTagList();
+    //! Return read-only list of built-in IOP tags
+    const TagInfo* iopTagList();
+    //! Return read-only list of built-in GPS tags
+    const TagInfo* gpsTagList();
+    //! Return read-only list of built-in Exiv2 Makernote info tags
+    const TagInfo* mnTagList();
+
+    //! Return the group id for a group name
+    IfdId groupId(const std::string& groupName);
+    //! Return the name of the IFD
+    const char* ifdName(IfdId ifdId);
+    //! Return the group name for a group id
+    const char* groupName(IfdId ifdId);
+
+    //! Return true if \em ifdId is a makernote IFD id. (Note: returns false for makerIfd)
+    bool isMakerIfd(IfdId ifdId);
+    //! Return true if \em ifdId is an %Exif IFD id.
+    bool isExifIfd(IfdId ifdId);
+
+    //! Print the list of tags for \em ifdId to the output stream \em os
+    void taglist(std::ostream& os, IfdId ifdId);
+    //! Return the tag list for \em ifdId
+    const TagInfo* tagList(IfdId ifdId);
+    //! Return the tag info for \em tag and \em ifdId
+    const TagInfo* tagInfo(uint16_t tag, IfdId ifdId);
+    //! Return the tag info for \em tagName and \em ifdId
+    const TagInfo* tagInfo(const std::string& tagName, IfdId ifdId);
+    /*!
+      @brief Return the tag number for one combination of IFD id and tagName.
+             If the tagName is not known, it expects tag names in the
+             form "0x01ff" and converts them to unsigned integer.
+
+      @throw Error if the tagname or ifdId is invalid
+     */
+    uint16_t tagNumber(const std::string& tagName, IfdId ifdId);
+
+    //! @name Functions printing interpreted tag values
+    //@{
+    //! Default print function, using the Value output operator
+    std::ostream& printValue(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the value converted to a long
+    std::ostream& printLong(std::ostream& os, const Value& value, const ExifData*);
+    //! Print a Rational or URational value in floating point format
+    std::ostream& printFloat(std::ostream& os, const Value& value, const ExifData*);
+    //! Print a longitude or latitude value
+    std::ostream& printDegrees(std::ostream& os, const Value& value, const ExifData*);
+    //! Print function converting from UCS-2LE to UTF-8
+    std::ostream& printUcs2(std::ostream& os, const Value& value, const ExifData*);
+    //! Print function for Exif units
+    std::ostream& printExifUnit(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS version
+    std::ostream& print0x0000(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS altitude ref
+    std::ostream& print0x0005(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS altitude
+    std::ostream& print0x0006(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS timestamp
+    std::ostream& print0x0007(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS status
+    std::ostream& print0x0009(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS measurement mode
+    std::ostream& print0x000a(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS speed ref
+    std::ostream& print0x000c(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS destination distance ref
+    std::ostream& print0x0019(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS differential correction
+    std::ostream& print0x001e(std::ostream& os, const Value& value, const ExifData*);
+    //! Print orientation
+    std::ostream& print0x0112(std::ostream& os, const Value& value, const ExifData*);
+    //! Print YCbCrPositioning
+    std::ostream& print0x0213(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the copyright
+    std::ostream& print0x8298(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the exposure time
+    std::ostream& print0x829a(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the f-number
+    std::ostream& print0x829d(std::ostream& os, const Value& value, const ExifData*);
+    //! Print exposure program
+    std::ostream& print0x8822(std::ostream& os, const Value& value, const ExifData*);
+    //! Print ISO speed ratings
+    std::ostream& print0x8827(std::ostream& os, const Value& value, const ExifData*);
+    //! Print components configuration specific to compressed data
+    std::ostream& print0x9101(std::ostream& os, const Value& value, const ExifData*);
+    //! Print exposure time converted from APEX shutter speed value
+    std::ostream& print0x9201(std::ostream& os, const Value& value, const ExifData*);
+    //! Print f-number converted from APEX aperture value
+    std::ostream& print0x9202(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the exposure bias value
+    std::ostream& print0x9204(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the subject distance
+    std::ostream& print0x9206(std::ostream& os, const Value& value, const ExifData*);
+    //! Print metering mode
+    std::ostream& print0x9207(std::ostream& os, const Value& value, const ExifData*);
+    //! Print light source
+    std::ostream& print0x9208(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the actual focal length of the lens
+    std::ostream& print0x920a(std::ostream& os, const Value& value, const ExifData*);
+    //! Print the user comment
+    std::ostream& print0x9286(std::ostream& os, const Value& value, const ExifData*);
+    //! Print color space
+    std::ostream& print0xa001(std::ostream& os, const Value& value, const ExifData*);
+    //! Print sensing method
+    std::ostream& print0xa217(std::ostream& os, const Value& value, const ExifData*);
+    //! Print file source
+    std::ostream& print0xa300(std::ostream& os, const Value& value, const ExifData*);
+    //! Print scene type
+    std::ostream& print0xa301(std::ostream& os, const Value& value, const ExifData*);
+    //! Print custom rendered
+    std::ostream& print0xa401(std::ostream& os, const Value& value, const ExifData*);
+    //! Print exposure mode
+    std::ostream& print0xa402(std::ostream& os, const Value& value, const ExifData*);
+    //! Print white balance
+    std::ostream& print0xa403(std::ostream& os, const Value& value, const ExifData*);
+    //! Print digital zoom ratio
+    std::ostream& print0xa404(std::ostream& os, const Value& value, const ExifData*);
+    //! Print 35mm equivalent focal length
+    std::ostream& print0xa405(std::ostream& os, const Value& value, const ExifData*);
+    //! Print scene capture type
+    std::ostream& print0xa406(std::ostream& os, const Value& value, const ExifData*);
+    //! Print gain control
+    std::ostream& print0xa407(std::ostream& os, const Value& value, const ExifData*);
+    //! Print saturation
+    std::ostream& print0xa409(std::ostream& os, const Value& value, const ExifData*);
+    //! Print subject distance range
+    std::ostream& print0xa40c(std::ostream& os, const Value& value, const ExifData*);
+    //! Print GPS direction ref
+    std::ostream& printGPSDirRef(std::ostream& os, const Value& value, const ExifData*);
+    //! Print contrast, sharpness (normal, soft, hard)
+    std::ostream& printNormalSoftHard(std::ostream& os, const Value& value, const ExifData*);
+    //! Print any version packed in 4 Bytes format : major major minor minor
+    std::ostream& printExifVersion(std::ostream& os, const Value& value, const ExifData*);
+    //! Print any version encoded in the ASCII string majormajorminorminor
+    std::ostream& printXmpVersion(std::ostream& os, const Value& value, const ExifData*);
+    //! Print a date following the format YYYY-MM-DDTHH:MM:SSZ
+    std::ostream& printXmpDate(std::ostream& os, const Value& value, const ExifData*);
+    //@}
+
+    //! Calculate F number from an APEX aperture value
+    float fnumber(float apertureValue);
+
+    //! Calculate the exposure time from an APEX shutter speed value
+    URational exposureTime(float shutterSpeedValue);
+
+}}                                      // namespace Internal, Exiv2
+
+#endif                                  // #ifndef TAGS_INT_HPP_
diff -Nru exiv2-0.19/src/tgaimage.cpp exiv2-0.21/src/tgaimage.cpp
--- exiv2-0.19/src/tgaimage.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/tgaimage.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      tgaimage.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Marco Piovanelli, Ovolab (marco)
   History:   05-Mar-2007, marco: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: tgaimage.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: tgaimage.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 //#define DEBUG 1
 
diff -Nru exiv2-0.19/src/tgaimage.hpp exiv2-0.21/src/tgaimage.hpp
--- exiv2-0.19/src/tgaimage.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/tgaimage.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -23,7 +23,7 @@
   @brief   Truevision TARGA v2 image, implemented using the following references:
            <a href="http://en.wikipedia.org/wiki/Truevision_TGA">Truevision TGA page on Wikipedia</a><br>
            <a href="http://www.gamers.org/dEngine/quake3/TGA.ps.gz">TGA(tm) File Format Specification</a>
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Marco Piovanelli, Ovolab (marco)
            <a href="mailto:marco.piovanelli@pobox.com">marco.piovanelli@pobox.com</a>
   @date    05-Mar-2007, marco: created
diff -Nru exiv2-0.19/src/tiffcomposite.cpp exiv2-0.21/src/tiffcomposite.cpp
--- exiv2-0.19/src/tiffcomposite.cpp	2009-12-27 09:56:29.000000000 +0000
+++ exiv2-0.21/src/tiffcomposite.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      tiffcomposite.cpp
-  Version:   $Rev: 1967 $
+  Version:   $Rev: 2344 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   11-Apr-06, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: tiffcomposite.cpp 1967 2009-12-27 09:56:29Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: tiffcomposite.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -45,6 +45,7 @@
 
 // + standard includes
 #include <string>
+#include <cstring>
 #include <iostream>
 #include <iomanip>
 #include <algorithm>
@@ -60,128 +61,10 @@
 namespace Exiv2 {
     namespace Internal {
 
-    //! Structure for group and group name info
-    struct TiffGroupInfo {
-        //! Comparison operator for group (id)
-        bool operator==(const uint16_t& group) const;
-        //! Comparison operator for group name
-        bool operator==(const std::string& groupName) const;
-
-        uint16_t group_;   //!< group
-        const char* name_; //!< group name
-    };
-
-    // Todo: This mapping table probably belongs somewhere else - move it
-    // Note: Names must be unique!
-    //! List of groups and their names.
-    extern const TiffGroupInfo tiffGroupInfo[] = {
-        {   1, "Image"        },
-        {   2, "Thumbnail"    },
-        {   3, "Image2"       },
-        {   4, "Image3"       },
-        {   5, "Photo"        },
-        {   6, "GPSInfo"      },
-        {   7, "Iop"          },
-        {   8, "SubImage1"    },
-        {   9, "SubImage2"    },
-        {  10, "SubImage3"    },
-        {  11, "SubImage4"    },
-        {  64, "PanasonicRaw" },
-        { 256, "MakerNote"    },
-        // 257 not needed (olympmn)
-        { 258, "Fujifilm"     },
-        { 259, "Canon"        },
-        { 260, "CanonCs"      },
-        { 261, "CanonSi"      },
-        { 262, "CanonCf"      },
-        // 263 not needed (nikonmn)
-        { 264, "Nikon1"       },
-        { 265, "Nikon2"       },
-        { 266, "Nikon3"       },
-        { 267, "Panasonic"    },
-        { 268, "Sigma"        },
-        // 269 not needed (sonymn)
-        { 270, "Sony"         },
-        { 271, "Sony"         }, // Todo: Need second Sony group!
-        { 272, "Minolta"      },
-        { 273, "MinoltaCsOld" },
-        { 274, "MinoltaCsNew" },
-        { 275, "MinoltaCs5D"  },
-        { 276, "MinoltaCs7D"  },
-        { 277, "CanonPi"      },
-        { 278, "CanonPa"      },
-        { 279, "Pentax"       },
-        { 280, "NikonPreview" },
-        { 281, "Olympus"      },
-        { 282, "Olympus2"     },
-        { 283, "OlympusCs"    },
-        { 284, "OlympusEq"    },
-        { 285, "OlympusRd"    },
-        { 286, "OlympusRd2"   },
-        { 287, "OlympusIp"    },
-        { 288, "OlympusFi"    },
-        { 289, "OlympusFe1"   },
-        { 290, "OlympusFe2"   },
-        { 291, "OlympusFe3"   },
-        { 292, "OlympusFe4"   },
-        { 293, "OlympusFe5"   },
-        { 294, "OlympusFe6"   },
-        { 295, "OlympusFe7"   },
-        { 296, "OlympusFe8"   },
-        { 297, "OlympusFe9"   },
-        { 298, "OlympusRi"    },
-        { 299, "NikonWt"      },
-        { 300, "NikonIi"      },
-        { 301, "NikonLd1"     },
-        { 302, "NikonLd2"     },
-        { 303, "NikonLd3"     },
-        { 304, "NikonCb1"     },
-        { 305, "NikonCb2"     },
-        { 306, "NikonCb2a"    },
-        { 307, "NikonCb2b"    },
-        { 308, "NikonCb3"     },
-        { 309, "NikonCb4"     },
-        { 310, "NikonVr"      },
-        { 311, "NikonPc"      },
-        { 312, "NikonAf"      },
-        { 313, "NikonSiD80"   },
-        { 314, "NikonSiD40"   },
-        { 315, "NikonSiD300a" },
-        { 316, "NikonSiD300b" },
-        { 317, "NikonSi02xx"  },
-        { 318, "NikonSi01xx"  },
-        { 320, "CanonFi"      }
-    };
-
-    bool TiffGroupInfo::operator==(const uint16_t& group) const
-    {
-        return group_ == group;
-    }
-
-    bool TiffGroupInfo::operator==(const std::string& groupName) const
-    {
-        std::string name(name_);
-        return name == groupName;
-    }
-
-    const char* tiffGroupName(uint16_t group)
-    {
-        const TiffGroupInfo* gi = find(tiffGroupInfo, group);
-        if (!gi) return "Unknown";
-        return gi->name_;
-    }
-
-    uint16_t tiffGroupId(const std::string& groupName)
-    {
-        const TiffGroupInfo* gi = find(tiffGroupInfo, groupName);
-        if (!gi) return 0;
-        return gi->group_;
-    }
-
     bool TiffMappingInfo::operator==(const TiffMappingInfo::Key& key) const
     {
-        std::string make(make_);
-        return    ("*" == make || make == key.m_.substr(0, make.length()))
+        return    (   0 == strcmp("*", make_)
+                   || 0 == strncmp(make_, key.m_.c_str(), strlen(make_)))
                && (Tag::all == extendedTag_ || key.e_ == extendedTag_)
                && key.g_ == group_;
     }
@@ -210,12 +93,12 @@
         return io_.putb(data);
     }
 
-    TiffComponent::TiffComponent(uint16_t tag, uint16_t group)
+    TiffComponent::TiffComponent(uint16_t tag, IfdId group)
         : tag_(tag), group_(group), pStart_(0)
     {
     }
 
-    TiffEntryBase::TiffEntryBase(uint16_t tag, uint16_t group, TiffType tiffType)
+    TiffEntryBase::TiffEntryBase(uint16_t tag, IfdId group, TiffType tiffType)
         : TiffComponent(tag, group),
           tiffType_(tiffType), count_(0), offset_(0),
           size_(0), pData_(0), isMalloced_(false), idx_(0),
@@ -223,19 +106,19 @@
     {
     }
 
-    TiffSubIfd::TiffSubIfd(uint16_t tag, uint16_t group, uint16_t newGroup)
+    TiffSubIfd::TiffSubIfd(uint16_t tag, IfdId group, IfdId newGroup)
         : TiffEntryBase(tag, group, ttUnsignedLong), newGroup_(newGroup)
     {
     }
 
-    TiffMnEntry::TiffMnEntry(uint16_t tag, uint16_t group, uint16_t mnGroup)
+    TiffMnEntry::TiffMnEntry(uint16_t tag, IfdId group, IfdId mnGroup)
         : TiffEntryBase(tag, group, ttUndefined), mnGroup_(mnGroup), mn_(0)
     {
     }
 
     TiffIfdMakernote::TiffIfdMakernote(uint16_t  tag,
-                                       uint16_t  group,
-                                       uint16_t  mnGroup,
+                                       IfdId     group,
+                                       IfdId     mnGroup,
                                        MnHeader* pHeader,
                                        bool      hasNext)
         : TiffComponent(tag, group),
@@ -247,7 +130,7 @@
     }
 
     TiffBinaryArray::TiffBinaryArray(uint16_t tag,
-                                     uint16_t group,
+                                     IfdId group,
                                      const ArrayCfg* arrayCfg,
                                      const ArrayDef* arrayDef,
                                      int defSize)
@@ -266,7 +149,7 @@
     }
 
     TiffBinaryArray::TiffBinaryArray(uint16_t tag,
-                                     uint16_t group,
+                                     IfdId group,
                                      const ArraySet* arraySet,
                                      int setSize,
                                      CfgSelFct cfgSelFct)
@@ -286,8 +169,7 @@
         assert(arraySet_ != 0);
     }
 
-    TiffBinaryElement::TiffBinaryElement(uint16_t tag,
-                                         uint16_t group)
+    TiffBinaryElement::TiffBinaryElement(uint16_t tag, IfdId group)
         : TiffEntryBase(tag, group)
     {
     }
@@ -302,14 +184,14 @@
             delete *i;
         }
         delete pNext_;
-    } // TiffDirectory::~TiffDirectory
+    }
 
     TiffSubIfd::~TiffSubIfd()
     {
         for (Ifds::iterator i = ifds_.begin(); i != ifds_.end(); ++i) {
             delete *i;
         }
-    } // TiffSubIfd::~TiffSubIfd
+    }
 
     TiffEntryBase::~TiffEntryBase()
     {
@@ -317,7 +199,7 @@
             delete[] pData_;
         }
         delete pValue_;
-    } // TiffEntryBase::~TiffEntryBase
+    }
 
     TiffEntry::~TiffEntry()
     {
@@ -342,7 +224,7 @@
     TiffMnEntry::~TiffMnEntry()
     {
         delete mn_;
-    } // TiffMnEntry::~TiffMnEntry
+    }
 
     TiffIfdMakernote::~TiffIfdMakernote()
     {
@@ -354,12 +236,113 @@
         for (Components::iterator i = elements_.begin(); i != elements_.end(); ++i) {
             delete *i;
         }
-    } // TiffBinaryArray::~TiffBinaryArray
+    }
 
     TiffBinaryElement::~TiffBinaryElement()
     {
     }
 
+    TiffEntryBase::TiffEntryBase(const TiffEntryBase& rhs)
+        : TiffComponent(rhs),
+          tiffType_(rhs.tiffType_),
+          count_(rhs.count_),
+          offset_(rhs.offset_),
+          size_(rhs.size_),
+          pData_(rhs.pData_),
+          isMalloced_(rhs.isMalloced_),
+          idx_(rhs.idx_),
+          pValue_(rhs.pValue_ ? rhs.pValue_->clone().release() : 0)
+    {
+        if (rhs.isMalloced_) {
+            pData_ = new byte[rhs.size_];
+            memcpy(pData_, rhs.pData_, rhs.size_);
+        }
+    }
+
+    TiffDirectory::TiffDirectory(const TiffDirectory& rhs)
+        : TiffComponent(rhs),
+          hasNext_(rhs.hasNext_),
+          pNext_(0)
+    {
+    }
+
+    TiffSubIfd::TiffSubIfd(const TiffSubIfd& rhs)
+        : TiffEntryBase(rhs),
+          newGroup_(rhs.newGroup_)
+    {
+    }
+
+    TiffBinaryArray::TiffBinaryArray(const TiffBinaryArray& rhs)
+        : TiffEntryBase(rhs),
+          cfgSelFct_(rhs.cfgSelFct_),
+          arraySet_(rhs.arraySet_),
+          arrayCfg_(rhs.arrayCfg_),
+          arrayDef_(rhs.arrayDef_),
+          defSize_(rhs.defSize_),
+          setSize_(rhs.setSize_),
+          origData_(rhs.origData_),
+          origSize_(rhs.origSize_),
+          pRoot_(rhs.pRoot_)
+    {
+    }
+
+    TiffComponent::AutoPtr TiffComponent::clone() const
+    {
+        return AutoPtr(doClone());
+    }
+
+    TiffEntry* TiffEntry::doClone() const
+    {
+        return new TiffEntry(*this);
+    }
+
+    TiffDataEntry* TiffDataEntry::doClone() const
+    {
+        return new TiffDataEntry(*this);
+    }
+
+    TiffImageEntry* TiffImageEntry::doClone() const
+    {
+        return new TiffImageEntry(*this);
+    }
+
+    TiffSizeEntry* TiffSizeEntry::doClone() const
+    {
+        return new TiffSizeEntry(*this);
+    }
+
+    TiffDirectory* TiffDirectory::doClone() const
+    {
+        return new TiffDirectory(*this);
+    }
+
+    TiffSubIfd* TiffSubIfd::doClone() const
+    {
+        return new TiffSubIfd(*this);
+    }
+
+    TiffMnEntry* TiffMnEntry::doClone() const
+    {
+        assert(false); // Not implemented
+        return 0;
+    }
+
+    TiffIfdMakernote* TiffIfdMakernote::doClone() const
+    {
+        assert(false); // Not implemented
+        return 0;
+    }
+
+    TiffBinaryArray* TiffBinaryArray::doClone() const
+    {
+        return new TiffBinaryArray(*this);
+    }
+
+    TiffBinaryElement* TiffBinaryElement::doClone() const
+    {
+        return new TiffBinaryElement(*this);
+    }
+
     int TiffComponent::idx() const
     {
         return 0;
@@ -416,32 +399,29 @@
     {
         if (!pValue() || !pSize) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << tag()
-                      << ": Size or data offset value not set, ignoring them.\n";
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << ": Size or data offset value not set, ignoring them.\n";
 #endif
             return;
         }
         if (pValue()->count() == 0) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << tag()
-                      << ": Data offset entry value is empty, ignoring it.\n";
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << ": Data offset entry value is empty, ignoring it.\n";
 #endif
             return;
         }
         if (pValue()->count() != pSize->count()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << tag()
-                      << ": Size and data offset entries have different"
-                      << " number of components, ignoring them.\n";
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << ": Size and data offset entries have different"
+                        << " number of components, ignoring them.\n";
 #endif
             return;
         }
@@ -456,11 +436,10 @@
             + static_cast<uint32_t>(pSize->toLong(pSize->count()-1))
             - offset != size) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << tag()
-                      << ": Data area is not contiguous, ignoring it.\n";
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << ": Data area is not contiguous, ignoring it.\n";
 #endif
             return;
         }
@@ -468,11 +447,10 @@
             || size > sizeData
             || baseOffset + offset > sizeData - size) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << tag()
-                      << ": Data area exceeds data buffer, ignoring it.\n";
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << ": Data area exceeds data buffer, ignoring it.\n";
 #endif
             return;
         }
@@ -488,22 +466,20 @@
     {
         if (!pValue() || !pSize) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << tag()
-                      << ": Size or data offset value not set, ignoring them.\n";
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << ": Size or data offset value not set, ignoring them.\n";
 #endif
             return;
         }
         if (pValue()->count() != pSize->count()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << tag()
-                      << ": Size and data offset entries have different"
-                      << " number of components, ignoring them.\n";
+            EXV_WARNING << "Directory " << groupName(group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << tag()
+                        << ": Size and data offset entries have different"
+                        << " number of components, ignoring them.\n";
 #endif
             return;
         }
@@ -516,12 +492,11 @@
                 || size > sizeData
                 || baseOffset + offset > sizeData - size) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: "
-                          << "Directory " << tiffGroupName(group())
-                          << ", entry 0x" << std::setw(4)
-                          << std::setfill('0') << std::hex << tag()
-                          << ": Strip " << std::dec << i
-                          << " is outside of the data area; ignored.\n";
+                EXV_WARNING << "Directory " << groupName(group())
+                            << ", entry 0x" << std::setw(4)
+                            << std::setfill('0') << std::hex << tag()
+                            << ": Strip " << std::dec << i
+                            << " is outside of the data area; ignored.\n";
 #endif
             }
             else if (size != 0) {
@@ -581,13 +556,13 @@
         return pHeader_->write(ioWrapper, byteOrder);
     }
 
-    uint32_t ArrayDef::size(uint16_t tag, uint16_t group) const
+    uint32_t ArrayDef::size(uint16_t tag, IfdId group) const
     {
         TypeId typeId = toTypeId(tiffType_, tag, group);
         return count_ * TypeInfo::typeSize(typeId);
     }
 
-    bool TiffBinaryArray::initialize(uint16_t group)
+    bool TiffBinaryArray::initialize(IfdId group)
     {
         if (arrayCfg_ != 0) return true; // Not a complex array or already initialized
 
@@ -626,16 +601,15 @@
         assert(pData != 0);
 
         if (origSize_ != size) return false;
+        if (origData_ == pData) return true;
         memcpy(origData_, pData, origSize_);
         return true;
     }
 
-    uint32_t TiffBinaryArray::addElement(uint32_t idx, const ArrayDef* def)
+    uint32_t TiffBinaryArray::addElement(uint32_t idx, const ArrayDef& def)
     {
-        assert(def != 0);
-
         uint16_t tag = static_cast<uint16_t>(idx / cfg()->tagStep());
-        int32_t sz = EXV_MIN(def->size(tag, cfg()->group_), TiffEntryBase::doSize() - idx);
+        int32_t sz = EXV_MIN(def.size(tag, cfg()->group_), TiffEntryBase::doSize() - idx);
         TiffComponent::AutoPtr tc = TiffCreator::create(tag, cfg()->group_);
         TiffBinaryElement* tp = dynamic_cast<TiffBinaryElement*>(tc.get());
         // The assertion typically fails if a component is not configured in
@@ -649,17 +623,26 @@
         return sz;
     } // TiffBinaryArray::addElement
 
-    TiffComponent* TiffComponent::addPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot)
+    TiffComponent* TiffComponent::addPath(uint16_t tag,
+                                          TiffPath& tiffPath,
+                                          TiffComponent* const pRoot,
+                                          TiffComponent::AutoPtr object)
     {
-        return doAddPath(tag, tiffPath, pRoot);
+        return doAddPath(tag, tiffPath, pRoot, object);
     } // TiffComponent::addPath
 
-    TiffComponent* TiffComponent::doAddPath(uint16_t  /*tag*/, TiffPath& /*tiffPath*/, TiffComponent* const /*pRoot*/)
+    TiffComponent* TiffComponent::doAddPath(uint16_t  /*tag*/,
+                                            TiffPath& /*tiffPath*/,
+                                            TiffComponent* const /*pRoot*/,
+                                            TiffComponent::AutoPtr /*object*/)
     {
         return this;
     } // TiffComponent::doAddPath
 
-    TiffComponent* TiffDirectory::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot)
+    TiffComponent* TiffDirectory::doAddPath(uint16_t tag,
+                                            TiffPath& tiffPath,
+                                            TiffComponent* const pRoot,
+                                            TiffComponent::AutoPtr object)
     {
         assert(tiffPath.size() > 1);
         tiffPath.pop();
@@ -671,7 +654,7 @@
         // This is used to prevent duplicate entries. Sub-IFDs also, but the > 1
         // condition takes care of them, see below.
         if (   tiffPath.size() > 1
-            || (tpi.extendedTag() == 0x927c && tpi.group() == Group::exif)) {
+            || (tpi.extendedTag() == 0x927c && tpi.group() == exifId)) {
             if (tpi.extendedTag() == Tag::next) {
                 tc = pNext_;
             }
@@ -685,7 +668,13 @@
             }
         }
         if (tc == 0) {
-            TiffComponent::AutoPtr atc = TiffCreator::create(tpi.extendedTag(), tpi.group());
+            TiffComponent::AutoPtr atc;
+            if (tiffPath.size() == 1 && object.get() != 0) {
+                atc = object;
+            }
+            else {
+                atc = TiffCreator::create(tpi.extendedTag(), tpi.group());
+            }
             assert(atc.get() != 0);
 
             // Prevent dangling sub-IFD tags: Do not add a sub-IFD component without children.
@@ -699,10 +688,13 @@
                 tc = this->addChild(atc);
             }
         }
-        return tc->addPath(tag, tiffPath, pRoot);
+        return tc->addPath(tag, tiffPath, pRoot, object);
     } // TiffDirectory::doAddPath
 
-    TiffComponent* TiffSubIfd::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot)
+    TiffComponent* TiffSubIfd::doAddPath(uint16_t tag,
+                                         TiffPath& tiffPath,
+                                         TiffComponent* const pRoot,
+                                         TiffComponent::AutoPtr object)
     {
         assert(!tiffPath.empty());
         const TiffPathItem tpi1 = tiffPath.top();
@@ -722,14 +714,22 @@
             }
         }
         if (tc == 0) {
-            TiffComponent::AutoPtr atc(new TiffDirectory(tpi1.tag(), tpi2.group()));
-            tc = addChild(atc);
+            if (tiffPath.size() == 1 && object.get() != 0) {
+                tc = addChild(object);
+            }
+            else {
+                TiffComponent::AutoPtr atc(new TiffDirectory(tpi1.tag(), tpi2.group()));
+                tc = addChild(atc);
+            }
             setCount(static_cast<uint32_t>(ifds_.size()));
         }
-        return tc->addPath(tag, tiffPath, pRoot);
+        return tc->addPath(tag, tiffPath, pRoot, object);
     } // TiffSubIfd::doAddPath
 
-    TiffComponent* TiffMnEntry::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot)
+    TiffComponent* TiffMnEntry::doAddPath(uint16_t tag,
+                                          TiffPath& tiffPath,
+                                          TiffComponent* const pRoot,
+                                          TiffComponent::AutoPtr object)
     {
         assert(!tiffPath.empty());
         const TiffPathItem tpi1 = tiffPath.top();
@@ -745,15 +745,21 @@
             mn_ = TiffMnCreator::create(tpi1.tag(), tpi1.group(), mnGroup_);
             assert(mn_);
         }
-        return mn_->addPath(tag, tiffPath, pRoot);
+        return mn_->addPath(tag, tiffPath, pRoot, object);
     } // TiffMnEntry::doAddPath
 
-    TiffComponent* TiffIfdMakernote::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot)
-    {
-        return ifd_.addPath(tag, tiffPath, pRoot);
+    TiffComponent* TiffIfdMakernote::doAddPath(uint16_t tag,
+                                               TiffPath& tiffPath,
+                                               TiffComponent* const pRoot,
+                                               TiffComponent::AutoPtr object)
+    {
+        return ifd_.addPath(tag, tiffPath, pRoot, object);
     }
 
-    TiffComponent* TiffBinaryArray::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot)
+    TiffComponent* TiffBinaryArray::doAddPath(uint16_t tag,
+                                              TiffPath& tiffPath,
+                                              TiffComponent* const pRoot,
+                                              TiffComponent::AutoPtr object)
     {
         pRoot_ = pRoot;
         if (tiffPath.size() == 1) {
@@ -777,14 +783,19 @@
             }
         }
         if (tc == 0) {
-            TiffComponent::AutoPtr atc = TiffCreator::create(tpi.extendedTag(), tpi.group());
+            TiffComponent::AutoPtr atc;
+            if (tiffPath.size() == 1 && object.get() != 0) {
+                atc = object;
+            }
+            else {
+                atc = TiffCreator::create(tpi.extendedTag(), tpi.group());
+            }
             assert(atc.get() != 0);
-
             assert(tpi.extendedTag() != Tag::next);
             tc = addChild(atc);
             setCount(static_cast<uint32_t>(elements_.size()));
         }
-        return tc->addPath(tag, tiffPath, pRoot);
+        return tc->addPath(tag, tiffPath, pRoot, object);
     } // TiffBinaryArray::doAddPath
 
     TiffComponent* TiffComponent::addChild(TiffComponent::AutoPtr tiffComponent)
@@ -1037,7 +1048,7 @@
 
     uint32_t TiffBinaryElement::doCount() const
     {
-        return elDef_->count_;
+        return elDef_.count_;
     }
 
     uint32_t TiffComponent::write(IoWrapper& ioWrapper,
@@ -1061,7 +1072,7 @@
 
         // Number of components to write
         const uint32_t compCount = count();
-        if (compCount > 0xffff) throw Error(49, tiffGroupName(group()));
+        if (compCount > 0xffff) throw Error(49, groupName(group()));
 
         // Size of next IFD, if any
         uint32_t sizeNext = 0;
@@ -1075,7 +1086,7 @@
 
         // TIFF standard requires IFD entries to be sorted in ascending order by tag.
         // Not sorting makernote directories sometimes preserves them better.
-        if (group() < Group::mn) {
+        if (group() < mnId) {
             std::sort(components_.begin(), components_.end(), cmpTagLt);
         }
         // Size of IFD values and additional data
@@ -1277,9 +1288,9 @@
     {
         uint32_t o2 = imageIdx;
         // For makernotes, write TIFF image data to the data area
-        if (group() > Group::mn) o2 = offset + dataIdx;
+        if (group() > mnId) o2 = offset + dataIdx;
 #ifdef DEBUG
-        std::cerr << "TiffImageEntry, Directory " << tiffGroupName(group())
+        std::cerr << "TiffImageEntry, Directory " << ifdItem(group())
                   << ", entry 0x" << std::setw(4)
                   << std::setfill('0') << std::hex << tag() << std::dec
                   << ": Writing offset " << o2 << "\n";
@@ -1290,7 +1301,7 @@
             idx += writeOffset(buf.pData_ + idx, o2, tiffType(), byteOrder);
             o2 += i->second;
             o2 += i->second & 1;                // Align strip data to word boundary
-            if (!(group() > Group::mn)) {
+            if (!(group() > mnId)) {            // Todo: FIX THIS!! SHOULDN'T USE >
                 imageIdx += i->second;
                 imageIdx += i->second & 1;      // Align strip data to word boundary
             }
@@ -1308,6 +1319,8 @@
     {
         DataBuf buf(static_cast<long>(ifds_.size()) * 4);
         uint32_t idx = 0;
+        // Sort IFDs by group, needed if image data tags were copied first
+        std::sort(ifds_.begin(), ifds_.end(), cmpGroupLt);
         for (Ifds::const_iterator i = ifds_.begin(); i != ifds_.end(); ++i) {
             idx += writeOffset(buf.pData_ + idx, offset + dataIdx, tiffType(), byteOrder);
             dataIdx += (*i)->size();
@@ -1462,7 +1475,7 @@
     {
         uint32_t len = 0;
         // For makernotes, write TIFF image data to the data area
-        if (group() > Group::mn) {
+        if (group() > mnId) { // Todo: FIX THIS HACK!!!
             len = writeImage(ioWrapper, byteOrder);
         }
         return len;
@@ -1573,7 +1586,7 @@
         uint32_t len = pValue()->sizeDataArea();
         if (len > 0) {
 #ifdef DEBUG
-            std::cerr << "TiffImageEntry, Directory " << tiffGroupName(group())
+            std::cerr << "TiffImageEntry, Directory " << ifdItem(group())
                       << ", entry 0x" << std::setw(4)
                       << std::setfill('0') << std::hex << tag() << std::dec
                       << ": Writing data area, size = " << len;
@@ -1586,7 +1599,7 @@
         }
         else {
 #ifdef DEBUG
-            std::cerr << "TiffImageEntry, Directory " << tiffGroupName(group())
+            std::cerr << "TiffImageEntry, Directory " << ifdItem(group())
                       << ", entry 0x" << std::setw(4)
                       << std::setfill('0') << std::hex << tag() << std::dec
                       << ": Writing " << strips_.size() << " strips";
@@ -1712,7 +1725,7 @@
     {
         uint32_t len = 0;
         // For makernotes, TIFF image data is written to the data area
-        if (group() > Group::mn) {
+        if (group() > mnId) { // Todo: Fix this hack!!
             len = sizeImage();
         }
         return len;
@@ -1789,11 +1802,11 @@
 
     // *************************************************************************
     // free functions
-    TypeId toTypeId(TiffType tiffType, uint16_t tag, uint16_t group)
+    TypeId toTypeId(TiffType tiffType, uint16_t tag, IfdId group)
     {
         TypeId ti = TypeId(tiffType);
         // On the fly type conversion for Exif.Photo.UserComment
-        if (tag == 0x9286 && group == Group::exif && ti == undefined) {
+        if (tag == 0x9286 && group == exifId && ti == undefined) {
             ti = comment;
         }
         return ti;
@@ -1803,7 +1816,7 @@
     {
         if (static_cast<uint32_t>(typeId) > 0xffff) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: '" << TypeInfo::typeName(typeId)
+            EXV_ERROR << "'" << TypeInfo::typeName(typeId)
                       << "' is not a valid Exif (TIFF) type; using type '"
                       << TypeInfo::typeName(undefined) << "'.\n";
 #endif
@@ -1820,17 +1833,24 @@
         return lhs->idx() < rhs->idx();
     }
 
-    TiffComponent::AutoPtr newTiffEntry(uint16_t tag, uint16_t group)
+    bool cmpGroupLt(TiffComponent const* lhs, TiffComponent const* rhs)
+    {
+        assert(lhs != 0);
+        assert(rhs != 0);
+        return lhs->group() < rhs->group();
+    }
+
+    TiffComponent::AutoPtr newTiffEntry(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(new TiffEntry(tag, group));
     }
 
-    TiffComponent::AutoPtr newTiffMnEntry(uint16_t tag, uint16_t group)
+    TiffComponent::AutoPtr newTiffMnEntry(uint16_t tag, IfdId group)
     {
-        return TiffComponent::AutoPtr(new TiffMnEntry(tag, group, Group::mn));
+        return TiffComponent::AutoPtr(new TiffMnEntry(tag, group, mnId));
     }
 
-    TiffComponent::AutoPtr newTiffBinaryElement(uint16_t tag, uint16_t group)
+    TiffComponent::AutoPtr newTiffBinaryElement(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(new TiffBinaryElement(tag, group));
     }
diff -Nru exiv2-0.19/src/tiffcomposite_int.hpp exiv2-0.21/src/tiffcomposite_int.hpp
--- exiv2-0.19/src/tiffcomposite_int.hpp	2009-12-30 11:29:52.000000000 +0000
+++ exiv2-0.21/src/tiffcomposite_int.hpp	2010-08-30 19:33:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    tiffcomposite_int.hpp
   @brief   Internal classes used in a TIFF composite structure
-  @version $Rev: 1986 $
+  @version $Rev: 2336 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    11-Apr-06, ahu: created
@@ -70,42 +70,12 @@
     const TiffType ttTiffIfd          =13; //!< TIFF IFD type
 
     //! Convert the \em tiffType of a \em tag and \em group to an Exiv2 \em typeId.
-    TypeId toTypeId(TiffType tiffType, uint16_t tag, uint16_t group);
+    TypeId toTypeId(TiffType tiffType, uint16_t tag, IfdId group);
     //! Convert the %Exiv2 \em typeId to a TIFF value type.
     TiffType toTiffType(TypeId typeId);
 
     /*!
-      Known TIFF groups
-
-      Todo: what exactly are these and where should they go?
-      Are they going to be mapped to the second part of an Exif key or are they
-      the second part of the key?
-
-      @note Groups with ids > mn are Makernote groups and get treated slightly
-            differently.
-    */
-    namespace Group {
-        const uint16_t none    =   0; //!< Dummy group
-        const uint16_t ifd0    =   1; //!< Exif IFD0
-        const uint16_t ifd1    =   2; //!< Thumbnail IFD
-        const uint16_t ifd2    =   3; //!< IFD2
-        const uint16_t ifd3    =   4; //!< IFD3
-        const uint16_t exif    =   5; //!< Exif IFD
-        const uint16_t gps     =   6; //!< GPS IFD
-        const uint16_t iop     =   7; //!< Interoperability IFD
-        const uint16_t subimg1 =   8; //!< 1st TIFF SubIFD in IFD0
-        const uint16_t subimg2 =   9; //!< 2nd TIFF SubIFD in IFD0
-        const uint16_t subimg3 =  10; //!< 3rd TIFF SubIFD in IFD0
-        const uint16_t subimg4 =  11; //!< 4th TIFF SubIFD in IFD0
-        const uint16_t panaraw =  64; //!< IFD0 of Panasonic RAW images
-        const uint16_t mn      = 256; //!< Makernote
-        const uint16_t ignr    = 511; //!< Read but do not decode
-    }
-
-    /*!
       Special TIFF tags for the use in TIFF structures only
-
-      Todo: Same Q as above...
     */
     namespace Tag {
         const uint32_t none = 0x10000; //!< Dummy tag
@@ -124,7 +94,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffPathItem(uint32_t extendedTag, uint16_t group)
+        TiffPathItem(uint32_t extendedTag, IfdId group)
             : extendedTag_(extendedTag), group_(group) {}
         //@}
 
@@ -135,13 +105,13 @@
         //! Return the extended tag (32 bit so that it can contain special tags)
         uint32_t extendedTag() const { return extendedTag_; }
         //! Return the group
-        uint16_t group()       const { return group_; }
+        IfdId    group()       const { return group_; }
         //@}
 
     private:
         // DATA
         uint32_t extendedTag_;
-        uint16_t group_;
+        IfdId    group_;
     }; // class TiffPathItem
 
     /*!
@@ -210,7 +180,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffComponent(uint16_t tag, uint16_t group);
+        TiffComponent(uint16_t tag, IfdId group);
         //! Virtual destructor.
         virtual ~TiffComponent();
         //@}
@@ -224,10 +194,15 @@
           @param tag      The tag of the new entry
           @param tiffPath A path from the TIFF root element to a TIFF entry.
           @param pRoot    Pointer to the root component of the TIFF composite.
+          @param object   TIFF component to add. If 0, the correct entry will be
+                          created.
 
           @return A pointer to the newly added TIFF entry.
          */
-        TiffComponent* addPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot);
+        TiffComponent* addPath(uint16_t tag,
+                               TiffPath& tiffPath,
+                               TiffComponent* const pRoot,
+                               AutoPtr object =AutoPtr(0));
         /*!
           @brief Add a child to the component. Default is to do nothing.
           @param tiffComponent Auto pointer to the component to add.
@@ -281,9 +256,15 @@
         //! Return the tag of this entry.
         uint16_t tag()                        const { return tag_; }
         //! Return the group id of this component
-        uint16_t group()                      const { return group_; }
+        IfdId    group()                      const { return group_; }
         //! Return a pointer to the start of the binary representation of the component
-        byte* start()                         const { return pStart_; }
+        byte*    start()                      const { return pStart_; }
+        /*!
+          @brief Return an auto-pointer to a copy of itself (deep copy, but
+                 without any children). The caller owns this copy and the
+                 auto-pointer ensures that it will be deleted.
+         */
+        AutoPtr clone() const;
         /*!
           @brief Write the IFD data of this component to a binary image.
                  Return the number of bytes written. Components derived from
@@ -336,7 +317,10 @@
         //! @name Protected Manipulators
         //@{
         //! Implements addPath(). The default implementation does nothing.
-        virtual TiffComponent* doAddPath(uint16_t  tag, TiffPath& tiffPath, TiffComponent* const pRoot);
+        virtual TiffComponent* doAddPath(uint16_t  tag,
+                                         TiffPath& tiffPath,
+                                         TiffComponent* const pRoot,
+                                         TiffComponent::AutoPtr object);
         //! Implements addChild(). The default implementation does nothing.
         virtual TiffComponent* doAddChild(AutoPtr tiffComponent);
         //! Implements addNext(). The default implementation does nothing.
@@ -354,6 +338,8 @@
 
         //! @name Protected Accessors
         //@{
+        //! Internal virtual copy constructor, implements clone().
+        virtual TiffComponent* doClone() const =0;
         //! Implements writeData().
         virtual uint32_t doWriteData(IoWrapper& ioWrapper,
                                      ByteOrder byteOrder,
@@ -376,7 +362,7 @@
     private:
         // DATA
         uint16_t tag_;      //!< Tag that identifies the component
-        uint16_t group_;    //!< Group id for this component
+        IfdId    group_;    //!< Group id for this component
         /*!
           Pointer to the start of the binary representation of the component in
           a memory buffer. The buffer is allocated and freed outside of this class.
@@ -403,7 +389,7 @@
         // DATA
         const char* make_;        //!< Camera make for which these mapping functions apply
         uint32_t    extendedTag_; //!< Tag (32 bit so that it can contain special tags)
-        uint16_t    group_;       //!< Group that contains the tag
+        IfdId       group_;       //!< Group that contains the tag
         DecoderFct  decoderFct_;  //!< Decoder function for matching tags
         EncoderFct  encoderFct_;  //!< Encoder function for matching tags
 
@@ -412,10 +398,10 @@
     //! Search key for TIFF mapping structures.
     struct TiffMappingInfo::Key {
         //! Constructor
-        Key(const std::string& m, uint32_t e, uint16_t g) : m_(m), e_(e), g_(g) {}
+        Key(const std::string& m, uint32_t e, IfdId g) : m_(m), e_(e), g_(g) {}
         std::string m_;                    //!< Camera make
         uint32_t    e_;                    //!< Extended tag
-        uint16_t    g_;                    //!< %Group
+        IfdId       g_;                    //!< %Group
     };
 
     /*!
@@ -431,8 +417,8 @@
     public:
         //! @name Creators
         //@{
-        //! Default constructor
-        TiffEntryBase(uint16_t tag, uint16_t group, TiffType tiffType =ttUndefined);
+        //! Default constructor.
+        TiffEntryBase(uint16_t tag, IfdId group, TiffType tiffType =ttUndefined);
         //! Virtual destructor.
         virtual ~TiffEntryBase();
         //@}
@@ -490,6 +476,12 @@
         //@}
 
     protected:
+        //! @name Protected Creators
+        //@{
+        //! Copy constructor (used to implement clone()).
+        TiffEntryBase(const TiffEntryBase& rhs);
+        //@}
+
         //! @name Protected Manipulators
         //@{
         //! Implements encode().
@@ -545,6 +537,12 @@
                                     ByteOrder byteOrder);
 
     private:
+        //! @name NOT implemented
+        //@{
+        //! Assignment operator.
+        TiffEntryBase& operator=(const TiffEntryBase& rhs);
+        //@}
+
         // DATA
         TiffType tiffType_;   //!< Field TIFF type
         uint32_t count_;      //!< The number of values of the indicated type
@@ -569,7 +567,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffEntry(uint16_t tag, uint16_t group) : TiffEntryBase(tag, group) {}
+        TiffEntry(uint16_t tag, IfdId group) : TiffEntryBase(tag, group) {}
         //! Virtual destructor.
         virtual ~TiffEntry();
         //@}
@@ -581,6 +579,11 @@
         virtual void doEncode(TiffEncoder& encoder, const Exifdatum* datum);
         //@}
 
+        //! @name Protected Accessors
+        //@{
+        virtual TiffEntry* doClone() const;
+        //@}
+
     }; // class TiffEntry
 
     /*!
@@ -596,7 +599,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffDataEntryBase(uint16_t tag, uint16_t group, uint16_t szTag, uint16_t szGroup)
+        TiffDataEntryBase(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup)
             : TiffEntryBase(tag, group),
               szTag_(szTag), szGroup_(szGroup) {}
         //! Virtual destructor.
@@ -623,15 +626,15 @@
         //! @name Accessors
         //@{
         //! Return the group of the entry which has the size
-        uint16_t szTag() const { return szTag_; }
+        uint16_t szTag()   const { return szTag_; }
         //! Return the group of the entry which has the size
-        uint16_t szGroup() const { return szGroup_; }
+        IfdId    szGroup() const { return szGroup_; }
         //@}
 
     private:
         // DATA
         const uint16_t szTag_;               //!< Tag of the entry with the size
-        const uint16_t szGroup_;             //!< Group of the entry with the size
+        const IfdId    szGroup_;             //!< Group of the entry with the size
 
     }; // class TiffDataEntryBase
 
@@ -652,7 +655,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffDataEntry(uint16_t tag, uint16_t group, uint16_t szTag, uint16_t szGroup)
+        TiffDataEntry(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup)
             : TiffDataEntryBase(tag, group, szTag, szGroup),
               pDataArea_(0), sizeDataArea_(0) {}
         //! Virtual destructor.
@@ -693,6 +696,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffDataEntry* doClone() const;
         /*!
           @brief Implements writeData(). Write the data area to the \em ioWrapper.
                  Return the number of bytes written.
@@ -734,7 +738,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffImageEntry(uint16_t tag, uint16_t group, uint16_t szTag, uint16_t szGroup)
+        TiffImageEntry(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup)
             : TiffDataEntryBase(tag, group, szTag, szGroup) {}
         //! Virtual destructor.
         virtual ~TiffImageEntry();
@@ -768,6 +772,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffImageEntry* doClone() const;
         /*!
           @brief Implements writeData(). Write the image data area to the \em ioWrapper.
                  Return the number of bytes written.
@@ -815,7 +820,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffSizeEntry(uint16_t tag, uint16_t group, uint16_t dtTag, uint16_t dtGroup)
+        TiffSizeEntry(uint16_t tag, IfdId group, uint16_t dtTag, IfdId dtGroup)
             : TiffEntryBase(tag, group), dtTag_(dtTag), dtGroup_(dtGroup) {}
         //! Virtual destructor.
         virtual ~TiffSizeEntry();
@@ -824,9 +829,9 @@
         //! @name Accessors
         //@{
         //! Return the group of the related entry which has the data area
-        uint16_t dtTag() const { return dtTag_; }
+        uint16_t dtTag()   const { return dtTag_; }
         //! Return the group of the related entry which has the data area
-        uint16_t dtGroup() const { return dtGroup_; }
+        IfdId    dtGroup() const { return dtGroup_; }
         //@}
 
     protected:
@@ -836,10 +841,15 @@
         virtual void doEncode(TiffEncoder& encoder, const Exifdatum* datum);
         //@}
 
+        //! @name Protected Accessors
+        //@{
+        virtual TiffSizeEntry* doClone() const;
+        //@}
+
     private:
         // DATA
         const uint16_t dtTag_;        //!< Tag of the entry with the data area
-        const uint16_t dtGroup_;      //!< Group of the entry with the data area
+        const IfdId    dtGroup_;      //!< Group of the entry with the data area
 
     }; // class TiffSizeEntry
 
@@ -853,7 +863,7 @@
         //! @name Creators
         //@{
         //! Default constructor
-        TiffDirectory(uint16_t tag, uint16_t group, bool hasNext =true)
+        TiffDirectory(uint16_t tag, IfdId group, bool hasNext =true)
             : TiffComponent(tag, group), hasNext_(hasNext), pNext_(0) {}
         //! Virtual destructor
         virtual ~TiffDirectory();
@@ -866,9 +876,18 @@
         //@}
 
     protected:
+        //! @name Protected Creators
+        //@{
+        //! Copy constructor (used to implement clone()).
+        TiffDirectory(const TiffDirectory& rhs);
+        //@}
+
         //! @name Protected Manipulators
         //@{
-        virtual TiffComponent* doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot);
+        virtual TiffComponent* doAddPath(uint16_t tag,
+                                         TiffPath& tiffPath,
+                                         TiffComponent* const pRoot,
+                                         TiffComponent::AutoPtr object);
         virtual TiffComponent* doAddChild(TiffComponent::AutoPtr tiffComponent);
         virtual TiffComponent* doAddNext(TiffComponent::AutoPtr tiffComponent);
         virtual void doAccept(TiffVisitor& visitor);
@@ -887,6 +906,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffDirectory* doClone() const;
         /*!
           @brief This class does not really implement writeData(), it only has
                  write(). This method must not be called; it commits suicide.
@@ -927,6 +947,12 @@
         //@}
 
     private:
+        //! @name NOT implemented
+        //@{
+        //! Assignment operator.
+        TiffDirectory& operator=(const TiffDirectory& rhs);
+        //@}
+
         //! @name Private Accessors
         //@{
         //! Write a binary directory entry for a TIFF component.
@@ -960,15 +986,24 @@
         //! @name Creators
         //@{
         //! Default constructor
-        TiffSubIfd(uint16_t tag, uint16_t group, uint16_t newGroup);
+        TiffSubIfd(uint16_t tag, IfdId group, IfdId newGroup);
         //! Virtual destructor
         virtual ~TiffSubIfd();
         //@}
 
     protected:
+        //! @name Protected Creators
+        //@{
+        //! Copy constructor (used to implement clone()).
+        TiffSubIfd(const TiffSubIfd& rhs);
+        //@}
+
         //! @name Protected Manipulators
         //@{
-        virtual TiffComponent* doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot);
+        virtual TiffComponent* doAddPath(uint16_t tag,
+                                         TiffPath& tiffPath,
+                                         TiffComponent* const pRoot,
+                                         TiffComponent::AutoPtr object);
         virtual TiffComponent* doAddChild(TiffComponent::AutoPtr tiffComponent);
         virtual void doAccept(TiffVisitor& visitor);
         virtual void doEncode(TiffEncoder& encoder, const Exifdatum* datum);
@@ -987,6 +1022,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffSubIfd* doClone() const;
         /*!
           @brief Implements writeData(). Write the sub-IFDs to the \em ioWrapper.
                  Return the number of bytes written.
@@ -1011,11 +1047,17 @@
         //@}
 
     private:
+        //! @name NOT implemented
+        //@{
+        //! Assignment operator.
+        TiffSubIfd& operator=(const TiffSubIfd& rhs);
+        //@}
+
         //! A collection of TIFF directories (IFDs)
         typedef std::vector<TiffDirectory*> Ifds;
 
         // DATA
-        uint16_t newGroup_; //!< Start of the range of group numbers for the sub-IFDs
+        IfdId    newGroup_; //!< Start of the range of group numbers for the sub-IFDs
         Ifds     ifds_;     //!< The subdirectories
 
     }; // class TiffSubIfd
@@ -1035,7 +1077,7 @@
         //! @name Creators
         //@{
         //! Default constructor
-        TiffMnEntry(uint16_t tag, uint16_t group, uint16_t mnGroup);
+        TiffMnEntry(uint16_t tag, IfdId group, IfdId mnGroup);
         //! Virtual destructor
         virtual ~TiffMnEntry();
         //@}
@@ -1043,7 +1085,10 @@
     protected:
         //! @name Protected Manipulators
         //@{
-        virtual TiffComponent* doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot);
+        virtual TiffComponent* doAddPath(uint16_t tag,
+                                         TiffPath& tiffPath,
+                                         TiffComponent* const pRoot,
+                                         TiffComponent::AutoPtr object);
         virtual TiffComponent* doAddChild(TiffComponent::AutoPtr tiffComponent);
         virtual TiffComponent* doAddNext(TiffComponent::AutoPtr tiffComponent);
         virtual void doAccept(TiffVisitor& visitor);
@@ -1062,6 +1107,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffMnEntry* doClone() const;
         //! Implements count(). Return number of components in the entry.
         virtual uint32_t doCount() const;
         // Using doWriteData from base class
@@ -1076,8 +1122,16 @@
         //@}
 
     private:
+        //! @name NOT implemented
+        //@{
+        //! Copy constructor.
+        TiffMnEntry(const TiffMnEntry& rhs);
+        //! Assignment operator.
+        TiffMnEntry& operator=(const TiffMnEntry& rhs);
+        //@}
+
         // DATA
-        uint16_t       mnGroup_;             //!< New group for concrete mn
+        IfdId          mnGroup_;             //!< New group for concrete mn
         TiffComponent* mn_;                  //!< The Makernote
 
     }; // class TiffMnEntry
@@ -1098,8 +1152,8 @@
         //@{
         //! Default constructor
         TiffIfdMakernote(uint16_t  tag,
-                         uint16_t  group,
-                         uint16_t  mnGroup,
+                         IfdId     group,
+                         IfdId     mnGroup,
                          MnHeader* pHeader,
                          bool      hasNext =true);
         //! Virtual destructor
@@ -1163,7 +1217,10 @@
     protected:
         //! @name Protected Manipulators
         //@{
-        virtual TiffComponent* doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot);
+        virtual TiffComponent* doAddPath(uint16_t tag,
+                                         TiffPath& tiffPath,
+                                         TiffComponent* const pRoot,
+                                         TiffComponent::AutoPtr object);
         virtual TiffComponent* doAddChild(TiffComponent::AutoPtr tiffComponent);
         virtual TiffComponent* doAddNext(TiffComponent::AutoPtr tiffComponent);
         virtual void doAccept(TiffVisitor& visitor);
@@ -1182,6 +1239,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffIfdMakernote* doClone() const;
         /*!
           @brief This class does not really implement writeData(), it only has
                  write(). This method must not be called; it commits suicide.
@@ -1221,6 +1279,20 @@
         //@}
 
     private:
+        /*!
+          @name NOT implemented
+
+          Implementing the copy constructor and assignment operator will require
+          cloning the header, i.e., clone() functionality on the MnHeader
+          hierarchy.
+         */
+        //@{
+        //! Copy constructor.
+        TiffIfdMakernote(const TiffIfdMakernote& rhs);
+        //! Assignment operator.
+        TiffIfdMakernote& operator=(const TiffIfdMakernote& rhs);
+        //@}
+
         // DATA
         MnHeader*     pHeader_;                 //!< Makernote header
         TiffDirectory ifd_;                     //!< Makernote IFD
@@ -1243,7 +1315,7 @@
         //! Comparison with idx
         bool operator==(uint32_t idx) const { return idx_ == idx; }
         //! Get the size in bytes of a tag.
-        uint32_t size(uint16_t tag, uint16_t group) const;
+        uint32_t size(uint16_t tag, IfdId group) const;
         // DATA
         uint32_t idx_;             //!< Index in bytes from the start
         TiffType tiffType_;        //!< TIFF type of the element
@@ -1258,12 +1330,13 @@
          */
         uint32_t tagStep() const { return elDefaultDef_.size(0, group_); }
         //DATA
-        uint16_t    group_;        //!< Group for the elements
+        IfdId       group_;        //!< Group for the elements
         ByteOrder   byteOrder_;    //!< Byte order, invalidByteOrder to inherit
         TiffType    elTiffType_;   //!< Type for the array entry and the size element, if any
         CryptFct    cryptFct_;     //!< Crypt function, 0 if not used
         bool        hasSize_;      //!< If true, first tag is the size element
         bool        hasFillers_;   //!< If true, write all defined tags
+        bool        concat_;       //!< If true, concatenate gaps between defined tags to single tags
         ArrayDef    elDefaultDef_; //!< Default element
     };
 
@@ -1285,13 +1358,13 @@
         //@{
         //! Constructor
         TiffBinaryArray(uint16_t tag,
-                        uint16_t group,
+                        IfdId group,
                         const ArrayCfg* arrayCfg,
                         const ArrayDef* arrayDef,
                         int defSize);
         //! Constructor for a complex binary array
         TiffBinaryArray(uint16_t tag,
-                        uint16_t group,
+                        IfdId group,
                         const ArraySet* arraySet,
                         int setSize,
                         CfgSelFct cfgSelFct);
@@ -1302,7 +1375,7 @@
         //! @name Manipulators
         //@{
         //! Add an element to the binary array, return the size of the element
-        uint32_t addElement(uint32_t idx, const ArrayDef* def);
+        uint32_t addElement(uint32_t idx, const ArrayDef& def);
         /*!
           @brief Setup cfg and def for the component, in case of a complex binary array.
                  Else do nothing. Return true if the initialization succeeded, else false.
@@ -1314,7 +1387,7 @@
           @param group Group to setup the binary array for.
           @return true if the initialization succeeded, else false.
          */
-        bool initialize(uint16_t group);
+        bool initialize(IfdId group);
         /*!
           @brief Setup cfg and def for the component, in case of a complex binary array.
                  Else do nothing. Return true if the initialization succeeded, else false.
@@ -1343,12 +1416,21 @@
         //@}
 
     protected:
+        //! @name Protected Creators
+        //@{
+        //! Copy constructor (used to implement clone()).
+        TiffBinaryArray(const TiffBinaryArray& rhs);
+        //@}
+
         //! @name Protected Manipulators
         //@{
         /*!
           @brief Implements addPath(). Todo: Document it!
          */
-        virtual TiffComponent* doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* const pRoot);
+        virtual TiffComponent* doAddPath(uint16_t tag,
+                                         TiffPath& tiffPath,
+                                         TiffComponent* const pRoot,
+                                         TiffComponent::AutoPtr object);
         /*!
           @brief Implements addChild(). Todo: Document it!
          */
@@ -1368,6 +1450,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffBinaryArray* doClone() const;
         //! Implements count(). Todo: Document it!
         virtual uint32_t doCount() const;
         // Using doWriteData from base class
@@ -1381,6 +1464,12 @@
         //@}
 
     private:
+        //! @name NOT implemented
+        //@{
+        //! Assignment operator.
+        TiffBinaryArray& operator=(const TiffBinaryArray& rhs);
+        //@}
+
         // DATA
         const CfgSelFct cfgSelFct_; //!< Pointer to a function to determine which cfg to use (may be 0)
         const ArraySet* arraySet_;  //!< Pointer to the array set, if any (may be 0)
@@ -1402,8 +1491,7 @@
         //! @name Creators
         //@{
         //! Constructor
-        TiffBinaryElement(uint16_t tag,
-                          uint16_t group);
+        TiffBinaryElement(uint16_t tag, IfdId group);
         //! Virtual destructor.
         virtual ~TiffBinaryElement();
         //@}
@@ -1413,7 +1501,7 @@
         /*!
           @brief Set the array definition for this element.
          */
-        void setElDef(const ArrayDef* def) { elDef_ = def; }
+        void setElDef(const ArrayDef& def) { elDef_ = def; }
         /*!
           @brief Set the byte order of this element.
          */
@@ -1425,7 +1513,7 @@
         /*!
           @brief Return the array definition of this element.
          */
-        const ArrayDef* elDef()       const { return elDef_; }
+        const ArrayDef* elDef()       const { return &elDef_; }
         /*!
           @brief Return the byte order of this element.
          */
@@ -1450,6 +1538,7 @@
 
         //! @name Protected Accessors
         //@{
+        virtual TiffBinaryElement* doClone() const;
         /*!
           @brief Implements count(). Returns the count from the element definition.
          */
@@ -1467,7 +1556,7 @@
 
     private:
         // DATA
-        const ArrayDef* elDef_;  //!< Pointer to the array element definition
+        ArrayDef  elDef_;        //!< The array element definition
         ByteOrder elByteOrder_;  //!< Byte order to read/write the element
 
     }; // class TiffBinaryElement
@@ -1481,38 +1570,38 @@
      */
     bool cmpTagLt(TiffComponent const* lhs, TiffComponent const* rhs);
 
-    //! Return the group name for a group
-    const char* tiffGroupName(uint16_t group);
-
-    //! Return the TIFF group id for a group name
-    uint16_t tiffGroupId(const std::string& groupName);
+    /*!
+      @brief Compare two TIFF component pointers by group. Return true if the
+             group of component lhs is less than that of rhs.
+     */
+    bool cmpGroupLt(TiffComponent const* lhs, TiffComponent const* rhs);
 
     //! Function to create and initialize a new TIFF entry
-    TiffComponent::AutoPtr newTiffEntry(uint16_t tag, uint16_t group);
+    TiffComponent::AutoPtr newTiffEntry(uint16_t tag, IfdId group);
 
     //! Function to create and initialize a new TIFF makernote entry
-    TiffComponent::AutoPtr newTiffMnEntry(uint16_t tag, uint16_t group);
+    TiffComponent::AutoPtr newTiffMnEntry(uint16_t tag, IfdId group);
 
     //! Function to create and initialize a new binary array element
-    TiffComponent::AutoPtr newTiffBinaryElement(uint16_t tag, uint16_t group);
+    TiffComponent::AutoPtr newTiffBinaryElement(uint16_t tag, IfdId group);
 
     //! Function to create and initialize a new TIFF directory
-    template<uint16_t newGroup>
-    TiffComponent::AutoPtr newTiffDirectory(uint16_t tag, uint16_t /*group*/)
+    template<IfdId newGroup>
+    TiffComponent::AutoPtr newTiffDirectory(uint16_t tag, IfdId /*group*/)
     {
         return TiffComponent::AutoPtr(new TiffDirectory(tag, newGroup));
     }
 
     //! Function to create and initialize a new TIFF sub-directory
-    template<uint16_t newGroup>
-    TiffComponent::AutoPtr newTiffSubIfd(uint16_t tag, uint16_t group)
+    template<IfdId newGroup>
+    TiffComponent::AutoPtr newTiffSubIfd(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(new TiffSubIfd(tag, group, newGroup));
     }
 
     //! Function to create and initialize a new binary array entry
     template<const ArrayCfg* arrayCfg, int N, const ArrayDef (&arrayDef)[N]>
-    TiffComponent::AutoPtr newTiffBinaryArray0(uint16_t tag, uint16_t group)
+    TiffComponent::AutoPtr newTiffBinaryArray0(uint16_t tag, IfdId group)
     {
         // *& acrobatics is a workaround for a MSVC 7.1 bug
         return TiffComponent::AutoPtr(
@@ -1521,7 +1610,7 @@
 
     //! Function to create and initialize a new simple binary array entry
     template<const ArrayCfg* arrayCfg>
-    TiffComponent::AutoPtr newTiffBinaryArray1(uint16_t tag, uint16_t group)
+    TiffComponent::AutoPtr newTiffBinaryArray1(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(
             new TiffBinaryArray(tag, group, arrayCfg, 0, 0));
@@ -1529,39 +1618,39 @@
 
     //! Function to create and initialize a new complex binary array entry
     template<const ArraySet* arraySet, int N, CfgSelFct cfgSelFct>
-    TiffComponent::AutoPtr newTiffBinaryArray2(uint16_t tag, uint16_t group)
+    TiffComponent::AutoPtr newTiffBinaryArray2(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(
             new TiffBinaryArray(tag, group, arraySet, N, cfgSelFct));
     }
 
     //! Function to create and initialize a new TIFF entry for a thumbnail (data)
-    template<uint16_t szTag, uint16_t szGroup>
-    TiffComponent::AutoPtr newTiffThumbData(uint16_t tag, uint16_t group)
+    template<uint16_t szTag, IfdId szGroup>
+    TiffComponent::AutoPtr newTiffThumbData(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(
             new TiffDataEntry(tag, group, szTag, szGroup));
     }
 
     //! Function to create and initialize a new TIFF entry for a thumbnail (size)
-    template<uint16_t dtTag, uint16_t dtGroup>
-    TiffComponent::AutoPtr newTiffThumbSize(uint16_t tag, uint16_t group)
+    template<uint16_t dtTag, IfdId dtGroup>
+    TiffComponent::AutoPtr newTiffThumbSize(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(
             new TiffSizeEntry(tag, group, dtTag, dtGroup));
     }
 
     //! Function to create and initialize a new TIFF entry for image data
-    template<uint16_t szTag, uint16_t szGroup>
-    TiffComponent::AutoPtr newTiffImageData(uint16_t tag, uint16_t group)
+    template<uint16_t szTag, IfdId szGroup>
+    TiffComponent::AutoPtr newTiffImageData(uint16_t tag, IfdId group)
     {
         return TiffComponent::AutoPtr(
             new TiffImageEntry(tag, group, szTag, szGroup));
     }
 
     //! Function to create and initialize a new TIFF entry for image data (size)
-    template<uint16_t dtTag, uint16_t dtGroup>
-    TiffComponent::AutoPtr newTiffImageSize(uint16_t tag, uint16_t group)
+    template<uint16_t dtTag, IfdId dtGroup>
+    TiffComponent::AutoPtr newTiffImageSize(uint16_t tag, IfdId group)
     {
         // Todo: Same as newTiffThumbSize - consolidate (rename)?
         return TiffComponent::AutoPtr(
diff -Nru exiv2-0.19/src/tifffwd_int.hpp exiv2-0.21/src/tifffwd_int.hpp
--- exiv2-0.19/src/tifffwd_int.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/tifffwd_int.hpp	2010-08-30 19:33:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    tifffwd_int.hpp
   @brief   Internal TIFF parser related typedefs and forward definitions.
-  @version $Rev: 1937 $
+  @version $Rev: 2336 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    24-Jun-06, ahu: created
@@ -32,10 +32,12 @@
 // *****************************************************************************
 // included header files
 #include "types.hpp"
+#include "tags_int.hpp"
 
 // + standard includes
 #include <memory>
 #include <stack>
+#include <vector>
 
 // *****************************************************************************
 // Exiv2 namespace extensions
@@ -90,25 +92,28 @@
      */
     typedef DecoderFct (*FindDecoderFct)(const std::string& make,
                                                uint32_t     extendedTag,
-                                               uint16_t     group);
+                                               IfdId        group);
     /*!
       @brief Type for a function pointer for a function to encode a TIFF component.
      */
     typedef EncoderFct (*FindEncoderFct)(
         const std::string& make,
               uint32_t     extendedTag,
-              uint16_t     group
+              IfdId        group
     );
     /*!
       @brief Type for a function pointer for a function to create a TIFF component.
              Use TiffComponent::AutoPtr, it is not used in this declaration only
              to reduce dependencies.
      */
-    typedef std::auto_ptr<TiffComponent> (*NewTiffCompFct)(uint16_t tag, uint16_t group);
+    typedef std::auto_ptr<TiffComponent> (*NewTiffCompFct)(uint16_t tag, IfdId group);
 
     //! Stack to hold a path from the TIFF root element to a TIFF entry
     typedef std::stack<TiffPathItem> TiffPath;
 
+    //! Type for a list of primary image groups
+    typedef std::vector<IfdId> PrimaryGroups;
+
 }}                                      // namespace Internal, Exiv2
 
 #endif                                  // #ifndef TIFFFWD_INT_HPP_
diff -Nru exiv2-0.19/src/tiffimage.cpp exiv2-0.21/src/tiffimage.cpp
--- exiv2-0.19/src/tiffimage.cpp	2009-12-30 11:29:52.000000000 +0000
+++ exiv2-0.21/src/tiffimage.cpp	2010-10-25 13:16:04.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      tiffimage.cpp
-  Version:   $Rev: 1986 $
+  Version:   $Rev: 2369 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   15-Mar-06, ahu: created
 
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: tiffimage.cpp 1986 2009-12-30 11:29:52Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: tiffimage.cpp 2369 2010-10-25 13:16:04Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -80,55 +80,90 @@
     using namespace Internal;
 
     TiffImage::TiffImage(BasicIo::AutoPtr io, bool /*create*/)
-        : Image(ImageType::tiff, mdExif | mdIptc, io)
+        : Image(ImageType::tiff, mdExif | mdIptc, io),
+          pixelWidth_(0), pixelHeight_(0)
     {
     } // TiffImage::TiffImage
 
+    struct MimeTypeList {
+        bool operator==(int compression) const { return compression_ == compression; }
+        int compression_;
+        const char* mimeType_;
+    };
+
+    MimeTypeList mimeTypeList[] = {
+        { 32770, "image/x-samsung-srw" },
+        { 34713, "image/x-nikon-nef"   },
+        { 65535, "image/x-pentax-pef"  }
+    };
+
     std::string TiffImage::mimeType() const
     {
-        return "image/tiff";
+        if (!mimeType_.empty()) return mimeType_;
+
+        mimeType_ = std::string("image/tiff");
+        std::string key = "Exif." + primaryGroup() + ".Compression";
+        ExifData::const_iterator md = exifData_.findKey(ExifKey(key));
+        if (md != exifData_.end() && md->count() > 0) {
+            const MimeTypeList* i = find(mimeTypeList, static_cast<int>(md->toLong()));
+            if (i) mimeType_ = std::string(i->mimeType_);
+        }
+        return mimeType_;
     }
 
     std::string TiffImage::primaryGroup() const
     {
+        if (!primaryGroup_.empty()) return primaryGroup_;
+
         static const char* keys[] = {
             "Exif.Image.NewSubfileType",
             "Exif.SubImage1.NewSubfileType",
             "Exif.SubImage2.NewSubfileType",
             "Exif.SubImage3.NewSubfileType",
-            "Exif.SubImage4.NewSubfileType"
+            "Exif.SubImage4.NewSubfileType",
+            "Exif.SubImage5.NewSubfileType",
+            "Exif.SubImage6.NewSubfileType",
+            "Exif.SubImage7.NewSubfileType",
+            "Exif.SubImage8.NewSubfileType",
+            "Exif.SubImage9.NewSubfileType"
         };
         // Find the group of the primary image, default to "Image"
-        std::string groupName = "Image";
+        primaryGroup_ = std::string("Image");
         for (unsigned int i = 0; i < EXV_COUNTOF(keys); ++i) {
             ExifData::const_iterator md = exifData_.findKey(ExifKey(keys[i]));
             // Is it the primary image?
             if (md != exifData_.end() && md->count() > 0 && md->toLong() == 0) {
-                groupName = md->groupName();
-                break;
+                // Sometimes there is a JPEG primary image; that's not our first choice
+                primaryGroup_ = md->groupName();
+                std::string key = "Exif." + primaryGroup_ + ".JPEGInterchangeFormat";
+                if (exifData_.findKey(ExifKey(key)) == exifData_.end()) break;
             }
         }
-        return groupName;
+        return primaryGroup_;
     }
 
     int TiffImage::pixelWidth() const
     {
+        if (pixelWidth_ != 0) return pixelWidth_;
+
         ExifKey key(std::string("Exif.") + primaryGroup() + std::string(".ImageWidth"));
         ExifData::const_iterator imageWidth = exifData_.findKey(key);
         if (imageWidth != exifData_.end() && imageWidth->count() > 0) {
-            return imageWidth->toLong();
+            pixelWidth_ = static_cast<int>(imageWidth->toLong());
         }
-        return 0;
+        return pixelWidth_;
     }
 
     int TiffImage::pixelHeight() const
     {
+        if (pixelHeight_ != 0) return pixelHeight_;
+
         ExifKey key(std::string("Exif.") + primaryGroup() + std::string(".ImageLength"));
         ExifData::const_iterator imageHeight = exifData_.findKey(key);
         if (imageHeight != exifData_.end() && imageHeight->count() > 0) {
-            return imageHeight->toLong();
+            pixelHeight_ = imageHeight->toLong();
         }
-        return 0;
+        return pixelHeight_;
     }
 
     void TiffImage::setComment(const std::string& /*comment*/)
@@ -217,7 +252,7 @@
 
         // Delete IFDs which do not occur in TIFF images
         static const IfdId filteredIfds[] = {
-            panaRawIfdId
+            panaRawId
         };
         for (unsigned int i = 0; i < EXV_COUNTOF(filteredIfds); ++i) {
 #ifdef DEBUG
@@ -283,12 +318,13 @@
 
     //! Canon Camera Settings binary array - configuration
     extern const ArrayCfg canonCsCfg = {
-        Group::canoncs,   // Group for the elements
+        canonCsId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUnsignedShort,  // Type for array entry and size element
         notEncrypted,     // Not encrypted
         true,             // With size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Canon Camera Settings binary array - definition
@@ -298,56 +334,61 @@
 
     //! Canon Shot Info binary array - configuration
     extern const ArrayCfg canonSiCfg = {
-        Group::canonsi,   // Group for the elements
+        canonSiId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUnsignedShort,  // Type for array entry and size element
         notEncrypted,     // Not encrypted
         true,             // With size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
 
     //! Canon Panorama binary array - configuration
     extern const ArrayCfg canonPaCfg = {
-        Group::canonpa,   // Group for the elements
+        canonPaId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUnsignedShort,  // Type for array entry and size element
         notEncrypted,     // Not encrypted
         false,            // No size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
 
     //! Canon Custom Function binary array - configuration
     extern const ArrayCfg canonCfCfg = {
-        Group::canoncf,   // Group for the elements
+        canonCfId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUnsignedShort,  // Type for array entry and size element
         notEncrypted,     // Not encrypted
         true,             // With size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
 
     //! Canon Picture Info binary array - configuration
     extern const ArrayCfg canonPiCfg = {
-        Group::canonpi,   // Group for the elements
+        canonPiId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUnsignedShort,  // Type for array entry and size element
         notEncrypted,     // Not encrypted
         false,            // No size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
 
     //! Canon File Info binary array - configuration
     extern const ArrayCfg canonFiCfg = {
-        Group::canonfi,   // Group for the elements
+        canonFiId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUnsignedShort,  // Type for array entry and size element
         notEncrypted,     // Not encrypted
         true,             // Has a size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttSignedShort, 1 }
     };
     //! Canon File Info binary array - definition
@@ -355,14 +396,27 @@
         { 2, ttUnsignedLong, 1 }
     };
 
+    //! Canon Processing Info binary array - configuration
+    extern const ArrayCfg canonPrCfg = {
+        canonPrId,        // Group for the elements
+        invalidByteOrder, // Use byte order from parent
+        ttUnsignedShort,  // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        true,             // Has a size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttSignedShort, 1 }
+    };
+
     //! Nikon Vibration Reduction binary array - configuration
     extern const ArrayCfg nikonVrCfg = {
-        Group::nikonvr,   // Group for the elements
+        nikonVrId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         notEncrypted,     // Not encrypted
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Vibration Reduction binary array - definition
@@ -373,12 +427,13 @@
 
     //! Nikon Picture Control binary array - configuration
     extern const ArrayCfg nikonPcCfg = {
-        Group::nikonpc,   // Group for the elements
+        nikonPcId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         notEncrypted,     // Not encrypted
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Picture Control binary array - definition
@@ -386,65 +441,224 @@
         {  0, ttUndefined,     4 }, // Version
         {  4, ttAsciiString,  20 },
         { 24, ttAsciiString,  20 },
+        { 48, ttUnsignedByte,  1 },
+        { 49, ttUnsignedByte,  1 },
+        { 50, ttUnsignedByte,  1 },
+        { 51, ttUnsignedByte,  1 },
+        { 52, ttUnsignedByte,  1 },
+        { 53, ttUnsignedByte,  1 },
+        { 54, ttUnsignedByte,  1 },
+        { 55, ttUnsignedByte,  1 },
+        { 56, ttUnsignedByte,  1 },
         { 57, ttUnsignedByte,  1 }  // The array contains 58 bytes
     };
 
     //! Nikon World Time binary array - configuration
     extern const ArrayCfg nikonWtCfg = {
-        Group::nikonwt,   // Group for the elements
+        nikonWtId,        // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         notEncrypted,     // Not encrypted
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon World Time binary array - definition
     extern const ArrayDef nikonWtDef[] = {
         { 0, ttSignedShort,   1 },
+        { 2, ttUnsignedByte,  1 },
         { 3, ttUnsignedByte,  1 }
     };
 
     //! Nikon ISO info binary array - configuration
     extern const ArrayCfg nikonIiCfg = {
-        Group::nikonii,   // Group for the elements
+        nikonIiId,        // Group for the elements
         bigEndian,        // Byte order
         ttUndefined,      // Type for array entry
         notEncrypted,     // Not encrypted
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon ISO info binary array - definition
     extern const ArrayDef nikonIiDef[] = {
+        {  0, ttUnsignedByte,  1 },
         {  4, ttUnsignedShort, 1 },
+        {  6, ttUnsignedByte,  1 },
         { 10, ttUnsignedShort, 1 },
         { 13, ttUnsignedByte,  1 }  // The array contains 14 bytes
     };
 
     //! Nikon Auto Focus binary array - configuration
     extern const ArrayCfg nikonAfCfg = {
-        Group::nikonaf,   // Group for the elements
+        nikonAfId,        // Group for the elements
         littleEndian,     // Byte order
         ttUndefined,      // Type for array entry
         notEncrypted,     // Not encrypted
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Auto Focus binary array - definition
     extern const ArrayDef nikonAfDef[] = {
+        { 0, ttUnsignedByte,  1 },
+        { 1, ttUnsignedByte,  1 },
         { 2, ttUnsignedShort, 1 } // The array contains 4 bytes
     };
 
+    //! Nikon Auto Focus 2 binary array - configuration
+    extern const ArrayCfg nikonAf2Cfg = {
+        nikonAf2Id,       // Group for the elements
+        littleEndian,     // Byte order
+        ttUndefined,      // Type for array entry
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        true,             // Write all tags
+        true,             // Concatenate gaps
+        { 0, ttUnsignedByte,  1 }
+    };
+    //! Nikon Auto Focus 2 binary array - definition
+    extern const ArrayDef nikonAf2Def[] = {
+        {  0, ttUndefined,     4 }, // Version
+        {  4, ttUnsignedByte,  1 }, // ContrastDetectAF
+        {  5, ttUnsignedByte,  1 }, // AFAreaMode
+        {  6, ttUnsignedByte,  1 }, // PhaseDetectAF
+        {  7, ttUnsignedByte,  1 }, // PrimaryAFPoint
+        {  8, ttUnsignedByte,  7 }, // AFPointsUsed
+        { 16, ttUnsignedShort, 1 }, // AFImageWidth
+        { 18, ttUnsignedShort, 1 }, // AFImageHeight
+        { 20, ttUnsignedShort, 1 }, // AFAreaXPosition
+        { 22, ttUnsignedShort, 1 }, // AFAreaYPosition
+        { 24, ttUnsignedShort, 1 }, // AFAreaWidth
+        { 26, ttUnsignedShort, 1 }, // AFAreaHeight
+        { 28, ttUnsignedShort, 1 }, // ContrastDetectAFInFocus
+    };
+
+    //! Nikon File Info binary array - configuration
+    extern const ArrayCfg nikonFiCfg = {
+        nikonFiId,        // Group for the elements
+        littleEndian,     // Byte order
+        ttUndefined,      // Type for array entry
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        true,             // Write all tags
+        true,             // Concatenate gaps
+        { 0, ttUnsignedByte,  1 }
+    };
+    //! Nikon File Info binary array - definition
+    extern const ArrayDef nikonFiDef[] = {
+        { 0, ttUndefined,     4 }, // Version
+        { 6, ttUnsignedShort, 1 }, // Directory Number
+        { 8, ttUnsignedShort, 1 }  // File Number
+    };
+
+    //! Nikon Multi Exposure binary array - configuration
+    extern const ArrayCfg nikonMeCfg = {
+        nikonMeId,        // Group for the elements
+        littleEndian,     // Byte order
+        ttUndefined,      // Type for array entry
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        true,             // Write all tags
+        true,             // Concatenate gaps
+        { 0, ttUnsignedByte,  1 }
+    };
+    //! Nikon Multi Exposure binary array - definition
+    extern const ArrayDef nikonMeDef[] = {
+        {  0, ttUndefined,     4 }, // Version
+        {  4, ttUnsignedLong,  1 }, // MultiExposureMode
+        {  8, ttUnsignedLong,  1 }, // MultiExposureShots
+        { 12, ttUnsignedLong,  1 }  // MultiExposureAutoGain
+    };
+
+    //! Nikon Flash Info binary array - configuration 1
+    extern const ArrayCfg nikonFl1Cfg = {
+        nikonFl1Id,       // Group for the elements
+        littleEndian,     // Byte order
+        ttUndefined,      // Type for array entry
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        true,             // Write all tags
+        true,             // Concatenate gaps
+        { 0, ttUnsignedByte,  1 }
+    };
+    //! Nikon Flash Info binary array - definition 1
+    extern const ArrayDef nikonFl1Def[] = {
+        {  0, ttUndefined,     4 }, // Version
+        {  4, ttUnsignedByte,  1 }, // FlashSource
+        {  6, ttUnsignedShort, 1 }, // ExternalFlashFirmware
+        {  8, ttUnsignedByte,  1 }, // ExternalFlashFlags
+        { 11, ttUnsignedByte,  1 }, // FlashFocalLength
+        { 12, ttUnsignedByte,  1 }, // RepeatingFlashRate
+        { 13, ttUnsignedByte,  1 }, // RepeatingFlashCount
+        { 14, ttUnsignedByte,  1 }, // FlashGNDistance
+        { 15, ttUnsignedByte,  1 }, // FlashGroupAControlMode
+        { 16, ttUnsignedByte,  1 }  // FlashGroupBControlMode
+    };
+    //! Nikon Flash Info binary array - configuration 2
+    extern const ArrayCfg nikonFl2Cfg = {
+        nikonFl2Id,       // Group for the elements
+        littleEndian,     // Byte order
+        ttUndefined,      // Type for array entry
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        true,             // Write all tags
+        true,             // Concatenate gaps
+        { 0, ttUnsignedByte,  1 }
+    };
+    //! Nikon Flash Info binary array - definition 2
+    extern const ArrayDef nikonFl2Def[] = {
+        {  0, ttUndefined,     4 }, // Version
+        {  4, ttUnsignedByte,  1 }, // FlashSource
+        {  6, ttUnsignedShort, 1 }, // ExternalFlashFirmware
+        {  8, ttUnsignedByte,  1 }, // ExternalFlashFlags
+        { 12, ttUnsignedByte,  1 }, // FlashFocalLength
+        { 13, ttUnsignedByte,  1 }, // RepeatingFlashRate
+        { 14, ttUnsignedByte,  1 }, // RepeatingFlashCount
+        { 15, ttUnsignedByte,  1 }, // FlashGNDistance
+    };
+    //! Nikon Flash Info binary array - configuration 3
+    extern const ArrayCfg nikonFl3Cfg = {
+        nikonFl3Id,       // Group for the elements
+        littleEndian,     // Byte order
+        ttUndefined,      // Type for array entry
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        true,             // Write all tags
+        true,             // Concatenate gaps
+        { 0, ttUnsignedByte,  1 }
+    };
+    //! Nikon Flash Info binary array - definition
+    extern const ArrayDef nikonFl3Def[] = {
+        {  0, ttUndefined,     4 }, // Version
+        {  4, ttUnsignedByte,  1 }, // FlashSource
+        {  6, ttUnsignedShort, 1 }, // ExternalFlashFirmware
+        {  8, ttUnsignedByte,  1 }, // ExternalFlashFlags
+        { 12, ttUnsignedByte,  1 }, // FlashFocalLength
+        { 13, ttUnsignedByte,  1 }, // RepeatingFlashRate
+        { 14, ttUnsignedByte,  1 }, // RepeatingFlashCount
+        { 15, ttUnsignedByte,  1 }, // FlashGNDistance
+        { 16, ttUnsignedByte,  1 }, // FlashColorFilter
+    };
+    //! Nikon Lens Data configurations and definitions
+    extern const ArraySet nikonFlSet[] = {
+        { nikonFl1Cfg, nikonFl1Def, EXV_COUNTOF(nikonFl1Def) },
+        { nikonFl2Cfg, nikonFl2Def, EXV_COUNTOF(nikonFl2Def) },
+        { nikonFl3Cfg, nikonFl3Def, EXV_COUNTOF(nikonFl3Def) }
+    };
+
     //! Nikon Shot Info binary array - configuration 1 (D80)
     extern const ArrayCfg nikonSi1Cfg = {
-        Group::nikonsi1,  // Group for the elements
+        nikonSi1Id,       // Group for the elements
         bigEndian,        // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Shot Info binary array - definition 1 (D80)
@@ -455,45 +669,50 @@
     };
     //! Nikon Shot Info binary array - configuration 2 (D40)
     extern const ArrayCfg nikonSi2Cfg = {
-        Group::nikonsi2,  // Group for the elements
+        nikonSi2Id,       // Group for the elements
         bigEndian,        // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Shot Info binary array - definition 2 (D40)
     extern const ArrayDef nikonSi2Def[] = {
         {    0, ttUndefined,    4 }, // Version
         {  582, ttUnsignedLong, 1 }, // ShutterCount
+        {  738, ttUnsignedByte, 1 },
         { 1112, ttUnsignedByte, 1 }  // The array contains 1113 bytes
     };
     //! Nikon Shot Info binary array - configuration 3 (D300a)
     extern const ArrayCfg nikonSi3Cfg = {
-        Group::nikonsi3,  // Group for the elements
+        nikonSi3Id,       // Group for the elements
         bigEndian,        // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Shot Info binary array - definition 3 (D300a)
     extern const ArrayDef nikonSi3Def[] = {
         {    0, ttUndefined,     4 }, // Version
+        {  604, ttUnsignedByte,  1 }, // ISO
         {  633, ttUnsignedLong,  1 }, // ShutterCount
         {  721, ttUnsignedShort, 1 }, // AFFineTuneAdj
         {  814, ttUndefined,  4478 }  // The array contains 5291 bytes
     };
     //! Nikon Shot Info binary array - configuration 4 (D300b)
     extern const ArrayCfg nikonSi4Cfg = {
-        Group::nikonsi4,  // Group for the elements
+        nikonSi4Id,       // Group for the elements
         bigEndian,        // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         true,             // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Shot Info binary array - definition 4 (D300b)
@@ -505,30 +724,36 @@
     };
     //! Nikon Shot Info binary array - configuration 5 (ver 02.xx)
     extern const ArrayCfg nikonSi5Cfg = {
-        Group::nikonsi5,  // Group for the elements
+        nikonSi5Id,       // Group for the elements
         bigEndian,        // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         false,            // Write all tags (don't know how many)
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Shot Info binary array - definition 5 (ver 01.xx and ver 02.xx)
     extern const ArrayDef nikonSi5Def[] = {
         {    0, ttUndefined,     4 }, // Version
-        {  106, ttUnsignedLong,  1 }, // ShutterCount
+        {  106, ttUnsignedLong,  1 }, // ShutterCount1
         {  110, ttUnsignedLong,  1 }, // DeletedImageCount
+        {  117, ttUnsignedByte,  1 }, // VibrationReduction
+        {  130, ttUnsignedByte,  1 }, // VibrationReduction1
         {  343, ttUndefined,     2 }, // ShutterCount
+        {  430, ttUnsignedByte,  1 }, // VibrationReduction2
+        {  598, ttUnsignedByte,  1 }, // ISO
         {  630, ttUnsignedLong,  1 }  // ShutterCount
     };
     //! Nikon Shot Info binary array - configuration 6 (ver 01.xx)
     extern const ArrayCfg nikonSi6Cfg = {
-        Group::nikonsi6,  // Group for the elements
+        nikonSi6Id,       // Group for the elements
         bigEndian,        // Use byte order from parent
         ttUndefined,      // Type for array entry
         notEncrypted,     // Encryption function
         false,            // No size element
         false,            // Write all tags (don't know how many)
+        true,             // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Lens Data configurations and definitions
@@ -543,32 +768,35 @@
 
     //! Nikon Lens Data binary array - configuration 1
     extern const ArrayCfg nikonLd1Cfg = {
-        Group::nikonld1,  // Group for the elements
+        nikonLd1Id,       // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         notEncrypted,     // Encryption function
         false,            // No size element
         true,             // Write all tags
+        false,            // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Lens Data binary array - configuration 2
     extern const ArrayCfg nikonLd2Cfg = {
-        Group::nikonld2,  // Group for the elements
+        nikonLd2Id,       // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         true,             // Write all tags
+        false,            // Concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Lens Data binary array - configuration 3
     extern const ArrayCfg nikonLd3Cfg = {
-        Group::nikonld3,  // Group for the elements
+        nikonLd3Id,       // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         true,             // Write all tags
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedByte,  1 }
     };
     //! Nikon Lens Data binary array - definition
@@ -584,107 +812,103 @@
 
     //! Nikon Color Balance binary array - configuration 1
     extern const ArrayCfg nikonCb1Cfg = {
-        Group::nikoncb1,  // Group for the elements
+        nikonCb1Id,       // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         notEncrypted,     // Encryption function
         false,            // No size element
         false,            // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Nikon Color Balance binary array - configuration 2
     extern const ArrayCfg nikonCb2Cfg = {
-        Group::nikoncb2,  // Group for the elements
+        nikonCb2Id,       // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         false,            // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Nikon Color Balance binary array - configuration 2a
     extern const ArrayCfg nikonCb2aCfg = {
-        Group::nikoncb2a, // Group for the elements
+        nikonCb2aId,      // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         false,            // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Nikon Color Balance binary array - configuration 2b
     extern const ArrayCfg nikonCb2bCfg = {
-        Group::nikoncb2b, // Group for the elements
+        nikonCb2bId,      // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         false,            // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Nikon Color Balance binary array - configuration 3
     extern const ArrayCfg nikonCb3Cfg = {
-        Group::nikoncb3,  // Group for the elements
+        nikonCb3Id,       // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         notEncrypted,     // Encryption function
         false,            // No size element
         false,            // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Nikon Color Balance binary array - configuration 4
     extern const ArrayCfg nikonCb4Cfg = {
-        Group::nikoncb4,  // Group for the elements
+        nikonCb4Id,       // Group for the elements
         invalidByteOrder, // Use byte order from parent
         ttUndefined,      // Type for array entry
         nikonCrypt,       // Encryption function
         false,            // No size element
         false,            // Write all tags
+        true,             // Concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Nikon Color Balance binary array - definition 1 (D100)
     extern const ArrayDef nikonCb1Def[] = {
         {  0, ttUndefined,        4 }, // Version
-        {  4, ttUnsignedShort,   34 }, // Unknown
-        { 72, ttUnsignedShort,    4 }, // Color balance levels
-        { 80, ttUnsignedShort, 9999 }  // Unknown
+        { 72, ttUnsignedShort,    4 }  // Color balance levels
     };
     //! Nikon Color Balance binary array - definition 2 (D2H)
     extern const ArrayDef nikonCb2Def[] = {
         {  0, ttUndefined,        4 }, // Version
-        {  4, ttUnsignedShort,    3 }, // Unknown
-        { 10, ttUnsignedShort,    4 }, // Color balance levels
-        { 18, ttUnsignedShort, 9999 }  // Unknown
+        { 10, ttUnsignedShort,    4 }  // Color balance levels
     };
     //! Nikon Color Balance binary array - definition 2a (D50)
     extern const ArrayDef nikonCb2aDef[] = {
         {  0, ttUndefined,        4 }, // Version
-        {  4, ttUnsignedShort,    7 }, // Unknown
-        { 18, ttUnsignedShort,    4 }, // Color balance levels
-        { 26, ttUnsignedShort, 9999 }  // Unknown
+        { 18, ttUnsignedShort,    4 }  // Color balance levels
     };
     //! Nikon Color Balance binary array - definition 2b (D2X=0204,D2Hs=0206,D200=0207,D40=0208)
     extern const ArrayDef nikonCb2bDef[] = {
         {  0, ttUndefined,        4 }, // Version
         {  4, ttUnsignedShort,  140 }, // Unknown
         {284, ttUnsignedShort,    3 }, // Unknown (encrypted)
-        {290, ttUnsignedShort,    4 }, // Color balance levels
-        {298, ttUnsignedShort, 9999 }  // Unknown (encrypted)
+        {290, ttUnsignedShort,    4 }  // Color balance levels
     };
     //! Nikon Color Balance binary array - definition 3 (D70)
     extern const ArrayDef nikonCb3Def[] = {
         {  0, ttUndefined,        4 }, // Version
-        {  4, ttUnsignedShort,    8 }, // Unknown
-        { 20, ttUnsignedShort,    4 }, // Color balance levels
-        { 28, ttUnsignedShort, 9999 }  // Unknown
+        { 20, ttUnsignedShort,    4 }  // Color balance levels
     };
     //! Nikon Color Balance binary array - definition 4 (D3)
     extern const ArrayDef nikonCb4Def[] = {
         {  0, ttUndefined,        4 }, // Version
         {  4, ttUnsignedShort,  140 }, // Unknown
         {284, ttUnsignedShort,    5 }, // Unknown (encrypted)
-        {294, ttUnsignedShort,    4 }, // Color balance levels
-        {302, ttUnsignedShort, 9999 }  // Unknown (encrypted)
+        {294, ttUnsignedShort,    4 }  // Color balance levels
     };
     //! Nikon Color Balance configurations and definitions
     extern const ArraySet nikonCbSet[] = {
@@ -698,34 +922,37 @@
 
     //! Minolta Camera Settings (old) binary array - configuration
     extern const ArrayCfg minoCsoCfg = {
-        Group::minocso,   // Group for the elements
+        minoltaCsOldId,   // Group for the elements
         bigEndian,        // Big endian
         ttUndefined,      // Type for array entry and size element
         notEncrypted,     // Not encrypted
         false,            // No size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedLong, 1 }
     };
 
     //! Minolta Camera Settings (new) binary array - configuration
     extern const ArrayCfg minoCsnCfg = {
-        Group::minocsn,   // Group for the elements
+        minoltaCsNewId,   // Group for the elements
         bigEndian,        // Big endian
         ttUndefined,      // Type for array entry and size element
         notEncrypted,     // Not encrypted
         false,            // No size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedLong, 1 }
     };
 
     //! Minolta 7D Camera Settings binary array - configuration
     extern const ArrayCfg minoCs7Cfg = {
-        Group::minocs7,   // Group for the elements
+        minoltaCs7DId,    // Group for the elements
         bigEndian,        // Big endian
         ttUndefined,      // Type for array entry and size element
         notEncrypted,     // Not encrypted
         false,            // No size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Minolta 7D Camera Settings binary array - definition
@@ -736,12 +963,13 @@
 
     //! Minolta 5D Camera Settings binary array - configuration
     extern const ArrayCfg minoCs5Cfg = {
-        Group::minocs5,   // Group for the elements
+        minoltaCs5DId,    // Group for the elements
         bigEndian,        // Big endian
         ttUndefined,      // Type for array entry and size element
         notEncrypted,     // Not encrypted
         false,            // No size element
         false,            // No fillers
+        false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
     //! Minolta 5D Camera Settings binary array - definition
@@ -749,6 +977,128 @@
         { 146, ttSignedShort, 1 } // Exif.MinoltaCs5D.ColorTemperature
     };
 
+    // Todo: Performance of the handling of Sony Camera Settings can be
+    //       improved by defining all known array elements in the definitions
+    //       sonyCsDef and sonyCs2Def below and enabling the 'concatenate gaps'
+    //       setting in all four configurations.
+
+    //! Sony1 Camera Settings binary array - configuration
+    extern const ArrayCfg sony1CsCfg = {
+        sony1CsId,        // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedShort, 1 }
+    };
+    //! Sony1 Camera Settings 2 binary array - configuration
+    extern const ArrayCfg sony1Cs2Cfg = {
+        sony1Cs2Id,       // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedShort, 1 }
+    };
+    //! Sony[12] Camera Settings binary array - definition
+    extern const ArrayDef sonyCsDef[] = {
+        {  12, ttSignedShort,   1 }  // Exif.Sony[12]Cs.WhiteBalanceFineTune
+    };
+    //! Sony2 Camera Settings binary array - configuration
+    extern const ArrayCfg sony2CsCfg = {
+        sony2CsId,        // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedShort, 1 }
+    };
+    //! Sony2 Camera Settings 2 binary array - configuration
+    extern const ArrayCfg sony2Cs2Cfg = {
+        sony2Cs2Id,       // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedShort, 1 }
+    };
+    //! Sony[12] Camera Settings 2 binary array - definition
+    extern const ArrayDef sonyCs2Def[] = {
+        {  44, ttUnsignedShort, 1 } // Exif.Sony[12]Cs2.FocusMode
+    };
+    //! Sony1 Camera Settings configurations and definitions
+    extern const ArraySet sony1CsSet[] = {
+        { sony1CsCfg,  sonyCsDef,  EXV_COUNTOF(sonyCsDef)  },
+        { sony1Cs2Cfg, sonyCs2Def, EXV_COUNTOF(sonyCs2Def) }
+    };
+    //! Sony2 Camera Settings configurations and definitions
+    extern const ArraySet sony2CsSet[] = {
+        { sony2CsCfg,  sonyCsDef,  EXV_COUNTOF(sonyCsDef)  },
+        { sony2Cs2Cfg, sonyCs2Def, EXV_COUNTOF(sonyCs2Def) }
+    };
+
+    //! Sony Minolta Camera Settings (old) binary array - configuration
+    extern const ArrayCfg sony1MCsoCfg = {
+        sony1MltCsOldId,  // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedLong, 1 }
+    };
+
+    //! Sony Minolta Camera Settings (new) binary array - configuration
+    extern const ArrayCfg sony1MCsnCfg = {
+        sony1MltCsNewId,  // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedLong, 1 }
+    };
+
+    //! Sony Minolta 7D Camera Settings binary array - configuration
+    extern const ArrayCfg sony1MCs7Cfg = {
+        sony1MltCs7DId,   // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedShort, 1 }
+    };
+
+    //! Sony Minolta A100 Camera Settings binary array - configuration
+    extern const ArrayCfg sony1MCsA100Cfg = {
+        sony1MltCsA100Id, // Group for the elements
+        bigEndian,        // Big endian
+        ttUndefined,      // Type for array entry and size element
+        notEncrypted,     // Not encrypted
+        false,            // No size element
+        false,            // No fillers
+        false,            // Don't concatenate gaps
+        { 0, ttUnsignedShort, 1 }
+    };
+    //! Sony Minolta A100 Camera Settings binary array - definition
+    extern const ArrayDef sony1MCsA100Def[] = {
+        { 112, ttSignedShort, 1 }, // Exif.Sony1MltCsA100.WhiteBalanceFineTune
+        { 116, ttSignedShort, 1 }, // Exif.Sony1MltCsA100.ColorCompensationFilter
+        { 190, ttSignedShort, 1 }  // Exif.Sony1MltCsA100.ColorCompensationFilter2
+    };
+
     /*
       This table lists for each group in a tree, its parent group and tag.
       Root identifies the root of a TIFF tree, as there is a need for multiple
@@ -761,84 +1111,108 @@
     const TiffTreeStruct TiffCreator::tiffTreeStruct_[] = {
         // root      group             parent group      parent tag
         //---------  ----------------- ----------------- ----------
-        { Tag::root, Group::none,      Group::none,      Tag::root },
-        { Tag::root, Group::ifd0,      Group::none,      Tag::root },
-        { Tag::root, Group::subimg1,   Group::ifd0,      0x014a    },
-        { Tag::root, Group::subimg2,   Group::ifd0,      0x014a    },
-        { Tag::root, Group::subimg3,   Group::ifd0,      0x014a    },
-        { Tag::root, Group::subimg4,   Group::ifd0,      0x014a    },
-        { Tag::root, Group::exif,      Group::ifd0,      0x8769    },
-        { Tag::root, Group::gps,       Group::ifd0,      0x8825    },
-        { Tag::root, Group::iop,       Group::exif,      0xa005    },
-        { Tag::root, Group::ifd1,      Group::ifd0,      Tag::next },
-        { Tag::root, Group::ifd2,      Group::ifd1,      Tag::next },
-        { Tag::root, Group::ifd3,      Group::ifd2,      Tag::next },
-        { Tag::root, Group::olymp1mn,  Group::exif,      0x927c    },
-        { Tag::root, Group::olymp2mn,  Group::exif,      0x927c    },
-        { Tag::root, Group::olympeq,   Group::olymp2mn,  0x2010    },
-        { Tag::root, Group::olympcs,   Group::olymp2mn,  0x2020    },
-        { Tag::root, Group::olymprd,   Group::olymp2mn,  0x2030    },
-        { Tag::root, Group::olymprd2,  Group::olymp2mn,  0x2031    },
-        { Tag::root, Group::olympip,   Group::olymp2mn,  0x2040    },
-        { Tag::root, Group::olympfi,   Group::olymp2mn,  0x2050    },
-        { Tag::root, Group::olympfe1,  Group::olymp2mn,  0x2100    },
-        { Tag::root, Group::olympfe2,  Group::olymp2mn,  0x2200    },
-        { Tag::root, Group::olympfe3,  Group::olymp2mn,  0x2300    },
-        { Tag::root, Group::olympfe4,  Group::olymp2mn,  0x2400    },
-        { Tag::root, Group::olympfe5,  Group::olymp2mn,  0x2500    },
-        { Tag::root, Group::olympfe6,  Group::olymp2mn,  0x2600    },
-        { Tag::root, Group::olympfe7,  Group::olymp2mn,  0x2700    },
-        { Tag::root, Group::olympfe8,  Group::olymp2mn,  0x2800    },
-        { Tag::root, Group::olympfe9,  Group::olymp2mn,  0x2900    },
-        { Tag::root, Group::olympri,   Group::olymp2mn,  0x3000    },
-        { Tag::root, Group::fujimn,    Group::exif,      0x927c    },
-        { Tag::root, Group::canonmn,   Group::exif,      0x927c    },
-        { Tag::root, Group::canoncs,   Group::canonmn,   0x0001    },
-        { Tag::root, Group::canonsi,   Group::canonmn,   0x0004    },
-        { Tag::root, Group::canonpa,   Group::canonmn,   0x0005    },
-        { Tag::root, Group::canoncf,   Group::canonmn,   0x000f    },
-        { Tag::root, Group::canonpi,   Group::canonmn,   0x0012    },
-        { Tag::root, Group::canonfi,   Group::canonmn,   0x0093    },
-        { Tag::root, Group::nikon1mn,  Group::exif,      0x927c    },
-        { Tag::root, Group::nikon2mn,  Group::exif,      0x927c    },
-        { Tag::root, Group::nikon3mn,  Group::exif,      0x927c    },
-        { Tag::root, Group::nikonpv,   Group::nikon3mn,  0x0011    },
-        { Tag::root, Group::nikonvr,   Group::nikon3mn,  0x001f    },
-        { Tag::root, Group::nikonpc,   Group::nikon3mn,  0x0023    },
-        { Tag::root, Group::nikonwt,   Group::nikon3mn,  0x0024    },
-        { Tag::root, Group::nikonii,   Group::nikon3mn,  0x0025    },
-        { Tag::root, Group::nikonaf,   Group::nikon3mn,  0x0088    },
-        { Tag::root, Group::nikonsi1,  Group::nikon3mn,  0x0091    },
-        { Tag::root, Group::nikonsi2,  Group::nikon3mn,  0x0091    },
-        { Tag::root, Group::nikonsi3,  Group::nikon3mn,  0x0091    },
-        { Tag::root, Group::nikonsi4,  Group::nikon3mn,  0x0091    },
-        { Tag::root, Group::nikonsi5,  Group::nikon3mn,  0x0091    },
-        { Tag::root, Group::nikonsi6,  Group::nikon3mn,  0x0091    },
-        { Tag::root, Group::nikoncb1,  Group::nikon3mn,  0x0097    },
-        { Tag::root, Group::nikoncb2,  Group::nikon3mn,  0x0097    },
-        { Tag::root, Group::nikoncb2a, Group::nikon3mn,  0x0097    },
-        { Tag::root, Group::nikoncb2b, Group::nikon3mn,  0x0097    },
-        { Tag::root, Group::nikoncb3,  Group::nikon3mn,  0x0097    },
-        { Tag::root, Group::nikoncb4,  Group::nikon3mn,  0x0097    },
-        { Tag::root, Group::nikonld1,  Group::nikon3mn,  0x0098    },
-        { Tag::root, Group::nikonld2,  Group::nikon3mn,  0x0098    },
-        { Tag::root, Group::nikonld3,  Group::nikon3mn,  0x0098    },
-        { Tag::root, Group::panamn,    Group::exif,      0x927c    },
-        { Tag::root, Group::pentaxmn,  Group::exif,      0x927c    },
-        { Tag::root, Group::sigmamn,   Group::exif,      0x927c    },
-        { Tag::root, Group::sony1mn,   Group::exif,      0x927c    },
-        { Tag::root, Group::sony2mn,   Group::exif,      0x927c    },
-        { Tag::root, Group::minoltamn, Group::exif,      0x927c    },
-        { Tag::root, Group::minocso,   Group::minoltamn, 0x0001    },
-        { Tag::root, Group::minocsn,   Group::minoltamn, 0x0003    },
-        { Tag::root, Group::minocs7,   Group::minoltamn, 0x0004    },
-        { Tag::root, Group::minocs5,   Group::minoltamn, 0x0114    },
+        { Tag::root, ifdIdNotSet,      ifdIdNotSet,      Tag::root },
+        { Tag::root, ifd0Id,           ifdIdNotSet,      Tag::root },
+        { Tag::root, subImage1Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage2Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage3Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage4Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage5Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage6Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage7Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage8Id,      ifd0Id,           0x014a    },
+        { Tag::root, subImage9Id,      ifd0Id,           0x014a    },
+        { Tag::root, exifId,           ifd0Id,           0x8769    },
+        { Tag::root, gpsId,            ifd0Id,           0x8825    },
+        { Tag::root, iopId,            exifId,           0xa005    },
+        { Tag::root, ifd1Id,           ifd0Id,           Tag::next },
+        { Tag::root, ifd2Id,           ifd1Id,           Tag::next },
+        { Tag::root, ifd3Id,           ifd2Id,           Tag::next },
+        { Tag::root, olympusId,        exifId,           0x927c    },
+        { Tag::root, olympus2Id,       exifId,           0x927c    },
+        { Tag::root, subThumb1Id,      ifd1Id,           0x014a    },
+        { Tag::root, olympusEqId,      olympus2Id,       0x2010    },
+        { Tag::root, olympusCsId,      olympus2Id,       0x2020    },
+        { Tag::root, olympusRdId,      olympus2Id,       0x2030    },
+        { Tag::root, olympusRd2Id,     olympus2Id,       0x2031    },
+        { Tag::root, olympusIpId,      olympus2Id,       0x2040    },
+        { Tag::root, olympusFiId,      olympus2Id,       0x2050    },
+        { Tag::root, olympusFe1Id,     olympus2Id,       0x2100    },
+        { Tag::root, olympusFe2Id,     olympus2Id,       0x2200    },
+        { Tag::root, olympusFe3Id,     olympus2Id,       0x2300    },
+        { Tag::root, olympusFe4Id,     olympus2Id,       0x2400    },
+        { Tag::root, olympusFe5Id,     olympus2Id,       0x2500    },
+        { Tag::root, olympusFe6Id,     olympus2Id,       0x2600    },
+        { Tag::root, olympusFe7Id,     olympus2Id,       0x2700    },
+        { Tag::root, olympusFe8Id,     olympus2Id,       0x2800    },
+        { Tag::root, olympusFe9Id,     olympus2Id,       0x2900    },
+        { Tag::root, olympusRiId,      olympus2Id,       0x3000    },
+        { Tag::root, fujiId,           exifId,           0x927c    },
+        { Tag::root, canonId,          exifId,           0x927c    },
+        { Tag::root, canonCsId,        canonId,          0x0001    },
+        { Tag::root, canonSiId,        canonId,          0x0004    },
+        { Tag::root, canonPaId,        canonId,          0x0005    },
+        { Tag::root, canonCfId,        canonId,          0x000f    },
+        { Tag::root, canonPiId,        canonId,          0x0012    },
+        { Tag::root, canonFiId,        canonId,          0x0093    },
+        { Tag::root, canonPrId,        canonId,          0x00a0    },
+        { Tag::root, nikon1Id,         exifId,           0x927c    },
+        { Tag::root, nikon2Id,         exifId,           0x927c    },
+        { Tag::root, nikon3Id,         exifId,           0x927c    },
+        { Tag::root, nikonPvId,        nikon3Id,         0x0011    },
+        { Tag::root, nikonVrId,        nikon3Id,         0x001f    },
+        { Tag::root, nikonPcId,        nikon3Id,         0x0023    },
+        { Tag::root, nikonWtId,        nikon3Id,         0x0024    },
+        { Tag::root, nikonIiId,        nikon3Id,         0x0025    },
+        { Tag::root, nikonAfId,        nikon3Id,         0x0088    },
+        { Tag::root, nikonSi1Id,       nikon3Id,         0x0091    },
+        { Tag::root, nikonSi2Id,       nikon3Id,         0x0091    },
+        { Tag::root, nikonSi3Id,       nikon3Id,         0x0091    },
+        { Tag::root, nikonSi4Id,       nikon3Id,         0x0091    },
+        { Tag::root, nikonSi5Id,       nikon3Id,         0x0091    },
+        { Tag::root, nikonSi6Id,       nikon3Id,         0x0091    },
+        { Tag::root, nikonCb1Id,       nikon3Id,         0x0097    },
+        { Tag::root, nikonCb2Id,       nikon3Id,         0x0097    },
+        { Tag::root, nikonCb2aId,      nikon3Id,         0x0097    },
+        { Tag::root, nikonCb2bId,      nikon3Id,         0x0097    },
+        { Tag::root, nikonCb3Id,       nikon3Id,         0x0097    },
+        { Tag::root, nikonCb4Id,       nikon3Id,         0x0097    },
+        { Tag::root, nikonLd1Id,       nikon3Id,         0x0098    },
+        { Tag::root, nikonLd2Id,       nikon3Id,         0x0098    },
+        { Tag::root, nikonLd3Id,       nikon3Id,         0x0098    },
+        { Tag::root, nikonMeId,        nikon3Id,         0x00b0    },
+        { Tag::root, nikonAf2Id,       nikon3Id,         0x00b7    },
+        { Tag::root, nikonFiId,        nikon3Id,         0x00b8    },
+        { Tag::root, nikonFl1Id,       nikon3Id,         0x00a8    },
+        { Tag::root, nikonFl2Id,       nikon3Id,         0x00a8    },
+        { Tag::root, nikonFl3Id,       nikon3Id,         0x00a8    },
+        { Tag::root, panasonicId,      exifId,           0x927c    },
+        { Tag::root, pentaxId,         exifId,           0x927c    },
+        { Tag::root, samsung2Id,       exifId,           0x927c    },
+        { Tag::root, samsungPvId,      samsung2Id,       0x0035    },
+        { Tag::root, sigmaId,          exifId,           0x927c    },
+        { Tag::root, sony1Id,          exifId,           0x927c    },
+        { Tag::root, sony1CsId,        sony1Id,          0x0114    },
+        { Tag::root, sony1Cs2Id,       sony1Id,          0x0114    },
+        { Tag::root, sonyMltId,        sony1Id,          0xb028    },
+        { Tag::root, sony1MltCsOldId,  sonyMltId,        0x0001    },
+        { Tag::root, sony1MltCsNewId,  sonyMltId,        0x0003    },
+        { Tag::root, sony1MltCs7DId,   sonyMltId,        0x0004    },
+        { Tag::root, sony1MltCsA100Id, sonyMltId,        0x0114    },
+        { Tag::root, sony2Id,          exifId,           0x927c    },
+        { Tag::root, sony2CsId,        sony2Id,          0x0114    },
+        { Tag::root, sony2Cs2Id,       sony2Id,          0x0114    },
+        { Tag::root, minoltaId,        exifId,           0x927c    },
+        { Tag::root, minoltaCsOldId,   minoltaId,        0x0001    },
+        { Tag::root, minoltaCsNewId,   minoltaId,        0x0003    },
+        { Tag::root, minoltaCs7DId,    minoltaId,        0x0004    },
+        { Tag::root, minoltaCs5DId,    minoltaId,        0x0114    },
         // ---------------------------------------------------------
         // Panasonic RW2 raw images
-        { Tag::pana, Group::none,      Group::none,      Tag::pana },
-        { Tag::pana, Group::panaraw,   Group::none,      Tag::pana },
-        { Tag::pana, Group::exif,      Group::panaraw,   0x8769    },
-        { Tag::pana, Group::gps,       Group::panaraw,   0x8825    }
+        { Tag::pana, ifdIdNotSet,      ifdIdNotSet,      Tag::pana },
+        { Tag::pana, panaRawId,        ifdIdNotSet,      Tag::pana },
+        { Tag::pana, exifId,           panaRawId,        0x8769    },
+        { Tag::pana, gpsId,            panaRawId,        0x8825    }
     };
 
     /*
@@ -856,330 +1230,455 @@
         // ext. tag  group             create function
         //---------  ----------------- -----------------------------------------
         // Root directory
-        { Tag::root, Group::none,      newTiffDirectory<Group::ifd0>             },
+        { Tag::root, ifdIdNotSet,      newTiffDirectory<ifd0Id>                  },
 
         // IFD0
-        {    0x8769, Group::ifd0,      newTiffSubIfd<Group::exif>                },
-        {    0x8825, Group::ifd0,      newTiffSubIfd<Group::gps>                 },
-        {    0x0111, Group::ifd0,      newTiffImageData<0x0117, Group::ifd0>     },
-        {    0x0117, Group::ifd0,      newTiffImageSize<0x0111, Group::ifd0>     },
-        {    0x0144, Group::ifd0,      newTiffImageData<0x0145, Group::ifd0>     },
-        {    0x0145, Group::ifd0,      newTiffImageSize<0x0144, Group::ifd0>     },
-        {    0x0201, Group::ifd0,      newTiffImageData<0x0202, Group::ifd0>     },
-        {    0x0202, Group::ifd0,      newTiffImageSize<0x0201, Group::ifd0>     },
-        {    0x014a, Group::ifd0,      newTiffSubIfd<Group::subimg1>             },
-        { Tag::next, Group::ifd0,      newTiffDirectory<Group::ifd1>             },
-        {  Tag::all, Group::ifd0,      newTiffEntry                              },
-
-        // Subdir subimg1
-        {    0x0111, Group::subimg1,   newTiffImageData<0x0117, Group::subimg1>  },
-        {    0x0117, Group::subimg1,   newTiffImageSize<0x0111, Group::subimg1>  },
-        {    0x0144, Group::subimg1,   newTiffImageData<0x0145, Group::subimg1>  },
-        {    0x0145, Group::subimg1,   newTiffImageSize<0x0144, Group::subimg1>  },
-        {    0x0201, Group::subimg1,   newTiffImageData<0x0202, Group::subimg1>  },
-        {    0x0202, Group::subimg1,   newTiffImageSize<0x0201, Group::subimg1>  },
-        { Tag::next, Group::subimg1,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::subimg1,   newTiffEntry                              },
-
-        // Subdir subimg2
-        {    0x0111, Group::subimg2,   newTiffImageData<0x0117, Group::subimg2>  },
-        {    0x0117, Group::subimg2,   newTiffImageSize<0x0111, Group::subimg2>  },
-        {    0x0144, Group::subimg2,   newTiffImageData<0x0145, Group::subimg2>  },
-        {    0x0145, Group::subimg2,   newTiffImageSize<0x0144, Group::subimg2>  },
-        {    0x0201, Group::subimg2,   newTiffImageData<0x0202, Group::subimg2>  },
-        {    0x0202, Group::subimg2,   newTiffImageSize<0x0201, Group::subimg2>  },
-        { Tag::next, Group::subimg2,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::subimg2,   newTiffEntry                              },
-
-        // Subdir subimg3
-        {    0x0111, Group::subimg3,   newTiffImageData<0x0117, Group::subimg3>  },
-        {    0x0117, Group::subimg3,   newTiffImageSize<0x0111, Group::subimg3>  },
-        {    0x0144, Group::subimg3,   newTiffImageData<0x0145, Group::subimg3>  },
-        {    0x0145, Group::subimg3,   newTiffImageSize<0x0144, Group::subimg3>  },
-        {    0x0201, Group::subimg3,   newTiffImageData<0x0202, Group::subimg3>  },
-        {    0x0202, Group::subimg3,   newTiffImageSize<0x0201, Group::subimg3>  },
-        { Tag::next, Group::subimg3,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::subimg3,   newTiffEntry                              },
-
-        // Subdir subimg4
-        {    0x0111, Group::subimg4,   newTiffImageData<0x0117, Group::subimg4>  },
-        {    0x0117, Group::subimg4,   newTiffImageSize<0x0111, Group::subimg4>  },
-        {    0x0144, Group::subimg4,   newTiffImageData<0x0145, Group::subimg4>  },
-        {    0x0145, Group::subimg4,   newTiffImageSize<0x0144, Group::subimg4>  },
-        {    0x0201, Group::subimg4,   newTiffImageData<0x0202, Group::subimg4>  },
-        {    0x0202, Group::subimg4,   newTiffImageSize<0x0201, Group::subimg4>  },
-        { Tag::next, Group::subimg4,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::subimg4,   newTiffEntry                              },
+        {    0x8769, ifd0Id,           newTiffSubIfd<exifId>                     },
+        {    0x8825, ifd0Id,           newTiffSubIfd<gpsId>                      },
+        {    0x0111, ifd0Id,           newTiffImageData<0x0117, ifd0Id>          },
+        {    0x0117, ifd0Id,           newTiffImageSize<0x0111, ifd0Id>          },
+        {    0x0144, ifd0Id,           newTiffImageData<0x0145, ifd0Id>          },
+        {    0x0145, ifd0Id,           newTiffImageSize<0x0144, ifd0Id>          },
+        {    0x0201, ifd0Id,           newTiffImageData<0x0202, ifd0Id>          },
+        {    0x0202, ifd0Id,           newTiffImageSize<0x0201, ifd0Id>          },
+        {    0x014a, ifd0Id,           newTiffSubIfd<subImage1Id>                },
+        { Tag::next, ifd0Id,           newTiffDirectory<ifd1Id>                  },
+        {  Tag::all, ifd0Id,           newTiffEntry                              },
+
+        // Subdir subImage1
+        {    0x0111, subImage1Id,      newTiffImageData<0x0117, subImage1Id>     },
+        {    0x0117, subImage1Id,      newTiffImageSize<0x0111, subImage1Id>     },
+        {    0x0144, subImage1Id,      newTiffImageData<0x0145, subImage1Id>     },
+        {    0x0145, subImage1Id,      newTiffImageSize<0x0144, subImage1Id>     },
+        {    0x0201, subImage1Id,      newTiffImageData<0x0202, subImage1Id>     },
+        {    0x0202, subImage1Id,      newTiffImageSize<0x0201, subImage1Id>     },
+        { Tag::next, subImage1Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage1Id,      newTiffEntry                              },
+
+        // Subdir subImage2
+        {    0x0111, subImage2Id,      newTiffImageData<0x0117, subImage2Id>     },
+        {    0x0117, subImage2Id,      newTiffImageSize<0x0111, subImage2Id>     },
+        {    0x0144, subImage2Id,      newTiffImageData<0x0145, subImage2Id>     },
+        {    0x0145, subImage2Id,      newTiffImageSize<0x0144, subImage2Id>     },
+        {    0x0201, subImage2Id,      newTiffImageData<0x0202, subImage2Id>     },
+        {    0x0202, subImage2Id,      newTiffImageSize<0x0201, subImage2Id>     },
+        { Tag::next, subImage2Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage2Id,      newTiffEntry                              },
+
+        // Subdir subImage3
+        {    0x0111, subImage3Id,      newTiffImageData<0x0117, subImage3Id>     },
+        {    0x0117, subImage3Id,      newTiffImageSize<0x0111, subImage3Id>     },
+        {    0x0144, subImage3Id,      newTiffImageData<0x0145, subImage3Id>     },
+        {    0x0145, subImage3Id,      newTiffImageSize<0x0144, subImage3Id>     },
+        {    0x0201, subImage3Id,      newTiffImageData<0x0202, subImage3Id>     },
+        {    0x0202, subImage3Id,      newTiffImageSize<0x0201, subImage3Id>     },
+        { Tag::next, subImage3Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage3Id,      newTiffEntry                              },
+
+        // Subdir subImage4
+        {    0x0111, subImage4Id,      newTiffImageData<0x0117, subImage4Id>     },
+        {    0x0117, subImage4Id,      newTiffImageSize<0x0111, subImage4Id>     },
+        {    0x0144, subImage4Id,      newTiffImageData<0x0145, subImage4Id>     },
+        {    0x0145, subImage4Id,      newTiffImageSize<0x0144, subImage4Id>     },
+        {    0x0201, subImage4Id,      newTiffImageData<0x0202, subImage4Id>     },
+        {    0x0202, subImage4Id,      newTiffImageSize<0x0201, subImage4Id>     },
+        { Tag::next, subImage4Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage4Id,      newTiffEntry                              },
+
+        // Subdir subImage5
+        {    0x0111, subImage5Id,      newTiffImageData<0x0117, subImage5Id>     },
+        {    0x0117, subImage5Id,      newTiffImageSize<0x0111, subImage5Id>     },
+        {    0x0144, subImage5Id,      newTiffImageData<0x0145, subImage5Id>     },
+        {    0x0145, subImage5Id,      newTiffImageSize<0x0144, subImage5Id>     },
+        {    0x0201, subImage5Id,      newTiffImageData<0x0202, subImage5Id>     },
+        {    0x0202, subImage5Id,      newTiffImageSize<0x0201, subImage5Id>     },
+        { Tag::next, subImage5Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage5Id,      newTiffEntry                              },
+
+        // Subdir subImage6
+        {    0x0111, subImage6Id,      newTiffImageData<0x0117, subImage6Id>     },
+        {    0x0117, subImage6Id,      newTiffImageSize<0x0111, subImage6Id>     },
+        {    0x0144, subImage6Id,      newTiffImageData<0x0145, subImage6Id>     },
+        {    0x0145, subImage6Id,      newTiffImageSize<0x0144, subImage6Id>     },
+        {    0x0201, subImage6Id,      newTiffImageData<0x0202, subImage6Id>     },
+        {    0x0202, subImage6Id,      newTiffImageSize<0x0201, subImage6Id>     },
+        { Tag::next, subImage6Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage6Id,      newTiffEntry                              },
+
+        // Subdir subImage7
+        {    0x0111, subImage7Id,      newTiffImageData<0x0117, subImage7Id>     },
+        {    0x0117, subImage7Id,      newTiffImageSize<0x0111, subImage7Id>     },
+        {    0x0144, subImage7Id,      newTiffImageData<0x0145, subImage7Id>     },
+        {    0x0145, subImage7Id,      newTiffImageSize<0x0144, subImage7Id>     },
+        {    0x0201, subImage7Id,      newTiffImageData<0x0202, subImage7Id>     },
+        {    0x0202, subImage7Id,      newTiffImageSize<0x0201, subImage7Id>     },
+        { Tag::next, subImage7Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage7Id,      newTiffEntry                              },
+
+        // Subdir subImage8
+        {    0x0111, subImage8Id,      newTiffImageData<0x0117, subImage8Id>     },
+        {    0x0117, subImage8Id,      newTiffImageSize<0x0111, subImage8Id>     },
+        {    0x0144, subImage8Id,      newTiffImageData<0x0145, subImage8Id>     },
+        {    0x0145, subImage8Id,      newTiffImageSize<0x0144, subImage8Id>     },
+        {    0x0201, subImage8Id,      newTiffImageData<0x0202, subImage8Id>     },
+        {    0x0202, subImage8Id,      newTiffImageSize<0x0201, subImage8Id>     },
+        { Tag::next, subImage8Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage8Id,      newTiffEntry                              },
+
+        // Subdir subImage9
+        {    0x0111, subImage9Id,      newTiffImageData<0x0117, subImage9Id>     },
+        {    0x0117, subImage9Id,      newTiffImageSize<0x0111, subImage9Id>     },
+        {    0x0144, subImage9Id,      newTiffImageData<0x0145, subImage9Id>     },
+        {    0x0145, subImage9Id,      newTiffImageSize<0x0144, subImage9Id>     },
+        {    0x0201, subImage9Id,      newTiffImageData<0x0202, subImage9Id>     },
+        {    0x0202, subImage9Id,      newTiffImageSize<0x0201, subImage9Id>     },
+        { Tag::next, subImage9Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subImage9Id,      newTiffEntry                              },
 
         // Exif subdir
-        {    0xa005, Group::exif,      newTiffSubIfd<Group::iop>                 },
-        {    0x927c, Group::exif,      newTiffMnEntry                            },
-        { Tag::next, Group::exif,      newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::exif,      newTiffEntry                              },
+        {    0xa005, exifId,           newTiffSubIfd<iopId>                      },
+        {    0x927c, exifId,           newTiffMnEntry                            },
+        { Tag::next, exifId,           newTiffDirectory<ignoreId>                },
+        {  Tag::all, exifId,           newTiffEntry                              },
 
         // GPS subdir
-        { Tag::next, Group::gps,       newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::gps,       newTiffEntry                              },
+        { Tag::next, gpsId,            newTiffDirectory<ignoreId>                },
+        {  Tag::all, gpsId,            newTiffEntry                              },
 
         // IOP subdir
-        { Tag::next, Group::iop,       newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::iop,       newTiffEntry                              },
+        { Tag::next, iopId,            newTiffDirectory<ignoreId>                },
+        {  Tag::all, iopId,            newTiffEntry                              },
 
         // IFD1
-        {    0x0111, Group::ifd1,      newTiffThumbData<0x0117, Group::ifd1>     },
-        {    0x0117, Group::ifd1,      newTiffThumbSize<0x0111, Group::ifd1>     },
-        {    0x0201, Group::ifd1,      newTiffThumbData<0x0202, Group::ifd1>     },
-        {    0x0202, Group::ifd1,      newTiffThumbSize<0x0201, Group::ifd1>     },
-        { Tag::next, Group::ifd1,      newTiffDirectory<Group::ifd2>             },
-        {  Tag::all, Group::ifd1,      newTiffEntry                              },
+        {    0x0111, ifd1Id,           newTiffThumbData<0x0117, ifd1Id>          },
+        {    0x0117, ifd1Id,           newTiffThumbSize<0x0111, ifd1Id>          },
+        {    0x0144, ifd1Id,           newTiffImageData<0x0145, ifd1Id>          },
+        {    0x0145, ifd1Id,           newTiffImageSize<0x0144, ifd1Id>          },
+        {    0x014a, ifd1Id,           newTiffSubIfd<subThumb1Id>                },
+        {    0x0201, ifd1Id,           newTiffThumbData<0x0202, ifd1Id>          },
+        {    0x0202, ifd1Id,           newTiffThumbSize<0x0201, ifd1Id>          },
+        { Tag::next, ifd1Id,           newTiffDirectory<ifd2Id>                  },
+        {  Tag::all, ifd1Id,           newTiffEntry                              },
+
+        // Subdir subThumb1
+        {    0x0111, subThumb1Id,      newTiffImageData<0x0117, subThumb1Id>     },
+        {    0x0117, subThumb1Id,      newTiffImageSize<0x0111, subThumb1Id>     },
+        {    0x0144, subThumb1Id,      newTiffImageData<0x0145, subThumb1Id>     },
+        {    0x0145, subThumb1Id,      newTiffImageSize<0x0144, subThumb1Id>     },
+        {    0x0201, subThumb1Id,      newTiffImageData<0x0202, subThumb1Id>     },
+        {    0x0202, subThumb1Id,      newTiffImageSize<0x0201, subThumb1Id>     },
+        { Tag::next, subThumb1Id,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, subThumb1Id,      newTiffEntry                              },
 
         // IFD2 (eg, in Pentax PEF and Canon CR2 files)
-        {    0x0111, Group::ifd2,      newTiffImageData<0x0117, Group::ifd2>     },
-        {    0x0117, Group::ifd2,      newTiffImageSize<0x0111, Group::ifd2>     },
-        {    0x0201, Group::ifd2,      newTiffImageData<0x0202, Group::ifd2>     },
-        {    0x0202, Group::ifd2,      newTiffImageSize<0x0201, Group::ifd2>     },
-        { Tag::next, Group::ifd2,      newTiffDirectory<Group::ifd3>             },
-        {  Tag::all, Group::ifd2,      newTiffEntry                              },
+        {    0x0111, ifd2Id,           newTiffImageData<0x0117, ifd2Id>          },
+        {    0x0117, ifd2Id,           newTiffImageSize<0x0111, ifd2Id>          },
+        {    0x0144, ifd1Id,           newTiffImageData<0x0145, ifd2Id>          },
+        {    0x0145, ifd1Id,           newTiffImageSize<0x0144, ifd2Id>          },
+        {    0x0201, ifd2Id,           newTiffImageData<0x0202, ifd2Id>          },
+        {    0x0202, ifd2Id,           newTiffImageSize<0x0201, ifd2Id>          },
+        { Tag::next, ifd2Id,           newTiffDirectory<ifd3Id>                  },
+        {  Tag::all, ifd2Id,           newTiffEntry                              },
 
         // IFD3 (eg, in Canon CR2 files)
-        {    0x0111, Group::ifd3,      newTiffImageData<0x0117, Group::ifd3>     },
-        {    0x0117, Group::ifd3,      newTiffImageSize<0x0111, Group::ifd3>     },
-        {    0x0201, Group::ifd3,      newTiffImageData<0x0202, Group::ifd3>     },
-        {    0x0202, Group::ifd3,      newTiffImageSize<0x0201, Group::ifd3>     },
-        { Tag::next, Group::ifd3,      newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::ifd3,      newTiffEntry                              },
+        {    0x0111, ifd3Id,           newTiffImageData<0x0117, ifd3Id>          },
+        {    0x0117, ifd3Id,           newTiffImageSize<0x0111, ifd3Id>          },
+        {    0x0144, ifd1Id,           newTiffImageData<0x0145, ifd3Id>          },
+        {    0x0145, ifd1Id,           newTiffImageSize<0x0144, ifd3Id>          },
+        {    0x0201, ifd3Id,           newTiffImageData<0x0202, ifd3Id>          },
+        {    0x0202, ifd3Id,           newTiffImageSize<0x0201, ifd3Id>          },
+        { Tag::next, ifd3Id,           newTiffDirectory<ignoreId>                },
+        {  Tag::all, ifd3Id,           newTiffEntry                              },
 
         // Olympus makernote - some Olympus cameras use Minolta structures
         // Todo: Adding such tags will not work (maybe result in a Minolta makernote), need separate groups
-        {    0x0001, Group::olymp1mn,  EXV_SIMPLE_BINARY_ARRAY(minoCsoCfg)       },
-        {    0x0003, Group::olymp1mn,  EXV_SIMPLE_BINARY_ARRAY(minoCsnCfg)       },
-        { Tag::next, Group::olymp1mn,  newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::olymp1mn,  newTiffEntry                              },
+        {    0x0001, olympusId,        EXV_SIMPLE_BINARY_ARRAY(minoCsoCfg)       },
+        {    0x0003, olympusId,        EXV_SIMPLE_BINARY_ARRAY(minoCsnCfg)       },
+        { Tag::next, olympusId,        newTiffDirectory<ignoreId>                },
+        {  Tag::all, olympusId,        newTiffEntry                              },
 
         // Olympus2 makernote
-        {    0x0001, Group::olymp2mn,  EXV_SIMPLE_BINARY_ARRAY(minoCsoCfg)       },
-        {    0x0003, Group::olymp2mn,  EXV_SIMPLE_BINARY_ARRAY(minoCsnCfg)       },
-        {    0x2010, Group::olymp2mn,  newTiffSubIfd<Group::olympeq>             },
-        {    0x2020, Group::olymp2mn,  newTiffSubIfd<Group::olympcs>             },
-        {    0x2030, Group::olymp2mn,  newTiffSubIfd<Group::olymprd>             },
-        {    0x2031, Group::olymp2mn,  newTiffSubIfd<Group::olymprd2>            },
-        {    0x2040, Group::olymp2mn,  newTiffSubIfd<Group::olympip>             },
-        {    0x2050, Group::olymp2mn,  newTiffSubIfd<Group::olympfi>             },
-        {    0x2100, Group::olymp2mn,  newTiffSubIfd<Group::olympfe1>            },
-        {    0x2200, Group::olymp2mn,  newTiffSubIfd<Group::olympfe2>            },
-        {    0x2300, Group::olymp2mn,  newTiffSubIfd<Group::olympfe3>            },
-        {    0x2400, Group::olymp2mn,  newTiffSubIfd<Group::olympfe4>            },
-        {    0x2500, Group::olymp2mn,  newTiffSubIfd<Group::olympfe5>            },
-        {    0x2600, Group::olymp2mn,  newTiffSubIfd<Group::olympfe6>            },
-        {    0x2700, Group::olymp2mn,  newTiffSubIfd<Group::olympfe7>            },
-        {    0x2800, Group::olymp2mn,  newTiffSubIfd<Group::olympfe8>            },
-        {    0x2900, Group::olymp2mn,  newTiffSubIfd<Group::olympfe9>            },
-        {    0x3000, Group::olymp2mn,  newTiffSubIfd<Group::olympri>             },
-        { Tag::next, Group::olymp2mn,  newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::olymp2mn,  newTiffEntry                              },
+        {    0x0001, olympus2Id,       EXV_SIMPLE_BINARY_ARRAY(minoCsoCfg)       },
+        {    0x0003, olympus2Id,       EXV_SIMPLE_BINARY_ARRAY(minoCsnCfg)       },
+        {    0x2010, olympus2Id,       newTiffSubIfd<olympusEqId>                },
+        {    0x2020, olympus2Id,       newTiffSubIfd<olympusCsId>                },
+        {    0x2030, olympus2Id,       newTiffSubIfd<olympusRdId>                },
+        {    0x2031, olympus2Id,       newTiffSubIfd<olympusRd2Id>               },
+        {    0x2040, olympus2Id,       newTiffSubIfd<olympusIpId>                },
+        {    0x2050, olympus2Id,       newTiffSubIfd<olympusFiId>                },
+        {    0x2100, olympus2Id,       newTiffSubIfd<olympusFe1Id>               },
+        {    0x2200, olympus2Id,       newTiffSubIfd<olympusFe2Id>               },
+        {    0x2300, olympus2Id,       newTiffSubIfd<olympusFe3Id>               },
+        {    0x2400, olympus2Id,       newTiffSubIfd<olympusFe4Id>               },
+        {    0x2500, olympus2Id,       newTiffSubIfd<olympusFe5Id>               },
+        {    0x2600, olympus2Id,       newTiffSubIfd<olympusFe6Id>               },
+        {    0x2700, olympus2Id,       newTiffSubIfd<olympusFe7Id>               },
+        {    0x2800, olympus2Id,       newTiffSubIfd<olympusFe8Id>               },
+        {    0x2900, olympus2Id,       newTiffSubIfd<olympusFe9Id>               },
+        {    0x3000, olympus2Id,       newTiffSubIfd<olympusRiId>                },
+        { Tag::next, olympus2Id,       newTiffDirectory<ignoreId>                },
+        {  Tag::all, olympus2Id,       newTiffEntry                              },
 
         // Olympus2 equipment subdir
-        {  Tag::all, Group::olympeq,   newTiffEntry                              },
+        {  Tag::all, olympusEqId,        newTiffEntry                            },
 
         // Olympus2 camera settings subdir
-        {    0x0101, Group::olympcs,   newTiffImageData<0x0102, Group::olympcs>  },
-        {    0x0102, Group::olympcs,   newTiffImageSize<0x0101, Group::olympcs>  },
-        {  Tag::all, Group::olympcs,   newTiffEntry                              },
+        {    0x0101, olympusCsId,        newTiffImageData<0x0102, olympusCsId>   },
+        {    0x0102, olympusCsId,        newTiffImageSize<0x0101, olympusCsId>   },
+        {  Tag::all, olympusCsId,        newTiffEntry                            },
 
         // Olympus2 raw development subdir
-        {  Tag::all, Group::olymprd,   newTiffEntry                              },
+        {  Tag::all, olympusRdId,        newTiffEntry                            },
 
         // Olympus2 raw development 2 subdir
-        {  Tag::all, Group::olymprd2,  newTiffEntry                              },
+        {  Tag::all, olympusRd2Id,       newTiffEntry                            },
 
         // Olympus2 image processing subdir
-        {  Tag::all, Group::olympip,   newTiffEntry                              },
+        {  Tag::all, olympusIpId,        newTiffEntry                            },
 
         // Olympus2 focus info subdir
-        {  Tag::all, Group::olympfi,   newTiffEntry                              },
+        {  Tag::all, olympusFiId,        newTiffEntry                            },
 
         // Olympus2 FE 1 subdir
-        {  Tag::all, Group::olympfe1,  newTiffEntry                              },
+        {  Tag::all, olympusFe1Id,       newTiffEntry                            },
 
         // Olympus2 FE 2 subdir
-        {  Tag::all, Group::olympfe2,  newTiffEntry                              },
+        {  Tag::all, olympusFe2Id,       newTiffEntry                            },
 
         // Olympus2 FE 3 subdir
-        {  Tag::all, Group::olympfe3,  newTiffEntry                              },
+        {  Tag::all, olympusFe3Id,       newTiffEntry                            },
 
         // Olympus2 FE 4 subdir
-        {  Tag::all, Group::olympfe4,  newTiffEntry                              },
+        {  Tag::all, olympusFe4Id,       newTiffEntry                            },
 
         // Olympus2 FE 5 subdir
-        {  Tag::all, Group::olympfe5,  newTiffEntry                              },
+        {  Tag::all, olympusFe5Id,       newTiffEntry                            },
 
         // Olympus2 FE 6 subdir
-        {  Tag::all, Group::olympfe6,  newTiffEntry                              },
+        {  Tag::all, olympusFe6Id,       newTiffEntry                            },
 
         // Olympus2 FE 7 subdir
-        {  Tag::all, Group::olympfe7,  newTiffEntry                              },
+        {  Tag::all, olympusFe7Id,       newTiffEntry                            },
 
         // Olympus2 FE 8 subdir
-        {  Tag::all, Group::olympfe8,  newTiffEntry                              },
+        {  Tag::all, olympusFe8Id,       newTiffEntry                            },
 
         // Olympus2 FE 9 subdir
-        {  Tag::all, Group::olympfe9,  newTiffEntry                              },
+        {  Tag::all, olympusFe9Id,       newTiffEntry                            },
 
         // Olympus2 Raw Info subdir
-        {  Tag::all, Group::olympri,   newTiffEntry                              },
+        {  Tag::all, olympusRiId,        newTiffEntry                            },
 
         // Fujifilm makernote
-        { Tag::next, Group::fujimn,    newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::fujimn,    newTiffEntry                              },
+        { Tag::next, fujiId,           newTiffDirectory<ignoreId>                },
+        {  Tag::all, fujiId,           newTiffEntry                              },
 
         // Canon makernote
-        {    0x0001, Group::canonmn,   EXV_BINARY_ARRAY(canonCsCfg, canonCsDef)  },
-        {    0x0004, Group::canonmn,   EXV_SIMPLE_BINARY_ARRAY(canonSiCfg)       },
-        {    0x0005, Group::canonmn,   EXV_SIMPLE_BINARY_ARRAY(canonPaCfg)       },
-        {    0x000f, Group::canonmn,   EXV_SIMPLE_BINARY_ARRAY(canonCfCfg)       },
-        {    0x0012, Group::canonmn,   EXV_SIMPLE_BINARY_ARRAY(canonPiCfg)       },
-        {    0x0093, Group::canonmn,   EXV_BINARY_ARRAY(canonFiCfg, canonFiDef)  },
-        { Tag::next, Group::canonmn,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::canonmn,   newTiffEntry                              },
+        {    0x0001, canonId,          EXV_BINARY_ARRAY(canonCsCfg, canonCsDef)  },
+        {    0x0004, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonSiCfg)       },
+        {    0x0005, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonPaCfg)       },
+        {    0x000f, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonCfCfg)       },
+        {    0x0012, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonPiCfg)       },
+        {    0x0093, canonId,          EXV_BINARY_ARRAY(canonFiCfg, canonFiDef)  },
+        {    0x00a0, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonPrCfg)  },
+        { Tag::next, canonId,          newTiffDirectory<ignoreId>                },
+        {  Tag::all, canonId,          newTiffEntry                              },
 
         // Canon makernote composite tags
-        {  Tag::all, Group::canoncs,   newTiffBinaryElement                      },
-        {  Tag::all, Group::canonsi,   newTiffBinaryElement                      },
-        {  Tag::all, Group::canonpa,   newTiffBinaryElement                      },
-        {  Tag::all, Group::canoncf,   newTiffBinaryElement                      },
-        {  Tag::all, Group::canonpi,   newTiffBinaryElement                      },
-        {  Tag::all, Group::canonfi,   newTiffBinaryElement                      },
+        {  Tag::all, canonCsId,        newTiffBinaryElement                      },
+        {  Tag::all, canonSiId,        newTiffBinaryElement                      },
+        {  Tag::all, canonPaId,        newTiffBinaryElement                      },
+        {  Tag::all, canonCfId,        newTiffBinaryElement                      },
+        {  Tag::all, canonPiId,        newTiffBinaryElement                      },
+        {  Tag::all, canonFiId,        newTiffBinaryElement                      },
+        {  Tag::all, canonPrId,        newTiffBinaryElement                      },
 
         // Nikon1 makernote
-        { Tag::next, Group::nikon1mn,  newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::nikon1mn,  newTiffEntry                              },
+        { Tag::next, nikon1Id,         newTiffDirectory<ignoreId>                },
+        {  Tag::all, nikon1Id,         newTiffEntry                              },
 
         // Nikon2 makernote
-        { Tag::next, Group::nikon2mn,  newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::nikon2mn,  newTiffEntry                              },
+        { Tag::next, nikon2Id,         newTiffDirectory<ignoreId>                },
+        {  Tag::all, nikon2Id,         newTiffEntry                              },
 
         // Nikon3 makernote
-        { Tag::next, Group::nikon3mn,  newTiffDirectory<Group::ignr>             },
-        {    0x0011, Group::nikon3mn,  newTiffSubIfd<Group::nikonpv>             },
-        {    0x001f, Group::nikon3mn,  EXV_BINARY_ARRAY(nikonVrCfg, nikonVrDef)  },
-        {    0x0023, Group::nikon3mn,  EXV_BINARY_ARRAY(nikonPcCfg, nikonPcDef)  },
-        {    0x0024, Group::nikon3mn,  EXV_BINARY_ARRAY(nikonWtCfg, nikonWtDef)  },
-        {    0x0025, Group::nikon3mn,  EXV_BINARY_ARRAY(nikonIiCfg, nikonIiDef)  },
-        {    0x0088, Group::nikon3mn,  EXV_BINARY_ARRAY(nikonAfCfg, nikonAfDef)  },
-        {    0x0091, Group::nikon3mn,  EXV_COMPLEX_BINARY_ARRAY(nikonSiSet, nikonSelector) },
-        {    0x0097, Group::nikon3mn,  EXV_COMPLEX_BINARY_ARRAY(nikonCbSet, nikonSelector) },
-        {    0x0098, Group::nikon3mn,  EXV_COMPLEX_BINARY_ARRAY(nikonLdSet, nikonSelector) },
-        {  Tag::all, Group::nikon3mn,  newTiffEntry                              },
+        { Tag::next, nikon3Id,         newTiffDirectory<ignoreId>                },
+        {    0x0011, nikon3Id,         newTiffSubIfd<nikonPvId>                  },
+        {    0x001f, nikon3Id,         EXV_BINARY_ARRAY(nikonVrCfg, nikonVrDef)  },
+        {    0x0023, nikon3Id,         EXV_BINARY_ARRAY(nikonPcCfg, nikonPcDef)  },
+        {    0x0024, nikon3Id,         EXV_BINARY_ARRAY(nikonWtCfg, nikonWtDef)  },
+        {    0x0025, nikon3Id,         EXV_BINARY_ARRAY(nikonIiCfg, nikonIiDef)  },
+        {    0x0088, nikon3Id,         EXV_BINARY_ARRAY(nikonAfCfg, nikonAfDef)  },
+        {    0x0091, nikon3Id,         EXV_COMPLEX_BINARY_ARRAY(nikonSiSet, nikonSelector) },
+        {    0x0097, nikon3Id,         EXV_COMPLEX_BINARY_ARRAY(nikonCbSet, nikonSelector) },
+        {    0x0098, nikon3Id,         EXV_COMPLEX_BINARY_ARRAY(nikonLdSet, nikonSelector) },
+        {    0x00a8, nikon3Id,         EXV_COMPLEX_BINARY_ARRAY(nikonFlSet, nikonSelector) },
+        {    0x00b0, nikon3Id,         EXV_BINARY_ARRAY(nikonMeCfg, nikonMeDef)  },
+        {    0x00b7, nikon3Id,         EXV_BINARY_ARRAY(nikonAf2Cfg, nikonAf2Def)},
+        {    0x00b8, nikon3Id,         EXV_BINARY_ARRAY(nikonFiCfg, nikonFiDef)  },
+        {  Tag::all, nikon3Id,         newTiffEntry                              },
 
         // Nikon3 makernote preview subdir
-        {    0x0201, Group::nikonpv,   newTiffThumbData<0x0202, Group::nikonpv>  },
-        {    0x0202, Group::nikonpv,   newTiffThumbSize<0x0201, Group::nikonpv>  },
-        { Tag::next, Group::nikonpv,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::nikonpv,   newTiffEntry                              },
+        {    0x0201, nikonPvId,        newTiffThumbData<0x0202, nikonPvId>       },
+        {    0x0202, nikonPvId,        newTiffThumbSize<0x0201, nikonPvId>       },
+        { Tag::next, nikonPvId,        newTiffDirectory<ignoreId>                },
+        {  Tag::all, nikonPvId,        newTiffEntry                              },
 
         // Nikon3 vibration reduction
-        {  Tag::all, Group::nikonvr,   newTiffBinaryElement                      },
+        {  Tag::all, nikonVrId,        newTiffBinaryElement                      },
 
         // Nikon3 picture control
-        {  Tag::all, Group::nikonpc,   newTiffBinaryElement                      },
+        {  Tag::all, nikonPcId,        newTiffBinaryElement                      },
 
         // Nikon3 world time
-        {  Tag::all, Group::nikonwt,   newTiffBinaryElement                      },
+        {  Tag::all, nikonWtId,        newTiffBinaryElement                      },
 
         // Nikon3 ISO info
-        {  Tag::all, Group::nikonii,   newTiffBinaryElement                      },
+        {  Tag::all, nikonIiId,        newTiffBinaryElement                      },
 
         // Nikon3 auto focus
-        {  Tag::all, Group::nikonaf,   newTiffBinaryElement                      },
+        {  Tag::all, nikonAfId,        newTiffBinaryElement                      },
+        
+        // Nikon3 auto focus 2
+        {  Tag::all, nikonAf2Id,       newTiffBinaryElement                      },
+        
+        // Nikon3 file info
+        {  Tag::all, nikonFiId,        newTiffBinaryElement                      },
+
+        // Nikon3 multi exposure
+        {  Tag::all, nikonMeId,        newTiffBinaryElement                      },
+
+        // Nikon3 flash info
+        {  Tag::all, nikonFl1Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonFl2Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonFl3Id,       newTiffBinaryElement                      },
 
         // Nikon3 shot info
-        {  Tag::all, Group::nikonsi1,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikonsi2,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikonsi3,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikonsi4,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikonsi5,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikonsi6,  newTiffBinaryElement                      },
+        {  Tag::all, nikonSi1Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonSi2Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonSi3Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonSi4Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonSi5Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonSi6Id,       newTiffBinaryElement                      },
 
         // Nikon3 color balance
-        {  Tag::all, Group::nikoncb1,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikoncb2,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikoncb2a, newTiffBinaryElement                      },
-        {  Tag::all, Group::nikoncb2b, newTiffBinaryElement                      },
-        {  Tag::all, Group::nikoncb3,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikoncb4,  newTiffBinaryElement                      },
+        {  Tag::all, nikonCb1Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonCb2Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonCb2aId,      newTiffBinaryElement                      },
+        {  Tag::all, nikonCb2bId,      newTiffBinaryElement                      },
+        {  Tag::all, nikonCb3Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonCb4Id,       newTiffBinaryElement                      },
 
         // Nikon3 lens data
-        {  Tag::all, Group::nikonld1,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikonld2,  newTiffBinaryElement                      },
-        {  Tag::all, Group::nikonld3,  newTiffBinaryElement                      },
+        {  Tag::all, nikonLd1Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonLd2Id,       newTiffBinaryElement                      },
+        {  Tag::all, nikonLd3Id,       newTiffBinaryElement                      },
 
         // Panasonic makernote
-        { Tag::next, Group::panamn,    newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::panamn,    newTiffEntry                              },
+        { Tag::next, panasonicId,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, panasonicId,      newTiffEntry                              },
 
         // Pentax makernote
-        {    0x0003, Group::pentaxmn,  newTiffThumbSize<0x0004, Group::pentaxmn> },
-        {    0x0004, Group::pentaxmn,  newTiffThumbData<0x0003, Group::pentaxmn> },
-        { Tag::next, Group::pentaxmn,  newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::pentaxmn,  newTiffEntry                              },
+        {    0x0003, pentaxId,         newTiffThumbSize<0x0004, pentaxId>        },
+        {    0x0004, pentaxId,         newTiffThumbData<0x0003, pentaxId>        },
+        { Tag::next, pentaxId,         newTiffDirectory<ignoreId>                },
+        {  Tag::all, pentaxId,         newTiffEntry                              },
+
+        // Samsung2 makernote
+        {    0x0035, samsung2Id,       newTiffSubIfd<samsungPvId>                },
+        { Tag::next, samsung2Id,       newTiffDirectory<ignoreId>                },
+        {  Tag::all, samsung2Id,       newTiffEntry                              },
+
+        // Samsung2 makernote preview subdir
+        {    0x0201, samsungPvId,      newTiffThumbData<0x0202, samsungPvId>     },
+        {    0x0202, samsungPvId,      newTiffThumbSize<0x0201, samsungPvId>     },
+        { Tag::next, samsungPvId,      newTiffDirectory<ignoreId>                },
+        {  Tag::all, samsungPvId,      newTiffEntry                              },
 
         // Sigma/Foveon makernote
-        { Tag::next, Group::sigmamn,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::sigmamn,   newTiffEntry                              },
+        { Tag::next, sigmaId,          newTiffDirectory<ignoreId>                },
+        {  Tag::all, sigmaId,          newTiffEntry                              },
 
         // Sony1 makernote
-        { Tag::next, Group::sony1mn,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::sony1mn,   newTiffEntry                              },
+        {    0x0114, sony1Id,          EXV_COMPLEX_BINARY_ARRAY(sony1CsSet, sonyCsSelector) },
+        {    0xb028, sony1Id,          newTiffSubIfd<sonyMltId>                  },
+        { Tag::next, sony1Id,          newTiffDirectory<ignoreId>                },
+        {  Tag::all, sony1Id,          newTiffEntry                              },
+
+        // Sony1 camera settings
+        {  Tag::all, sony1CsId,        newTiffBinaryElement                      },
+        {  Tag::all, sony1Cs2Id,       newTiffBinaryElement                      },
 
         // Sony2 makernote
-        { Tag::next, Group::sony2mn,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::sony2mn,   newTiffEntry                              },
+        {    0x0114, sony2Id,          EXV_COMPLEX_BINARY_ARRAY(sony2CsSet, sonyCsSelector) },
+        { Tag::next, sony2Id,          newTiffDirectory<ignoreId>                },
+        {  Tag::all, sony2Id,          newTiffEntry                              },
+
+        // Sony2 camera settings
+        {  Tag::all, sony2CsId,        newTiffBinaryElement                      },
+        {  Tag::all, sony2Cs2Id,       newTiffBinaryElement                      },
+
+        // Sony1 Minolta makernote
+        {    0x0001, sonyMltId,        EXV_SIMPLE_BINARY_ARRAY(sony1MCsoCfg)     },
+        {    0x0003, sonyMltId,        EXV_SIMPLE_BINARY_ARRAY(sony1MCsnCfg)     },
+        {    0x0004, sonyMltId,        EXV_BINARY_ARRAY(sony1MCs7Cfg, minoCs7Def)}, // minoCs7Def [sic]
+        {    0x0088, sonyMltId,        newTiffThumbData<0x0089, sonyMltId>       },
+        {    0x0089, sonyMltId,        newTiffThumbSize<0x0088, sonyMltId>       },
+        {    0x0114, sonyMltId,        EXV_BINARY_ARRAY(sony1MCsA100Cfg, sony1MCsA100Def)},
+        { Tag::next, sonyMltId,        newTiffDirectory<ignoreId>                },
+        {  Tag::all, sonyMltId,        newTiffEntry                              },
+
+        // Sony1 Minolta makernote composite tags
+        {  Tag::all, sony1MltCsOldId,  newTiffBinaryElement                      },
+        {  Tag::all, sony1MltCsNewId,  newTiffBinaryElement                      },
+        {  Tag::all, sony1MltCs7DId,   newTiffBinaryElement                      },
+        {  Tag::all, sony1MltCsA100Id, newTiffBinaryElement                      },
 
         // Minolta makernote
-        {    0x0001, Group::minoltamn, EXV_SIMPLE_BINARY_ARRAY(minoCsoCfg)       },
-        {    0x0003, Group::minoltamn, EXV_SIMPLE_BINARY_ARRAY(minoCsnCfg)       },
-        {    0x0004, Group::minoltamn, EXV_BINARY_ARRAY(minoCs7Cfg, minoCs7Def)  },
-        {    0x0088, Group::minoltamn, newTiffThumbData<0x0089, Group::minoltamn>},
-        {    0x0089, Group::minoltamn, newTiffThumbSize<0x0088, Group::minoltamn>},
-        {    0x0114, Group::minoltamn, EXV_BINARY_ARRAY(minoCs5Cfg, minoCs5Def)  },
-        { Tag::next, Group::minoltamn, newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::minoltamn, newTiffEntry                              },
+        {    0x0001, minoltaId,        EXV_SIMPLE_BINARY_ARRAY(minoCsoCfg)       },
+        {    0x0003, minoltaId,        EXV_SIMPLE_BINARY_ARRAY(minoCsnCfg)       },
+        {    0x0004, minoltaId,        EXV_BINARY_ARRAY(minoCs7Cfg, minoCs7Def)  },
+        {    0x0088, minoltaId,        newTiffThumbData<0x0089, minoltaId>       },
+        {    0x0089, minoltaId,        newTiffThumbSize<0x0088, minoltaId>       },
+        {    0x0114, minoltaId,        EXV_BINARY_ARRAY(minoCs5Cfg, minoCs5Def)  },
+        { Tag::next, minoltaId,        newTiffDirectory<ignoreId>                },
+        {  Tag::all, minoltaId,        newTiffEntry                              },
 
         // Minolta makernote composite tags
-        {  Tag::all, Group::minocso,   newTiffBinaryElement                      },
-        {  Tag::all, Group::minocsn,   newTiffBinaryElement                      },
-        {  Tag::all, Group::minocs7,   newTiffBinaryElement                      },
-        {  Tag::all, Group::minocs5,   newTiffBinaryElement                      },
+        {  Tag::all, minoltaCsOldId,   newTiffBinaryElement                      },
+        {  Tag::all, minoltaCsNewId,   newTiffBinaryElement                      },
+        {  Tag::all, minoltaCs7DId,    newTiffBinaryElement                      },
+        {  Tag::all, minoltaCs5DId,    newTiffBinaryElement                      },
 
         // -----------------------------------------------------------------------
         // Root directory of Panasonic RAW images
-        { Tag::pana, Group::none,      newTiffDirectory<Group::panaraw>          },
+        { Tag::pana, ifdIdNotSet,      newTiffDirectory<panaRawId>               },
 
         // IFD0 of Panasonic RAW images
-        {    0x8769, Group::panaraw,   newTiffSubIfd<Group::exif>                },
-        {    0x8825, Group::panaraw,   newTiffSubIfd<Group::gps>                 },
-//        {    0x0111, Group::panaraw,   newTiffImageData<0x0117, Group::panaraw>  },
-//        {    0x0117, Group::panaraw,   newTiffImageSize<0x0111, Group::panaraw>  },
-        { Tag::next, Group::panaraw,   newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::panaraw,   newTiffEntry                              },
+        {    0x8769, panaRawId,        newTiffSubIfd<exifId>                     },
+        {    0x8825, panaRawId,        newTiffSubIfd<gpsId>                      },
+//        {    0x0111, panaRawId,        newTiffImageData<0x0117, panaRawId>       },
+//        {    0x0117, panaRawId,        newTiffImageSize<0x0111, panaRawId>       },
+        { Tag::next, panaRawId,        newTiffDirectory<ignoreId>                },
+        {  Tag::all, panaRawId,        newTiffEntry                              },
 
         // -----------------------------------------------------------------------
         // Tags which are not de/encoded
-        { Tag::next, Group::ignr,      newTiffDirectory<Group::ignr>             },
-        {  Tag::all, Group::ignr,      newTiffEntry                              }
+        { Tag::next, ignoreId,           newTiffDirectory<ignoreId>              },
+        {  Tag::all, ignoreId,           newTiffEntry                            }
     };
 
     // TIFF mapping table for special decoding and encoding requirements
     const TiffMappingInfo TiffMapping::tiffMappingInfo_[] = {
-        { "*",       Tag::all, Group::ignr,    0, 0 }, // Do not decode tags with group == Group::ignr
-        { "*",         0x02bc, Group::ifd0,    &TiffDecoder::decodeXmp,          0 /*done before the tree is traversed*/ },
-        { "*",         0x83bb, Group::ifd0,    &TiffDecoder::decodeIptc,         0 /*done before the tree is traversed*/ },
-        { "*",         0x8649, Group::ifd0,    &TiffDecoder::decodeIptc,         0 /*done before the tree is traversed*/ }
+        { "*",       Tag::all, ignoreId,  0, 0 }, // Do not decode tags with group == ignoreId
+        { "*",         0x02bc, ifd0Id,    &TiffDecoder::decodeXmp,          0 /*done before the tree is traversed*/ },
+        { "*",         0x83bb, ifd0Id,    &TiffDecoder::decodeIptc,         0 /*done before the tree is traversed*/ },
+        { "*",         0x8649, ifd0Id,    &TiffDecoder::decodeIptc,         0 /*done before the tree is traversed*/ }
     };
 
     DecoderFct TiffMapping::findDecoder(const std::string& make,
                                               uint32_t     extendedTag,
-                                              uint16_t     group)
+                                              IfdId        group)
     {
         DecoderFct decoderFct = &TiffDecoder::decodeStdTiffEntry;
         const TiffMappingInfo* td = find(tiffMappingInfo_,
@@ -1194,7 +1693,7 @@
     EncoderFct TiffMapping::findEncoder(
         const std::string& make,
               uint32_t     extendedTag,
-              uint16_t     group
+              IfdId        group
     )
     {
         EncoderFct encoderFct = 0;
@@ -1207,19 +1706,13 @@
         return encoderFct;
     }
 
-    bool TiffGroupStruct::operator==(const TiffGroupStruct::Key& key) const
-    {
-        return    (Tag::all == extendedTag_ || key.e_ == extendedTag_)
-               && key.g_ == group_;
-    }
-
     bool TiffTreeStruct::operator==(const TiffTreeStruct::Key& key) const
     {
         return key.r_ == root_ && key.g_ == group_;
     }
 
     TiffComponent::AutoPtr TiffCreator::create(uint32_t extendedTag,
-                                               uint16_t group)
+                                               IfdId    group)
     {
         TiffComponent::AutoPtr tc(0);
         uint16_t tag = static_cast<uint16_t>(extendedTag & 0xffff);
@@ -1238,7 +1731,7 @@
             }
             std::cerr << "extended tag 0x" << std::setw(4) << std::setfill('0')
                       << std::hex << std::right << extendedTag
-                      << ", group " << tiffGroupName(group) << "\n";
+                      << ", group " << ifdItem(group) << "\n";
         }
 #endif
         return tc;
@@ -1246,7 +1739,7 @@
 
     void TiffCreator::getPath(TiffPath& tiffPath,
                               uint32_t  extendedTag,
-                              uint16_t  group,
+                              IfdId     group,
                               uint32_t  root)
     {
         const TiffTreeStruct* ts = 0;
@@ -1256,7 +1749,7 @@
             assert(ts != 0);
             extendedTag = ts->parentExtTag_;
             group = ts->parentGroup_;
-        } while (!(ts->root_ == root && ts->group_ == Group::none));
+        } while (!(ts->root_ == root && ts->group_ == ifdIdNotSet));
 
     } // TiffCreator::getPath
 
@@ -1312,28 +1805,38 @@
         assert(pHeader);
         assert(pHeader->byteOrder() != invalidByteOrder);
         WriteMethod writeMethod = wmIntrusive;
-        TiffComponent::AutoPtr createdTree;
         TiffComponent::AutoPtr parsedTree = parse(pData, size, root, pHeader);
+        PrimaryGroups primaryGroups;
+        findPrimaryGroups(primaryGroups, parsedTree.get());
         if (0 != parsedTree.get()) {
             // Attempt to update existing TIFF components based on metadata entries
             TiffEncoder encoder(exifData,
                                 iptcData,
                                 xmpData,
                                 parsedTree.get(),
-                                pHeader->byteOrder(),
+                                false,
+                                &primaryGroups,
+                                pHeader,
                                 findEncoderFct);
             parsedTree->accept(encoder);
             if (!encoder.dirty()) writeMethod = wmNonIntrusive;
         }
         if (writeMethod == wmIntrusive) {
-            createdTree = TiffCreator::create(root, Group::none);
+            TiffComponent::AutoPtr createdTree = TiffCreator::create(root, ifdIdNotSet);
+            if (0 != parsedTree.get()) {
+                // Copy image tags from the original image to the composite
+                TiffCopier copier(createdTree.get(), root, pHeader, &primaryGroups);
+                parsedTree->accept(copier);
+            }
+            // Add entries from metadata to composite
             TiffEncoder encoder(exifData,
                                 iptcData,
                                 xmpData,
                                 createdTree.get(),
-                                pHeader->byteOrder(),
+                                parsedTree.get() == 0,
+                                &primaryGroups,
+                                pHeader,
                                 findEncoderFct);
-            // Add entries from metadata to composite
             encoder.add(createdTree.get(), parsedTree.get(), root);
             // Write binary representation from the composite tree
             DataBuf header = pHeader->write();
@@ -1371,7 +1874,7 @@
         if (!pHeader->read(pData, size) || pHeader->offset() >= size) {
             throw Error(3, "TIFF");
         }
-        TiffComponent::AutoPtr rootDir = TiffCreator::create(root, Group::none);
+        TiffComponent::AutoPtr rootDir = TiffCreator::create(root, ifdIdNotSet);
         if (0 != rootDir.get()) {
             rootDir->setStart(pData + pHeader->offset());
             TiffRwState::AutoPtr state(
@@ -1384,6 +1887,41 @@
 
     } // TiffParserWorker::parse
 
+    void TiffParserWorker::findPrimaryGroups(PrimaryGroups& primaryGroups,
+                                             TiffComponent* pSourceDir)
+    {
+        if (0 == pSourceDir) return;
+
+        const IfdId imageGroups[] = {
+            ifd0Id,
+            ifd1Id,
+            ifd2Id,
+            ifd3Id,
+            subImage1Id,
+            subImage2Id,
+            subImage3Id,
+            subImage4Id,
+            subImage5Id,
+            subImage6Id,
+            subImage7Id,
+            subImage8Id,
+            subImage9Id
+        };
+
+        for (unsigned int i = 0; i < EXV_COUNTOF(imageGroups); ++i) {
+            TiffFinder finder(0x00fe, imageGroups[i]);
+            pSourceDir->accept(finder);
+            TiffEntryBase* te = dynamic_cast<TiffEntryBase*>(finder.result());
+            if (   te
+                && te->pValue()->typeId() == unsignedLong
+                && te->pValue()->count() == 1
+                && (te->pValue()->toLong() & 1) == 0) {
+                primaryGroups.push_back(te->group());
+            }
+        }
+
+    } // TiffParserWorker::findPrimaryGroups
+
     TiffHeaderBase::TiffHeaderBase(uint16_t  tag,
                                    uint32_t  size,
                                    ByteOrder byteOrder,
@@ -1484,8 +2022,16 @@
         return tag_;
     }
 
-    TiffHeader::TiffHeader(ByteOrder byteOrder, uint32_t offset)
-        : TiffHeaderBase(42, 8, byteOrder, offset)
+    bool TiffHeaderBase::isImageTag(      uint16_t       /*tag*/,
+                                          IfdId          /*group*/,
+                                    const PrimaryGroups* /*primaryGroups*/) const
+    {
+        return false;
+    }
+
+    TiffHeader::TiffHeader(ByteOrder byteOrder, uint32_t offset, bool hasImageTags)
+        : TiffHeaderBase(42, 8, byteOrder, offset),
+          hasImageTags_(hasImageTags)
     {
     }
 
@@ -1493,4 +2039,121 @@
     {
     }
 
+    bool TiffHeader::isImageTag(      uint16_t       tag,
+                                      IfdId          group,
+                                const PrimaryGroups* pPrimaryGroups) const
+    {
+        //! List of TIFF image tags
+        static const TiffImgTagStruct tiffImageTags[] = {
+            { 0x00fe, ifd0Id }, // Exif.Image.NewSubfileType
+            { 0x00ff, ifd0Id }, // Exif.Image.SubfileType
+            { 0x0100, ifd0Id }, // Exif.Image.ImageWidth
+            { 0x0101, ifd0Id }, // Exif.Image.ImageLength
+            { 0x0102, ifd0Id }, // Exif.Image.BitsPerSample
+            { 0x0103, ifd0Id }, // Exif.Image.Compression
+            { 0x0106, ifd0Id }, // Exif.Image.PhotometricInterpretation
+            { 0x010a, ifd0Id }, // Exif.Image.FillOrder
+            { 0x0111, ifd0Id }, // Exif.Image.StripOffsets
+            { 0x0115, ifd0Id }, // Exif.Image.SamplesPerPixel
+            { 0x0116, ifd0Id }, // Exif.Image.RowsPerStrip
+            { 0x0117, ifd0Id }, // Exif.Image.StripByteCounts
+            { 0x011a, ifd0Id }, // Exif.Image.XResolution
+            { 0x011b, ifd0Id }, // Exif.Image.YResolution
+            { 0x011c, ifd0Id }, // Exif.Image.PlanarConfiguration
+            { 0x0122, ifd0Id }, // Exif.Image.GrayResponseUnit
+            { 0x0123, ifd0Id }, // Exif.Image.GrayResponseCurve
+            { 0x0124, ifd0Id }, // Exif.Image.T4Options
+            { 0x0125, ifd0Id }, // Exif.Image.T6Options
+            { 0x0128, ifd0Id }, // Exif.Image.ResolutionUnit
+            { 0x012d, ifd0Id }, // Exif.Image.TransferFunction
+            { 0x013d, ifd0Id }, // Exif.Image.Predictor
+            { 0x013e, ifd0Id }, // Exif.Image.WhitePoint
+            { 0x013f, ifd0Id }, // Exif.Image.PrimaryChromaticities
+            { 0x0140, ifd0Id }, // Exif.Image.ColorMap
+            { 0x0141, ifd0Id }, // Exif.Image.HalftoneHints
+            { 0x0142, ifd0Id }, // Exif.Image.TileWidth
+            { 0x0143, ifd0Id }, // Exif.Image.TileLength
+            { 0x0144, ifd0Id }, // Exif.Image.TileOffsets
+            { 0x0145, ifd0Id }, // Exif.Image.TileByteCounts
+            { 0x014c, ifd0Id }, // Exif.Image.InkSet
+            { 0x014d, ifd0Id }, // Exif.Image.InkNames
+            { 0x014e, ifd0Id }, // Exif.Image.NumberOfInks
+            { 0x0150, ifd0Id }, // Exif.Image.DotRange
+            { 0x0151, ifd0Id }, // Exif.Image.TargetPrinter
+            { 0x0152, ifd0Id }, // Exif.Image.ExtraSamples
+            { 0x0153, ifd0Id }, // Exif.Image.SampleFormat
+            { 0x0154, ifd0Id }, // Exif.Image.SMinSampleValue
+            { 0x0155, ifd0Id }, // Exif.Image.SMaxSampleValue
+            { 0x0156, ifd0Id }, // Exif.Image.TransferRange
+            { 0x0157, ifd0Id }, // Exif.Image.ClipPath
+            { 0x0158, ifd0Id }, // Exif.Image.XClipPathUnits
+            { 0x0159, ifd0Id }, // Exif.Image.YClipPathUnits
+            { 0x015a, ifd0Id }, // Exif.Image.Indexed
+            { 0x015b, ifd0Id }, // Exif.Image.JPEGTables
+            { 0x0200, ifd0Id }, // Exif.Image.JPEGProc
+            { 0x0201, ifd0Id }, // Exif.Image.JPEGInterchangeFormat
+            { 0x0202, ifd0Id }, // Exif.Image.JPEGInterchangeFormatLength
+            { 0x0203, ifd0Id }, // Exif.Image.JPEGRestartInterval
+            { 0x0205, ifd0Id }, // Exif.Image.JPEGLosslessPredictors
+            { 0x0206, ifd0Id }, // Exif.Image.JPEGPointTransforms
+            { 0x0207, ifd0Id }, // Exif.Image.JPEGQTables
+            { 0x0208, ifd0Id }, // Exif.Image.JPEGDCTables
+            { 0x0209, ifd0Id }, // Exif.Image.JPEGACTables
+            { 0x0211, ifd0Id }, // Exif.Image.YCbCrCoefficients
+            { 0x0212, ifd0Id }, // Exif.Image.YCbCrSubSampling
+            { 0x0213, ifd0Id }, // Exif.Image.YCbCrPositioning
+            { 0x0214, ifd0Id }, // Exif.Image.ReferenceBlackWhite
+            { 0x828d, ifd0Id }, // Exif.Image.CFARepeatPatternDim
+            { 0x828e, ifd0Id }, // Exif.Image.CFAPattern
+            { 0x8773, ifd0Id }, // Exif.Image.InterColorProfile
+            { 0x8824, ifd0Id }, // Exif.Image.SpectralSensitivity
+            { 0x8828, ifd0Id }, // Exif.Image.OECF
+            { 0x9102, ifd0Id }, // Exif.Image.CompressedBitsPerPixel
+            { 0x9217, ifd0Id }, // Exif.Image.SensingMethod
+        };
+
+        if (!hasImageTags_) {
+#ifdef DEBUG
+            std::cerr << "No image tags in this image\n";
+#endif
+            return false;
+        }
+#ifdef DEBUG
+        ExifKey key(tag, ifdItem(group));
+#endif
+        // If there are primary groups and none matches group, we're done
+        if (   pPrimaryGroups != 0
+            && !pPrimaryGroups->empty()
+            && std::find(pPrimaryGroups->begin(), pPrimaryGroups->end(), group)
+               == pPrimaryGroups->end()) {
+#ifdef DEBUG
+            std::cerr << "Not an image tag: " << key << " (1)\n";
+#endif
+            return false;
+        }
+        // All tags of marked primary groups other than IFD0 are considered
+        // image tags. That should take care of NEFs until we know better.
+        if (   pPrimaryGroups != 0
+            && !pPrimaryGroups->empty()
+            && group != ifd0Id) {
+#ifdef DEBUG
+            ExifKey key(tag, ifdItem(group));
+            std::cerr << "Image tag: " << key << " (2)\n";
+#endif
+            return true;
+        }
+        // If tag, group is one of the image tags listed above -> bingo!
+        if (find(tiffImageTags, TiffImgTagStruct::Key(tag, group))) {
+#ifdef DEBUG
+            ExifKey key(tag, ifdItem(group));
+            std::cerr << "Image tag: " << key << " (3)\n";
+#endif
+            return true;
+        }
+#ifdef DEBUG
+        std::cerr << "Not an image tag: " << key << " (4)\n";
+#endif
+        return false;
+    }
+
 }}                                       // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/tiffimage.hpp exiv2-0.21/src/tiffimage.hpp
--- exiv2-0.19/src/tiffimage.hpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/tiffimage.hpp	2010-11-21 15:06:26.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    tiffimage.hpp
   @brief   Class TiffImage
-  @version $Rev: 1977 $
+  @version $Rev: 2377 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    15-Mar-06, ahu: created
@@ -48,6 +48,12 @@
     // Add TIFF to the supported image formats
     namespace ImageType {
         const int tiff = 4;          //!< TIFF image type (see class TiffImage)
+        const int dng = 4;           //!< DNG image type (see class TiffImage)
+        const int nef = 4;           //!< NEF image type (see class TiffImage)
+        const int pef = 4;           //!< PEF image type (see class TiffImage)
+        const int arw = 4;           //!< ARW image type (see class TiffImage)
+        const int sr2 = 4;           //!< SR2 image type (see class TiffImage)
+        const int srw = 4;           //!< SRW image type (see class TiffImage)
     }
 
     /*!
@@ -109,6 +115,13 @@
         std::string primaryGroup() const;
         //@}
 
+    private:
+        // DATA
+        mutable std::string primaryGroup_;     //!< The primary group
+        mutable std::string mimeType_;         //!< The MIME type
+        mutable int pixelWidth_;               //!< Width of the primary image in pixels 
+        mutable int pixelHeight_;              //!< Height of the primary image in pixels 
+
     }; // class TiffImage
 
     /*!
diff -Nru exiv2-0.19/src/tiffimage_int.hpp exiv2-0.21/src/tiffimage_int.hpp
--- exiv2-0.19/src/tiffimage_int.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/tiffimage_int.hpp	2010-08-30 19:33:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    tiffimage_int.hpp
   @brief   Internal class TiffParserWorker to parse TIFF data.
-  @version $Rev: 1937 $
+  @version $Rev: 2336 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    23-Apr-08, ahu: created
@@ -32,7 +32,9 @@
 // *****************************************************************************
 // included header files
 #include "tifffwd_int.hpp"
+#include "tiffcomposite_int.hpp"
 #include "image.hpp"
+#include "tags_int.hpp"
 #include "types.hpp"
 
 // + standard includes
@@ -108,8 +110,25 @@
         virtual uint32_t offset() const;
         //! Return the size (in bytes) of the image header.
         virtual uint32_t size() const;
-        //! Return the tag value (magic number) which identifies the buffer as TIFF data
+        //! Return the tag value (magic number) which identifies the buffer as TIFF data.
         virtual uint16_t tag() const;
+        /*!
+          @brief Return \c true if the %Exif \em tag from \em group is an image tag.
+
+          Certain tags of TIFF and TIFF-like images are required to correctly
+          display the primary image. These image tags contain image data rather
+          than metadata.
+
+          @param tag Tag number.
+          @param group Group identifier.
+          @param pPrimaryGroups Pointer to a list of TIFF groups that contain
+                 primary images, empty if none are marked.
+
+          @return The default implementation returns \c false.
+         */
+        virtual bool isImageTag(      uint16_t       tag,
+                                      IfdId          group,
+                                const PrimaryGroups* pPrimaryGroups) const;
         //@}
 
     private:
@@ -129,38 +148,75 @@
         //! @name Creators
         //@{
         //! Default constructor
-        TiffHeader(ByteOrder byteOrder =littleEndian,
-                   uint32_t  offset    =0x00000008);
+        TiffHeader(ByteOrder byteOrder    =littleEndian,
+                   uint32_t  offset       =0x00000008,
+                   bool      hasImageTags =true);
         //! Destructor
         ~TiffHeader();
         //@}
+        //@{
+        //! @name Accessors
+        bool isImageTag(      uint16_t       tag,
+                              IfdId          group,
+                        const PrimaryGroups* pPrimaryGroups) const;
+        //@}
+
+    private:
+        // DATA
+        bool           hasImageTags_;   //!< Indicates if image tags are supported
     }; // class TiffHeader
 
     /*!
+      @brief Data structure used to list image tags for TIFF and TIFF-like images.
+     */
+    struct TiffImgTagStruct {
+        //! Search key for TIFF image tag structure.
+        struct Key {
+            //! Constructor
+            Key(uint16_t t, IfdId g) : t_(t), g_(g) {}
+            uint16_t t_;                    //!< %Tag
+            IfdId    g_;                    //!< %Group
+        };
+
+        //! Comparison operator to compare a TiffImgTagStruct with a TiffImgTagStruct::Key
+        bool operator==(const Key& key) const
+        {
+            return key.g_ == group_ && key.t_ == tag_;
+        }
+
+        // DATA
+        uint16_t       tag_;            //!< Image tag
+        IfdId          group_;          //!< Group that contains the image tag
+    }; // struct TiffImgTagStruct
+
+    /*!
       @brief Data structure used as a row (element) of a table (array)
              defining the TIFF component used for each tag in a group.
      */
     struct TiffGroupStruct {
-        struct Key;
+        //! Search key for TIFF group structure.
+        struct Key {
+            //! Constructor
+            Key(uint32_t e, IfdId g) : e_(e), g_(g) {}
+            uint32_t e_;                    //!< Extended tag
+            IfdId    g_;                    //!< %Group
+        };
+
         //! Comparison operator to compare a TiffGroupStruct with a TiffGroupStruct::Key
-        bool operator==(const Key& key) const;
+        bool operator==(const Key& key) const
+        {
+            return    key.g_ == group_
+                   && (Tag::all == extendedTag_ || key.e_ == extendedTag_);
+        }
         //! Return the tag corresponding to the extended tag
         uint16_t tag() const { return static_cast<uint16_t>(extendedTag_ & 0xffff); }
 
         // DATA
         uint32_t       extendedTag_;    //!< Tag (32 bit so that it can contain special tags)
-        uint16_t       group_;          //!< Group that contains the tag
+        IfdId          group_;          //!< Group that contains the tag
         NewTiffCompFct newTiffCompFct_; //!< Function to create the correct TIFF component
     };
 
-    //! Search key for TIFF group structure.
-    struct TiffGroupStruct::Key {
-        //! Constructor
-        Key(uint32_t e, uint16_t g) : e_(e), g_(g) {}
-        uint32_t e_;                    //!< Extended tag
-        uint16_t g_;                    //!< %Group
-    };
-
     /*!
       @brief Data structure used as a row of the table which describes TIFF trees.
              Multiple trees are needed as TIFF-based RAW image formats do not always
@@ -173,17 +229,17 @@
 
         // DATA
         uint32_t       root_;           //!< Tree root element, identifies a tree
-        uint16_t       group_;          //!< Each group is a node in the tree
-        uint16_t       parentGroup_;    //!< Parent group
+        IfdId          group_;          //!< Each group is a node in the tree
+        IfdId          parentGroup_;    //!< Parent group
         uint32_t       parentExtTag_;   //!< Parent tag (32 bit so that it can contain special tags)
     };
 
     //! Search key for TIFF tree structure.
     struct TiffTreeStruct::Key {
         //! Constructor
-        Key(uint32_t r, uint16_t g) : r_(r), g_(g) {}
+        Key(uint32_t r, IfdId g) : r_(r), g_(g) {}
         uint32_t r_;                    //!< Root
-        uint16_t g_;                    //!< %Group
+        IfdId    g_;                    //!< %Group
     };
 
     /*!
@@ -198,7 +254,7 @@
                  is 0, then the TIFF entry should be ignored.
         */
         static std::auto_ptr<TiffComponent> create(uint32_t extendedTag,
-                                                   uint16_t group);
+                                                   IfdId    group);
         /*!
           @brief Get the path, i.e., a list of extended tag and group pairs, from
                  the \em root TIFF element to the TIFF entry \em extendedTag and
@@ -206,7 +262,7 @@
         */
         static void getPath(TiffPath& tiffPath,
                             uint32_t  extendedTag,
-                            uint16_t  group,
+                            IfdId     group,
                             uint32_t  root);
 
     private:
@@ -251,7 +307,8 @@
                   uint32_t           size,
                   uint32_t           root,
                   FindDecoderFct     findDecoderFct,
-                  TiffHeaderBase*    pHeader =0);
+                  TiffHeaderBase*    pHeader =0
+        );
         /*!
           @brief Encode TIFF metadata from the metadata containers into a
                  memory block \em blob.
@@ -288,11 +345,23 @@
                            composite structure. If \em pData is 0 or \em size
                            is 0, the return value is a 0 pointer.
          */
-        static std::auto_ptr<TiffComponent>
-        parse(const byte*              pData,
-                    uint32_t           size,
-                    uint32_t           root,
-                    TiffHeaderBase*    pHeader);
+        static std::auto_ptr<TiffComponent> parse(
+            const byte*              pData,
+                  uint32_t           size,
+                  uint32_t           root,
+                  TiffHeaderBase*    pHeader
+        );
+        /*!
+          @brief Find primary groups in the source tree provided and populate
+                 the list of primary groups.
+
+          @param primaryGroups List of primary groups which is populated
+          @param pSourceDir Pointer to the source composite tree to search (may be 0)
+         */
+        static void findPrimaryGroups(
+            PrimaryGroups& primaryGroups,
+            TiffComponent* pSourceDir
+        );
 
     }; // class TiffParserWorker
 
@@ -319,7 +388,7 @@
          */
         static DecoderFct findDecoder(const std::string& make,
                                             uint32_t     extendedTag,
-                                            uint16_t     group);
+                                            IfdId        group);
         /*!
           @brief Find special encoder function for a key.
 
@@ -336,7 +405,7 @@
         static EncoderFct findEncoder(
             const std::string& make,
                   uint32_t     extendedTag,
-                  uint16_t     group
+                  IfdId        group
         );
 
     private:
@@ -344,16 +413,17 @@
 
     }; // class TiffMapping
 
+    // Todo: Move this class to metadatum_int.hpp or tags_int.hpp
     //! Unary predicate that matches an Exifdatum with a given IfdId.
     class FindExifdatum {
     public:
         //! Constructor, initializes the object with the IfdId to look for.
-        FindExifdatum(Exiv2::IfdId ifdId) : ifdId_(ifdId) {}
+        FindExifdatum(Exiv2::Internal::IfdId ifdId) : ifdId_(ifdId) {}
         //! Returns true if IFD id matches.
         bool operator()(const Exiv2::Exifdatum& md) const { return ifdId_ == md.ifdId(); }
 
     private:
-        Exiv2::IfdId ifdId_;
+        Exiv2::Internal::IfdId ifdId_;
 
     }; // class FindExifdatum
 
diff -Nru exiv2-0.19/src/tiffvisitor.cpp exiv2-0.21/src/tiffvisitor.cpp
--- exiv2-0.19/src/tiffvisitor.cpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/tiffvisitor.cpp	2010-09-21 15:45:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      tiffvisitor.cpp
-  Version:   $Rev: 1977 $
+  Version:   $Rev: 2353 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   11-Apr-06, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: tiffvisitor.cpp 1977 2009-12-28 14:47:58Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: tiffvisitor.cpp 2353 2010-09-21 15:45:07Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -59,12 +59,12 @@
     class FindExifdatum2 {
     public:
         //! Constructor, initializes the object with the group and index to look for.
-        FindExifdatum2(uint16_t group, int idx)
-            : groupName_(Exiv2::Internal::tiffGroupName(group)), idx_(idx) {}
+        FindExifdatum2(Exiv2::Internal::IfdId group, int idx)
+            : groupName_(Exiv2::Internal::groupName(group)), idx_(idx) {}
         //! Returns true if group and index match.
         bool operator()(const Exiv2::Exifdatum& md) const
         {
-            return idx_ == md.idx() && 0 == strcmp(md.ifdItem().c_str(), groupName_);
+            return idx_ == md.idx() && 0 == strcmp(md.groupName().c_str(), groupName_);
         }
 
     private:
@@ -127,7 +127,7 @@
     {
     }
 
-    void TiffFinder::init(uint16_t tag, uint16_t group)
+    void TiffFinder::init(uint16_t tag, IfdId group)
     {
         tag_ = tag;
         group_ = group;
@@ -197,6 +197,91 @@
         findObject(object);
     }
 
+    TiffCopier::TiffCopier(      TiffComponent*  pRoot,
+                                 uint32_t        root,
+                           const TiffHeaderBase* pHeader,
+                           const PrimaryGroups*  pPrimaryGroups)
+        : pRoot_(pRoot),
+          root_(root),
+          pHeader_(pHeader),
+          pPrimaryGroups_(pPrimaryGroups)
+    {
+        assert(pRoot_ != 0);
+        assert(pHeader_ != 0);
+        assert(pPrimaryGroups_ != 0);
+    }
+
+    TiffCopier::~TiffCopier()
+    {
+    }
+
+    void TiffCopier::copyObject(TiffComponent* object)
+    {
+        assert(object != 0);
+
+        if (pHeader_->isImageTag(object->tag(), object->group(), pPrimaryGroups_)) {
+            TiffComponent::AutoPtr clone = object->clone();
+            // Assumption is that the corresponding TIFF entry doesn't exist
+            TiffPath tiffPath;
+            TiffCreator::getPath(tiffPath, object->tag(), object->group(), root_);
+            pRoot_->addPath(object->tag(), tiffPath, pRoot_, clone);
+#ifdef DEBUG
+            ExifKey key(object->tag(), groupName(object->group()));
+            std::cerr << "Copied " << key << "\n";
+#endif
+        }
+    }
+
+    void TiffCopier::visitEntry(TiffEntry* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitDataEntry(TiffDataEntry* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitImageEntry(TiffImageEntry* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitSizeEntry(TiffSizeEntry* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitDirectory(TiffDirectory* /*object*/)
+    {
+        // Do not copy directories (avoids problems with SubIfds)
+    }
+
+    void TiffCopier::visitSubIfd(TiffSubIfd* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitMnEntry(TiffMnEntry* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitIfdMakernote(TiffIfdMakernote* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitBinaryArray(TiffBinaryArray* object)
+    {
+        copyObject(object);
+    }
+
+    void TiffCopier::visitBinaryElement(TiffBinaryElement* object)
+    {
+        copyObject(object);
+    }
+
     TiffDecoder::TiffDecoder(
         ExifData&            exifData,
         IptcData&            iptcData,
@@ -218,7 +303,7 @@
         xmpData_.clear();
 
         // Find camera make
-        TiffFinder finder(0x010f, Group::ifd0);
+        TiffFinder finder(0x010f, ifd0Id);
         pRoot_->accept(finder);
         TiffEntryBase* te = dynamic_cast<TiffEntryBase*>(finder.result());
         if (te && te->pValue()) {
@@ -287,7 +372,7 @@
     void TiffDecoder::getObjData(byte const*& pData,
                                  long& size,
                                  uint16_t tag,
-                                 uint16_t group,
+                                 IfdId group,
                                  const TiffEntryBase* object)
     {
         if (object && object->tag() == tag && object->group() == group) {
@@ -312,21 +397,21 @@
 
         byte const* pData = 0;
         long size = 0;
-        getObjData(pData, size, 0x02bc, Group::ifd0, object);
+        getObjData(pData, size, 0x02bc, ifd0Id, object);
         if (pData) {
             std::string xmpPacket;
             xmpPacket.assign(reinterpret_cast<const char*>(pData), size);
             std::string::size_type idx = xmpPacket.find_first_of('<');
             if (idx != std::string::npos && idx > 0) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Removing " << static_cast<unsigned long>(idx)
-						  << " characters from the beginning of the XMP packet\n";
+                EXV_WARNING << "Removing " << static_cast<unsigned long>(idx)
+                            << " characters from the beginning of the XMP packet\n";
 #endif
                 xmpPacket = xmpPacket.substr(idx);
             }
             if (XmpParser::decode(xmpData_, xmpPacket)) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Failed to decode XMP metadata.\n";
+                EXV_WARNING << "Failed to decode XMP metadata.\n";
 #endif
             }
         }
@@ -346,15 +431,15 @@
         // 1st choice: IPTCNAA
         byte const* pData = 0;
         long size = 0;
-        getObjData(pData, size, 0x83bb, Group::ifd0, object);
+        getObjData(pData, size, 0x83bb, ifd0Id, object);
         if (pData) {
             if (0 == IptcParser::decode(iptcData_, pData, size)) {
                 return;
             }
 #ifndef SUPPRESS_WARNINGS
             else {
-                std::cerr << "Warning: Failed to decode IPTC block found in "
-                          << "Directory Image, entry 0x83bb\n";
+                EXV_WARNING << "Failed to decode IPTC block found in "
+                            << "Directory Image, entry 0x83bb\n";
             }
 #endif
         }
@@ -363,7 +448,7 @@
         // ImageResources
         pData = 0;
         size = 0;
-        getObjData(pData, size, 0x8649, Group::ifd0, object);
+        getObjData(pData, size, 0x8649, ifd0Id, object);
         if (pData) {
             byte const* record = 0;
             uint32_t sizeHdr = 0;
@@ -377,8 +462,8 @@
             }
 #ifndef SUPPRESS_WARNINGS
             else {
-                std::cerr << "Warning: Failed to decode IPTC block found in "
-                          << "Directory Image, entry 0x8649\n";
+                EXV_WARNING << "Failed to decode IPTC block found in "
+                            << "Directory Image, entry 0x8649\n";
             }
 #endif
         }
@@ -403,9 +488,7 @@
     void TiffDecoder::decodeStdTiffEntry(const TiffEntryBase* object)
     {
         assert(object != 0);
-        // Todo: ExifKey should have an appropriate c'tor, it should not be
-        //       necessary to use groupName here
-        ExifKey key(object->tag(), tiffGroupName(object->group()));
+        ExifKey key(object->tag(), groupName(object->group()));
         key.setIdx(object->idx());
         exifData_.add(key, object->pValue());
 
@@ -428,22 +511,30 @@
             const IptcData&      iptcData,
             const XmpData&       xmpData,
                   TiffComponent* pRoot,
-                  ByteOrder      byteOrder,
+            const bool           isNewImage,
+            const PrimaryGroups* pPrimaryGroups,
+            const TiffHeaderBase* pHeader,
                   FindEncoderFct findEncoderFct
     )
         : exifData_(exifData),
           iptcData_(iptcData),
           xmpData_(xmpData),
           del_(true),
+          pHeader_(pHeader),
           pRoot_(pRoot),
-          pSourceTree_(0),
-          byteOrder_(byteOrder),
-          origByteOrder_(byteOrder),
+          isNewImage_(isNewImage),
+          pPrimaryGroups_(pPrimaryGroups),
+          pSourceTree_(0),          
           findEncoderFct_(findEncoderFct),
           dirty_(false),
           writeMethod_(wmNonIntrusive)
     {
         assert(pRoot != 0);
+        assert(pPrimaryGroups != 0);
+        assert(pHeader != 0);
+
+        byteOrder_ = pHeader->byteOrder();
+        origByteOrder_ = byteOrder_;
 
         encodeIptc();
         encodeXmp();
@@ -455,7 +546,7 @@
             make_ = pos->toString();
         }
         if (make_.empty() && pRoot_) {
-            TiffFinder finder(0x010f, Group::ifd0);
+            TiffFinder finder(0x010f, ifd0Id);
             pRoot_->accept(finder);
             TiffEntryBase* te = dynamic_cast<TiffEntryBase*>(finder.result());
             if (te && te->pValue()) {
@@ -533,7 +624,7 @@
         std::string xmpPacket;
         if (XmpParser::encode(xmpPacket, xmpData_) > 1) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: Failed to encode XMP metadata.\n";
+            EXV_ERROR << "Failed to encode XMP metadata.\n";
 #endif
         }
         if (!xmpPacket.empty()) {
@@ -632,7 +723,7 @@
         }
         else if (del_) {
             // The makernote is made up of decoded tags, delete binary tag
-            ExifKey key(object->tag(), tiffGroupName(object->group()));
+            ExifKey key(object->tag(), groupName(object->group()));
             ExifData::iterator pos = exifData_.findKey(key);
             if (pos != exifData_.end()) exifData_.erase(pos);
         }
@@ -711,6 +802,14 @@
         byteOrder_ = boOrig;
     }
 
+    bool TiffEncoder::isImageTag(uint16_t tag, IfdId group) const
+    {
+        if (!isNewImage_ && pHeader_->isImageTag(tag, group, pPrimaryGroups_)) {
+            return true;
+        }
+        return false;
+    }
+
     void TiffEncoder::encodeTiffComponent(
               TiffEntryBase* object,
         const Exifdatum*     datum
@@ -718,11 +817,15 @@
     {
         assert(object != 0);
 
+        // Skip image tags of existing TIFF image - they were copied earlier -
+        // but add and encode image tags of new images (creation)
+        if (isImageTag(object->tag(), object->group())) return;
+
         ExifData::iterator pos = exifData_.end();
         const Exifdatum* ed = datum;
         if (ed == 0) {
             // Non-intrusive writing: find matching tag
-            ExifKey key(object->tag(), tiffGroupName(object->group()));
+            ExifKey key(object->tag(), groupName(object->group()));
             pos = exifData_.findKey(key);
             if (pos != exifData_.end()) {
                 ed = &(*pos);
@@ -789,7 +892,7 @@
             if (  object->sizeDataArea_
                 < static_cast<uint32_t>(object->pValue()->sizeDataArea())) {
 #ifdef DEBUG
-                ExifKey key(object->tag(), tiffGroupName(object->group()));
+                ExifKey key(object->tag(), groupName(object->group()));
                 std::cerr << "DATAAREA GREW     " << key << "\n";
 #endif
                 setDirty();
@@ -797,7 +900,7 @@
             else {
                 // Write the new dataarea, fill with 0x0
 #ifdef DEBUG
-                ExifKey key(object->tag(), tiffGroupName(object->group()));
+                ExifKey key(object->tag(), groupName(object->group()));
                 std::cerr << "Writing data area for " << key << "\n";
 #endif
                 DataBuf buf = object->pValue()->dataArea();
@@ -834,12 +937,12 @@
             std::cerr << "\t DATAAREA IS SET (INTRUSIVE WRITING)";
 #endif
             // Set pseudo strips (without a data pointer) from the size tag
-            ExifKey key(object->szTag(), tiffGroupName(object->szGroup()));
+            ExifKey key(object->szTag(), groupName(object->szGroup()));
             ExifData::const_iterator pos = exifData_.findKey(key);
             const byte* zero = 0;
             if (pos == exifData_.end()) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Error: Size tag " << key
+                EXV_ERROR << "Size tag " << key
                           << " not found. Writing only one strip.\n";
 #endif
                 object->strips_.clear();
@@ -855,8 +958,8 @@
                 }
                 if (sizeTotal != sizeDataArea) {
 #ifndef SUPPRESS_WARNINGS
-                    ExifKey key2(object->tag(), tiffGroupName(object->group()));
-                    std::cerr << "Error: Sum of all sizes of " << key
+                    ExifKey key2(object->tag(), groupName(object->group()));
+                    EXV_ERROR << "Sum of all sizes of " << key
                               << " != data size of " << key2 << ". "
                               << "This results in an invalid image.\n";
 #endif
@@ -880,8 +983,8 @@
             }
 #ifndef SUPPRESS_WARNINGS
             else {
-                ExifKey key2(object->tag(), tiffGroupName(object->group()));
-                std::cerr << "Warning: No image data to encode " << key2 << ".\n";
+                ExifKey key2(object->tag(), groupName(object->group()));
+                EXV_WARNING << "No image data to encode " << key2 << ".\n";
             }
 #endif
         }
@@ -921,7 +1024,7 @@
         }
         object->updateValue(datum->getValue(), byteOrder()); // clones the value
 #ifdef DEBUG
-        ExifKey key(object->tag(), tiffGroupName(object->group()));
+        ExifKey key(object->tag(), groupName(object->group()));
         std::cerr << "UPDATING DATA     " << key;
         if (tooLarge) {
             std::cerr << "\t\t\t ALLOCATED " << std::dec << object->size_ << " BYTES";
@@ -939,7 +1042,7 @@
             setDirty();
             object->updateValue(datum->getValue(), byteOrder()); // clones the value
 #ifdef DEBUG
-            ExifKey key(object->tag(), tiffGroupName(object->group()));
+            ExifKey key(object->tag(), groupName(object->group()));
             std::cerr << "UPDATING DATA     " << key;
             std::cerr << "\t\t\t ALLOCATED " << object->size() << " BYTES";
 #endif
@@ -947,7 +1050,7 @@
         else {
             object->setValue(datum->getValue()); // clones the value
 #ifdef DEBUG
-            ExifKey key(object->tag(), tiffGroupName(object->group()));
+            ExifKey key(object->tag(), groupName(object->group()));
             std::cerr << "NOT UPDATING      " << key;
             std::cerr << "\t\t\t PRESERVE VALUE DATA";
 #endif
@@ -962,6 +1065,7 @@
     )
     {
         assert(pRootDir != 0);
+
         writeMethod_ = wmIntrusive;
         pSourceTree_ = pSourceDir;
 
@@ -973,15 +1077,19 @@
         for (ExifData::const_iterator i = exifData_.begin();
              i != exifData_.end(); ++i) {
 
-            uint16_t group = tiffGroupId(i->groupName());
+            IfdId group = groupId(i->groupName());
             // Skip synthesized info tags
-            if (group == Group::mn) {
+            if (group == mnId) {
                 if (i->tag() == 0x0002) {
                     posBo = i;
                 }
                 continue;
             }
 
+            // Skip image tags of existing TIFF image - they were copied earlier -
+            // but add and encode image tags of new images (creation)
+            if (isImageTag(i->tag(), group)) continue;
+
             // Assumption is that the corresponding TIFF entry doesn't exist
             TiffPath tiffPath;
             TiffCreator::getPath(tiffPath, i->tag(), group, root);
@@ -1009,7 +1117,7 @@
          */
         if (posBo == exifData_.end()) return;
 
-        TiffFinder finder(0x927c, Group::exif);
+        TiffFinder finder(0x927c, exifId);
         pRootDir->accept(finder);
         TiffMnEntry* te = dynamic_cast<TiffMnEntry*>(finder.result());
         if (te) {
@@ -1114,14 +1222,13 @@
         }
     }
 
-    bool TiffReader::circularReference(const byte* start, uint16_t group)
+    bool TiffReader::circularReference(const byte* start, IfdId group)
     {
         DirList::const_iterator pos = dirList_.find(start);
         if (pos != dirList_.end()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: "
-                      << tiffGroupName(group)  << " pointer references previously read "
-                      << tiffGroupName(pos->second) << " directory. Ignored.\n";
+            EXV_ERROR << groupName(group) << " pointer references previously read "
+                      << groupName(pos->second) << " directory. Ignored.\n";
 #endif
             return true;
         }
@@ -1129,7 +1236,7 @@
         return false;
     }
 
-    int TiffReader::nextIdx(uint16_t group)
+    int TiffReader::nextIdx(IfdId group)
     {
         return ++idxSeq_[group];
     }
@@ -1154,8 +1261,7 @@
 
         if (p + 2 > pLast_) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: "
-                      << "Directory " << tiffGroupName(object->group())
+            EXV_ERROR << "Directory " << groupName(object->group())
                       << ": IFD exceeds data buffer, cannot read entry count.\n";
 #endif
             return;
@@ -1165,8 +1271,7 @@
         // Sanity check with an "unreasonably" large number
         if (n > 256) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: "
-                      << "Directory " << tiffGroupName(object->group()) << " with "
+            EXV_ERROR << "Directory " << groupName(object->group()) << " with "
                       << n << " entries considered invalid; not read.\n";
 #endif
             return;
@@ -1174,8 +1279,7 @@
         for (uint16_t i = 0; i < n; ++i) {
             if (p + 12 > pLast_) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Error: "
-                          << "Directory " << tiffGroupName(object->group())
+                EXV_ERROR << "Directory " << groupName(object->group())
                           << ": IFD entry " << i
                           << " lies outside of the data buffer.\n";
 #endif
@@ -1194,8 +1298,7 @@
         if (object->hasNext()) {
             if (p + 4 > pLast_) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Error: "
-                          << "Directory " << tiffGroupName(object->group())
+                EXV_ERROR << "Directory " << groupName(object->group())
                           << ": IFD exceeds data buffer, cannot read next pointer.\n";
 #endif
                 return;
@@ -1206,17 +1309,15 @@
                 tc = TiffCreator::create(Tag::next, object->group());
 #ifndef SUPPRESS_WARNINGS
                 if (tc.get() == 0) {
-                    std::cerr << "Warning: "
-                              << "Directory " << tiffGroupName(object->group())
-                              << " has an unhandled next pointer.\n";
+                    EXV_WARNING << "Directory " << groupName(object->group())
+                                << " has an unhandled next pointer.\n";
                 }
 #endif
             }
             if (tc.get()) {
                 if (baseOffset() + next > size_) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Error: "
-                              << "Directory " << tiffGroupName(object->group())
+                    EXV_ERROR << "Directory " << groupName(object->group())
                               << ": Next pointer is out of bounds; ignored.\n";
 #endif
                     return;
@@ -1236,13 +1337,15 @@
         if (   (object->tiffType() == ttUnsignedLong || object->tiffType() == ttSignedLong
                 || object->tiffType() == ttTiffIfd)
             && object->count() >= 1) {
+            // Todo: Fix hack
+            uint32_t maxi = 9;
+            if (object->group() == ifd1Id) maxi = 1;
             for (uint32_t i = 0; i < object->count(); ++i) {
                 int32_t offset = getLong(object->pData() + 4*i, byteOrder());
                 if (   baseOffset() + offset > size_
                     || static_cast<int32_t>(baseOffset()) + offset < 0) {
 #ifndef SUPPRESS_WARNINGS
-                    std::cerr << "Error: "
-                              << "Directory " << tiffGroupName(object->group())
+                    EXV_ERROR << "Directory " << groupName(object->group())
                               << ", entry 0x" << std::setw(4)
                               << std::setfill('0') << std::hex << object->tag()
                               << " Sub-IFD pointer " << i
@@ -1250,20 +1353,28 @@
 #endif
                     return;
                 }
+                if (i >= maxi) {
+#ifndef SUPPRESS_WARNINGS
+                    EXV_WARNING << "Directory " << groupName(object->group())
+                                << ", entry 0x" << std::setw(4)
+                                << std::setfill('0') << std::hex << object->tag()
+                                << ": Skipping sub-IFDs beyond the first " << i << ".\n";
+#endif
+                    break;
+                }
                 // If there are multiple dirs, group is incremented for each
                 TiffComponent::AutoPtr td(new TiffDirectory(object->tag(),
-                                                            object->newGroup_ + i));
+                                                            static_cast<IfdId>(object->newGroup_ + i)));
                 td->setStart(pData_ + baseOffset() + offset);
                 object->addChild(td);
             }
         }
 #ifndef SUPPRESS_WARNINGS
         else {
-            std::cerr << "Warning: "
-                      << "Directory " << tiffGroupName(object->group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << object->tag()
-                      << " doesn't look like a sub-IFD.\n";
+            EXV_WARNING << "Directory " << groupName(object->group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << object->tag()
+                        << " doesn't look like a sub-IFD.\n";
         }
 #endif
 
@@ -1275,7 +1386,7 @@
 
         readTiffEntry(object);
         // Find camera make
-        TiffFinder finder(0x010f, Group::ifd0);
+        TiffFinder finder(0x010f, ifd0Id);
         pRoot_->accept(finder);
         TiffEntryBase* te = dynamic_cast<TiffEntryBase*>(finder.result());
         std::string make;
@@ -1303,8 +1414,8 @@
                                 static_cast<uint32_t>(pLast_ - object->start()),
                                 byteOrder())) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: Failed to read "
-                      << tiffGroupName(object->ifd_.group())
+            EXV_ERROR << "Failed to read "
+                      << groupName(object->ifd_.group())
                       << " IFD Makernote header.\n";
 #ifdef DEBUG
             if (static_cast<uint32_t>(pLast_ - object->start()) >= 16) {
@@ -1342,7 +1453,7 @@
 
         if (p + 12 > pLast_) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: Entry in directory " << tiffGroupName(object->group())
+            EXV_ERROR << "Entry in directory " << groupName(object->group())
                       << "requests access to memory beyond the data buffer. "
                       << "Skipping entry.\n";
 #endif
@@ -1355,11 +1466,11 @@
         long typeSize = TypeInfo::typeSize(typeId);
         if (0 == typeSize) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Directory " << tiffGroupName(object->group())
-                      << ", entry 0x" << std::setw(4)
-                      << std::setfill('0') << std::hex << object->tag()
-                      << " has unknown Exif (TIFF) type " << std::dec << tiffType
-                      << "; setting type size 1.\n";
+            EXV_WARNING << "Directory " << groupName(object->group())
+                        << ", entry 0x" << std::setw(4)
+                        << std::setfill('0') << std::hex << object->tag()
+                        << " has unknown Exif (TIFF) type " << std::dec << tiffType
+                        << "; setting type size 1.\n";
 #endif
             typeSize = 1;
         }
@@ -1367,7 +1478,7 @@
         uint32_t count = getULong(p, byteOrder());
         if (count >= 0x10000000) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Error: Directory " << tiffGroupName(object->group())
+            EXV_ERROR << "Directory " << groupName(object->group())
                       << ", entry 0x" << std::setw(4)
                       << std::setfill('0') << std::hex << object->tag()
                       << " has invalid size "
@@ -1382,16 +1493,15 @@
         byte* pData = p;
         if (   size > 4
             && (   baseOffset() + offset >= size_
-                || static_cast<int32_t>(baseOffset()) + offset < 0)) {
+                || static_cast<int32_t>(baseOffset()) + offset <= 0)) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Error: Offset of "
-                          << "directory " << tiffGroupName(object->group())
-                          << ", entry 0x" << std::setw(4)
-                          << std::setfill('0') << std::hex << object->tag()
-                          << " is out of bounds: "
-                          << "Offset = 0x" << std::setw(8)
-                          << std::setfill('0') << std::hex << offset
-                          << "; truncating the entry\n";
+            EXV_ERROR << "Offset of directory " << groupName(object->group())
+                      << ", entry 0x" << std::setw(4)
+                      << std::setfill('0') << std::hex << object->tag()
+                      << " is out of bounds: "
+                      << "Offset = 0x" << std::setw(8)
+                      << std::setfill('0') << std::hex << offset
+                      << "; truncating the entry\n";
 #endif
                 size = 0;
         }
@@ -1399,8 +1509,8 @@
             pData = const_cast<byte*>(pData_) + baseOffset() + offset;
             if (size > static_cast<uint32_t>(pLast_ - pData)) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Error: Upper boundary of data for "
-                          << "directory " << tiffGroupName(object->group())
+                EXV_ERROR << "Upper boundary of data for "
+                          << "directory " << groupName(object->group())
                           << ", entry 0x" << std::setw(4)
                           << std::setfill('0') << std::hex << object->tag()
                           << " is out of bounds: "
@@ -1442,10 +1552,10 @@
 
         if (object->TiffEntryBase::doSize() == 0) return;
         if (!object->initialize(pRoot_)) return;
-        const ArrayDef* defs = object->def();
-        const ArrayDef* def = &object->cfg()->elDefaultDef_;
 
-        const CryptFct cryptFct = object->cfg()->cryptFct_;
+        const ArrayCfg* cfg = object->cfg();
+
+        const CryptFct cryptFct = cfg->cryptFct_;
         if (cryptFct != 0) {
             const byte* pData = object->pData();
             int32_t size = object->TiffEntryBase::doSize();
@@ -1453,12 +1563,41 @@
             if (buf.size_ > 0) object->setData(buf);
         }
 
+        const ArrayDef* defs = object->def();
+        const ArrayDef* defsEnd = defs + object->defSize();
+        const ArrayDef* def = &cfg->elDefaultDef_;
+        ArrayDef gap = *def;
+
         for (uint32_t idx = 0; idx < object->TiffEntryBase::doSize(); ) {
             if (defs) {
-                def = std::find(defs, defs + object->defSize(), idx);
-                if (def == defs + object->defSize()) def = &object->cfg()->elDefaultDef_;
+                def = std::find(defs, defsEnd, idx);
+                if (def == defsEnd) {
+                    if (cfg->concat_) {
+                        // Determine gap-size
+                        const ArrayDef* xdef = defs;
+                        for (; xdef != defsEnd && xdef->idx_ <= idx; ++xdef) {}
+                        uint32_t gapSize = 0;
+                        if (xdef != defsEnd && xdef->idx_ > idx) {
+                            gapSize = xdef->idx_ - idx;
+                        }
+                        else {
+                            gapSize = object->TiffEntryBase::doSize() - idx;
+                        }
+                        gap.idx_ = idx;
+                        gap.tiffType_ = cfg->elDefaultDef_.tiffType_;
+                        gap.count_ = gapSize / cfg->tagStep();
+                        if (gap.count_ * cfg->tagStep() != gapSize) {
+                            gap.tiffType_ = ttUndefined;
+                            gap.count_ = gapSize;
+                        }
+                        def = &gap;
+                    }
+                    else {
+                        def = &cfg->elDefaultDef_;
+                    }
+                }
             }
-            idx += object->addElement(idx, def); // idx may be different from def->idx_
+            idx += object->addElement(idx, *def); // idx may be different from def->idx_
         }
 
     } // TiffReader::visitBinaryArray
diff -Nru exiv2-0.19/src/tiffvisitor_int.hpp exiv2-0.21/src/tiffvisitor_int.hpp
--- exiv2-0.19/src/tiffvisitor_int.hpp	2009-12-28 14:47:58.000000000 +0000
+++ exiv2-0.21/src/tiffvisitor_int.hpp	2010-08-30 19:33:07.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -22,7 +22,7 @@
   @file    tiffvisitor_int.hpp
   @brief   Internal operations on a TIFF composite tree, implemented as visitor
            classes.
-  @version $Rev: 1977 $
+  @version $Rev: 2336 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    11-Apr-06, ahu: created
@@ -168,7 +168,7 @@
         //! @name Creators
         //@{
         //! Constructor, taking \em tag and \em group of the component to find.
-        TiffFinder(uint16_t tag, uint16_t group)
+        TiffFinder(uint16_t tag, IfdId group)
             : tag_(tag), group_(group), tiffComponent_(0) {}
         //! Virtual destructor
         virtual ~TiffFinder();
@@ -200,7 +200,7 @@
         //! Check if \em object matches \em tag and \em group
         void findObject(TiffComponent* object);
         //! Initialize the Finder for a new search.
-        void init(uint16_t tag, uint16_t group);
+        void init(uint16_t tag, IfdId group);
         //@}
 
         //! @name Accessors
@@ -214,11 +214,70 @@
 
     private:
         uint16_t tag_;
-        uint16_t group_;
+        IfdId group_;
         TiffComponent* tiffComponent_;
     }; // class TiffFinder
 
     /*!
+      @brief Copy all image tags from the source tree (the tree that is traversed) to a 
+             target tree, which is empty except for the root element provided in the
+             constructor.
+    */
+    class TiffCopier : public TiffVisitor {
+    public:
+        //! @name Creators
+        //@{
+        /*!
+          @brief Constructor
+
+          @param pRoot Pointer to the root element of the (empty) target tree.
+          @param root 
+          @param pHeader Pointer to the TIFF header of the source image.
+          @param pPrimaryGroups Pointer to the list of primary groups.
+         */
+        TiffCopier(      TiffComponent*  pRoot,
+                         uint32_t        root,
+                   const TiffHeaderBase* pHeader,
+                   const PrimaryGroups*  pPrimaryGroups);
+        //! Virtual destructor
+        virtual ~TiffCopier();
+        //@}
+
+        //! @name Manipulators
+        //@{
+        //! Copy a TIFF entry if it is an image tag
+        virtual void visitEntry(TiffEntry* object);
+        //! Copy a TIFF data entry if it is an image tag
+        virtual void visitDataEntry(TiffDataEntry* object);
+        //! Copy a TIFF image entry if it is an image tag
+        virtual void visitImageEntry(TiffImageEntry* object);
+        //! Copy a TIFF size entry if it is an image tag
+        virtual void visitSizeEntry(TiffSizeEntry* object);
+        //! Copy a TIFF directory if it is an image tag
+        virtual void visitDirectory(TiffDirectory* object);
+        //! Copy a TIFF sub-IFD if it is an image tag
+        virtual void visitSubIfd(TiffSubIfd* object);
+        //! Copy a TIFF makernote if it is an image tag
+        virtual void visitMnEntry(TiffMnEntry* object);
+        //! Copy an IFD makernote if it is an image tag
+        virtual void visitIfdMakernote(TiffIfdMakernote* object);
+        //! Copy a binary array if it is an image tag
+        virtual void visitBinaryArray(TiffBinaryArray* object);
+        //! Copy an element of a binary array if it is an image tag
+        virtual void visitBinaryElement(TiffBinaryElement* object);
+
+        //! Check if \em object is an image tag and if so, copy it to the target tree.
+        void copyObject(TiffComponent* object);
+        //@}
+
+    private:
+              TiffComponent*  pRoot_;
+              uint32_t        root_;
+        const TiffHeaderBase* pHeader_;
+        const PrimaryGroups*  pPrimaryGroups_;
+    }; // class TiffCopier
+
+    /*!
       @brief TIFF composite visitor to decode metadata from the TIFF tree and
              add it to an Image, which is supplied in the constructor (Visitor
              pattern). Used by TiffParser to decode the metadata from a
@@ -291,7 +350,7 @@
         void getObjData(byte const*&         pData,
                         long&                size,
                         uint16_t             tag,
-                        uint16_t             group,
+                        IfdId                group,
                         const TiffEntryBase* object);
         //@}
 
@@ -336,7 +395,9 @@
             const IptcData&      iptcData,
             const XmpData&       xmpData,
                   TiffComponent* pRoot,
-                  ByteOrder      byteOrder,
+            const bool           isNewImage,
+            const PrimaryGroups* pPrimaryGroups,
+            const TiffHeaderBase* pHeader,
                   FindEncoderFct findEncoderFct
         );
         //! Virtual destructor
@@ -482,10 +543,20 @@
           @brief Update a directory entry. This is called after all directory
                  entries are encoded. It takes care of type and count changes
                  and size shrinkage for non-intrusive writing.
-        */
+         */
         uint32_t updateDirEntry(byte* buf,
                                 ByteOrder byteOrder,
                                 TiffComponent* pTiffComponent) const;
+        /*!
+          @brief Check if the tag is an image tag of an existing image. Such 
+                 tags are copied from the original image and can't be modifed.
+
+                 The condition is true if there is an existing image (as
+                 opposed to a newly created TIFF image) and \em tag, \em group
+                 is considered an image tag of this image - whether or not
+                 it's actually present in the existing image doesn't matter.
+         */
+        bool isImageTag(uint16_t tag, IfdId group) const;
         //@}
 
     private:
@@ -494,7 +565,10 @@
         const IptcData& iptcData_;   //!< IPTC data to encode, just a reference
         const XmpData&  xmpData_;    //!< XMP data to encode, just a reference
         bool del_;                   //!< Indicates if Exif data entries should be deleted after encoding
+        const TiffHeaderBase* pHeader_; //!< TIFF image header
         TiffComponent* pRoot_;       //!< Root element of the composite
+        const bool isNewImage_;      //!< True if the TIFF image is created from scratch
+        const PrimaryGroups* pPrimaryGroups_; //!< List of primary image groups
         TiffComponent* pSourceTree_; //!< Parsed source tree for reference
         ByteOrder byteOrder_;        //!< Byteorder for encoding
         ByteOrder origByteOrder_;    //!< Byteorder as set in the c'tor
@@ -502,6 +576,7 @@
         std::string make_;           //!< Camera make, determined from the tags to encode
         bool dirty_;                 //!< Signals if any tag is deleted or allocated
         WriteMethod writeMethod_;    //!< Write method used.
+
     }; // class TiffEncoder
 
     /*!
@@ -612,9 +687,9 @@
         //! Reset the state to the original state as set in the constructor.
         void resetState();
         //! Check IFD directory pointer \em start for circular reference
-        bool circularReference(const byte* start, uint16_t group);
+        bool circularReference(const byte* start, IfdId group);
         //! Return the next idx sequence number for \em group
-        int nextIdx(uint16_t group);
+        int nextIdx(IfdId group);
 
         /*!
           @brief Read deferred components.
@@ -637,7 +712,7 @@
         //@}
 
     private:
-        typedef std::map<const byte*, uint16_t> DirList;
+        typedef std::map<const byte*, IfdId> DirList;
         typedef std::map<uint16_t, int> IdxSeq;
         typedef std::vector<TiffComponent*> PostList;
 
@@ -652,7 +727,6 @@
         IdxSeq               idxSeq_;     //!< Sequences for group, used for the entry's idx
         PostList             postList_;   //!< List of components with deferred reading
         bool                 postProc_;   //!< True in postProcessList()
-
     }; // class TiffReader
 
 }}                                      // namespace Internal, Exiv2
diff -Nru exiv2-0.19/src/Todo exiv2-0.21/src/Todo
--- exiv2-0.19/src/Todo	2006-02-03 04:41:44.000000000 +0000
+++ exiv2-0.21/src/Todo	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-Library Features:
-+ rename erase* methods that access a file to remove* 
-+ add ExifData::erase(tag)
-+ Thumbnail support: set (re-calculate)
-+ operator>> for Value, since we already have read()?
-+ Use size_t where appropriate
-+ Support TIFF type ids
-+ Support for broken IFD makernotes (which have corrupted IFD offsets)
-+ Support non-intrusive deletion of entries from an IFD.
-+ Write an example using low level IFD classes to print summary Exif info
-+ Extended JPEG support (actual resolution of the image)
-+ Implement proper error handling
-+ Complete support to create Exif data from scratch:
-  + set thumbnail, write thumbnail tags
-+ Make it possible to force write from metadata (just an optional arg to write?)
-
-+ Make Image::doWriteMetadata do its work in a single pass
-
-+ Revise Image and IptcData+ExifData API (aka turn it inside out)
-+ Add PSD images support (and TIFF, NEF, CRW...)
-+ Add support for XML metadata files
-
-Exiv2 functionality
-+ Add offset to value for hexdump (requires metadata to have an offset)
-
-Bugs:
-+ Handle all Todo's
-+ Cleanup and fix implementation of JpegImage (must be able to read any APP0/1),
-  should be able to insert exv into extracted thumbs (usually w/o APP0/1)
-+ Review Image interface. Is it really necessary to have so many functions there?
-+ Review the handling of type ids? What if we encounter type 27 in an IFD?
-+ Rational and other output operators (see Josuttis, p653)
-+ Through ExifData::iterator and Metadatum::operator= it is possible to have 
-  multiple copies of one metadatum in the metadata container
-+ Checks and non-intrusive updates must be atomic, i.e., not change anything
-  if the metadata is not compatible
-+ Review: Exception safety
-+ Review: Ifd1 only at Thumbnail, do we really need Thumbnail::update() ?
-+ Should JpegImage differ between NO Jpeg comment and an empty Jpeg comment??
diff -Nru exiv2-0.19/src/TODO exiv2-0.21/src/TODO
--- exiv2-0.19/src/TODO	1970-01-01 00:00:00.000000000 +0000
+++ exiv2-0.21/src/TODO	2010-04-20 09:01:57.000000000 +0000
@@ -0,0 +1,39 @@
+Library Features:
++ rename erase* methods that access a file to remove* 
++ add ExifData::erase(tag)
++ Thumbnail support: set (re-calculate)
++ operator>> for Value, since we already have read()?
++ Use size_t where appropriate
++ Support TIFF type ids
++ Support for broken IFD makernotes (which have corrupted IFD offsets)
++ Support non-intrusive deletion of entries from an IFD.
++ Write an example using low level IFD classes to print summary Exif info
++ Extended JPEG support (actual resolution of the image)
++ Implement proper error handling
++ Complete support to create Exif data from scratch:
+  + set thumbnail, write thumbnail tags
++ Make it possible to force write from metadata (just an optional arg to write?)
+
++ Make Image::doWriteMetadata do its work in a single pass
+
++ Revise Image and IptcData+ExifData API (aka turn it inside out)
++ Add PSD images support (and TIFF, NEF, CRW...)
++ Add support for XML metadata files
+
+Exiv2 functionality
++ Add offset to value for hexdump (requires metadata to have an offset)
+
+Bugs:
++ Handle all Todo's
++ Cleanup and fix implementation of JpegImage (must be able to read any APP0/1),
+  should be able to insert exv into extracted thumbs (usually w/o APP0/1)
++ Review Image interface. Is it really necessary to have so many functions there?
++ Review the handling of type ids? What if we encounter type 27 in an IFD?
++ Rational and other output operators (see Josuttis, p653)
++ Through ExifData::iterator and Metadatum::operator= it is possible to have 
+  multiple copies of one metadatum in the metadata container
++ Checks and non-intrusive updates must be atomic, i.e., not change anything
+  if the metadata is not compatible
++ Review: Exception safety
++ Review: Ifd1 only at Thumbnail, do we really need Thumbnail::update() ?
++ Should JpegImage differ between NO Jpeg comment and an empty Jpeg comment??
diff -Nru exiv2-0.19/src/types.cpp exiv2-0.21/src/types.cpp
--- exiv2-0.19/src/types.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/types.cpp	2010-08-24 15:54:05.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      types.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2329 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: types.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: types.cpp 2329 2010-08-24 15:54:05Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -59,9 +59,15 @@
         const char* name_;                      //!< Name of the type
         long size_;                             //!< Bytes per data entry
         //! Comparison operator for \em typeId
-        bool operator==(Exiv2::TypeId typeId) const;
+        bool operator==(Exiv2::TypeId typeId) const
+        {
+            return typeId_ == typeId;
+        }
         //! Comparison operator for \em name
-        bool operator==(const std::string& name) const;
+        bool operator==(const std::string& name) const
+        {
+            return 0 == strcmp(name_, name.c_str());
+        }
     }; // struct TypeInfoTable
 
     //! Lookup list with information of Exiv2 types
@@ -92,16 +98,6 @@
         { Exiv2::langAlt,          "LangAlt",     1 }
     };
 
-    bool TypeInfoTable::operator==(Exiv2::TypeId typeId) const
-    {
-        return typeId_ == typeId;
-    }
-
-    bool TypeInfoTable::operator==(const std::string& name) const
-    {
-        return std::string(name_) == name;
-    }
-
 }
 
 // *****************************************************************************
@@ -156,8 +152,10 @@
     {
         if (size > size_) {
             delete[] pData_;
-            size_ = size;
+            pData_ = 0;
+            size_ = 0;
             pData_ = new byte[size];
+            size_ = size;
         }
     }
 
@@ -181,6 +179,38 @@
     // *************************************************************************
     // free functions
 
+    std::ostream& operator<<(std::ostream& os, const Rational& r)
+    {
+        return os << r.first << "/" << r.second;
+    }
+
+    std::istream& operator>>(std::istream& is, Rational& r)
+    {
+        int32_t nominator;
+        int32_t denominator;
+        char c('\0');
+        is >> nominator >> c >> denominator;
+        if (c != '/') is.setstate(std::ios::failbit);
+        if (is) r = std::make_pair(nominator, denominator);
+        return is;
+    }
+
+    std::ostream& operator<<(std::ostream& os, const URational& r)
+    {
+        return os << r.first << "/" << r.second;
+    }
+
+    std::istream& operator>>(std::istream& is, URational& r)
+    {
+        uint32_t nominator;
+        uint32_t denominator;
+        char c('\0');
+        is >> nominator >> c >> denominator;
+        if (c != '/') is.setstate(std::ios::failbit);
+        if (is) r = std::make_pair(nominator, denominator);
+        return is;
+    }
+
     uint16_t getUShort(const byte* buf, ByteOrder byteOrder)
     {
         if (byteOrder == littleEndian) {
@@ -239,6 +269,54 @@
         return std::make_pair(nominator, denominator);
     }
 
+    float getFloat(const byte* buf, ByteOrder byteOrder)
+    {
+        // This algorithm assumes that the internal representation of the float
+        // type is the 4-byte IEEE 754 binary32 format, which is common but not
+        // required by the C++ standard.
+        assert(sizeof(float) == 4);
+        union {
+            uint32_t ul_;
+            float    f_;
+        } u;
+        u.ul_ = getULong(buf, byteOrder);
+        return u.f_;
+    }
+
+    double getDouble(const byte* buf, ByteOrder byteOrder)
+    {
+        // This algorithm assumes that the internal representation of the double
+        // type is the 8-byte IEEE 754 binary64 format, which is common but not
+        // required by the C++ standard.
+        assert(sizeof(double) == 8);
+        union {
+            uint64_t ull_;
+            double   d_;
+        } u;
+        u.ull_ = 0;
+        if (byteOrder == littleEndian) {
+            u.ull_ =   static_cast<uint64_t>(buf[7]) << 56
+                     | static_cast<uint64_t>(buf[6]) << 48
+                     | static_cast<uint64_t>(buf[5]) << 40
+                     | static_cast<uint64_t>(buf[4]) << 32
+                     | static_cast<uint64_t>(buf[3]) << 24
+                     | static_cast<uint64_t>(buf[2]) << 16
+                     | static_cast<uint64_t>(buf[1]) <<  8
+                     | static_cast<uint64_t>(buf[0]);
+        }
+        else {
+            u.ull_ =   static_cast<uint64_t>(buf[0]) << 56
+                     | static_cast<uint64_t>(buf[1]) << 48
+                     | static_cast<uint64_t>(buf[2]) << 40
+                     | static_cast<uint64_t>(buf[3]) << 32
+                     | static_cast<uint64_t>(buf[4]) << 24
+                     | static_cast<uint64_t>(buf[5]) << 16
+                     | static_cast<uint64_t>(buf[6]) <<  8
+                     | static_cast<uint64_t>(buf[7]);
+        }
+        return u.d_;
+    }
+
     long us2Data(byte* buf, uint16_t s, ByteOrder byteOrder)
     {
         if (byteOrder == littleEndian) {
@@ -313,6 +391,55 @@
         return o;
     }
 
+    long f2Data(byte* buf, float f, ByteOrder byteOrder)
+    {
+        // This algorithm assumes that the internal representation of the float
+        // type is the 4-byte IEEE 754 binary32 format, which is common but not
+        // required by the C++ standard.
+        assert(sizeof(float) == 4);
+        union {
+            uint32_t ul_;
+            float    f_;
+        } u;
+        u.f_ = f;
+        return ul2Data(buf, u.ul_, byteOrder);
+    }
+
+    long d2Data(byte* buf, double d, ByteOrder byteOrder)
+    {
+        // This algorithm assumes that the internal representation of the double
+        // type is the 8-byte IEEE 754 binary64 format, which is common but not
+        // required by the C++ standard.
+        assert(sizeof(double) == 8);
+        union {
+            uint64_t ull_;
+            double   d_;
+        } u;
+        u.d_ = d;
+        uint64_t m = 0xff;
+        if (byteOrder == littleEndian) {
+            buf[0] =  (byte)(u.ull_ & m);
+            buf[1] = (byte)((u.ull_ & (m <<  8)) >>  8);
+            buf[2] = (byte)((u.ull_ & (m << 16)) >> 16);
+            buf[3] = (byte)((u.ull_ & (m << 24)) >> 24);
+            buf[4] = (byte)((u.ull_ & (m << 32)) >> 32);
+            buf[5] = (byte)((u.ull_ & (m << 40)) >> 40);
+            buf[6] = (byte)((u.ull_ & (m << 48)) >> 48);
+            buf[7] = (byte)((u.ull_ & (m << 56)) >> 56);
+        }
+        else {
+            buf[0] = (byte)((u.ull_ & (m << 56)) >> 56);
+            buf[1] = (byte)((u.ull_ & (m << 48)) >> 48);
+            buf[2] = (byte)((u.ull_ & (m << 40)) >> 40);
+            buf[3] = (byte)((u.ull_ & (m << 32)) >> 32);
+            buf[4] = (byte)((u.ull_ & (m << 24)) >> 24);
+            buf[5] = (byte)((u.ull_ & (m << 16)) >> 16);
+            buf[6] = (byte)((u.ull_ & (m <<  8)) >>  8);
+            buf[7] =  (byte)(u.ull_ & m);
+        }
+        return 8;
+    }
+
     void hexdump(std::ostream& os, const byte* buf, long len, long offset)
     {
         const std::string::size_type pos = 8 + 16 * 3 + 2;
diff -Nru exiv2-0.19/src/types.hpp exiv2-0.21/src/types.hpp
--- exiv2-0.19/src/types.hpp	2009-12-29 15:24:40.000000000 +0000
+++ exiv2-0.21/src/types.hpp	2010-09-04 09:20:04.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,11 +21,11 @@
 /*!
   @file    types.hpp
   @brief   Type definitions for %Exiv2 and related functionality
-  @version $Rev: 1983 $
+  @version $Rev: 2340 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    09-Jan-04, ahu: created<BR>
-           11-Feb-04, ahu: isolated as a component
+           11-Feb-04, ahu: isolated as a component<BR>
            31-Jul-04, brad: added Time, Data and String values
  */
 #ifndef TYPES_HPP_
@@ -62,8 +62,11 @@
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+typedef __int8           int8_t;
 typedef __int16          int16_t;
 typedef __int32          int32_t;
+typedef __int64          int64_t;
 #endif
 
 /*!
@@ -144,84 +147,6 @@
         lastTypeId    =0x1ffff  //!< Last type id.
     };
 
-    //! Type to specify the IFD to which a metadata belongs
-    enum IfdId {
-        ifdIdNotSet,
-        ifd0Id,
-        exifIfdId,
-        gpsIfdId,
-        iopIfdId,
-        ifd1Id,
-        ifd2Id,
-        ifd3Id,
-        subImage1Id,
-        subImage2Id,
-        subImage3Id,
-        subImage4Id,
-        mnIfdId,
-        canonIfdId,
-        canonCsIfdId,
-        canonSiIfdId,
-        canonCfIfdId,
-        canonPiIfdId,
-        canonPaIfdId,
-        canonFiIfdId,
-        fujiIfdId,
-        minoltaIfdId,
-        minoltaCs5DIfdId,
-        minoltaCs7DIfdId,
-        minoltaCsOldIfdId,
-        minoltaCsNewIfdId,
-        nikon1IfdId,
-        nikon2IfdId,
-        nikon3IfdId,
-        nikonPvIfdId,
-        nikonVrIfdId,
-        nikonPcIfdId,
-        nikonWtIfdId,
-        nikonIiIfdId,
-        nikonAfIfdId,
-        nikonSi1IfdId,
-        nikonSi2IfdId,
-        nikonSi3IfdId,
-        nikonSi4IfdId,
-        nikonSi5IfdId,
-        nikonSi6IfdId,
-        nikonLd1IfdId,
-        nikonLd2IfdId,
-        nikonLd3IfdId,
-        nikonCb1IfdId,
-        nikonCb2IfdId,
-        nikonCb2aIfdId,
-        nikonCb2bIfdId,
-        nikonCb3IfdId,
-        nikonCb4IfdId,
-        olympusIfdId,
-        olympus2IfdId,
-        olympusCsIfdId,
-        olympusEqIfdId,
-        olympusRdIfdId,
-        olympusRd2IfdId,
-        olympusIpIfdId,
-        olympusFiIfdId,
-        olympusFe1IfdId,
-        olympusFe2IfdId,
-        olympusFe3IfdId,
-        olympusFe4IfdId,
-        olympusFe5IfdId,
-        olympusFe6IfdId,
-        olympusFe7IfdId,
-        olympusFe8IfdId,
-        olympusFe9IfdId,
-        olympusRiIfdId,
-        panasonicIfdId,
-        panaRawIfdId,
-        pentaxIfdId,
-        sigmaIfdId,
-        sonyIfdId,
-        lastIfdId
-    };
-
     //! Container for binary data
     typedef std::vector<byte> Blob;
 
@@ -345,6 +270,10 @@
     EXIV2API int32_t getLong(const byte* buf, ByteOrder byteOrder);
     //! Read an 8 byte signed rational value from the data buffer
     EXIV2API Rational getRational(const byte* buf, ByteOrder byteOrder);
+    //! Read a 4 byte single precision floating point value (IEEE 754 binary32) from the data buffer
+    EXIV2API float getFloat(const byte* buf, ByteOrder byteOrder);
+    //! Read an 8 byte double precision floating point value (IEEE 754 binary64) from the data buffer
+    EXIV2API double getDouble(const byte* buf, ByteOrder byteOrder);
 
     //! Output operator for our fake rational
     EXIV2API std::ostream& operator<<(std::ostream& os, const Rational& r);
@@ -385,6 +314,16 @@
              return number of bytes written.
      */
     EXIV2API long r2Data(byte* buf, Rational l, ByteOrder byteOrder);
+    /*!
+      @brief Convert a single precision floating point (IEEE 754 binary32) float
+             to data, write the data to the buffer, return number of bytes written.
+     */
+    EXIV2API long f2Data(byte* buf, float f, ByteOrder byteOrder);
+    /*!
+      @brief Convert a double precision floating point (IEEE 754 binary64) double
+             to data, write the data to the buffer, return number of bytes written.
+     */
+    EXIV2API long d2Data(byte* buf, double d, ByteOrder byteOrder);
 
     /*!
       @brief Print len bytes from buf in hex and ASCII format to the given
diff -Nru exiv2-0.19/src/utils.cpp exiv2-0.21/src/utils.cpp
--- exiv2-0.19/src/utils.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/utils.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      utils.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: utils.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: utils.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
diff -Nru exiv2-0.19/src/utils.hpp exiv2-0.21/src/utils.hpp
--- exiv2-0.19/src/utils.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/utils.hpp	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 // ********************************************************* -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    utils.hpp
   @brief   A collection of utility functions
-  @version $Rev: 1937 $
+  @version $Rev: 2045 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    12-Dec-03, ahu: created
diff -Nru exiv2-0.19/src/utiltest.cpp exiv2-0.21/src/utiltest.cpp
--- exiv2-0.19/src/utiltest.cpp	2005-10-08 11:25:44.000000000 +0000
+++ exiv2-0.21/src/utiltest.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -6,12 +6,12 @@
 
   RCS information
    $Name:  $
-   $Revision: 631 $
+   $Revision: 2286 $
  */
 
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: utiltest.cpp 631 2005-10-08 11:25:44Z ahuggel $");
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: utiltest.cpp 2286 2010-06-27 10:04:39Z ahuggel $");
 
 // *****************************************************************************
 // included header files
diff -Nru exiv2-0.19/src/value.cpp exiv2-0.21/src/value.cpp
--- exiv2-0.19/src/value.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/value.cpp	2010-09-10 14:02:09.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,21 +20,22 @@
  */
 /*
   File:      value.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2344 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
              31-Jul-04, brad: added Time, Date and String values
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: value.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: value.cpp 2344 2010-09-10 14:02:09Z ahuggel $")
 
 // *****************************************************************************
 // included header files
 #include "value.hpp"
 #include "types.hpp"
 #include "error.hpp"
+#include "convert.hpp"
 
 // + standard includes
 #include <iostream>
@@ -75,8 +76,6 @@
         case invalidTypeId:
         case signedByte:
         case unsignedByte:
-        case tiffFloat:
-        case tiffDouble:
             value = AutoPtr(new DataValue(typeId));
             break;
         case asciiString:
@@ -87,7 +86,7 @@
             break;
         case unsignedLong:
         case tiffIfd:
-            value = AutoPtr(new ValueType<uint32_t>);
+            value = AutoPtr(new ValueType<uint32_t>(typeId));
             break;
         case unsignedRational:
             value = AutoPtr(new ValueType<URational>);
@@ -104,6 +103,12 @@
         case signedRational:
             value = AutoPtr(new ValueType<Rational>);
             break;
+        case tiffFloat:
+            value = AutoPtr(new ValueType<float>);
+            break;
+        case tiffDouble:
+            value = AutoPtr(new ValueType<double>);
+            break;
         case string:
             value = AutoPtr(new StringValue);
             break;
@@ -160,7 +165,7 @@
     DataBuf Value::dataArea() const
     {
         return DataBuf(0, 0);
-    };
+    }
 
     DataValue::DataValue(TypeId typeId) : Value(typeId)
     {
@@ -193,12 +198,13 @@
     {
         std::istringstream is(buf);
         int tmp;
-        value_.clear();
+        ValueType val;
         while (!(is.eof())) {
             is >> tmp;
             if (is.fail()) return 1;
-            value_.push_back(static_cast<byte>(tmp));
+            val.push_back(static_cast<byte>(tmp));
         }
+        value_.swap(val);
         return 0;
     }
 
@@ -440,12 +446,12 @@
     }
 
     CommentValue::CommentValue()
-        : StringValueBase(Exiv2::undefined)
+        : StringValueBase(Exiv2::undefined), byteOrder_(littleEndian)
     {
     }
 
     CommentValue::CommentValue(const std::string& comment)
-        : StringValueBase(Exiv2::undefined)
+        : StringValueBase(Exiv2::undefined), byteOrder_(littleEndian)
     {
         read(comment);
     }
@@ -467,30 +473,69 @@
             charsetId = CharsetInfo::charsetIdByName(name);
             if (charsetId == invalidCharsetId) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: " << Error(28, name) << "\n";
+                EXV_WARNING << Error(28, name) << "\n";
 #endif
                 return 1;
             }
             c.clear();
             if (pos != std::string::npos) c = comment.substr(pos+1);
         }
+        if (charsetId == unicode) {
+            const char* to = byteOrder_ == littleEndian ? "UCS-2LE" : "UCS-2BE";
+            convertStringCharset(c, "UTF-8", to);
+        }
         const std::string code(CharsetInfo::code(charsetId), 8);
         return StringValueBase::read(code + c);
     }
 
+    int CommentValue::read(const byte* buf, long len, ByteOrder byteOrder)
+    {
+        byteOrder_ = byteOrder;
+        return StringValueBase::read(buf, len, byteOrder);
+    }
+
+    long CommentValue::copy(byte* buf, ByteOrder byteOrder) const
+    {
+        std::string c = value_;
+        if (charsetId() == unicode) {
+            c = value_.substr(8);
+            std::string::size_type sz = c.size();
+            if (byteOrder_ == littleEndian && byteOrder == bigEndian) {
+                convertStringCharset(c, "UCS-2LE", "UCS-2BE");
+                assert(c.size() == sz);
+            }
+            else if (byteOrder_ == bigEndian && byteOrder == littleEndian) {
+                convertStringCharset(c, "UCS-2BE", "UCS-2LE");
+                assert(c.size() == sz);
+            }
+            c = value_.substr(0, 8) + c;
+        }
+        if (c.size() == 0) return 0;
+        assert(buf != 0);
+        return static_cast<long>(c.copy(reinterpret_cast<char*>(buf), c.size()));
+    }
+
     std::ostream& CommentValue::write(std::ostream& os) const
     {
-        CharsetId charsetId = this->charsetId();
-        if (charsetId != undefined) {
-            os << "charset=\"" << CharsetInfo::name(charsetId) << "\" ";
+        CharsetId csId = charsetId();
+        if (csId != undefined) {
+            os << "charset=\"" << CharsetInfo::name(csId) << "\" ";
         }
         return os << comment();
     }
 
-    std::string CommentValue::comment() const
+    std::string CommentValue::comment(const char* encoding) const
     {
-        if (value_.length() >= 8) return value_.substr(8);
-        return "";
+        std::string c;
+        if (value_.length() < 8) {
+            return c;
+        }
+        c = value_.substr(8);
+        if (charsetId() == unicode) {
+            const char* from = encoding == 0 || *encoding == '\0' ? detectCharset(c) : encoding;
+            convertStringCharset(c, from, "UTF-8");
+        }
+        return c;
     }
 
     CommentValue::CharsetId CommentValue::charsetId() const
@@ -503,6 +548,27 @@
         return charsetId;
     }
 
+    const char* CommentValue::detectCharset(std::string& c) const
+    {
+        // Interpret a BOM if there is one
+        if (0 == strncmp(c.data(), "\xef\xbb\xbf", 3)) {
+            c = c.substr(3);
+            return "UTF-8";
+        }
+        if (0 == strncmp(c.data(), "\xff\xfe", 2)) {
+            c = c.substr(2);
+            return "UCS-2LE";
+        }
+        if (0 == strncmp(c.data(), "\xfe\xff", 2)) {
+            c = c.substr(2);
+            return "UCS-2BE";
+        }
+
+        // Todo: Add logic to guess if the comment is encoded in UTF-8
+
+        return byteOrder_ == littleEndian ? "UCS-2LE" : "UCS-2BE";
+    }
+
     CommentValue* CommentValue::clone_() const
     {
         return new CommentValue(*this);
@@ -859,7 +925,7 @@
         // Hard coded to read Iptc style dates
         if (len != 8) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: " << Error(29) << "\n";
+            EXV_WARNING << Error(29) << "\n";
 #endif
             return 1;
         }
@@ -870,7 +936,7 @@
                              &date_.year, &date_.month, &date_.day);
         if (scanned != 3) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: " << Error(29) << "\n";
+            EXV_WARNING << Error(29) << "\n";
 #endif
             return 1;
         }
@@ -882,7 +948,7 @@
         // Hard coded to read Iptc style dates
         if (buf.length() < 8) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: " << Error(29) << "\n";
+            EXV_WARNING << Error(29) << "\n";
 #endif
             return 1;
         }
@@ -890,7 +956,7 @@
                              &date_.year, &date_.month, &date_.day);
         if (scanned != 3) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: " << Error(29) << "\n";
+            EXV_WARNING << Error(29) << "\n";
 #endif
             return 1;
         }
@@ -1005,7 +1071,7 @@
         if (rc) {
             rc = 1;
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: " << Error(30) << "\n";
+            EXV_WARNING << Error(30) << "\n";
 #endif
         }
         return rc;
@@ -1025,7 +1091,7 @@
         if (rc) {
             rc = 1;
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: " << Error(30) << "\n";
+            EXV_WARNING << Error(30) << "\n";
 #endif
         }
         return rc;
diff -Nru exiv2-0.19/src/value.hpp exiv2-0.21/src/value.hpp
--- exiv2-0.19/src/value.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/value.hpp	2010-08-07 16:36:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    value.hpp
   @brief   Value interface and concrete subclasses
-  @version $Rev: 1937 $
+  @version $Rev: 2306 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -40,6 +40,7 @@
 #include <vector>
 #include <map>
 #include <iostream>
+#include <iomanip>
 #include <sstream>
 #include <memory>
 #include <cstring>
@@ -217,8 +218,8 @@
           <TR><TD class="indexkey">signedShort</TD><TD class="indexvalue">%ValueType &lt; int16_t &gt;</TD></TR>
           <TR><TD class="indexkey">signedLong</TD><TD class="indexvalue">%ValueType &lt; int32_t &gt;</TD></TR>
           <TR><TD class="indexkey">signedRational</TD><TD class="indexvalue">%ValueType &lt; Rational &gt;</TD></TR>
-          <TR><TD class="indexkey">tiffFloat</TD><TD class="indexvalue">%DataValue(tiffFloat)</TD></TR>
-          <TR><TD class="indexkey">tiffDouble</TD><TD class="indexvalue">%DataValue(tiffDouble)</TD></TR>
+          <TR><TD class="indexkey">tiffFloat</TD><TD class="indexvalue">%ValueType &lt; float &gt;</TD></TR>
+          <TR><TD class="indexkey">tiffDouble</TD><TD class="indexvalue">%ValueType &lt; double &gt;</TD></TR>
           <TR><TD class="indexkey">tiffIfd</TD><TD class="indexvalue">%ValueType &lt; uint32_t &gt;</TD></TR>
           <TR><TD class="indexkey">date</TD><TD class="indexvalue">%DateValue</TD></TR>
           <TR><TD class="indexkey">time</TD><TD class="indexvalue">%TimeValue</TD></TR>
@@ -529,7 +530,7 @@
             const char* code_;                      //!< Code of the charset
         }; // struct CharsetTable
         //! Charset information lookup functions. Implemented as a static class.
-        class CharsetInfo {
+        class EXIV2API CharsetInfo {
             //! Prevent construction: not implemented.
             CharsetInfo() {}
             //! Prevent copy-construction: not implemented.
@@ -566,7 +567,6 @@
 
         //! @name Manipulators
         //@{
-        using StringValueBase::read;
         /*!
           @brief Read the value from a comment
 
@@ -580,19 +580,47 @@
                   1 if an invalid character set is encountered
         */
         int read(const std::string& comment);
+        /*!
+          @brief Read the comment from a byte buffer.
+         */
+        int read(const byte* buf, long len, ByteOrder byteOrder);
         //@}
 
         //! @name Accessors
         //@{
         AutoPtr clone() const { return AutoPtr(clone_()); }
+        long copy(byte* buf, ByteOrder byteOrder) const;
         /*!
           @brief Write the comment in a format which can be read by
           read(const std::string& comment).
          */
         std::ostream& write(std::ostream& os) const;
-        //! Return the comment (without a charset="..." prefix)
-        std::string comment() const;
-        //! Return the charset id of the comment
+        /*!
+          @brief Return the comment (without a charset="..." prefix)
+
+          The comment is decoded to UTF-8. For Exif UNICODE comments, the
+          function makes an attempt to correctly determine the character
+          encoding of the value. Alternatively, the optional \em encoding
+          parameter can be used to specify it.
+
+          @param encoding Optional argument to specify the character encoding
+              that the comment is encoded in, as an iconv(3) name. Only used
+              for Exif UNICODE comments.
+
+          @return A string containing the comment converted to UTF-8.
+         */
+        std::string comment(const char* encoding =0) const;
+        /*!
+          @brief Determine the character encoding that was used to encode the
+              UNICODE comment value as an iconv(3) name.
+
+          If the comment \em c starts with a BOM, the BOM is interpreted and
+          removed from the string.
+
+          Todo: Implement rules to guess if the comment is UTF-8 encoded.
+         */
+        const char* detectCharset(std::string& c) const;
+        //! Return the Exif charset id of the comment
         CharsetId charsetId() const;
         //@}
 
@@ -600,6 +628,10 @@
         //! Internal virtual copy constructor.
         EXV_DLLLOCAL virtual CommentValue* clone_() const;
 
+    public:
+        // DATA
+        ByteOrder byteOrder_;      //!< Byte order of the comment string that was read
+
     }; // class CommentValue
 
     /*!
@@ -1178,6 +1210,10 @@
     template<> inline TypeId getType<int32_t>() { return signedLong; }
     //! Specialization for a signed rational
     template<> inline TypeId getType<Rational>() { return signedRational; }
+    //! Specialization for a float
+    template<> inline TypeId getType<float>() { return tiffFloat; }
+    //! Specialization for a double
+    template<> inline TypeId getType<double>() { return tiffDouble; }
 
     // No default implementation: let the compiler/linker complain
     // template<typename T> inline TypeId getType() { return invalid; }
@@ -1194,12 +1230,12 @@
 
         //! @name Creators
         //@{
-        //! Default constructor.
-        ValueType();
-        //! Constructor
-        ValueType(const byte* buf, long len, ByteOrder byteOrder);
-        //! Constructor (Note: Argument \em byteOrder is ignored and deprecated)
-        explicit ValueType(const T& val, ByteOrder byteOrder =littleEndian);
+        //! Default Constructor.
+        explicit ValueType(TypeId typeId =getType<T>());
+        //! Constructor.
+        ValueType(const byte* buf, long len, ByteOrder byteOrder, TypeId typeId =getType<T>());
+        //! Constructor.
+        explicit ValueType(const T& val, TypeId typeId =getType<T>());
         //! Copy constructor
         ValueType(const ValueType<T>& rhs);
         //! Virtual destructor.
@@ -1290,6 +1326,10 @@
     typedef ValueType<int32_t> LongValue;
     //! Signed rational value type
     typedef ValueType<Rational> RationalValue;
+    //! Float value type
+    typedef ValueType<float> FloatValue;
+    //! Double value type
+    typedef ValueType<double> DoubleValue;
 
 // *****************************************************************************
 // free functions, template and inline definitions
@@ -1342,6 +1382,18 @@
     {
         return getRational(buf, byteOrder);
     }
+    // Specialization for a 4 byte float value.
+    template<>
+    inline float getValue(const byte* buf, ByteOrder byteOrder)
+    {
+        return getFloat(buf, byteOrder);
+    }
+    // Specialization for a 8 byte double value.
+    template<>
+    inline double getValue(const byte* buf, ByteOrder byteOrder)
+    {
+        return getDouble(buf, byteOrder);
+    }
 
     /*!
       @brief Convert a value of type T to data, write the data to the data buffer.
@@ -1410,23 +1462,41 @@
     {
         return r2Data(buf, t, byteOrder);
     }
+    /*!
+      @brief Specialization to write a float to the data buffer.
+             Return the number of bytes written.
+     */
+    template<>
+    inline long toData(byte* buf, float t, ByteOrder byteOrder)
+    {
+        return f2Data(buf, t, byteOrder);
+    }
+    /*!
+      @brief Specialization to write a double to the data buffer.
+             Return the number of bytes written.
+     */
+    template<>
+    inline long toData(byte* buf, double t, ByteOrder byteOrder)
+    {
+        return d2Data(buf, t, byteOrder);
+    }
 
     template<typename T>
-    ValueType<T>::ValueType()
-        : Value(getType<T>()), pDataArea_(0), sizeDataArea_(0)
+    ValueType<T>::ValueType(TypeId typeId)
+        : Value(typeId), pDataArea_(0), sizeDataArea_(0)
     {
     }
 
     template<typename T>
-    ValueType<T>::ValueType(const byte* buf, long len, ByteOrder byteOrder)
-        : Value(getType<T>()), pDataArea_(0), sizeDataArea_(0)
+    ValueType<T>::ValueType(const byte* buf, long len, ByteOrder byteOrder, TypeId typeId)
+        : Value(typeId), pDataArea_(0), sizeDataArea_(0)
     {
         read(buf, len, byteOrder);
     }
 
     template<typename T>
-    ValueType<T>::ValueType(const T& val, ByteOrder /*byteOrder*/)
-        : Value(getType<T>()), pDataArea_(0), sizeDataArea_(0)
+    ValueType<T>::ValueType(const T& val, TypeId typeId)
+        : Value(typeId), pDataArea_(0), sizeDataArea_(0)
     {
         value_.push_back(val);
     }
@@ -1484,12 +1554,13 @@
     {
         std::istringstream is(buf);
         T tmp;
-        value_.clear();
+        ValueList val;
         while (!(is.eof())) {
             is >> tmp;
             if (is.fail()) return 1;
-            value_.push_back(tmp);
+            val.push_back(tmp);
         }
+        value_.swap(val);
         return 0;
     }
 
@@ -1528,7 +1599,7 @@
         typename ValueList::const_iterator end = value_.end();
         typename ValueList::const_iterator i = value_.begin();
         while (i != end) {
-            os << *i;
+            os << std::setprecision(15) << *i;
             if (++i != end) os << " ";
         }
         return os;
@@ -1546,7 +1617,7 @@
     long ValueType<T>::toLong(long n) const
     {
         ok_ = true;
-        return value_[n];
+        return static_cast<long>(value_[n]);
     }
     // Specialization for rational
     template<>
@@ -1608,6 +1679,22 @@
         ok_ = true;
         return Rational(value_[n].first, value_[n].second);
     }
+    // Specialization for float.
+    template<>
+    inline Rational ValueType<float>::toRational(long n) const
+    {
+        ok_ = true;
+        // Warning: This is a very simple conversion, see floatToRationalCast()
+        return floatToRationalCast(value_[n]);
+    }
+    // Specialization for double.
+    template<>
+    inline Rational ValueType<double>::toRational(long n) const
+    {
+        ok_ = true;
+        // Warning: This is a very simple conversion, see floatToRationalCast()
+        return floatToRationalCast(static_cast<float>(value_[n]));
+    }
 
     template<typename T>
     long ValueType<T>::sizeDataArea() const
diff -Nru exiv2-0.19/src/version.cpp exiv2-0.21/src/version.cpp
--- exiv2-0.19/src/version.cpp	2009-02-16 14:30:51.000000000 +0000
+++ exiv2-0.21/src/version.cpp	2010-06-27 10:04:39.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      version.cpp
-  Version:   $Rev: 1750 $
+  Version:   $Rev: 2286 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   06-Mar-07, ahu: created
 
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: version.cpp 1750 2009-02-16 14:30:51Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: version.cpp 2286 2010-06-27 10:04:39Z ahuggel $")
 
 // *****************************************************************************
 // included header files
diff -Nru exiv2-0.19/src/version.hpp exiv2-0.21/src/version.hpp
--- exiv2-0.19/src/version.hpp	2009-12-29 13:29:21.000000000 +0000
+++ exiv2-0.21/src/version.hpp	2010-08-15 15:09:00.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -24,7 +24,7 @@
            References: Similar versioning defines are used in KDE, GTK and other
            libraries. See http://apr.apache.org/versioning.html for accompanying
            guidelines.
-  @version $Rev: 1981 $
+  @version $Rev: 2320 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    31-May-06, ahu: created
@@ -39,7 +39,7 @@
 /*!
   @brief %Exiv2 MINOR version number of the library used at compile-time.
  */
-#define EXIV2_MINOR_VERSION (19)
+#define EXIV2_MINOR_VERSION (21)
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
diff -Nru exiv2-0.19/src/xmp.cpp exiv2-0.21/src/xmp.cpp
--- exiv2-0.19/src/xmp.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/xmp.cpp	2010-11-06 13:53:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,13 +20,13 @@
  */
 /*
   File:      xmp.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2374 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   13-July-07, ahu: created
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: xmp.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: xmp.cpp 2374 2010-11-06 13:53:15Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -381,10 +381,13 @@
         if (!initialized_) {
 #ifdef EXV_HAVE_XMP_TOOLKIT
             initialized_ = SXMPMeta::Initialize();
-            SXMPMeta::RegisterNamespace("http://www.digikam.org/ns/1.0/", "digiKam", 0);
-            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.0/", "MicrosoftPhoto", 0);
-            SXMPMeta::RegisterNamespace("http://iptc.org/std/Iptc4xmpExt/2008-02-29/", "iptcExt", 0);
-            SXMPMeta::RegisterNamespace("http://ns.useplus.org/ldf/xmp/1.0/", "plus", 0);
+            SXMPMeta::RegisterNamespace("http://www.digikam.org/ns/1.0/", "digiKam");
+            SXMPMeta::RegisterNamespace("http://www.digikam.org/ns/kipi/1.0/", "kipi");
+            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.0/", "MicrosoftPhoto");
+            SXMPMeta::RegisterNamespace("http://iptc.org/std/Iptc4xmpExt/2008-02-29/", "iptcExt");
+            SXMPMeta::RegisterNamespace("http://ns.useplus.org/ldf/xmp/1.0/", "plus");
+            SXMPMeta::RegisterNamespace("http://ns.iview-multimedia.com/mediapro/1.0/", "mediapro");
+            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/expressionmedia/1.0/", "expressionmedia");
 #else
             initialized_ = true;
 #endif
@@ -404,12 +407,13 @@
     }
 
 #ifdef EXV_HAVE_XMP_TOOLKIT
-    bool XmpParser::registerNs(const std::string& ns,
+    void XmpParser::registerNs(const std::string& ns,
                                const std::string& prefix)
     {
         try {
             initialize();
-            return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
+            SXMPMeta::DeleteNamespace(ns.c_str());
+            SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str());
         }
         catch (const XMP_Error& e) {
             throw Error(40, e.GetID(), e.GetErrMsg());
@@ -446,7 +450,7 @@
 
         if (!initialize()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "XMP Toolkit initialization failed.\n";
+            EXV_ERROR << "XMP toolkit initialization failed.\n";
 #endif
             return 2;
         }
@@ -563,13 +567,19 @@
 
         return 0;
     }
-    catch (const XMP_Error& e) {
 #ifndef SUPPRESS_WARNINGS
-        std::cerr << Error(40, e.GetID(), e.GetErrMsg()) << "\n";
-#endif
+    catch (const XMP_Error& e) {
+        EXV_ERROR << Error(40, e.GetID(), e.GetErrMsg()) << "\n";
         xmpData.clear();
         return 3;
-    }} // XmpParser::decode
+    }
+#else
+    catch (const XMP_Error&) {
+        xmpData.clear();
+        return 3;
+    }
+#endif // SUPPRESS_WARNINGS
+    } // XmpParser::decode
 #else
     int XmpParser::decode(      XmpData&     xmpData,
                           const std::string& xmpPacket)
@@ -577,7 +587,7 @@
         xmpData.clear();
         if (!xmpPacket.empty()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: XMP toolkit support not compiled in.\n";
+            EXV_WARNING << "XMP toolkit support not compiled in.\n";
 #endif
         }
         return 1;
@@ -597,11 +607,18 @@
 
         if (!initialize()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "XMP Toolkit initialization failed.\n";
+            EXV_ERROR << "XMP toolkit initialization failed.\n";
 #endif
             return 2;
         }
-
+        // Register custom namespaces with XMP-SDK
+        for (XmpProperties::NsRegistry::iterator i = XmpProperties::nsRegistry_.begin();
+             i != XmpProperties::nsRegistry_.end(); ++i) {
+#ifdef DEBUG
+            std::cerr << "Registering " << i->second.prefix_ << " : " << i->first << "\n";
+#endif
+            registerNs(i->first, i->second.prefix_);
+        }
         SXMPMeta meta;
         for (XmpData::const_iterator i = xmpData.begin(); i != xmpData.end(); ++i) {
             const std::string ns = XmpProperties::ns(i->groupName());
@@ -678,12 +695,17 @@
 
         return 0;
     }
-    catch (const XMP_Error& e) {
 #ifndef SUPPRESS_WARNINGS
-        std::cerr << Error(40, e.GetID(), e.GetErrMsg()) << "\n";
-#endif
+    catch (const XMP_Error& e) {
+        EXV_ERROR << Error(40, e.GetID(), e.GetErrMsg()) << "\n";
         return 3;
-    }} // XmpParser::decode
+    }
+#else
+    catch (const XMP_Error&) {
+        return 3;
+    }
+#endif // SUPPRESS_WARNINGS
+    } // XmpParser::decode
 #else
     int XmpParser::encode(      std::string& /*xmpPacket*/,
                           const XmpData&     xmpData,
@@ -692,7 +714,7 @@
     {
         if (!xmpData.empty()) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: XMP toolkit support not compiled in.\n";
+            EXV_WARNING << "XMP toolkit support not compiled in.\n";
 #endif
         }
         return 1;
diff -Nru exiv2-0.19/src/xmp.hpp exiv2-0.21/src/xmp.hpp
--- exiv2-0.19/src/xmp.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/xmp.hpp	2010-11-06 13:53:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    xmp.hpp
   @brief   Encoding and decoding of XMP data
-  @version $Rev: 1937 $
+  @version $Rev: 2374 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    13-Jul-07, ahu: created
@@ -256,8 +256,6 @@
              the XMP toolkit to do the job.
      */
     class EXIV2API XmpParser {
-        friend void XmpProperties::registerNs(const std::string&, const std::string&);
-        friend void XmpProperties::unregisterNs(const std::string&);
     public:
         //! Options to control the format of the serialized XMP packet.
         enum XmpFormatFlags {
@@ -325,12 +323,8 @@
     private:
         /*!
           @brief Register a namespace with the XMP Toolkit.
-
-          XmpProperties::registerNs calls this to synchronize namespaces.
-
-          @return \em true if the registered prefix matches the suggested prefix.
          */
-        static bool registerNs(const std::string& ns,
+        static void registerNs(const std::string& ns,
                                const std::string& prefix);
         /*!
           @brief Delete a namespace from the XMP Toolkit.
diff -Nru exiv2-0.19/src/xmpsidecar.cpp exiv2-0.21/src/xmpsidecar.cpp
--- exiv2-0.19/src/xmpsidecar.cpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/xmpsidecar.cpp	2010-10-30 06:06:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -20,14 +20,14 @@
  */
 /*
   File:      xmpsidecar.cpp
-  Version:   $Rev: 1937 $
+  Version:   $Rev: 2372 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   07-Mar-08, ahu: created
   Credits:   See header file
  */
 // *****************************************************************************
-#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: xmpsidecar.cpp 1937 2009-11-27 05:59:23Z ahuggel $")
+#include "rcsid_int.hpp"
+EXIV2_RCSID("@(#) $Id: xmpsidecar.cpp 2372 2010-10-30 06:06:15Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -51,11 +51,14 @@
 #include <cassert>
 
 // *****************************************************************************
+namespace {
+    const char* xmlHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    const long  xmlHdrCnt = 39; // without the trailing 0-character
+}
+
 // class member definitions
 namespace Exiv2 {
 
-    const char* XmpSidecar::xmlHeader_ = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    const long XmpSidecar::xmlHdrCnt_ = 39; // without the trailing 0-character
 
     XmpSidecar::XmpSidecar(BasicIo::AutoPtr io, bool create)
         : Image(ImageType::xmp, mdXmp, io)
@@ -63,7 +66,7 @@
         if (create) {
             if (io_->open() == 0) {
                 IoCloser closer(*io_);
-                io_->write(reinterpret_cast<const byte*>(xmlHeader_), xmlHdrCnt_);
+                io_->write(reinterpret_cast<const byte*>(xmlHeader), xmlHdrCnt);
             }
         }
     } // XmpSidecar::XmpSidecar
@@ -106,7 +109,7 @@
         xmpPacket_ = xmpPacket;
         if (xmpPacket_.size() > 0 && XmpParser::decode(xmpData_, xmpPacket_)) {
 #ifndef SUPPRESS_WARNINGS
-            std::cerr << "Warning: Failed to decode XMP metadata.\n";
+            EXV_WARNING << "Failed to decode XMP metadata.\n";
 #endif
         }
         copyXmpToIptc(xmpData_, iptcData_);
@@ -126,13 +129,13 @@
             if (XmpParser::encode(xmpPacket_, xmpData_,
                                   XmpParser::omitPacketWrapper|XmpParser::useCompactFormat) > 1) {
 #ifndef SUPPRESS_WARNINGS
-                std::cerr << "Error: Failed to encode XMP metadata.\n";
+                EXV_ERROR << "Failed to encode XMP metadata.\n";
 #endif
             }
         }
         if (xmpPacket_.size() > 0) {
             if (xmpPacket_.substr(0, 5)  != "<?xml") {
-                xmpPacket_ = xmlHeader_ + xmpPacket_;
+                xmpPacket_ = xmlHeader + xmpPacket_;
             }
             BasicIo::AutoPtr tempIo(io_->temporary()); // may throw
             assert(tempIo.get() != 0);
@@ -160,29 +163,49 @@
     bool isXmpType(BasicIo& iIo, bool advance)
     {
         /*
-          Make sure the file starts with and (optional) XML declaration,
-          followed by an XMP header (<?xpacket ... ?>) or an <x:xmpmeta>
-          element. That doesn't cover all cases, since also x:xmpmeta is
-          optional, but let's wait and see.
-         */
-
-        // Todo: Proper implementation
+          Check if the file starts with an optional XML declaration followed by
+          either an XMP header (<?xpacket ... ?>) or an <x:xmpmeta> element.
 
-        const int32_t len = 10;
+          In addition, in order for empty XmpSidecar objects as created by
+          Exiv2 to pass the test, just an XML header is also considered ok.
+         */
+        const int32_t len = 80;
         byte buf[len];
-        iIo.read(buf, len);
+        iIo.read(buf, xmlHdrCnt + 1);
+        if (   iIo.eof()
+            && 0 == strncmp(reinterpret_cast<const char*>(buf), xmlHeader, xmlHdrCnt)) {
+            return true;
+        }
         if (iIo.error() || iIo.eof()) {
             return false;
         }
+        iIo.read(buf + xmlHdrCnt + 1, len - xmlHdrCnt - 1);
+        if (iIo.error() || iIo.eof()) {
+            return false;
+        }
+        // Skip leading BOM
+        int32_t start = 0;
+        if (0 == strncmp(reinterpret_cast<const char*>(buf), "\xef\xbb\xbf", 3)) {
+            start = 3;
+        }
         bool rc = false;
-        const std::string head(reinterpret_cast<const char*>(buf), len);
-        if (   head.substr(0, 5)  == "<?xml"
-            || head.substr(0, 9)  == "<?xpacket"
-            || head.substr(0, 10) == "<x:xmpmeta") {
+        std::string head(reinterpret_cast<const char*>(buf + start), len - start);
+        if (head.substr(0, 5)  == "<?xml") {
+            // Forward to the next tag
+            for (unsigned i = 5; i < head.size(); ++i) {
+                if (head[i] == '<') {
+                    head = head.substr(i);
+                    break;
+                }
+            }
+        }
+        if (   head.size() > 9
+            && (   head.substr(0, 9)  == "<?xpacket"
+                || head.substr(0, 10) == "<x:xmpmeta")) {
             rc = true;
         }
         if (!advance || !rc) {
-            iIo.seek(-len, BasicIo::cur);
+            iIo.seek(-(len - start), BasicIo::cur); // Swallow the BOM
         }
         return rc;
 
diff -Nru exiv2-0.19/src/xmpsidecar.hpp exiv2-0.21/src/xmpsidecar.hpp
--- exiv2-0.19/src/xmpsidecar.hpp	2009-11-27 05:59:23.000000000 +0000
+++ exiv2-0.21/src/xmpsidecar.hpp	2010-10-30 06:06:15.000000000 +0000
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+ * Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
  *
  * This program is part of the Exiv2 distribution.
  *
@@ -21,7 +21,7 @@
 /*!
   @file    xmpsidecar.hpp
   @brief   An Image subclass to support XMP sidecar files
-  @version $Rev: 1937 $
+  @version $Rev: 2372 $
   @author  Andreas Huggel
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    07-Mar-08, ahu: created
@@ -98,10 +98,6 @@
         XmpSidecar& operator=(const XmpSidecar& rhs);
         //@}
 
-        // DATA
-        static const char* xmlHeader_;
-        static const long  xmlHdrCnt_;
-
     }; // class XmpSidecar
 
 // *****************************************************************************
diff -Nru exiv2-0.19/xmpsdk/include/client-glue/TXMPMeta.incl_cpp exiv2-0.21/xmpsdk/include/client-glue/TXMPMeta.incl_cpp
--- exiv2-0.19/xmpsdk/include/client-glue/TXMPMeta.incl_cpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/include/client-glue/TXMPMeta.incl_cpp	2010-11-06 13:53:15.000000000 +0000
@@ -233,17 +233,11 @@
 
 // -------------------------------------------------------------------------------------------------
 
-XMP_MethodIntro(TXMPMeta,bool)::
+XMP_MethodIntro(TXMPMeta,void)::
 RegisterNamespace ( XMP_StringPtr namespaceURI,
-                    XMP_StringPtr suggestedPrefix,
-                    tStringObj *  registeredPrefix )
+                    XMP_StringPtr prefix )
 {
-	XMP_StringPtr resultPtr = 0;
-	XMP_StringLen resultLen = 0;
-	WrapCheckBool ( prefixMatch, zXMPMeta_RegisterNamespace_1 ( namespaceURI, suggestedPrefix, &resultPtr, &resultLen ) );
-	if ( registeredPrefix != 0 ) registeredPrefix->assign ( resultPtr, resultLen );
-	WXMPMeta_Unlock_1 ( 0 );
-	return prefixMatch;
+	WrapCheckVoid ( zXMPMeta_RegisterNamespace_1 ( namespaceURI, prefix ) );
 }
 
 // -------------------------------------------------------------------------------------------------
diff -Nru exiv2-0.19/xmpsdk/include/client-glue/WXMPMeta.hpp exiv2-0.21/xmpsdk/include/client-glue/WXMPMeta.hpp
--- exiv2-0.19/xmpsdk/include/client-glue/WXMPMeta.hpp	2009-07-07 14:08:52.000000000 +0000
+++ exiv2-0.21/xmpsdk/include/client-glue/WXMPMeta.hpp	2010-11-06 13:53:15.000000000 +0000
@@ -39,8 +39,8 @@
 #define zXMPMeta_DumpAliases_1(outProc,refCon) \
     WXMPMeta_DumpAliases_1 ( outProc, refCon, &wResult )
 
-#define zXMPMeta_RegisterNamespace_1(namespaceURI,suggestedPrefix,registeredPrefix,prefixSize) \
-    WXMPMeta_RegisterNamespace_1 ( namespaceURI, suggestedPrefix, registeredPrefix, prefixSize, &wResult )
+#define zXMPMeta_RegisterNamespace_1(namespaceURI,prefix) \
+    WXMPMeta_RegisterNamespace_1 ( namespaceURI, prefix, &wResult )
 
 #define zXMPMeta_GetNamespacePrefix_1(namespaceURI,namespacePrefix,prefixSize) \
     WXMPMeta_GetNamespacePrefix_1 ( namespaceURI, namespacePrefix, prefixSize, &wResult )
@@ -232,9 +232,7 @@
 
 extern void
 WXMPMeta_RegisterNamespace_1 ( XMP_StringPtr   namespaceURI,
-                               XMP_StringPtr   suggestedPrefix,
-                               XMP_StringPtr * registeredPrefix,
-                               XMP_StringLen * prefixSize,
+                               XMP_StringPtr   prefix,
                                WXMP_Result *   wResult );
 
 extern void
diff -Nru exiv2-0.19/xmpsdk/include/TXMPMeta.hpp exiv2-0.21/xmpsdk/include/TXMPMeta.hpp
--- exiv2-0.19/xmpsdk/include/TXMPMeta.hpp	2009-07-07 14:20:26.000000000 +0000
+++ exiv2-0.21/xmpsdk/include/TXMPMeta.hpp	2010-11-06 13:53:15.000000000 +0000
@@ -267,30 +267,20 @@
     /// new URI.
 
     // ---------------------------------------------------------------------------------------------
-    /// @brief \c RegisterNamespace() registers a namespace URI with a suggested prefix.
+    /// @brief \c RegisterNamespace() registers a namespace URI with a prefix.
     ///
-    /// If the URI is not registered but the suggested prefix is in use, a unique prefix is created
-    /// from the suggested one. The actual registered prefix is returned. The function result tells
-    /// if the registered prefix is the suggested one. It is not an error if the URI is already
-    /// registered, regardless of the prefix.
+    /// If the the prefix is in use, the URI of the existing prefix is overwritten.
     ///
     /// This function is static; make the call directly from the concrete class (\c SXMPMeta).
     ///
     /// @param namespaceURI The URI for the namespace. Must be a valid XML URI.
     ///
-    /// @param suggestedPrefix The suggested prefix to be used if the URI is not yet registered.
-    /// Must be a valid XML name.
-    ///
-    /// @param registeredPrefix [out] A string object in which to return the prefix actually
-    /// registered for this URI.
-    ///
-    /// @return True if the registered prefix matches the suggested prefix.
+    /// @param prefix The prefix to be used. Must be a valid XML name.
     ///
     /// @note No checking is done on either the URI or the prefix.  */
 
-    static bool RegisterNamespace ( XMP_StringPtr namespaceURI,
-                        			XMP_StringPtr suggestedPrefix,
-                       				tStringObj *  registeredPrefix );
+    static void RegisterNamespace ( XMP_StringPtr namespaceURI,
+                                    XMP_StringPtr prefix );
 
     // ---------------------------------------------------------------------------------------------
     /// @brief \c GetNamespacePrefix() obtains the prefix for a registered namespace URI, and
diff -Nru exiv2-0.19/xmpsdk/src/ExpatAdapter.cpp exiv2-0.21/xmpsdk/src/ExpatAdapter.cpp
--- exiv2-0.19/xmpsdk/src/ExpatAdapter.cpp	2009-07-07 14:08:52.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/ExpatAdapter.cpp	2010-11-06 13:53:15.000000000 +0000
@@ -19,7 +19,9 @@
 using namespace std;
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#   ifdef _MSC_VER
+        #pragma warning ( disable : 4996 )	// '...' was declared deprecated
+#   endif
 #endif
 
 // *** Set memory handlers.
@@ -258,7 +260,7 @@
 	#endif
 	
 	if ( XMP_LitMatch ( uri, "http://purl.org/dc/1.1/" ) ) uri = "http://purl.org/dc/elements/1.1/";
-	(void) XMPMeta::RegisterNamespace ( uri, prefix, &voidStringPtr, &voidStringLen );
+	XMPMeta::RegisterNamespace ( uri, prefix );
 
 }	// StartNamespaceDeclHandler
 
diff -Nru exiv2-0.19/xmpsdk/src/Makefile exiv2-0.21/xmpsdk/src/Makefile
--- exiv2-0.19/xmpsdk/src/Makefile	2009-07-07 14:20:26.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/Makefile	2010-04-03 07:53:30.000000000 +0000
@@ -1,6 +1,6 @@
 # ************************************************************* -*- Makefile -*-
 #
-# Copyright (C) 2004-2009 Andreas Huggel <ahuggel@gmx.net>
+# Copyright (C) 2004-2010 Andreas Huggel <ahuggel@gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -31,7 +31,7 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # File:      Makefile
-# Version:   $Rev: 1853 $
+# Version:   $Rev: 2045 $
 # Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
 # History:   30-Sep-07, ahu: created
 #
diff -Nru exiv2-0.19/xmpsdk/src/ParseRDF.cpp exiv2-0.21/xmpsdk/src/ParseRDF.cpp
--- exiv2-0.19/xmpsdk/src/ParseRDF.cpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/ParseRDF.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -19,8 +19,10 @@
 using namespace std;
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4189 )	// local variable is initialized but not referenced
-	#pragma warning ( disable : 4505 )	// unreferenced local function has been removed
+#   ifdef _MSC_VER
+        #pragma warning ( disable : 4189 )	// local variable is initialized but not referenced
+        #pragma warning ( disable : 4505 )	// unreferenced local function has been removed
+#   endif
 #endif
 
 // =================================================================================================
diff -Nru exiv2-0.19/xmpsdk/src/WXMPIterator.cpp exiv2-0.21/xmpsdk/src/WXMPIterator.cpp
--- exiv2-0.19/xmpsdk/src/WXMPIterator.cpp	2007-10-01 17:59:06.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/WXMPIterator.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -13,12 +13,14 @@
 #include "client-glue/WXMPIterator.hpp"
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4101 ) // unreferenced local variable
-	#pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
-	#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
-	#if XMP_DebugBuild
-		#pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
-	#endif
+#   ifdef _MSC_VER
+        #pragma warning ( disable : 4101 ) // unreferenced local variable
+        #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+        #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+        #if XMP_DebugBuild
+            #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+#       endif
+#   endif
 #endif
 
 #if __cplusplus
diff -Nru exiv2-0.19/xmpsdk/src/WXMPMeta.cpp exiv2-0.21/xmpsdk/src/WXMPMeta.cpp
--- exiv2-0.19/xmpsdk/src/WXMPMeta.cpp	2009-07-07 14:08:52.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/WXMPMeta.cpp	2010-11-06 13:53:15.000000000 +0000
@@ -13,13 +13,15 @@
 #include "client-glue/WXMPMeta.hpp"
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4101 ) // unreferenced local variable
-	#pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
-	#pragma warning ( disable : 4702 ) // unreachable code
-	#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
-	#if XMP_DebugBuild
-		#pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
-	#endif
+    #ifdef _MSC_VER
+        #pragma warning ( disable : 4101 ) // unreferenced local variable
+        #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+        #pragma warning ( disable : 4702 ) // unreachable code
+        #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+        #if XMP_DebugBuild
+            #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+        #endif
+    #endif
 #endif
 
 #if __cplusplus
@@ -215,23 +217,17 @@
 
 /* class static */ void
 WXMPMeta_RegisterNamespace_1 ( XMP_StringPtr   namespaceURI,
-							   XMP_StringPtr   suggestedPrefix,
-							   XMP_StringPtr * registeredPrefix,
-							   XMP_StringLen * prefixSize,
-							   WXMP_Result *   wResult )
+                               XMP_StringPtr   prefix,
+                               WXMP_Result *   wResult )
 {
 	XMP_ENTER_WRAPPER ( "WXMPMeta_RegisterNamespace_1" )
 
 		if ( (namespaceURI == 0) || (*namespaceURI == 0) ) XMP_Throw ( "Empty namespace URI", kXMPErr_BadSchema );
-		if ( (suggestedPrefix == 0) || (*suggestedPrefix == 0) ) XMP_Throw ( "Empty suggested prefix", kXMPErr_BadSchema );
+		if ( (prefix == 0) || (*prefix == 0) ) XMP_Throw ( "Empty prefix", kXMPErr_BadSchema );
 
-		if ( registeredPrefix == 0 ) registeredPrefix = &voidStringPtr;
-		if ( prefixSize == 0 ) prefixSize = &voidStringLen;
-
-		bool prefixMatch = XMPMeta::RegisterNamespace ( namespaceURI, suggestedPrefix, registeredPrefix, prefixSize );
-		wResult->int32Result = prefixMatch;
+		XMPMeta::RegisterNamespace ( namespaceURI, prefix );
 
-	XMP_EXIT_WRAPPER_KEEP_LOCK ( true ) // ! Always keep the lock, a string is always returned!
+	XMP_EXIT_WRAPPER
 }
 
 // -------------------------------------------------------------------------------------------------
diff -Nru exiv2-0.19/xmpsdk/src/WXMPUtils.cpp exiv2-0.21/xmpsdk/src/WXMPUtils.cpp
--- exiv2-0.19/xmpsdk/src/WXMPUtils.cpp	2009-07-07 14:08:52.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/WXMPUtils.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -15,12 +15,14 @@
 #include "client-glue/WXMPUtils.hpp"
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4101 ) // unreferenced local variable
-	#pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
-	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
-	#if XMP_DebugBuild
-		#pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
-	#endif
+    #ifdef _MSC_VER
+        #pragma warning ( disable : 4101 ) // unreferenced local variable
+        #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+        #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+        #if XMP_DebugBuild
+            #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+        #endif
+    #endif
 #endif
 
 #if __cplusplus
diff -Nru exiv2-0.19/xmpsdk/src/XML_Node.cpp exiv2-0.21/xmpsdk/src/XML_Node.cpp
--- exiv2-0.19/xmpsdk/src/XML_Node.cpp	2009-11-28 14:09:28.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XML_Node.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -17,9 +17,11 @@
 #define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
 
 #if XMP_WinBuild
+#ifdef _MSC_VER
 	#define snprintf _snprintf
 	#pragma warning ( disable : 4996 )	// snprintf is safe
 #endif
+#endif
 
 // =================================================================================================
 
diff -Nru exiv2-0.19/xmpsdk/src/XMPCore_Impl.cpp exiv2-0.21/xmpsdk/src/XMPCore_Impl.cpp
--- exiv2-0.19/xmpsdk/src/XMPCore_Impl.cpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPCore_Impl.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -18,8 +18,10 @@
 using namespace std;
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4290 )	// C++ exception specification ignored except ... not __declspec(nothrow)
-	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+    #ifdef _MSC_VER
+        #pragma warning ( disable : 4290 )	// C++ exception specification ignored except ... not __declspec(nothrow)
+        #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+    #endif
 #endif
 
 // *** Add debug codegen checks, e.g. that typical masking operations really work
@@ -843,7 +845,8 @@
 		schemaNode = new XMP_Node ( xmpTree, nsURI, (kXMP_SchemaNode | kXMP_NewImplicitNode) );
 		XMP_StringPtr prefixPtr;
 		XMP_StringLen prefixLen;
-		bool found = XMPMeta::GetNamespacePrefix ( nsURI, &prefixPtr, &prefixLen );	// *** Use map directly?
+        bool found = false;
+        found = XMPMeta::GetNamespacePrefix ( nsURI, &prefixPtr, &prefixLen );	// *** Use map directly?
 		XMP_Assert ( found );
 
 		schemaNode->value.assign ( prefixPtr, prefixLen );
diff -Nru exiv2-0.19/xmpsdk/src/XMPCore_Impl.hpp exiv2-0.21/xmpsdk/src/XMPCore_Impl.hpp
--- exiv2-0.19/xmpsdk/src/XMPCore_Impl.hpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPCore_Impl.hpp	2010-06-13 14:21:05.000000000 +0000
@@ -30,8 +30,10 @@
 #endif
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4244 )	// possible loss of data (temporary for 64 bit builds)
-	#pragma warning ( disable : 4267 )	// possible loss of data (temporary for 64 bit builds)
+#   ifdef _MSC_VER
+        #pragma warning ( disable : 4244 )	// possible loss of data (temporary for 64 bit builds)
+        #pragma warning ( disable : 4267 )	// possible loss of data (temporary for 64 bit builds)
+#   endif
 #endif
 
 // =================================================================================================
diff -Nru exiv2-0.19/xmpsdk/src/XMPIterator.cpp exiv2-0.21/xmpsdk/src/XMPIterator.cpp
--- exiv2-0.19/xmpsdk/src/XMPIterator.cpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPIterator.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -15,9 +15,11 @@
 #include <stdio.h>	// For snprintf.
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4702 )	// unreachable code
-	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
-	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
+    #ifdef _MSC_VER
+        #pragma warning ( disable : 4702 )	// unreachable code
+        #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+        #pragma warning ( disable : 4996 )	// '...' was declared deprecated
+    #endif
 #endif
 
 // =================================================================================================
diff -Nru exiv2-0.19/xmpsdk/src/XMPMeta.cpp exiv2-0.21/xmpsdk/src/XMPMeta.cpp
--- exiv2-0.19/xmpsdk/src/XMPMeta.cpp	2009-12-27 15:30:07.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPMeta.cpp	2010-11-06 13:53:15.000000000 +0000
@@ -30,11 +30,13 @@
 using namespace std;
 
 #if XMP_WinBuild
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
 	#pragma warning ( disable : 4702 )	// unreachable code
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
 	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
 #endif
+#endif
 
 
 // *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
@@ -112,7 +114,7 @@
 	
 		// Output the next span of regular characters.
 		for ( spanEnd = spanStart; spanEnd < valueEnd; ++spanEnd ) {
-			if ( *spanEnd > 0x7F ) break;
+			if ( (unsigned char)(*spanEnd) > 0x7F ) break;
 			if ( (*spanEnd < 0x20) && (*spanEnd != kTab) && (*spanEnd != kLF) ) break;
 		}
 		if ( spanStart != spanEnd ) status = (*outProc) ( refCon,  spanStart, (spanEnd-spanStart) );
@@ -122,7 +124,7 @@
 		// Output the next span of irregular characters.
 		prevNormal = true;
 		for ( spanEnd = spanStart; spanEnd < valueEnd; ++spanEnd ) {
-			if ( ((0x20 <= *spanEnd) && (*spanEnd <= 0x7F)) || (*spanEnd == kTab) || (*spanEnd == kLF) ) break;
+			if ( ((0x20 <= *spanEnd) && ((unsigned char)(*spanEnd) <= 0x7F)) || (*spanEnd == kTab) || (*spanEnd == kLF) ) break;
 			char space = ' ';
 			if ( prevNormal ) space = '<';
 			status = (*outProc) ( refCon, &space, 1 );
@@ -660,67 +662,63 @@
 	InitializeUnicodeConversions();
 	
 	// Register standard namespaces and aliases.
-	
-	XMP_StringPtr	voidPtr;
-	XMP_StringLen	voidLen;
-	
-	(void) RegisterNamespace ( kXMP_NS_XML, "xml", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_RDF, "rdf", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_DC, "dc", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_XMP, "xmp", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PDF, "pdf", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_Photoshop, "photoshop", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PSAlbum, "album", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_EXIF, "exif", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_EXIF_Aux, "aux", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_TIFF, "tiff", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PNG, "png", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_JPEG, "jpeg", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_JP2K, "jp2k", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_CameraRaw, "crs", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_ASF, "asf", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_WAV, "wav", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_AdobeStockPhoto, "bmsp", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_CreatorAtom, "creatorAtom", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_XMP_Rights, "xmpRights", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_MM, "xmpMM", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_BJ, "xmpBJ", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_Note, "xmpNote", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_DM, "xmpDM", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_Text, "xmpT", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_PagedFile, "xmpTPg", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_Graphics, "xmpG", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_Image, "xmpGImg", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_XMP_Font, "stFnt", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_Dimensions, "stDim", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_ResourceEvent, "stEvt", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_ResourceRef, "stRef", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_ST_Version, "stVer", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_ST_Job, "stJob", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_XMP_ManifestItem, "stMfs", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_XMP_IdentifierQual, "xmpidq", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_IPTCCore, "Iptc4xmpCore", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_DICOM, "DICOM", &voidPtr, &voidLen );
-
-	(void) RegisterNamespace ( kXMP_NS_PDFA_Schema, "pdfaSchema", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PDFA_Property, "pdfaProperty", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PDFA_Type, "pdfaType", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PDFA_Field, "pdfaField", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PDFA_ID, "pdfaid", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PDFA_Extension, "pdfaExtension", &voidPtr, &voidLen );
+	RegisterNamespace ( kXMP_NS_XML, "xml" );
+	RegisterNamespace ( kXMP_NS_RDF, "rdf" );
+	RegisterNamespace ( kXMP_NS_DC, "dc" );
+
+	RegisterNamespace ( kXMP_NS_XMP, "xmp" );
+	RegisterNamespace ( kXMP_NS_PDF, "pdf" );
+	RegisterNamespace ( kXMP_NS_Photoshop, "photoshop" );
+	RegisterNamespace ( kXMP_NS_PSAlbum, "album" );
+	RegisterNamespace ( kXMP_NS_EXIF, "exif" );
+	RegisterNamespace ( kXMP_NS_EXIF_Aux, "aux" );
+	RegisterNamespace ( kXMP_NS_TIFF, "tiff" );
+	RegisterNamespace ( kXMP_NS_PNG, "png" );
+	RegisterNamespace ( kXMP_NS_JPEG, "jpeg" );
+	RegisterNamespace ( kXMP_NS_JP2K, "jp2k" );
+	RegisterNamespace ( kXMP_NS_CameraRaw, "crs" );
+	RegisterNamespace ( kXMP_NS_ASF, "asf" );
+	RegisterNamespace ( kXMP_NS_WAV, "wav" );
+
+	RegisterNamespace ( kXMP_NS_AdobeStockPhoto, "bmsp" );
+	RegisterNamespace ( kXMP_NS_CreatorAtom, "creatorAtom" );
+
+	RegisterNamespace ( kXMP_NS_XMP_Rights, "xmpRights" );
+	RegisterNamespace ( kXMP_NS_XMP_MM, "xmpMM" );
+	RegisterNamespace ( kXMP_NS_XMP_BJ, "xmpBJ" );
+	RegisterNamespace ( kXMP_NS_XMP_Note, "xmpNote" );
+
+	RegisterNamespace ( kXMP_NS_DM, "xmpDM" );
+	RegisterNamespace ( kXMP_NS_XMP_Text, "xmpT" );
+	RegisterNamespace ( kXMP_NS_XMP_PagedFile, "xmpTPg" );
+	RegisterNamespace ( kXMP_NS_XMP_Graphics, "xmpG" );
+	RegisterNamespace ( kXMP_NS_XMP_Image, "xmpGImg" );
+
+	RegisterNamespace ( kXMP_NS_XMP_Font, "stFnt" );
+	RegisterNamespace ( kXMP_NS_XMP_Dimensions, "stDim" );
+	RegisterNamespace ( kXMP_NS_XMP_ResourceEvent, "stEvt" );
+	RegisterNamespace ( kXMP_NS_XMP_ResourceRef, "stRef" );
+	RegisterNamespace ( kXMP_NS_XMP_ST_Version, "stVer" );
+	RegisterNamespace ( kXMP_NS_XMP_ST_Job, "stJob" );
+	RegisterNamespace ( kXMP_NS_XMP_ManifestItem, "stMfs" );
+
+	RegisterNamespace ( kXMP_NS_XMP_IdentifierQual, "xmpidq" );
+
+	RegisterNamespace ( kXMP_NS_IPTCCore, "Iptc4xmpCore" );
+	RegisterNamespace ( kXMP_NS_DICOM, "DICOM" );
+
+	RegisterNamespace ( kXMP_NS_PDFA_Schema, "pdfaSchema" );
+	RegisterNamespace ( kXMP_NS_PDFA_Property, "pdfaProperty" );
+	RegisterNamespace ( kXMP_NS_PDFA_Type, "pdfaType" );
+	RegisterNamespace ( kXMP_NS_PDFA_Field, "pdfaField" );
+	RegisterNamespace ( kXMP_NS_PDFA_ID, "pdfaid" );
+	RegisterNamespace ( kXMP_NS_PDFA_Extension, "pdfaExtension" );
 
-	(void) RegisterNamespace ( kXMP_NS_PDFX, "pdfx", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( kXMP_NS_PDFX_ID, "pdfxid", &voidPtr, &voidLen );
+	RegisterNamespace ( kXMP_NS_PDFX, "pdfx" );
+	RegisterNamespace ( kXMP_NS_PDFX_ID, "pdfxid" );
 	
-	(void) RegisterNamespace ( "adobe:ns:meta/", "x", &voidPtr, &voidLen );
-	(void) RegisterNamespace ( "http://ns.adobe.com/iX/1.0/", "iX", &voidPtr, &voidLen );
+	RegisterNamespace ( "adobe:ns:meta/", "x" );
+	RegisterNamespace ( "http://ns.adobe.com/iX/1.0/", "iX" );
 
 // 06-Oct-07, ahu: Do not use aliases. They result in unexpected behaviour.
 //	XMPMeta::RegisterStandardAliases ( "" );
@@ -741,7 +739,8 @@
 	XMP_Assert ( sizeof(XMP_Uns64) == 8 );
 	
 	XMP_Assert ( sizeof(XMP_OptionBits) == 4 );	// Check that option masking work on all 32 bits.
-	XMP_OptionBits flag = ~0UL;
+	XMP_OptionBits flag;
+    flag = ~0UL;
 	XMP_Assert ( flag == (XMP_OptionBits)(-1L) );
 	XMP_Assert ( (flag ^ kXMP_PropHasLang) == 0xFFFFFFBFUL );
 	XMP_Assert ( (flag & ~kXMP_PropHasLang) == 0xFFFFFFBFUL );
@@ -1033,60 +1032,22 @@
 // RegisterNamespace
 // -----------------
 
-/* class-static */ bool
+/* class-static */ void
 XMPMeta::RegisterNamespace ( XMP_StringPtr	 namespaceURI,
-							 XMP_StringPtr	 suggestedPrefix,
-							 XMP_StringPtr * registeredPrefix,
-							 XMP_StringLen * prefixSize )
+                             XMP_StringPtr	 prefix )
 {
-	bool	prefixMatches	= false;
-	
-	XMP_Assert ( (registeredPrefix != 0) && (prefixSize != 0) );		// ! Enforced by wrapper.
-	if ( (*namespaceURI == 0) || (*suggestedPrefix == 0) ) {
+	if ( (*namespaceURI == 0) || (*prefix == 0) ) {
 		XMP_Throw ( "Empty namespace URI or prefix", kXMPErr_BadParam );
 	}
 	
 	XMP_VarString	nsURI ( namespaceURI );
-	XMP_VarString	suggPrefix ( suggestedPrefix );
-	if ( suggPrefix[suggPrefix.size()-1] != ':' ) suggPrefix += ':';
-	VerifySimpleXMLName ( suggestedPrefix, suggestedPrefix+suggPrefix.size()-1 );	// Exclude the colon.
-	
-	XMP_StringMapPos	uriPos	= sNamespaceURIToPrefixMap->find ( nsURI );
-	
-	if ( uriPos == sNamespaceURIToPrefixMap->end() ) {
-		
-		// The URI is not yet registered, make sure we use a unique prefix.
-		
-		XMP_VarString	uniqPrefix ( suggPrefix );
-		int		suffix = 0;
-		char	buffer [32];
-
-		while ( true ) {
-			if ( sNamespacePrefixToURIMap->find ( uniqPrefix ) == sNamespacePrefixToURIMap->end() ) break;
-			++suffix;
-			snprintf ( buffer, sizeof(buffer), "_%d_:", suffix );	// AUDIT: Using sizeof for snprintf length is safe.
-			uniqPrefix = suggPrefix;
-			uniqPrefix.erase ( uniqPrefix.size()-1 );	// ! Remove the trailing ':'.
-			uniqPrefix += buffer;
-		}
-		
-		// Add the new namespace to both maps.
-		
-		XMP_StringPair	newNS ( nsURI, uniqPrefix );
-		uriPos = sNamespaceURIToPrefixMap->insert ( sNamespaceURIToPrefixMap->end(), newNS );
-		
-		newNS.first.swap ( newNS.second );
-		(void) sNamespacePrefixToURIMap->insert ( sNamespacePrefixToURIMap->end(), newNS );
-
-	}
-	
-	// Return the actual prefix and see if it matches the suggested prefix.
-	
-	*registeredPrefix = uriPos->second.c_str();
-	*prefixSize = uriPos->second.size();
-	
-	prefixMatches = ( uriPos->second == suggPrefix );
-	return prefixMatches;
+	XMP_VarString	prfix ( prefix );
+	if ( prfix[prfix.size()-1] != ':' ) prfix += ':';
+	VerifySimpleXMLName ( prefix, prefix+prfix.size()-1 );	// Exclude the colon.
+	
+        // Set the new namespace in both maps.
+        (*sNamespaceURIToPrefixMap)[nsURI] = prfix;
+        (*sNamespacePrefixToURIMap)[prfix] = nsURI;
 	
 }	// RegisterNamespace
 
@@ -1160,7 +1121,6 @@
 /* class-static */ void
 XMPMeta::DeleteNamespace ( XMP_StringPtr namespaceURI )
 {
-
 	XMP_StringMapPos uriPos = sNamespaceURIToPrefixMap->find ( namespaceURI );
 	if ( uriPos == sNamespaceURIToPrefixMap->end() ) return;
 
diff -Nru exiv2-0.19/xmpsdk/src/XMPMeta-GetSet.cpp exiv2-0.21/xmpsdk/src/XMPMeta-GetSet.cpp
--- exiv2-0.19/xmpsdk/src/XMPMeta-GetSet.cpp	2009-07-07 14:08:52.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPMeta-GetSet.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -28,9 +28,11 @@
 using namespace std;
 
 #if XMP_WinBuild
-	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
-	#pragma warning ( disable : 4702 )	// unreachable code
-	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+    #ifdef _MSC_VER
+        #pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
+        #pragma warning ( disable : 4702 )	// unreachable code
+        #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
+    #endif
 #endif
 
 
diff -Nru exiv2-0.19/xmpsdk/src/XMPMeta.hpp exiv2-0.21/xmpsdk/src/XMPMeta.hpp
--- exiv2-0.19/xmpsdk/src/XMPMeta.hpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPMeta.hpp	2010-11-06 13:53:15.000000000 +0000
@@ -67,11 +67,9 @@
 	
 	// ---------------------------------------------------------------------------------------------
 	
-	static bool
+	static void
 	RegisterNamespace ( XMP_StringPtr	namespaceURI,
-						XMP_StringPtr	suggestedPrefix,
-						XMP_StringPtr * registeredPrefix,
-						XMP_StringLen * prefixSize );
+                            XMP_StringPtr	prefix );
 	
 	static bool
 	GetNamespacePrefix ( XMP_StringPtr	 namespaceURI,
diff -Nru exiv2-0.19/xmpsdk/src/XMPMeta-Parse.cpp exiv2-0.21/xmpsdk/src/XMPMeta-Parse.cpp
--- exiv2-0.19/xmpsdk/src/XMPMeta-Parse.cpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPMeta-Parse.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -26,11 +26,13 @@
 using namespace std;
 
 #if XMP_WinBuild
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
 	#pragma warning ( disable : 4702 )	// unreachable code
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
 	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
 #endif
+#endif
 
 
 // *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
diff -Nru exiv2-0.19/xmpsdk/src/XMPMeta-Serialize.cpp exiv2-0.21/xmpsdk/src/XMPMeta-Serialize.cpp
--- exiv2-0.19/xmpsdk/src/XMPMeta-Serialize.cpp	2009-07-07 14:13:03.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPMeta-Serialize.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -25,11 +25,12 @@
 using namespace std;
 
 #if XMP_WinBuild
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
 	#pragma warning ( disable : 4702 )	// unreachable code
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
 #endif
-
+#endif
 
 // *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
 // *** Add debug codegen checks, e.g. that typical masking operations really work
diff -Nru exiv2-0.19/xmpsdk/src/XMPUtils.cpp exiv2-0.21/xmpsdk/src/XMPUtils.cpp
--- exiv2-0.19/xmpsdk/src/XMPUtils.cpp	2009-11-15 13:55:19.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPUtils.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -24,9 +24,11 @@
 #include <stdio.h>	// For snprintf.
 
 #if XMP_WinBuild
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
 	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
 #endif
+#endif
 
 
 // =================================================================================================
@@ -600,7 +602,8 @@
 		printf ( "  Move %s, %d bytes\n", propName, propSize );
 	#endif
 
-	bool moved = MoveOneProperty ( stdXMP, extXMP, schemaURI, propName );
+    bool moved = false;
+	moved = MoveOneProperty ( stdXMP, extXMP, schemaURI, propName );
 	XMP_Assert ( moved );
 
 	propSizes.erase ( lastPos );
@@ -1839,7 +1842,8 @@
 	// Adjust the standard XMP padding to be up to 2KB.
 
 	XMP_Assert ( (sStandardXMP->size() > kTrailerLen) && (sStandardXMP->size() <= kStdXMPLimit) );
-	const char * packetEnd = sStandardXMP->c_str() + sStandardXMP->size() - kTrailerLen;
+	const char * packetEnd = 0;
+    packetEnd = sStandardXMP->c_str() + sStandardXMP->size() - kTrailerLen;
 	XMP_Assert ( XMP_LitMatch ( packetEnd, kPacketTrailer ) );
 
 	size_t extraPadding = kStdXMPLimit - sStandardXMP->size();	// ! Do this before erasing the trailer.
diff -Nru exiv2-0.19/xmpsdk/src/XMPUtils-FileInfo.cpp exiv2-0.21/xmpsdk/src/XMPUtils-FileInfo.cpp
--- exiv2-0.19/xmpsdk/src/XMPUtils-FileInfo.cpp	2009-07-07 14:08:52.000000000 +0000
+++ exiv2-0.21/xmpsdk/src/XMPUtils-FileInfo.cpp	2010-04-13 19:10:55.000000000 +0000
@@ -20,8 +20,10 @@
 #include <stdio.h>	// For snprintf.
 
 #if XMP_WinBuild
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
 #endif
+#endif
 
 // =================================================================================================
 // Local Types and Constants